diff --git a/src/main/java/com/intel/jndn/management/NFD.java b/src/main/java/com/intel/jndn/management/NFD.java
index 67ca9e0..9eb9180 100644
--- a/src/main/java/com/intel/jndn/management/NFD.java
+++ b/src/main/java/com/intel/jndn/management/NFD.java
@@ -21,8 +21,8 @@
 import com.intel.jndn.management.types.LocalControlHeader;
 import com.intel.jndn.management.types.RibEntry;
 import com.intel.jndn.management.types.StrategyChoice;
-import com.intel.jndn.utils.client.SegmentedClient;
-import com.intel.jndn.utils.client.SimpleClient;
+import com.intel.jndn.utils.client.impl.AdvancedClient;
+import com.intel.jndn.utils.client.impl.SimpleClient;
 import java.io.IOException;
 import java.util.List;
 import net.named_data.jndn.ControlParameters;
@@ -573,7 +573,7 @@
     interest.setInterestLifetimeMilliseconds(DEFAULT_TIMEOUT);
 
     // send packet
-    Data data = SegmentedClient.getDefault().getSync(forwarder, interest);
+    Data data = AdvancedClient.getDefault().getSync(forwarder, interest);
 
     // check for failed request
     if (data.getContent().buf().get(0) == ControlResponse.TLV_CONTROL_RESPONSE) {
diff --git a/src/test/java/com/intel/jndn/management/FaceStatusTest.java b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
index 679976c..742743e 100644
--- a/src/test/java/com/intel/jndn/management/FaceStatusTest.java
+++ b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
@@ -15,7 +15,7 @@
 
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.FaceStatus;
-import com.intel.jndn.utils.client.SimpleClient;
+import com.intel.jndn.utils.client.impl.SimpleClient;
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
diff --git a/src/test/java/com/intel/jndn/management/FibEntryTest.java b/src/test/java/com/intel/jndn/management/FibEntryTest.java
index 28af62f..e966a97 100644
--- a/src/test/java/com/intel/jndn/management/FibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/FibEntryTest.java
@@ -16,7 +16,7 @@
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.NextHopRecord;
 import com.intel.jndn.management.types.FibEntry;
-import com.intel.jndn.utils.client.SimpleClient;
+import com.intel.jndn.utils.client.impl.SimpleClient;
 import java.util.List;
 import junit.framework.Assert;
 import net.named_data.jndn.Data;
diff --git a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
index 8367c7c..709c8a1 100644
--- a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
+++ b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
@@ -14,7 +14,7 @@
 package com.intel.jndn.management;
 
 import com.intel.jndn.management.types.LocalControlHeader;
-import com.intel.jndn.utils.client.SimpleClient;
+import com.intel.jndn.utils.client.impl.SimpleClient;
 import java.util.logging.Logger;
 import junit.framework.Assert;
 import net.named_data.jndn.Data;
diff --git a/src/test/java/com/intel/jndn/management/RibEntryTest.java b/src/test/java/com/intel/jndn/management/RibEntryTest.java
index c7fe21e..9494239 100644
--- a/src/test/java/com/intel/jndn/management/RibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/RibEntryTest.java
@@ -16,7 +16,7 @@
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.RibEntry;
 import com.intel.jndn.management.types.Route;
-import com.intel.jndn.utils.client.SimpleClient;
+import com.intel.jndn.utils.client.impl.SimpleClient;
 import java.util.List;
 import junit.framework.Assert;
 import net.named_data.jndn.Data;