diff --git a/src/main/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportAction.java b/src/main/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportAction.java
index b0deb93d9..c3ef866fd 100644
--- a/src/main/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportAction.java
+++ b/src/main/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportAction.java
@@ -43,7 +43,7 @@
 import static org.opensearch.knn.common.KNNConstants.MODEL_METADATA_FIELD;
 
 /**
- * Transport action used to update metadata of model's on the master node.
+ * Transport action used to update metadata of model's on the cluster manager node.
  */
 public class UpdateModelMetadataTransportAction extends TransportMasterNodeAction<UpdateModelMetadataRequest, AcknowledgedResponse> {
 
@@ -87,7 +87,7 @@ protected void masterOperation(
         ClusterState clusterState,
         ActionListener<AcknowledgedResponse> actionListener
     ) {
-        // Master updates model metadata based on request parameters
+        // ClusterManager updates model metadata based on request parameters
         clusterService.submitStateUpdateTask(
             PLUGIN_NAME,
             new UpdateModelMetaDataTask(request.getModelId(), request.getModelMetadata(), request.isRemoveRequest()),
diff --git a/src/test/java/org/opensearch/knn/indices/ModelDaoTests.java b/src/test/java/org/opensearch/knn/indices/ModelDaoTests.java
index 590df80c8..51f8240f3 100644
--- a/src/test/java/org/opensearch/knn/indices/ModelDaoTests.java
+++ b/src/test/java/org/opensearch/knn/indices/ModelDaoTests.java
@@ -173,7 +173,7 @@ public void testPut_withId() throws InterruptedException, IOException {
         ActionListener<IndexResponse> docCreationListener = ActionListener.wrap(response -> {
             assertEquals(modelId, response.getId());
 
-            // We need to use executor service here so master thread does not block
+            // We need to use executor service here so main thread does not block
             modelGetterExecutor.submit(() -> {
                 try {
                     assertEquals(model, modelDao.get(modelId));
@@ -232,7 +232,7 @@ public void testPut_withoutModel() throws InterruptedException, IOException {
         ActionListener<IndexResponse> docCreationListener = ActionListener.wrap(response -> {
             assertEquals(modelId, response.getId());
 
-            // We need to use executor service here so master thread does not block
+            // We need to use executor service here so main thread does not block
             modelGetterExecutor.submit(() -> {
                 try {
                     assertEquals(model, modelDao.get(modelId));
@@ -327,7 +327,7 @@ public void testUpdate() throws IOException, InterruptedException {
         ActionListener<IndexResponse> docCreationListener = ActionListener.wrap(response -> {
             assertEquals(modelId, response.getId());
 
-            // We need to use executor service here so master thread does not block
+            // We need to use executor service here so main thread does not block
             modelGetterExecutor.submit(() -> {
                 try {
                     assertEquals(model, modelDao.get(modelId));
@@ -363,7 +363,7 @@ public void testUpdate() throws IOException, InterruptedException {
         ActionListener<IndexResponse> updateListener = ActionListener.wrap(response -> {
             assertEquals(modelId, response.getId());
 
-            // We need to use executor service here so master thread does not block
+            // We need to use executor service here so main thread does not block
             modelGetterExecutor.submit(() -> {
                 try {
                     assertEquals(updatedModel, modelDao.get(modelId));
diff --git a/src/test/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportActionTests.java b/src/test/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportActionTests.java
index c98745695..a56c4d2bd 100644
--- a/src/test/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportActionTests.java
+++ b/src/test/java/org/opensearch/knn/plugin/transport/UpdateModelMetadataTransportActionTests.java
@@ -52,7 +52,7 @@ public void testRead() throws IOException {
         assertEquals(acknowledgedResponse, acknowledgedResponse1);
     }
 
-    public void testMasterOperation() throws InterruptedException {
+    public void testClusterManagerOperation() throws InterruptedException {
         // Setup the Model system index
         createIndex(MODEL_INDEX_NAME);