diff --git a/documentation/sphinx/source/mr-status.rst b/documentation/sphinx/source/mr-status.rst
index 772db55f2e..61d2103b16 100644
--- a/documentation/sphinx/source/mr-status.rst
+++ b/documentation/sphinx/source/mr-status.rst
@@ -127,7 +127,7 @@ The following format informally describes the JSON containing the status data. T
           "name": <  "initializing"
                    | "missing_data"
                    | "healing"
-                   | "removing_redundant_teams"
+                   | "optimizing_team_collections"
                    | "healthy_repartitioning"
                    | "healthy_removing_server"
                    | "healthy_rebalancing"
diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst
index 112615bd0e..d0f1b945c5 100644
--- a/documentation/sphinx/source/release-notes.rst
+++ b/documentation/sphinx/source/release-notes.rst
@@ -7,7 +7,7 @@ Release Notes
 
 Features
 --------
-Improved replication mechanism, a new hierarchical replication technique that further significantly reduces the frequency of data loss events even when multiple machines (e.g., fault-tolerant zones in the current code) permanently fail at the same time.  `(PR #964) <https://github.com/apple/foundationdb/pull/964>`.
+* Improved replication mechanism, a new hierarchical replication technique that further significantly reduces the frequency of data loss events even when multiple machines (e.g., fault-tolerant zones in the current code) permanently fail at the same time.  `(PR #964) <https://github.com/apple/foundationdb/pull/964>`.
 
 
 * Get read version, read, and commit requests are counted and aggregated by server-side latency in configurable latency bands and output in JSON status. `(PR #1084) <https://github.com/apple/foundationdb/pull/1084>`_
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 08efea0317..769d7e8d25 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -521,7 +521,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                   "initializing",
                   "missing_data",
                   "healing",
-                  "removing_redundant_teams",
+                  "optimizing_team_collections",
                   "healthy_repartitioning",
                   "healthy_removing_server",
                   "healthy_rebalancing",
@@ -554,7 +554,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                           "initializing",
                           "missing_data",
                           "healing",
-                          "removing_redundant_teams",
+                          "optimizing_team_collections",
                           "healthy_repartitioning",
                           "healthy_removing_server",
                           "healthy_rebalancing",
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 09cb2cfdf3..0b48d7fcf2 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -1204,8 +1204,8 @@ ACTOR static Future<JsonBuilderObject> dataStatusFetcher(std::pair<WorkerInterfa
 			}
 			else if (highestPriority >= PRIORITY_TEAM_REDUNDANT) {
 				stateSectionObj["healthy"] = true;
-				stateSectionObj["name"] = "removing_redundant_teams";
-				stateSectionObj["description"] = "Removing redundant machine teams";
+				stateSectionObj["name"] = "optimizing_team_collections";
+				stateSectionObj["description"] = "Optimizing team collections";
 			}
 			else if (highestPriority >= PRIORITY_MERGE_SHARD) {
 				stateSectionObj["healthy"] = true;