diff --git a/build.gradle b/build.gradle
index 00a55677a..21c9c3cee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -656,6 +656,8 @@ List<String> jacocoExclusions = [
 
         // Class containing just constants. Don't need to test
         'org.opensearch.ad.constant.*',
+        'org.opensearch.forecast.constant.*',
+        'org.opensearch.timeseries.constant.*',
 
         //'org.opensearch.ad.common.exception.AnomalyDetectionException',
         'org.opensearch.ad.util.ClientUtil',
diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
index 2dc3ca031..d5f3bbb40 100644
--- a/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
+++ b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
@@ -62,6 +62,7 @@
 import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
 import org.opensearch.jobscheduler.spi.utils.LockService;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.base.Throwables;
 
@@ -514,7 +515,7 @@ private void stopAdJobForEndRunException(
     }
 
     private void stopAdJob(String detectorId, AnomalyDetectorFunction function) {
-        GetRequest getRequest = new GetRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
         ActionListener<GetResponse> listener = ActionListener.wrap(response -> {
             if (response.isExists()) {
                 try (
@@ -537,7 +538,7 @@ private void stopAdJob(String detectorId, AnomalyDetectorFunction function) {
                             job.getUser(),
                             job.getResultIndex()
                         );
-                        IndexRequest indexRequest = new IndexRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
+                        IndexRequest indexRequest = new IndexRequest(CommonName.JOB_INDEX)
                             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
                             .source(newJob.toXContent(XContentBuilder.builder(XContentType.JSON.xContent()), XCONTENT_WITH_TYPE))
                             .id(detectorId);
diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java b/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java
index 0548c2e82..90a68339c 100644
--- a/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java
+++ b/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java
@@ -42,7 +42,7 @@
 import org.opensearch.ad.cluster.ADDataMigrator;
 import org.opensearch.ad.cluster.ClusterManagerEventListener;
 import org.opensearch.ad.cluster.HashRing;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.dataprocessor.IntegerSensitiveSingleFeatureLinearUniformInterpolator;
 import org.opensearch.ad.dataprocessor.Interpolator;
 import org.opensearch.ad.dataprocessor.LinearUniformInterpolator;
@@ -85,7 +85,6 @@
 import org.opensearch.ad.settings.NumericSetting;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.ad.stats.suppliers.IndexStatusSupplier;
 import org.opensearch.ad.stats.suppliers.ModelsOnNodeCountSupplier;
@@ -195,6 +194,8 @@
 import org.opensearch.threadpool.ExecutorBuilder;
 import org.opensearch.threadpool.ScalingExecutorBuilder;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.watcher.ResourceWatcherService;
 
 import com.amazon.randomcutforest.parkservices.state.ThresholdedRandomCutForestMapper;
@@ -429,7 +430,7 @@ public PooledObject<LinkedBuffer> wrap(LinkedBuffer obj) {
         CheckpointDao checkpoint = new CheckpointDao(
             client,
             clientUtil,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             gson,
             mapper,
             converter,
@@ -454,7 +455,7 @@ public PooledObject<LinkedBuffer> wrap(LinkedBuffer obj) {
         CheckPointMaintainRequestAdapter adapter = new CheckPointMaintainRequestAdapter(
             cacheProvider,
             checkpoint,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             AnomalyDetectorSettings.CHECKPOINT_SAVING_FREQ,
             getClock(),
             clusterService,
@@ -477,7 +478,7 @@ public PooledObject<LinkedBuffer> wrap(LinkedBuffer obj) {
             AnomalyDetectorSettings.MAINTENANCE_FREQ_CONSTANT,
             AnomalyDetectorSettings.QUEUE_MAINTENANCE,
             checkpoint,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE,
             stateManager,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE
@@ -625,23 +626,23 @@ public PooledObject<LinkedBuffer> wrap(LinkedBuffer obj) {
             )
             .put(
                 StatNames.ANOMALY_DETECTORS_INDEX_STATUS.getName(),
-                new ADStat<>(true, new IndexStatusSupplier(indexUtils, AnomalyDetector.ANOMALY_DETECTORS_INDEX))
+                new ADStat<>(true, new IndexStatusSupplier(indexUtils, CommonName.CONFIG_INDEX))
             )
             .put(
                 StatNames.ANOMALY_RESULTS_INDEX_STATUS.getName(),
-                new ADStat<>(true, new IndexStatusSupplier(indexUtils, CommonName.ANOMALY_RESULT_INDEX_ALIAS))
+                new ADStat<>(true, new IndexStatusSupplier(indexUtils, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS))
             )
             .put(
                 StatNames.MODELS_CHECKPOINT_INDEX_STATUS.getName(),
-                new ADStat<>(true, new IndexStatusSupplier(indexUtils, CommonName.CHECKPOINT_INDEX_NAME))
+                new ADStat<>(true, new IndexStatusSupplier(indexUtils, ADCommonName.CHECKPOINT_INDEX_NAME))
             )
             .put(
                 StatNames.ANOMALY_DETECTION_JOB_INDEX_STATUS.getName(),
-                new ADStat<>(true, new IndexStatusSupplier(indexUtils, AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX))
+                new ADStat<>(true, new IndexStatusSupplier(indexUtils, CommonName.JOB_INDEX))
             )
             .put(
                 StatNames.ANOMALY_DETECTION_STATE_STATUS.getName(),
-                new ADStat<>(true, new IndexStatusSupplier(indexUtils, CommonName.DETECTION_STATE_INDEX))
+                new ADStat<>(true, new IndexStatusSupplier(indexUtils, ADCommonName.DETECTION_STATE_INDEX))
             )
             .put(StatNames.DETECTOR_COUNT.getName(), new ADStat<>(true, new SettableSupplier()))
             .put(StatNames.SINGLE_ENTITY_DETECTOR_COUNT.getName(), new ADStat<>(true, new SettableSupplier()))
@@ -752,7 +753,7 @@ public PooledObject<LinkedBuffer> wrap(LinkedBuffer obj) {
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             this.clientUtil,
             this.indexUtils,
@@ -1010,7 +1011,7 @@ public String getJobType() {
 
     @Override
     public String getJobIndex() {
-        return AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
+        return CommonName.JOB_INDEX;
     }
 
     @Override
diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java
index 3104a545a..397666cff 100644
--- a/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java
+++ b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java
@@ -13,8 +13,6 @@
 
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_FIND_DETECTOR_MSG;
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_PARSE_DETECTOR_MSG;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.opensearch.rest.RestStatus.BAD_REQUEST;
 import static org.opensearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
@@ -35,8 +33,8 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.common.exception.NotSerializedADExceptionName;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.ADTaskType;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -74,6 +72,7 @@
 import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.InternalCardinality;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 public class AnomalyDetectorProfileRunner extends AbstractProfileRunner {
@@ -121,7 +120,7 @@ private void calculateTotalResponsesToWait(
         Set<DetectorProfileName> profilesToCollect,
         ActionListener<DetectorProfile> listener
     ) {
-        GetRequest getDetectorRequest = new GetRequest(ANOMALY_DETECTORS_INDEX, detectorId);
+        GetRequest getDetectorRequest = new GetRequest(CommonName.CONFIG_INDEX, detectorId);
         client.get(getDetectorRequest, ActionListener.wrap(getDetectorResponse -> {
             if (getDetectorResponse != null && getDetectorResponse.isExists()) {
                 try (
@@ -151,7 +150,7 @@ private void prepareProfile(
         Set<DetectorProfileName> profilesToCollect
     ) {
         String detectorId = detector.getDetectorId();
-        GetRequest getRequest = new GetRequest(ANOMALY_DETECTOR_JOB_INDEX, detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.JOB_INDEX, detectorId);
         client.get(getRequest, ActionListener.wrap(getResponse -> {
             if (getResponse != null && getResponse.isExists()) {
                 try (
@@ -292,14 +291,14 @@ private void profileEntityStats(MultiResponsesDelegateActionListener<DetectorPro
             if (categoryField.size() == 1) {
                 // Run a cardinality aggregation to count the cardinality of single category fields
                 SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-                CardinalityAggregationBuilder aggBuilder = new CardinalityAggregationBuilder(CommonName.TOTAL_ENTITIES);
+                CardinalityAggregationBuilder aggBuilder = new CardinalityAggregationBuilder(ADCommonName.TOTAL_ENTITIES);
                 aggBuilder.field(categoryField.get(0));
                 searchSourceBuilder.aggregation(aggBuilder);
 
                 SearchRequest request = new SearchRequest(detector.getIndices().toArray(new String[0]), searchSourceBuilder);
                 final ActionListener<SearchResponse> searchResponseListener = ActionListener.wrap(searchResponse -> {
                     Map<String, Aggregation> aggMap = searchResponse.getAggregations().asMap();
-                    InternalCardinality totalEntities = (InternalCardinality) aggMap.get(CommonName.TOTAL_ENTITIES);
+                    InternalCardinality totalEntities = (InternalCardinality) aggMap.get(ADCommonName.TOTAL_ENTITIES);
                     long value = totalEntities.getValue();
                     DetectorProfile.Builder profileBuilder = new DetectorProfile.Builder();
                     DetectorProfile profile = profileBuilder.totalEntities(value).build();
@@ -322,7 +321,7 @@ private void profileEntityStats(MultiResponsesDelegateActionListener<DetectorPro
                 // Run a composite query and count the number of buckets to decide cardinality of multiple category fields
                 AggregationBuilder bucketAggs = AggregationBuilders
                     .composite(
-                        CommonName.TOTAL_ENTITIES,
+                        ADCommonName.TOTAL_ENTITIES,
                         detector.getCategoryField().stream().map(f -> new TermsValuesSourceBuilder(f).field(f)).collect(Collectors.toList())
                     )
                     .size(maxTotalEntitiesToTrack);
@@ -344,7 +343,7 @@ private void profileEntityStats(MultiResponsesDelegateActionListener<DetectorPro
                         return;
                     }
 
-                    Aggregation aggrResult = aggs.get(CommonName.TOTAL_ENTITIES);
+                    Aggregation aggrResult = aggs.get(ADCommonName.TOTAL_ENTITIES);
                     if (aggrResult == null) {
                         listener.onFailure(new IllegalArgumentException("Fail to find valid aggregation result"));
                         return;
@@ -558,7 +557,7 @@ private ActionListener<RCFPollingResponse> onPollRCFUpdates(
                     NotSerializedADExceptionName.RESOURCE_NOT_FOUND_EXCEPTION_NAME_UNDERSCORE.getName()
                 )
                 || (ExceptionUtil.isIndexNotAvailable(causeException)
-                    && causeException.getMessage().contains(CommonName.CHECKPOINT_INDEX_NAME))) {
+                    && causeException.getMessage().contains(ADCommonName.CHECKPOINT_INDEX_NAME))) {
                 // cannot find checkpoint
                 // We don't want to show the estimated time remaining to initialize
                 // a detector before cold start finishes, where the actual
diff --git a/src/main/java/org/opensearch/ad/EntityProfileRunner.java b/src/main/java/org/opensearch/ad/EntityProfileRunner.java
index 4bbc2746c..45557eb98 100644
--- a/src/main/java/org/opensearch/ad/EntityProfileRunner.java
+++ b/src/main/java/org/opensearch/ad/EntityProfileRunner.java
@@ -11,8 +11,6 @@
 
 package org.opensearch.ad;
 
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.util.List;
@@ -27,8 +25,8 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.model.AnomalyResult;
@@ -58,6 +56,7 @@
 import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.search.aggregations.AggregationBuilders;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class EntityProfileRunner extends AbstractProfileRunner {
     private final Logger logger = LogManager.getLogger(EntityProfileRunner.class);
@@ -94,7 +93,7 @@ public void profile(
             listener.onFailure(new IllegalArgumentException(CommonErrorMessages.EMPTY_PROFILES_COLLECT));
             return;
         }
-        GetRequest getDetectorRequest = new GetRequest(ANOMALY_DETECTORS_INDEX, detectorId);
+        GetRequest getDetectorRequest = new GetRequest(CommonName.CONFIG_INDEX, detectorId);
 
         client.get(getDetectorRequest, ActionListener.wrap(getResponse -> {
             if (getResponse != null && getResponse.isExists()) {
@@ -220,7 +219,7 @@ private void getJob(
         EntityProfileResponse entityProfileResponse,
         ActionListener<EntityProfile> listener
     ) {
-        GetRequest getRequest = new GetRequest(ANOMALY_DETECTOR_JOB_INDEX, detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.JOB_INDEX, detectorId);
         client.get(getRequest, ActionListener.wrap(getResponse -> {
             if (getResponse != null && getResponse.isExists()) {
                 try (
@@ -457,15 +456,15 @@ private SearchRequest createLastSampleTimeRequest(String detectorId, long enable
 
         boolQueryBuilder.filter(QueryBuilders.termQuery(AnomalyResult.DETECTOR_ID_FIELD, detectorId));
 
-        boolQueryBuilder.filter(QueryBuilders.rangeQuery(AnomalyResult.EXECUTION_END_TIME_FIELD).gte(enabledTime));
+        boolQueryBuilder.filter(QueryBuilders.rangeQuery(CommonName.EXECUTION_END_TIME_FIELD).gte(enabledTime));
 
         SearchSourceBuilder source = new SearchSourceBuilder()
             .query(boolQueryBuilder)
-            .aggregation(AggregationBuilders.max(CommonName.AGG_NAME_MAX_TIME).field(AnomalyResult.EXECUTION_END_TIME_FIELD))
+            .aggregation(AggregationBuilders.max(ADCommonName.AGG_NAME_MAX_TIME).field(CommonName.EXECUTION_END_TIME_FIELD))
             .trackTotalHits(false)
             .size(0);
 
-        SearchRequest request = new SearchRequest(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        SearchRequest request = new SearchRequest(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         request.source(source);
         if (resultIndex != null) {
             request.indices(resultIndex);
diff --git a/src/main/java/org/opensearch/ad/NodeStateManager.java b/src/main/java/org/opensearch/ad/NodeStateManager.java
index f6e24b0da..930529496 100644
--- a/src/main/java/org/opensearch/ad/NodeStateManager.java
+++ b/src/main/java/org/opensearch/ad/NodeStateManager.java
@@ -31,8 +31,8 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.ad.common.exception.EndRunException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.ml.SingleStreamModelIdMapper;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -48,6 +48,7 @@
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * NodeStateManager is used to manage states shared by transport and ml components
@@ -130,7 +131,7 @@ public void getAnomalyDetector(String adID, ActionListener<Optional<AnomalyDetec
         if (state != null && state.getDetectorDef() != null) {
             listener.onResponse(Optional.of(state.getDetectorDef()));
         } else {
-            GetRequest request = new GetRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX, adID);
+            GetRequest request = new GetRequest(CommonName.CONFIG_INDEX, adID);
             clientUtil.<GetRequest, GetResponse>asyncRequest(request, client::get, onGetDetectorResponse(adID, listener));
         }
     }
@@ -182,7 +183,7 @@ public void getDetectorCheckpoint(String adID, ActionListener<Boolean> listener)
             return;
         }
 
-        GetRequest request = new GetRequest(CommonName.CHECKPOINT_INDEX_NAME, SingleStreamModelIdMapper.getRcfModelId(adID, 0));
+        GetRequest request = new GetRequest(ADCommonName.CHECKPOINT_INDEX_NAME, SingleStreamModelIdMapper.getRcfModelId(adID, 0));
 
         clientUtil.<GetRequest, GetResponse>asyncRequest(request, client::get, onGetCheckpointResponse(adID, listener));
     }
@@ -375,7 +376,7 @@ public void getAnomalyDetectorJob(String adID, ActionListener<Optional<AnomalyDe
         if (state != null && state.getDetectorJob() != null) {
             listener.onResponse(Optional.of(state.getDetectorJob()));
         } else {
-            GetRequest request = new GetRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, adID);
+            GetRequest request = new GetRequest(CommonName.JOB_INDEX, adID);
             clientUtil.<GetRequest, GetResponse>asyncRequest(request, client::get, onGetDetectorJobResponse(adID, listener));
         }
     }
diff --git a/src/main/java/org/opensearch/ad/ProfileUtil.java b/src/main/java/org/opensearch/ad/ProfileUtil.java
index b2fc0dbea..835f99219 100644
--- a/src/main/java/org/opensearch/ad/ProfileUtil.java
+++ b/src/main/java/org/opensearch/ad/ProfileUtil.java
@@ -14,7 +14,7 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.client.Client;
@@ -22,6 +22,7 @@
 import org.opensearch.index.query.ExistsQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class ProfileUtil {
     /**
@@ -35,7 +36,7 @@ public class ProfileUtil {
     private static SearchRequest createRealtimeInittedEverRequest(String detectorId, long enabledTime, String resultIndex) {
         BoolQueryBuilder filterQuery = new BoolQueryBuilder();
         filterQuery.filter(QueryBuilders.termQuery(AnomalyResult.DETECTOR_ID_FIELD, detectorId));
-        filterQuery.filter(QueryBuilders.rangeQuery(AnomalyResult.EXECUTION_END_TIME_FIELD).gte(enabledTime));
+        filterQuery.filter(QueryBuilders.rangeQuery(CommonName.EXECUTION_END_TIME_FIELD).gte(enabledTime));
         filterQuery.filter(QueryBuilders.rangeQuery(AnomalyResult.ANOMALY_SCORE_FIELD).gt(0));
         // Historical analysis result also stored in result index, which has non-null task_id.
         // For realtime detection result, we should filter task_id == null
@@ -44,7 +45,7 @@ private static SearchRequest createRealtimeInittedEverRequest(String detectorId,
 
         SearchSourceBuilder source = new SearchSourceBuilder().query(filterQuery).size(1);
 
-        SearchRequest request = new SearchRequest(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        SearchRequest request = new SearchRequest(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         request.source(source);
         if (resultIndex != null) {
             request.indices(resultIndex);
diff --git a/src/main/java/org/opensearch/ad/cluster/ADDataMigrator.java b/src/main/java/org/opensearch/ad/cluster/ADDataMigrator.java
index 383dcd298..2c1c0bd1a 100644
--- a/src/main/java/org/opensearch/ad/cluster/ADDataMigrator.java
+++ b/src/main/java/org/opensearch/ad/cluster/ADDataMigrator.java
@@ -11,13 +11,11 @@
 
 package org.opensearch.ad.cluster;
 
-import static org.opensearch.ad.constant.CommonName.DETECTION_STATE_INDEX;
+import static org.opensearch.ad.constant.ADCommonName.DETECTION_STATE_INDEX;
 import static org.opensearch.ad.model.ADTask.DETECTOR_ID_FIELD;
 import static org.opensearch.ad.model.ADTask.IS_LATEST_FIELD;
 import static org.opensearch.ad.model.ADTask.TASK_TYPE_FIELD;
 import static org.opensearch.ad.model.ADTaskType.taskTypeToString;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_DETECTOR_UPPER_LIMIT;
 import static org.opensearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE;
 import static org.opensearch.ad.util.RestHandlerUtils.createXContentParserFromRegistry;
@@ -39,7 +37,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.ADTaskState;
@@ -61,6 +59,7 @@
 import org.opensearch.index.query.TermsQueryBuilder;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Migrate AD data to support backward compatibility.
@@ -106,10 +105,10 @@ public void migrateData() {
                 // If detection index doesn't exist, create index and backfill realtime task.
                 detectionIndices.initDetectionStateIndex(ActionListener.wrap(r -> {
                     if (r.isAcknowledged()) {
-                        logger.info("Created {} with mappings.", CommonName.DETECTION_STATE_INDEX);
+                        logger.info("Created {} with mappings.", ADCommonName.DETECTION_STATE_INDEX);
                         migrateDetectorInternalStateToRealtimeTask();
                     } else {
-                        String error = "Create index " + CommonName.DETECTION_STATE_INDEX + " with mappings not acknowledged";
+                        String error = "Create index " + ADCommonName.DETECTION_STATE_INDEX + " with mappings not acknowledged";
                         logger.warn(error);
                     }
                 }, e -> {
@@ -132,7 +131,7 @@ public void migrateDetectorInternalStateToRealtimeTask() {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder()
             .query(new MatchAllQueryBuilder())
             .size(MAX_DETECTOR_UPPER_LIMIT);
-        SearchRequest searchRequest = new SearchRequest(ANOMALY_DETECTOR_JOB_INDEX).source(searchSourceBuilder);
+        SearchRequest searchRequest = new SearchRequest(CommonName.JOB_INDEX).source(searchSourceBuilder);
         client.search(searchRequest, ActionListener.wrap(r -> {
             if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) {
                 logger.info("No anomaly detector job found, no need to migrate");
@@ -240,7 +239,7 @@ private void createRealtimeADTask(
         ConcurrentLinkedQueue<AnomalyDetectorJob> detectorJobs,
         boolean migrateAll
     ) {
-        client.get(new GetRequest(ANOMALY_DETECTORS_INDEX, job.getName()), ActionListener.wrap(r -> {
+        client.get(new GetRequest(CommonName.CONFIG_INDEX, job.getName()), ActionListener.wrap(r -> {
             if (r != null && r.isExists()) {
                 try (XContentParser parser = createXContentParserFromRegistry(xContentRegistry, r.getSourceAsBytesRef())) {
                     ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
diff --git a/src/main/java/org/opensearch/ad/cluster/ADVersionUtil.java b/src/main/java/org/opensearch/ad/cluster/ADVersionUtil.java
index e5ace3310..463057991 100644
--- a/src/main/java/org/opensearch/ad/cluster/ADVersionUtil.java
+++ b/src/main/java/org/opensearch/ad/cluster/ADVersionUtil.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.cluster;
 
-import static org.opensearch.ad.constant.CommonName.AD_PLUGIN_VERSION_FOR_TEST;
+import static org.opensearch.ad.constant.ADCommonName.AD_PLUGIN_VERSION_FOR_TEST;
 
 import org.opensearch.Version;
 
diff --git a/src/main/java/org/opensearch/ad/cluster/DailyCron.java b/src/main/java/org/opensearch/ad/cluster/DailyCron.java
index 889cb0a42..e2b2b8808 100644
--- a/src/main/java/org/opensearch/ad/cluster/DailyCron.java
+++ b/src/main/java/org/opensearch/ad/cluster/DailyCron.java
@@ -18,13 +18,13 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.ad.constant.CommonName;
-import org.opensearch.ad.ml.CheckpointDao;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.util.ClientUtil;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.reindex.DeleteByQueryAction;
 import org.opensearch.index.reindex.DeleteByQueryRequest;
+import org.opensearch.timeseries.constant.CommonName;
 
 @Deprecated
 public class DailyCron implements Runnable {
@@ -46,15 +46,15 @@ public DailyCron(Clock clock, Duration checkpointTtl, ClientUtil clientUtil) {
 
     @Override
     public void run() {
-        DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(CommonName.CHECKPOINT_INDEX_NAME)
+        DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(ADCommonName.CHECKPOINT_INDEX_NAME)
             .setQuery(
                 QueryBuilders
                     .boolQuery()
                     .filter(
                         QueryBuilders
-                            .rangeQuery(CheckpointDao.TIMESTAMP)
+                            .rangeQuery(CommonName.TIMESTAMP)
                             .lte(clock.millis() - checkpointTtl.toMillis())
-                            .format(CommonName.EPOCH_MILLIS_FORMAT)
+                            .format(ADCommonName.EPOCH_MILLIS_FORMAT)
                     )
             )
             .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN);
diff --git a/src/main/java/org/opensearch/ad/cluster/HashRing.java b/src/main/java/org/opensearch/ad/cluster/HashRing.java
index 121338e87..22f301c6c 100644
--- a/src/main/java/org/opensearch/ad/cluster/HashRing.java
+++ b/src/main/java/org/opensearch/ad/cluster/HashRing.java
@@ -11,8 +11,8 @@
 
 package org.opensearch.ad.cluster;
 
-import static org.opensearch.ad.constant.CommonName.AD_PLUGIN_NAME;
-import static org.opensearch.ad.constant.CommonName.AD_PLUGIN_NAME_FOR_TEST;
+import static org.opensearch.ad.constant.ADCommonName.AD_PLUGIN_NAME;
+import static org.opensearch.ad.constant.ADCommonName.AD_PLUGIN_NAME_FOR_TEST;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES;
 
 import java.time.Clock;
diff --git a/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java b/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java
index 33d49d80b..c966c7b78 100644
--- a/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java
+++ b/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java
@@ -17,10 +17,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionListener;
-import org.opensearch.ad.constant.CommonName;
-import org.opensearch.ad.ml.CheckpointDao;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Model checkpoints cleanup of multi-entity detectors.
@@ -57,14 +57,14 @@ public ModelCheckpointIndexRetention(Duration defaultCheckpointTtl, Clock clock,
     public void run() {
         indexCleanup
             .deleteDocsByQuery(
-                CommonName.CHECKPOINT_INDEX_NAME,
+                ADCommonName.CHECKPOINT_INDEX_NAME,
                 QueryBuilders
                     .boolQuery()
                     .filter(
                         QueryBuilders
-                            .rangeQuery(CheckpointDao.TIMESTAMP)
+                            .rangeQuery(CommonName.TIMESTAMP)
                             .lte(clock.millis() - defaultCheckpointTtl.toMillis())
-                            .format(CommonName.EPOCH_MILLIS_FORMAT)
+                            .format(ADCommonName.EPOCH_MILLIS_FORMAT)
                     ),
                 ActionListener
                     .wrap(
@@ -79,15 +79,15 @@ public void run() {
     private void cleanupBasedOnShardSize(Duration cleanUpTtl) {
         indexCleanup
             .deleteDocsBasedOnShardSize(
-                CommonName.CHECKPOINT_INDEX_NAME,
+                ADCommonName.CHECKPOINT_INDEX_NAME,
                 MAX_SHARD_SIZE_IN_BYTE,
                 QueryBuilders
                     .boolQuery()
                     .filter(
                         QueryBuilders
-                            .rangeQuery(CheckpointDao.TIMESTAMP)
+                            .rangeQuery(CommonName.TIMESTAMP)
                             .lte(clock.millis() - cleanUpTtl.toMillis())
-                            .format(CommonName.EPOCH_MILLIS_FORMAT)
+                            .format(ADCommonName.EPOCH_MILLIS_FORMAT)
                     ),
                 ActionListener.wrap(cleanupNeeded -> {
                     if (cleanupNeeded) {
diff --git a/src/main/java/org/opensearch/ad/constant/CommonName.java b/src/main/java/org/opensearch/ad/constant/ADCommonName.java
similarity index 81%
rename from src/main/java/org/opensearch/ad/constant/CommonName.java
rename to src/main/java/org/opensearch/ad/constant/ADCommonName.java
index 5475b5ce3..ea004141e 100644
--- a/src/main/java/org/opensearch/ad/constant/CommonName.java
+++ b/src/main/java/org/opensearch/ad/constant/ADCommonName.java
@@ -11,9 +11,9 @@
 
 package org.opensearch.ad.constant;
 
-import org.opensearch.ad.stats.StatNames;
+import org.opensearch.timeseries.stats.StatNames;
 
-public class CommonName {
+public class ADCommonName {
     // ======================================
     // Index name
     // ======================================
@@ -21,7 +21,6 @@ public class CommonName {
     public static final String CHECKPOINT_INDEX_NAME = ".opendistro-anomaly-checkpoints";
     // index name for anomaly detection state. Will store AD task in this index as well.
     public static final String DETECTION_STATE_INDEX = ".opendistro-anomaly-detection-state";
-    // TODO: move other index name here
 
     // The alias of the index in which to write AD result history
     public static final String ANOMALY_RESULT_INDEX_ALIAS = ".opendistro-anomaly-results";
@@ -63,9 +62,7 @@ public class CommonName {
     public static final String MODELS = "models";
     public static final String MODEL = "model";
     public static final String INIT_PROGRESS = "init_progress";
-    public static final String MODEL_SIZE_IN_BYTES = "model_size_in_bytes";
     public static final String CATEGORICAL_FIELD = "category_field";
-
     public static final String TOTAL_ENTITIES = "total_entities";
     public static final String ACTIVE_ENTITIES = "active_entities";
     public static final String ENTITY_INFO = "entity_info";
@@ -79,21 +76,6 @@ public class CommonName {
     public static final String AD_TASK_REMOTE = "ad_task_remote";
     public static final String CANCEL_TASK = "cancel_task";
 
-    // ======================================
-    // Index mapping
-    // ======================================
-    // Elastic mapping type
-    public static final String MAPPING_TYPE = "_doc";
-
-    // Used to fetch mapping
-    public static final String TYPE = "type";
-    public static final String KEYWORD_TYPE = "keyword";
-    public static final String IP_TYPE = "ip";
-    public static final String DATE_TYPE = "date";
-
-    // used for updating mapping
-    public static final String SCHEMA_VERSION_FIELD = "schema_version";
-
     // ======================================
     // Query
     // ======================================
@@ -107,11 +89,9 @@ public class CommonName {
     public static final String FEATURE_AGGS = "feature_aggs";
 
     // ======================================
-    // Used in almost all components
+    // Used in stats API
     // ======================================
-    public static final String MODEL_ID_KEY = "model_id";
     public static final String DETECTOR_ID_KEY = "detector_id";
-    public static final String ENTITY_KEY = "entity";
 
     // ======================================
     // Used in toXContent
@@ -122,11 +102,6 @@ public class CommonName {
     public static final String CONFIDENCE_JSON_KEY = "confidence";
     public static final String ANOMALY_GRADE_JSON_KEY = "anomalyGrade";
     public static final String QUEUE_JSON_KEY = "queue";
-    public static final String START_JSON_KEY = "start";
-    public static final String END_JSON_KEY = "end";
-    public static final String VALUE_JSON_KEY = "value";
-    public static final String ENTITIES_JSON_KEY = "entities";
-
     // ======================================
     // Used for backward-compatibility in messaging
     // ======================================
@@ -136,13 +111,10 @@ public class CommonName {
     // ======================================
     // detector validation aspect
     public static final String DETECTOR_ASPECT = "detector";
-    public static final String MODEL_ASPECT = "model";
-
     // ======================================
     // Used for custom AD result index
     // ======================================
     public static final String DUMMY_AD_RESULT_ID = "dummy_ad_result_id";
     public static final String DUMMY_DETECTOR_ID = "dummy_detector_id";
     public static final String CUSTOM_RESULT_INDEX_PREFIX = "opensearch-ad-plugin-result-";
-    public static final String PROPERTIES = "properties";
 }
diff --git a/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java b/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java
index 5870a1278..64ae8dfe7 100644
--- a/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java
+++ b/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.constant;
 
-import static org.opensearch.ad.constant.CommonName.CUSTOM_RESULT_INDEX_PREFIX;
+import static org.opensearch.ad.constant.ADCommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.model.AnomalyDetector.MAX_RESULT_INDEX_NAME_SIZE;
 import static org.opensearch.ad.rest.handler.AbstractAnomalyDetectorActionHandler.MAX_DETECTOR_NAME_SIZE;
 
diff --git a/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java b/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java
index 922226107..cdbab8c3b 100644
--- a/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java
+++ b/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java
@@ -12,7 +12,7 @@
 package org.opensearch.ad.feature;
 
 import static org.apache.commons.math3.linear.MatrixUtils.createRealMatrix;
-import static org.opensearch.ad.constant.CommonName.DATE_HISTOGRAM;
+import static org.opensearch.ad.constant.ADCommonName.DATE_HISTOGRAM;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_ENTITIES_FOR_PREVIEW;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.PAGE_SIZE;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.PREVIEW_TIMEOUT_IN_MILLIS;
@@ -41,7 +41,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.dataprocessor.Interpolator;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.Entity;
@@ -169,7 +169,7 @@ public SearchFeatureDao(
      */
     public void getLatestDataTime(AnomalyDetector detector, ActionListener<Optional<Long>> listener) {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder()
-            .aggregation(AggregationBuilders.max(CommonName.AGG_NAME_MAX_TIME).field(detector.getTimeField()))
+            .aggregation(AggregationBuilders.max(ADCommonName.AGG_NAME_MAX_TIME).field(detector.getTimeField()))
             .size(0);
         SearchRequest searchRequest = new SearchRequest().indices(detector.getIndices().toArray(new String[0])).source(searchSourceBuilder);
         final ActionListener<SearchResponse> searchResponseListener = ActionListener
diff --git a/src/main/java/org/opensearch/ad/indices/ADIndex.java b/src/main/java/org/opensearch/ad/indices/ADIndex.java
index ea16c38a6..c936947b0 100644
--- a/src/main/java/org/opensearch/ad/indices/ADIndex.java
+++ b/src/main/java/org/opensearch/ad/indices/ADIndex.java
@@ -13,10 +13,9 @@
 
 import java.util.function.Supplier;
 
-import org.opensearch.ad.constant.CommonName;
-import org.opensearch.ad.model.AnomalyDetector;
-import org.opensearch.ad.model.AnomalyDetectorJob;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.util.ThrowingSupplierWrapper;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Represent an AD index
@@ -26,27 +25,27 @@ public enum ADIndex {
 
     // throw RuntimeException since we don't know how to handle the case when the mapping reading throws IOException
     RESULT(
-        CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+        ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
         true,
         ThrowingSupplierWrapper.throwingSupplierWrapper(AnomalyDetectionIndices::getAnomalyResultMappings)
     ),
     CONFIG(
-        AnomalyDetector.ANOMALY_DETECTORS_INDEX,
+        CommonName.CONFIG_INDEX,
         false,
         ThrowingSupplierWrapper.throwingSupplierWrapper(AnomalyDetectionIndices::getAnomalyDetectorMappings)
     ),
     JOB(
-        AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+        CommonName.JOB_INDEX,
         false,
         ThrowingSupplierWrapper.throwingSupplierWrapper(AnomalyDetectionIndices::getAnomalyDetectorJobMappings)
     ),
     CHECKPOINT(
-        CommonName.CHECKPOINT_INDEX_NAME,
+        ADCommonName.CHECKPOINT_INDEX_NAME,
         false,
         ThrowingSupplierWrapper.throwingSupplierWrapper(AnomalyDetectionIndices::getCheckpointMappings)
     ),
     STATE(
-        CommonName.DETECTION_STATE_INDEX,
+        ADCommonName.DETECTION_STATE_INDEX,
         false,
         ThrowingSupplierWrapper.throwingSupplierWrapper(AnomalyDetectionIndices::getDetectionStateMappings)
     );
diff --git a/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java b/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java
index acd14a092..2dc451a66 100644
--- a/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java
+++ b/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java
@@ -11,8 +11,8 @@
 
 package org.opensearch.ad.indices;
 
+import static org.opensearch.ad.constant.ADCommonName.DUMMY_AD_RESULT_ID;
 import static org.opensearch.ad.constant.CommonErrorMessages.CAN_NOT_FIND_RESULT_INDEX;
-import static org.opensearch.ad.constant.CommonName.DUMMY_AD_RESULT_ID;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_MAX_DOCS_PER_SHARD;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_RETENTION_PERIOD;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_ROLLOVER_PERIOD;
@@ -60,11 +60,9 @@
 import org.opensearch.action.support.GroupedActionListener;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.ad.common.exception.EndRunException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.constant.CommonValue;
-import org.opensearch.ad.model.AnomalyDetector;
-import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.rest.handler.AnomalyDetectorFunction;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
@@ -90,6 +88,7 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
@@ -300,7 +299,7 @@ public static String getCheckpointMappings() throws IOException {
      * @return true if anomaly detector index exists
      */
     public boolean doesAnomalyDetectorIndexExist() {
-        return clusterService.state().getRoutingTable().hasIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        return clusterService.state().getRoutingTable().hasIndex(CommonName.CONFIG_INDEX);
     }
 
     /**
@@ -309,7 +308,7 @@ public boolean doesAnomalyDetectorIndexExist() {
      * @return true if anomaly detector job index exists
      */
     public boolean doesAnomalyDetectorJobIndexExist() {
-        return clusterService.state().getRoutingTable().hasIndex(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX);
+        return clusterService.state().getRoutingTable().hasIndex(CommonName.JOB_INDEX);
     }
 
     /**
@@ -318,7 +317,7 @@ public boolean doesAnomalyDetectorJobIndexExist() {
      * @return true if anomaly result index exists
      */
     public boolean doesDefaultAnomalyResultIndexExist() {
-        return clusterService.state().metadata().hasAlias(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        return clusterService.state().metadata().hasAlias(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
     }
 
     public boolean doesIndexExist(String indexName) {
@@ -468,7 +467,7 @@ public boolean isValidResultIndexMapping(String resultIndex) {
      * @return true if anomaly state index exists
      */
     public boolean doesDetectorStateIndexExist() {
-        return clusterService.state().getRoutingTable().hasIndex(CommonName.DETECTION_STATE_INDEX);
+        return clusterService.state().getRoutingTable().hasIndex(ADCommonName.DETECTION_STATE_INDEX);
     }
 
     /**
@@ -477,7 +476,7 @@ public boolean doesDetectorStateIndexExist() {
      * @return true if checkpoint index exists
      */
     public boolean doesCheckpointIndexExist() {
-        return clusterService.state().getRoutingTable().hasIndex(CommonName.CHECKPOINT_INDEX_NAME);
+        return clusterService.state().getRoutingTable().hasIndex(ADCommonName.CHECKPOINT_INDEX_NAME);
     }
 
     /**
@@ -532,7 +531,7 @@ public void initAnomalyDetectorIndexIfAbsent(ActionListener<CreateIndexResponse>
      * @throws IOException IOException from {@link AnomalyDetectionIndices#getAnomalyDetectorMappings}
      */
     public void initAnomalyDetectorIndex(ActionListener<CreateIndexResponse> actionListener) throws IOException {
-        CreateIndexRequest request = new CreateIndexRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX)
+        CreateIndexRequest request = new CreateIndexRequest(CommonName.CONFIG_INDEX)
             .mapping(getAnomalyDetectorMappings(), XContentType.JSON)
             .settings(settings);
         adminClient.indices().create(request, markMappingUpToDate(ADIndex.CONFIG, actionListener));
@@ -582,7 +581,7 @@ private int getNumberOfPrimaryShards() {
      * @throws IOException IOException from {@link AnomalyDetectionIndices#getAnomalyResultMappings}
      */
     public void initDefaultAnomalyResultIndexDirectly(ActionListener<CreateIndexResponse> actionListener) throws IOException {
-        initAnomalyResultIndexDirectly(AD_RESULT_HISTORY_INDEX_PATTERN, CommonName.ANOMALY_RESULT_INDEX_ALIAS, true, actionListener);
+        initAnomalyResultIndexDirectly(AD_RESULT_HISTORY_INDEX_PATTERN, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, true, actionListener);
     }
 
     public void initCustomAnomalyResultIndexDirectly(String resultIndex, ActionListener<CreateIndexResponse> actionListener)
@@ -599,7 +598,7 @@ public void initAnomalyResultIndexDirectly(
         String mapping = getAnomalyResultMappings();
         CreateIndexRequest request = new CreateIndexRequest(resultIndex).mapping(mapping, XContentType.JSON);
         if (alias != null) {
-            request.alias(new Alias(CommonName.ANOMALY_RESULT_INDEX_ALIAS));
+            request.alias(new Alias(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS));
         }
         choosePrimaryShards(request, hiddenIndex);
         if (AD_RESULT_HISTORY_INDEX_PATTERN.equals(resultIndex)) {
@@ -616,7 +615,7 @@ public void initAnomalyResultIndexDirectly(
      */
     public void initAnomalyDetectorJobIndex(ActionListener<CreateIndexResponse> actionListener) {
         try {
-            CreateIndexRequest request = new CreateIndexRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
+            CreateIndexRequest request = new CreateIndexRequest(CommonName.JOB_INDEX)
                 .mapping(getAnomalyDetectorJobMappings(), XContentType.JSON);
             request
                 .settings(
@@ -648,7 +647,7 @@ public void initAnomalyDetectorJobIndex(ActionListener<CreateIndexResponse> acti
      */
     public void initDetectionStateIndex(ActionListener<CreateIndexResponse> actionListener) {
         try {
-            CreateIndexRequest request = new CreateIndexRequest(CommonName.DETECTION_STATE_INDEX)
+            CreateIndexRequest request = new CreateIndexRequest(ADCommonName.DETECTION_STATE_INDEX)
                 .mapping(getDetectionStateMappings(), XContentType.JSON)
                 .settings(settings);
             adminClient.indices().create(request, markMappingUpToDate(ADIndex.STATE, actionListener));
@@ -671,7 +670,7 @@ public void initCheckpointIndex(ActionListener<CreateIndexResponse> actionListen
         } catch (IOException e) {
             throw new EndRunException("", "Cannot find checkpoint mapping file", true);
         }
-        CreateIndexRequest request = new CreateIndexRequest(CommonName.CHECKPOINT_INDEX_NAME).mapping(mapping, XContentType.JSON);
+        CreateIndexRequest request = new CreateIndexRequest(ADCommonName.CHECKPOINT_INDEX_NAME).mapping(mapping, XContentType.JSON);
         choosePrimaryShards(request);
         adminClient.indices().create(request, markMappingUpToDate(ADIndex.CHECKPOINT, actionListener));
     }
@@ -718,7 +717,7 @@ void rolloverAndDeleteHistoryIndex() {
         }
 
         // We have to pass null for newIndexName in order to get Elastic to increment the index count.
-        RolloverRequest rollOverRequest = new RolloverRequest(CommonName.ANOMALY_RESULT_INDEX_ALIAS, null);
+        RolloverRequest rollOverRequest = new RolloverRequest(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, null);
         String adResultMapping = null;
         try {
             adResultMapping = getAnomalyResultMappings();
@@ -736,11 +735,15 @@ void rolloverAndDeleteHistoryIndex() {
         adminClient.indices().rolloverIndex(rollOverRequest, ActionListener.wrap(response -> {
             if (!response.isRolledOver()) {
                 logger
-                    .warn("{} not rolled over. Conditions were: {}", CommonName.ANOMALY_RESULT_INDEX_ALIAS, response.getConditionStatus());
+                    .warn(
+                        "{} not rolled over. Conditions were: {}",
+                        ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
+                        response.getConditionStatus()
+                    );
             } else {
                 IndexState indexStatetate = indexStates.computeIfAbsent(ADIndex.RESULT, IndexState::new);
                 indexStatetate.mappingUpToDate = true;
-                logger.info("{} rolled over. Conditions were: {}", CommonName.ANOMALY_RESULT_INDEX_ALIAS, response.getConditionStatus());
+                logger.info("{} rolled over. Conditions were: {}", ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, response.getConditionStatus());
                 deleteOldHistoryIndices();
             }
         }, exception -> { logger.error("Fail to roll over result index", exception); }));
diff --git a/src/main/java/org/opensearch/ad/ml/CheckpointDao.java b/src/main/java/org/opensearch/ad/ml/CheckpointDao.java
index 4ea4b70c9..0ef166fb9 100644
--- a/src/main/java/org/opensearch/ad/ml/CheckpointDao.java
+++ b/src/main/java/org/opensearch/ad/ml/CheckpointDao.java
@@ -56,7 +56,7 @@
 import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.ADIndex;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.Entity;
@@ -68,6 +68,7 @@
 import org.opensearch.index.reindex.DeleteByQueryAction;
 import org.opensearch.index.reindex.DeleteByQueryRequest;
 import org.opensearch.index.reindex.ScrollableHitSource;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.amazon.randomcutforest.RandomCutForest;
 import com.amazon.randomcutforest.config.Precision;
@@ -98,16 +99,10 @@ public class CheckpointDao {
     static final String INDEX_DELETED_LOG_MSG = "Checkpoint index has been deleted.  Has nothing to do:";
     static final String NOT_ABLE_TO_DELETE_LOG_MSG = "Cannot delete all checkpoints of detector";
 
-    // ======================================
-    // Model serialization/deserialization
-    // ======================================
-    public static final String ENTITY_SAMPLE = "sp";
     public static final String ENTITY_RCF = "rcf";
     public static final String ENTITY_THRESHOLD = "th";
     public static final String ENTITY_TRCF = "trcf";
-    public static final String FIELD_MODEL = "model";
     public static final String FIELD_MODELV2 = "modelV2";
-    public static final String TIMESTAMP = "timestamp";
     public static final String DETECTOR_ID = "detectorId";
 
     // dependencies
@@ -217,7 +212,7 @@ public void putTRCFCheckpoint(String modelId, ThresholdedRandomCutForest forest,
         String modelCheckpoint = toCheckpoint(forest);
         if (modelCheckpoint != null) {
             source.put(FIELD_MODELV2, modelCheckpoint);
-            source.put(TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
+            source.put(CommonName.TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
             putModelCheckpoint(modelId, source, listener);
         } else {
             listener.onFailure(new RuntimeException("Fail to create checkpoint to save"));
@@ -234,8 +229,8 @@ public void putTRCFCheckpoint(String modelId, ThresholdedRandomCutForest forest,
     public void putThresholdCheckpoint(String modelId, ThresholdingModel threshold, ActionListener<Void> listener) {
         String modelCheckpoint = AccessController.doPrivileged((PrivilegedAction<String>) () -> gson.toJson(threshold));
         Map<String, Object> source = new HashMap<>();
-        source.put(FIELD_MODEL, modelCheckpoint);
-        source.put(TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
+        source.put(CommonName.FIELD_MODEL, modelCheckpoint);
+        source.put(CommonName.TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
         putModelCheckpoint(modelId, source, listener);
     }
 
@@ -314,7 +309,7 @@ public Map<String, Object> toIndexSource(ModelState<EntityModel> modelState) thr
         source.put(DETECTOR_ID, detectorId);
         // we cannot pass Optional as OpenSearch does not know how to serialize an Optional value
         source.put(FIELD_MODELV2, serializedModel.get());
-        source.put(TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
+        source.put(CommonName.TIMESTAMP, ZonedDateTime.now(ZoneOffset.UTC));
         source.put(CommonName.SCHEMA_VERSION_FIELD, indexUtil.getSchemaVersion(ADIndex.CHECKPOINT));
         Optional<Entity> entity = model.getEntity();
         if (entity.isPresent()) {
@@ -339,7 +334,7 @@ public Optional<String> toCheckpoint(EntityModel model, String modelId) {
             try {
                 JsonObject json = new JsonObject();
                 if (model.getSamples() != null && !(model.getSamples().isEmpty())) {
-                    json.add(ENTITY_SAMPLE, gson.toJsonTree(model.getSamples()));
+                    json.add(CommonName.ENTITY_SAMPLE, gson.toJsonTree(model.getSamples()));
                 }
                 if (model.getTrcf().isPresent()) {
                     json.addProperty(ENTITY_TRCF, toCheckpoint(model.getTrcf().get()));
@@ -439,7 +434,7 @@ public void deleteModelCheckpointByDetectorId(String detectorID) {
         // with exponential back off. If the maximum retry limit is reached, processing
         // halts and all failed requests are returned in the response. Any delete
         // requests that completed successfully still stick, they are not rolled back.
-        DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(CommonName.CHECKPOINT_INDEX_NAME)
+        DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(ADCommonName.CHECKPOINT_INDEX_NAME)
             .setQuery(new MatchQueryBuilder(DETECTOR_ID, detectorID))
             .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN)
             .setAbortOnVersionConflict(false) // when current delete happens, previous might not finish.
@@ -495,7 +490,7 @@ public Optional<Entry<EntityModel, Instant>> fromEntityModelCheckpoint(Map<Strin
                 Object modelObj = checkpoint.get(FIELD_MODELV2);
                 if (modelObj == null) {
                     // in case there is old -format checkpoint
-                    modelObj = checkpoint.get(FIELD_MODEL);
+                    modelObj = checkpoint.get(CommonName.FIELD_MODEL);
                 }
                 if (modelObj == null) {
                     logger.warn(new ParameterizedMessage("Empty model for [{}]", modelId));
@@ -508,10 +503,10 @@ public Optional<Entry<EntityModel, Instant>> fromEntityModelCheckpoint(Map<Strin
                 }
                 JsonObject json = parser.parse(model).getAsJsonObject();
                 ArrayDeque<double[]> samples = null;
-                if (json.has(ENTITY_SAMPLE)) {
+                if (json.has(CommonName.ENTITY_SAMPLE)) {
                     // verified, don't need privileged call to get permission
                     samples = new ArrayDeque<>(
-                        Arrays.asList(this.gson.fromJson(json.getAsJsonArray(ENTITY_SAMPLE), new double[0][0].getClass()))
+                        Arrays.asList(this.gson.fromJson(json.getAsJsonArray(CommonName.ENTITY_SAMPLE), new double[0][0].getClass()))
                     );
                 } else {
                     // avoid possible null pointer exception
@@ -545,7 +540,7 @@ public Optional<Entry<EntityModel, Instant>> fromEntityModelCheckpoint(Map<Strin
                     }
                 }
 
-                String lastCheckpointTimeString = (String) (checkpoint.get(TIMESTAMP));
+                String lastCheckpointTimeString = (String) (checkpoint.get(CommonName.TIMESTAMP));
                 Instant timestamp = Instant.parse(lastCheckpointTimeString);
                 Entity entity = null;
                 Object serializedEntity = checkpoint.get(CommonName.ENTITY_KEY);
@@ -612,7 +607,7 @@ private void deserializeTRCFModel(
                 if (model != null) {
                     listener.onResponse(Optional.ofNullable(toTrcf((String) model)));
                 } else {
-                    Object modelV1 = response.getSource().get(FIELD_MODEL);
+                    Object modelV1 = response.getSource().get(CommonName.FIELD_MODEL);
                     Optional<RandomCutForest> forest = deserializeRCFModel((String) modelV1, rcfModelId);
                     if (!forest.isPresent()) {
                         logger.error("Unexpected error when deserializing [{}]", rcfModelId);
@@ -732,7 +727,7 @@ private Optional<Object> processThresholdModelCheckpoint(GetResponse response) {
             .ofNullable(response)
             .filter(GetResponse::isExists)
             .map(GetResponse::getSource)
-            .map(source -> source.get(FIELD_MODEL));
+            .map(source -> source.get(CommonName.FIELD_MODEL));
     }
 
     private Optional<Map<String, Object>> processRawCheckpoint(GetResponse response) {
diff --git a/src/main/java/org/opensearch/ad/ml/ModelState.java b/src/main/java/org/opensearch/ad/ml/ModelState.java
index 430e06bd1..ce9411147 100644
--- a/src/main/java/org/opensearch/ad/ml/ModelState.java
+++ b/src/main/java/org/opensearch/ad/ml/ModelState.java
@@ -18,7 +18,8 @@
 import java.util.Map;
 
 import org.opensearch.ad.ExpiringState;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * A ML model and states such as usage.
@@ -179,8 +180,8 @@ public void setPriority(float priority) {
     public Map<String, Object> getModelStateAsMap() {
         return new HashMap<String, Object>() {
             {
-                put(CommonName.MODEL_ID_KEY, modelId);
-                put(CommonName.DETECTOR_ID_KEY, detectorId);
+                put(CommonName.MODEL_ID_FIELD, modelId);
+                put(ADCommonName.DETECTOR_ID_KEY, detectorId);
                 put(MODEL_TYPE_KEY, modelType);
                 /* A stats API broadcasts requests to all nodes and renders node responses using toXContent.
                  *
diff --git a/src/main/java/org/opensearch/ad/model/AnomalyDetector.java b/src/main/java/org/opensearch/ad/model/AnomalyDetector.java
index a7176134d..c6f3df06a 100644
--- a/src/main/java/org/opensearch/ad/model/AnomalyDetector.java
+++ b/src/main/java/org/opensearch/ad/model/AnomalyDetector.java
@@ -11,10 +11,10 @@
 
 package org.opensearch.ad.model;
 
+import static org.opensearch.ad.constant.ADCommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_CHAR_IN_RESULT_INDEX_NAME;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_RESULT_INDEX_NAME_SIZE;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_RESULT_INDEX_PREFIX;
-import static org.opensearch.ad.constant.CommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.model.AnomalyDetectorType.MULTI_ENTITY;
 import static org.opensearch.ad.model.AnomalyDetectorType.SINGLE_ENTITY;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE;
@@ -34,7 +34,6 @@
 import org.opensearch.ad.annotation.Generated;
 import org.opensearch.ad.common.exception.ADValidationException;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.constant.CommonValue;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.settings.NumericSetting;
@@ -54,6 +53,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
@@ -73,7 +73,6 @@ public class AnomalyDetector implements Writeable, ToXContentObject {
         it -> parse(it)
     );
     public static final String NO_ID = "";
-    public static final String ANOMALY_DETECTORS_INDEX = ".opendistro-anomaly-detectors";
     public static final String TYPE = "_doc";
     public static final String QUERY_PARAM_PERIOD_START = "period_start";
     public static final String QUERY_PARAM_PERIOD_END = "period_end";
diff --git a/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java b/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java
index 1a0ee8cd6..4ad6b2fa9 100644
--- a/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java
+++ b/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java
@@ -51,7 +51,6 @@ enum ScheduleType {
         it -> parse(it)
     );
 
-    public static final String ANOMALY_DETECTOR_JOB_INDEX = ".opendistro-anomaly-detector-jobs";
     public static final String NAME_FIELD = "name";
     public static final String LAST_UPDATE_TIME_FIELD = "last_update_time";
     public static final String LOCK_DURATION_SECONDS = "lock_duration_seconds";
diff --git a/src/main/java/org/opensearch/ad/model/AnomalyResult.java b/src/main/java/org/opensearch/ad/model/AnomalyResult.java
index 86baedf58..8eea5b394 100644
--- a/src/main/java/org/opensearch/ad/model/AnomalyResult.java
+++ b/src/main/java/org/opensearch/ad/model/AnomalyResult.java
@@ -11,8 +11,7 @@
 
 package org.opensearch.ad.model;
 
-import static org.opensearch.ad.constant.CommonName.DUMMY_DETECTOR_ID;
-import static org.opensearch.ad.constant.CommonName.SCHEMA_VERSION_FIELD;
+import static org.opensearch.ad.constant.ADCommonName.DUMMY_DETECTOR_ID;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.io.IOException;
@@ -38,6 +37,7 @@
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.base.Objects;
 
@@ -56,17 +56,7 @@ public class AnomalyResult implements ToXContentObject, Writeable {
     public static final String DETECTOR_ID_FIELD = "detector_id";
     public static final String ANOMALY_SCORE_FIELD = "anomaly_score";
     public static final String ANOMALY_GRADE_FIELD = "anomaly_grade";
-    public static final String CONFIDENCE_FIELD = "confidence";
-    public static final String FEATURE_DATA_FIELD = "feature_data";
-    public static final String DATA_START_TIME_FIELD = "data_start_time";
-    public static final String DATA_END_TIME_FIELD = "data_end_time";
-    public static final String EXECUTION_START_TIME_FIELD = "execution_start_time";
-    public static final String EXECUTION_END_TIME_FIELD = "execution_end_time";
-    public static final String ERROR_FIELD = "error";
-    public static final String ENTITY_FIELD = "entity";
-    public static final String USER_FIELD = "user";
     public static final String TASK_ID_FIELD = "task_id";
-    public static final String MODEL_ID_FIELD = "model_id";
     public static final String APPROX_ANOMALY_START_FIELD = "approx_anomaly_start_time";
     public static final String RELEVANT_ATTRIBUTION_FIELD = "relevant_attribution";
     public static final String PAST_VALUES_FIELD = "past_values";
@@ -518,28 +508,28 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         XContentBuilder xContentBuilder = builder
             .startObject()
             .field(DETECTOR_ID_FIELD, detectorId)
-            .field(SCHEMA_VERSION_FIELD, schemaVersion);
+            .field(CommonName.SCHEMA_VERSION_FIELD, schemaVersion);
         // In normal AD result, we always pass data start/end times. In custom result index,
         // we need to write/delete a dummy AD result to verify if user has write permission
         // to the custom result index. Just pass in null start/end time for this dummy anomaly
         // result to make sure it won't be queried by mistake.
         if (dataStartTime != null) {
-            xContentBuilder.field(DATA_START_TIME_FIELD, dataStartTime.toEpochMilli());
+            xContentBuilder.field(CommonName.DATA_START_TIME_FIELD, dataStartTime.toEpochMilli());
         }
         if (dataEndTime != null) {
-            xContentBuilder.field(DATA_END_TIME_FIELD, dataEndTime.toEpochMilli());
+            xContentBuilder.field(CommonName.DATA_END_TIME_FIELD, dataEndTime.toEpochMilli());
         }
         if (featureData != null) {
             // can be null during preview
-            xContentBuilder.field(FEATURE_DATA_FIELD, featureData.toArray());
+            xContentBuilder.field(CommonName.FEATURE_DATA_FIELD, featureData.toArray());
         }
         if (executionStartTime != null) {
             // can be null during preview
-            xContentBuilder.field(EXECUTION_START_TIME_FIELD, executionStartTime.toEpochMilli());
+            xContentBuilder.field(CommonName.EXECUTION_START_TIME_FIELD, executionStartTime.toEpochMilli());
         }
         if (executionEndTime != null) {
             // can be null during preview
-            xContentBuilder.field(EXECUTION_END_TIME_FIELD, executionEndTime.toEpochMilli());
+            xContentBuilder.field(CommonName.EXECUTION_END_TIME_FIELD, executionEndTime.toEpochMilli());
         }
         if (anomalyScore != null && !anomalyScore.isNaN()) {
             xContentBuilder.field(ANOMALY_SCORE_FIELD, anomalyScore);
@@ -548,22 +538,22 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             xContentBuilder.field(ANOMALY_GRADE_FIELD, anomalyGrade);
         }
         if (confidence != null && !confidence.isNaN()) {
-            xContentBuilder.field(CONFIDENCE_FIELD, confidence);
+            xContentBuilder.field(CommonName.CONFIDENCE_FIELD, confidence);
         }
         if (error != null) {
-            xContentBuilder.field(ERROR_FIELD, error);
+            xContentBuilder.field(CommonName.ERROR_FIELD, error);
         }
         if (entity != null) {
-            xContentBuilder.field(ENTITY_FIELD, entity);
+            xContentBuilder.field(CommonName.ENTITY_FIELD, entity);
         }
         if (user != null) {
-            xContentBuilder.field(USER_FIELD, user);
+            xContentBuilder.field(CommonName.USER_FIELD, user);
         }
         if (taskId != null) {
             xContentBuilder.field(TASK_ID_FIELD, taskId);
         }
         if (modelId != null) {
-            xContentBuilder.field(MODEL_ID_FIELD, modelId);
+            xContentBuilder.field(CommonName.MODEL_ID_FIELD, modelId);
         }
 
         // output extra fields such as attribution and expected only when this is an anomaly
@@ -626,43 +616,43 @@ public static AnomalyResult parse(XContentParser parser) throws IOException {
                 case ANOMALY_GRADE_FIELD:
                     anomalyGrade = parser.doubleValue();
                     break;
-                case CONFIDENCE_FIELD:
+                case CommonName.CONFIDENCE_FIELD:
                     confidence = parser.doubleValue();
                     break;
-                case FEATURE_DATA_FIELD:
+                case CommonName.FEATURE_DATA_FIELD:
                     ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser);
                     while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
                         featureData.add(FeatureData.parse(parser));
                     }
                     break;
-                case DATA_START_TIME_FIELD:
+                case CommonName.DATA_START_TIME_FIELD:
                     dataStartTime = ParseUtils.toInstant(parser);
                     break;
-                case DATA_END_TIME_FIELD:
+                case CommonName.DATA_END_TIME_FIELD:
                     dataEndTime = ParseUtils.toInstant(parser);
                     break;
-                case EXECUTION_START_TIME_FIELD:
+                case CommonName.EXECUTION_START_TIME_FIELD:
                     executionStartTime = ParseUtils.toInstant(parser);
                     break;
-                case EXECUTION_END_TIME_FIELD:
+                case CommonName.EXECUTION_END_TIME_FIELD:
                     executionEndTime = ParseUtils.toInstant(parser);
                     break;
-                case ERROR_FIELD:
+                case CommonName.ERROR_FIELD:
                     error = parser.text();
                     break;
-                case ENTITY_FIELD:
+                case CommonName.ENTITY_FIELD:
                     entity = Entity.parse(parser);
                     break;
-                case USER_FIELD:
+                case CommonName.USER_FIELD:
                     user = User.parse(parser);
                     break;
-                case SCHEMA_VERSION_FIELD:
+                case CommonName.SCHEMA_VERSION_FIELD:
                     schemaVersion = parser.intValue();
                     break;
                 case TASK_ID_FIELD:
                     taskId = parser.text();
                     break;
-                case MODEL_ID_FIELD:
+                case CommonName.MODEL_ID_FIELD:
                     modelId = parser.text();
                     break;
                 case APPROX_ANOMALY_START_FIELD:
diff --git a/src/main/java/org/opensearch/ad/model/DetectorProfile.java b/src/main/java/org/opensearch/ad/model/DetectorProfile.java
index 65e9e2f7f..3bbd2558b 100644
--- a/src/main/java/org/opensearch/ad/model/DetectorProfile.java
+++ b/src/main/java/org/opensearch/ad/model/DetectorProfile.java
@@ -16,7 +16,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
@@ -188,41 +188,41 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         XContentBuilder xContentBuilder = builder.startObject();
 
         if (state != null) {
-            xContentBuilder.field(CommonName.STATE, state);
+            xContentBuilder.field(ADCommonName.STATE, state);
         }
         if (error != null) {
-            xContentBuilder.field(CommonName.ERROR, error);
+            xContentBuilder.field(ADCommonName.ERROR, error);
         }
         if (modelProfile != null && modelProfile.length > 0) {
-            xContentBuilder.startArray(CommonName.MODELS);
+            xContentBuilder.startArray(ADCommonName.MODELS);
             for (ModelProfileOnNode profile : modelProfile) {
                 profile.toXContent(xContentBuilder, params);
             }
             xContentBuilder.endArray();
         }
         if (shingleSize != -1) {
-            xContentBuilder.field(CommonName.SHINGLE_SIZE, shingleSize);
+            xContentBuilder.field(ADCommonName.SHINGLE_SIZE, shingleSize);
         }
         if (coordinatingNode != null && !coordinatingNode.isEmpty()) {
-            xContentBuilder.field(CommonName.COORDINATING_NODE, coordinatingNode);
+            xContentBuilder.field(ADCommonName.COORDINATING_NODE, coordinatingNode);
         }
         if (totalSizeInBytes != -1) {
-            xContentBuilder.field(CommonName.TOTAL_SIZE_IN_BYTES, totalSizeInBytes);
+            xContentBuilder.field(ADCommonName.TOTAL_SIZE_IN_BYTES, totalSizeInBytes);
         }
         if (initProgress != null) {
-            xContentBuilder.field(CommonName.INIT_PROGRESS, initProgress);
+            xContentBuilder.field(ADCommonName.INIT_PROGRESS, initProgress);
         }
         if (totalEntities != null) {
-            xContentBuilder.field(CommonName.TOTAL_ENTITIES, totalEntities);
+            xContentBuilder.field(ADCommonName.TOTAL_ENTITIES, totalEntities);
         }
         if (activeEntities != null) {
-            xContentBuilder.field(CommonName.ACTIVE_ENTITIES, activeEntities);
+            xContentBuilder.field(ADCommonName.ACTIVE_ENTITIES, activeEntities);
         }
         if (adTaskProfile != null) {
-            xContentBuilder.field(CommonName.AD_TASK, adTaskProfile);
+            xContentBuilder.field(ADCommonName.AD_TASK, adTaskProfile);
         }
         if (modelCount > 0) {
-            xContentBuilder.field(CommonName.MODEL_COUNT, modelCount);
+            xContentBuilder.field(ADCommonName.MODEL_COUNT, modelCount);
         }
         return xContentBuilder.endObject();
     }
@@ -428,37 +428,37 @@ public String toString() {
         ToStringBuilder toStringBuilder = new ToStringBuilder(this);
 
         if (state != null) {
-            toStringBuilder.append(CommonName.STATE, state);
+            toStringBuilder.append(ADCommonName.STATE, state);
         }
         if (error != null) {
-            toStringBuilder.append(CommonName.ERROR, error);
+            toStringBuilder.append(ADCommonName.ERROR, error);
         }
         if (modelProfile != null && modelProfile.length > 0) {
             toStringBuilder.append(modelProfile);
         }
         if (shingleSize != -1) {
-            toStringBuilder.append(CommonName.SHINGLE_SIZE, shingleSize);
+            toStringBuilder.append(ADCommonName.SHINGLE_SIZE, shingleSize);
         }
         if (coordinatingNode != null) {
-            toStringBuilder.append(CommonName.COORDINATING_NODE, coordinatingNode);
+            toStringBuilder.append(ADCommonName.COORDINATING_NODE, coordinatingNode);
         }
         if (totalSizeInBytes != -1) {
-            toStringBuilder.append(CommonName.TOTAL_SIZE_IN_BYTES, totalSizeInBytes);
+            toStringBuilder.append(ADCommonName.TOTAL_SIZE_IN_BYTES, totalSizeInBytes);
         }
         if (initProgress != null) {
-            toStringBuilder.append(CommonName.INIT_PROGRESS, initProgress);
+            toStringBuilder.append(ADCommonName.INIT_PROGRESS, initProgress);
         }
         if (totalEntities != null) {
-            toStringBuilder.append(CommonName.TOTAL_ENTITIES, totalEntities);
+            toStringBuilder.append(ADCommonName.TOTAL_ENTITIES, totalEntities);
         }
         if (activeEntities != null) {
-            toStringBuilder.append(CommonName.ACTIVE_ENTITIES, activeEntities);
+            toStringBuilder.append(ADCommonName.ACTIVE_ENTITIES, activeEntities);
         }
         if (adTaskProfile != null) {
-            toStringBuilder.append(CommonName.AD_TASK, adTaskProfile);
+            toStringBuilder.append(ADCommonName.AD_TASK, adTaskProfile);
         }
         if (modelCount > 0) {
-            toStringBuilder.append(CommonName.MODEL_COUNT, modelCount);
+            toStringBuilder.append(ADCommonName.MODEL_COUNT, modelCount);
         }
         return toStringBuilder.toString();
     }
diff --git a/src/main/java/org/opensearch/ad/model/DetectorProfileName.java b/src/main/java/org/opensearch/ad/model/DetectorProfileName.java
index 2b8f220a3..0941c4b1c 100644
--- a/src/main/java/org/opensearch/ad/model/DetectorProfileName.java
+++ b/src/main/java/org/opensearch/ad/model/DetectorProfileName.java
@@ -15,20 +15,20 @@
 import java.util.Set;
 
 import org.opensearch.ad.Name;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 
 public enum DetectorProfileName implements Name {
-    STATE(CommonName.STATE),
-    ERROR(CommonName.ERROR),
-    COORDINATING_NODE(CommonName.COORDINATING_NODE),
-    SHINGLE_SIZE(CommonName.SHINGLE_SIZE),
-    TOTAL_SIZE_IN_BYTES(CommonName.TOTAL_SIZE_IN_BYTES),
-    MODELS(CommonName.MODELS),
-    INIT_PROGRESS(CommonName.INIT_PROGRESS),
-    TOTAL_ENTITIES(CommonName.TOTAL_ENTITIES),
-    ACTIVE_ENTITIES(CommonName.ACTIVE_ENTITIES),
-    AD_TASK(CommonName.AD_TASK);
+    STATE(ADCommonName.STATE),
+    ERROR(ADCommonName.ERROR),
+    COORDINATING_NODE(ADCommonName.COORDINATING_NODE),
+    SHINGLE_SIZE(ADCommonName.SHINGLE_SIZE),
+    TOTAL_SIZE_IN_BYTES(ADCommonName.TOTAL_SIZE_IN_BYTES),
+    MODELS(ADCommonName.MODELS),
+    INIT_PROGRESS(ADCommonName.INIT_PROGRESS),
+    TOTAL_ENTITIES(ADCommonName.TOTAL_ENTITIES),
+    ACTIVE_ENTITIES(ADCommonName.ACTIVE_ENTITIES),
+    AD_TASK(ADCommonName.AD_TASK);
 
     private String name;
 
@@ -48,25 +48,25 @@ public String getName() {
 
     public static DetectorProfileName getName(String name) {
         switch (name) {
-            case CommonName.STATE:
+            case ADCommonName.STATE:
                 return STATE;
-            case CommonName.ERROR:
+            case ADCommonName.ERROR:
                 return ERROR;
-            case CommonName.COORDINATING_NODE:
+            case ADCommonName.COORDINATING_NODE:
                 return COORDINATING_NODE;
-            case CommonName.SHINGLE_SIZE:
+            case ADCommonName.SHINGLE_SIZE:
                 return SHINGLE_SIZE;
-            case CommonName.TOTAL_SIZE_IN_BYTES:
+            case ADCommonName.TOTAL_SIZE_IN_BYTES:
                 return TOTAL_SIZE_IN_BYTES;
-            case CommonName.MODELS:
+            case ADCommonName.MODELS:
                 return MODELS;
-            case CommonName.INIT_PROGRESS:
+            case ADCommonName.INIT_PROGRESS:
                 return INIT_PROGRESS;
-            case CommonName.TOTAL_ENTITIES:
+            case ADCommonName.TOTAL_ENTITIES:
                 return TOTAL_ENTITIES;
-            case CommonName.ACTIVE_ENTITIES:
+            case ADCommonName.ACTIVE_ENTITIES:
                 return ACTIVE_ENTITIES;
-            case CommonName.AD_TASK:
+            case ADCommonName.AD_TASK:
                 return AD_TASK;
             default:
                 throw new IllegalArgumentException(CommonErrorMessages.UNSUPPORTED_PROFILE_TYPE);
diff --git a/src/main/java/org/opensearch/ad/model/Entity.java b/src/main/java/org/opensearch/ad/model/Entity.java
index 9ebf63bd4..d346d4034 100644
--- a/src/main/java/org/opensearch/ad/model/Entity.java
+++ b/src/main/java/org/opensearch/ad/model/Entity.java
@@ -26,7 +26,6 @@
 
 import org.apache.lucene.util.SetOnce;
 import org.opensearch.ad.annotation.Generated;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.common.Numbers;
 import org.opensearch.common.bytes.BytesReference;
@@ -42,6 +41,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParser.Token;
 import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
diff --git a/src/main/java/org/opensearch/ad/model/EntityProfile.java b/src/main/java/org/opensearch/ad/model/EntityProfile.java
index 8b8a7e360..2dfd91226 100644
--- a/src/main/java/org/opensearch/ad/model/EntityProfile.java
+++ b/src/main/java/org/opensearch/ad/model/EntityProfile.java
@@ -17,7 +17,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
@@ -168,13 +168,13 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(LAST_SAMPLE_TIMESTAMP, lastSampleTimestampMs);
         }
         if (initProgress != null) {
-            builder.field(CommonName.INIT_PROGRESS, initProgress);
+            builder.field(ADCommonName.INIT_PROGRESS, initProgress);
         }
         if (modelProfile != null) {
-            builder.field(CommonName.MODEL, modelProfile);
+            builder.field(ADCommonName.MODEL, modelProfile);
         }
         if (state != null && state != EntityState.UNKNOWN) {
-            builder.field(CommonName.STATE, state);
+            builder.field(ADCommonName.STATE, state);
         }
         builder.endObject();
         return builder;
@@ -213,13 +213,13 @@ public String toString() {
             builder.append(LAST_SAMPLE_TIMESTAMP, lastSampleTimestampMs);
         }
         if (initProgress != null) {
-            builder.append(CommonName.INIT_PROGRESS, initProgress);
+            builder.append(ADCommonName.INIT_PROGRESS, initProgress);
         }
         if (modelProfile != null) {
-            builder.append(CommonName.MODELS, modelProfile);
+            builder.append(ADCommonName.MODELS, modelProfile);
         }
         if (state != null && state != EntityState.UNKNOWN) {
-            builder.append(CommonName.STATE, state);
+            builder.append(ADCommonName.STATE, state);
         }
         return builder.toString();
     }
diff --git a/src/main/java/org/opensearch/ad/model/EntityProfileName.java b/src/main/java/org/opensearch/ad/model/EntityProfileName.java
index 0d01df54e..b889a16e3 100644
--- a/src/main/java/org/opensearch/ad/model/EntityProfileName.java
+++ b/src/main/java/org/opensearch/ad/model/EntityProfileName.java
@@ -15,14 +15,14 @@
 import java.util.Set;
 
 import org.opensearch.ad.Name;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 
 public enum EntityProfileName implements Name {
-    INIT_PROGRESS(CommonName.INIT_PROGRESS),
-    ENTITY_INFO(CommonName.ENTITY_INFO),
-    STATE(CommonName.STATE),
-    MODELS(CommonName.MODELS);
+    INIT_PROGRESS(ADCommonName.INIT_PROGRESS),
+    ENTITY_INFO(ADCommonName.ENTITY_INFO),
+    STATE(ADCommonName.STATE),
+    MODELS(ADCommonName.MODELS);
 
     private String name;
 
@@ -42,13 +42,13 @@ public String getName() {
 
     public static EntityProfileName getName(String name) {
         switch (name) {
-            case CommonName.INIT_PROGRESS:
+            case ADCommonName.INIT_PROGRESS:
                 return INIT_PROGRESS;
-            case CommonName.ENTITY_INFO:
+            case ADCommonName.ENTITY_INFO:
                 return ENTITY_INFO;
-            case CommonName.STATE:
+            case ADCommonName.STATE:
                 return STATE;
-            case CommonName.MODELS:
+            case ADCommonName.MODELS:
                 return MODELS;
             default:
                 throw new IllegalArgumentException(CommonErrorMessages.UNSUPPORTED_PROFILE_TYPE);
diff --git a/src/main/java/org/opensearch/ad/model/ExpectedValueList.java b/src/main/java/org/opensearch/ad/model/ExpectedValueList.java
index 44b8297c5..25fdf2e1d 100644
--- a/src/main/java/org/opensearch/ad/model/ExpectedValueList.java
+++ b/src/main/java/org/opensearch/ad/model/ExpectedValueList.java
@@ -25,13 +25,12 @@
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.base.Objects;
 
 public class ExpectedValueList implements ToXContentObject, Writeable {
     public static final String LIKELIHOOD_FIELD = "likelihood";
-    public static final String VALUE_LIST_FIELD = "value_list";
-
     private Double likelihood;
     private List<DataByFeatureId> valueList;
 
@@ -52,7 +51,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             xContentBuilder.field(LIKELIHOOD_FIELD, likelihood);
         }
         if (valueList != null) {
-            xContentBuilder.field(VALUE_LIST_FIELD, valueList.toArray());
+            xContentBuilder.field(CommonName.VALUE_LIST_FIELD, valueList.toArray());
         }
         return xContentBuilder.endObject();
     }
@@ -75,7 +74,7 @@ public static ExpectedValueList parse(XContentParser parser) throws IOException
                 case LIKELIHOOD_FIELD:
                     likelihood = parser.doubleValue();
                     break;
-                case VALUE_LIST_FIELD:
+                case CommonName.VALUE_LIST_FIELD:
                     ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser);
                     while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
                         valueList.add(DataByFeatureId.parse(parser));
diff --git a/src/main/java/org/opensearch/ad/model/ModelProfile.java b/src/main/java/org/opensearch/ad/model/ModelProfile.java
index fc3c1fe60..b6a4bbecf 100644
--- a/src/main/java/org/opensearch/ad/model/ModelProfile.java
+++ b/src/main/java/org/opensearch/ad/model/ModelProfile.java
@@ -16,12 +16,12 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Used to show model information in profile API
@@ -78,7 +78,7 @@ public long getModelSizeInBytes() {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.field(CommonName.MODEL_ID_KEY, modelId);
+        builder.field(CommonName.MODEL_ID_FIELD, modelId);
         if (entity != null) {
             builder.field(CommonName.ENTITY_KEY, entity);
         }
@@ -114,7 +114,7 @@ public int hashCode() {
     @Override
     public String toString() {
         ToStringBuilder builder = new ToStringBuilder(this);
-        builder.append(CommonName.MODEL_ID_KEY, modelId);
+        builder.append(CommonName.MODEL_ID_FIELD, modelId);
         if (modelSizeInBytes > 0) {
             builder.append(CommonName.MODEL_SIZE_IN_BYTES, modelSizeInBytes);
         }
diff --git a/src/main/java/org/opensearch/ad/model/ModelProfileOnNode.java b/src/main/java/org/opensearch/ad/model/ModelProfileOnNode.java
index c426fe325..a78c90722 100644
--- a/src/main/java/org/opensearch/ad/model/ModelProfileOnNode.java
+++ b/src/main/java/org/opensearch/ad/model/ModelProfileOnNode.java
@@ -16,7 +16,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
@@ -98,7 +98,7 @@ public int hashCode() {
     @Override
     public String toString() {
         ToStringBuilder builder = new ToStringBuilder(this);
-        builder.append(CommonName.MODEL, modelProfile);
+        builder.append(ADCommonName.MODEL, modelProfile);
         builder.append(NODE_ID, nodeId);
         return builder.toString();
     }
diff --git a/src/main/java/org/opensearch/ad/model/ValidationAspect.java b/src/main/java/org/opensearch/ad/model/ValidationAspect.java
index a1583c875..744b19949 100644
--- a/src/main/java/org/opensearch/ad/model/ValidationAspect.java
+++ b/src/main/java/org/opensearch/ad/model/ValidationAspect.java
@@ -15,7 +15,8 @@
 import java.util.Set;
 
 import org.opensearch.ad.Name;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Validation Aspect enum. There two types of validation types for validation API,
@@ -28,7 +29,7 @@
  * </ul>
  */
 public enum ValidationAspect implements Name {
-    DETECTOR(CommonName.DETECTOR_ASPECT),
+    DETECTOR(ADCommonName.DETECTOR_ASPECT),
     MODEL(CommonName.MODEL_ASPECT);
 
     private String name;
@@ -49,7 +50,7 @@ public String getName() {
 
     public static ValidationAspect getName(String name) {
         switch (name) {
-            case CommonName.DETECTOR_ASPECT:
+            case ADCommonName.DETECTOR_ASPECT:
                 return DETECTOR;
             case CommonName.MODEL_ASPECT:
                 return MODEL;
diff --git a/src/main/java/org/opensearch/ad/ratelimit/CheckpointReadWorker.java b/src/main/java/org/opensearch/ad/ratelimit/CheckpointReadWorker.java
index 694c92b51..5e8f83303 100644
--- a/src/main/java/org/opensearch/ad/ratelimit/CheckpointReadWorker.java
+++ b/src/main/java/org/opensearch/ad/ratelimit/CheckpointReadWorker.java
@@ -37,8 +37,8 @@
 import org.opensearch.ad.breaker.ADCircuitBreakerService;
 import org.opensearch.ad.caching.CacheProvider;
 import org.opensearch.ad.common.exception.EndRunException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.indices.ADIndex;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.ml.CheckpointDao;
@@ -50,7 +50,6 @@
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.util.ExceptionUtil;
 import org.opensearch.ad.util.ParseUtils;
 import org.opensearch.cluster.service.ClusterService;
@@ -58,6 +57,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.stats.StatNames;
 
 /**
  * a queue for loading model checkpoint. The read is a multi-get query. Possible results are:
@@ -161,7 +161,7 @@ protected MultiGetRequest toBatchRequest(List<EntityFeatureRequest> toProcess) {
             if (false == modelId.isPresent()) {
                 continue;
             }
-            multiGetRequest.add(new MultiGetRequest.Item(CommonName.CHECKPOINT_INDEX_NAME, modelId.get()));
+            multiGetRequest.add(new MultiGetRequest.Item(ADCommonName.CHECKPOINT_INDEX_NAME, modelId.get()));
         }
         return multiGetRequest;
     }
diff --git a/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java
index 216cfaf94..a02746fb5 100644
--- a/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java
+++ b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java
@@ -23,8 +23,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.ad.AnomalyDetectorPlugin;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.settings.EnabledSetting;
 import org.opensearch.ad.transport.GetAnomalyDetectorAction;
@@ -35,6 +35,7 @@
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestActions;
 import org.opensearch.rest.action.RestToXContentListener;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -134,7 +135,7 @@ private Entity buildEntity(RestRequest request, String detectorId) throws IOExce
             throw new IllegalStateException(CommonErrorMessages.AD_ID_MISSING_MSG);
         }
 
-        String entityName = request.param(CommonName.CATEGORICAL_FIELD);
+        String entityName = request.param(ADCommonName.CATEGORICAL_FIELD);
         String entityValue = request.param(CommonName.ENTITY_KEY);
 
         if (entityName != null && entityValue != null) {
diff --git a/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java
index 57be1b391..08e627d19 100644
--- a/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java
+++ b/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java
@@ -13,7 +13,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.ad.AnomalyDetectorPlugin;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.transport.SearchADTasksAction;
 
@@ -32,7 +32,7 @@ public RestSearchADTasksAction() {
         super(
             ImmutableList.of(),
             ImmutableList.of(Pair.of(URL_PATH, LEGACY_URL_PATH)),
-            CommonName.DETECTION_STATE_INDEX,
+            ADCommonName.DETECTION_STATE_INDEX,
             ADTask.class,
             SearchADTasksAction.INSTANCE
         );
diff --git a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java
index 26fc442e1..1e406c4ab 100644
--- a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java
+++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java
@@ -11,12 +11,11 @@
 
 package org.opensearch.ad.rest;
 
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.ad.AnomalyDetectorPlugin;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.transport.SearchAnomalyDetectorAction;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -33,7 +32,7 @@ public RestSearchAnomalyDetectorAction() {
         super(
             ImmutableList.of(),
             ImmutableList.of(Pair.of(URL_PATH, LEGACY_URL_PATH)),
-            ANOMALY_DETECTORS_INDEX,
+            CommonName.CONFIG_INDEX,
             AnomalyDetector.class,
             SearchAnomalyDetectorAction.INSTANCE
         );
diff --git a/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java
index 2334c3f04..04e52a99d 100644
--- a/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java
+++ b/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java
@@ -13,7 +13,6 @@
 
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_FIND_DETECTOR_MSG;
 import static org.opensearch.ad.model.ADTaskType.HISTORICAL_DETECTOR_TASK_TYPES;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
 import static org.opensearch.ad.util.ParseUtils.listEqualsWithoutConsideringOrder;
 import static org.opensearch.ad.util.ParseUtils.parseAggregators;
 import static org.opensearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE;
@@ -55,7 +54,6 @@
 import org.opensearch.action.support.replication.ReplicationResponse;
 import org.opensearch.ad.common.exception.ADValidationException;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.feature.SearchFeatureDao;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.AnomalyDetector;
@@ -87,6 +85,7 @@
 import org.opensearch.rest.RestStatus;
 import org.opensearch.search.aggregations.AggregatorFactories;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.collect.Sets;
@@ -418,7 +417,7 @@ protected void prepareAnomalyDetectorIndexing(boolean indexingDryRun) {
     }
 
     protected void updateAnomalyDetector(String detectorId, boolean indexingDryRun) {
-        GetRequest request = new GetRequest(ANOMALY_DETECTORS_INDEX, detectorId);
+        GetRequest request = new GetRequest(CommonName.CONFIG_INDEX, detectorId);
         client
             .get(
                 request,
@@ -488,7 +487,7 @@ protected void validateAgainstExistingMultiEntityAnomalyDetector(String detector
 
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(query).size(0).timeout(requestTimeout);
 
-            SearchRequest searchRequest = new SearchRequest(ANOMALY_DETECTORS_INDEX).source(searchSourceBuilder);
+            SearchRequest searchRequest = new SearchRequest(CommonName.CONFIG_INDEX).source(searchSourceBuilder);
             client
                 .search(
                     searchRequest,
@@ -514,7 +513,7 @@ protected void createAnomalyDetector(boolean indexingDryRun) {
                     QueryBuilder query = QueryBuilders.matchAllQuery();
                     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(query).size(0).timeout(requestTimeout);
 
-                    SearchRequest searchRequest = new SearchRequest(ANOMALY_DETECTORS_INDEX).source(searchSourceBuilder);
+                    SearchRequest searchRequest = new SearchRequest(CommonName.CONFIG_INDEX).source(searchSourceBuilder);
 
                     client
                         .search(
@@ -717,7 +716,7 @@ protected void checkADNameExists(String detectorId, boolean indexingDryRun) thro
                 boolQueryBuilder.mustNot(QueryBuilders.termQuery(RestHandlerUtils._ID, detectorId));
             }
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(boolQueryBuilder).timeout(requestTimeout);
-            SearchRequest searchRequest = new SearchRequest(ANOMALY_DETECTORS_INDEX).source(searchSourceBuilder);
+            SearchRequest searchRequest = new SearchRequest(CommonName.CONFIG_INDEX).source(searchSourceBuilder);
             client
                 .search(
                     searchRequest,
@@ -812,7 +811,7 @@ protected void indexAnomalyDetector(String detectorId) throws IOException {
             user,
             anomalyDetector.getResultIndex()
         );
-        IndexRequest indexRequest = new IndexRequest(ANOMALY_DETECTORS_INDEX)
+        IndexRequest indexRequest = new IndexRequest(CommonName.CONFIG_INDEX)
             .setRefreshPolicy(refreshPolicy)
             .source(detector.toXContent(XContentFactory.jsonBuilder(), XCONTENT_WITH_TYPE))
             .setIfSeqNo(seqNo)
@@ -860,14 +859,14 @@ public void onFailure(Exception e) {
 
     protected void onCreateMappingsResponse(CreateIndexResponse response, boolean indexingDryRun) throws IOException {
         if (response.isAcknowledged()) {
-            logger.info("Created {} with mappings.", ANOMALY_DETECTORS_INDEX);
+            logger.info("Created {} with mappings.", CommonName.CONFIG_INDEX);
             prepareAnomalyDetectorIndexing(indexingDryRun);
         } else {
-            logger.warn("Created {} with mappings call not acknowledged.", ANOMALY_DETECTORS_INDEX);
+            logger.warn("Created {} with mappings call not acknowledged.", CommonName.CONFIG_INDEX);
             listener
                 .onFailure(
                     new OpenSearchStatusException(
-                        "Created " + ANOMALY_DETECTORS_INDEX + "with mappings call not acknowledged.",
+                        "Created " + CommonName.CONFIG_INDEX + "with mappings call not acknowledged.",
                         RestStatus.INTERNAL_SERVER_ERROR
                     )
                 );
diff --git a/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java
index b589ea58c..4b085292d 100644
--- a/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java
+++ b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java
@@ -11,7 +11,6 @@
 
 package org.opensearch.ad.rest.handler;
 
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.io.IOException;
@@ -29,6 +28,7 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestStatus;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Common handler to process AD request.
@@ -56,8 +56,8 @@ public void getDetectorJob(
         AnomalyDetectorFunction function,
         NamedXContentRegistry xContentRegistry
     ) {
-        if (clusterService.state().metadata().indices().containsKey(ANOMALY_DETECTOR_JOB_INDEX)) {
-            GetRequest request = new GetRequest(ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        if (clusterService.state().metadata().indices().containsKey(CommonName.JOB_INDEX)) {
+            GetRequest request = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
             client
                 .get(
                     request,
diff --git a/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
index 352e169ea..f2f7883bb 100644
--- a/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
+++ b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
@@ -13,7 +13,6 @@
 
 import static org.opensearch.action.DocWriteResponse.Result.CREATED;
 import static org.opensearch.action.DocWriteResponse.Result.UPDATED;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
 import static org.opensearch.ad.util.ExceptionUtil.getShardsFailure;
 import static org.opensearch.ad.util.RestHandlerUtils.createXContentParserFromRegistry;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
@@ -53,6 +52,7 @@
 import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
 import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import org.opensearch.rest.RestStatus;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.base.Throwables;
@@ -163,14 +163,14 @@ public void startAnomalyDetectorJob(AnomalyDetector detector, ActionListener<Ano
         if (!anomalyDetectionIndices.doesAnomalyDetectorJobIndexExist()) {
             anomalyDetectionIndices.initAnomalyDetectorJobIndex(ActionListener.wrap(response -> {
                 if (response.isAcknowledged()) {
-                    logger.info("Created {} with mappings.", ANOMALY_DETECTORS_INDEX);
+                    logger.info("Created {} with mappings.", CommonName.CONFIG_INDEX);
                     createJob(detector, startListener);
                 } else {
-                    logger.warn("Created {} with mappings call not acknowledged.", ANOMALY_DETECTORS_INDEX);
+                    logger.warn("Created {} with mappings call not acknowledged.", CommonName.CONFIG_INDEX);
                     startListener
                         .onFailure(
                             new OpenSearchStatusException(
-                                "Created " + ANOMALY_DETECTORS_INDEX + " with mappings call not acknowledged.",
+                                "Created " + CommonName.CONFIG_INDEX + " with mappings call not acknowledged.",
                                 RestStatus.INTERNAL_SERVER_ERROR
                             )
                         );
@@ -213,7 +213,7 @@ private void getAnomalyDetectorJobForWrite(
         AnomalyDetectorJob job,
         ActionListener<AnomalyDetectorJobResponse> listener
     ) {
-        GetRequest getRequest = new GetRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
 
         client
             .get(
@@ -293,7 +293,7 @@ private void indexAnomalyDetectorJob(
         AnomalyDetectorFunction function,
         ActionListener<AnomalyDetectorJobResponse> listener
     ) throws IOException {
-        IndexRequest indexRequest = new IndexRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
+        IndexRequest indexRequest = new IndexRequest(CommonName.JOB_INDEX)
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
             .source(job.toXContent(XContentFactory.jsonBuilder(), RestHandlerUtils.XCONTENT_WITH_TYPE))
             .setIfSeqNo(seqNo)
@@ -344,7 +344,7 @@ private void onIndexAnomalyDetectorJobResponse(
      * @param listener Listener to send responses
      */
     public void stopAnomalyDetectorJob(String detectorId, ActionListener<AnomalyDetectorJobResponse> listener) {
-        GetRequest getRequest = new GetRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
 
         client.get(getRequest, ActionListener.wrap(response -> {
             if (response.isExists()) {
diff --git a/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java b/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java
index cf89e638c..3f5421032 100644
--- a/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java
+++ b/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java
@@ -27,10 +27,11 @@
 import java.util.stream.Stream;
 
 import org.opensearch.ad.caching.CacheProvider;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * ModelsOnNodeSupplier provides a List of ModelStates info for the models the nodes contains
@@ -47,8 +48,8 @@ public class ModelsOnNodeSupplier implements Supplier<List<Map<String, Object>>>
     public static Set<String> MODEL_STATE_STAT_KEYS = new HashSet<>(
         Arrays
             .asList(
-                CommonName.MODEL_ID_KEY,
-                CommonName.DETECTOR_ID_KEY,
+                CommonName.MODEL_ID_FIELD,
+                ADCommonName.DETECTOR_ID_KEY,
                 MODEL_TYPE_KEY,
                 CommonName.ENTITY_KEY,
                 LAST_USED_TIME_KEY,
diff --git a/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java
index 0c1516387..264715561 100644
--- a/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java
+++ b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java
@@ -13,9 +13,9 @@
 
 import static org.opensearch.ad.AnomalyDetectorPlugin.AD_BATCH_TASK_THREAD_POOL_NAME;
 import static org.opensearch.ad.breaker.MemoryCircuitBreaker.DEFAULT_JVM_HEAP_USAGE_THRESHOLD;
+import static org.opensearch.ad.constant.ADCommonName.AGG_NAME_MAX_TIME;
+import static org.opensearch.ad.constant.ADCommonName.AGG_NAME_MIN_TIME;
 import static org.opensearch.ad.constant.CommonErrorMessages.NO_ELIGIBLE_NODE_TO_RUN_DETECTOR;
-import static org.opensearch.ad.constant.CommonName.AGG_NAME_MAX_TIME;
-import static org.opensearch.ad.constant.CommonName.AGG_NAME_MIN_TIME;
 import static org.opensearch.ad.model.ADTask.CURRENT_PIECE_FIELD;
 import static org.opensearch.ad.model.ADTask.EXECUTION_END_TIME_FIELD;
 import static org.opensearch.ad.model.ADTask.INIT_PROGRESS_FIELD;
@@ -30,8 +30,8 @@
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_TOP_ENTITIES_LIMIT_FOR_HISTORICAL_ANALYSIS;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES;
 import static org.opensearch.ad.stats.InternalStatNames.JVM_HEAP_USAGE;
-import static org.opensearch.ad.stats.StatNames.AD_EXECUTING_BATCH_TASK_COUNT;
 import static org.opensearch.ad.util.ParseUtils.isNullOrEmpty;
+import static org.opensearch.timeseries.stats.StatNames.AD_EXECUTING_BATCH_TASK_COUNT;
 
 import java.time.Clock;
 import java.time.Instant;
@@ -80,7 +80,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.settings.EnabledSetting;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.transport.ADBatchAnomalyResultRequest;
 import org.opensearch.ad.transport.ADBatchAnomalyResultResponse;
 import org.opensearch.ad.transport.ADBatchTaskRemoteExecutionAction;
@@ -109,6 +108,7 @@
 import org.opensearch.search.aggregations.metrics.InternalMin;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.TransportRequestOptions;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/main/java/org/opensearch/ad/task/ADTaskManager.java b/src/main/java/org/opensearch/ad/task/ADTaskManager.java
index 8609f09f3..fd3ce200a 100644
--- a/src/main/java/org/opensearch/ad/task/ADTaskManager.java
+++ b/src/main/java/org/opensearch/ad/task/ADTaskManager.java
@@ -13,6 +13,7 @@
 
 import static org.opensearch.action.DocWriteResponse.Result.CREATED;
 import static org.opensearch.ad.AnomalyDetectorPlugin.AD_BATCH_TASK_THREAD_POOL_NAME;
+import static org.opensearch.ad.constant.ADCommonName.DETECTION_STATE_INDEX;
 import static org.opensearch.ad.constant.CommonErrorMessages.CAN_NOT_FIND_LATEST_TASK;
 import static org.opensearch.ad.constant.CommonErrorMessages.CREATE_INDEX_NOT_ACKNOWLEDGED;
 import static org.opensearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING;
@@ -20,7 +21,6 @@
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_FIND_DETECTOR_MSG;
 import static org.opensearch.ad.constant.CommonErrorMessages.HC_DETECTOR_TASK_IS_UPDATING;
 import static org.opensearch.ad.constant.CommonErrorMessages.NO_ELIGIBLE_NODE_TO_RUN_DETECTOR;
-import static org.opensearch.ad.constant.CommonName.DETECTION_STATE_INDEX;
 import static org.opensearch.ad.indices.AnomalyDetectionIndices.ALL_AD_RESULTS_INDEX_PATTERN;
 import static org.opensearch.ad.model.ADTask.COORDINATING_NODE_FIELD;
 import static org.opensearch.ad.model.ADTask.DETECTOR_ID_FIELD;
@@ -41,8 +41,6 @@
 import static org.opensearch.ad.model.ADTaskType.HISTORICAL_DETECTOR_TASK_TYPES;
 import static org.opensearch.ad.model.ADTaskType.REALTIME_TASK_TYPES;
 import static org.opensearch.ad.model.ADTaskType.taskTypeToString;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.ad.model.AnomalyResult.TASK_ID_FIELD;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.DELETE_AD_RESULT_WHEN_DELETE_DETECTOR;
@@ -169,6 +167,7 @@
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportRequestOptions;
 import org.opensearch.transport.TransportService;
 
@@ -867,7 +866,7 @@ public void stopDetector(
      * @param <T> action listener response type
      */
     public <T> void getDetector(String detectorId, Consumer<Optional<AnomalyDetector>> function, ActionListener<T> listener) {
-        GetRequest getRequest = new GetRequest(ANOMALY_DETECTORS_INDEX, detectorId);
+        GetRequest getRequest = new GetRequest(CommonName.CONFIG_INDEX, detectorId);
         client.get(getRequest, ActionListener.wrap(response -> {
             if (!response.isExists()) {
                 function.accept(Optional.empty());
@@ -1095,7 +1094,7 @@ private <T> void resetRealtimeDetectorTaskState(
         }
         ADTask adTask = runningRealtimeTasks.get(0);
         String detectorId = adTask.getDetectorId();
-        GetRequest getJobRequest = new GetRequest(ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        GetRequest getJobRequest = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
         client.get(getJobRequest, ActionListener.wrap(r -> {
             if (r.isExists()) {
                 try (XContentParser parser = createXContentParserFromRegistry(xContentRegistry, r.getSourceAsBytesRef())) {
diff --git a/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java
index 91d9afa3d..84fe0c6fe 100644
--- a/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.AD_TASK;
+import static org.opensearch.ad.constant.ADCommonName.AD_TASK;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.ad.constant.CommonValue;
diff --git a/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java
index 5eb0f8f5c..d865ec14c 100644
--- a/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.AD_TASK_REMOTE;
+import static org.opensearch.ad.constant.ADCommonName.AD_TASK_REMOTE;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.ad.constant.CommonValue;
diff --git a/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java
index f328caf1d..31f20fa00 100644
--- a/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.CANCEL_TASK;
+import static org.opensearch.ad.constant.ADCommonName.CANCEL_TASK;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.ad.constant.CommonValue;
diff --git a/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java
index aebb2293c..a0db8e8d9 100644
--- a/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java
@@ -28,7 +28,7 @@
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.ratelimit.ResultWriteRequest;
 import org.opensearch.ad.util.BulkUtil;
@@ -68,7 +68,7 @@ public ADResultBulkTransportAction(
         this.primaryAndCoordinatingLimits = MAX_INDEXING_BYTES.get(settings).getBytes();
         this.softLimit = INDEX_PRESSURE_SOFT_LIMIT.get(settings);
         this.hardLimit = INDEX_PRESSURE_HARD_LIMIT.get(settings);
-        this.indexName = CommonName.ANOMALY_RESULT_INDEX_ALIAS;
+        this.indexName = ADCommonName.ANOMALY_RESULT_INDEX_ALIAS;
         this.client = client;
         clusterService.getClusterSettings().addSettingsUpdateConsumer(INDEX_PRESSURE_SOFT_LIMIT, it -> softLimit = it);
         clusterService.getClusterSettings().addSettingsUpdateConsumer(INDEX_PRESSURE_HARD_LIMIT, it -> hardLimit = it);
diff --git a/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java
index 2781cf720..f2b198d1c 100644
--- a/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.AD_TASK;
+import static org.opensearch.ad.constant.ADCommonName.AD_TASK;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.ad.constant.CommonValue;
diff --git a/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java
index cb7d4f662..645b78277 100644
--- a/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java
@@ -20,8 +20,8 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.InputStreamStreamInput;
 import org.opensearch.common.io.stream.OutputStreamStreamOutput;
@@ -29,6 +29,7 @@
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class AnomalyResultRequest extends ActionRequest implements ToXContentObject {
     private String adID;
@@ -88,7 +89,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
         builder.field(CommonName.START_JSON_KEY, start);
         builder.field(CommonName.END_JSON_KEY, end);
         builder.endObject();
diff --git a/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java
index dfca4cd52..1aeca27dc 100644
--- a/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java
@@ -54,8 +54,8 @@
 import org.opensearch.ad.common.exception.LimitExceededException;
 import org.opensearch.ad.common.exception.NotSerializedADExceptionName;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.feature.CompositeRetriever;
 import org.opensearch.ad.feature.CompositeRetriever.PageIterator;
 import org.opensearch.ad.feature.FeatureManager;
@@ -69,7 +69,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.settings.EnabledSetting;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.ad.util.ExceptionUtil;
 import org.opensearch.ad.util.ParseUtils;
@@ -93,6 +92,7 @@
 import org.opensearch.rest.RestStatus;
 import org.opensearch.tasks.Task;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.ActionNotFoundTransportException;
 import org.opensearch.transport.ConnectTransportException;
 import org.opensearch.transport.NodeNotConnectedException;
@@ -734,7 +734,7 @@ private void findException(Throwable cause, String adID, AtomicReference<Excepti
                 failure.set(new EndRunException(adID, CommonErrorMessages.BUG_RESPONSE, causeException, false));
             }
         } else if (causeException instanceof IndexNotFoundException
-            && causeException.getMessage().contains(CommonName.CHECKPOINT_INDEX_NAME)) {
+            && causeException.getMessage().contains(ADCommonName.CHECKPOINT_INDEX_NAME)) {
             // checkpoint index does not exist
             // ResourceNotFoundException will trigger cold start later
             failure.set(new ResourceNotFoundException(adID, causeException.getMessage()));
diff --git a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java
index dbce72b20..0fb912090 100644
--- a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java
@@ -13,7 +13,6 @@
 
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_DELETE_DETECTOR;
 import static org.opensearch.ad.model.ADTaskType.HISTORICAL_DETECTOR_TASK_TYPES;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES;
 import static org.opensearch.ad.util.ParseUtils.getUserContext;
 import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute;
@@ -34,8 +33,7 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.ad.constant.CommonName;
-import org.opensearch.ad.model.AnomalyDetector;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.rest.handler.AnomalyDetectorFunction;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
@@ -52,6 +50,7 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 public class DeleteAnomalyDetectorTransportAction extends HandledTransportAction<DeleteAnomalyDetectorRequest, DeleteResponse> {
@@ -130,7 +129,7 @@ protected void doExecute(Task task, DeleteAnomalyDetectorRequest request, Action
 
     private void deleteAnomalyDetectorJobDoc(String detectorId, ActionListener<DeleteResponse> listener) {
         LOG.info("Delete anomaly detector job {}", detectorId);
-        DeleteRequest deleteRequest = new DeleteRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, detectorId)
+        DeleteRequest deleteRequest = new DeleteRequest(CommonName.JOB_INDEX, detectorId)
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
         client.delete(deleteRequest, ActionListener.wrap(response -> {
             if (response.getResult() == DocWriteResponse.Result.DELETED || response.getResult() == DocWriteResponse.Result.NOT_FOUND) {
@@ -153,7 +152,7 @@ private void deleteAnomalyDetectorJobDoc(String detectorId, ActionListener<Delet
 
     private void deleteDetectorStateDoc(String detectorId, ActionListener<DeleteResponse> listener) {
         LOG.info("Delete detector info {}", detectorId);
-        DeleteRequest deleteRequest = new DeleteRequest(CommonName.DETECTION_STATE_INDEX, detectorId);
+        DeleteRequest deleteRequest = new DeleteRequest(ADCommonName.DETECTION_STATE_INDEX, detectorId);
         client
             .delete(
                 deleteRequest,
@@ -177,7 +176,7 @@ private void deleteDetectorStateDoc(String detectorId, ActionListener<DeleteResp
 
     private void deleteAnomalyDetectorDoc(String detectorId, ActionListener<DeleteResponse> listener) {
         LOG.info("Delete anomaly detector {}", detectorId);
-        DeleteRequest deleteRequest = new DeleteRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX, detectorId)
+        DeleteRequest deleteRequest = new DeleteRequest(CommonName.CONFIG_INDEX, detectorId)
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
         client.delete(deleteRequest, new ActionListener<DeleteResponse>() {
             @Override
@@ -193,8 +192,8 @@ public void onFailure(Exception e) {
     }
 
     private void getDetectorJob(String detectorId, ActionListener<DeleteResponse> listener, AnomalyDetectorFunction function) {
-        if (clusterService.state().metadata().indices().containsKey(ANOMALY_DETECTOR_JOB_INDEX)) {
-            GetRequest request = new GetRequest(ANOMALY_DETECTOR_JOB_INDEX).id(detectorId);
+        if (clusterService.state().metadata().indices().containsKey(CommonName.JOB_INDEX)) {
+            GetRequest request = new GetRequest(CommonName.JOB_INDEX).id(detectorId);
             client.get(request, ActionListener.wrap(response -> onGetAdJobResponseForWrite(response, listener, function), exception -> {
                 LOG.error("Fail to get anomaly detector job: " + detectorId, exception);
                 listener.onFailure(exception);
diff --git a/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java b/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java
index a083af76f..c651a7f79 100644
--- a/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java
@@ -17,8 +17,8 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.nodes.BaseNodesRequest;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
@@ -69,7 +69,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
         builder.endObject();
         return builder;
     }
diff --git a/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java b/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java
index 0bc7c091c..28cbe79aa 100644
--- a/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java
@@ -19,8 +19,8 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.model.EntityProfileName;
 import org.opensearch.common.Strings;
@@ -100,7 +100,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
         builder.field(ENTITY, entityValue);
         builder.field(PROFILES, profilesToCollect);
         builder.endObject();
diff --git a/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java b/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java
index 625997e20..36e7c6f6b 100644
--- a/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java
+++ b/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java
@@ -18,7 +18,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.opensearch.action.ActionResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ModelProfileOnNode;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -128,7 +128,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(TOTAL_UPDATES, totalUpdates);
         }
         if (modelProfile != null) {
-            builder.field(CommonName.MODEL, modelProfile);
+            builder.field(ADCommonName.MODEL, modelProfile);
         }
         builder.endObject();
         return builder;
@@ -140,7 +140,7 @@ public String toString() {
         builder.append(ACTIVE, isActive);
         builder.append(LAST_ACTIVE_TS, lastActiveMs);
         builder.append(TOTAL_UPDATES, totalUpdates);
-        builder.append(CommonName.MODEL, modelProfile);
+        builder.append(ADCommonName.MODEL, modelProfile);
 
         return builder.toString();
     }
diff --git a/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java b/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java
index 5f9ce60a9..590853f0e 100644
--- a/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java
@@ -21,14 +21,15 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class EntityResultRequest extends ActionRequest implements ToXContentObject {
     private static final Logger LOG = LogManager.getLogger(EntityResultRequest.class);
@@ -104,7 +105,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, detectorId);
+        builder.field(ADCommonName.ID_JSON_KEY, detectorId);
         builder.field(CommonName.START_JSON_KEY, start);
         builder.field(CommonName.END_JSON_KEY, end);
         builder.startArray(CommonName.ENTITIES_JSON_KEY);
diff --git a/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java
index 12f1ee9bd..b4a678d28 100644
--- a/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java
@@ -33,8 +33,8 @@
 import org.opensearch.ad.caching.CacheProvider;
 import org.opensearch.ad.common.exception.EndRunException;
 import org.opensearch.ad.common.exception.LimitExceededException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.indices.ADIndex;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.ml.EntityModel;
@@ -52,12 +52,12 @@
 import org.opensearch.ad.ratelimit.ResultWriteRequest;
 import org.opensearch.ad.ratelimit.ResultWriteWorker;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.util.ExceptionUtil;
 import org.opensearch.ad.util.ParseUtils;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.tasks.Task;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.TransportService;
 
 /**
@@ -189,7 +189,7 @@ private ActionListener<Optional<AnomalyDetector>> onGetDetector(
                     Map<String, String> attrValues = categoricalValues.getAttributes();
                     // handle a request from a version before OpenSearch 1.1.
                     categoricalValues = Entity
-                        .createSingleAttributeEntity(detector.getCategoryField().get(0), attrValues.get(CommonName.EMPTY_FIELD));
+                        .createSingleAttributeEntity(detector.getCategoryField().get(0), attrValues.get(ADCommonName.EMPTY_FIELD));
                 }
 
                 Optional<String> modelIdOptional = categoricalValues.getModelId(detectorId);
@@ -347,6 +347,6 @@ private ActionListener<Optional<AnomalyDetector>> onGetDetector(
      */
     private boolean isEntityFromOldNodeMsg(Entity categoricalValues) {
         Map<String, String> attrValues = categoricalValues.getAttributes();
-        return (attrValues != null && attrValues.containsKey(CommonName.EMPTY_FIELD));
+        return (attrValues != null && attrValues.containsKey(ADCommonName.EMPTY_FIELD));
     }
 }
diff --git a/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java b/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java
index 14a4dbeb5..309714cc8 100644
--- a/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.AD_TASK;
+import static org.opensearch.ad.constant.ADCommonName.AD_TASK;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.ad.constant.CommonValue;
diff --git a/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java
index c43fd0864..3568beaad 100644
--- a/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java
@@ -14,8 +14,6 @@
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_FIND_DETECTOR_MSG;
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_GET_DETECTOR;
 import static org.opensearch.ad.model.ADTaskType.ALL_DETECTOR_TASK_TYPES;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES;
 import static org.opensearch.ad.util.ParseUtils.getUserContext;
 import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute;
@@ -71,6 +69,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.collect.Sets;
@@ -275,10 +274,10 @@ private void getDetectorAndJob(
         Optional<ADTask> historicalAdTask,
         ActionListener<GetAnomalyDetectorResponse> listener
     ) {
-        MultiGetRequest.Item adItem = new MultiGetRequest.Item(ANOMALY_DETECTORS_INDEX, detectorID);
+        MultiGetRequest.Item adItem = new MultiGetRequest.Item(CommonName.CONFIG_INDEX, detectorID);
         MultiGetRequest multiGetRequest = new MultiGetRequest().add(adItem);
         if (returnJob) {
-            MultiGetRequest.Item adJobItem = new MultiGetRequest.Item(ANOMALY_DETECTOR_JOB_INDEX, detectorID);
+            MultiGetRequest.Item adJobItem = new MultiGetRequest.Item(CommonName.JOB_INDEX, detectorID);
             multiGetRequest.add(adJobItem);
         }
         client.multiGet(multiGetRequest, onMultiGetResponse(listener, returnJob, returnTask, realtimeAdTask, historicalAdTask, detectorID));
@@ -304,7 +303,7 @@ public void onResponse(MultiGetResponse multiGetResponse) {
                 long primaryTerm = 0;
 
                 for (MultiGetItemResponse response : responses) {
-                    if (ANOMALY_DETECTORS_INDEX.equals(response.getIndex())) {
+                    if (CommonName.CONFIG_INDEX.equals(response.getIndex())) {
                         if (response.getResponse() == null || !response.getResponse().isExists()) {
                             listener.onFailure(new OpenSearchStatusException(FAIL_TO_FIND_DETECTOR_MSG + detectorId, RestStatus.NOT_FOUND));
                             return;
@@ -328,7 +327,7 @@ public void onResponse(MultiGetResponse multiGetResponse) {
                         }
                     }
 
-                    if (ANOMALY_DETECTOR_JOB_INDEX.equals(response.getIndex())) {
+                    if (CommonName.JOB_INDEX.equals(response.getIndex())) {
                         if (response.getResponse() != null
                             && response.getResponse().isExists()
                             && !response.getResponse().isSourceEmpty()) {
diff --git a/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java
index f131a5fa6..25cf50b59 100644
--- a/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java
@@ -55,6 +55,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 public class PreviewAnomalyDetectorTransportAction extends
@@ -209,7 +210,7 @@ private void previewAnomalyDetector(
         ThreadContext.StoredContext context
     ) throws IOException {
         if (!StringUtils.isBlank(detectorId)) {
-            GetRequest getRequest = new GetRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX).id(detectorId);
+            GetRequest getRequest = new GetRequest(CommonName.CONFIG_INDEX).id(detectorId);
             client.get(getRequest, onGetAnomalyDetectorResponse(listener, startTime, endTime, context));
         } else {
             anomalyDetectorRunner
diff --git a/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java b/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java
index 8ef2ca826..a0dcae3df 100644
--- a/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java
+++ b/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java
@@ -16,13 +16,14 @@
 import java.util.Map;
 
 import org.opensearch.action.support.nodes.BaseNodeResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ModelProfile;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 /**
  * Profile response on a node
@@ -136,12 +137,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
         builder.endObject();
 
-        builder.field(CommonName.SHINGLE_SIZE, shingleSize);
-        builder.field(CommonName.ACTIVE_ENTITIES, activeEntities);
-        builder.field(CommonName.TOTAL_UPDATES, totalUpdates);
+        builder.field(ADCommonName.SHINGLE_SIZE, shingleSize);
+        builder.field(ADCommonName.ACTIVE_ENTITIES, activeEntities);
+        builder.field(ADCommonName.TOTAL_UPDATES, totalUpdates);
 
-        builder.field(CommonName.MODEL_COUNT, modelCount);
-        builder.startArray(CommonName.MODELS);
+        builder.field(ADCommonName.MODEL_COUNT, modelCount);
+        builder.startArray(ADCommonName.MODELS);
         for (ModelProfile modelProfile : modelProfiles) {
             builder.startObject();
             modelProfile.toXContent(builder, params);
diff --git a/src/main/java/org/opensearch/ad/transport/ProfileResponse.java b/src/main/java/org/opensearch/ad/transport/ProfileResponse.java
index 73acaa9a7..eb204aa6f 100644
--- a/src/main/java/org/opensearch/ad/transport/ProfileResponse.java
+++ b/src/main/java/org/opensearch/ad/transport/ProfileResponse.java
@@ -20,7 +20,7 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.support.nodes.BaseNodesResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ModelProfile;
 import org.opensearch.ad.model.ModelProfileOnNode;
 import org.opensearch.cluster.ClusterName;
@@ -35,13 +35,13 @@
 public class ProfileResponse extends BaseNodesResponse<ProfileNodeResponse> implements ToXContentFragment {
     private static final Logger LOG = LogManager.getLogger(ProfileResponse.class);
     // filed name in toXContent
-    static final String COORDINATING_NODE = CommonName.COORDINATING_NODE;
-    static final String SHINGLE_SIZE = CommonName.SHINGLE_SIZE;
-    static final String TOTAL_SIZE = CommonName.TOTAL_SIZE_IN_BYTES;
-    static final String ACTIVE_ENTITY = CommonName.ACTIVE_ENTITIES;
-    static final String MODELS = CommonName.MODELS;
-    static final String TOTAL_UPDATES = CommonName.TOTAL_UPDATES;
-    static final String MODEL_COUNT = CommonName.MODEL_COUNT;
+    static final String COORDINATING_NODE = ADCommonName.COORDINATING_NODE;
+    static final String SHINGLE_SIZE = ADCommonName.SHINGLE_SIZE;
+    static final String TOTAL_SIZE = ADCommonName.TOTAL_SIZE_IN_BYTES;
+    static final String ACTIVE_ENTITY = ADCommonName.ACTIVE_ENTITIES;
+    static final String MODELS = ADCommonName.MODELS;
+    static final String TOTAL_UPDATES = ADCommonName.TOTAL_UPDATES;
+    static final String MODEL_COUNT = ADCommonName.MODEL_COUNT;
 
     // changed from ModelProfile to ModelProfileOnNode since Opensearch 1.1
     private ModelProfileOnNode[] modelProfile;
diff --git a/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java b/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java
index 20cb5b392..8f6d7cd52 100644
--- a/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java
@@ -17,8 +17,8 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -60,7 +60,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
         builder.endObject();
         return builder;
     }
diff --git a/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java b/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java
index f59706f52..5e7d3302b 100644
--- a/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java
@@ -17,13 +17,14 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class RCFResultRequest extends ActionRequest implements ToXContentObject {
     private String adID;
@@ -92,9 +93,9 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
-        builder.field(CommonName.MODEL_ID_KEY, modelID);
-        builder.startArray(CommonName.FEATURE_JSON_KEY);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
+        builder.field(CommonName.MODEL_ID_FIELD, modelID);
+        builder.startArray(ADCommonName.FEATURE_JSON_KEY);
         for (double feature : features) {
             builder.value(feature);
         }
diff --git a/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java b/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java
index f7e58cdfe..769ad5f4f 100644
--- a/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java
+++ b/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java
@@ -15,7 +15,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.action.ActionResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
@@ -209,7 +209,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(FOREST_SIZE_JSON_KEY, forestSize);
         builder.field(ATTRIBUTION_JSON_KEY, attribution);
         builder.field(TOTAL_UPDATES_JSON_KEY, totalUpdates);
-        builder.field(CommonName.ANOMALY_GRADE_JSON_KEY, anomalyGrade);
+        builder.field(ADCommonName.ANOMALY_GRADE_JSON_KEY, anomalyGrade);
         builder.field(RELATIVE_INDEX_FIELD_JSON_KEY, relativeIndex);
         builder.field(PAST_VALUES_FIELD_JSON_KEY, pastValues);
         builder.field(EXPECTED_VAL_LIST_FIELD_JSON_KEY, expectedValuesList);
diff --git a/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java
index 4c43b4e53..c67dbe5bf 100644
--- a/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java
@@ -27,10 +27,10 @@
 import org.opensearch.ad.constant.CommonErrorMessages;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.TransportService;
 
 public class RCFResultTransportAction extends HandledTransportAction<RCFResultRequest, RCFResultResponse> {
diff --git a/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java
index 93ce86c87..d924ba52c 100644
--- a/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java
@@ -12,7 +12,6 @@
 package org.opensearch.ad.transport;
 
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_GET_DETECTOR_INFO;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
 import static org.opensearch.ad.util.RestHandlerUtils.wrapRestActionListener;
 
 import org.apache.logging.log4j.LogManager;
@@ -32,6 +31,7 @@
 import org.opensearch.index.query.TermsQueryBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 public class SearchAnomalyDetectorInfoTransportAction extends
@@ -62,7 +62,7 @@ protected void doExecute(
         String rawPath = request.getRawPath();
         ActionListener<SearchAnomalyDetectorInfoResponse> listener = wrapRestActionListener(actionListener, FAIL_TO_GET_DETECTOR_INFO);
         try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
-            SearchRequest searchRequest = new SearchRequest().indices(ANOMALY_DETECTORS_INDEX);
+            SearchRequest searchRequest = new SearchRequest().indices(CommonName.CONFIG_INDEX);
             if (rawPath.endsWith(RestHandlerUtils.COUNT)) {
                 // Count detectors
                 SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
diff --git a/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java
index b21a3e328..2f76bc7db 100644
--- a/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java
@@ -11,7 +11,7 @@
 
 package org.opensearch.ad.transport;
 
-import static org.opensearch.ad.constant.CommonName.CUSTOM_RESULT_INDEX_PREFIX;
+import static org.opensearch.ad.constant.ADCommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.indices.AnomalyDetectionIndices.ALL_AD_RESULTS_INDEX_PATTERN;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_DETECTOR_UPPER_LIMIT;
 
@@ -44,6 +44,7 @@
 import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -122,7 +123,7 @@ SearchRequest createSingleSearchRequest() {
             .field(AnomalyDetector.RESULT_INDEX_FIELD)
             .size(MAX_DETECTOR_UPPER_LIMIT);
         searchResultIndexBuilder.aggregation(aggregation).size(0);
-        return new SearchRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX).source(searchResultIndexBuilder);
+        return new SearchRequest(CommonName.CONFIG_INDEX).source(searchResultIndexBuilder);
     }
 
     @VisibleForTesting
diff --git a/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java
index 75b1f2d22..a56458337 100644
--- a/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java
@@ -63,6 +63,7 @@
 import org.opensearch.search.sort.FieldSortBuilder;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.collect.ImmutableMap;
@@ -486,7 +487,7 @@ private QueryBuilder generateQuery(SearchTopAnomalyResultRequest request) {
 
         // Adding the date range and anomaly grade filters (needed regardless of real-time or historical)
         RangeQueryBuilder dateRangeFilter = QueryBuilders
-            .rangeQuery(AnomalyResult.DATA_END_TIME_FIELD)
+            .rangeQuery(CommonName.DATA_END_TIME_FIELD)
             .gte(request.getStartTime().toEpochMilli())
             .lte(request.getEndTime().toEpochMilli());
         RangeQueryBuilder anomalyGradeFilter = QueryBuilders.rangeQuery(AnomalyResult.ANOMALY_GRADE_FIELD).gt(0);
diff --git a/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java
index 133c879b0..437610ea5 100644
--- a/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java
@@ -30,7 +30,6 @@
 import org.opensearch.ad.model.AnomalyDetectorType;
 import org.opensearch.ad.stats.ADStats;
 import org.opensearch.ad.stats.ADStatsResponse;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.util.MultiResponsesDelegateActionListener;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
@@ -42,6 +41,8 @@
 import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.TransportService;
 
 public class StatsAnomalyDetectorTransportAction extends HandledTransportAction<ADStatsRequest, StatsAnomalyDetectorResponse> {
@@ -129,11 +130,11 @@ private void getClusterStats(
         if ((adStatsRequest.getStatsToBeRetrieved().contains(StatNames.DETECTOR_COUNT.getName())
             || adStatsRequest.getStatsToBeRetrieved().contains(StatNames.SINGLE_ENTITY_DETECTOR_COUNT.getName())
             || adStatsRequest.getStatsToBeRetrieved().contains(StatNames.MULTI_ENTITY_DETECTOR_COUNT.getName()))
-            && clusterService.state().getRoutingTable().hasIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX)) {
+            && clusterService.state().getRoutingTable().hasIndex(CommonName.CONFIG_INDEX)) {
 
             TermsAggregationBuilder termsAgg = AggregationBuilders.terms(DETECTOR_TYPE_AGG).field(AnomalyDetector.DETECTOR_TYPE_FIELD);
             SearchRequest request = new SearchRequest()
-                .indices(AnomalyDetector.ANOMALY_DETECTORS_INDEX)
+                .indices(CommonName.CONFIG_INDEX)
                 .source(new SearchSourceBuilder().aggregation(termsAgg).size(0).trackTotalHits(true));
 
             client.search(request, ActionListener.wrap(r -> {
diff --git a/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java
index 1932970a7..aae2ca4d4 100644
--- a/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java
@@ -19,8 +19,8 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.InputStreamStreamInput;
 import org.opensearch.common.io.stream.OutputStreamStreamOutput;
@@ -72,7 +72,7 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
         builder.endObject();
         return builder;
     }
diff --git a/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java
index 6b841060f..87ffb9790 100644
--- a/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java
+++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java
@@ -17,13 +17,14 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class ThresholdResultRequest extends ActionRequest implements ToXContentObject {
     private String adID;
@@ -84,9 +85,9 @@ public ActionRequestValidationException validate() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ID_JSON_KEY, adID);
-        builder.field(CommonName.MODEL_ID_KEY, modelID);
-        builder.field(CommonName.RCF_SCORE_JSON_KEY, rcfScore);
+        builder.field(ADCommonName.ID_JSON_KEY, adID);
+        builder.field(CommonName.MODEL_ID_FIELD, modelID);
+        builder.field(ADCommonName.RCF_SCORE_JSON_KEY, rcfScore);
         builder.endObject();
         return builder;
     }
diff --git a/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java
index 82dc1b303..a6cbe06e3 100644
--- a/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java
+++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java
@@ -14,7 +14,7 @@
 import java.io.IOException;
 
 import org.opensearch.action.ActionResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
@@ -52,8 +52,8 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        builder.field(CommonName.ANOMALY_GRADE_JSON_KEY, anomalyGrade);
-        builder.field(CommonName.CONFIDENCE_JSON_KEY, confidence);
+        builder.field(ADCommonName.ANOMALY_GRADE_JSON_KEY, anomalyGrade);
+        builder.field(ADCommonName.CONFIDENCE_JSON_KEY, confidence);
         builder.endObject();
         return builder;
     }
diff --git a/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java b/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java
index 578da576f..f57d80d80 100644
--- a/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java
+++ b/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java
@@ -11,8 +11,8 @@
 
 package org.opensearch.ad.transport.handler;
 
+import static org.opensearch.ad.constant.ADCommonName.ANOMALY_RESULT_INDEX_ALIAS;
 import static org.opensearch.ad.constant.CommonErrorMessages.CAN_NOT_FIND_RESULT_INDEX;
-import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS;
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
 
 import java.util.List;
diff --git a/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java b/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java
index c2d980cde..1f4b10774 100644
--- a/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java
+++ b/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java
@@ -17,7 +17,7 @@
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.transport.ADResultBulkAction;
@@ -61,7 +61,7 @@ public MultiEntityResultHandler(
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtils,
diff --git a/src/main/java/org/opensearch/ad/util/ClientUtil.java b/src/main/java/org/opensearch/ad/util/ClientUtil.java
index 2563997d0..6a3f3bc3e 100644
--- a/src/main/java/org/opensearch/ad/util/ClientUtil.java
+++ b/src/main/java/org/opensearch/ad/util/ClientUtil.java
@@ -38,8 +38,8 @@
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.ad.common.exception.InternalFailure;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.client.Client;
 import org.opensearch.common.inject.Inject;
@@ -205,7 +205,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> Optional
 
             try (ThreadContext.StoredContext context = threadPool.getThreadContext().stashContext()) {
                 assert context != null;
-                threadPool.getThreadContext().putHeader(Task.X_OPAQUE_ID, CommonName.ANOMALY_DETECTOR + ":" + detectorId);
+                threadPool.getThreadContext().putHeader(Task.X_OPAQUE_ID, ADCommonName.ANOMALY_DETECTOR + ":" + detectorId);
                 consumer.accept(request, new LatchedActionListener<Response>(ActionListener.wrap(response -> {
                     // clear negative cache
                     throttler.clearFilteredQuery(detectorId);
@@ -272,7 +272,7 @@ private void onListTaskResponse(ListTasksResponse listTasksResponse, String dete
         TaskId matchedSingleTaskId = null;
         for (TaskInfo task : tasks) {
             if (!task.getHeaders().isEmpty()
-                && task.getHeaders().get(Task.X_OPAQUE_ID).equals(CommonName.ANOMALY_DETECTOR + ":" + detectorId)) {
+                && task.getHeaders().get(Task.X_OPAQUE_ID).equals(ADCommonName.ANOMALY_DETECTOR + ":" + detectorId)) {
                 if (!task.getParentTaskId().equals(TaskId.EMPTY_TASK_ID)) {
                     // we found the parent task, don't need to check more
                     matchedParentTaskId = task.getParentTaskId();
diff --git a/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java b/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java
index ed42a4199..69407a501 100644
--- a/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java
+++ b/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java
@@ -17,7 +17,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
@@ -91,8 +91,8 @@ public boolean test(DiscoveryNode discoveryNode) {
             return discoveryNode.isDataNode()
                 && discoveryNode
                     .getAttributes()
-                    .getOrDefault(CommonName.BOX_TYPE_KEY, CommonName.HOT_BOX_TYPE)
-                    .equals(CommonName.HOT_BOX_TYPE);
+                    .getOrDefault(ADCommonName.BOX_TYPE_KEY, ADCommonName.HOT_BOX_TYPE)
+                    .equals(ADCommonName.HOT_BOX_TYPE);
         }
     }
 }
diff --git a/src/main/java/org/opensearch/ad/util/ParseUtils.java b/src/main/java/org/opensearch/ad/util/ParseUtils.java
index 1db03addb..22a576329 100644
--- a/src/main/java/org/opensearch/ad/util/ParseUtils.java
+++ b/src/main/java/org/opensearch/ad/util/ParseUtils.java
@@ -11,12 +11,12 @@
 
 package org.opensearch.ad.util;
 
+import static org.opensearch.ad.constant.ADCommonName.DATE_HISTOGRAM;
+import static org.opensearch.ad.constant.ADCommonName.EPOCH_MILLIS_FORMAT;
+import static org.opensearch.ad.constant.ADCommonName.FEATURE_AGGS;
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_FIND_DETECTOR_MSG;
 import static org.opensearch.ad.constant.CommonErrorMessages.FAIL_TO_GET_USER_INFO;
 import static org.opensearch.ad.constant.CommonErrorMessages.NO_PERMISSION_TO_ACCESS_DETECTOR;
-import static org.opensearch.ad.constant.CommonName.DATE_HISTOGRAM;
-import static org.opensearch.ad.constant.CommonName.EPOCH_MILLIS_FORMAT;
-import static org.opensearch.ad.constant.CommonName.FEATURE_AGGS;
 import static org.opensearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_END;
 import static org.opensearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_START;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PIECE_SIZE;
@@ -47,7 +47,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.model.Feature;
@@ -82,6 +82,7 @@
 import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.Max;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.carrotsearch.hppc.DoubleArrayList;
 import com.google.common.collect.ImmutableList;
@@ -515,8 +516,8 @@ public static void getDetector(
         NamedXContentRegistry xContentRegistry,
         boolean filterByBackendRole
     ) {
-        if (clusterService.state().metadata().indices().containsKey(AnomalyDetector.ANOMALY_DETECTORS_INDEX)) {
-            GetRequest request = new GetRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX).id(detectorId);
+        if (clusterService.state().metadata().indices().containsKey(CommonName.CONFIG_INDEX)) {
+            GetRequest request = new GetRequest(CommonName.CONFIG_INDEX).id(detectorId);
             client
                 .get(
                     request,
@@ -538,7 +539,7 @@ public static void getDetector(
                         )
                 );
         } else {
-            listener.onFailure(new IndexNotFoundException(AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onFailure(new IndexNotFoundException(CommonName.CONFIG_INDEX));
         }
     }
 
@@ -633,7 +634,7 @@ public static Optional<Long> getLatestDataTime(SearchResponse searchResponse) {
             .ofNullable(searchResponse)
             .map(SearchResponse::getAggregations)
             .map(aggs -> aggs.asMap())
-            .map(map -> (Max) map.get(CommonName.AGG_NAME_MAX_TIME))
+            .map(map -> (Max) map.get(ADCommonName.AGG_NAME_MAX_TIME))
             .map(agg -> (long) agg.getValue());
     }
 
diff --git a/src/main/java/org/opensearch/forecast/constant/ForecastCommonName.java b/src/main/java/org/opensearch/forecast/constant/ForecastCommonName.java
new file mode 100644
index 000000000..8edaf2d2b
--- /dev/null
+++ b/src/main/java/org/opensearch/forecast/constant/ForecastCommonName.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.forecast.constant;
+
+public class ForecastCommonName {
+    // ======================================
+    // Validation
+    // ======================================
+    // detector validation aspect
+    public static final String FORECASTER_ASPECT = "forecaster";
+
+    // ======================================
+    // Used for custom forecast result index
+    // ======================================
+    public static final String DUMMY_FORECAST_RESULT_ID = "dummy_forecast_result_id";
+    public static final String DUMMY_FORECASTER_ID = "dummy_forecaster_id";
+    public static final String CUSTOM_RESULT_INDEX_PREFIX = "opensearch-forecast-result-";
+
+    // ======================================
+    // Index name
+    // ======================================
+    // index name for forecast checkpoint of each model. One model one document.
+    public static final String FORECAST_CHECKPOINT_INDEX_NAME = ".opensearch-forecast-checkpoints";
+    // index name for forecast state. Will store forecast task in this index as well.
+    public static final String FORECAST_STATE_INDEX = ".opensearch-forecast-state";
+    // The alias of the index in which to write forecast result history. Not a hidden index.
+    // Allow users to create dashboard or query freely on top of it.
+    public static final String FORECAST_RESULT_INDEX_ALIAS = "opensearch-forecast-results";
+
+    // ======================================
+    // Used in toXContent
+    // ======================================
+    public static final String ID_JSON_KEY = "forecasterID";
+
+    // ======================================
+    // Used in stats API
+    // ======================================
+    public static final String FORECASTER_ID_KEY = "forecaster_id";
+}
diff --git a/src/main/java/org/opensearch/timeseries/constant/CommonName.java b/src/main/java/org/opensearch/timeseries/constant/CommonName.java
new file mode 100644
index 000000000..ca74d9ff6
--- /dev/null
+++ b/src/main/java/org/opensearch/timeseries/constant/CommonName.java
@@ -0,0 +1,84 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.timeseries.constant;
+
+public class CommonName {
+
+    // ======================================
+    // Index mapping
+    // ======================================
+    // Elastic mapping type
+    public static final String MAPPING_TYPE = "_doc";
+    // used for updating mapping
+    public static final String SCHEMA_VERSION_FIELD = "schema_version";
+
+    // Used to fetch mapping
+    public static final String TYPE = "type";
+    public static final String KEYWORD_TYPE = "keyword";
+    public static final String IP_TYPE = "ip";
+    public static final String DATE_TYPE = "date";
+
+    // ======================================
+    // Index name
+    // ======================================
+    // config index. We are reusing ad detector index.
+    public static final String CONFIG_INDEX = ".opendistro-anomaly-detectors";
+
+    // job index. We are reusing ad job index.
+    public static final String JOB_INDEX = ".opendistro-anomaly-detector-jobs";
+
+    // ======================================
+    // Validation
+    // ======================================
+    public static final String MODEL_ASPECT = "model";
+
+    // ======================================
+    // Used for custom forecast result index
+    // ======================================
+    public static final String PROPERTIES = "properties";
+
+    // ======================================
+    // Used in toXContent
+    // ======================================
+    public static final String START_JSON_KEY = "start";
+    public static final String END_JSON_KEY = "end";
+    public static final String ENTITIES_JSON_KEY = "entities";
+    public static final String ENTITY_KEY = "entity";
+    public static final String VALUE_JSON_KEY = "value";
+    public static final String VALUE_LIST_FIELD = "value_list";
+    public static final String FEATURE_DATA_FIELD = "feature_data";
+    public static final String DATA_START_TIME_FIELD = "data_start_time";
+    public static final String DATA_END_TIME_FIELD = "data_end_time";
+    public static final String EXECUTION_START_TIME_FIELD = "execution_start_time";
+    public static final String EXECUTION_END_TIME_FIELD = "execution_end_time";
+    public static final String ERROR_FIELD = "error";
+    public static final String ENTITY_FIELD = "entity";
+    public static final String USER_FIELD = "user";
+    public static final String CONFIDENCE_FIELD = "confidence";
+    // MODEL_ID_FIELD can be used in profile and stats API as well
+    public static final String MODEL_ID_FIELD = "model_id";
+    public static final String TIMESTAMP = "timestamp";
+    public static final String FIELD_MODEL = "model";
+
+    // entity sample in checkpoint.
+    // kept for bwc purpose
+    public static final String ENTITY_SAMPLE = "sp";
+    // current key for entity samples
+    public static final String ENTITY_SAMPLE_QUEUE = "samples";
+
+    public static final String FORECASTER_ID_FIELD = "forecaster_id";
+
+    // ======================================
+    // Profile name
+    // ======================================
+    public static final String MODEL_SIZE_IN_BYTES = "model_size_in_bytes";
+}
diff --git a/src/main/java/org/opensearch/ad/stats/StatNames.java b/src/main/java/org/opensearch/timeseries/stats/StatNames.java
similarity index 98%
rename from src/main/java/org/opensearch/ad/stats/StatNames.java
rename to src/main/java/org/opensearch/timeseries/stats/StatNames.java
index 6b595dd54..a72e3f1b0 100644
--- a/src/main/java/org/opensearch/ad/stats/StatNames.java
+++ b/src/main/java/org/opensearch/timeseries/stats/StatNames.java
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.ad.stats;
+package org.opensearch.timeseries.stats;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java
index 94571f257..b66d84262 100644
--- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java
+++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java
@@ -20,7 +20,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
 
 import java.io.IOException;
 import java.time.Clock;
@@ -49,7 +48,6 @@
 import org.opensearch.ad.NodeStateManager;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.common.exception.ADValidationException;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.feature.SearchFeatureDao;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.AnomalyDetector;
@@ -68,6 +66,7 @@
 import org.opensearch.rest.RestRequest;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 /**
@@ -345,7 +344,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
                     if (action.equals(SearchAction.INSTANCE)) {
                         assertTrue(request instanceof SearchRequest);
                         SearchRequest searchRequest = (SearchRequest) request;
-                        if (searchRequest.indices()[0].equals(ANOMALY_DETECTORS_INDEX)) {
+                        if (searchRequest.indices()[0].equals(CommonName.CONFIG_INDEX)) {
                             listener.onResponse((Response) detectorResponse);
                         } else {
                             listener.onResponse((Response) userIndexResponse);
@@ -424,8 +423,7 @@ private void testUpdateTemplate(String fieldTypeName) throws IOException {
         int totalHits = 9;
         when(detectorResponse.getHits()).thenReturn(TestHelpers.createSearchHits(totalHits));
 
-        GetResponse getDetectorResponse = TestHelpers
-            .createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        GetResponse getDetectorResponse = TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX);
 
         SearchResponse userIndexResponse = mock(SearchResponse.class);
         int userIndexHits = 0;
@@ -444,7 +442,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
                     if (action.equals(SearchAction.INSTANCE)) {
                         assertTrue(request instanceof SearchRequest);
                         SearchRequest searchRequest = (SearchRequest) request;
-                        if (searchRequest.indices()[0].equals(ANOMALY_DETECTORS_INDEX)) {
+                        if (searchRequest.indices()[0].equals(CommonName.CONFIG_INDEX)) {
                             listener.onResponse((Response) detectorResponse);
                         } else {
                             listener.onResponse((Response) userIndexResponse);
@@ -541,7 +539,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
                     if (action.equals(SearchAction.INSTANCE)) {
                         assertTrue(request instanceof SearchRequest);
                         SearchRequest searchRequest = (SearchRequest) request;
-                        if (searchRequest.indices()[0].equals(ANOMALY_DETECTORS_INDEX)) {
+                        if (searchRequest.indices()[0].equals(CommonName.CONFIG_INDEX)) {
                             listener.onResponse((Response) detectorResponse);
                         } else {
                             listener.onResponse((Response) userIndexResponse);
@@ -622,7 +620,7 @@ public void testTenMultiEntityDetectorsUpdateSingleEntityAdToMulti() throws IOEx
         int totalHits = 10;
         AnomalyDetector existingDetector = TestHelpers.randomAnomalyDetectorUsingCategoryFields(detectorId, null);
         GetResponse getDetectorResponse = TestHelpers
-            .createGetResponse(existingDetector, existingDetector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+            .createGetResponse(existingDetector, existingDetector.getDetectorId(), CommonName.CONFIG_INDEX);
 
         SearchResponse searchResponse = mock(SearchResponse.class);
         when(searchResponse.getHits()).thenReturn(TestHelpers.createSearchHits(totalHits));
@@ -705,8 +703,7 @@ public void testTenMultiEntityDetectorsUpdateSingleEntityAdToMulti() throws IOEx
     public void testTenMultiEntityDetectorsUpdateExistingMultiEntityAd() throws IOException {
         int totalHits = 10;
         AnomalyDetector detector = TestHelpers.randomAnomalyDetectorUsingCategoryFields(detectorId, Arrays.asList("a"));
-        GetResponse getDetectorResponse = TestHelpers
-            .createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        GetResponse getDetectorResponse = TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX);
 
         SearchResponse searchResponse = mock(SearchResponse.class);
         when(searchResponse.getHits()).thenReturn(TestHelpers.createSearchHits(totalHits));
diff --git a/src/test/java/org/opensearch/ad/ADIntegTestCase.java b/src/test/java/org/opensearch/ad/ADIntegTestCase.java
index 68184578c..ab1d7a9eb 100644
--- a/src/test/java/org/opensearch/ad/ADIntegTestCase.java
+++ b/src/test/java/org/opensearch/ad/ADIntegTestCase.java
@@ -41,7 +41,7 @@
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.mock.plugin.MockReindexPlugin;
 import org.opensearch.ad.model.ADTask;
@@ -64,6 +64,7 @@
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.transport.MockTransportService;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import com.google.common.collect.ImmutableMap;
@@ -104,35 +105,35 @@ public void setUp() throws Exception {
 
     public void createDetectors(List<AnomalyDetector> detectors, boolean createIndexFirst) throws IOException {
         if (createIndexFirst) {
-            createIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
+            createIndex(CommonName.CONFIG_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
         }
 
         for (AnomalyDetector detector : detectors) {
-            indexDoc(AnomalyDetector.ANOMALY_DETECTORS_INDEX, detector.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
+            indexDoc(CommonName.CONFIG_INDEX, detector.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
         }
     }
 
     public String createDetector(AnomalyDetector detector) throws IOException {
-        return indexDoc(AnomalyDetector.ANOMALY_DETECTORS_INDEX, detector.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
+        return indexDoc(CommonName.CONFIG_INDEX, detector.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
     }
 
     public String createADResult(AnomalyResult adResult) throws IOException {
-        return indexDoc(CommonName.ANOMALY_RESULT_INDEX_ALIAS, adResult.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
+        return indexDoc(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, adResult.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
     }
 
     public String createADTask(ADTask adTask) throws IOException {
         if (adTask.getTaskId() != null) {
-            return indexDoc(CommonName.DETECTION_STATE_INDEX, adTask.getTaskId(), adTask.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
+            return indexDoc(ADCommonName.DETECTION_STATE_INDEX, adTask.getTaskId(), adTask.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
         }
-        return indexDoc(CommonName.DETECTION_STATE_INDEX, adTask.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
+        return indexDoc(ADCommonName.DETECTION_STATE_INDEX, adTask.toXContent(jsonBuilder(), XCONTENT_WITH_TYPE));
     }
 
     public void createDetectorIndex() throws IOException {
-        createIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
+        createIndex(CommonName.CONFIG_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
     }
 
     public void createADResultIndex() throws IOException {
-        createIndex(CommonName.ANOMALY_RESULT_INDEX_ALIAS, AnomalyDetectionIndices.getAnomalyResultMappings());
+        createIndex(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, AnomalyDetectionIndices.getAnomalyResultMappings());
     }
 
     public void createCustomADResultIndex(String indexName) throws IOException {
@@ -140,7 +141,7 @@ public void createCustomADResultIndex(String indexName) throws IOException {
     }
 
     public void createDetectionStateIndex() throws IOException {
-        createIndex(CommonName.DETECTION_STATE_INDEX, AnomalyDetectionIndices.getDetectionStateMappings());
+        createIndex(ADCommonName.DETECTION_STATE_INDEX, AnomalyDetectionIndices.getDetectionStateMappings());
     }
 
     public void createTestDataIndex(String indexName) {
@@ -162,7 +163,7 @@ public void createIndex(String indexName, String mappings) {
     }
 
     public AcknowledgedResponse deleteDetectorIndex() {
-        return deleteIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        return deleteIndex(CommonName.CONFIG_INDEX);
     }
 
     public AcknowledgedResponse deleteIndex(String indexName) {
@@ -241,7 +242,7 @@ public long countDetectorDocs(String detectorId) {
         SearchRequest request = new SearchRequest();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         searchSourceBuilder.query(new TermQueryBuilder("detector_id", detectorId)).size(10);
-        request.indices(CommonName.DETECTION_STATE_INDEX).source(searchSourceBuilder);
+        request.indices(ADCommonName.DETECTION_STATE_INDEX).source(searchSourceBuilder);
         SearchResponse searchResponse = client().search(request).actionGet(timeout);
         return searchResponse.getHits().getTotalHits().value;
     }
diff --git a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
index b3b13bb7d..c585721eb 100644
--- a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
+++ b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES;
 import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
 
@@ -56,7 +55,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.EndRunException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -90,6 +89,7 @@
 import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import org.opensearch.jobscheduler.spi.utils.LockService;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -191,9 +191,9 @@ public void setup() throws Exception {
             GetRequest request = (GetRequest) args[0];
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
-            if (request.index().equals(ANOMALY_DETECTOR_JOB_INDEX)) {
+            if (request.index().equals(CommonName.JOB_INDEX)) {
                 AnomalyDetectorJob job = TestHelpers.randomAnomalyDetectorJob(true);
-                listener.onResponse(TestHelpers.createGetResponse(job, randomAlphaOfLength(5), ANOMALY_DETECTOR_JOB_INDEX));
+                listener.onResponse(TestHelpers.createGetResponse(job, randomAlphaOfLength(5), CommonName.JOB_INDEX));
             }
             return null;
         }).when(client).get(any(), any());
@@ -215,7 +215,7 @@ public void setup() throws Exception {
             }
 
             assertTrue(request != null && listener != null);
-            ShardId shardId = new ShardId(new Index(ANOMALY_DETECTOR_JOB_INDEX, randomAlphaOfLength(10)), 0);
+            ShardId shardId = new ShardId(new Index(CommonName.JOB_INDEX, randomAlphaOfLength(10)), 0);
             listener.onResponse(new IndexResponse(shardId, request.id(), 1, 1, 1, true));
 
             return null;
@@ -375,14 +375,14 @@ public void testRunAdJobWithEndRunExceptionNowAndNotExistingDisabledAdJob() {
     }
 
     private void testRunAdJobWithEndRunExceptionNowAndStopAdJob(boolean jobExists, boolean jobEnabled, boolean disableSuccessfully) {
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
         Exception exception = new EndRunException(jobParameter.getName(), randomAlphaOfLength(5), true);
 
         doAnswer(invocation -> {
             ActionListener<GetResponse> listener = invocation.getArgument(1);
             GetResponse response = new GetResponse(
                 new GetResult(
-                    AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+                    CommonName.JOB_INDEX,
                     jobParameter.getName(),
                     UNASSIGNED_SEQ_NO,
                     0,
@@ -415,7 +415,7 @@ private void testRunAdJobWithEndRunExceptionNowAndStopAdJob(boolean jobExists, b
         doAnswer(invocation -> {
             IndexRequest request = invocation.getArgument(0);
             ActionListener<IndexResponse> listener = invocation.getArgument(1);
-            ShardId shardId = new ShardId(new Index(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, randomAlphaOfLength(10)), 0);
+            ShardId shardId = new ShardId(new Index(CommonName.JOB_INDEX, randomAlphaOfLength(10)), 0);
             if (disableSuccessfully) {
                 listener.onResponse(new IndexResponse(shardId, request.id(), 1, 1, 1, true));
             } else {
@@ -476,7 +476,7 @@ public void testRunAdJobWithEndRunExceptionNowAndFailToGetJob() {
             GetRequest request = (GetRequest) args[0];
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
-            if (request.index().equals(ANOMALY_DETECTOR_JOB_INDEX)) {
+            if (request.index().equals(CommonName.JOB_INDEX)) {
                 listener.onFailure(new RuntimeException("fail to get AD job"));
             }
             return null;
@@ -499,7 +499,7 @@ public void testRunAdJobWithEndRunExceptionNowAndFailToGetJob() {
 
     @Test
     public void testRunAdJobWithEndRunExceptionNotNowAndRetryUntilStop() throws InterruptedException {
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
         Instant executionStartTime = Instant.now();
         Schedule schedule = mock(IntervalSchedule.class);
         when(jobParameter.getSchedule()).thenReturn(schedule);
@@ -578,7 +578,7 @@ public void testFailtoFindDetector() {
             return null;
         }).when(nodeStateManager).getAnomalyDetector(any(String.class), any(ActionListener.class));
 
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
 
         runner.runAdJob(jobParameter, lockService, lock, Instant.now().minusSeconds(60), executionStartTime, recorder, detector);
 
@@ -607,7 +607,7 @@ public void testFailtoFindJob() {
             return null;
         }).when(nodeStateManager).getAnomalyDetectorJob(any(String.class), any(ActionListener.class));
 
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
 
         runner.runAdJob(jobParameter, lockService, lock, Instant.now().minusSeconds(60), executionStartTime, recorder, detector);
 
@@ -630,7 +630,7 @@ public void testEmptyDetector() {
             return null;
         }).when(nodeStateManager).getAnomalyDetector(any(String.class), any(ActionListener.class));
 
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
 
         runner.runAdJob(jobParameter, lockService, lock, Instant.now().minusSeconds(60), executionStartTime, recorder, detector);
 
@@ -659,7 +659,7 @@ public void testEmptyJob() {
             return null;
         }).when(nodeStateManager).getAnomalyDetectorJob(any(String.class), any(ActionListener.class));
 
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
 
         runner.runAdJob(jobParameter, lockService, lock, Instant.now().minusSeconds(60), executionStartTime, recorder, detector);
 
@@ -678,7 +678,7 @@ public void testMarkResultIndexQueried() throws IOException {
             .newInstance()
             .setDetectionInterval(new IntervalTimeConfiguration(1, ChronoUnit.MINUTES))
             .setCategoryFields(ImmutableList.of(randomAlphaOfLength(5)))
-            .setResultIndex(CommonName.CUSTOM_RESULT_INDEX_PREFIX + "index")
+            .setResultIndex(ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "index")
             .build();
         Instant executionStartTime = confirmInitializedSetup();
 
@@ -748,7 +748,7 @@ public void testMarkResultIndexQueried() throws IOException {
 
         assertEquals(false, adTaskCacheManager.hasQueriedResultIndex(detector.getDetectorId()));
 
-        LockModel lock = new LockModel(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
+        LockModel lock = new LockModel(CommonName.JOB_INDEX, jobParameter.getName(), Instant.now(), 10, false);
 
         runner.runAdJob(jobParameter, lockService, lock, Instant.now().minusSeconds(60), executionStartTime, recorder, detector);
 
diff --git a/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java
index 57a6d11b4..335d2eae2 100644
--- a/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java
+++ b/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java
@@ -17,8 +17,6 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -42,8 +40,8 @@
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -66,6 +64,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.RemoteTransportException;
 
 public class AnomalyDetectorProfileRunnerTests extends AbstractProfileRunnerTests {
@@ -120,16 +119,13 @@ private void setUpClientGet(
             GetRequest request = (GetRequest) args[0];
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
-            if (request.index().equals(ANOMALY_DETECTORS_INDEX)) {
+            if (request.index().equals(CommonName.CONFIG_INDEX)) {
                 switch (detectorStatus) {
                     case EXIST:
-                        listener
-                            .onResponse(
-                                TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX)
-                            );
+                        listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
                         break;
                     case INDEX_NOT_EXIST:
-                        listener.onFailure(new IndexNotFoundException(ANOMALY_DETECTORS_INDEX));
+                        listener.onFailure(new IndexNotFoundException(CommonName.CONFIG_INDEX));
                         break;
                     case NO_DOC:
                         when(detectorGetReponse.isExists()).thenReturn(false);
@@ -139,25 +135,19 @@ private void setUpClientGet(
                         assertTrue("should not reach here", false);
                         break;
                 }
-            } else if (request.index().equals(ANOMALY_DETECTOR_JOB_INDEX)) {
+            } else if (request.index().equals(CommonName.JOB_INDEX)) {
                 AnomalyDetectorJob job = null;
                 switch (jobStatus) {
                     case INDEX_NOT_EXIT:
-                        listener.onFailure(new IndexNotFoundException(ANOMALY_DETECTOR_JOB_INDEX));
+                        listener.onFailure(new IndexNotFoundException(CommonName.JOB_INDEX));
                         break;
                     case DISABLED:
                         job = TestHelpers.randomAnomalyDetectorJob(false, jobEnabledTime, null);
-                        listener
-                            .onResponse(
-                                TestHelpers.createGetResponse(job, detector.getDetectorId(), AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
-                            );
+                        listener.onResponse(TestHelpers.createGetResponse(job, detector.getDetectorId(), CommonName.JOB_INDEX));
                         break;
                     case ENABLED:
                         job = TestHelpers.randomAnomalyDetectorJob(true, jobEnabledTime, null);
-                        listener
-                            .onResponse(
-                                TestHelpers.createGetResponse(job, detector.getDetectorId(), AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
-                            );
+                        listener.onResponse(TestHelpers.createGetResponse(job, detector.getDetectorId(), CommonName.JOB_INDEX));
                         break;
                     default:
                         assertTrue("should not reach here", false);
@@ -165,7 +155,7 @@ private void setUpClientGet(
                 }
             } else {
                 if (errorResultStatus == ErrorResultStatus.INDEX_NOT_EXIT) {
-                    listener.onFailure(new IndexNotFoundException(CommonName.DETECTION_STATE_INDEX));
+                    listener.onFailure(new IndexNotFoundException(ADCommonName.DETECTION_STATE_INDEX));
                     return null;
                 }
                 DetectorInternalState.Builder result = new DetectorInternalState.Builder().lastUpdateTime(Instant.now());
@@ -175,7 +165,9 @@ private void setUpClientGet(
                     result.error(error);
                 }
                 listener
-                    .onResponse(TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), CommonName.DETECTION_STATE_INDEX));
+                    .onResponse(
+                        TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), ADCommonName.DETECTION_STATE_INDEX)
+                    );
 
             }
 
@@ -479,7 +471,7 @@ private void setUpClientExecuteRCFPollingAction(RCFPollingStatus inittedEverResu
                         break;
                     case INDEX_NOT_FOUND:
                     case REMOTE_INDEX_NOT_FOUND:
-                        cause = new IndexNotFoundException(detectorId, CommonName.CHECKPOINT_INDEX_NAME);
+                        cause = new IndexNotFoundException(detectorId, ADCommonName.CHECKPOINT_INDEX_NAME);
                         break;
                     default:
                         assertTrue("should not reach here", false);
diff --git a/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java
index ca1157444..1213c68fe 100644
--- a/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java
+++ b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java
@@ -14,8 +14,6 @@
 import static java.util.Collections.emptyMap;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 
 import java.io.IOException;
 import java.time.temporal.ChronoUnit;
@@ -34,8 +32,8 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchResponseSections;
 import org.opensearch.action.search.ShardSearchFailure;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.model.Entity;
@@ -60,6 +58,7 @@
 import org.opensearch.search.aggregations.InternalAggregations;
 import org.opensearch.search.aggregations.metrics.InternalMax;
 import org.opensearch.search.internal.InternalSearchResponse;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class EntityProfileRunnerTests extends AbstractADTest {
     private AnomalyDetector detector;
@@ -144,14 +143,10 @@ public void setUp() throws Exception {
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
             String indexName = request.index();
-            if (indexName.equals(ANOMALY_DETECTORS_INDEX)) {
-                listener
-                    .onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
-            } else if (indexName.equals(ANOMALY_DETECTOR_JOB_INDEX)) {
-                listener
-                    .onResponse(
-                        TestHelpers.createGetResponse(job, detector.getDetectorId(), AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
-                    );
+            if (indexName.equals(CommonName.CONFIG_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
+            } else if (indexName.equals(CommonName.JOB_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(job, detector.getDetectorId(), CommonName.JOB_INDEX));
             }
 
             return null;
@@ -169,8 +164,8 @@ private void setUpSearch() {
             SearchRequest request = (SearchRequest) args[0];
             String indexName = request.indices()[0];
             ActionListener<SearchResponse> listener = (ActionListener<SearchResponse>) args[1];
-            if (indexName.equals(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
-                InternalMax maxAgg = new InternalMax(CommonName.AGG_NAME_MAX_TIME, latestSampleTimestamp, DocValueFormat.RAW, emptyMap());
+            if (indexName.equals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+                InternalMax maxAgg = new InternalMax(ADCommonName.AGG_NAME_MAX_TIME, latestSampleTimestamp, DocValueFormat.RAW, emptyMap());
                 InternalAggregations internalAggregations = InternalAggregations.from(Collections.singletonList(maxAgg));
 
                 SearchHits hits = new SearchHits(new SearchHit[] {}, null, Float.NaN);
@@ -229,8 +224,8 @@ private void setUpExecuteEntityProfileAction(InittedEverResultStatus initted) {
             String indexName = request.indices()[0];
             ActionListener<SearchResponse> listener = (ActionListener<SearchResponse>) args[1];
             SearchResponse searchResponse = null;
-            if (indexName.equals(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
-                InternalMax maxAgg = new InternalMax(CommonName.AGG_NAME_MAX_TIME, latestSampleTimestamp, DocValueFormat.RAW, emptyMap());
+            if (indexName.equals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+                InternalMax maxAgg = new InternalMax(ADCommonName.AGG_NAME_MAX_TIME, latestSampleTimestamp, DocValueFormat.RAW, emptyMap());
                 InternalAggregations internalAggregations = InternalAggregations.from(Collections.singletonList(maxAgg));
 
                 SearchHits hits = new SearchHits(new SearchHit[] {}, null, Float.NaN);
@@ -356,11 +351,10 @@ public void testJobIndexNotFound() throws InterruptedException {
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
             String indexName = request.index();
-            if (indexName.equals(ANOMALY_DETECTORS_INDEX)) {
-                listener
-                    .onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
-            } else if (indexName.equals(ANOMALY_DETECTOR_JOB_INDEX)) {
-                listener.onFailure(new IndexNotFoundException(ANOMALY_DETECTOR_JOB_INDEX));
+            if (indexName.equals(CommonName.CONFIG_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
+            } else if (indexName.equals(CommonName.JOB_INDEX)) {
+                listener.onFailure(new IndexNotFoundException(CommonName.JOB_INDEX));
             }
 
             return null;
@@ -389,9 +383,8 @@ public void testNotMultiEntityDetector() throws IOException, InterruptedExceptio
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
             String indexName = request.index();
-            if (indexName.equals(ANOMALY_DETECTORS_INDEX)) {
-                listener
-                    .onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            if (indexName.equals(CommonName.CONFIG_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
             }
 
             return null;
diff --git a/src/test/java/org/opensearch/ad/HistoricalAnalysisIntegTestCase.java b/src/test/java/org/opensearch/ad/HistoricalAnalysisIntegTestCase.java
index cb4bdc892..1c34e7098 100644
--- a/src/test/java/org/opensearch/ad/HistoricalAnalysisIntegTestCase.java
+++ b/src/test/java/org/opensearch/ad/HistoricalAnalysisIntegTestCase.java
@@ -34,7 +34,7 @@
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.mock.plugin.MockReindexPlugin;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.ADTaskState;
@@ -55,6 +55,7 @@
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.test.transport.MockTransportService;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -191,7 +192,7 @@ public List<ADTask> searchADTasks(String detectorId, String parentTaskId, Boolea
         SearchRequest searchRequest = new SearchRequest();
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.query(query).sort(EXECUTION_START_TIME_FIELD, SortOrder.DESC).trackTotalHits(true).size(size);
-        searchRequest.source(sourceBuilder).indices(CommonName.DETECTION_STATE_INDEX);
+        searchRequest.source(sourceBuilder).indices(ADCommonName.DETECTION_STATE_INDEX);
         SearchResponse searchResponse = client().search(searchRequest).actionGet();
         Iterator<SearchHit> iterator = searchResponse.getHits().iterator();
 
@@ -205,13 +206,13 @@ public List<ADTask> searchADTasks(String detectorId, String parentTaskId, Boolea
     }
 
     public ADTask getADTask(String taskId) throws IOException {
-        ADTask adTask = toADTask(getDoc(CommonName.DETECTION_STATE_INDEX, taskId));
+        ADTask adTask = toADTask(getDoc(ADCommonName.DETECTION_STATE_INDEX, taskId));
         adTask.setTaskId(taskId);
         return adTask;
     }
 
     public AnomalyDetectorJob getADJob(String detectorId) throws IOException {
-        return toADJob(getDoc(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, detectorId));
+        return toADJob(getDoc(CommonName.JOB_INDEX, detectorId));
     }
 
     public ADTask toADTask(GetResponse doc) throws IOException {
diff --git a/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java
index d0753c481..825e6c069 100644
--- a/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java
+++ b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java
@@ -17,8 +17,6 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 
 import java.time.Clock;
 import java.time.Instant;
@@ -45,7 +43,7 @@
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -65,6 +63,7 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 public class MultiEntityProfileRunnerTests extends AbstractADTest {
@@ -150,17 +149,15 @@ public void setUp() throws Exception {
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
             String indexName = request.index();
-            if (indexName.equals(ANOMALY_DETECTORS_INDEX)) {
-                listener
-                    .onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
-            } else if (indexName.equals(CommonName.DETECTION_STATE_INDEX)) {
-                listener
-                    .onResponse(TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), CommonName.DETECTION_STATE_INDEX));
-            } else if (indexName.equals(ANOMALY_DETECTOR_JOB_INDEX)) {
+            if (indexName.equals(CommonName.CONFIG_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
+            } else if (indexName.equals(ADCommonName.DETECTION_STATE_INDEX)) {
                 listener
                     .onResponse(
-                        TestHelpers.createGetResponse(job, detector.getDetectorId(), AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
+                        TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), ADCommonName.DETECTION_STATE_INDEX)
                     );
+            } else if (indexName.equals(CommonName.JOB_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(job, detector.getDetectorId(), CommonName.JOB_INDEX));
             }
 
             return null;
diff --git a/src/test/java/org/opensearch/ad/NodeStateManagerTests.java b/src/test/java/org/opensearch/ad/NodeStateManagerTests.java
index a754b275c..8aba72aa0 100644
--- a/src/test/java/org/opensearch/ad/NodeStateManagerTests.java
+++ b/src/test/java/org/opensearch/ad/NodeStateManagerTests.java
@@ -62,6 +62,7 @@
 import org.opensearch.test.ClusterServiceUtils;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableMap;
 
@@ -166,10 +167,7 @@ private String setupDetector() throws IOException {
             }
 
             assertTrue(request != null && listener != null);
-            listener
-                .onResponse(
-                    TestHelpers.createGetResponse(detectorToCheck, detectorToCheck.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX)
-                );
+            listener.onResponse(TestHelpers.createGetResponse(detectorToCheck, detectorToCheck.getDetectorId(), CommonName.CONFIG_INDEX));
 
             return null;
         }).when(client).get(any(), any(ActionListener.class));
@@ -399,8 +397,8 @@ private String setupJob() throws IOException {
         doAnswer(invocation -> {
             GetRequest request = invocation.getArgument(0);
             ActionListener<GetResponse> listener = invocation.getArgument(1);
-            if (request.index().equals(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)) {
-                listener.onResponse(TestHelpers.createGetResponse(jobToCheck, detectorId, AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX));
+            if (request.index().equals(CommonName.JOB_INDEX)) {
+                listener.onResponse(TestHelpers.createGetResponse(jobToCheck, detectorId, CommonName.JOB_INDEX));
             }
             return null;
         }).when(client).get(any(), any(ActionListener.class));
diff --git a/src/test/java/org/opensearch/ad/TestHelpers.java b/src/test/java/org/opensearch/ad/TestHelpers.java
index 115a75e84..f6c208a1a 100644
--- a/src/test/java/org/opensearch/ad/TestHelpers.java
+++ b/src/test/java/org/opensearch/ad/TestHelpers.java
@@ -12,7 +12,6 @@
 package org.opensearch.ad;
 
 import static org.apache.hc.core5.http.ContentType.APPLICATION_JSON;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.cluster.node.DiscoveryNodeRole.BUILT_IN_ROLES;
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
@@ -58,8 +57,8 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.ShardSearchFailure;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.constant.CommonValue;
 import org.opensearch.ad.feature.Features;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
@@ -141,6 +140,7 @@
 import org.opensearch.test.ClusterServiceUtils;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -1107,8 +1107,12 @@ public static void createEmptyIndexMapping(RestClient client, String indexName,
     }
 
     public static void createEmptyAnomalyResultIndex(RestClient client) throws IOException {
-        createEmptyIndex(client, CommonName.ANOMALY_RESULT_INDEX_ALIAS);
-        createIndexMapping(client, CommonName.ANOMALY_RESULT_INDEX_ALIAS, toHttpEntity(AnomalyDetectionIndices.getAnomalyResultMappings()));
+        createEmptyIndex(client, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        createIndexMapping(
+            client,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            toHttpEntity(AnomalyDetectionIndices.getAnomalyResultMappings())
+        );
     }
 
     public static void createEmptyIndex(RestClient client, String indexName) throws IOException {
@@ -1512,7 +1516,7 @@ public static ClusterState createClusterState() {
         ImmutableOpenMap<String, IndexMetadata> immutableOpenMap = ImmutableOpenMap
             .<String, IndexMetadata>builder()
             .fPut(
-                ANOMALY_DETECTOR_JOB_INDEX,
+                CommonName.JOB_INDEX,
                 IndexMetadata
                     .builder("test")
                     .settings(
diff --git a/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java b/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java
index 268133bfc..653c19a2b 100644
--- a/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java
@@ -29,7 +29,7 @@
 import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.cluster.ClusterChangedEvent;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
@@ -119,7 +119,7 @@ public void testUnchangedClusterState() {
 
     public void testIsWarmNode() {
         HashMap<String, String> attributesForNode1 = new HashMap<>();
-        attributesForNode1.put(CommonName.BOX_TYPE_KEY, CommonName.WARM_BOX_TYPE);
+        attributesForNode1.put(ADCommonName.BOX_TYPE_KEY, ADCommonName.WARM_BOX_TYPE);
         dataNode1 = new DiscoveryNode(dataNode1Id, buildNewFakeTransportAddress(), attributesForNode1, BUILT_IN_ROLES, Version.CURRENT);
 
         ClusterState warmNodeClusterState = ClusterState
diff --git a/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java b/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java
index 748da9e80..a6623e9d7 100644
--- a/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java
@@ -21,8 +21,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.constant.CommonName.DETECTION_STATE_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
+import static org.opensearch.ad.constant.ADCommonName.DETECTION_STATE_INDEX;
 
 import org.apache.lucene.search.TotalHits;
 import org.junit.Before;
@@ -48,6 +47,7 @@
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.InternalAggregations;
 import org.opensearch.search.internal.InternalSearchResponse;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class ADDataMigratorTests extends ADUnitTestCase {
     private Client client;
@@ -442,7 +442,7 @@ public void testMigrateDataWithNoAvailableShardsException() {
     public void testMigrateDataWithIndexNotFoundException() {
         doAnswer(invocation -> {
             ActionListener<SearchResponse> listener = invocation.getArgument(1);
-            listener.onFailure(new IndexNotFoundException(ANOMALY_DETECTOR_JOB_INDEX));
+            listener.onFailure(new IndexNotFoundException(CommonName.JOB_INDEX));
             return null;
         }).when(client).search(any(), any());
         when(detectionIndices.doesAnomalyDetectorJobIndexExist()).thenReturn(true);
diff --git a/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java b/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java
index 8a3d45302..c7ec778a5 100644
--- a/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java
@@ -29,7 +29,7 @@
 import org.junit.Before;
 import org.opensearch.ad.AbstractADTest;
 import org.opensearch.ad.cluster.diskcleanup.ModelCheckpointIndexRetention;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.ClientUtil;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
@@ -75,7 +75,7 @@ public void setUp() throws Exception {
         clock = mock(Clock.class);
         clientUtil = mock(ClientUtil.class);
         HashMap<String, String> ignoredAttributes = new HashMap<String, String>();
-        ignoredAttributes.put(CommonName.BOX_TYPE_KEY, CommonName.WARM_BOX_TYPE);
+        ignoredAttributes.put(ADCommonName.BOX_TYPE_KEY, ADCommonName.WARM_BOX_TYPE);
         nodeFilter = new DiscoveryNodeFilterer(clusterService);
 
         clusterManagerService = new ClusterManagerEventListener(
diff --git a/src/test/java/org/opensearch/ad/cluster/HashRingTests.java b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java
index 383dbc1fd..cd94385c7 100644
--- a/src/test/java/org/opensearch/ad/cluster/HashRingTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.opensearch.action.admin.cluster.node.info.PluginsAndModules;
 import org.opensearch.ad.ADUnitTestCase;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
 import org.opensearch.client.AdminClient;
@@ -85,7 +85,7 @@ public void setUp() throws Exception {
         newNodeId = "newNode";
         newNode = createNode(newNodeId, "127.0.0.2", 9201, emptyMap());
         warmNodeId = "warmNode";
-        warmNode = createNode(warmNodeId, "127.0.0.3", 9202, ImmutableMap.of(CommonName.BOX_TYPE_KEY, CommonName.WARM_BOX_TYPE));
+        warmNode = createNode(warmNodeId, "127.0.0.3", 9202, ImmutableMap.of(ADCommonName.BOX_TYPE_KEY, ADCommonName.WARM_BOX_TYPE));
 
         settings = Settings.builder().put(COOLDOWN_MINUTES.getKey(), TimeValue.timeValueSeconds(5)).build();
         ClusterSettings clusterSettings = clusterSetting(settings, COOLDOWN_MINUTES);
@@ -248,7 +248,7 @@ private NodeInfo createNodeInfo(DiscoveryNode node, String version) {
         plugins
             .add(
                 new PluginInfo(
-                    CommonName.AD_PLUGIN_NAME,
+                    ADCommonName.AD_PLUGIN_NAME,
                     randomAlphaOfLengthBetween(3, 10),
                     version,
                     Version.CURRENT,
diff --git a/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java
index 7cb4b4865..e5fa6cd93 100644
--- a/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java
@@ -29,7 +29,7 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.transport.CronAction;
 import org.opensearch.ad.transport.CronNodeResponse;
 import org.opensearch.ad.transport.CronResponse;
@@ -59,7 +59,7 @@ public void templateHourlyCron(HourlyCronTestExecutionMode mode) {
         ClusterState state = ClusterCreation.state(1);
         when(clusterService.state()).thenReturn(state);
         HashMap<String, String> ignoredAttributes = new HashMap<String, String>();
-        ignoredAttributes.put(CommonName.BOX_TYPE_KEY, CommonName.WARM_BOX_TYPE);
+        ignoredAttributes.put(ADCommonName.BOX_TYPE_KEY, ADCommonName.WARM_BOX_TYPE);
         DiscoveryNodeFilterer nodeFilter = new DiscoveryNodeFilterer(clusterService);
 
         Client client = mock(Client.class);
diff --git a/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java b/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java
index 8da501562..ffdb1a042 100644
--- a/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java
+++ b/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java
@@ -28,7 +28,7 @@
 import org.mockito.MockitoAnnotations;
 import org.opensearch.action.ActionListener;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 
 public class ModelCheckpointIndexRetentionTests extends AbstractADTest {
 
@@ -70,12 +70,14 @@ public void testRunWithCleanupAsNeeded() throws Exception {
             ActionListener<Boolean> listener = (ActionListener<Boolean>) args[3];
             listener.onResponse(true);
             return null;
-        }).when(indexCleanup).deleteDocsBasedOnShardSize(eq(CommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
+        })
+            .when(indexCleanup)
+            .deleteDocsBasedOnShardSize(eq(ADCommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
 
         modelCheckpointIndexRetention.run();
         verify(indexCleanup, times(2))
-            .deleteDocsBasedOnShardSize(eq(CommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
-        verify(indexCleanup).deleteDocsByQuery(eq(CommonName.CHECKPOINT_INDEX_NAME), any(), any());
+            .deleteDocsBasedOnShardSize(eq(ADCommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
+        verify(indexCleanup).deleteDocsByQuery(eq(ADCommonName.CHECKPOINT_INDEX_NAME), any(), any());
     }
 
     @SuppressWarnings("unchecked")
@@ -86,10 +88,12 @@ public void testRunWithCleanupAsFalse() throws Exception {
             ActionListener<Boolean> listener = (ActionListener<Boolean>) args[3];
             listener.onResponse(false);
             return null;
-        }).when(indexCleanup).deleteDocsBasedOnShardSize(eq(CommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
+        })
+            .when(indexCleanup)
+            .deleteDocsBasedOnShardSize(eq(ADCommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
 
         modelCheckpointIndexRetention.run();
-        verify(indexCleanup).deleteDocsBasedOnShardSize(eq(CommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
-        verify(indexCleanup).deleteDocsByQuery(eq(CommonName.CHECKPOINT_INDEX_NAME), any(), any());
+        verify(indexCleanup).deleteDocsBasedOnShardSize(eq(ADCommonName.CHECKPOINT_INDEX_NAME), eq(50 * 1024 * 1024 * 1024L), any(), any());
+        verify(indexCleanup).deleteDocsByQuery(eq(ADCommonName.CHECKPOINT_INDEX_NAME), any(), any());
     }
 }
diff --git a/src/test/java/org/opensearch/ad/common/exception/ADValidationExceptionTests.java b/src/test/java/org/opensearch/ad/common/exception/ADValidationExceptionTests.java
index f5e3bb030..9c75b82e9 100644
--- a/src/test/java/org/opensearch/ad/common/exception/ADValidationExceptionTests.java
+++ b/src/test/java/org/opensearch/ad/common/exception/ADValidationExceptionTests.java
@@ -11,10 +11,10 @@
 
 package org.opensearch.ad.common.exception;
 
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.DetectorValidationIssueType;
 import org.opensearch.ad.model.ValidationAspect;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class ADValidationExceptionTests extends OpenSearchTestCase {
     public void testConstructorDetector() {
diff --git a/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java b/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java
index 46f2710a3..1251cf87d 100644
--- a/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java
+++ b/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java
@@ -63,7 +63,7 @@
 import org.opensearch.action.search.ShardSearchFailure;
 import org.opensearch.ad.AnomalyDetectorPlugin;
 import org.opensearch.ad.NodeStateManager;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.dataprocessor.Interpolator;
 import org.opensearch.ad.dataprocessor.LinearUniformInterpolator;
 import org.opensearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator;
@@ -215,7 +215,7 @@ public void setup() throws Exception {
         searchRequest = new SearchRequest(detector.getIndices().toArray(new String[0]));
         aggsMap = new HashMap<>();
 
-        when(max.getName()).thenReturn(CommonName.AGG_NAME_MAX_TIME);
+        when(max.getName()).thenReturn(ADCommonName.AGG_NAME_MAX_TIME);
         List<Aggregation> list = new ArrayList<>();
         list.add(max);
         Aggregations aggregations = new Aggregations(list);
@@ -250,11 +250,11 @@ public void setup() throws Exception {
     @SuppressWarnings("unchecked")
     public void getLatestDataTime_returnExpectedToListener() {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder()
-            .aggregation(AggregationBuilders.max(CommonName.AGG_NAME_MAX_TIME).field(detector.getTimeField()))
+            .aggregation(AggregationBuilders.max(ADCommonName.AGG_NAME_MAX_TIME).field(detector.getTimeField()))
             .size(0);
         searchRequest.source(searchSourceBuilder);
         long epochTime = 100L;
-        aggsMap.put(CommonName.AGG_NAME_MAX_TIME, max);
+        aggsMap.put(ADCommonName.AGG_NAME_MAX_TIME, max);
         when(max.getValue()).thenReturn((double) epochTime);
         doAnswer(invocation -> {
             ActionListener<SearchResponse> listener = invocation.getArgument(1);
diff --git a/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java b/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java
index 529ae9c1f..42176cee4 100644
--- a/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java
+++ b/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java
@@ -20,7 +20,7 @@
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.ad.AnomalyDetectorPlugin;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
@@ -32,6 +32,7 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.test.OpenSearchIntegTestCase;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class AnomalyDetectionIndicesTests extends OpenSearchIntegTestCase {
 
@@ -78,7 +79,7 @@ public void testAnomalyDetectorIndexExists() throws IOException {
             boolean acknowledged = response.isAcknowledged();
             assertTrue(acknowledged);
         }, failure -> { throw new RuntimeException("should not recreate index"); }));
-        TestHelpers.waitForIndexCreationToComplete(client(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        TestHelpers.waitForIndexCreationToComplete(client(), CommonName.CONFIG_INDEX);
     }
 
     public void testAnomalyDetectorIndexExistsAndNotRecreate() throws IOException {
@@ -90,18 +91,14 @@ public void testAnomalyDetectorIndexExistsAndNotRecreate() throws IOException {
                         failure -> { throw new RuntimeException("should not recreate index"); }
                     )
             );
-        TestHelpers.waitForIndexCreationToComplete(client(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
-        if (client().admin().indices().prepareExists(AnomalyDetector.ANOMALY_DETECTORS_INDEX).get().isExists()) {
+        TestHelpers.waitForIndexCreationToComplete(client(), CommonName.CONFIG_INDEX);
+        if (client().admin().indices().prepareExists(CommonName.CONFIG_INDEX).get().isExists()) {
             indices
                 .initAnomalyDetectorIndexIfAbsent(
                     TestHelpers
                         .createActionListener(
-                            response -> {
-                                throw new RuntimeException("should not recreate index " + AnomalyDetector.ANOMALY_DETECTORS_INDEX);
-                            },
-                            failure -> {
-                                throw new RuntimeException("should not recreate index " + AnomalyDetector.ANOMALY_DETECTORS_INDEX);
-                            }
+                            response -> { throw new RuntimeException("should not recreate index " + CommonName.CONFIG_INDEX); },
+                            failure -> { throw new RuntimeException("should not recreate index " + CommonName.CONFIG_INDEX); }
                         )
                 );
         }
@@ -117,7 +114,7 @@ public void testAnomalyResultIndexExists() throws IOException {
             boolean acknowledged = response.isAcknowledged();
             assertTrue(acknowledged);
         }, failure -> { throw new RuntimeException("should not recreate index"); }));
-        TestHelpers.waitForIndexCreationToComplete(client(), CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        TestHelpers.waitForIndexCreationToComplete(client(), ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
     }
 
     public void testAnomalyResultIndexExistsAndNotRecreate() throws IOException {
@@ -129,17 +126,17 @@ public void testAnomalyResultIndexExistsAndNotRecreate() throws IOException {
                         failure -> { throw new RuntimeException("should not recreate index"); }
                     )
             );
-        TestHelpers.waitForIndexCreationToComplete(client(), CommonName.ANOMALY_RESULT_INDEX_ALIAS);
-        if (client().admin().indices().prepareExists(CommonName.ANOMALY_RESULT_INDEX_ALIAS).get().isExists()) {
+        TestHelpers.waitForIndexCreationToComplete(client(), ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        if (client().admin().indices().prepareExists(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS).get().isExists()) {
             indices
                 .initDefaultAnomalyResultIndexIfAbsent(
                     TestHelpers
                         .createActionListener(
                             response -> {
-                                throw new RuntimeException("should not recreate index " + CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+                                throw new RuntimeException("should not recreate index " + ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
                             },
                             failure -> {
-                                throw new RuntimeException("should not recreate index " + CommonName.ANOMALY_RESULT_INDEX_ALIAS, failure);
+                                throw new RuntimeException("should not recreate index " + ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, failure);
                             }
                         )
                 );
diff --git a/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java b/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java
index 46935ade4..a8d0c97f7 100644
--- a/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java
+++ b/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java
@@ -23,7 +23,6 @@
 
 import org.opensearch.Version;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
@@ -36,6 +35,7 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class CustomIndexTests extends AbstractADTest {
     AnomalyDetectionIndices adIndices;
@@ -109,27 +109,27 @@ private Map<String, Object> createMapping() {
 
         Map<String, Object> confidence_mapping = new HashMap<>();
         confidence_mapping.put("type", "double");
-        mappings.put(AnomalyResult.CONFIDENCE_FIELD, confidence_mapping);
+        mappings.put(CommonName.CONFIDENCE_FIELD, confidence_mapping);
 
         Map<String, Object> data_end_time = new HashMap<>();
         data_end_time.put("type", "date");
         data_end_time.put("format", "strict_date_time||epoch_millis");
-        mappings.put(AnomalyResult.DATA_END_TIME_FIELD, data_end_time);
+        mappings.put(CommonName.DATA_END_TIME_FIELD, data_end_time);
 
         Map<String, Object> data_start_time = new HashMap<>();
         data_start_time.put("type", "date");
         data_start_time.put("format", "strict_date_time||epoch_millis");
-        mappings.put(AnomalyResult.DATA_START_TIME_FIELD, data_start_time);
+        mappings.put(CommonName.DATA_START_TIME_FIELD, data_start_time);
 
         Map<String, Object> exec_start_mapping = new HashMap<>();
         exec_start_mapping.put("type", "date");
         exec_start_mapping.put("format", "strict_date_time||epoch_millis");
-        mappings.put(AnomalyResult.EXECUTION_START_TIME_FIELD, exec_start_mapping);
+        mappings.put(CommonName.EXECUTION_START_TIME_FIELD, exec_start_mapping);
 
         Map<String, Object> exec_end_mapping = new HashMap<>();
         exec_end_mapping.put("type", "date");
         exec_end_mapping.put("format", "strict_date_time||epoch_millis");
-        mappings.put(AnomalyResult.EXECUTION_END_TIME_FIELD, exec_end_mapping);
+        mappings.put(CommonName.EXECUTION_END_TIME_FIELD, exec_end_mapping);
 
         Map<String, Object> detector_id_mapping = new HashMap<>();
         detector_id_mapping.put("type", "keyword");
@@ -141,11 +141,11 @@ private Map<String, Object> createMapping() {
         entity_nested_mapping.put("name", Collections.singletonMap("type", "keyword"));
         entity_nested_mapping.put("value", Collections.singletonMap("type", "keyword"));
         entity_mapping.put(CommonName.PROPERTIES, entity_nested_mapping);
-        mappings.put(AnomalyResult.ENTITY_FIELD, entity_mapping);
+        mappings.put(CommonName.ENTITY_FIELD, entity_mapping);
 
         Map<String, Object> error_mapping = new HashMap<>();
         error_mapping.put("type", "text");
-        mappings.put(AnomalyResult.ERROR_FIELD, error_mapping);
+        mappings.put(CommonName.ERROR_FIELD, error_mapping);
 
         Map<String, Object> expected_mapping = new HashMap<>();
         expected_mapping.put("type", "nested");
@@ -167,9 +167,9 @@ private Map<String, Object> createMapping() {
         feature_mapping.put(CommonName.PROPERTIES, feature_nested_mapping);
         feature_nested_mapping.put("data", Collections.singletonMap("type", "double"));
         feature_nested_mapping.put("feature_id", Collections.singletonMap("type", "keyword"));
-        mappings.put(AnomalyResult.FEATURE_DATA_FIELD, feature_mapping);
+        mappings.put(CommonName.FEATURE_DATA_FIELD, feature_mapping);
         mappings.put(AnomalyResult.IS_ANOMALY_FIELD, Collections.singletonMap("type", "boolean"));
-        mappings.put(AnomalyResult.MODEL_ID_FIELD, Collections.singletonMap("type", "keyword"));
+        mappings.put(CommonName.MODEL_ID_FIELD, Collections.singletonMap("type", "keyword"));
 
         Map<String, Object> past_mapping = new HashMap<>();
         past_mapping.put("type", "nested");
@@ -216,7 +216,7 @@ private Map<String, Object> createMapping() {
         roles_mapping.put("type", "text");
         roles_mapping.put("fields", Collections.singletonMap("keyword", Collections.singletonMap("type", "keyword")));
         user_nested_mapping.put("roles", roles_mapping);
-        mappings.put(AnomalyResult.USER_FIELD, user_mapping);
+        mappings.put(CommonName.USER_FIELD, user_mapping);
         return mappings;
     }
 
@@ -254,7 +254,7 @@ public void testCorrectReordered() throws IOException {
         // feature_id comes before data compared with what createMapping returned
         feature_nested_mapping.put("feature_id", Collections.singletonMap("type", "keyword"));
         feature_nested_mapping.put("data", Collections.singletonMap("type", "double"));
-        mappings.put(AnomalyResult.FEATURE_DATA_FIELD, feature_mapping);
+        mappings.put(CommonName.FEATURE_DATA_FIELD, feature_mapping);
 
         IndexMetadata indexMetadata1 = new IndexMetadata.Builder(customIndexName)
             .settings(
diff --git a/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java
index babbf6c2d..4b4bf4b0f 100644
--- a/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java
+++ b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java
@@ -30,9 +30,7 @@
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
 import org.opensearch.action.admin.indices.create.CreateIndexResponse;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
-import org.opensearch.ad.model.AnomalyDetector;
-import org.opensearch.ad.model.AnomalyDetectorJob;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
 import org.opensearch.client.AdminClient;
@@ -46,6 +44,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class InitAnomalyDetectionIndicesTests extends AbstractADTest {
     Client client;
@@ -121,7 +120,7 @@ private void fixedPrimaryShardsIndexCreationTemplate(String index) throws IOExce
         }).when(indicesClient).create(any(), any());
 
         ActionListener<CreateIndexResponse> listener = mock(ActionListener.class);
-        if (index.equals(AnomalyDetector.ANOMALY_DETECTORS_INDEX)) {
+        if (index.equals(CommonName.CONFIG_INDEX)) {
             adIndices.initAnomalyDetectorIndexIfAbsent(listener);
         } else {
             adIndices.initDetectionStateIndex(listener);
@@ -143,10 +142,10 @@ private void fixedPrimaryShardsIndexNoCreationTemplate(String index, String alia
         when(clusterState.getRoutingTable()).thenReturn(rb.build());
 
         Metadata.Builder mb = Metadata.builder();
-        mb.put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, CommonName.ANOMALY_RESULT_INDEX_ALIAS), true);
+        mb.put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS), true);
 
         ActionListener<CreateIndexResponse> listener = mock(ActionListener.class);
-        if (index.equals(AnomalyDetector.ANOMALY_DETECTORS_INDEX)) {
+        if (index.equals(CommonName.CONFIG_INDEX)) {
             adIndices.initAnomalyDetectorIndexIfAbsent(listener);
         } else {
             adIndices.initDefaultAnomalyResultIndexIfAbsent(listener);
@@ -160,14 +159,14 @@ private void adaptivePrimaryShardsIndexCreationTemplate(String index) throws IOE
 
         doAnswer(invocation -> {
             CreateIndexRequest request = invocation.getArgument(0);
-            if (index.equals(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
-                assertTrue(request.aliases().contains(new Alias(CommonName.ANOMALY_RESULT_INDEX_ALIAS)));
+            if (index.equals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+                assertTrue(request.aliases().contains(new Alias(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)));
             } else {
                 assertEquals(index, request.index());
             }
 
             Settings settings = request.settings();
-            if (index.equals(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)) {
+            if (index.equals(CommonName.JOB_INDEX)) {
                 assertThat(settings.get("index.number_of_shards"), equalTo(Integer.toString(1)));
             } else {
                 assertThat(settings.get("index.number_of_shards"), equalTo(Integer.toString(numberOfHotNodes)));
@@ -180,13 +179,13 @@ private void adaptivePrimaryShardsIndexCreationTemplate(String index) throws IOE
         }).when(indicesClient).create(any(), any());
 
         ActionListener<CreateIndexResponse> listener = mock(ActionListener.class);
-        if (index.equals(AnomalyDetector.ANOMALY_DETECTORS_INDEX)) {
+        if (index.equals(CommonName.CONFIG_INDEX)) {
             adIndices.initAnomalyDetectorIndexIfAbsent(listener);
-        } else if (index.equals(CommonName.DETECTION_STATE_INDEX)) {
+        } else if (index.equals(ADCommonName.DETECTION_STATE_INDEX)) {
             adIndices.initDetectionStateIndex(listener);
-        } else if (index.equals(CommonName.CHECKPOINT_INDEX_NAME)) {
+        } else if (index.equals(ADCommonName.CHECKPOINT_INDEX_NAME)) {
             adIndices.initCheckpointIndex(listener);
-        } else if (index.equals(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)) {
+        } else if (index.equals(CommonName.JOB_INDEX)) {
             adIndices.initAnomalyDetectorJobIndex(listener);
         } else {
             adIndices.initDefaultAnomalyResultIndexIfAbsent(listener);
@@ -199,30 +198,30 @@ private void adaptivePrimaryShardsIndexCreationTemplate(String index) throws IOE
     }
 
     public void testNotCreateDetector() throws IOException {
-        fixedPrimaryShardsIndexNoCreationTemplate(AnomalyDetector.ANOMALY_DETECTORS_INDEX, null);
+        fixedPrimaryShardsIndexNoCreationTemplate(CommonName.CONFIG_INDEX, null);
     }
 
     public void testNotCreateResult() throws IOException {
-        fixedPrimaryShardsIndexNoCreationTemplate(AnomalyDetector.ANOMALY_DETECTORS_INDEX, null);
+        fixedPrimaryShardsIndexNoCreationTemplate(CommonName.CONFIG_INDEX, null);
     }
 
     public void testCreateDetector() throws IOException {
-        fixedPrimaryShardsIndexCreationTemplate(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        fixedPrimaryShardsIndexCreationTemplate(CommonName.CONFIG_INDEX);
     }
 
     public void testCreateState() throws IOException {
-        fixedPrimaryShardsIndexCreationTemplate(CommonName.DETECTION_STATE_INDEX);
+        fixedPrimaryShardsIndexCreationTemplate(ADCommonName.DETECTION_STATE_INDEX);
     }
 
     public void testCreateJob() throws IOException {
-        adaptivePrimaryShardsIndexCreationTemplate(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX);
+        adaptivePrimaryShardsIndexCreationTemplate(CommonName.JOB_INDEX);
     }
 
     public void testCreateResult() throws IOException {
-        adaptivePrimaryShardsIndexCreationTemplate(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        adaptivePrimaryShardsIndexCreationTemplate(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
     }
 
     public void testCreateCheckpoint() throws IOException {
-        adaptivePrimaryShardsIndexCreationTemplate(CommonName.CHECKPOINT_INDEX_NAME);
+        adaptivePrimaryShardsIndexCreationTemplate(ADCommonName.CHECKPOINT_INDEX_NAME);
     }
 }
diff --git a/src/test/java/org/opensearch/ad/indices/RolloverTests.java b/src/test/java/org/opensearch/ad/indices/RolloverTests.java
index 66a50c6be..8806bb96c 100644
--- a/src/test/java/org/opensearch/ad/indices/RolloverTests.java
+++ b/src/test/java/org/opensearch/ad/indices/RolloverTests.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.rollover.RolloverResponse;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
 import org.opensearch.client.AdminClient;
@@ -121,7 +121,7 @@ public void setUp() throws Exception {
     }
 
     private void assertRolloverRequest(RolloverRequest request) {
-        assertEquals(CommonName.ANOMALY_RESULT_INDEX_ALIAS, request.indices()[0]);
+        assertEquals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, request.indices()[0]);
 
         Map<String, Condition<?>> conditions = request.getConditions();
         assertEquals(1, conditions.size());
@@ -146,7 +146,7 @@ public void testNotRolledOver() {
 
         Metadata.Builder metaBuilder = Metadata
             .builder()
-            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, CommonName.ANOMALY_RESULT_INDEX_ALIAS), true);
+            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS), true);
         clusterState = ClusterState.builder(clusterName).metadata(metaBuilder.build()).build();
         when(clusterService.state()).thenReturn(clusterState);
 
@@ -161,7 +161,7 @@ private void setUpRolloverSuccess() {
             @SuppressWarnings("unchecked")
             ActionListener<RolloverResponse> listener = (ActionListener<RolloverResponse>) invocation.getArgument(1);
 
-            assertEquals(CommonName.ANOMALY_RESULT_INDEX_ALIAS, request.indices()[0]);
+            assertEquals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, request.indices()[0]);
 
             Map<String, Condition<?>> conditions = request.getConditions();
             assertEquals(1, conditions.size());
@@ -180,12 +180,12 @@ public void testRolledOverButNotDeleted() {
 
         Metadata.Builder metaBuilder = Metadata
             .builder()
-            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, CommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
+            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 1L, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
             .put(
                 indexMeta(
                     ".opendistro-anomaly-results-history-2020.06.24-000004",
                     Instant.now().toEpochMilli(),
-                    CommonName.ANOMALY_RESULT_INDEX_ALIAS
+                    ADCommonName.ANOMALY_RESULT_INDEX_ALIAS
                 ),
                 true
             );
@@ -201,13 +201,13 @@ public void testRolledOverButNotDeleted() {
     private void setUpTriggerDelete() {
         Metadata.Builder metaBuilder = Metadata
             .builder()
-            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000002", 1L, CommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
-            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 2L, CommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
+            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000002", 1L, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
+            .put(indexMeta(".opendistro-anomaly-results-history-2020.06.24-000003", 2L, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS), true)
             .put(
                 indexMeta(
                     ".opendistro-anomaly-results-history-2020.06.24-000004",
                     Instant.now().toEpochMilli(),
-                    CommonName.ANOMALY_RESULT_INDEX_ALIAS
+                    ADCommonName.ANOMALY_RESULT_INDEX_ALIAS
                 ),
                 true
             );
diff --git a/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java b/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java
index 224d4b980..490f51359 100644
--- a/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java
+++ b/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java
@@ -40,7 +40,6 @@
 import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
 import org.opensearch.client.AdminClient;
@@ -57,6 +56,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.timeseries.constant.CommonName;
 
 public class UpdateMappingTests extends AbstractADTest {
     private static String resultIndexName;
diff --git a/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java b/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java
index 4949770f4..2107d4e59 100644
--- a/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java
+++ b/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java
@@ -60,6 +60,7 @@
 import org.opensearch.test.ClusterServiceUtils;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -120,7 +121,7 @@ public void setUp() throws Exception {
         doAnswer(invocation -> {
             ActionListener<GetResponse> listener = invocation.getArgument(2);
 
-            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, CommonName.CONFIG_INDEX));
 
             return null;
         }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
diff --git a/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java
index df11518b5..804896ae4 100644
--- a/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java
+++ b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java
@@ -23,9 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opensearch.action.DocWriteResponse.Result.UPDATED;
-import static org.opensearch.ad.ml.CheckpointDao.FIELD_MODEL;
 import static org.opensearch.ad.ml.CheckpointDao.FIELD_MODELV2;
-import static org.opensearch.ad.ml.CheckpointDao.TIMESTAMP;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -96,7 +94,7 @@
 import org.opensearch.action.support.replication.ReplicationResponse;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.util.ClientUtil;
@@ -105,6 +103,7 @@
 import org.opensearch.index.engine.VersionConflictEngineException;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.JsonDeserializer;
 import test.org.opensearch.ad.util.MLUtil;
@@ -281,10 +280,10 @@ private void verifyPutModelCheckpointAsync() {
         assertEquals(indexName, updateRequest.index());
         assertEquals(modelId, updateRequest.id());
         IndexRequest indexRequest = updateRequest.doc();
-        Set<String> expectedSourceKeys = new HashSet<String>(Arrays.asList(FIELD_MODELV2, CheckpointDao.TIMESTAMP));
+        Set<String> expectedSourceKeys = new HashSet<String>(Arrays.asList(FIELD_MODELV2, CommonName.TIMESTAMP));
         assertEquals(expectedSourceKeys, indexRequest.sourceAsMap().keySet());
         assertTrue(!((String) (indexRequest.sourceAsMap().get(FIELD_MODELV2))).isEmpty());
-        assertNotNull(indexRequest.sourceAsMap().get(CheckpointDao.TIMESTAMP));
+        assertNotNull(indexRequest.sourceAsMap().get(CommonName.TIMESTAMP));
 
         ArgumentCaptor<Void> responseCaptor = ArgumentCaptor.forClass(Void.class);
         verify(listener).onResponse(responseCaptor.capture());
@@ -301,7 +300,7 @@ public void test_putModelCheckpoint_callListener_no_checkpoint_index() {
 
         doAnswer(invocation -> {
             ActionListener<CreateIndexResponse> listener = invocation.getArgument(0);
-            listener.onResponse(new CreateIndexResponse(true, true, CommonName.CHECKPOINT_INDEX_NAME));
+            listener.onResponse(new CreateIndexResponse(true, true, ADCommonName.CHECKPOINT_INDEX_NAME));
             return null;
         }).when(indexUtil).initCheckpointIndex(any());
 
@@ -313,7 +312,7 @@ public void test_putModelCheckpoint_callListener_race_condition() {
 
         doAnswer(invocation -> {
             ActionListener<CreateIndexResponse> listener = invocation.getArgument(0);
-            listener.onFailure(new ResourceAlreadyExistsException(CommonName.CHECKPOINT_INDEX_NAME));
+            listener.onFailure(new ResourceAlreadyExistsException(ADCommonName.CHECKPOINT_INDEX_NAME));
             return null;
         }).when(indexUtil).initCheckpointIndex(any());
 
@@ -341,7 +340,7 @@ public void test_getModelCheckpoint_returnExpectedToListener() {
         // ArgumentCaptor<GetRequest> requestCaptor = ArgumentCaptor.forClass(GetRequest.class);
         UpdateResponse updateResponse = new UpdateResponse(
             new ReplicationResponse.ShardInfo(3, 2),
-            new ShardId(CommonName.CHECKPOINT_INDEX_NAME, "uuid", 2),
+            new ShardId(ADCommonName.CHECKPOINT_INDEX_NAME, "uuid", 2),
             "1",
             7,
             17,
@@ -395,7 +394,7 @@ public void test_getModelCheckpoint_Bwc() {
         // ArgumentCaptor<GetRequest> requestCaptor = ArgumentCaptor.forClass(GetRequest.class);
         UpdateResponse updateResponse = new UpdateResponse(
             new ReplicationResponse.ShardInfo(3, 2),
-            new ShardId(CommonName.CHECKPOINT_INDEX_NAME, "uuid", 2),
+            new ShardId(ADCommonName.CHECKPOINT_INDEX_NAME, "uuid", 2),
             "1",
             7,
             17,
@@ -501,7 +500,7 @@ public void test_restore() throws IOException {
         Map<String, Object> source = new HashMap<>();
         source.put(CheckpointDao.DETECTOR_ID, state.getDetectorId());
         source.put(CheckpointDao.FIELD_MODELV2, checkpointDao.toCheckpoint(modelToSave, modelId).get());
-        source.put(CheckpointDao.TIMESTAMP, "2020-10-11T22:58:23.610392Z");
+        source.put(CommonName.TIMESTAMP, "2020-10-11T22:58:23.610392Z");
         when(getResponse.getSource()).thenReturn(source);
 
         doAnswer(invocation -> {
@@ -544,7 +543,7 @@ public void test_batch_write_no_index() {
 
         doAnswer(invocation -> {
             ActionListener<CreateIndexResponse> listener = invocation.getArgument(0);
-            listener.onResponse(new CreateIndexResponse(true, true, CommonName.CHECKPOINT_INDEX_NAME));
+            listener.onResponse(new CreateIndexResponse(true, true, ADCommonName.CHECKPOINT_INDEX_NAME));
             return null;
         }).when(indexUtil).initCheckpointIndex(any());
         checkpointDao.batchWrite(new BulkRequest(), null);
@@ -556,7 +555,7 @@ public void test_batch_write_index_init_no_ack() throws InterruptedException {
 
         doAnswer(invocation -> {
             ActionListener<CreateIndexResponse> listener = invocation.getArgument(0);
-            listener.onResponse(new CreateIndexResponse(false, false, CommonName.CHECKPOINT_INDEX_NAME));
+            listener.onResponse(new CreateIndexResponse(false, false, ADCommonName.CHECKPOINT_INDEX_NAME));
             return null;
         }).when(indexUtil).initCheckpointIndex(any());
 
@@ -603,14 +602,14 @@ public void test_batch_write_init_exception() throws InterruptedException {
     private BulkResponse createBulkResponse(int succeeded, int failed, String[] failedId) {
         BulkItemResponse[] bulkItemResponses = new BulkItemResponse[succeeded + failed];
 
-        ShardId shardId = new ShardId(CommonName.CHECKPOINT_INDEX_NAME, "", 1);
+        ShardId shardId = new ShardId(ADCommonName.CHECKPOINT_INDEX_NAME, "", 1);
         int i = 0;
         for (; i < failed; i++) {
             bulkItemResponses[i] = new BulkItemResponse(
                 i,
                 DocWriteRequest.OpType.UPDATE,
                 new BulkItemResponse.Failure(
-                    CommonName.CHECKPOINT_INDEX_NAME,
+                    ADCommonName.CHECKPOINT_INDEX_NAME,
                     failedId[i],
                     new VersionConflictEngineException(shardId, "id", "test")
                 )
@@ -657,9 +656,9 @@ public void test_batch_read() throws InterruptedException {
             items[0] = new MultiGetItemResponse(
                 null,
                 new MultiGetResponse.Failure(
-                    CommonName.CHECKPOINT_INDEX_NAME,
+                    ADCommonName.CHECKPOINT_INDEX_NAME,
                     "modelId",
-                    new IndexNotFoundException(CommonName.CHECKPOINT_INDEX_NAME)
+                    new IndexNotFoundException(ADCommonName.CHECKPOINT_INDEX_NAME)
                 )
             );
             listener.onResponse(new MultiGetResponse(items));
@@ -759,7 +758,7 @@ public void testMapperFailure() throws IOException {
         ModelState<EntityModel> state = MLUtil.randomModelState(new RandomModelStateConfig.Builder().fullModel(true).sampleSize(1).build());
         String json = checkpointDao.toCheckpoint(state.getModel(), modelId).get();
         assertEquals(null, JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_TRCF));
-        assertTrue(null != JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_SAMPLE));
+        assertTrue(null != JsonDeserializer.getChildNode(json, CommonName.ENTITY_SAMPLE));
         // assertTrue(null != JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_THRESHOLD));
         // assertNotNull(JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_TRCF));
     }
@@ -768,7 +767,7 @@ public void testEmptySample() throws IOException {
         ModelState<EntityModel> state = MLUtil.randomModelState(new RandomModelStateConfig.Builder().fullModel(true).sampleSize(0).build());
         String json = checkpointDao.toCheckpoint(state.getModel(), modelId).get();
         // assertTrue(null != JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_TRCF));
-        assertEquals(null, JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_SAMPLE));
+        assertEquals(null, JsonDeserializer.getChildNode(json, CommonName.ENTITY_SAMPLE));
         // assertTrue(null != JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_THRESHOLD));
         assertNotNull(JsonDeserializer.getChildNode(json, CheckpointDao.ENTITY_TRCF));
     }
@@ -842,7 +841,7 @@ public void testFromEntityModelCheckpointWithTrcf() throws Exception {
 
         Map<String, Object> entity = new HashMap<>();
         entity.put(FIELD_MODELV2, model);
-        entity.put(TIMESTAMP, Instant.now().toString());
+        entity.put(CommonName.TIMESTAMP, Instant.now().toString());
         Optional<Entry<EntityModel, Instant>> result = checkpointDao.fromEntityModelCheckpoint(entity, this.modelId);
 
         assertTrue(result.isPresent());
@@ -859,7 +858,7 @@ public void testFromEntityModelCheckpointTrcfMapperFail() throws Exception {
 
         Map<String, Object> entity = new HashMap<>();
         entity.put(FIELD_MODELV2, model);
-        entity.put(TIMESTAMP, Instant.now().toString());
+        entity.put(CommonName.TIMESTAMP, Instant.now().toString());
         Optional<Entry<EntityModel, Instant>> result = checkpointDao.fromEntityModelCheckpoint(entity, this.modelId);
 
         assertTrue(result.isPresent());
@@ -884,8 +883,8 @@ private Pair<Map<String, Object>, Instant> setUp1_0Model(String checkpointFileNa
 
         Instant now = Instant.now();
         Map<String, Object> entity = new HashMap<>();
-        entity.put(FIELD_MODEL, model);
-        entity.put(TIMESTAMP, now.toString());
+        entity.put(CommonName.FIELD_MODEL, model);
+        entity.put(CommonName.TIMESTAMP, now.toString());
         return Pair.of(entity, now);
     }
 
@@ -949,7 +948,7 @@ public void testFromEntityModelCheckpointModelTooLarge() throws FileNotFoundExce
     // test no model is present in checkpoint
     public void testFromEntityModelCheckpointEmptyModel() throws FileNotFoundException, IOException, URISyntaxException {
         Map<String, Object> entity = new HashMap<>();
-        entity.put(TIMESTAMP, Instant.now().toString());
+        entity.put(CommonName.TIMESTAMP, Instant.now().toString());
 
         Optional<Entry<EntityModel, Instant>> result = checkpointDao.fromEntityModelCheckpoint(entity, this.modelId);
         assertTrue(!result.isPresent());
@@ -989,7 +988,7 @@ public void testFromEntityModelCheckpointWithEntity() throws Exception {
             .randomModelState(new RandomModelStateConfig.Builder().fullModel(true).entityAttributes(true).build());
         Map<String, Object> content = checkpointDao.toIndexSource(state);
         // Opensearch will convert from java.time.ZonedDateTime to String. Here I am converting to simulate that
-        content.put(TIMESTAMP, "2021-09-23T05:00:37.93195Z");
+        content.put(CommonName.TIMESTAMP, "2021-09-23T05:00:37.93195Z");
 
         Optional<Entry<EntityModel, Instant>> result = checkpointDao.fromEntityModelCheckpoint(content, this.modelId);
 
diff --git a/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java
index aba990e12..0afdcc5b0 100644
--- a/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java
+++ b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java
@@ -28,7 +28,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.util.ClientUtil;
 import org.opensearch.client.Client;
@@ -100,7 +100,7 @@ public void setUp() throws Exception {
         checkpointDao = new CheckpointDao(
             client,
             clientUtil,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             gson,
             mapper,
             converter,
@@ -140,7 +140,7 @@ public void delete_by_detector_id_template(DeleteExecutionMode mode) {
 
             assertTrue(listener != null);
             if (mode == DeleteExecutionMode.INDEX_NOT_FOUND) {
-                listener.onFailure(new IndexNotFoundException(CommonName.CHECKPOINT_INDEX_NAME));
+                listener.onFailure(new IndexNotFoundException(ADCommonName.CHECKPOINT_INDEX_NAME));
             } else if (mode == DeleteExecutionMode.FAILURE) {
                 listener.onFailure(new OpenSearchException(""));
             } else {
diff --git a/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java b/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java
index 6e7fdb3d4..a6d5d34c1 100644
--- a/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java
+++ b/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java
@@ -48,7 +48,6 @@
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.feature.FeatureManager;
 import org.opensearch.ad.ml.ModelManager.ModelType;
-import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.IntervalTimeConfiguration;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.settings.EnabledSetting;
@@ -58,6 +57,7 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.LabelledAnomalyGenerator;
 import test.org.opensearch.ad.util.MLUtil;
@@ -423,7 +423,7 @@ public void testNotEnoughSamples() throws InterruptedException, IOException {
             GetRequest request = invocation.getArgument(0);
             ActionListener<GetResponse> listener = invocation.getArgument(2);
 
-            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, CommonName.CONFIG_INDEX));
             return null;
         }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
 
@@ -476,7 +476,7 @@ public void testEmptyDataRange() throws InterruptedException {
             GetRequest request = invocation.getArgument(0);
             ActionListener<GetResponse> listener = invocation.getArgument(2);
 
-            listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
             return null;
         }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
 
@@ -588,8 +588,7 @@ private void accuracyTemplate(int detectorIntervalMins, float precisionThreshold
                 GetRequest request = invocation.getArgument(0);
                 ActionListener<GetResponse> listener = invocation.getArgument(2);
 
-                listener
-                    .onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+                listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
                 return null;
             }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
 
diff --git a/src/test/java/org/opensearch/ad/ml/HCADModelPerfTests.java b/src/test/java/org/opensearch/ad/ml/HCADModelPerfTests.java
index 5d2849401..c51bc11b5 100644
--- a/src/test/java/org/opensearch/ad/ml/HCADModelPerfTests.java
+++ b/src/test/java/org/opensearch/ad/ml/HCADModelPerfTests.java
@@ -40,13 +40,13 @@
 import org.opensearch.ad.feature.FeatureManager;
 import org.opensearch.ad.feature.SearchFeatureDao;
 import org.opensearch.ad.ml.ModelManager.ModelType;
-import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.model.IntervalTimeConfiguration;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.ClusterServiceUtils;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.LabelledAnomalyGenerator;
 import test.org.opensearch.ad.util.MultiDimDataWithTime;
@@ -99,7 +99,7 @@ private void averageAccuracyTemplate(
         doAnswer(invocation -> {
             ActionListener<GetResponse> listener = invocation.getArgument(2);
 
-            listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
             return null;
         }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
 
diff --git a/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java
index 2f8552414..bdb0e55ba 100644
--- a/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java
+++ b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java
@@ -28,7 +28,7 @@
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobAction;
 import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobTransportActionWithUser;
 import org.opensearch.client.Client;
@@ -114,7 +114,7 @@ protected void doExecute(Task task, DeleteByQueryRequest request, ActionListener
                     BulkRequestBuilder bulkRequestBuilder = client.prepareBulk();
                     while (iterator.hasNext()) {
                         String id = iterator.next().getId();
-                        DeleteRequest deleteRequest = new DeleteRequest(CommonName.DETECTION_STATE_INDEX, id);
+                        DeleteRequest deleteRequest = new DeleteRequest(ADCommonName.DETECTION_STATE_INDEX, id);
                         bulkRequestBuilder.add(deleteRequest);
                     }
                     BulkRequest bulkRequest = bulkRequestBuilder.request().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
diff --git a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
index 533099594..c5b87feae 100644
--- a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
+++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
@@ -11,10 +11,10 @@
 
 package org.opensearch.ad.model;
 
+import static org.opensearch.ad.constant.ADCommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_CHAR_IN_RESULT_INDEX_NAME;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_RESULT_INDEX_NAME_SIZE;
 import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_RESULT_INDEX_PREFIX;
-import static org.opensearch.ad.constant.CommonName.CUSTOM_RESULT_INDEX_PREFIX;
 import static org.opensearch.ad.model.AnomalyDetector.MAX_RESULT_INDEX_NAME_SIZE;
 
 import java.io.IOException;
@@ -26,8 +26,8 @@
 import org.opensearch.ad.AbstractADTest;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.common.exception.ADValidationException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.xcontent.ToXContent;
@@ -49,7 +49,7 @@ public void testParseAnomalyDetector() throws IOException {
     }
 
     public void testParseAnomalyDetectorWithCustomIndex() throws IOException {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
         AnomalyDetector detector = TestHelpers
             .randomDetector(
                 ImmutableList.of(TestHelpers.randomFeature()),
@@ -69,7 +69,7 @@ public void testParseAnomalyDetectorWithCustomIndex() throws IOException {
     }
 
     public void testAnomalyDetectorWithInvalidCustomIndex() throws Exception {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test@@";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test@@";
         TestHelpers
             .assertFailWith(
                 ADValidationException.class,
diff --git a/src/test/java/org/opensearch/ad/model/DetectorProfileTests.java b/src/test/java/org/opensearch/ad/model/DetectorProfileTests.java
index d8da3399b..025624519 100644
--- a/src/test/java/org/opensearch/ad/model/DetectorProfileTests.java
+++ b/src/test/java/org/opensearch/ad/model/DetectorProfileTests.java
@@ -15,8 +15,8 @@
 import java.util.Map;
 
 import org.opensearch.ad.TestHelpers;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
 import org.opensearch.core.xcontent.XContentParser;
@@ -88,16 +88,16 @@ public void testDetectorProfileToXContent() throws IOException {
     }
 
     public void testDetectorProfileName() throws IllegalArgumentException {
-        assertEquals("ad_task", DetectorProfileName.getName(CommonName.AD_TASK).getName());
-        assertEquals("state", DetectorProfileName.getName(CommonName.STATE).getName());
-        assertEquals("error", DetectorProfileName.getName(CommonName.ERROR).getName());
-        assertEquals("coordinating_node", DetectorProfileName.getName(CommonName.COORDINATING_NODE).getName());
-        assertEquals("shingle_size", DetectorProfileName.getName(CommonName.SHINGLE_SIZE).getName());
-        assertEquals("total_size_in_bytes", DetectorProfileName.getName(CommonName.TOTAL_SIZE_IN_BYTES).getName());
-        assertEquals("models", DetectorProfileName.getName(CommonName.MODELS).getName());
-        assertEquals("init_progress", DetectorProfileName.getName(CommonName.INIT_PROGRESS).getName());
-        assertEquals("total_entities", DetectorProfileName.getName(CommonName.TOTAL_ENTITIES).getName());
-        assertEquals("active_entities", DetectorProfileName.getName(CommonName.ACTIVE_ENTITIES).getName());
+        assertEquals("ad_task", DetectorProfileName.getName(ADCommonName.AD_TASK).getName());
+        assertEquals("state", DetectorProfileName.getName(ADCommonName.STATE).getName());
+        assertEquals("error", DetectorProfileName.getName(ADCommonName.ERROR).getName());
+        assertEquals("coordinating_node", DetectorProfileName.getName(ADCommonName.COORDINATING_NODE).getName());
+        assertEquals("shingle_size", DetectorProfileName.getName(ADCommonName.SHINGLE_SIZE).getName());
+        assertEquals("total_size_in_bytes", DetectorProfileName.getName(ADCommonName.TOTAL_SIZE_IN_BYTES).getName());
+        assertEquals("models", DetectorProfileName.getName(ADCommonName.MODELS).getName());
+        assertEquals("init_progress", DetectorProfileName.getName(ADCommonName.INIT_PROGRESS).getName());
+        assertEquals("total_entities", DetectorProfileName.getName(ADCommonName.TOTAL_ENTITIES).getName());
+        assertEquals("active_entities", DetectorProfileName.getName(ADCommonName.ACTIVE_ENTITIES).getName());
         IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> DetectorProfileName.getName("abc"));
         assertEquals(exception.getMessage(), CommonErrorMessages.UNSUPPORTED_PROFILE_TYPE);
     }
diff --git a/src/test/java/org/opensearch/ad/model/EntityProfileTests.java b/src/test/java/org/opensearch/ad/model/EntityProfileTests.java
index 2eeff3240..d85c515ac 100644
--- a/src/test/java/org/opensearch/ad/model/EntityProfileTests.java
+++ b/src/test/java/org/opensearch/ad/model/EntityProfileTests.java
@@ -17,7 +17,7 @@
 
 import org.opensearch.ad.AbstractADTest;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -40,7 +40,7 @@ public void testToXContent() throws IOException, JsonPathNotFoundException {
         profile1.toXContent(builder, ToXContent.EMPTY_PARAMS);
         String json = Strings.toString(builder);
 
-        assertEquals("INIT", JsonDeserializer.getTextValue(json, CommonName.STATE));
+        assertEquals("INIT", JsonDeserializer.getTextValue(json, ADCommonName.STATE));
 
         EntityProfile profile2 = new EntityProfile(null, -1, -1, null, null, EntityState.UNKNOWN);
 
@@ -48,7 +48,7 @@ public void testToXContent() throws IOException, JsonPathNotFoundException {
         profile2.toXContent(builder, ToXContent.EMPTY_PARAMS);
         json = Strings.toString(builder);
 
-        assertTrue(false == JsonDeserializer.hasChildNode(json, CommonName.STATE));
+        assertTrue(false == JsonDeserializer.hasChildNode(json, ADCommonName.STATE));
     }
 
     public void testToXContentTimeStampAboveZero() throws IOException, JsonPathNotFoundException {
@@ -58,7 +58,7 @@ public void testToXContentTimeStampAboveZero() throws IOException, JsonPathNotFo
         profile1.toXContent(builder, ToXContent.EMPTY_PARAMS);
         String json = Strings.toString(builder);
 
-        assertEquals("INIT", JsonDeserializer.getTextValue(json, CommonName.STATE));
+        assertEquals("INIT", JsonDeserializer.getTextValue(json, ADCommonName.STATE));
 
         EntityProfile profile2 = new EntityProfile(null, 1, 1, null, null, EntityState.UNKNOWN);
 
@@ -66,6 +66,6 @@ public void testToXContentTimeStampAboveZero() throws IOException, JsonPathNotFo
         profile2.toXContent(builder, ToXContent.EMPTY_PARAMS);
         json = Strings.toString(builder);
 
-        assertTrue(false == JsonDeserializer.hasChildNode(json, CommonName.STATE));
+        assertTrue(false == JsonDeserializer.hasChildNode(json, ADCommonName.STATE));
     }
 }
diff --git a/src/test/java/org/opensearch/ad/model/ModelProfileTests.java b/src/test/java/org/opensearch/ad/model/ModelProfileTests.java
index 64d70900a..28920d3ba 100644
--- a/src/test/java/org/opensearch/ad/model/ModelProfileTests.java
+++ b/src/test/java/org/opensearch/ad/model/ModelProfileTests.java
@@ -16,10 +16,10 @@
 import java.io.IOException;
 
 import org.opensearch.ad.AbstractADTest;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.JsonDeserializer;
 
diff --git a/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java
index 1fc93fb05..74adb46c8 100644
--- a/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java
+++ b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java
@@ -29,7 +29,7 @@
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.client.Client;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.unit.TimeValue;
@@ -168,7 +168,7 @@ protected void doExecute(Task task, DeleteByQueryRequest request, ActionListener
                 Iterator<SearchHit> iterator = r.getHits().iterator();
                 while (iterator.hasNext()) {
                     String id = iterator.next().getId();
-                    DeleteRequest deleteRequest = new DeleteRequest(CommonName.DETECTION_STATE_INDEX, id)
+                    DeleteRequest deleteRequest = new DeleteRequest(ADCommonName.DETECTION_STATE_INDEX, id)
                         .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
                     client.delete(deleteRequest, delegateListener);
                 }
diff --git a/src/test/java/org/opensearch/ad/ratelimit/CheckPointMaintainRequestAdapterTests.java b/src/test/java/org/opensearch/ad/ratelimit/CheckPointMaintainRequestAdapterTests.java
index 6a223fd0e..d1fe526de 100644
--- a/src/test/java/org/opensearch/ad/ratelimit/CheckPointMaintainRequestAdapterTests.java
+++ b/src/test/java/org/opensearch/ad/ratelimit/CheckPointMaintainRequestAdapterTests.java
@@ -29,7 +29,7 @@
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.ad.caching.CacheProvider;
 import org.opensearch.ad.caching.EntityCache;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.CheckpointDao;
 import org.opensearch.ad.ml.EntityModel;
 import org.opensearch.ad.ml.ModelState;
@@ -58,7 +58,7 @@ public void setUp() throws Exception {
         super.setUp();
         cache = mock(CacheProvider.class);
         checkpointDao = mock(CheckpointDao.class);
-        indexName = CommonName.CHECKPOINT_INDEX_NAME;
+        indexName = ADCommonName.CHECKPOINT_INDEX_NAME;
         checkpointInterval = AnomalyDetectorSettings.CHECKPOINT_SAVING_FREQ;
         EntityCache entityCache = mock(EntityCache.class);
         when(cache.get()).thenReturn(entityCache);
diff --git a/src/test/java/org/opensearch/ad/ratelimit/CheckpointMaintainWorkerTests.java b/src/test/java/org/opensearch/ad/ratelimit/CheckpointMaintainWorkerTests.java
index 22e104ac2..85bf42580 100644
--- a/src/test/java/org/opensearch/ad/ratelimit/CheckpointMaintainWorkerTests.java
+++ b/src/test/java/org/opensearch/ad/ratelimit/CheckpointMaintainWorkerTests.java
@@ -35,7 +35,7 @@
 import org.opensearch.ad.breaker.ADCircuitBreakerService;
 import org.opensearch.ad.caching.CacheProvider;
 import org.opensearch.ad.caching.EntityCache;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.CheckpointDao;
 import org.opensearch.ad.ml.EntityModel;
 import org.opensearch.ad.ml.ModelState;
@@ -84,7 +84,7 @@ public void setUp() throws Exception {
 
         CacheProvider cache = mock(CacheProvider.class);
         checkpointDao = mock(CheckpointDao.class);
-        String indexName = CommonName.CHECKPOINT_INDEX_NAME;
+        String indexName = ADCommonName.CHECKPOINT_INDEX_NAME;
         Setting<TimeValue> checkpointInterval = AnomalyDetectorSettings.CHECKPOINT_SAVING_FREQ;
         EntityCache entityCache = mock(EntityCache.class);
         when(cache.get()).thenReturn(entityCache);
diff --git a/src/test/java/org/opensearch/ad/ratelimit/CheckpointReadWorkerTests.java b/src/test/java/org/opensearch/ad/ratelimit/CheckpointReadWorkerTests.java
index 0d54fb48b..225001415 100644
--- a/src/test/java/org/opensearch/ad/ratelimit/CheckpointReadWorkerTests.java
+++ b/src/test/java/org/opensearch/ad/ratelimit/CheckpointReadWorkerTests.java
@@ -52,7 +52,7 @@
 import org.opensearch.ad.caching.CacheProvider;
 import org.opensearch.ad.caching.EntityCache;
 import org.opensearch.ad.common.exception.LimitExceededException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.ml.CheckpointDao;
 import org.opensearch.ad.ml.EntityModel;
@@ -64,7 +64,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
@@ -76,6 +75,7 @@
 import org.opensearch.rest.RestStatus;
 import org.opensearch.threadpool.ThreadPoolStats;
 import org.opensearch.threadpool.ThreadPoolStats.Stats;
+import org.opensearch.timeseries.stats.StatNames;
 
 import test.org.opensearch.ad.util.MLUtil;
 import test.org.opensearch.ad.util.RandomModelStateConfig;
@@ -218,7 +218,7 @@ private void regularTestSetUp(RegularSetUpConfig config) {
             MultiGetItemResponse[] items = new MultiGetItemResponse[1];
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(ADCommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
                 ),
                 null
             );
@@ -270,9 +270,9 @@ public void testIndexNotFound() {
             items[0] = new MultiGetItemResponse(
                 null,
                 new MultiGetResponse.Failure(
-                    CommonName.CHECKPOINT_INDEX_NAME,
+                    ADCommonName.CHECKPOINT_INDEX_NAME,
                     entity.getModelId(detectorId).get(),
-                    new IndexNotFoundException(CommonName.CHECKPOINT_INDEX_NAME)
+                    new IndexNotFoundException(ADCommonName.CHECKPOINT_INDEX_NAME)
                 )
             );
             ActionListener<MultiGetResponse> listener = invocation.getArgument(1);
@@ -291,7 +291,7 @@ public void testAllDocNotFound() {
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
                     new GetResult(
-                        CommonName.CHECKPOINT_INDEX_NAME,
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
                         entity.getModelId(detectorId).get(),
                         SequenceNumbers.UNASSIGNED_SEQ_NO,
                         SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
@@ -307,7 +307,7 @@ public void testAllDocNotFound() {
             items[1] = new MultiGetItemResponse(
                 new GetResponse(
                     new GetResult(
-                        CommonName.CHECKPOINT_INDEX_NAME,
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
                         entity2.getModelId(detectorId).get(),
                         SequenceNumbers.UNASSIGNED_SEQ_NO,
                         SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
@@ -339,14 +339,14 @@ public void testSingleDocNotFound() {
             MultiGetItemResponse[] items = new MultiGetItemResponse[2];
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(ADCommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
                 ),
                 null
             );
             items[1] = new MultiGetItemResponse(
                 new GetResponse(
                     new GetResult(
-                        CommonName.CHECKPOINT_INDEX_NAME,
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
                         entity2.getModelId(detectorId).get(),
                         SequenceNumbers.UNASSIGNED_SEQ_NO,
                         SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
@@ -380,7 +380,7 @@ public void testTimeout() {
                 items[0] = new MultiGetItemResponse(
                     null,
                     new MultiGetResponse.Failure(
-                        CommonName.CHECKPOINT_INDEX_NAME,
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
                         entity.getModelId(detectorId).get(),
                         new OpenSearchStatusException("blah", RestStatus.REQUEST_TIMEOUT)
                     )
@@ -388,7 +388,7 @@ public void testTimeout() {
                 items[1] = new MultiGetItemResponse(
                     null,
                     new MultiGetResponse.Failure(
-                        CommonName.CHECKPOINT_INDEX_NAME,
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
                         entity2.getModelId(detectorId).get(),
                         new OpenSearchStatusException("blah", RestStatus.CONFLICT)
                     )
@@ -398,7 +398,7 @@ public void testTimeout() {
                 items[0] = new MultiGetItemResponse(
                     new GetResponse(
                         new GetResult(
-                            CommonName.CHECKPOINT_INDEX_NAME,
+                            ADCommonName.CHECKPOINT_INDEX_NAME,
                             entity.getModelId(detectorId).get(),
                             1,
                             1,
@@ -414,7 +414,7 @@ public void testTimeout() {
                 items[1] = new MultiGetItemResponse(
                     new GetResponse(
                         new GetResult(
-                            CommonName.CHECKPOINT_INDEX_NAME,
+                            ADCommonName.CHECKPOINT_INDEX_NAME,
                             entity2.getModelId(detectorId).get(),
                             1,
                             1,
@@ -450,7 +450,7 @@ public void testOverloadedExceptionFromResponse() {
             items[0] = new MultiGetItemResponse(
                 null,
                 new MultiGetResponse.Failure(
-                    CommonName.CHECKPOINT_INDEX_NAME,
+                    ADCommonName.CHECKPOINT_INDEX_NAME,
                     entity.getModelId(detectorId).get(),
                     new OpenSearchRejectedExecutionException("blah")
                 )
@@ -489,7 +489,7 @@ public void testUnexpectedException() {
             items[0] = new MultiGetItemResponse(
                 null,
                 new MultiGetResponse.Failure(
-                    CommonName.CHECKPOINT_INDEX_NAME,
+                    ADCommonName.CHECKPOINT_INDEX_NAME,
                     entity.getModelId(detectorId).get(),
                     new IllegalArgumentException("blah")
                 )
@@ -686,7 +686,7 @@ public void testOpenCircuitBreaker() {
             MultiGetItemResponse[] items = new MultiGetItemResponse[1];
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(ADCommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
                 ),
                 null
             );
@@ -748,13 +748,23 @@ public void testHostException() throws IOException {
             MultiGetItemResponse[] items = new MultiGetItemResponse[2];
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(ADCommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
                 ),
                 null
             );
             items[1] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity4.getModelId(detectorId2).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(
+                        ADCommonName.CHECKPOINT_INDEX_NAME,
+                        entity4.getModelId(detectorId2).get(),
+                        1,
+                        1,
+                        0,
+                        true,
+                        null,
+                        null,
+                        null
+                    )
                 ),
                 null
             );
@@ -781,7 +791,7 @@ public void testFailToScore() {
             MultiGetItemResponse[] items = new MultiGetItemResponse[1];
             items[0] = new MultiGetItemResponse(
                 new GetResponse(
-                    new GetResult(CommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
+                    new GetResult(ADCommonName.CHECKPOINT_INDEX_NAME, entity.getModelId(detectorId).get(), 1, 1, 0, true, null, null, null)
                 ),
                 null
             );
diff --git a/src/test/java/org/opensearch/ad/ratelimit/CheckpointWriteWorkerTests.java b/src/test/java/org/opensearch/ad/ratelimit/CheckpointWriteWorkerTests.java
index 84c9adb26..ae2d3fbbc 100644
--- a/src/test/java/org/opensearch/ad/ratelimit/CheckpointWriteWorkerTests.java
+++ b/src/test/java/org/opensearch/ad/ratelimit/CheckpointWriteWorkerTests.java
@@ -48,7 +48,7 @@
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.ad.AnomalyDetectorPlugin;
 import org.opensearch.ad.breaker.ADCircuitBreakerService;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.CheckpointDao;
 import org.opensearch.ad.ml.EntityModel;
 import org.opensearch.ad.ml.ModelState;
@@ -63,6 +63,7 @@
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.MLUtil;
 import test.org.opensearch.ad.util.RandomModelStateConfig;
@@ -98,7 +99,7 @@ public void setUp() throws Exception {
 
         checkpoint = mock(CheckpointDao.class);
         Map<String, Object> checkpointMap = new HashMap<>();
-        checkpointMap.put(CheckpointDao.FIELD_MODEL, "a");
+        checkpointMap.put(CommonName.FIELD_MODEL, "a");
         when(checkpoint.toIndexSource(any())).thenReturn(checkpointMap);
         when(checkpoint.shouldSave(any(), anyBoolean(), any(), any())).thenReturn(true);
 
@@ -119,7 +120,7 @@ public void setUp() throws Exception {
             AnomalyDetectorSettings.MAINTENANCE_FREQ_CONSTANT,
             AnomalyDetectorSettings.QUEUE_MAINTENANCE,
             checkpoint,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE,
             nodeStateManager,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE
@@ -223,7 +224,7 @@ public void testTriggerAutoFlush() throws InterruptedException {
             AnomalyDetectorSettings.MAINTENANCE_FREQ_CONSTANT,
             AnomalyDetectorSettings.QUEUE_MAINTENANCE,
             checkpoint,
-            CommonName.CHECKPOINT_INDEX_NAME,
+            ADCommonName.CHECKPOINT_INDEX_NAME,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE,
             nodeStateManager,
             AnomalyDetectorSettings.HOURLY_MAINTENANCE
diff --git a/src/test/java/org/opensearch/ad/ratelimit/ResultWriteWorkerTests.java b/src/test/java/org/opensearch/ad/ratelimit/ResultWriteWorkerTests.java
index aa11e47e9..83defe706 100644
--- a/src/test/java/org/opensearch/ad/ratelimit/ResultWriteWorkerTests.java
+++ b/src/test/java/org/opensearch/ad/ratelimit/ResultWriteWorkerTests.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.breaker.ADCircuitBreakerService;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.transport.ADResultBulkRequest;
@@ -137,7 +137,7 @@ public void testRegular() {
     public void testSingleRetryRequest() throws IOException {
         List<IndexRequest> retryRequests = new ArrayList<>();
         try (XContentBuilder builder = jsonBuilder()) {
-            IndexRequest indexRequest = new IndexRequest(CommonName.ANOMALY_RESULT_INDEX_ALIAS)
+            IndexRequest indexRequest = new IndexRequest(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)
                 .source(detectResult.toXContent(builder, RestHandlerUtils.XCONTENT_WITH_TYPE));
             retryRequests.add(indexRequest);
         }
diff --git a/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java b/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java
index 62102e3b0..8bf4628c0 100644
--- a/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java
+++ b/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java
@@ -34,8 +34,8 @@
 import org.opensearch.ad.AnomalyDetectorPlugin;
 import org.opensearch.ad.AnomalyDetectorRestTestCase;
 import org.opensearch.ad.TestHelpers;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorExecutionInput;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -53,6 +53,7 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -417,7 +418,7 @@ public void testUpdateAnomalyDetectorWithNotExistingIndex() throws Exception {
             null
         );
 
-        deleteIndexWithAdminClient(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        deleteIndexWithAdminClient(CommonName.CONFIG_INDEX);
 
         TestHelpers
             .assertFailWith(
@@ -1670,8 +1671,8 @@ public void testSearchTopAnomalyResultsOnNonExistentResultIndex() throws IOExcep
         );
 
         // Delete any existing result index
-        if (indexExistsWithAdminClient(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
-            deleteIndexWithAdminClient(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        if (indexExistsWithAdminClient(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+            deleteIndexWithAdminClient(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         }
         Response response = searchTopAnomalyResults(
             detector.getDetectorId(),
@@ -1709,8 +1710,8 @@ public void testSearchTopAnomalyResultsOnEmptyResultIndex() throws IOException {
         );
 
         // Clear any existing result index, create an empty one
-        if (indexExistsWithAdminClient(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
-            deleteIndexWithAdminClient(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        if (indexExistsWithAdminClient(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+            deleteIndexWithAdminClient(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         }
         TestHelpers.createEmptyAnomalyResultIndex(adminClient());
         Response response = searchTopAnomalyResults(
@@ -1749,7 +1750,7 @@ public void testSearchTopAnomalyResultsOnPopulatedResultIndex() throws IOExcepti
         );
 
         // Ingest some sample results
-        if (!indexExistsWithAdminClient(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+        if (!indexExistsWithAdminClient(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
             TestHelpers.createEmptyAnomalyResultIndex(adminClient());
         }
         Map<String, Object> entityAttrs1 = new HashMap<String, Object>() {
@@ -1777,9 +1778,9 @@ public void testSearchTopAnomalyResultsOnPopulatedResultIndex() throws IOExcepti
         AnomalyResult anomalyResult3 = TestHelpers
             .randomHCADAnomalyDetectResult(detector.getDetectorId(), null, entityAttrs3, 0.5, 0.2, null, 5L, 5L);
 
-        TestHelpers.ingestDataToIndex(adminClient(), CommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult1));
-        TestHelpers.ingestDataToIndex(adminClient(), CommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult2));
-        TestHelpers.ingestDataToIndex(adminClient(), CommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult3));
+        TestHelpers.ingestDataToIndex(adminClient(), ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult1));
+        TestHelpers.ingestDataToIndex(adminClient(), ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult2));
+        TestHelpers.ingestDataToIndex(adminClient(), ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, TestHelpers.toHttpEntity(anomalyResult3));
 
         // Sorting by severity
         Response severityResponse = searchTopAnomalyResults(
@@ -1843,7 +1844,7 @@ public void testSearchTopAnomalyResultsOnPopulatedResultIndex() throws IOExcepti
 
     public void testSearchTopAnomalyResultsWithCustomResultIndex() throws IOException {
         String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
-        String customResultIndexName = CommonName.CUSTOM_RESULT_INDEX_PREFIX + randomAlphaOfLength(5).toLowerCase(Locale.ROOT);
+        String customResultIndexName = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + randomAlphaOfLength(5).toLowerCase(Locale.ROOT);
         Map<String, String> categoryFieldsAndTypes = new HashMap<String, String>() {
             {
                 put("keyword-field", "keyword");
diff --git a/src/test/java/org/opensearch/ad/rest/HistoricalAnalysisRestApiIT.java b/src/test/java/org/opensearch/ad/rest/HistoricalAnalysisRestApiIT.java
index 9f6252af8..a8800c1d3 100644
--- a/src/test/java/org/opensearch/ad/rest/HistoricalAnalysisRestApiIT.java
+++ b/src/test/java/org/opensearch/ad/rest/HistoricalAnalysisRestApiIT.java
@@ -16,9 +16,9 @@
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_RUNNING_ENTITIES_PER_DETECTOR_FOR_HISTORICAL_ANALYSIS;
-import static org.opensearch.ad.stats.StatNames.AD_TOTAL_BATCH_TASK_EXECUTION_COUNT;
-import static org.opensearch.ad.stats.StatNames.MULTI_ENTITY_DETECTOR_COUNT;
-import static org.opensearch.ad.stats.StatNames.SINGLE_ENTITY_DETECTOR_COUNT;
+import static org.opensearch.timeseries.stats.StatNames.AD_TOTAL_BATCH_TASK_EXECUTION_COUNT;
+import static org.opensearch.timeseries.stats.StatNames.MULTI_ENTITY_DETECTOR_COUNT;
+import static org.opensearch.timeseries.stats.StatNames.SINGLE_ENTITY_DETECTOR_COUNT;
 
 import java.io.IOException;
 import java.util.List;
@@ -32,7 +32,7 @@
 import org.junit.Ignore;
 import org.opensearch.ad.HistoricalAnalysisRestTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.ADTaskProfile;
 import org.opensearch.ad.model.ADTaskState;
@@ -67,7 +67,7 @@ public void testHistoricalAnalysisForSingleEntityDetector() throws Exception {
     }
 
     public void testHistoricalAnalysisForSingleEntityDetectorWithCustomResultIndex() throws Exception {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + randomAlphaOfLength(5).toLowerCase(Locale.ROOT);
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + randomAlphaOfLength(5).toLowerCase(Locale.ROOT);
         List<String> startHistoricalAnalysisResult = startHistoricalAnalysis(0, resultIndex);
         String detectorId = startHistoricalAnalysisResult.get(0);
         String taskId = startHistoricalAnalysisResult.get(1);
diff --git a/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java b/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java
index 0c26143bb..0a3ec8c76 100644
--- a/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java
+++ b/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java
@@ -28,7 +28,7 @@
 import org.junit.Before;
 import org.opensearch.ad.AnomalyDetectorRestTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorExecutionInput;
 import org.opensearch.ad.model.DetectionDateRange;
@@ -382,14 +382,14 @@ public void testCreateAnomalyDetectorWithCustomResultIndex() throws IOException
         AnomalyDetector anomalyDetector = createRandomAnomalyDetector(false, false, aliceClient);
         // User elk has AD full access, but has no read permission of index
 
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
         AnomalyDetector detector = cloneDetector(anomalyDetector, resultIndex);
         // User goat has no permission to create index
         Exception exception = expectThrows(IOException.class, () -> { createAnomalyDetector(detector, true, goatClient); });
         Assert.assertTrue(exception.getMessage().contains("no permissions for [indices:admin/create]"));
 
         // User cat has permission to create index
-        resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test2";
+        resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test2";
         TestHelpers.createIndexWithTimeField(client(), anomalyDetector.getIndices().get(0), anomalyDetector.getTimeField());
         AnomalyDetector detectorOfCat = createAnomalyDetector(cloneDetector(anomalyDetector, resultIndex), true, catClient);
         assertEquals(resultIndex, detectorOfCat.getResultIndex());
diff --git a/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java b/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java
index 718e73862..5a145d864 100644
--- a/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java
+++ b/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java
@@ -39,8 +39,8 @@
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.common.exception.InternalFailure;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.mock.model.MockSimpleLog;
 import org.opensearch.ad.model.AnomalyDetector;
@@ -358,7 +358,7 @@ public void testIndexException() throws IOException {
                 10,
                 MockSimpleLog.TIME_FIELD,
                 null,
-                CommonName.CUSTOM_RESULT_INDEX_PREFIX + "index"
+                ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "index"
             );
         when(anomalyDetectionIndices.doesIndexExist(anyString())).thenReturn(false);
         handler.startAnomalyDetectorJob(detector, listener);
diff --git a/src/test/java/org/opensearch/ad/stats/ADStatsTests.java b/src/test/java/org/opensearch/ad/stats/ADStatsTests.java
index 26846edcf..0d8150683 100644
--- a/src/test/java/org/opensearch/ad/stats/ADStatsTests.java
+++ b/src/test/java/org/opensearch/ad/stats/ADStatsTests.java
@@ -44,6 +44,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.stats.StatNames;
 
 import test.org.opensearch.ad.util.MLUtil;
 import test.org.opensearch.ad.util.RandomModelStateConfig;
diff --git a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java
index 2fd2a1f93..008e5034f 100644
--- a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java
+++ b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java
@@ -36,9 +36,9 @@
 import static org.opensearch.ad.TestHelpers.randomIntervalSchedule;
 import static org.opensearch.ad.TestHelpers.randomIntervalTimeConfiguration;
 import static org.opensearch.ad.TestHelpers.randomUser;
+import static org.opensearch.ad.constant.ADCommonName.ANOMALY_RESULT_INDEX_ALIAS;
+import static org.opensearch.ad.constant.ADCommonName.DETECTION_STATE_INDEX;
 import static org.opensearch.ad.constant.CommonErrorMessages.CREATE_INDEX_NOT_ACKNOWLEDGED;
-import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS;
-import static org.opensearch.ad.constant.CommonName.DETECTION_STATE_INDEX;
 import static org.opensearch.ad.model.Entity.createSingleAttributeEntity;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.DELETE_AD_RESULT_WHEN_DELETE_DETECTOR;
@@ -129,6 +129,7 @@
 import org.opensearch.search.aggregations.InternalAggregations;
 import org.opensearch.search.internal.InternalSearchResponse;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
@@ -290,7 +291,7 @@ private void setupGetDetector(AnomalyDetector detector) {
                 .onResponse(
                     new GetResponse(
                         new GetResult(
-                            AnomalyDetector.ANOMALY_DETECTORS_INDEX,
+                            CommonName.CONFIG_INDEX,
                             detector.getDetectorId(),
                             UNASSIGNED_SEQ_NO,
                             0,
@@ -636,7 +637,7 @@ public void testGetADTaskWithNotExistTask() {
             ActionListener<GetResponse> listener = invocation.getArgument(1);
             GetResponse response = new GetResponse(
                 new GetResult(
-                    AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+                    CommonName.JOB_INDEX,
                     taskId,
                     UNASSIGNED_SEQ_NO,
                     0,
@@ -692,7 +693,7 @@ public void testGetADTaskWithExistingTask() {
             ADTask adTask = randomAdTask();
             GetResponse response = new GetResponse(
                 new GetResult(
-                    AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+                    CommonName.JOB_INDEX,
                     taskId,
                     UNASSIGNED_SEQ_NO,
                     0,
@@ -1228,7 +1229,7 @@ private void setupGetAndExecuteOnLatestADTasks(ADTaskProfile adTaskProfile) {
             ActionListener<GetResponse> getResponselistener = invocation.getArgument(1);
             GetResponse response = new GetResponse(
                 new GetResult(
-                    AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+                    CommonName.JOB_INDEX,
                     detectorId,
                     UNASSIGNED_SEQ_NO,
                     0,
@@ -1551,7 +1552,7 @@ public void testGetDetectorWithWrongContent() {
             ActionListener<GetResponse> responseListener = invocation.getArgument(1);
             GetResponse response = new GetResponse(
                 new GetResult(
-                    AnomalyDetector.ANOMALY_DETECTORS_INDEX,
+                    CommonName.CONFIG_INDEX,
                     detectorId,
                     UNASSIGNED_SEQ_NO,
                     0,
diff --git a/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java
index 3847f4429..f0be82db6 100644
--- a/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java
@@ -27,7 +27,7 @@
 import org.opensearch.ad.HistoricalAnalysisIntegTestCase;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.common.exception.EndRunException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.DetectionDateRange;
@@ -101,7 +101,7 @@ public void testHistoricalAnalysisWithValidDateRange() throws IOException, Inter
         ADBatchAnomalyResultRequest request = adBatchAnomalyResultRequest(dateRange);
         client().execute(ADBatchAnomalyResultAction.INSTANCE, request).actionGet(5000);
         Thread.sleep(20000);
-        GetResponse doc = getDoc(CommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
+        GetResponse doc = getDoc(ADCommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
         assertTrue(HISTORICAL_ANALYSIS_FINISHED_FAILED_STATS.contains(doc.getSourceAsMap().get(ADTask.STATE_FIELD)));
     }
 
@@ -121,7 +121,7 @@ public void testHistoricalAnalysisExceedsMaxRunningTaskLimit() throws IOExceptio
         for (int i = 0; i < totalDataNodes; i++) {
             client().execute(ADBatchAnomalyResultAction.INSTANCE, adBatchAnomalyResultRequest(dateRange)).actionGet(5000);
         }
-        waitUntil(() -> countDocs(CommonName.DETECTION_STATE_INDEX) >= totalDataNodes, 10, TimeUnit.SECONDS);
+        waitUntil(() -> countDocs(ADCommonName.DETECTION_STATE_INDEX) >= totalDataNodes, 10, TimeUnit.SECONDS);
 
         ADBatchAnomalyResultRequest request = adBatchAnomalyResultRequest(dateRange);
         try {
@@ -164,7 +164,7 @@ public void testMultipleTasks() throws IOException, InterruptedException {
         );
         client().execute(ADBatchAnomalyResultAction.INSTANCE, request).actionGet(5000);
         Thread.sleep(25000);
-        GetResponse doc = getDoc(CommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
+        GetResponse doc = getDoc(ADCommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
         assertTrue(HISTORICAL_ANALYSIS_FINISHED_FAILED_STATS.contains(doc.getSourceAsMap().get(ADTask.STATE_FIELD)));
         updateTransientSettings(ImmutableMap.of(MAX_BATCH_TASK_PER_NODE.getKey(), 1));
     }
@@ -189,7 +189,7 @@ private void testInvalidDetectionDateRange(DetectionDateRange dateRange, String
         ADBatchAnomalyResultRequest request = adBatchAnomalyResultRequest(dateRange);
         client().execute(ADBatchAnomalyResultAction.INSTANCE, request).actionGet(5000);
         Thread.sleep(5000);
-        GetResponse doc = getDoc(CommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
+        GetResponse doc = getDoc(ADCommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId());
         assertEquals(error, doc.getSourceAsMap().get(ADTask.ERROR_FIELD));
     }
 }
diff --git a/src/test/java/org/opensearch/ad/transport/ADStatsTests.java b/src/test/java/org/opensearch/ad/transport/ADStatsTests.java
index 0473cfaf4..1c1d3c3ff 100644
--- a/src/test/java/org/opensearch/ad/transport/ADStatsTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADStatsTests.java
@@ -34,11 +34,9 @@
 import org.opensearch.Version;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.ml.EntityModel;
 import org.opensearch.ad.ml.ModelState;
 import org.opensearch.ad.model.Entity;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Strings;
@@ -48,6 +46,8 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 
 import test.org.opensearch.ad.util.JsonDeserializer;
 
diff --git a/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java
index ee9060207..22326ecc0 100644
--- a/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java
@@ -42,7 +42,7 @@
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.ad.HistoricalAnalysisIntegTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.mock.model.MockSimpleLog;
 import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobAction;
 import org.opensearch.ad.model.ADTask;
@@ -52,12 +52,13 @@
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.model.DetectionDateRange;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.client.Client;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.test.OpenSearchIntegTestCase;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -313,7 +314,7 @@ public void testCleanOldTaskDocs() throws InterruptedException, IOException {
             ADTask task = randomADTask(randomAlphaOfLength(5), detector, detectorId, dateRange, state);
             createADTask(task);
         }
-        long count = countDocs(CommonName.DETECTION_STATE_INDEX);
+        long count = countDocs(ADCommonName.DETECTION_STATE_INDEX);
         assertEquals(states.size(), count);
 
         AnomalyDetectorJobRequest request = new AnomalyDetectorJobRequest(
@@ -344,15 +345,15 @@ public void testCleanOldTaskDocs() throws InterruptedException, IOException {
     public void tearDown() throws Exception {
         super.tearDown();
         // delete index will clear search context, this can avoid in-flight contexts error
-        deleteIndexIfExists(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
-        deleteIndexIfExists(CommonName.DETECTION_STATE_INDEX);
+        deleteIndexIfExists(CommonName.CONFIG_INDEX);
+        deleteIndexIfExists(ADCommonName.DETECTION_STATE_INDEX);
     }
 
     public void testStartRealtimeDetector() throws IOException {
         List<String> realtimeResult = startRealtimeDetector();
         String detectorId = realtimeResult.get(0);
         String jobId = realtimeResult.get(1);
-        GetResponse jobDoc = getDoc(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, detectorId);
+        GetResponse jobDoc = getDoc(CommonName.JOB_INDEX, detectorId);
         AnomalyDetectorJob job = toADJob(jobDoc);
         assertTrue(job.isEnabled());
         assertEquals(detectorId, job.getName());
@@ -421,7 +422,7 @@ public void testStopRealtimeDetector() throws IOException {
 
         AnomalyDetectorJobRequest request = stopDetectorJobRequest(detectorId, false);
         client().execute(AnomalyDetectorJobAction.INSTANCE, request).actionGet(10000);
-        GetResponse doc = getDoc(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX, detectorId);
+        GetResponse doc = getDoc(CommonName.JOB_INDEX, detectorId);
         AnomalyDetectorJob job = toADJob(doc);
         assertFalse(job.isEnabled());
         assertEquals(detectorId, job.getName());
diff --git a/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java
index d4518be48..0116dda36 100644
--- a/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java
+++ b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java
@@ -76,8 +76,8 @@
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
 import org.opensearch.ad.common.exception.LimitExceededException;
 import org.opensearch.ad.common.exception.ResourceNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.feature.FeatureManager;
 import org.opensearch.ad.feature.SinglePointFeatures;
 import org.opensearch.ad.ml.ModelManager;
@@ -89,7 +89,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.ad.util.SecurityClientUtil;
@@ -115,6 +114,8 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.NodeNotConnectedException;
 import org.opensearch.transport.RemoteTransportException;
 import org.opensearch.transport.Transport;
@@ -275,7 +276,7 @@ public void setUp() throws Exception {
             }
 
             assertTrue(request != null && listener != null);
-            ShardId shardId = new ShardId(new Index(CommonName.ANOMALY_RESULT_INDEX_ALIAS, randomAlphaOfLength(10)), 0);
+            ShardId shardId = new ShardId(new Index(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS, randomAlphaOfLength(10)), 0);
             listener.onResponse(new IndexResponse(shardId, request.id(), 1, 1, 1, true));
 
             return null;
@@ -301,12 +302,14 @@ public void setUp() throws Exception {
             GetRequest request = (GetRequest) args[0];
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
-            if (request.index().equals(CommonName.DETECTION_STATE_INDEX)) {
+            if (request.index().equals(ADCommonName.DETECTION_STATE_INDEX)) {
 
                 DetectorInternalState.Builder result = new DetectorInternalState.Builder().lastUpdateTime(Instant.now());
 
                 listener
-                    .onResponse(TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), CommonName.DETECTION_STATE_INDEX));
+                    .onResponse(
+                        TestHelpers.createGetResponse(result.build(), detector.getDetectorId(), ADCommonName.DETECTION_STATE_INDEX)
+                    );
 
             }
 
@@ -1063,7 +1066,7 @@ public void testJsonRequest() throws IOException, JsonPathNotFoundException {
         request.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY), request.getAdID());
+        assertEquals(JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY), request.getAdID());
         assertEquals(JsonDeserializer.getLongValue(json, CommonName.START_JSON_KEY), request.getStart());
         assertEquals(JsonDeserializer.getLongValue(json, CommonName.END_JSON_KEY), request.getEnd());
     }
@@ -1636,7 +1639,7 @@ public void testEndRunDueToNoTrainingData() {
         doAnswer(invocation -> {
             Object[] args = invocation.getArguments();
             ActionListener<ThresholdingResult> listener = (ActionListener<ThresholdingResult>) args[3];
-            listener.onFailure(new IndexNotFoundException(CommonName.CHECKPOINT_INDEX_NAME));
+            listener.onFailure(new IndexNotFoundException(ADCommonName.CHECKPOINT_INDEX_NAME));
             return null;
         }).when(rcfManager).getTRcfResult(any(String.class), any(String.class), any(double[].class), any(ActionListener.class));
 
@@ -1792,7 +1795,7 @@ public void testColdStartBecauseFailtoGetCheckpoint() {
         ThreadPool mockThreadPool = mock(ThreadPool.class);
         setUpColdStart(
             mockThreadPool,
-            new ColdStartConfig.Builder().getCheckpointException(new IndexNotFoundException(CommonName.CHECKPOINT_INDEX_NAME)).build()
+            new ColdStartConfig.Builder().getCheckpointException(new IndexNotFoundException(ADCommonName.CHECKPOINT_INDEX_NAME)).build()
         );
 
         doAnswer(invocation -> {
diff --git a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java
index e7085ee31..18f08f03a 100644
--- a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java
+++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java
@@ -13,7 +13,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
 
 import java.time.Instant;
@@ -57,6 +56,7 @@
 import org.opensearch.index.get.GetResult;
 import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportService;
 
@@ -199,7 +199,7 @@ private ClusterState createClusterState() {
         ImmutableOpenMap<String, IndexMetadata> immutableOpenMap = ImmutableOpenMap
             .<String, IndexMetadata>builder()
             .fPut(
-                ANOMALY_DETECTOR_JOB_INDEX,
+                CommonName.JOB_INDEX,
                 IndexMetadata
                     .builder("test")
                     .settings(
@@ -269,7 +269,7 @@ private void setupMocks(
             }
             getResponse = new GetResponse(
                 new GetResult(
-                    AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX,
+                    CommonName.JOB_INDEX,
                     "id",
                     UNASSIGNED_SEQ_NO,
                     0,
diff --git a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java
index 76e5eb0dc..dad52b44c 100644
--- a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java
@@ -12,7 +12,7 @@
 package org.opensearch.ad.transport;
 
 import static org.opensearch.ad.TestHelpers.matchAllRequest;
-import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS;
+import static org.opensearch.ad.constant.ADCommonName.ANOMALY_RESULT_INDEX_ALIAS;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/org/opensearch/ad/transport/DeleteTests.java b/src/test/java/org/opensearch/ad/transport/DeleteTests.java
index 01ebe30e9..cd2929e3a 100644
--- a/src/test/java/org/opensearch/ad/transport/DeleteTests.java
+++ b/src/test/java/org/opensearch/ad/transport/DeleteTests.java
@@ -43,8 +43,8 @@
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.ad.AbstractADTest;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.util.DiscoveryNodeFilterer;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.ClusterName;
@@ -187,7 +187,7 @@ public <R extends ToXContent> void testJsonRequestTemplate(R request, Supplier<S
         request.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY), requestSupplier.get());
+        assertEquals(JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY), requestSupplier.get());
     }
 
     public void testJsonRequestStopDetector() throws IOException, JsonPathNotFoundException {
diff --git a/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java
index 44818d6a3..79794dcdb 100644
--- a/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java
+++ b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java
@@ -38,8 +38,8 @@
 import org.opensearch.ad.cluster.HashRing;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.model.Entity;
 import org.opensearch.ad.model.EntityProfileName;
 import org.opensearch.ad.model.ModelProfile;
@@ -51,6 +51,7 @@
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.tasks.Task;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.ConnectTransportException;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportException;
@@ -358,7 +359,7 @@ public void testResponseToXContent() throws IOException, JsonPathNotFoundExcepti
         EntityProfileResponse response = builder.build();
         String json = TestHelpers.xContentBuilderToString(response.toXContent(TestHelpers.builder(), ToXContent.EMPTY_PARAMS));
         assertEquals(lastActiveTimestamp, JsonDeserializer.getLongValue(json, EntityProfileResponse.LAST_ACTIVE_TS));
-        assertEquals(modelSize, JsonDeserializer.getChildNode(json, CommonName.MODEL, CommonName.MODEL_SIZE_IN_BYTES).getAsLong());
+        assertEquals(modelSize, JsonDeserializer.getChildNode(json, ADCommonName.MODEL, CommonName.MODEL_SIZE_IN_BYTES).getAsLong());
     }
 
     public void testResponseHashCodeEquals() {
@@ -375,8 +376,8 @@ public void testResponseHashCodeEquals() {
     }
 
     public void testEntityProfileName() {
-        assertEquals("state", EntityProfileName.getName(CommonName.STATE).getName());
-        assertEquals("models", EntityProfileName.getName(CommonName.MODELS).getName());
+        assertEquals("state", EntityProfileName.getName(ADCommonName.STATE).getName());
+        assertEquals("models", EntityProfileName.getName(ADCommonName.MODELS).getName());
         IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> EntityProfileName.getName("abc"));
         assertEquals(exception.getMessage(), CommonErrorMessages.UNSUPPORTED_PROFILE_TYPE);
     }
diff --git a/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java
index dbfd88bb8..dc8ac493f 100644
--- a/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java
@@ -59,8 +59,8 @@
 import org.opensearch.ad.common.exception.EndRunException;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
 import org.opensearch.ad.common.exception.LimitExceededException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.constant.CommonValue;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.ml.CheckpointDao;
@@ -77,7 +77,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Strings;
@@ -86,6 +85,8 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.TransportService;
 
 import test.org.opensearch.ad.util.JsonDeserializer;
@@ -354,7 +355,7 @@ public void testJsonResponse() throws IOException, JsonPathNotFoundException {
         request.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY), detectorId);
+        assertEquals(JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY), detectorId);
         assertEquals(JsonDeserializer.getLongValue(json, CommonName.START_JSON_KEY), start);
         assertEquals(JsonDeserializer.getLongValue(json, CommonName.END_JSON_KEY), end);
         JsonArray array = JsonDeserializer.getArrayValue(json, CommonName.ENTITIES_JSON_KEY);
diff --git a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java
index d25979304..ebd973c10 100644
--- a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java
+++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java
@@ -20,8 +20,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -59,6 +57,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.get.GetResult;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportService;
 
@@ -159,7 +158,7 @@ public void testValidRequest() throws IOException {
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
             String indexName = request.index();
-            if (indexName.equals(ANOMALY_DETECTORS_INDEX)) {
+            if (indexName.equals(CommonName.CONFIG_INDEX)) {
                 listener.onResponse(null);
             }
             return null;
@@ -219,13 +218,13 @@ private MultiGetResponse createMultiGetResponse() {
         ByteBuffer[] buffers = new ByteBuffer[0];
         items[0] = new MultiGetItemResponse(
             new GetResponse(
-                new GetResult(ANOMALY_DETECTOR_JOB_INDEX, "test_1", 1, 1, 0, true, BytesReference.fromByteBuffers(buffers), null, null)
+                new GetResult(CommonName.JOB_INDEX, "test_1", 1, 1, 0, true, BytesReference.fromByteBuffers(buffers), null, null)
             ),
             null
         );
         items[1] = new MultiGetItemResponse(
             new GetResponse(
-                new GetResult(ANOMALY_DETECTOR_JOB_INDEX, "test_2", 1, 1, 0, true, BytesReference.fromByteBuffers(buffers), null, null)
+                new GetResult(CommonName.JOB_INDEX, "test_2", 1, 1, 0, true, BytesReference.fromByteBuffers(buffers), null, null)
             ),
             null
         );
diff --git a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java
index 9f821ea18..333bd03ab 100644
--- a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java
@@ -28,7 +28,7 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.ad.NodeStateManager;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
@@ -245,7 +245,7 @@ public void testGetAnomalyDetectorProfileResponse() throws IOException {
 
         // {init_progress={percentage=99%, estimated_minutes_left=2, needed_shingles=2}}
         Map<String, Object> map = TestHelpers.XContentBuilderToMap(builder);
-        Map<String, Object> parsedInitProgress = (Map<String, Object>) (map.get(CommonName.INIT_PROGRESS));
+        Map<String, Object> parsedInitProgress = (Map<String, Object>) (map.get(ADCommonName.INIT_PROGRESS));
         Assert.assertEquals(initProgress.getPercentage(), parsedInitProgress.get(InitProgressProfile.PERCENTAGE).toString());
         assertTrue(initProgress.toString().contains("[percentage=99%,estimated_minutes_left=2,needed_shingles=2]"));
         Assert
diff --git a/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java
index b76ba44bb..6ba36eb01 100644
--- a/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java
@@ -61,6 +61,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.collect.ImmutableMap;
@@ -97,10 +98,10 @@ public void setUp() throws Exception {
             .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
             .build();
         final Settings.Builder existingSettings = Settings.builder().put(indexSettings).put(IndexMetadata.SETTING_INDEX_UUID, "test2UUID");
-        IndexMetadata indexMetaData = IndexMetadata.builder(AnomalyDetector.ANOMALY_DETECTORS_INDEX).settings(existingSettings).build();
+        IndexMetadata indexMetaData = IndexMetadata.builder(CommonName.CONFIG_INDEX).settings(existingSettings).build();
         final ImmutableOpenMap<String, IndexMetadata> indices = ImmutableOpenMap
             .<String, IndexMetadata>builder()
-            .fPut(AnomalyDetector.ANOMALY_DETECTORS_INDEX, indexMetaData)
+            .fPut(CommonName.CONFIG_INDEX, indexMetaData)
             .build();
         ClusterState clusterState = ClusterState.builder(clusterName).metadata(Metadata.builder().indices(indices).build()).build();
         when(clusterService.state()).thenReturn(clusterState);
@@ -123,8 +124,7 @@ public void setUp() throws Exception {
         );
         task = mock(Task.class);
         AnomalyDetector detector = TestHelpers.randomAnomalyDetector(ImmutableMap.of("testKey", "testValue"), Instant.now());
-        GetResponse getDetectorResponse = TestHelpers
-            .createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        GetResponse getDetectorResponse = TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX);
         doAnswer(invocation -> {
             Object[] args = invocation.getArguments();
             assertTrue(
diff --git a/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java b/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java
index ed4428c1f..e98c95b2e 100644
--- a/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java
+++ b/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java
@@ -96,7 +96,6 @@
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.ad.util.ClientUtil;
@@ -123,6 +122,8 @@
 import org.opensearch.test.ClusterServiceUtils;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportException;
 import org.opensearch.transport.TransportInterceptor;
@@ -431,7 +432,7 @@ public void setUpNormlaStateManager() throws IOException {
             .build();
         doAnswer(invocation -> {
             ActionListener<GetResponse> listener = invocation.getArgument(1);
-            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, CommonName.CONFIG_INDEX));
             return null;
         }).when(client).get(any(GetRequest.class), any(ActionListener.class));
 
@@ -742,7 +743,7 @@ public void testCircuitBreakerOpen() throws InterruptedException, IOException {
         ClientUtil clientUtil = mock(ClientUtil.class);
         doAnswer(invocation -> {
             ActionListener<GetResponse> listener = invocation.getArgument(2);
-            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, AnomalyDetector.ANOMALY_DETECTORS_INDEX));
+            listener.onResponse(TestHelpers.createGetResponse(detector, detectorId, CommonName.CONFIG_INDEX));
             return null;
         }).when(clientUtil).asyncRequest(any(GetRequest.class), any(), any(ActionListener.class));
 
diff --git a/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java
index b10c66e7b..8f47425a9 100644
--- a/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java
@@ -75,6 +75,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.timeseries.constant.CommonName;
 import org.opensearch.transport.TransportService;
 
 import com.google.common.collect.ImmutableMap;
@@ -120,10 +121,10 @@ public void setUp() throws Exception {
             .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
             .build();
         final Settings.Builder existingSettings = Settings.builder().put(indexSettings).put(IndexMetadata.SETTING_INDEX_UUID, "test2UUID");
-        IndexMetadata indexMetaData = IndexMetadata.builder(AnomalyDetector.ANOMALY_DETECTORS_INDEX).settings(existingSettings).build();
+        IndexMetadata indexMetaData = IndexMetadata.builder(CommonName.CONFIG_INDEX).settings(existingSettings).build();
         final ImmutableOpenMap<String, IndexMetadata> indices = ImmutableOpenMap
             .<String, IndexMetadata>builder()
-            .fPut(AnomalyDetector.ANOMALY_DETECTORS_INDEX, indexMetaData)
+            .fPut(CommonName.CONFIG_INDEX, indexMetaData)
             .build();
         ClusterState clusterState = ClusterState.builder(clusterName).metadata(Metadata.builder().indices(indices).build()).build();
         when(clusterService.state()).thenReturn(clusterState);
@@ -267,7 +268,7 @@ public void testPreviewTransportActionWithIndex() throws IOException, Interrupte
         final CountDownLatch inProgressLatch = new CountDownLatch(1);
         PreviewAnomalyDetectorRequest request = new PreviewAnomalyDetectorRequest(null, "1234", Instant.now(), Instant.now());
         Settings indexSettings = Settings.builder().put("index.number_of_shards", 5).put("index.number_of_replicas", 1).build();
-        CreateIndexRequest indexRequest = new CreateIndexRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX, indexSettings);
+        CreateIndexRequest indexRequest = new CreateIndexRequest(CommonName.CONFIG_INDEX, indexSettings);
         client().admin().indices().create(indexRequest).actionGet();
         ActionListener<PreviewAnomalyDetectorResponse> previewResponse = new ActionListener<PreviewAnomalyDetectorResponse>() {
             @Override
@@ -314,8 +315,7 @@ public void testPreviewTransportActionNoContext() throws IOException, Interrupte
             Instant.now()
         );
 
-        GetResponse getDetectorResponse = TestHelpers
-            .createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        GetResponse getDetectorResponse = TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX);
         doAnswer(invocation -> {
             Object[] args = invocation.getArguments();
             assertTrue(
@@ -352,11 +352,11 @@ public void onFailure(Exception e) {
     public void testPreviewTransportActionWithDetector() throws IOException, InterruptedException {
         final CountDownLatch inProgressLatch = new CountDownLatch(1);
         CreateIndexResponse createResponse = TestHelpers
-            .createIndex(client().admin(), AnomalyDetector.ANOMALY_DETECTORS_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
+            .createIndex(client().admin(), CommonName.CONFIG_INDEX, AnomalyDetectionIndices.getAnomalyDetectorMappings());
         Assert.assertNotNull(createResponse);
 
         AnomalyDetector detector = TestHelpers.randomAnomalyDetector(ImmutableMap.of("testKey", "testValue"), Instant.now());
-        IndexRequest indexRequest = new IndexRequest(AnomalyDetector.ANOMALY_DETECTORS_INDEX)
+        IndexRequest indexRequest = new IndexRequest(CommonName.CONFIG_INDEX)
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
             .source(detector.toXContent(XContentFactory.jsonBuilder(), RestHandlerUtils.XCONTENT_WITH_TYPE));
         IndexResponse indexResponse = client().index(indexRequest).actionGet(5_000);
diff --git a/src/test/java/org/opensearch/ad/transport/ProfileTests.java b/src/test/java/org/opensearch/ad/transport/ProfileTests.java
index f930da6fa..15c4133fe 100644
--- a/src/test/java/org/opensearch/ad/transport/ProfileTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ProfileTests.java
@@ -30,7 +30,7 @@
 import org.opensearch.Version;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.DetectorProfileName;
 import org.opensearch.ad.model.ModelProfileOnNode;
 import org.opensearch.cluster.ClusterName;
@@ -42,6 +42,7 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.constant.CommonName;
 
 import test.org.opensearch.ad.util.JsonDeserializer;
 
@@ -162,7 +163,7 @@ public void testProfileNodeResponse() throws IOException, JsonPathNotFoundExcept
             );
         }
 
-        assertEquals("toXContent has the wrong shingle size", JsonDeserializer.getIntValue(json, CommonName.SHINGLE_SIZE), shingleSize);
+        assertEquals("toXContent has the wrong shingle size", JsonDeserializer.getIntValue(json, ADCommonName.SHINGLE_SIZE), shingleSize);
     }
 
     @Test
@@ -250,8 +251,8 @@ public void testProfileResponse() throws IOException, JsonPathNotFoundException
             JsonElement element = modelsJson.get(i);
             assertTrue(
                 "toXContent has the wrong model id",
-                JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_KEY).equals(model1Id)
-                    || JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_KEY).equals(model0Id)
+                JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_FIELD).equals(model1Id)
+                    || JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_FIELD).equals(model0Id)
             );
 
             assertEquals(
@@ -260,7 +261,7 @@ public void testProfileResponse() throws IOException, JsonPathNotFoundException
                 modelSize
             );
 
-            if (JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_KEY).equals(model1Id)) {
+            if (JsonDeserializer.getTextValue(element, CommonName.MODEL_ID_FIELD).equals(model1Id)) {
                 assertEquals("toXContent has the wrong node id", JsonDeserializer.getTextValue(element, ModelProfileOnNode.NODE_ID), node1);
             } else {
                 assertEquals("toXContent has the wrong node id", JsonDeserializer.getTextValue(element, ModelProfileOnNode.NODE_ID), node2);
diff --git a/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java
index 0467c2ac7..416de2a8f 100644
--- a/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java
+++ b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java
@@ -34,7 +34,7 @@
 import org.opensearch.ad.cluster.HashRing;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.ml.SingleStreamModelIdMapper;
 import org.opensearch.cluster.node.DiscoveryNode;
@@ -354,7 +354,7 @@ public void testResponseToXContent() throws IOException, JsonPathNotFoundExcepti
     public void testRequestToXContent() throws IOException, JsonPathNotFoundException {
         RCFPollingRequest response = new RCFPollingRequest(detectorId);
         String json = TestHelpers.xContentBuilderToString(response.toXContent(TestHelpers.builder(), ToXContent.EMPTY_PARAMS));
-        assertEquals(detectorId, JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY));
+        assertEquals(detectorId, JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY));
     }
 
     public void testNullDetectorId() {
diff --git a/src/test/java/org/opensearch/ad/transport/RCFResultTests.java b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java
index 6544f8e9b..b241d0cdd 100644
--- a/src/test/java/org/opensearch/ad/transport/RCFResultTests.java
+++ b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java
@@ -42,13 +42,12 @@
 import org.opensearch.ad.cluster.HashRing;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
 import org.opensearch.ad.common.exception.LimitExceededException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.ml.ThresholdingResult;
 import org.opensearch.ad.stats.ADStat;
 import org.opensearch.ad.stats.ADStats;
-import org.opensearch.ad.stats.StatNames;
 import org.opensearch.ad.stats.suppliers.CounterSupplier;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Strings;
@@ -59,6 +58,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.tasks.Task;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.timeseries.stats.StatNames;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportService;
 
@@ -268,8 +268,8 @@ public void testJsonRequest() throws IOException, JsonPathNotFoundException {
         request.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY), request.getAdID());
-        assertArrayEquals(JsonDeserializer.getDoubleArrayValue(json, CommonName.FEATURE_JSON_KEY), request.getFeatures(), 0.001);
+        assertEquals(JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY), request.getAdID());
+        assertArrayEquals(JsonDeserializer.getDoubleArrayValue(json, ADCommonName.FEATURE_JSON_KEY), request.getFeatures(), 0.001);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java
index 542b83902..7be934870 100644
--- a/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java
@@ -19,7 +19,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.HistoricalAnalysisIntegTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 
 public class SearchADTasksActionTests extends HistoricalAnalysisIntegTestCase {
 
@@ -35,7 +35,7 @@ public void testSearchADTasksAction() throws IOException {
 
     @Test
     public void testNoIndex() {
-        deleteIndexIfExists(CommonName.DETECTION_STATE_INDEX);
+        deleteIndexIfExists(ADCommonName.DETECTION_STATE_INDEX);
         SearchResponse searchResponse = client().execute(SearchADTasksAction.INSTANCE, matchAllRequest()).actionGet(10000);
         assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value);
     }
diff --git a/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java
index 27edd6d63..bc87faf13 100644
--- a/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java
@@ -23,7 +23,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.ad.HistoricalAnalysisIntegTestCase;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.ADTask;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
@@ -83,7 +83,7 @@ private SearchRequest searchRequest(boolean isLatest) {
         BoolQueryBuilder query = new BoolQueryBuilder();
         query.filter(new TermQueryBuilder(ADTask.IS_LATEST_FIELD, isLatest));
         sourceBuilder.query(query);
-        SearchRequest request = new SearchRequest().source(sourceBuilder).indices(CommonName.DETECTION_STATE_INDEX);
+        SearchRequest request = new SearchRequest().source(sourceBuilder).indices(ADCommonName.DETECTION_STATE_INDEX);
         return request;
     }
 
diff --git a/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java
index 7120c3a05..f1d93c8ed 100644
--- a/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java
@@ -27,6 +27,7 @@
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.google.common.collect.ImmutableList;
 
@@ -61,7 +62,7 @@ public void testSearchDetectorAction() throws IOException {
     }
 
     public void testNoIndex() {
-        deleteIndexIfExists(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
+        deleteIndexIfExists(CommonName.CONFIG_INDEX);
 
         BoolQueryBuilder query = new BoolQueryBuilder().filter(new MatchAllQueryBuilder());
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(query);
diff --git a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java
index 9e3001793..d9b7c2ea8 100644
--- a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java
@@ -41,7 +41,7 @@
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.ad.HistoricalAnalysisIntegTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.settings.AnomalyDetectorSettings;
 import org.opensearch.ad.transport.handler.ADSearchHandler;
 import org.opensearch.client.Client;
@@ -299,7 +299,7 @@ public void testSearchResultAction() throws IOException {
 
     @Test
     public void testNoIndex() {
-        deleteIndexIfExists(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        deleteIndexIfExists(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         SearchResponse searchResponse = client()
             .execute(SearchAnomalyResultAction.INSTANCE, matchAllRequest().indices(ALL_AD_RESULTS_INDEX_PATTERN))
             .actionGet(10000);
diff --git a/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java
index e3e6aaaf7..90ad49123 100644
--- a/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java
@@ -29,7 +29,7 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.ad.ADIntegTestCase;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyResultBucket;
 import org.opensearch.ad.transport.handler.ADSearchHandler;
 import org.opensearch.client.Client;
@@ -93,7 +93,7 @@ public void setUp() throws Exception {
     }
 
     public void testSearchOnNonExistingResultIndex() throws IOException {
-        deleteIndexIfExists(CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        deleteIndexIfExists(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         String testIndexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
         ImmutableList<String> categoryFields = ImmutableList.of("test-field-1", "test-field-2");
         String detectorId = createDetector(
diff --git a/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java
index 4f5054132..157dfbfea 100644
--- a/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java
@@ -18,7 +18,7 @@
 import org.opensearch.ad.ADIntegTestCase;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.stats.InternalStatNames;
-import org.opensearch.ad.stats.StatNames;
+import org.opensearch.timeseries.stats.StatNames;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java
index fa691f260..f1713e1e0 100644
--- a/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java
@@ -28,8 +28,8 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.ad.common.exception.JsonPathNotFoundException;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.ml.ThresholdingResult;
 import org.opensearch.common.Strings;
@@ -118,8 +118,8 @@ public void testJsonResponse() throws IOException, JsonPathNotFoundException {
         response.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getDoubleValue(json, CommonName.ANOMALY_GRADE_JSON_KEY), response.getAnomalyGrade(), 0.001);
-        assertEquals(JsonDeserializer.getDoubleValue(json, CommonName.CONFIDENCE_JSON_KEY), response.getConfidence(), 0.001);
+        assertEquals(JsonDeserializer.getDoubleValue(json, ADCommonName.ANOMALY_GRADE_JSON_KEY), response.getAnomalyGrade(), 0.001);
+        assertEquals(JsonDeserializer.getDoubleValue(json, ADCommonName.CONFIDENCE_JSON_KEY), response.getConfidence(), 0.001);
     }
 
     public void testEmptyDetectorID() {
@@ -149,7 +149,7 @@ public void testJsonRequest() throws IOException, JsonPathNotFoundException {
         request.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String json = Strings.toString(builder);
-        assertEquals(JsonDeserializer.getTextValue(json, CommonName.ID_JSON_KEY), request.getAdID());
-        assertEquals(JsonDeserializer.getDoubleValue(json, CommonName.RCF_SCORE_JSON_KEY), request.getRCFScore(), 0.001);
+        assertEquals(JsonDeserializer.getTextValue(json, ADCommonName.ID_JSON_KEY), request.getAdID());
+        assertEquals(JsonDeserializer.getDoubleValue(json, ADCommonName.RCF_SCORE_JSON_KEY), request.getRCFScore(), 0.001);
     }
 }
diff --git a/src/test/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportActionTests.java
index 71fb84701..2090ec331 100644
--- a/src/test/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportActionTests.java
@@ -20,8 +20,8 @@
 import org.junit.Test;
 import org.opensearch.ad.ADIntegTestCase;
 import org.opensearch.ad.TestHelpers;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.constant.CommonErrorMessages;
-import org.opensearch.ad.constant.CommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.DetectorValidationIssueType;
@@ -261,7 +261,7 @@ public void testValidateAnomalyDetectorWithMultipleInvalidFeatureField() throws
 
     @Test
     public void testValidateAnomalyDetectorWithCustomResultIndex() throws IOException {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
         createCustomADResultIndex(resultIndex);
         AnomalyDetector anomalyDetector = TestHelpers
             .randomDetector(
@@ -298,7 +298,7 @@ public void testValidateAnomalyDetectorWithCustomResultIndexPresentButNotCreated
 
     @Test
     public void testValidateAnomalyDetectorWithCustomResultIndexWithInvalidMapping() throws IOException {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
         URL url = AnomalyDetectionIndices.class.getClassLoader().getResource("mappings/checkpoint.json");
         createIndex(resultIndex, Resources.toString(url, Charsets.UTF_8));
         AnomalyDetector anomalyDetector = TestHelpers
@@ -326,7 +326,7 @@ public void testValidateAnomalyDetectorWithCustomResultIndexWithInvalidMapping()
     }
 
     private void testValidateAnomalyDetectorWithCustomResultIndex(boolean resultIndexCreated) throws IOException {
-        String resultIndex = CommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
+        String resultIndex = ADCommonName.CUSTOM_RESULT_INDEX_PREFIX + "test";
         if (resultIndexCreated) {
             createCustomADResultIndex(resultIndex);
         }
diff --git a/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java b/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java
index ff9720b02..7f8f9147d 100644
--- a/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java
+++ b/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java
@@ -29,7 +29,7 @@
 import org.opensearch.action.admin.indices.create.CreateIndexResponse;
 import org.opensearch.ad.AbstractADTest;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.indices.AnomalyDetectionIndices;
 import org.opensearch.ad.transport.AnomalyResultTests;
 import org.opensearch.ad.util.ClientUtil;
@@ -104,7 +104,7 @@ protected void setWriteBlockAdResultIndex(boolean blocked) {
         Settings settings = blocked
             ? Settings.builder().put(IndexMetadata.INDEX_BLOCKS_WRITE_SETTING.getKey(), true).build()
             : Settings.EMPTY;
-        ClusterState blockedClusterState = createIndexBlockedState(indexName, settings, CommonName.ANOMALY_RESULT_INDEX_ALIAS);
+        ClusterState blockedClusterState = createIndexBlockedState(indexName, settings, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS);
         when(clusterService.state()).thenReturn(blockedClusterState);
         when(indexNameResolver.concreteIndexNames(any(), any(), any(String.class))).thenReturn(new String[] { indexName });
     }
@@ -124,13 +124,13 @@ protected void setUpSavingAnomalyResultIndex(boolean anomalyResultIndexExists, I
                     listener.onFailure(new RuntimeException());
                     break;
                 case RESOURCE_EXISTS_EXCEPTION:
-                    listener.onFailure(new ResourceAlreadyExistsException(CommonName.ANOMALY_RESULT_INDEX_ALIAS));
+                    listener.onFailure(new ResourceAlreadyExistsException(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS));
                     break;
                 case ACKED:
-                    listener.onResponse(new CreateIndexResponse(true, true, CommonName.ANOMALY_RESULT_INDEX_ALIAS));
+                    listener.onResponse(new CreateIndexResponse(true, true, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS));
                     break;
                 case NOT_ACKED:
-                    listener.onResponse(new CreateIndexResponse(false, false, CommonName.ANOMALY_RESULT_INDEX_ALIAS));
+                    listener.onResponse(new CreateIndexResponse(false, false, ADCommonName.ANOMALY_RESULT_INDEX_ALIAS));
                     break;
                 default:
                     assertTrue("should not reach here", false);
diff --git a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java
index 1ee99af7d..d27fefeb9 100644
--- a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java
+++ b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS;
+import static org.opensearch.ad.constant.ADCommonName.ANOMALY_RESULT_INDEX_ALIAS;
 
 import java.io.IOException;
 import java.time.Clock;
diff --git a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java
index f2a0e6cae..468a95083 100644
--- a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java
+++ b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java
@@ -37,7 +37,7 @@
 import org.opensearch.ad.NodeStateManager;
 import org.opensearch.ad.TestHelpers;
 import org.opensearch.ad.common.exception.AnomalyDetectionException;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyResult;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
@@ -85,7 +85,7 @@ public void testSavingAdResult() throws IOException {
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtil,
@@ -121,7 +121,7 @@ public void testIndexWriteBlock() {
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtil,
@@ -139,7 +139,7 @@ public void testAdResultIndexExist() throws IOException {
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtil,
@@ -159,7 +159,7 @@ public void testAdResultIndexOtherException() throws IOException {
             client,
             settings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtil,
@@ -217,7 +217,7 @@ private void savingFailureTemplate(boolean throwOpenSearchRejectedExecutionExcep
             client,
             backoffSettings,
             threadPool,
-            CommonName.ANOMALY_RESULT_INDEX_ALIAS,
+            ADCommonName.ANOMALY_RESULT_INDEX_ALIAS,
             anomalyDetectionIndices,
             clientUtil,
             indexUtil,
diff --git a/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java b/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java
index 5e86089d3..4a57b6502 100644
--- a/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java
+++ b/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java
@@ -16,8 +16,6 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX;
-import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX;
 
 import java.io.IOException;
 import java.time.temporal.ChronoUnit;
@@ -35,7 +33,7 @@
 import org.opensearch.ad.AnomalyDetectorProfileRunner;
 import org.opensearch.ad.NodeStateManager;
 import org.opensearch.ad.TestHelpers;
-import org.opensearch.ad.constant.CommonName;
+import org.opensearch.ad.constant.ADCommonName;
 import org.opensearch.ad.model.AnomalyDetector;
 import org.opensearch.ad.model.AnomalyDetectorJob;
 import org.opensearch.ad.model.IntervalTimeConfiguration;
@@ -48,6 +46,7 @@
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.search.aggregations.InternalAggregation;
 import org.opensearch.search.aggregations.InternalAggregations;
+import org.opensearch.timeseries.constant.CommonName;
 
 import com.carrotsearch.hppc.BitMixer;
 
@@ -94,33 +93,27 @@ private void setUpMultiEntityClientGet(DetectorStatus detectorStatus, JobStatus
             GetRequest request = (GetRequest) args[0];
             ActionListener<GetResponse> listener = (ActionListener<GetResponse>) args[1];
 
-            if (request.index().equals(ANOMALY_DETECTORS_INDEX)) {
+            if (request.index().equals(CommonName.CONFIG_INDEX)) {
                 switch (detectorStatus) {
                     case EXIST:
-                        listener
-                            .onResponse(
-                                TestHelpers.createGetResponse(detector, detector.getDetectorId(), AnomalyDetector.ANOMALY_DETECTORS_INDEX)
-                            );
+                        listener.onResponse(TestHelpers.createGetResponse(detector, detector.getDetectorId(), CommonName.CONFIG_INDEX));
                         break;
                     default:
                         assertTrue("should not reach here", false);
                         break;
                 }
-            } else if (request.index().equals(ANOMALY_DETECTOR_JOB_INDEX)) {
+            } else if (request.index().equals(CommonName.JOB_INDEX)) {
                 AnomalyDetectorJob job = null;
                 switch (jobStatus) {
                     case ENABLED:
                         job = TestHelpers.randomAnomalyDetectorJob(true);
-                        listener
-                            .onResponse(
-                                TestHelpers.createGetResponse(job, detector.getDetectorId(), AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
-                            );
+                        listener.onResponse(TestHelpers.createGetResponse(job, detector.getDetectorId(), CommonName.JOB_INDEX));
                         break;
                     default:
                         assertTrue("should not reach here", false);
                         break;
                 }
-            } else if (request.index().equals(CommonName.DETECTION_STATE_INDEX)) {
+            } else if (request.index().equals(ADCommonName.DETECTION_STATE_INDEX)) {
                 switch (errorResultStatus) {
                     case NO_ERROR:
                         listener.onResponse(null);
@@ -146,7 +139,7 @@ private void setUpMultiEntityClientSearch(ADResultStatus resultStatus, Cardinali
             Object[] args = invocation.getArguments();
             ActionListener<SearchResponse> listener = (ActionListener<SearchResponse>) args[1];
             SearchRequest request = (SearchRequest) args[0];
-            if (request.indices()[0].equals(CommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
+            if (request.indices()[0].equals(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS)) {
                 switch (resultStatus) {
                     case NO_RESULT:
                         SearchResponse mockResponse = mock(SearchResponse.class);
@@ -176,7 +169,7 @@ private void setUpMultiEntityClientSearch(ADResultStatus resultStatus, Cardinali
                         for (int i = 0; i < 100; i++) {
                             hyperLogLog.collect(0, BitMixer.mix64(randomIntBetween(1, 100)));
                         }
-                        aggs.add(new InternalCardinality(CommonName.TOTAL_ENTITIES, hyperLogLog, new HashMap<>()));
+                        aggs.add(new InternalCardinality(ADCommonName.TOTAL_ENTITIES, hyperLogLog, new HashMap<>()));
                         when(response.getAggregations()).thenReturn(InternalAggregations.from(aggs));
                         listener.onResponse(response);
                         break;