diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index c51d7d3..ff9b786 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -579,7 +579,7 @@
             }
 
             IntentState state =
-                intentService.getIntentState(fetchedIntent.id());
+                intentService.getIntentState(fetchedIntent.key());
             if (state == null ||
                 state == IntentState.WITHDRAWING ||
                 state == IntentState.WITHDRAWN) {
@@ -601,7 +601,7 @@
             }
 
             IntentState state =
-                intentService.getIntentState(fetchedIntent.id());
+                intentService.getIntentState(fetchedIntent.key());
             if (state == null ||
                 state == IntentState.WITHDRAWING ||
                 state == IntentState.WITHDRAWN) {
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
index b92b093..1af0914 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
@@ -535,19 +535,19 @@
         reset(intentService);
         Set<Intent> intents = new HashSet<Intent>();
         intents.add(intent1);
-        expect(intentService.getIntentState(intent1.id()))
+        expect(intentService.getIntentState(intent1.key()))
                 .andReturn(IntentState.INSTALLED).anyTimes();
         intents.add(intent2);
-        expect(intentService.getIntentState(intent2.id()))
+        expect(intentService.getIntentState(intent2.key()))
                 .andReturn(IntentState.INSTALLED).anyTimes();
         intents.add(intent4);
-        expect(intentService.getIntentState(intent4.id()))
+        expect(intentService.getIntentState(intent4.key()))
                 .andReturn(IntentState.INSTALLED).anyTimes();
         intents.add(intent5);
-        expect(intentService.getIntentState(intent5.id()))
+        expect(intentService.getIntentState(intent5.key()))
                 .andReturn(IntentState.INSTALLED).anyTimes();
         intents.add(intent7);
-        expect(intentService.getIntentState(intent7.id()))
+        expect(intentService.getIntentState(intent7.key()))
                 .andReturn(IntentState.WITHDRAWING).anyTimes();
         expect(intentService.getIntents()).andReturn(intents).anyTimes();
 
