diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
index a4ca067..0036578 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
@@ -115,7 +115,7 @@
                 .build();
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .transition(CordVtnPipeline.TABLE_ACCESS_TYPE)
+                .transition(CordVtnPipeline.TABLE_ACCESS)
                 .build();
 
         FlowRule flowRule = DefaultFlowRule.builder()
@@ -170,7 +170,7 @@
                 .withTreatment(treatment)
                 .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(instance.deviceId())
-                .forTable(CordVtnPipeline.TABLE_DST_IP)
+                .forTable(CordVtnPipeline.TABLE_DST)
                 .makePermanent()
                 .build();
 
@@ -200,7 +200,7 @@
                     .withTreatment(treatment)
                     .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                     .forDevice(node.integrationBridgeId())
-                    .forTable(CordVtnPipeline.TABLE_DST_IP)
+                    .forTable(CordVtnPipeline.TABLE_DST)
                     .makePermanent()
                     .build();
 
@@ -239,7 +239,7 @@
                 .build();
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .transition(CordVtnPipeline.TABLE_DST_IP)
+                .transition(CordVtnPipeline.TABLE_DST)
                 .build();
 
 
@@ -250,7 +250,7 @@
                     .withTreatment(treatment)
                     .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                     .forDevice(node.integrationBridgeId())
-                    .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
+                    .forTable(CordVtnPipeline.TABLE_ACCESS)
                     .makePermanent()
                     .build();
 
@@ -275,7 +275,7 @@
                     .withTreatment(treatment)
                     .withPriority(CordVtnPipeline.PRIORITY_LOW)
                     .forDevice(node.integrationBridgeId())
-                    .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
+                    .forTable(CordVtnPipeline.TABLE_ACCESS)
                     .makePermanent()
                     .build();