diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/mapping/UpdateMappingIntegrationIT.java
index 8e2872f31abfc..51ff5de34240a 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/mapping/UpdateMappingIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/mapping/UpdateMappingIntegrationIT.java
@@ -386,13 +386,13 @@ private void assertConcreteMappingsOnAll(final String index, final String... fie
                 assertNotNull("field " + fieldName + " doesn't exists on " + node, fieldType);
             }
         }
-        assertMappingOnMaster(index, fieldNames);
+        assertMappingOnClusterManager(index, fieldNames);
     }
 
     /**
      * Waits for the given mapping type to exists on the cluster-manager node.
      */
-    private void assertMappingOnMaster(final String index, final String... fieldNames) {
+    private void assertMappingOnClusterManager(final String index, final String... fieldNames) {
         GetMappingsResponse response = client().admin().indices().prepareGetMappings(index).get();
         MappingMetadata mappings = response.getMappings().get(index);
         assertThat(mappings, notNullValue());
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java
index 6f8659cbf230b..d5f36608941d5 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java
@@ -245,7 +245,7 @@ public void testLongRunningCloneAllowsConcurrentSnapshot() throws Exception {
         createFullSnapshot(repoName, sourceSnapshot);
 
         final String targetSnapshot = "target-snapshot";
-        blockMasterOnShardClone(repoName);
+        blockClusterManagerOnShardClone(repoName);
         final ActionFuture<AcknowledgedResponse> cloneFuture = startClone(repoName, sourceSnapshot, targetSnapshot, indexSlow);
         waitForBlock(clusterManagerNode, repoName, TimeValue.timeValueSeconds(30L));
 
@@ -336,7 +336,7 @@ public void testBackToBackClonesForIndexNotInCluster() throws Exception {
         assertAcked(admin().indices().prepareDelete(indexBlocked).get());
 
         final String targetSnapshot1 = "target-snapshot";
-        blockMasterOnShardClone(repoName);
+        blockClusterManagerOnShardClone(repoName);
         final ActionFuture<AcknowledgedResponse> cloneFuture1 = startClone(repoName, sourceSnapshot, targetSnapshot1, indexBlocked);
         waitForBlock(clusterManagerNode, repoName, TimeValue.timeValueSeconds(30L));
         assertThat(cloneFuture1.isDone(), is(false));
@@ -388,7 +388,7 @@ public void testClusterManagerFailoverDuringCloneStep1() throws Exception {
         final String sourceSnapshot = "source-snapshot";
         createFullSnapshot(repoName, sourceSnapshot);
 
-        blockMasterOnReadIndexMeta(repoName);
+        blockClusterManagerOnReadIndexMeta(repoName);
         final String cloneName = "target-snapshot";
         final ActionFuture<AcknowledgedResponse> cloneFuture = startCloneFromDataNode(repoName, sourceSnapshot, cloneName, testIndex);
         awaitNumberOfSnapshotsInProgress(1);
@@ -444,7 +444,7 @@ public void testClusterManagerFailoverDuringCloneStep2() throws Exception {
         createFullSnapshot(repoName, sourceSnapshot);
 
         final String targetSnapshot = "target-snapshot";
-        blockMasterOnShardClone(repoName);
+        blockClusterManagerOnShardClone(repoName);
         final ActionFuture<AcknowledgedResponse> cloneFuture = startCloneFromDataNode(repoName, sourceSnapshot, targetSnapshot, testIndex);
         awaitNumberOfSnapshotsInProgress(1);
         final String clusterManagerNode = internalCluster().getMasterName();
@@ -642,12 +642,12 @@ private static ActionFuture<AcknowledgedResponse> startClone(
         return client.admin().cluster().prepareCloneSnapshot(repoName, sourceSnapshot, targetSnapshot).setIndices(indices).execute();
     }
 
-    private void blockMasterOnReadIndexMeta(String repoName) {
+    private void blockClusterManagerOnReadIndexMeta(String repoName) {
         ((MockRepository) internalCluster().getCurrentMasterNodeInstance(RepositoriesService.class).repository(repoName))
             .setBlockOnReadIndexMeta();
     }
 
-    private void blockMasterOnShardClone(String repoName) {
+    private void blockClusterManagerOnShardClone(String repoName) {
         ((MockRepository) internalCluster().getCurrentMasterNodeInstance(RepositoriesService.class).repository(repoName))
             .setBlockOnWriteShardLevelMeta();
     }
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
index 0fd46b6b04bc5..d44c145837d49 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
@@ -1417,12 +1417,12 @@ private List<String> createNSnapshots(String repoName, int count) {
         return snapshotNames;
     }
 
-    private ActionFuture<AcknowledgedResponse> startDeleteFromNonMasterClient(String repoName, String snapshotName) {
+    private ActionFuture<AcknowledgedResponse> startDeleteFromNonClusterManagerClient(String repoName, String snapshotName) {
         logger.info("--> deleting snapshot [{}] from repo [{}] from non cluster-manager client", snapshotName, repoName);
         return internalCluster().nonMasterClient().admin().cluster().prepareDeleteSnapshot(repoName, snapshotName).execute();
     }
 
-    private ActionFuture<CreateSnapshotResponse> startFullSnapshotFromNonMasterClient(String repoName, String snapshotName) {
+    private ActionFuture<CreateSnapshotResponse> startFullSnapshotFromNonClusterManagerClient(String repoName, String snapshotName) {
         logger.info("--> creating full snapshot [{}] to repo [{}] from non cluster-manager client", snapshotName, repoName);
         return internalCluster().nonMasterClient()
             .admin()
@@ -1432,7 +1432,7 @@ private ActionFuture<CreateSnapshotResponse> startFullSnapshotFromNonMasterClien
             .execute();
     }
 
-    private ActionFuture<CreateSnapshotResponse> startFullSnapshotFromMasterClient(String repoName, String snapshotName) {
+    private ActionFuture<CreateSnapshotResponse> startFullSnapshotFromClusterManagerClient(String repoName, String snapshotName) {
         logger.info("--> creating full snapshot [{}] to repo [{}] from cluster-manager client", snapshotName, repoName);
         return internalCluster().masterClient()
             .admin()