diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
index 3e059aa98..395359435 100644
--- a/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
+++ b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
@@ -138,7 +138,7 @@ public void runJob(ScheduledJobParameter scheduledJobParameter, JobExecutionCont
         adTaskManager.refreshRealtimeJobRunTime(detectorId);
         if (!(scheduledJobParameter instanceof Job)) {
             throw new IllegalArgumentException(
-                "Job parameter is not instance of AnomalyDetectorJob, type: " + scheduledJobParameter.getClass().getCanonicalName()
+                "Job parameter is not instance of Job, type: " + scheduledJobParameter.getClass().getCanonicalName()
             );
         }
         Job jobParameter = (Job) scheduledJobParameter;
diff --git a/src/main/java/org/opensearch/ad/ratelimit/ResultWriteWorker.java b/src/main/java/org/opensearch/ad/ratelimit/ResultWriteWorker.java
index 6b77157ff..c0ccbcfec 100644
--- a/src/main/java/org/opensearch/ad/ratelimit/ResultWriteWorker.java
+++ b/src/main/java/org/opensearch/ad/ratelimit/ResultWriteWorker.java
@@ -37,8 +37,8 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.threadpool.ThreadPool;
@@ -202,7 +202,7 @@ private Optional<AnomalyResult> getAnomalyResult(DocWriteRequest<?> request) {
             // we send IndexRequest previously
             IndexRequest indexRequest = (IndexRequest) request;
             BytesReference indexSource = indexRequest.source();
-            XContentType indexContentType = indexRequest.getContentType();
+            MediaType indexContentType = indexRequest.getContentType();
             try (
                 XContentParser xContentParser = XContentHelper
                     .createParser(xContentRegistry, LoggingDeprecationHandler.INSTANCE, indexSource, indexContentType)
diff --git a/src/main/java/org/opensearch/timeseries/NodeStateManager.java b/src/main/java/org/opensearch/timeseries/NodeStateManager.java
index ab5bf83ad..bda0039ae 100644
--- a/src/main/java/org/opensearch/timeseries/NodeStateManager.java
+++ b/src/main/java/org/opensearch/timeseries/NodeStateManager.java
@@ -133,7 +133,7 @@ public void maintenance() {
     /**
      * Used in delete workflow
      *
-     * @param configId detector ID
+     * @param configId config ID
      */
     @Override
     public void clear(String configId) {
diff --git a/src/main/java/org/opensearch/timeseries/util/TimeSeriesSafeSecurityInjector.java b/src/main/java/org/opensearch/timeseries/util/TimeSeriesSafeSecurityInjector.java
index fcb07c39a..4bb73b323 100644
--- a/src/main/java/org/opensearch/timeseries/util/TimeSeriesSafeSecurityInjector.java
+++ b/src/main/java/org/opensearch/timeseries/util/TimeSeriesSafeSecurityInjector.java
@@ -57,13 +57,13 @@ public void injectUserRolesFromConfig(ActionListener<Void> injectListener) {
             return;
         }
 
-        ActionListener<Optional<? extends Config>> getDetectorListener = ActionListener.wrap(detectorOp -> {
-            if (!detectorOp.isPresent()) {
+        ActionListener<Optional<? extends Config>> getConfigListener = ActionListener.wrap(configOp -> {
+            if (!configOp.isPresent()) {
                 injectListener.onFailure(new EndRunException(id, "Config is not available.", false));
                 return;
             }
-            Config detector = detectorOp.get();
-            User userInfo = SecurityUtil.getUserFromConfig(detector, settings);
+            Config config = configOp.get();
+            User userInfo = SecurityUtil.getUserFromConfig(config, settings);
             inject(userInfo.getName(), userInfo.getRoles());
             injectListener.onResponse(null);
         }, injectListener::onFailure);
@@ -71,7 +71,7 @@ public void injectUserRolesFromConfig(ActionListener<Void> injectListener) {
         // Since we are gonna read user from config, make sure the config exists and fetched from disk or cached memory
         // We don't accept a passed-in Config because the caller might mistakenly not insert any user info in the
         // constructed Config and thus poses risks. In the case, if the user is null, we will give admin role.
-        nodeStateManager.getConfig(id, context, getDetectorListener);
+        nodeStateManager.getConfig(id, context, getConfigListener);
     }
 
     public void injectUserRoles(User user) {
diff --git a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
index 167e896c3..8b47f7135 100644
--- a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
+++ b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
@@ -262,7 +262,7 @@ public void tearDown() throws Exception {
     @Test
     public void testRunJobWithWrongParameterType() {
         expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("Job parameter is not instance of AnomalyDetectorJob, type: ");
+        expectedEx.expectMessage("Job parameter is not instance of Job, type: ");
 
         ScheduledJobParameter parameter = mock(ScheduledJobParameter.class);
         when(jobParameter.getLockDurationSeconds()).thenReturn(null);
diff --git a/src/test/java/org/opensearch/ad/ODFERestTestCase.java b/src/test/java/org/opensearch/ad/ODFERestTestCase.java
index e7b69e388..5ee0fec98 100644
--- a/src/test/java/org/opensearch/ad/ODFERestTestCase.java
+++ b/src/test/java/org/opensearch/ad/ODFERestTestCase.java
@@ -59,10 +59,10 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.commons.rest.SecureRestClientBuilder;
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
@@ -156,7 +156,7 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
     @After
     protected void wipeAllODFEIndices() throws IOException {
         Response response = adminClient().performRequest(new Request("GET", "/_cat/indices?format=json&expand_wildcards=all"));
-        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType());
+        MediaType xContentType = MediaType.fromMediaType(response.getEntity().getContentType());
         try (
             XContentParser parser = xContentType
                 .xContent()