diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
index f410fab8..c314b6be 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
@@ -17,7 +17,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.cluster.service.MasterService;
+import org.opensearch.cluster.service.ClusterManagerService;
 import org.opensearch.cluster.service.SourcePrioritizedRunnable;
 import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
@@ -82,7 +82,9 @@ public void collectMetrics(long startTime) {
         try {
             if (Objects.isNull(OpenSearchResources.INSTANCE.getClusterService())
                     || Objects.isNull(
-                            OpenSearchResources.INSTANCE.getClusterService().getMasterService())) {
+                            OpenSearchResources.INSTANCE
+                                    .getClusterService()
+                                    .getClusterManagerService())) {
                 return;
             }
 
@@ -186,7 +188,8 @@ void generateFinishMetrics(long startTime) {
 
     // - Separated to have a unit test; and catch any code changes around this field
     Field getClusterManagerServiceTPExecutorField() throws NoSuchFieldException {
-        Field threadPoolExecutorField = MasterService.class.getDeclaredField("threadPoolExecutor");
+        Field threadPoolExecutorField =
+                ClusterManagerService.class.getDeclaredField("threadPoolExecutor");
         threadPoolExecutorField.setAccessible(true);
         return threadPoolExecutorField;
     }
@@ -223,8 +226,8 @@ Queue<Runnable> getClusterManagerServiceCurrentQueue()
             throws NoSuchFieldException, IllegalAccessException {
         if (clusterManagerServiceCurrentQueue == null) {
             if (OpenSearchResources.INSTANCE.getClusterService() != null) {
-                MasterService clusterManagerService =
-                        OpenSearchResources.INSTANCE.getClusterService().getMasterService();
+                ClusterManagerService clusterManagerService =
+                        OpenSearchResources.INSTANCE.getClusterService().getClusterManagerService();
 
                 if (clusterManagerService != null) {
                     if (prioritizedOpenSearchThreadPoolExecutor == null) {
@@ -253,8 +256,8 @@ HashSet<Object> getClusterManagerServiceWorkers()
             throws NoSuchFieldException, IllegalAccessException {
         if (clusterManagerServiceWorkers == null) {
             if (OpenSearchResources.INSTANCE.getClusterService() != null) {
-                MasterService clusterManagerService =
-                        OpenSearchResources.INSTANCE.getClusterService().getMasterService();
+                ClusterManagerService clusterManagerService =
+                        OpenSearchResources.INSTANCE.getClusterService().getClusterManagerService();
 
                 if (clusterManagerService != null) {
                     if (prioritizedOpenSearchThreadPoolExecutor == null) {
diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java
index cb29394a..25229d50 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java
@@ -59,7 +59,9 @@ public String getMetricsPath(long startTime, String... keysPath) {
     public void collectMetrics(long startTime) {
         if (Objects.isNull(OpenSearchResources.INSTANCE.getClusterService())
                 || Objects.isNull(
-                        OpenSearchResources.INSTANCE.getClusterService().getMasterService())) {
+                        OpenSearchResources.INSTANCE
+                                .getClusterService()
+                                .getClusterManagerService())) {
             return;
         }
 
@@ -72,7 +74,10 @@ public void collectMetrics(long startTime) {
          *      timeIn_queue: "86ms"
          */
         List<PendingClusterTask> pendingTasks =
-                OpenSearchResources.INSTANCE.getClusterService().getMasterService().pendingTasks();
+                OpenSearchResources.INSTANCE
+                        .getClusterService()
+                        .getClusterManagerService()
+                        .pendingTasks();
         HashMap<String, Integer> pendingTaskCountPerTaskType = new HashMap<>();
 
         pendingTasks.stream()
diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java
index f7d68347..92b4d005 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java
@@ -14,7 +14,7 @@
 import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.cluster.service.MasterService;
+import org.opensearch.cluster.service.ClusterManagerService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.performanceanalyzer.commons.collectors.MetricStatus;
 import org.opensearch.performanceanalyzer.commons.collectors.PerformanceAnalyzerMetricsCollector;
@@ -67,7 +67,9 @@ public void collectMetrics(long startTime) {
         }
         if (Objects.isNull(OpenSearchResources.INSTANCE.getClusterService())
                 || Objects.isNull(
-                        OpenSearchResources.INSTANCE.getClusterService().getMasterService())) {
+                        OpenSearchResources.INSTANCE
+                                .getClusterService()
+                                .getClusterManagerService())) {
             return;
         }
 
@@ -105,7 +107,7 @@ public void collectMetrics(long startTime) {
     private boolean isClusterManagerThrottlingFeatureAvailable() {
         try {
             Class.forName(CLUSTER_MANAGER_THROTTLING_RETRY_LISTENER_PATH);
-            MasterService.class.getMethod(THROTTLED_PENDING_TASK_COUNT_METHOD_NAME);
+            ClusterManagerService.class.getMethod(THROTTLED_PENDING_TASK_COUNT_METHOD_NAME);
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             return false;
         }
@@ -114,9 +116,13 @@ private boolean isClusterManagerThrottlingFeatureAvailable() {
 
     private long getTotalClusterManagerThrottledTaskCount()
             throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        Method method = MasterService.class.getMethod(THROTTLED_PENDING_TASK_COUNT_METHOD_NAME);
+        Method method =
+                ClusterManagerService.class.getMethod(THROTTLED_PENDING_TASK_COUNT_METHOD_NAME);
         return (long)
-                method.invoke(OpenSearchResources.INSTANCE.getClusterService().getMasterService());
+                method.invoke(
+                        OpenSearchResources.INSTANCE
+                                .getClusterService()
+                                .getClusterManagerService());
     }
 
     private long getRetryingPendingTaskCount()
diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java
index f2aa4535..2ba105cf 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java
@@ -89,7 +89,7 @@ public void collectMetrics(long startTime) {
         DiscoveryNodes discoveryNodes =
                 OpenSearchResources.INSTANCE.getClusterService().state().nodes();
 
-        DiscoveryNode clusterManagerNode = discoveryNodes.getMasterNode();
+        DiscoveryNode clusterManagerNode = discoveryNodes.getClusterManagerNode();
 
         Iterator<DiscoveryNode> discoveryNodeIterator = discoveryNodes.iterator();
         addMetricsToStringBuilder(discoveryNodes.getLocalNode(), value, "", clusterManagerNode);
@@ -124,7 +124,7 @@ private String getNodeRole(final DiscoveryNode node) {
         final NodeRole role =
                 node.isDataNode()
                         ? NodeRole.DATA
-                        : node.isMasterNode() ? NodeRole.CLUSTER_MANAGER : NodeRole.UNKNOWN;
+                        : node.isClusterManagerNode() ? NodeRole.CLUSTER_MANAGER : NodeRole.UNKNOWN;
         return role.toString();
     }
 
diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java
index 59167702..f97dd8f1 100644
--- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java
@@ -119,7 +119,7 @@ public void testCollectMetrics() throws Exception {
                                 .get(
                                         OpenSearchResources.INSTANCE
                                                 .getClusterService()
-                                                .getMasterService());
+                                                .getClusterManagerService());
         SourcePrioritizedRunnable runnable =
                 new SourcePrioritizedRunnable(Priority.HIGH, "_add_listener_") {
                     @Override
diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java
index 5ce7d73a..795d9df0 100644
--- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java
@@ -94,7 +94,7 @@ public void testWithMockClusterService() {
         assertNull(jsonStr);
 
         OpenSearchResources.INSTANCE.setClusterService(mockedClusterService);
-        when(mockedClusterService.getMasterService()).thenThrow(new RuntimeException());
+        when(mockedClusterService.getClusterManagerService()).thenThrow(new RuntimeException());
         clusterManagerServiceMetrics.run();
         jsonStr = readMetricsInJsonString(0);
         assertNull(jsonStr);
diff --git a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java
index 3de35bad..1c4101e4 100644
--- a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java
@@ -493,7 +493,7 @@ public void testNodeDetails() throws Exception {
             discoBuilder = discoBuilder.add(node);
         }
 
-        discoBuilder.masterNodeId(nodeId1);
+        discoBuilder.clusterManagerNodeId(nodeId1);
         discoBuilder.localNodeId(nodeId2);
 
         DiscoveryNodes discoveryNodes = discoBuilder.build();