diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
index 086aeb695c411..6328d96ef3e76 100644
--- a/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
@@ -158,7 +158,7 @@ public void clusterChanged(ClusterChangedEvent event) {
             assertNotNull(sne);
             assertThat(
                 sne.getMessage(),
-                either(endsWith(" Failed to update cluster state during snapshot finalization")).or(endsWith(" no longer master"))
+                either(endsWith(" Failed to update cluster state during snapshot finalization")).or(endsWith(" no longer cluster-manager"))
             );
             assertThat(sne.getSnapshotName(), is(snapshot));
         }
@@ -272,7 +272,7 @@ public void testMasterFailOverDuringShardSnapshots() throws Exception {
             SnapshotException.class,
             () -> snapshotResponse.actionGet(TimeValue.timeValueSeconds(30L))
         );
-        assertThat(sne.getMessage(), endsWith("no longer master"));
+        assertThat(sne.getMessage(), endsWith("no longer cluster-manager"));
     }
 
     private void assertSnapshotExists(String repository, String snapshot) {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
index 6855803ba6c45..98c264e54a1d0 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
@@ -218,11 +218,11 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
                     @Override
                     public void onNoLongerMaster(String source) {
                         logger.trace(
-                            "stopped being master while waiting for events with priority [{}]. retrying.",
+                            "stopped being cluster-manager while waiting for events with priority [{}]. retrying.",
                             request.waitForEvents()
                         );
                         // TransportMasterNodeAction implements the retry logic, which is triggered by passing a NotMasterException
-                        listener.onFailure(new NotMasterException("no longer master. source: [" + source + "]"));
+                        listener.onFailure(new NotMasterException("no longer cluster-manager. source: [" + source + "]"));
                     }
 
                     @Override
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java
index b7b9da675a385..0889fcb079dca 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java
@@ -136,7 +136,7 @@ private static void addClusterStateApplier(ClusterService clusterService) {
                     return;
                 }
                 clusterService.submitStateUpdateTask(
-                    "clean up repository cleanup task after master failover",
+                    "clean up repository cleanup task after cluster-manager failover",
                     new ClusterStateUpdateTask() {
                         @Override
                         public ClusterState execute(ClusterState currentState) {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
index 6d479431e1a94..46cd8b12d4781 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
@@ -159,7 +159,7 @@ private void reroute(final boolean updateSettingsAcked) {
                     // For example the minimum_master_node could have been breached and we're no longer elected master,
                     // so we should *not* execute the reroute.
                     if (!clusterService.state().nodes().isLocalNodeElectedMaster()) {
-                        logger.debug("Skipping reroute after cluster update settings, because node is no longer master");
+                        logger.debug("Skipping reroute after cluster update settings, because node is no longer cluster-manager");
                         listener.onResponse(
                             new ClusterUpdateSettingsResponse(
                                 updateSettingsAcked,
@@ -198,7 +198,7 @@ protected ClusterUpdateSettingsResponse newResponse(boolean acknowledged) {
                             @Override
                             public void onNoLongerMaster(String source) {
                                 logger.debug(
-                                    "failed to preform reroute after cluster settings were updated - current node is no longer a master"
+                                    "failed to preform reroute after cluster settings were updated - current node is no longer a cluster-manager"
                                 );
                                 listener.onResponse(
                                     new ClusterUpdateSettingsResponse(
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java
index 42497c5244167..595127d83d4bf 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java
@@ -138,7 +138,7 @@ public void onNewClusterState(ClusterState newState) {
                         } else {
                             listener.onFailure(
                                 new NotMasterException(
-                                    "master stepped down waiting for metadata version " + request.waitForMetadataVersion()
+                                    "cluster-manager stepped down waiting for metadata version " + request.waitForMetadataVersion()
                                 )
                             );
                         }
diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java
index 62d08c23534af..76babf2ea5d1d 100644
--- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java
+++ b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java
@@ -198,7 +198,7 @@ protected void doStart(ClusterState clusterState) {
                     }
                 } else {
                     if (nodes.getMasterNode() == null) {
-                        logger.debug("no known master node, scheduling a retry");
+                        logger.debug("no known cluster-manager node, scheduling a retry");
                         retryOnMasterChange(clusterState, null);
                     } else {
                         DiscoveryNode masterNode = nodes.getMasterNode();
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java
index 718df33f8a2d2..273286e772e2c 100644
--- a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java
+++ b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java
@@ -47,7 +47,7 @@ public interface ClusterStateTaskListener {
      * Used only for tasks submitted to {@link MasterService}.
      */
     default void onNoLongerMaster(String source) {
-        onFailure(source, new NotMasterException("no longer master. source: [" + source + "]"));
+        onFailure(source, new NotMasterException("no longer cluster-manager. source: [" + source + "]"));
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/action/index/NodeMappingRefreshAction.java b/server/src/main/java/org/opensearch/cluster/action/index/NodeMappingRefreshAction.java
index 23ce218904d21..1412bfe19fb6b 100644
--- a/server/src/main/java/org/opensearch/cluster/action/index/NodeMappingRefreshAction.java
+++ b/server/src/main/java/org/opensearch/cluster/action/index/NodeMappingRefreshAction.java
@@ -76,7 +76,7 @@ public NodeMappingRefreshAction(TransportService transportService, MetadataMappi
 
     public void nodeMappingRefresh(final DiscoveryNode masterNode, final NodeMappingRefreshRequest request) {
         if (masterNode == null) {
-            logger.warn("can't send mapping refresh for [{}], no master known.", request.index());
+            logger.warn("can't send mapping refresh for [{}], no cluster-manager known.", request.index());
             return;
         }
         transportService.sendRequest(masterNode, ACTION_NAME, request, EmptyTransportResponseHandler.INSTANCE_SAME);
diff --git a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
index 300067587b78b..020fd4ff4b166 100644
--- a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
+++ b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
@@ -180,7 +180,7 @@ private void sendShardAction(
         DiscoveryNode masterNode = currentState.nodes().getMasterNode();
         Predicate<ClusterState> changePredicate = MasterNodeChangePredicate.build(currentState);
         if (masterNode == null) {
-            logger.warn("no master known for action [{}] for shard entry [{}]", actionName, request);
+            logger.warn("no cluster-manager known for action [{}] for shard entry [{}]", actionName, request);
             waitForNewMasterAndRetry(actionName, observer, request, listener, changePredicate);
         } else {
             logger.debug("sending [{}] to [{}] for shard entry [{}]", actionName, masterNode.getId(), request);
@@ -305,7 +305,7 @@ protected void waitForNewMasterAndRetry(
             @Override
             public void onNewClusterState(ClusterState state) {
                 if (logger.isTraceEnabled()) {
-                    logger.trace("new cluster state [{}] after waiting for master election for shard entry [{}]", state, request);
+                    logger.trace("new cluster state [{}] after waiting for cluster-manager election for shard entry [{}]", state, request);
                 }
                 sendShardAction(actionName, state, request, listener);
             }
@@ -376,13 +376,13 @@ public void onFailure(String source, Exception e) {
 
                     @Override
                     public void onNoLongerMaster(String source) {
-                        logger.error("{} no longer master while failing shard [{}]", request.shardId, request);
+                        logger.error("{} no longer cluster-manager while failing shard [{}]", request.shardId, request);
                         try {
                             channel.sendResponse(new NotMasterException(source));
                         } catch (Exception channelException) {
                             logger.warn(
                                 () -> new ParameterizedMessage(
-                                    "{} failed to send no longer master while failing shard [{}]",
+                                    "{} failed to send no longer cluster-manager while failing shard [{}]",
                                     request.shardId,
                                     request
                                 ),
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
index 89e5b9b4cfbcc..0349bdedbb0ea 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
@@ -1233,14 +1233,16 @@ public void publish(
                 if (mode != Mode.LEADER || getCurrentTerm() != clusterChangedEvent.state().term()) {
                     logger.debug(
                         () -> new ParameterizedMessage(
-                            "[{}] failed publication as node is no longer master for term {}",
+                            "[{}] failed publication as node is no longer cluster-manager for term {}",
                             clusterChangedEvent.source(),
                             clusterChangedEvent.state().term()
                         )
                     );
                     publishListener.onFailure(
                         new FailedToCommitClusterStateException(
-                            "node is no longer master for term " + clusterChangedEvent.state().term() + " while handling publication"
+                            "node is no longer cluster-manager for term "
+                                + clusterChangedEvent.state().term()
+                                + " while handling publication"
                         )
                     );
                     return;
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java
index 5975e5b64214f..723c70eaf5a4e 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java
@@ -142,19 +142,23 @@ public ClusterTasksResult<JoinTaskExecutor.Task> execute(ClusterState currentSta
                 // Stop processing the current cluster state update, as there's no point in continuing to compute it as
                 // it will later be rejected by Coordinator.publish(...) anyhow
                 if (currentState.term() > term) {
-                    logger.trace("encountered higher term {} than current {}, there is a newer master", currentState.term(), term);
+                    logger.trace("encountered higher term {} than current {}, there is a newer cluster-manager", currentState.term(), term);
                     throw new NotMasterException(
-                        "Higher term encountered (current: " + currentState.term() + " > used: " + term + "), there is a newer master"
+                        "Higher term encountered (current: "
+                            + currentState.term()
+                            + " > used: "
+                            + term
+                            + "), there is a newer cluster-manager"
                     );
                 } else if (currentState.nodes().getMasterNodeId() == null && joiningTasks.stream().anyMatch(Task::isBecomeMasterTask)) {
-                    assert currentState.term() < term : "there should be at most one become master task per election (= by term)";
+                    assert currentState.term() < term : "there should be at most one become cluster-manager task per election (= by term)";
                     final CoordinationMetadata coordinationMetadata = CoordinationMetadata.builder(currentState.coordinationMetadata())
                         .term(term)
                         .build();
                     final Metadata metadata = Metadata.builder(currentState.metadata()).coordinationMetadata(coordinationMetadata).build();
                     currentState = ClusterState.builder(currentState).metadata(metadata).build();
                 } else if (currentState.nodes().isLocalNodeElectedMaster()) {
-                    assert currentState.term() == term : "term should be stable for the same master";
+                    assert currentState.term() == term : "term should be stable for the same cluster-manager";
                 }
                 return super.execute(currentState, joiningTasks);
             }
@@ -297,7 +301,7 @@ void logLastFailedJoinAttempt() {
     }
 
     public void sendJoinRequest(DiscoveryNode destination, long term, Optional<Join> optionalJoin, Runnable onCompletion) {
-        assert destination.isMasterNode() : "trying to join master-ineligible " + destination;
+        assert destination.isMasterNode() : "trying to join cluster-manager-ineligible " + destination;
         final StatusInfo statusInfo = nodeHealthService.getHealth();
         if (statusInfo.getStatus() == UNHEALTHY) {
             logger.debug("dropping join request to [{}]: [{}]", destination, statusInfo.getInfo());
@@ -348,7 +352,7 @@ public String executor() {
     }
 
     public void sendStartJoinRequest(final StartJoinRequest startJoinRequest, final DiscoveryNode destination) {
-        assert startJoinRequest.getSourceNode().isMasterNode() : "sending start-join request for master-ineligible "
+        assert startJoinRequest.getSourceNode().isMasterNode() : "sending start-join request for cluster-manager-ineligible "
             + startJoinRequest.getSourceNode();
         transportService.sendRequest(destination, START_JOIN_ACTION_NAME, startJoinRequest, new TransportResponseHandler<Empty>() {
             @Override
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
index ea5c33b4300a5..7ca07a297e781 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
@@ -129,7 +129,7 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
         if (joiningNodes.size() == 1 && joiningNodes.get(0).isFinishElectionTask()) {
             return results.successes(joiningNodes).build(currentState);
         } else if (currentNodes.getMasterNode() == null && joiningNodes.stream().anyMatch(Task::isBecomeMasterTask)) {
-            assert joiningNodes.stream().anyMatch(Task::isFinishElectionTask) : "becoming a master but election is not finished "
+            assert joiningNodes.stream().anyMatch(Task::isFinishElectionTask) : "becoming a cluster-manager but election is not finished "
                 + joiningNodes;
             // use these joins to try and become the master.
             // Note that we don't have to do any validation of the amount of joining nodes - the commit
@@ -137,8 +137,11 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
             newState = becomeMasterAndTrimConflictingNodes(currentState, joiningNodes);
             nodesChanged = true;
         } else if (currentNodes.isLocalNodeElectedMaster() == false) {
-            logger.trace("processing node joins, but we are not the master. current master: {}", currentNodes.getMasterNode());
-            throw new NotMasterException("Node [" + currentNodes.getLocalNode() + "] not master for join request");
+            logger.trace(
+                "processing node joins, but we are not the cluster-manager. current cluster-manager: {}",
+                currentNodes.getMasterNode()
+            );
+            throw new NotMasterException("Node [" + currentNodes.getLocalNode() + "] not cluster-manager for join request");
         } else {
             newState = ClusterState.builder(currentState);
         }
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java b/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java
index b4edc9401234d..e712d448d1e71 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java
@@ -208,7 +208,7 @@ private void handleLeaderCheck(LeaderCheckRequest request) {
             logger.debug(message);
             throw new NodeHealthCheckFailureException(message);
         } else if (discoveryNodes.isLocalNodeElectedMaster() == false) {
-            logger.debug("rejecting leader check on non-master {}", request);
+            logger.debug("rejecting leader check on non-cluster-manager {}", request);
             throw new CoordinationStateRejectedException(
                 "rejecting leader check from [" + request.getSender() + "] sent to a node that is no longer the master"
             );
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java b/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java
index 8cbb0446a1337..afa3406c7127a 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java
@@ -105,7 +105,9 @@ private static ClusterBlock parseNoMasterBlock(String value) {
             case "metadata_write":
                 return NO_MASTER_BLOCK_METADATA_WRITES;
             default:
-                throw new IllegalArgumentException("invalid no-master block [" + value + "], must be one of [all, write, metadata_write]");
+                throw new IllegalArgumentException(
+                    "invalid no-cluster-manager block [" + value + "], must be one of [all, write, metadata_write]"
+                );
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutor.java
index 02bdb65c7edf2..e8ab2f8d53d3f 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutor.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutor.java
@@ -127,7 +127,7 @@ public void onFailure(final String source, final Exception e) {
 
     @Override
     public void onNoLongerMaster(String source) {
-        logger.debug("no longer master while processing node removal [{}]", source);
+        logger.debug("no longer cluster-manager while processing node removal [{}]", source);
     }
 
 }
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Reconfigurator.java b/server/src/main/java/org/opensearch/cluster/coordination/Reconfigurator.java
index b38b0cf0f4693..ae64deeaeedf2 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/Reconfigurator.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/Reconfigurator.java
@@ -114,7 +114,7 @@ public VotingConfiguration reconfigure(
     ) {
         assert liveNodes.contains(currentMaster) : "liveNodes = " + liveNodes + " master = " + currentMaster;
         logger.trace(
-            "{} reconfiguring {} based on liveNodes={}, retiredNodeIds={}, currentMaster={}",
+            "{} reconfiguring {} based on liveNodes={}, retiredNodeIds={}, currentClusterManager={}",
             this,
             currentConfig,
             liveNodes,
diff --git a/server/src/main/java/org/opensearch/cluster/service/MasterService.java b/server/src/main/java/org/opensearch/cluster/service/MasterService.java
index ad0bc599420f1..99486158f36cf 100644
--- a/server/src/main/java/org/opensearch/cluster/service/MasterService.java
+++ b/server/src/main/java/org/opensearch/cluster/service/MasterService.java
@@ -228,14 +228,14 @@ private static boolean isMasterUpdateThread() {
     }
 
     public static boolean assertMasterUpdateThread() {
-        assert isMasterUpdateThread() : "not called from the master service thread";
+        assert isMasterUpdateThread() : "not called from the cluster-manager service thread";
         return true;
     }
 
     public static boolean assertNotMasterUpdateThread(String reason) {
         assert isMasterUpdateThread() == false : "Expected current thread ["
             + Thread.currentThread()
-            + "] to not be the master service thread. Reason: ["
+            + "] to not be the cluster-manager service thread. Reason: ["
             + reason
             + "]";
         return true;
@@ -244,7 +244,7 @@ assert isMasterUpdateThread() == false : "Expected current thread ["
     private void runTasks(TaskInputs taskInputs) {
         final String summary = taskInputs.summary;
         if (!lifecycle.started()) {
-            logger.debug("processing [{}]: ignoring, master service not started", summary);
+            logger.debug("processing [{}]: ignoring, cluster-manager service not started", summary);
             return;
         }
 
@@ -252,7 +252,7 @@ private void runTasks(TaskInputs taskInputs) {
         final ClusterState previousClusterState = state();
 
         if (!previousClusterState.nodes().isLocalNodeElectedMaster() && taskInputs.runOnlyWhenMaster()) {
-            logger.debug("failing [{}]: local node is no longer master", summary);
+            logger.debug("failing [{}]: local node is no longer cluster-manager", summary);
             taskInputs.onNoLongerMaster();
             return;
         }
@@ -616,7 +616,10 @@ public void onNoLongerMaster(String source) {
                 listener.onNoLongerMaster(source);
             } catch (Exception e) {
                 logger.error(
-                    () -> new ParameterizedMessage("exception thrown by listener while notifying no longer master from [{}]", source),
+                    () -> new ParameterizedMessage(
+                        "exception thrown by listener while notifying no longer cluster-manager from [{}]",
+                        source
+                    ),
                     e
                 );
             }
diff --git a/server/src/main/java/org/opensearch/common/settings/ConsistentSettingsService.java b/server/src/main/java/org/opensearch/common/settings/ConsistentSettingsService.java
index fbb37651198d4..78214536367bc 100644
--- a/server/src/main/java/org/opensearch/common/settings/ConsistentSettingsService.java
+++ b/server/src/main/java/org/opensearch/common/settings/ConsistentSettingsService.java
@@ -283,7 +283,7 @@ public void onFailure(String source, Exception e) {
 
         @Override
         public void offMaster() {
-            logger.trace("I am no longer master, nothing to do");
+            logger.trace("I am no longer cluster-manager, nothing to do");
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/gateway/GatewayService.java b/server/src/main/java/org/opensearch/gateway/GatewayService.java
index 47347cea50e27..512695ed8270f 100644
--- a/server/src/main/java/org/opensearch/gateway/GatewayService.java
+++ b/server/src/main/java/org/opensearch/gateway/GatewayService.java
@@ -216,7 +216,7 @@ public void clusterChanged(final ClusterChangedEvent event) {
 
         final DiscoveryNodes nodes = state.nodes();
         if (state.nodes().getMasterNodeId() == null) {
-            logger.debug("not recovering from gateway, no master elected yet");
+            logger.debug("not recovering from gateway, no cluster-manager elected yet");
         } else if (recoverAfterNodes != -1 && (nodes.getMasterAndDataNodes().size()) < recoverAfterNodes) {
             logger.debug(
                 "not recovering from gateway, nodes_size (data+master) [{}] < recover_after_nodes [{}]",
@@ -333,7 +333,7 @@ public void clusterStateProcessed(final String source, final ClusterState oldSta
 
         @Override
         public void onNoLongerMaster(String source) {
-            logger.debug("stepped down as master before recovering state [{}]", source);
+            logger.debug("stepped down as cluster-manager before recovering state [{}]", source);
             resetRecoveredFlags();
         }
 
diff --git a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java
index 52e858bfdaa92..e0ac26107b91e 100644
--- a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java
+++ b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java
@@ -1179,7 +1179,7 @@ public synchronized void updateFromMaster(
             // check that the master does not fabricate new in-sync entries out of thin air once we are in primary mode
             assert !primaryMode
                 || inSyncAllocationIds.stream().allMatch(inSyncId -> checkpoints.containsKey(inSyncId) && checkpoints.get(inSyncId).inSync)
-                : "update from master in primary mode contains in-sync ids "
+                : "update from cluster-manager in primary mode contains in-sync ids "
                     + inSyncAllocationIds
                     + " that have no matching entries in "
                     + checkpoints;
@@ -1197,7 +1197,7 @@ public synchronized void updateFromMaster(
                 for (String initializingId : initializingAllocationIds) {
                     if (checkpoints.containsKey(initializingId) == false) {
                         final boolean inSync = inSyncAllocationIds.contains(initializingId);
-                        assert inSync == false : "update from master in primary mode has "
+                        assert inSync == false : "update from cluster-manager in primary mode has "
                             + initializingId
                             + " as in-sync but it does not exist locally";
                         final long localCheckpoint = SequenceNumbers.UNASSIGNED_SEQ_NO;
diff --git a/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
index 9463b51ca3792..8761ccba18a76 100644
--- a/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
+++ b/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
@@ -669,7 +669,7 @@ private void updateShard(
             // we managed to tell the master we started), mark us as started
             if (logger.isTraceEnabled()) {
                 logger.trace(
-                    "{} master marked shard as initializing, but shard has state [{}], resending shard started to {}",
+                    "{} cluster-manager marked shard as initializing, but shard has state [{}], resending shard started to {}",
                     shardRouting.shardId(),
                     state,
                     nodes.getMasterNode()
@@ -679,7 +679,7 @@ private void updateShard(
                 shardStateAction.shardStarted(
                     shardRouting,
                     primaryTerm,
-                    "master "
+                    "cluster-manager "
                         + nodes.getMasterNode()
                         + " marked shard as initializing, but shard state is ["
                         + state
diff --git a/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java b/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
index e57246265bb66..51417733ebe61 100644
--- a/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
+++ b/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
@@ -118,7 +118,7 @@ public FsRepository(
         if (location.isEmpty()) {
             logger.warn(
                 "the repository location is missing, it should point to a shared file system location"
-                    + " that is available on all master and data nodes"
+                    + " that is available on all cluster-manager and data nodes"
             );
             throw new RepositoryException(metadata.name(), "missing location");
         }
diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
index ad5cfe6e443ff..c5a30ebe81dcf 100644
--- a/server/src/main/java/org/opensearch/snapshots/RestoreService.java
+++ b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
@@ -954,7 +954,7 @@ public void onFailure(final String source, final Exception e) {
 
         @Override
         public void onNoLongerMaster(String source) {
-            logger.debug("no longer master while processing restore state update [{}]", source);
+            logger.debug("no longer cluster-manager while processing restore state update [{}]", source);
         }
 
     }
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java
index b6c0b63efe3d3..450ee06e9d5cf 100644
--- a/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java
+++ b/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java
@@ -450,8 +450,8 @@ private void syncShardStatsOnNewMaster(ClusterChangedEvent event) {
                             if (stage == Stage.DONE) {
                                 // but we think the shard is done - we need to make new master know that the shard is done
                                 logger.debug(
-                                    "[{}] new master thinks the shard [{}] is not completed but the shard is done locally, "
-                                        + "updating status on the master",
+                                    "[{}] new cluster-manager thinks the shard [{}] is not completed but the shard is done locally, "
+                                        + "updating status on the cluster-manager",
                                     snapshot.snapshot(),
                                     shardId
                                 );
@@ -460,8 +460,8 @@ private void syncShardStatsOnNewMaster(ClusterChangedEvent event) {
                             } else if (stage == Stage.FAILURE) {
                                 // but we think the shard failed - we need to make new master know that the shard failed
                                 logger.debug(
-                                    "[{}] new master thinks the shard [{}] is not completed but the shard failed locally, "
-                                        + "updating status on master",
+                                    "[{}] new cluster-manager thinks the shard [{}] is not completed but the shard failed locally, "
+                                        + "updating status on cluster-manager",
                                     snapshot.snapshot(),
                                     shardId
                                 );
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
index 122c13337fa70..3a736fbb63849 100644
--- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
+++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
@@ -1120,7 +1120,7 @@ public void onNoLongerMaster(String source) {
                             // The new master will take care of it
                             logger.warn("[{}] failed to create snapshot - no longer a master", snapshot.snapshot().getSnapshotId());
                             userCreateSnapshotListener.onFailure(
-                                new SnapshotException(snapshot.snapshot(), "master changed during snapshot initialization")
+                                new SnapshotException(snapshot.snapshot(), "cluster-manager changed during snapshot initialization")
                             );
                         }
 
@@ -1311,7 +1311,7 @@ public void applyClusterState(ClusterChangedEvent event) {
                 // state).
                 for (Snapshot snapshot : new HashSet<>(snapshotCompletionListeners.keySet())) {
                     if (endingSnapshots.add(snapshot)) {
-                        failSnapshotCompletionListeners(snapshot, new SnapshotException(snapshot, "no longer master"));
+                        failSnapshotCompletionListeners(snapshot, new SnapshotException(snapshot, "no longer cluster-manager"));
                     }
                 }
             }
@@ -2082,7 +2082,7 @@ public void onFailure(String source, Exception e) {
 
             @Override
             public void onNoLongerMaster(String source) {
-                failure.addSuppressed(new SnapshotException(snapshot, "no longer master"));
+                failure.addSuppressed(new SnapshotException(snapshot, "no longer cluster-manager"));
                 failSnapshotCompletionListeners(snapshot, failure);
                 failAllListenersOnMasterFailOver(new NotMasterException(source));
                 if (listener != null) {
@@ -2297,7 +2297,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
                     );
                 }, e -> {
                     if (ExceptionsHelper.unwrap(e, NotMasterException.class, FailedToCommitClusterStateException.class) != null) {
-                        logger.warn("master failover before deleted snapshot could complete", e);
+                        logger.warn("cluster-manager failover before deleted snapshot could complete", e);
                         // Just pass the exception to the transport handler as is so it is retried on the new master
                         listener.onFailure(e);
                     } else {
@@ -2776,12 +2776,12 @@ protected void handleListeners(List<ActionListener<Void>> deleteListeners) {
      * @param e exception that caused us to realize we are not master any longer
      */
     private void failAllListenersOnMasterFailOver(Exception e) {
-        logger.debug("Failing all snapshot operation listeners because this node is not master any longer", e);
+        logger.debug("Failing all snapshot operation listeners because this node is not cluster-manager any longer", e);
         synchronized (currentlyFinalizing) {
             if (ExceptionsHelper.unwrap(e, NotMasterException.class, FailedToCommitClusterStateException.class) != null) {
                 repositoryOperations.clear();
                 for (Snapshot snapshot : new HashSet<>(snapshotCompletionListeners.keySet())) {
-                    failSnapshotCompletionListeners(snapshot, new SnapshotException(snapshot, "no longer master"));
+                    failSnapshotCompletionListeners(snapshot, new SnapshotException(snapshot, "no longer cluster-manager"));
                 }
                 final Exception wrapped = new RepositoryException("_all", "Failed to update cluster state during repository operation", e);
                 for (Iterator<List<ActionListener<Void>>> iterator = snapshotDeletionListeners.values().iterator(); iterator.hasNext();) {
diff --git a/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java
index 845a5ee91052d..65527aab3030a 100644
--- a/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java
@@ -167,7 +167,7 @@ public void onFailure(String source, Exception e) {
         });
 
         latch1.await();
-        assertTrue("cluster state update task was executed on a non-master", taskFailed[0]);
+        assertTrue("cluster state update task was executed on a non-cluster-manager", taskFailed[0]);
 
         final CountDownLatch latch2 = new CountDownLatch(1);
         nonMaster.submitStateUpdateTask("test", new LocalClusterUpdateTask() {
@@ -185,7 +185,7 @@ public void onFailure(String source, Exception e) {
             }
         });
         latch2.await();
-        assertFalse("non-master cluster state update task was not executed", taskFailed[0]);
+        assertFalse("non-cluster-manager cluster state update task was not executed", taskFailed[0]);
 
         nonMaster.close();
     }
diff --git a/server/src/test/java/org/opensearch/discovery/PeerFinderTests.java b/server/src/test/java/org/opensearch/discovery/PeerFinderTests.java
index 6558f9d06c2f7..5390bad6dc684 100644
--- a/server/src/test/java/org/opensearch/discovery/PeerFinderTests.java
+++ b/server/src/test/java/org/opensearch/discovery/PeerFinderTests.java
@@ -147,7 +147,7 @@ public void run() {
                                 listener.onResponse(discoveryNode);
                                 return;
                             } else {
-                                listener.onFailure(new OpenSearchException("non-master node " + discoveryNode));
+                                listener.onFailure(new OpenSearchException("non-cluster-manager node " + discoveryNode));
                                 return;
                             }
                         }
diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java
index 6617102c12ffc..c526771dc69a6 100644
--- a/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java
@@ -1343,7 +1343,7 @@ public void onFailure(String source, Exception e) {
 
                         @Override
                         public void onNoLongerMaster(String source) {
-                            logger.trace("no longer master: [{}]", source);
+                            logger.trace("no longer cluster-manager: [{}]", source);
                             taskListener.onNoLongerMaster(source);
                         }
 
diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
index a7c819609c619..8568f0f233bba 100644
--- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
@@ -836,7 +836,7 @@ public Client nonMasterClient() {
         if (randomNodeAndClient != null) {
             return randomNodeAndClient.nodeClient(); // ensure node client non-master is requested
         }
-        throw new AssertionError("No non-master client found");
+        throw new AssertionError("No non-cluster-manager client found");
     }
 
     /**