diff --git a/tests/core/scheduler.cpp b/tests/core/scheduler.cpp
index 8a82426..04a9671 100644
--- a/tests/core/scheduler.cpp
+++ b/tests/core/scheduler.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(CoreScheduler)
 
@@ -82,4 +82,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/core/time.cpp b/tests/core/time.cpp
index 64ad830..6d0db3f 100644
--- a/tests/core/time.cpp
+++ b/tests/core/time.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(CoreTime)
 
@@ -44,4 +44,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/face/dummy-face.hpp b/tests/face/dummy-face.hpp
index a960380..a58a3ee 100644
--- a/tests/face/dummy-face.hpp
+++ b/tests/face/dummy-face.hpp
@@ -9,7 +9,7 @@
 
 #include "face/face.hpp"
 
-namespace ndn {
+namespace nfd {
 
 /** \class DummyFace
  *  \brief provides a Face that cannot communicate
@@ -34,6 +34,6 @@
   }
 };
 
-} // namespace ndn
+} // namespace nfd
 
 #endif // TEST_FACE_DUMMY_FACE_HPP
diff --git a/tests/face/face.cpp b/tests/face/face.cpp
index e84ab03..dced528 100644
--- a/tests/face/face.cpp
+++ b/tests/face/face.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(FaceFace)
 
@@ -22,4 +22,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/table/cs.cpp b/tests/table/cs.cpp
index 3462476..b7bdbb8 100644
--- a/tests/table/cs.cpp
+++ b/tests/table/cs.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(TableCs)
 
@@ -25,4 +25,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/table/fib.cpp b/tests/table/fib.cpp
index 1a4e2fc..ceba1da 100644
--- a/tests/table/fib.cpp
+++ b/tests/table/fib.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(TableFib)
 
@@ -203,4 +203,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/table/pit.cpp b/tests/table/pit.cpp
index c9b4112..2564799 100644
--- a/tests/table/pit.cpp
+++ b/tests/table/pit.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace ndn {
+namespace nfd {
 
 BOOST_AUTO_TEST_SUITE(TablePit)
 
@@ -19,13 +19,13 @@
   shared_ptr<Face> face2 = make_shared<DummyFace>(2);
   Name name("ndn:/KuYfjtRq");
   Interest interest(name);
-  Interest interest1(name, static_cast<Milliseconds>(2528));
+  Interest interest1(name, static_cast<ndn::Milliseconds>(2528));
   interest1.setNonce(25559);
-  Interest interest2(name, static_cast<Milliseconds>(6464));
+  Interest interest2(name, static_cast<ndn::Milliseconds>(6464));
   interest2.setNonce(19004);
-  Interest interest3(name, static_cast<Milliseconds>(3585));
+  Interest interest3(name, static_cast<ndn::Milliseconds>(3585));
   interest3.setNonce(24216);
-  Interest interest4(name, static_cast<Milliseconds>(8795));
+  Interest interest4(name, static_cast<ndn::Milliseconds>(8795));
   interest4.setNonce(17365);
   
   pit::Entry entry(interest);
@@ -274,4 +274,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd
diff --git a/tests/util/event-emitter.cpp b/tests/util/event-emitter.cpp
index e49c5e9..5f8d947 100644
--- a/tests/util/event-emitter.cpp
+++ b/tests/util/event-emitter.cpp
@@ -8,7 +8,7 @@
 
 #include "util/event-emitter.hpp"
 
-namespace ndn {
+namespace nfd {
 
 class EventEmitterTester : noncopyable
 {
@@ -228,4 +228,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // namespace ndn
+} // namespace nfd