diff --git a/src/transport/tcp-transport.cpp b/src/transport/tcp-transport.cpp
index 343ddd2..7fb6341 100644
--- a/src/transport/tcp-transport.cpp
+++ b/src/transport/tcp-transport.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,7 +21,7 @@
 
 #include "tcp-transport.hpp"
 #include "stream-transport-with-resolver-impl.hpp"
-#include "util/face-uri.hpp"
+#include "net/face-uri.hpp"
 
 namespace ndn {
 
@@ -51,7 +51,7 @@
   }
 
   try {
-    const util::FaceUri uri(uriString);
+    const FaceUri uri(uriString);
 
     const std::string scheme = uri.getScheme();
     if (scheme != "tcp" && scheme != "tcp4" && scheme != "tcp6") {
@@ -66,7 +66,7 @@
       port = uri.getPort();
     }
   }
-  catch (const util::FaceUri::Error& error) {
+  catch (const FaceUri::Error& error) {
     BOOST_THROW_EXCEPTION(Error(error.what()));
   }
 
diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
index f2e44aa..be5536e 100644
--- a/src/transport/unix-transport.cpp
+++ b/src/transport/unix-transport.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -23,7 +23,7 @@
 #include "stream-transport-impl.hpp"
 
 #include "../face.hpp"
-#include "util/face-uri.hpp"
+#include "net/face-uri.hpp"
 
 namespace ndn {
 
@@ -47,7 +47,7 @@
   }
 
   try {
-    const util::FaceUri uri(uriString);
+    const FaceUri uri(uriString);
 
     if (uri.getScheme() != "unix") {
       BOOST_THROW_EXCEPTION(Error("Cannot create UnixTransport from \"" +
@@ -58,7 +58,7 @@
       path = uri.getPath();
     }
   }
-  catch (const util::FaceUri::Error& error) {
+  catch (const FaceUri::Error& error) {
     BOOST_THROW_EXCEPTION(Error(error.what()));
   }