diff --git a/include/ndnboost/config/abi_prefix.hpp b/include/ndnboost/config/abi_prefix.hpp
index 277cd60..4f70b1b 100644
--- a/include/ndnboost/config/abi_prefix.hpp
+++ b/include/ndnboost/config/abi_prefix.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_CONFIG_ABI_PREFIX_HPP
 # define BOOST_CONFIG_ABI_PREFIX_HPP
 #else
-# error double inclusion of header boost/config/abi_prefix.hpp is an error
+# error double inclusion of header ndnboost/config/abi_prefix.hpp is an error
 #endif
 
 #include <ndnboost/config.hpp>
diff --git a/include/ndnboost/config/abi_suffix.hpp b/include/ndnboost/config/abi_suffix.hpp
index c1287cb..054843c 100644
--- a/include/ndnboost/config/abi_suffix.hpp
+++ b/include/ndnboost/config/abi_suffix.hpp
@@ -10,7 +10,7 @@
 // <ndnboost/config/abi_prefix.hpp>.
 
 #ifndef BOOST_CONFIG_ABI_PREFIX_HPP
-# error Header boost/config/abi_suffix.hpp must only be used after boost/config/abi_prefix.hpp
+# error Header ndnboost/config/abi_suffix.hpp must only be used after ndnboost/config/abi_prefix.hpp
 #else
 # undef BOOST_CONFIG_ABI_PREFIX_HPP
 #endif
diff --git a/include/ndnboost/config/no_tr1/cmath.hpp b/include/ndnboost/config/no_tr1/cmath.hpp
index d8268d8..635e543 100644
--- a/include/ndnboost/config/no_tr1/cmath.hpp
+++ b/include/ndnboost/config/no_tr1/cmath.hpp
@@ -5,7 +5,7 @@
 //
 // The aim of this header is just to include <cmath> but to do
 // so in a way that does not result in recursive inclusion of
-// the Boost TR1 components if boost/tr1/tr1/cmath is in the
+// the Boost TR1 components if ndnboost/tr1/tr1/cmath is in the
 // include search path.  We have to do this to avoid circular
 // dependencies:
 //
diff --git a/include/ndnboost/config/no_tr1/complex.hpp b/include/ndnboost/config/no_tr1/complex.hpp
index ca20092..4f7c97c 100644
--- a/include/ndnboost/config/no_tr1/complex.hpp
+++ b/include/ndnboost/config/no_tr1/complex.hpp
@@ -5,7 +5,7 @@
 //
 // The aim of this header is just to include <complex> but to do
 // so in a way that does not result in recursive inclusion of
-// the Boost TR1 components if boost/tr1/tr1/complex is in the
+// the Boost TR1 components if ndnboost/tr1/tr1/complex is in the
 // include search path.  We have to do this to avoid circular
 // dependencies:
 //
diff --git a/include/ndnboost/config/no_tr1/functional.hpp b/include/ndnboost/config/no_tr1/functional.hpp
index e395efc..5679772 100644
--- a/include/ndnboost/config/no_tr1/functional.hpp
+++ b/include/ndnboost/config/no_tr1/functional.hpp
@@ -5,7 +5,7 @@
 //
 // The aim of this header is just to include <functional> but to do
 // so in a way that does not result in recursive inclusion of
-// the Boost TR1 components if boost/tr1/tr1/functional is in the
+// the Boost TR1 components if ndnboost/tr1/tr1/functional is in the
 // include search path.  We have to do this to avoid circular
 // dependencies:
 //
diff --git a/include/ndnboost/config/no_tr1/memory.hpp b/include/ndnboost/config/no_tr1/memory.hpp
index 2b5d208..e035156 100644
--- a/include/ndnboost/config/no_tr1/memory.hpp
+++ b/include/ndnboost/config/no_tr1/memory.hpp
@@ -5,7 +5,7 @@
 //
 // The aim of this header is just to include <memory> but to do
 // so in a way that does not result in recursive inclusion of
-// the Boost TR1 components if boost/tr1/tr1/memory is in the
+// the Boost TR1 components if ndnboost/tr1/tr1/memory is in the
 // include search path.  We have to do this to avoid circular
 // dependencies:
 //
diff --git a/include/ndnboost/config/no_tr1/utility.hpp b/include/ndnboost/config/no_tr1/utility.hpp
index dea8f11..de60035 100644
--- a/include/ndnboost/config/no_tr1/utility.hpp
+++ b/include/ndnboost/config/no_tr1/utility.hpp
@@ -5,7 +5,7 @@
 //
 // The aim of this header is just to include <utility> but to do
 // so in a way that does not result in recursive inclusion of
-// the Boost TR1 components if boost/tr1/tr1/utility is in the
+// the Boost TR1 components if ndnboost/tr1/tr1/utility is in the
 // include search path.  We have to do this to avoid circular
 // dependencies:
 //
diff --git a/include/ndnboost/config/platform/win32.hpp b/include/ndnboost/config/platform/win32.hpp
index 6ab59f4..82b27c8 100644
--- a/include/ndnboost/config/platform/win32.hpp
+++ b/include/ndnboost/config/platform/win32.hpp
@@ -23,7 +23,7 @@
 
 //  Default defines for BOOST_SYMBOL_EXPORT and BOOST_SYMBOL_IMPORT
 //  If a compiler doesn't support __declspec(dllexport)/__declspec(dllimport),
-//  its boost/config/compiler/ file must define BOOST_SYMBOL_EXPORT and
+//  its ndnboost/config/compiler/ file must define BOOST_SYMBOL_EXPORT and
 //  BOOST_SYMBOL_IMPORT
 #ifndef BOOST_SYMBOL_EXPORT
 #  define BOOST_HAS_DECLSPEC
diff --git a/include/ndnboost/config/user.hpp b/include/ndnboost/config/user.hpp
index 5a4a9d4..2a5c15c 100644
--- a/include/ndnboost/config/user.hpp
+++ b/include/ndnboost/config/user.hpp
@@ -1,4 +1,4 @@
-//  boost/config/user.hpp  ---------------------------------------------------//
+//  ndnboost/config/user.hpp  ---------------------------------------------------//
 
 //  (C) Copyright John Maddock 2001. 
 //  Use, modification and distribution are subject to the