diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
index 46824ca..7f337a9 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
@@ -40,7 +40,7 @@
 import org.onlab.onos.sdnip.config.BgpSpeaker;
 import org.onlab.onos.sdnip.config.Interface;
 import org.onlab.onos.sdnip.config.InterfaceAddress;
-import org.onlab.onos.sdnip.config.SdnIpConfigService;
+import org.onlab.onos.sdnip.config.SdnIpConfigurationService;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.IpAddress;
@@ -75,7 +75,7 @@
 
     private PeerConnectivityManager peerConnectivityManager;
     private IntentSynchronizer intentSynchronizer;
-    private SdnIpConfigService configInfoService;
+    private SdnIpConfigurationService configInfoService;
     private InterfaceService interfaceService;
     private IntentService intentService;
 
@@ -536,7 +536,7 @@
      */
     private void initPeerConnectivity() throws TestUtilsException {
 
-        configInfoService = createMock(SdnIpConfigService.class);
+        configInfoService = createMock(SdnIpConfigurationService.class);
         expect(configInfoService.getBgpPeers()).andReturn(peers).anyTimes();
         expect(configInfoService.getBgpSpeakers()).andReturn(bgpSpeakers).anyTimes();
         replay(configInfoService);
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
index e877f34..470aa49 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
@@ -59,7 +59,7 @@
 import org.onlab.onos.sdnip.IntentSynchronizer.IntentKey;
 import org.onlab.onos.sdnip.config.BgpPeer;
 import org.onlab.onos.sdnip.config.Interface;
-import org.onlab.onos.sdnip.config.SdnIpConfigService;
+import org.onlab.onos.sdnip.config.SdnIpConfigurationService;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.Ip4Address;
@@ -78,7 +78,7 @@
  */
 public class RouterTest extends AbstractIntentTest {
 
-    private SdnIpConfigService sdnIpConfigService;
+    private SdnIpConfigurationService sdnIpConfigService;
     private InterfaceService interfaceService;
     private IntentService intentService;
     private HostService hostService;
@@ -146,7 +146,7 @@
         peers.put(IpAddress.valueOf(peer2Sw2Eth1),
                 new BgpPeer("00:00:00:00:00:00:00:02", 1, peer2Sw2Eth1));
 
-        sdnIpConfigService = createMock(SdnIpConfigService.class);
+        sdnIpConfigService = createMock(SdnIpConfigurationService.class);
         expect(sdnIpConfigService.getBgpPeers()).andReturn(peers).anyTimes();
         replay(sdnIpConfigService);
 
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java
index 46bcdd3..d9503f2 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java
@@ -60,7 +60,7 @@
 import org.onlab.onos.sdnip.Router.InternalHostListener;
 import org.onlab.onos.sdnip.config.BgpPeer;
 import org.onlab.onos.sdnip.config.Interface;
-import org.onlab.onos.sdnip.config.SdnIpConfigService;
+import org.onlab.onos.sdnip.config.SdnIpConfigurationService;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.Ip4Address;
@@ -80,7 +80,7 @@
  */
 public class RouterTestWithAsyncArp extends AbstractIntentTest {
 
-    private SdnIpConfigService sdnIpConfigService;
+    private SdnIpConfigurationService sdnIpConfigService;
     private InterfaceService interfaceService;
     private IntentService intentService;
     private HostService hostService;
@@ -133,7 +133,7 @@
      */
     private void setUpSdnIpConfigService() {
 
-        sdnIpConfigService = createMock(SdnIpConfigService.class);
+        sdnIpConfigService = createMock(SdnIpConfigurationService.class);
 
         Map<IpAddress, BgpPeer> peers = new HashMap<>();
 
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
index 4dfe3cc..d87bfd7 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
@@ -42,7 +42,7 @@
 import org.onlab.onos.net.intent.AbstractIntentTest;
 import org.onlab.onos.sdnip.config.BgpPeer;
 import org.onlab.onos.sdnip.config.Interface;
-import org.onlab.onos.sdnip.config.SdnIpConfigService;
+import org.onlab.onos.sdnip.config.SdnIpConfigurationService;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.Ip4Prefix;
@@ -70,7 +70,7 @@
     private IntentSynchronizer intentSynchronizer;
     static Router router;
 
-    private SdnIpConfigService sdnIpConfigService;
+    private SdnIpConfigurationService sdnIpConfigService;
     private InterfaceService interfaceService;
     private HostService hostService;
     private IntentService intentService;
@@ -169,7 +169,7 @@
      */
     private void setUpSdnIpConfigService() {
 
-        sdnIpConfigService = createMock(SdnIpConfigService.class);
+        sdnIpConfigService = createMock(SdnIpConfigurationService.class);
 
         bgpPeers = new HashMap<>();