diff --git a/src/test/java/org/opensearch/EntityProfileRequest1_0.java b/src/test/java/org/opensearch/EntityProfileRequest1_0.java
index 90d356273..2c339551f 100644
--- a/src/test/java/org/opensearch/EntityProfileRequest1_0.java
+++ b/src/test/java/org/opensearch/EntityProfileRequest1_0.java
@@ -25,8 +25,8 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class EntityProfileRequest1_0 extends ActionRequest implements ToXContentObject {
     public static final String ENTITY = "entity";
diff --git a/src/test/java/org/opensearch/EntityProfileResponse1_0.java b/src/test/java/org/opensearch/EntityProfileResponse1_0.java
index 78fe8e737..e0007bc34 100644
--- a/src/test/java/org/opensearch/EntityProfileResponse1_0.java
+++ b/src/test/java/org/opensearch/EntityProfileResponse1_0.java
@@ -21,8 +21,8 @@
 import org.opensearch.ad.constant.CommonName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class EntityProfileResponse1_0 extends ActionResponse implements ToXContentObject {
     public static final String ACTIVE = "active";
diff --git a/src/test/java/org/opensearch/EntityResultRequest1_0.java b/src/test/java/org/opensearch/EntityResultRequest1_0.java
index 9abfc3ece..8ab7a7a51 100644
--- a/src/test/java/org/opensearch/EntityResultRequest1_0.java
+++ b/src/test/java/org/opensearch/EntityResultRequest1_0.java
@@ -24,8 +24,8 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class EntityResultRequest1_0 extends ActionRequest implements ToXContentObject {
 
diff --git a/src/test/java/org/opensearch/ModelProfile1_0.java b/src/test/java/org/opensearch/ModelProfile1_0.java
index 31ec4def7..6a217b9b0 100644
--- a/src/test/java/org/opensearch/ModelProfile1_0.java
+++ b/src/test/java/org/opensearch/ModelProfile1_0.java
@@ -19,8 +19,8 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class ModelProfile1_0 implements Writeable, ToXContent {
     // field name in toXContent
diff --git a/src/test/java/org/opensearch/ProfileNodeResponse1_0.java b/src/test/java/org/opensearch/ProfileNodeResponse1_0.java
index 83a7170cd..6535cc27e 100644
--- a/src/test/java/org/opensearch/ProfileNodeResponse1_0.java
+++ b/src/test/java/org/opensearch/ProfileNodeResponse1_0.java
@@ -19,8 +19,8 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentFragment;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentFragment;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 /**
  * Profile response on a node
diff --git a/src/test/java/org/opensearch/ProfileResponse1_0.java b/src/test/java/org/opensearch/ProfileResponse1_0.java
index 30d0eee2f..102b370cd 100644
--- a/src/test/java/org/opensearch/ProfileResponse1_0.java
+++ b/src/test/java/org/opensearch/ProfileResponse1_0.java
@@ -22,8 +22,8 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentFragment;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentFragment;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 /**
  * This class consists of the aggregated responses from the nodes
diff --git a/src/test/java/org/opensearch/RCFResultResponse1_0.java b/src/test/java/org/opensearch/RCFResultResponse1_0.java
index 6e7103ce0..b84047c5c 100644
--- a/src/test/java/org/opensearch/RCFResultResponse1_0.java
+++ b/src/test/java/org/opensearch/RCFResultResponse1_0.java
@@ -16,8 +16,8 @@
 import org.opensearch.action.ActionResponse;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class RCFResultResponse1_0 extends ActionResponse implements ToXContentObject {
     public static final String RCF_SCORE_JSON_KEY = "rcfScore";