diff --git a/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeService.java b/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeGenerator.java
similarity index 99%
rename from src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeService.java
rename to src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeGenerator.java
index 830a664..802660e 100644
--- a/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeService.java
+++ b/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/QueryShapeGenerator.java
@@ -22,7 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class QueryShapeService {
+public class QueryShapeGenerator {
     static final String TWO_SPACE_INDENT = "  ";
 
     public static String buildShape(SearchSourceBuilder source, Boolean showFields) {
diff --git a/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/SearchQueryCategorizer.java b/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/SearchQueryCategorizer.java
index 5f394c2..4cb2227 100644
--- a/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/SearchQueryCategorizer.java
+++ b/src/main/java/org/opensearch/plugin/insights/core/service/categorizer/SearchQueryCategorizer.java
@@ -88,7 +88,7 @@ public void categorize(SearchQueryRecord record) {
         incrementQueryAggregationCounters(source.aggregations(), measurements);
         incrementQuerySortCounters(source.sorts(), measurements);
 
-        String searchShape = QueryShapeService.buildShape(source, true);
+        String searchShape = QueryShapeGenerator.buildShape(source, true);
         logger.trace(searchShape);
     }
 
diff --git a/src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeServiceTests.java b/src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeGeneratorTests.java
similarity index 90%
rename from src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeServiceTests.java
rename to src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeGeneratorTests.java
index 7de4da0..56c9de4 100644
--- a/src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeServiceTests.java
+++ b/src/test/java/org/opensearch/plugin/insights/core/service/categorizor/QueryShapeGeneratorTests.java
@@ -13,14 +13,14 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.RegexpQueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
-import org.opensearch.plugin.insights.core.service.categorizer.QueryShapeService;
+import org.opensearch.plugin.insights.core.service.categorizer.QueryShapeGenerator;
 import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.opensearch.search.aggregations.support.ValueType;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.test.OpenSearchTestCase;
 
-public final class QueryShapeServiceTests extends OpenSearchTestCase {
+public final class QueryShapeGeneratorTests extends OpenSearchTestCase {
     public void testQueryShape() {
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.size(0);
@@ -29,7 +29,7 @@ public void testQueryShape() {
         RegexpQueryBuilder regexpQueryBuilder = new RegexpQueryBuilder("field", "text");
         sourceBuilder.query(new BoolQueryBuilder().must(termQueryBuilder).filter(matchQueryBuilder).should(regexpQueryBuilder));
 
-        String shape = QueryShapeService.buildShape(sourceBuilder, true);
+        String shape = QueryShapeGenerator.buildShape(sourceBuilder, true);
 
         String expected = "bool\n" + "  must:\n" + "    term\n" + "  filter:\n" + "    match\n" + "  should:\n" + "    regexp\n";
         assertEquals(expected, shape);
@@ -46,7 +46,7 @@ public void testAggregationShape() {
                 .subAggregation(new TermsAggregationBuilder("child-agg2").userValueTypeHint(ValueType.STRING).field("key.sub2"))
         );
 
-        String shape = QueryShapeService.buildShape(sourceBuilder, true);
+        String shape = QueryShapeGenerator.buildShape(sourceBuilder, true);
 
         String expected = "aggregation:\n"
             + "  terms [key]\n"
@@ -65,7 +65,7 @@ public void testSortShape() {
         sourceBuilder.sort("price", SortOrder.ASC);
         sourceBuilder.sort("album", SortOrder.ASC);
 
-        String shape = QueryShapeService.buildShape(sourceBuilder, true);
+        String shape = QueryShapeGenerator.buildShape(sourceBuilder, true);
 
         String expected = "sort:\n" + "  asc [album]\n" + "  asc [price]\n" + "  desc [color]\n" + "  desc [vendor]\n";
         assertEquals(expected, shape);