diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index e47fb5f..15881e3 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -6,7 +6,7 @@
 
 #include "forwarder.hpp"
 
-namespace ndn {
+namespace nfd {
 
 Forwarder::Forwarder(boost::asio::io_service& ioService)
 {
@@ -33,4 +33,4 @@
 {
 }
 
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index 3f9947a..6395f29 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -10,7 +10,7 @@
 #include "common.hpp"
 #include "face/face.hpp"
 
-namespace ndn {
+namespace nfd {
 
 /**
  * Forwarder is the main class of NFD.