diff --git a/daemon/table/cs-entry.hpp b/daemon/table/cs-entry.hpp
index 1726d87..2502105 100644
--- a/daemon/table/cs-entry.hpp
+++ b/daemon/table/cs-entry.hpp
@@ -9,7 +9,7 @@
 
 #include "common.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace cs {
 
 /** \class Entry
@@ -21,6 +21,6 @@
 };
 
 } // namespace cs
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_CS_ENTRY_HPP
diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index c0dc4e2..d85b2d0 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -8,7 +8,7 @@
 
 #include "cs.hpp"
 
-namespace ndn {
+namespace nfd {
 
 Cs::Cs()
 {
@@ -31,4 +31,4 @@
 }
 
 
-} //namespace ndn
+} //namespace nfd
diff --git a/daemon/table/cs.hpp b/daemon/table/cs.hpp
index 9404015..0db5ad7 100644
--- a/daemon/table/cs.hpp
+++ b/daemon/table/cs.hpp
@@ -10,7 +10,7 @@
 #include "common.hpp"
 #include "cs-entry.hpp"
 
-namespace ndn {
+namespace nfd {
 
 /** \class Cs
  *  \brief represents the ContentStore
@@ -39,6 +39,6 @@
   find(const Interest& interest);
 };
 
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_CS_HPP
diff --git a/daemon/table/fib-entry.cpp b/daemon/table/fib-entry.cpp
index a00a582..5b64e6b 100644
--- a/daemon/table/fib-entry.cpp
+++ b/daemon/table/fib-entry.cpp
@@ -7,7 +7,7 @@
 #include "fib-entry.hpp"
 #include <algorithm>
 
-namespace ndn {
+namespace nfd {
 namespace fib {
 
 Entry::Entry(const Name& prefix)
@@ -64,4 +64,4 @@
 
 
 } // namespace fib
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/fib-entry.hpp b/daemon/table/fib-entry.hpp
index 67f5056..20d0206 100644
--- a/daemon/table/fib-entry.hpp
+++ b/daemon/table/fib-entry.hpp
@@ -9,7 +9,7 @@
 
 #include "fib-nexthop.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace fib {
 
 /** \class NextHopList
@@ -71,6 +71,6 @@
 
 
 } // namespace fib
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_FIB_ENTRY_HPP
diff --git a/daemon/table/fib-nexthop.cpp b/daemon/table/fib-nexthop.cpp
index 06bbdcb..178d853 100644
--- a/daemon/table/fib-nexthop.cpp
+++ b/daemon/table/fib-nexthop.cpp
@@ -6,7 +6,7 @@
 
 #include "fib-nexthop.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace fib {
 
 NextHop::NextHop(shared_ptr<Face> face)
@@ -38,4 +38,4 @@
 }
 
 } // namespace fib
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/fib-nexthop.hpp b/daemon/table/fib-nexthop.hpp
index c3e2cf0..5961b42 100644
--- a/daemon/table/fib-nexthop.hpp
+++ b/daemon/table/fib-nexthop.hpp
@@ -10,7 +10,7 @@
 #include "common.hpp"
 #include "face/face.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace fib {
 
 /** \class NextHop
@@ -38,6 +38,6 @@
 };
 
 } // namespace fib
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_FIB_NEXTHOP_HPP
diff --git a/daemon/table/fib.cpp b/daemon/table/fib.cpp
index 1d8fe3a..532ad97 100644
--- a/daemon/table/fib.cpp
+++ b/daemon/table/fib.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <numeric>
 
-namespace ndn {
+namespace nfd {
 
 Fib::Fib()
 {
@@ -75,4 +75,4 @@
 }
 
 
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/fib.hpp b/daemon/table/fib.hpp
index 0c88eaa..53a34c7 100644
--- a/daemon/table/fib.hpp
+++ b/daemon/table/fib.hpp
@@ -8,7 +8,7 @@
 #define NFD_TABLE_FIB_HPP
 
 #include "fib-entry.hpp"
-namespace ndn {
+namespace nfd {
 
 /** \class Fib
  *  \brief represents the FIB
@@ -43,6 +43,6 @@
   std::list<shared_ptr<fib::Entry> > m_table;
 };
 
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_FIB_HPP
diff --git a/daemon/table/pit-entry.cpp b/daemon/table/pit-entry.cpp
index e11abef..094ea6e 100644
--- a/daemon/table/pit-entry.cpp
+++ b/daemon/table/pit-entry.cpp
@@ -7,7 +7,7 @@
 #include "pit-entry.hpp"
 #include <algorithm>
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 Entry::Entry(const Interest& interest)
@@ -93,4 +93,4 @@
 
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/pit-entry.hpp b/daemon/table/pit-entry.hpp
index 97de5e2..00e8a79 100644
--- a/daemon/table/pit-entry.hpp
+++ b/daemon/table/pit-entry.hpp
@@ -10,7 +10,7 @@
 #include "pit-in-record.hpp"
 #include "pit-out-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 /** \class InRecordCollection
@@ -88,6 +88,6 @@
 }
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_PIT_ENTRY_HPP
diff --git a/daemon/table/pit-face-record.cpp b/daemon/table/pit-face-record.cpp
index 89aef1e..cbcd3b1 100644
--- a/daemon/table/pit-face-record.cpp
+++ b/daemon/table/pit-face-record.cpp
@@ -6,7 +6,7 @@
 
 #include "pit-face-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 FaceRecord::FaceRecord(shared_ptr<Face> face)
@@ -35,4 +35,4 @@
 
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/pit-face-record.hpp b/daemon/table/pit-face-record.hpp
index d2dfe2c..b51c0bc 100644
--- a/daemon/table/pit-face-record.hpp
+++ b/daemon/table/pit-face-record.hpp
@@ -10,7 +10,7 @@
 #include "face/face.hpp"
 #include "core/time.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 /** \class FaceRecord
@@ -78,6 +78,6 @@
 }
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_PIT_FACE_RECORD_HPP
diff --git a/daemon/table/pit-in-record.cpp b/daemon/table/pit-in-record.cpp
index 662f074..6963da2 100644
--- a/daemon/table/pit-in-record.cpp
+++ b/daemon/table/pit-in-record.cpp
@@ -6,7 +6,7 @@
 
 #include "pit-in-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 InRecord::InRecord(shared_ptr<Face> face)
@@ -21,4 +21,4 @@
 
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/pit-in-record.hpp b/daemon/table/pit-in-record.hpp
index 9539ce3..1f4e1e1 100644
--- a/daemon/table/pit-in-record.hpp
+++ b/daemon/table/pit-in-record.hpp
@@ -9,7 +9,7 @@
 
 #include "pit-face-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 /** \class InRecord
@@ -25,6 +25,6 @@
 };
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_PIT_IN_RECORD_HPP
diff --git a/daemon/table/pit-out-record.cpp b/daemon/table/pit-out-record.cpp
index ce4db8c..064236f 100644
--- a/daemon/table/pit-out-record.cpp
+++ b/daemon/table/pit-out-record.cpp
@@ -6,7 +6,7 @@
 
 #include "pit-out-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 OutRecord::OutRecord(shared_ptr<Face> face)
@@ -20,4 +20,4 @@
 }
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/pit-out-record.hpp b/daemon/table/pit-out-record.hpp
index 83ff3e1..635de98 100644
--- a/daemon/table/pit-out-record.hpp
+++ b/daemon/table/pit-out-record.hpp
@@ -9,7 +9,7 @@
 
 #include "pit-face-record.hpp"
 
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 /** \class OutRecord
@@ -25,6 +25,6 @@
 };
 
 } // namespace pit
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_PIT_IN_RECORD_HPP
diff --git a/daemon/table/pit.cpp b/daemon/table/pit.cpp
index 7742266..168a64e 100644
--- a/daemon/table/pit.cpp
+++ b/daemon/table/pit.cpp
@@ -7,7 +7,7 @@
 #include "pit.hpp"
 #include <algorithm>
 
-namespace ndn {
+namespace nfd {
 
 Pit::Pit()
 {
@@ -73,4 +73,4 @@
   m_table.remove(pitEntry);
 }
 
-} // namespace ndn
+} // namespace nfd
diff --git a/daemon/table/pit.hpp b/daemon/table/pit.hpp
index 44dc252..9dd2e1e 100644
--- a/daemon/table/pit.hpp
+++ b/daemon/table/pit.hpp
@@ -8,7 +8,7 @@
 #define NFD_TABLE_PIT_HPP
 
 #include "pit-entry.hpp"
-namespace ndn {
+namespace nfd {
 namespace pit {
 
 /** \class DataMatchResult
@@ -52,6 +52,6 @@
   std::list<shared_ptr<pit::Entry> > m_table;
 };
 
-} // namespace ndn
+} // namespace nfd
 
 #endif // NFD_TABLE_PIT_HPP