diff --git a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
index 3d4af38..ffbc9c9 100644
--- a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
@@ -69,7 +69,7 @@
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.onlab.util.Tools.groupedThreads;
 import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced;
-import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.MANAGEMENT;
+import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.MANAGEMENT;
 import static org.opencord.cordvtn.api.Constants.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -246,7 +246,7 @@
                 .domainServer(DEFAULT_DNS)
                 .assignmentStatus(Option_RangeNotEnforced);
 
-        if (service.networkType() != MANAGEMENT) {
+        if (service.serviceType() != MANAGEMENT) {
             ipBuilder = ipBuilder.routerAddress(service.serviceIp().getIp4Address());
         }
 
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java
index 853963e..e6dd406 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java
@@ -37,7 +37,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.OLT_AGENT;
+import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.ACCESS_AGENT;
 
 /**
  * Provides network connectivity for OLT agent instances.
@@ -59,7 +59,7 @@
 
     @Activate
     protected void activate() {
-        serviceType = Optional.of(OLT_AGENT);
+        serviceType = Optional.of(ACCESS_AGENT);
         configListener = new InternalConfigListener();
         super.activate();