diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
index 0b4a81fd2e..15a16833ae 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
@@ -1,7 +1,7 @@
 package com.linkedin.metadata.graph.elastic;
 
+import static com.linkedin.metadata.graph.Edge.*;
 import static com.linkedin.metadata.graph.elastic.ElasticSearchGraphService.*;
-import static com.linkedin.metadata.graph.elastic.GraphRelationshipMappingsBuilder.*;
 
 import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
index 30b92218bf..5ee319049d 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
@@ -1,6 +1,6 @@
 package com.linkedin.metadata.graph.elastic;
 
-import static com.linkedin.metadata.graph.elastic.GraphRelationshipMappingsBuilder.*;
+import static com.linkedin.metadata.graph.Edge.*;
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/GraphRelationshipMappingsBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/GraphRelationshipMappingsBuilder.java
index ab4eaa1b99..efd52ab4c7 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/GraphRelationshipMappingsBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/GraphRelationshipMappingsBuilder.java
@@ -1,5 +1,7 @@
 package com.linkedin.metadata.graph.elastic;
 
+import static com.linkedin.metadata.graph.Edge.*;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
@@ -7,12 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class GraphRelationshipMappingsBuilder {
-  public static final String EDGE_FIELD_SOURCE = "source";
-  public static final String EDGE_FIELD_DESTINATION = "destination";
-  public static final String EDGE_FIELD_RELNSHIP_TYPE = "relationshipType";
-  public static final String EDGE_FIELD_PROPERTIES = "properties";
-  public static final String EDGE_FIELD_VIA = "via";
-  public static final String EDGE_FIELD_LIFECYCLE_OWNER = "lifecycleOwner";
 
   private GraphRelationshipMappingsBuilder() {}
 
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/graph/Edge.java b/metadata-service/services/src/main/java/com/linkedin/metadata/graph/Edge.java
index 83965986fc..c0d8b9ca57 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/graph/Edge.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/graph/Edge.java
@@ -81,17 +81,21 @@ public class Edge {
     }
   }
 
-  public static final String SOURCE_URN_FIELD = "source.urn";
-  public static final String DESTINATION_URN_FIELD = "destination.urn";
-  public static final String RELATIONSHIP_TYPE_FIELD = "relationshipType";
-  public static final String LIFE_CYCLE_OWNER_FIELD = "lifeCycleOwner";
+  public static final String EDGE_FIELD_SOURCE = "source";
+  public static final String EDGE_FIELD_DESTINATION = "destination";
+  public static final String EDGE_FIELD_RELNSHIP_TYPE = "relationshipType";
+  public static final String EDGE_FIELD_PROPERTIES = "properties";
+  public static final String EDGE_FIELD_VIA = "via";
+  public static final String EDGE_FIELD_LIFECYCLE_OWNER = "lifecycleOwner";
+  public static final String EDGE_SOURCE_URN_FIELD = "source.urn";
+  public static final String EDGE_DESTINATION_URN_FIELD = "destination.urn";
 
   public static final List<Pair<String, SortOrder>> KEY_SORTS =
       List.of(
-          new Pair<>(SOURCE_URN_FIELD, SortOrder.ASCENDING),
-          new Pair<>(DESTINATION_URN_FIELD, SortOrder.ASCENDING),
-          new Pair<>(RELATIONSHIP_TYPE_FIELD, SortOrder.ASCENDING),
-          new Pair<>(LIFE_CYCLE_OWNER_FIELD, SortOrder.ASCENDING));
+          new Pair<>(EDGE_SOURCE_URN_FIELD, SortOrder.ASCENDING),
+          new Pair<>(EDGE_DESTINATION_URN_FIELD, SortOrder.ASCENDING),
+          new Pair<>(EDGE_FIELD_RELNSHIP_TYPE, SortOrder.ASCENDING),
+          new Pair<>(EDGE_FIELD_LIFECYCLE_OWNER, SortOrder.ASCENDING));
   public static List<SortCriterion> EDGE_SORT_CRITERION =
       KEY_SORTS.stream()
           .map(entry -> SearchUtil.sortBy(entry.getKey(), entry.getValue()))