diff --git a/pom.xml b/pom.xml
index df72e2e..8ee30a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.intel.jndn.management</groupId>
   <artifactId>jndn-management</artifactId>
-  <version>0.9.3</version>
+  <version>0.9.4</version>
   <name>jndn-management</name>
   <description>Tools for managing an NDN forwarding daemon</description>
   <url>https://github.com/01org/jndn-management</url>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>net.named-data</groupId>
       <artifactId>jndn</artifactId>
-      <version>0.3</version>
+      <version>RELEASE</version>
     </dependency>
     <dependency>
       <groupId>com.intel.jndn.utils</groupId>
diff --git a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
index a8116fb..2034d13 100644
--- a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
+++ b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
@@ -43,13 +43,13 @@
     Face forwarder = new Face("localhost");
     KeyChain keyChain = IntegrationSuite.buildTestKeyChain();
     forwarder.setCommandSigningInfo(keyChain, keyChain.getDefaultCertificateName());
-    
+
     // enable incoming face ID header
     boolean success = NFD.enableLocalControlHeader(forwarder, LocalControlHeader.INCOMING_FACE_ID);
     assertTrue(success);
     
     // use and verify
-    Data data = Client.getDefault().getSync(forwarder, new Name("/localhop/nfd"));
+    Data data = Client.getDefault().getSync(forwarder, new Name("/localhost/nfd"));
     long faceId = data.getIncomingFaceId();
     logger.info("Face ID for this client on the forwarder: " + faceId);
   }
