diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolver.java
index d07bc25a55..d89f52bb7a 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolver.java
@@ -74,7 +74,7 @@ public class CreateDomainResolver implements DataFetcher<CompletableFuture<Strin
 
         String domainUrn = _entityClient.ingestProposal(proposal, context.getAuthentication());
         OwnershipType ownershipType = OwnershipType.TECHNICAL_OWNER;
-        if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType)))) {
+        if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType.name())))) {
           log.warn("Technical owner does not exist, defaulting to None ownership.");
           ownershipType = OwnershipType.NONE;
         }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolver.java
index effee84ab5..ee5b896043 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolver.java
@@ -69,7 +69,7 @@ public class CreateGlossaryNodeResolver implements DataFetcher<CompletableFuture
           String glossaryNodeUrn = _entityClient.ingestProposal(proposal, context.getAuthentication());
 
           OwnershipType ownershipType = OwnershipType.TECHNICAL_OWNER;
-          if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType)))) {
+          if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType.name())))) {
             log.warn("Technical owner does not exist, defaulting to None ownership.");
             ownershipType = OwnershipType.NONE;
           }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolver.java
index 13f4de3a45..6db79e5c34 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolver.java
@@ -68,7 +68,7 @@ public class CreateGlossaryTermResolver implements DataFetcher<CompletableFuture
 
           String glossaryTermUrn = _entityClient.ingestProposal(proposal, context.getAuthentication());
           OwnershipType ownershipType = OwnershipType.TECHNICAL_OWNER;
-          if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType)))) {
+          if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType.name())))) {
             log.warn("Technical owner does not exist, defaulting to None ownership.");
             ownershipType = OwnershipType.NONE;
           }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddOwnerResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddOwnerResolver.java
index c9b8a626fc..5ca7007d98 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddOwnerResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddOwnerResolver.java
@@ -36,7 +36,7 @@ public class AddOwnerResolver implements DataFetcher<CompletableFuture<Boolean>>
     Urn ownerUrn = Urn.createFromString(input.getOwnerUrn());
     OwnerEntityType ownerEntityType = input.getOwnerEntityType();
     OwnershipType type = input.getType() == null ? OwnershipType.NONE : input.getType();
-    String ownershipUrn = input.getOwnershipTypeUrn() == null ? mapOwnershipTypeToEntity(type) : input.getOwnershipTypeUrn();
+    String ownershipUrn = input.getOwnershipTypeUrn() == null ? mapOwnershipTypeToEntity(type.name()) : input.getOwnershipTypeUrn();
     Urn targetUrn = Urn.createFromString(input.getResourceUrn());
 
     if (!OwnerUtils.isAuthorizedToUpdateOwners(environment.getContext(), targetUrn)) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
index fb9ca78d5d..a062016ed5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
@@ -116,7 +116,8 @@ public class OwnerUtils {
       }
 
       // Fall back to mapping deprecated type to the new ownership entity, if it matches remove
-      return mapOwnershipTypeToEntity(OwnershipType.valueOf(owner.getType().toString())).equals(ownershipUrn.toString());
+      return mapOwnershipTypeToEntity(OwnershipType.valueOf(owner.getType().toString()).name())
+          .equals(ownershipUrn.toString());
     });
 
     Owner newOwner = new Owner();
@@ -158,7 +159,7 @@ public class OwnerUtils {
           }
 
           // Fall back to mapping deprecated type to the new ownership entity, if it matches remove
-          return mapOwnershipTypeToEntity(OwnershipType.valueOf(owner.getType().toString()))
+          return mapOwnershipTypeToEntity(OwnershipType.valueOf(owner.getType().toString()).name())
               .equals(maybeOwnershipTypeUrn.get().toString());
         });
       } else {
@@ -283,7 +284,7 @@ public class OwnerUtils {
     EntityService entityService) {
     try {
       Urn actorUrn = CorpuserUrn.createFromString(context.getActorUrn());
-      String ownershipTypeUrn = mapOwnershipTypeToEntity(ownershipType);
+      String ownershipTypeUrn = mapOwnershipTypeToEntity(ownershipType.name());
 
       if (!entityService.exists(UrnUtils.getUrn(ownershipTypeUrn))) {
         throw new RuntimeException(String.format("Unknown ownership type urn %s", ownershipTypeUrn));
@@ -300,8 +301,8 @@ public class OwnerUtils {
     }
   }
 
-  public static String mapOwnershipTypeToEntity(OwnershipType type) {
-    final String typeName = SYSTEM_ID + type.name().toLowerCase();
+  public static String mapOwnershipTypeToEntity(String type) {
+    final String typeName = SYSTEM_ID + type.toLowerCase();
     return Urn.createFromTuple(Constants.OWNERSHIP_TYPE_ENTITY_NAME, typeName).toString();
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolver.java
index e253b67d3c..a0568937d2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolver.java
@@ -73,7 +73,7 @@ public class CreateTagResolver implements DataFetcher<CompletableFuture<String>>
 
         String tagUrn = _entityClient.ingestProposal(proposal, context.getAuthentication());
         OwnershipType ownershipType = OwnershipType.TECHNICAL_OWNER;
-        if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType)))) {
+        if (!_entityService.exists(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType.name())))) {
           log.warn("Technical owner does not exist, defaulting to None ownership.");
           ownershipType = OwnershipType.NONE;
         }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerMapper.java
index f7c262db85..181bdc176f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerMapper.java
@@ -33,7 +33,7 @@ public class OwnerMapper {
 
         if (owner.getTypeUrn() == null) {
             OwnershipType ownershipType = OwnershipType.valueOf(owner.getType().toString());
-            owner.setTypeUrn(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType)));
+            owner.setTypeUrn(UrnUtils.getUrn(mapOwnershipTypeToEntity(ownershipType.name())));
         }
 
         if (owner.getTypeUrn() != null) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerUpdateMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerUpdateMapper.java
index 4b740e0450..aac0067974 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerUpdateMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/OwnerUpdateMapper.java
@@ -1,5 +1,6 @@
 package com.linkedin.datahub.graphql.types.common.mappers;
 
+import com.linkedin.common.urn.UrnUtils;
 import javax.annotation.Nonnull;
 
 import com.linkedin.common.Owner;
@@ -34,7 +35,14 @@ public class OwnerUpdateMapper implements ModelMapper<OwnerUpdate, Owner> {
         } catch (URISyntaxException e) {
             e.printStackTrace();
         }
-        owner.setType(OwnershipType.valueOf(input.getType().toString()));
+        if (input.getOwnershipTypeUrn() != null) {
+            owner.setTypeUrn(UrnUtils.getUrn(input.getOwnershipTypeUrn()));
+        } else if (input.getType() != null) {
+            owner.setType(OwnershipType.valueOf(input.getType().toString()));
+        } else {
+            throw new RuntimeException("Ownership type not specified. Please define the ownership type urn.");
+        }
+
         owner.setSource(new OwnershipSource().setType(OwnershipSourceType.SERVICE));
         return owner;
     }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/tag/mappers/TagUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/tag/mappers/TagUpdateInputMapper.java
index b666bf5c60..505dd0d369 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/tag/mappers/TagUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/tag/mappers/TagUpdateInputMapper.java
@@ -8,6 +8,7 @@ import com.linkedin.common.OwnershipSource;
 import com.linkedin.common.OwnershipSourceType;
 import com.linkedin.common.OwnershipType;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.generated.TagUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.util.UpdateMappingHelper;
@@ -18,6 +19,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import javax.annotation.Nonnull;
 
+import static com.linkedin.datahub.graphql.resolvers.mutate.util.OwnerUtils.*;
 import static com.linkedin.metadata.Constants.*;
 
 
@@ -47,6 +49,7 @@ public class TagUpdateInputMapper implements InputModelMapper<TagUpdateInput, Co
     final Owner owner = new Owner();
     owner.setOwner(actor);
     owner.setType(OwnershipType.NONE);
+    owner.setTypeUrn(UrnUtils.getUrn(mapOwnershipTypeToEntity(OwnershipType.NONE.name())));
     owner.setSource(new OwnershipSource().setType(OwnershipSourceType.SERVICE));
     ownership.setOwners(new OwnerArray(owner));
     ownership.setLastModified(auditStamp);
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
index 5d180e8347..9bdb3c1db2 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
@@ -43,7 +43,7 @@ public class AddOwnersResolverTest {
     Mockito.when(mockService.exists(Urn.createFromString(TEST_OWNER_2_URN))).thenReturn(true);
 
     Mockito.when(mockService.exists(Urn.createFromString(
-        OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER))))
+        OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER.name()))))
         .thenReturn(true);
 
     AddOwnersResolver resolver = new AddOwnersResolver(mockService);
@@ -53,9 +53,9 @@ public class AddOwnersResolverTest {
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name())),
         new OwnerInput(TEST_OWNER_2_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))
     ), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
@@ -88,7 +88,7 @@ public class AddOwnersResolverTest {
     Mockito.when(mockService.exists(Urn.createFromString(TEST_OWNER_2_URN))).thenReturn(true);
 
     Mockito.when(mockService.exists(Urn.createFromString(
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER))))
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER.name()))))
         .thenReturn(true);
 
     AddOwnersResolver resolver = new AddOwnersResolver(mockService);
@@ -98,9 +98,9 @@ public class AddOwnersResolverTest {
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name())),
         new OwnerInput(TEST_OWNER_2_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))
     ), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
@@ -138,7 +138,7 @@ public class AddOwnersResolverTest {
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))), TEST_ENTITY_URN);
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
@@ -166,7 +166,7 @@ public class AddOwnersResolverTest {
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))), TEST_ENTITY_URN);
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
@@ -184,7 +184,7 @@ public class AddOwnersResolverTest {
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))), TEST_ENTITY_URN);
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     QueryContext mockContext = getMockDenyContext();
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
@@ -208,7 +208,7 @@ public class AddOwnersResolverTest {
     QueryContext mockContext = getMockAllowContext();
     AddOwnersInput input = new AddOwnersInput(ImmutableList.of(
         new OwnerInput(TEST_OWNER_1_URN, OwnerEntityType.CORP_USER, OwnershipType.TECHNICAL_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER))), TEST_ENTITY_URN);
+            OwnerUtils.mapOwnershipTypeToEntity(OwnershipType.TECHNICAL_OWNER.name()))), TEST_ENTITY_URN);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
index 5fc79f275c..e38eb9eb67 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
@@ -56,7 +56,7 @@ public class BatchAddOwnersResolverTest {
     Mockito.when(mockService.exists(Urn.createFromString(TEST_OWNER_URN_2))).thenReturn(true);
 
     Mockito.when(mockService.exists(Urn.createFromString(
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))))
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))))
         .thenReturn(true);
 
     BatchAddOwnersResolver resolver = new BatchAddOwnersResolver(mockService);
@@ -68,12 +68,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
             new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
@@ -119,11 +119,11 @@ public class BatchAddOwnersResolverTest {
     Mockito.when(mockService.exists(Urn.createFromString(TEST_OWNER_URN_2))).thenReturn(true);
 
     Mockito.when(mockService.exists(Urn.createFromString(
-        OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER))))
+        OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.TECHNICAL_OWNER.name()))))
         .thenReturn(true);
 
     Mockito.when(mockService.exists(Urn.createFromString(
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))))
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))))
         .thenReturn(true);
 
     BatchAddOwnersResolver resolver = new BatchAddOwnersResolver(mockService);
@@ -136,12 +136,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
           new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
@@ -183,12 +183,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
             new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
@@ -228,12 +228,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
             new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
@@ -257,12 +257,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
             new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
@@ -292,12 +292,12 @@ public class BatchAddOwnersResolverTest {
             TEST_OWNER_URN_1,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER)),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name())),
         new OwnerInput(
             TEST_OWNER_URN_2,
             OwnerEntityType.CORP_USER,
             com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER,
-            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER))),
+            OwnerUtils.mapOwnershipTypeToEntity(com.linkedin.datahub.graphql.generated.OwnershipType.BUSINESS_OWNER.name()))),
         null,
         ImmutableList.of(
             new ResourceRefInput(TEST_ENTITY_URN_1, null, null),