diff --git a/daemon/core/monotonic_deadline_timer.hpp b/daemon/core/monotonic_deadline_timer.hpp
index 543cd7a..c158fe4 100644
--- a/daemon/core/monotonic_deadline_timer.hpp
+++ b/daemon/core/monotonic_deadline_timer.hpp
@@ -17,15 +17,15 @@
 namespace asio {
 
 template <> 
-struct time_traits<ndn::time::monotonic_clock>
+struct time_traits<nfd::time::monotonic_clock>
 {
-  typedef ndn::time::Point time_type;
-  typedef ndn::time::Duration duration_type;
+  typedef nfd::time::Point time_type;
+  typedef nfd::time::Duration duration_type;
 
   static time_type
   now()
   {
-    return ndn::time::now();
+    return nfd::time::now();
   }
 
   static time_type
@@ -53,7 +53,7 @@
   }
 };
 
-typedef basic_deadline_timer<ndn::time::monotonic_clock> monotonic_deadline_timer; 
+typedef basic_deadline_timer<nfd::time::monotonic_clock> monotonic_deadline_timer; 
 
 } // namespace asio
 } // namespace boost
diff --git a/daemon/core/scheduler.cpp b/daemon/core/scheduler.cpp
index c4fc1d8..f9f9996 100644
--- a/daemon/core/scheduler.cpp
+++ b/daemon/core/scheduler.cpp
@@ -6,7 +6,7 @@
 
 #include "scheduler.hpp"
 
-namespace ndn {
+namespace nfd {
 
 struct EventIdImpl
 {
@@ -173,4 +173,4 @@
 }
 
 
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/core/scheduler.hpp b/daemon/core/scheduler.hpp
index d5d57aa..4b2e2d4 100644
--- a/daemon/core/scheduler.hpp
+++ b/daemon/core/scheduler.hpp
@@ -10,7 +10,7 @@
 #include "common.hpp"
 #include "monotonic_deadline_timer.hpp"
 
-namespace ndn {
+namespace nfd {
 
 struct EventIdImpl; ///< \brief Private storage of information about the event
 /**
@@ -94,6 +94,6 @@
   boost::asio::monotonic_deadline_timer m_deadlineTimer;
 };
 
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_CORE_SCHEDULER_HPP
diff --git a/daemon/core/time.cpp b/daemon/core/time.cpp
index 712779d..c216df4 100644
--- a/daemon/core/time.cpp
+++ b/daemon/core/time.cpp
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <sys/time.h>
 
-namespace ndn {
+namespace nfd {
 namespace time {
 
 Point
@@ -42,4 +42,4 @@
 }
 
 } // namespace time
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/core/time.hpp b/daemon/core/time.hpp
index 3b0d002..5efd082 100644
--- a/daemon/core/time.hpp
+++ b/daemon/core/time.hpp
@@ -9,7 +9,7 @@
 
 #include "common.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace time {
 
 class monotonic_clock;
@@ -156,6 +156,6 @@
 
 
 } // namespace time
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_CORE_TIME_H