diff --git a/include/ndn-cpp/common.hpp b/include/ndn-cpp/common.hpp
index 2d47c30..a23356e 100644
--- a/include/ndn-cpp/common.hpp
+++ b/include/ndn-cpp/common.hpp
@@ -30,6 +30,8 @@
 // cd ndnboost
 // (unset LANG; find . -type f -exec sed -i '' 's/\<boost\//\<ndnboost\//g' {} +)
 // (unset LANG; find . -type f -exec sed -i '' 's/\"boost\//\"ndnboost\//g' {} +)
+// (unset LANG; find . -type f -exec sed -i '' 's/\ boost\//\ ndnboost\//g' {} +)
+// (unset LANG; find . -type f -exec sed -i '' 's/(boost\//(ndnboost\//g' {} +)
 #include <ndnboost/shared_ptr.hpp>
 #include <ndnboost/make_shared.hpp>
 namespace ndn { namespace ptr_lib = ndnboost; }
diff --git a/include/ndnboost/algorithm/string/sequence_traits.hpp b/include/ndnboost/algorithm/string/sequence_traits.hpp
index 5ef46af..b0de2d7 100644
--- a/include/ndnboost/algorithm/string/sequence_traits.hpp
+++ b/include/ndnboost/algorithm/string/sequence_traits.hpp
@@ -26,8 +26,8 @@
     Due to a language restriction, it is not currently possible to define specializations for
     stl containers without including the corresponding header. To decrease the overhead
     needed by this inclusion, user can selectively include a specialization
-    header for a specific container. They are located in boost/algorithm/string/stl
-    directory. Alternatively she can include boost/algorithm/string/std_collection_traits.hpp
+    header for a specific container. They are located in ndnboost/algorithm/string/stl
+    directory. Alternatively she can include ndnboost/algorithm/string/std_collection_traits.hpp
     header which contains specializations for all stl containers.
 */
 
diff --git a/include/ndnboost/any.hpp b/include/ndnboost/any.hpp
index 2419c6d..5127932 100644
--- a/include/ndnboost/any.hpp
+++ b/include/ndnboost/any.hpp
@@ -25,7 +25,7 @@
 #include <ndnboost/utility/enable_if.hpp>
 #include <ndnboost/type_traits/is_same.hpp>
 
-// See boost/python/type_id.hpp
+// See ndnboost/python/type_id.hpp
 // TODO: add BOOST_TYPEID_COMPARE_BY_NAME to config.hpp
 # if (defined(__GNUC__) && __GNUC__ >= 3) \
  || defined(_AIX) \
diff --git a/include/ndnboost/assert.hpp b/include/ndnboost/assert.hpp
index 539857c..0132fca 100644
--- a/include/ndnboost/assert.hpp
+++ b/include/ndnboost/assert.hpp
@@ -1,5 +1,5 @@
 //
-//  boost/assert.hpp - BOOST_ASSERT(expr)
+//  ndnboost/assert.hpp - BOOST_ASSERT(expr)
 //                     BOOST_ASSERT_MSG(expr, msg)
 //                     BOOST_VERIFY(expr)
 //
diff --git a/include/ndnboost/bind/storage.hpp b/include/ndnboost/bind/storage.hpp
index 5a97f4a..ef1a870 100644
--- a/include/ndnboost/bind/storage.hpp
+++ b/include/ndnboost/bind/storage.hpp
@@ -10,7 +10,7 @@
 //
 //  bind/storage.hpp
 //
-//  boost/bind.hpp support header, optimized storage
+//  ndnboost/bind.hpp support header, optimized storage
 //
 //  Copyright (c) 2006 Peter Dimov
 //
diff --git a/include/ndnboost/call_traits.hpp b/include/ndnboost/call_traits.hpp
index aefeeff..72c441c 100644
--- a/include/ndnboost/call_traits.hpp
+++ b/include/ndnboost/call_traits.hpp
@@ -5,7 +5,7 @@
 //
 //  See http://www.boost.org/libs/utility for most recent version including documentation.
 
-//  See boost/detail/call_traits.hpp and boost/detail/ob_call_traits.hpp
+//  See ndnboost/detail/call_traits.hpp and ndnboost/detail/ob_call_traits.hpp
 //  for full copyright notices.
 
 #ifndef BOOST_CALL_TRAITS_HPP
diff --git a/include/ndnboost/checked_delete.hpp b/include/ndnboost/checked_delete.hpp
index 50ec0db..00ce3f9 100644
--- a/include/ndnboost/checked_delete.hpp
+++ b/include/ndnboost/checked_delete.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/checked_delete.hpp
+//  ndnboost/checked_delete.hpp
 //
 //  Copyright (c) 2002, 2003 Peter Dimov
 //  Copyright (c) 2003 Daniel Frey
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 
diff --git a/include/ndnboost/cstdint.hpp b/include/ndnboost/cstdint.hpp
index 83bb8a0..22cc447 100644
--- a/include/ndnboost/cstdint.hpp
+++ b/include/ndnboost/cstdint.hpp
@@ -212,7 +212,7 @@
      typedef unsigned char   uint_least8_t;
      typedef unsigned char   uint_fast8_t;
 # else
-#    error defaults not correct; you must hand modify boost/cstdint.hpp
+#    error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 # endif
 
 //  16-bit types  -----------------------------------------------------------//
@@ -251,7 +251,7 @@
      typedef unsigned short  uint_least16_t;
      typedef unsigned short  uint_fast16_t;
 # else
-#    error defaults not correct; you must hand modify boost/cstdint.hpp
+#    error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 # endif
 
 //  32-bit types  -----------------------------------------------------------//
@@ -286,7 +286,7 @@
       typedef unsigned __int32  uint_least32_t; 
       typedef unsigned __int32  uint_fast32_t; 
 # else
-#    error defaults not correct; you must hand modify boost/cstdint.hpp
+#    error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 # endif
 
 //  64-bit types + intmax_t and uintmax_t  ----------------------------------//
@@ -300,7 +300,7 @@
 #    elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL)
                                                                  // 2**64 - 1
 #    else
-#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#       error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #    endif
 
      typedef  ::ndnboost::long_long_type            intmax_t;
@@ -324,7 +324,7 @@
      typedef unsigned long        uint_least64_t;
      typedef unsigned long        uint_fast64_t;
 #    else
-#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#       error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #    endif
 # elif defined(__GNUC__) && defined(BOOST_HAS_LONG_LONG)
      __extension__ typedef long long            intmax_t;
@@ -378,7 +378,7 @@
 //
 // For the following code we get several warnings along the lines of: 
 // 
-// boost/cstdint.hpp:428:35: error: use of C99 long long integer constant 
+// ndnboost/cstdint.hpp:428:35: error: use of C99 long long integer constant 
 // 
 // So we declare this a system header to suppress these warnings. 
 //
@@ -469,7 +469,7 @@
 #       define INT64_C(value) value##LL
 #       define UINT64_C(value) value##uLL
 #    else
-#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#       error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #    endif
 #  elif ULONG_MAX != 0xffffffff
 
@@ -477,7 +477,7 @@
 #       define INT64_C(value) value##L
 #       define UINT64_C(value) value##uL
 #    else
-#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#       error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #    endif
 #  elif defined(BOOST_HAS_LONG_LONG)
      // Usual macros not defined, work things out for ourselves:
@@ -485,10 +485,10 @@
 #       define INT64_C(value) value##LL
 #       define UINT64_C(value) value##uLL
 #    else
-#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#       error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #    endif
 #  else
-#    error defaults not correct; you must hand modify boost/cstdint.hpp
+#    error defaults not correct; you must hand modify ndnboost/cstdint.hpp
 #  endif
 
 #  ifdef BOOST_NO_INT64_T
diff --git a/include/ndnboost/cstdlib.hpp b/include/ndnboost/cstdlib.hpp
index 5101ba7..f57725f 100644
--- a/include/ndnboost/cstdlib.hpp
+++ b/include/ndnboost/cstdlib.hpp
@@ -1,4 +1,4 @@
-//  boost/cstdlib.hpp header  ------------------------------------------------//
+//  ndnboost/cstdlib.hpp header  ------------------------------------------------//
 
 //  Copyright Beman Dawes 2001.  Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
diff --git a/include/ndnboost/current_function.hpp b/include/ndnboost/current_function.hpp
index 4580ca5..cd7f516 100644
--- a/include/ndnboost/current_function.hpp
+++ b/include/ndnboost/current_function.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/current_function.hpp - BOOST_CURRENT_FUNCTION
+//  ndnboost/current_function.hpp - BOOST_CURRENT_FUNCTION
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/detail/endian.hpp b/include/ndnboost/detail/endian.hpp
index ccee87f..1dcb237 100644
--- a/include/ndnboost/detail/endian.hpp
+++ b/include/ndnboost/detail/endian.hpp
@@ -118,7 +118,7 @@
 # define BOOST_LITTLE_ENDIAN
 # define BOOST_BYTE_ORDER 1234
 #else
-# error The file boost/detail/endian.hpp needs to be set up for your CPU type.
+# error The file ndnboost/detail/endian.hpp needs to be set up for your CPU type.
 #endif
 
 
diff --git a/include/ndnboost/detail/interlocked.hpp b/include/ndnboost/detail/interlocked.hpp
index 4ad8271..1616414 100644
--- a/include/ndnboost/detail/interlocked.hpp
+++ b/include/ndnboost/detail/interlocked.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/interlocked.hpp
+//  ndnboost/detail/interlocked.hpp
 //
 //  Copyright 2005 Peter Dimov
 //
diff --git a/include/ndnboost/detail/lightweight_mutex.hpp b/include/ndnboost/detail/lightweight_mutex.hpp
index 6b952e5..69e3e38 100644
--- a/include/ndnboost/detail/lightweight_mutex.hpp
+++ b/include/ndnboost/detail/lightweight_mutex.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lightweight_mutex.hpp - lightweight mutex
+//  ndnboost/detail/lightweight_mutex.hpp - lightweight mutex
 //
 //  Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/detail/lightweight_test.hpp b/include/ndnboost/detail/lightweight_test.hpp
index 2b87b2e..252a2be 100644
--- a/include/ndnboost/detail/lightweight_test.hpp
+++ b/include/ndnboost/detail/lightweight_test.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lightweight_test.hpp - lightweight test library
+//  ndnboost/detail/lightweight_test.hpp - lightweight test library
 //
 //  Copyright (c) 2002, 2009 Peter Dimov
 //  Copyright (2) Beman Dawes 2010, 2011
diff --git a/include/ndnboost/function_types/components.hpp b/include/ndnboost/function_types/components.hpp
index 4c53024..6c4d43a 100644
--- a/include/ndnboost/function_types/components.hpp
+++ b/include/ndnboost/function_types/components.hpp
@@ -415,7 +415,7 @@
 
 #endif // end of BORLAND WORKAROUND
 
-#define BOOST_FT_al_path boost/function_types/detail/components_impl
+#define BOOST_FT_al_path ndnboost/function_types/detail/components_impl
 #include <ndnboost/function_types/detail/pp_loop.hpp>
 
   } } // namespace function_types::detail
diff --git a/include/ndnboost/function_types/detail/classifier.hpp b/include/ndnboost/function_types/detail/classifier.hpp
index 5108bcd..200e818 100644
--- a/include/ndnboost/function_types/detail/classifier.hpp
+++ b/include/ndnboost/function_types/detail/classifier.hpp
@@ -45,7 +45,7 @@
 #define BOOST_FT_type_member_function_pointer(cc,name) BOOST_FT_SYNTAX( \
     R BOOST_PP_EMPTY,BOOST_PP_LPAREN,cc,T0::** BOOST_PP_EMPTY,name,BOOST_PP_RPAREN)
 
-#define BOOST_FT_al_path boost/function_types/detail/classifier_impl
+#define BOOST_FT_al_path ndnboost/function_types/detail/classifier_impl
 #include <ndnboost/function_types/detail/pp_loop.hpp>
 
 template<typename T> struct classifier_bits
diff --git a/include/ndnboost/function_types/detail/synthesize.hpp b/include/ndnboost/function_types/detail/synthesize.hpp
index 87865ca..660a522 100644
--- a/include/ndnboost/function_types/detail/synthesize.hpp
+++ b/include/ndnboost/function_types/detail/synthesize.hpp
@@ -70,7 +70,7 @@
 };
 
 #define BOOST_FT_variations BOOST_FT_function|BOOST_FT_member_pointer
-#define BOOST_FT_al_path boost/function_types/detail/synthesize_impl
+#define BOOST_FT_al_path ndnboost/function_types/detail/synthesize_impl
 #include <ndnboost/function_types/detail/pp_loop.hpp>
 
 } } } // namespace ::ndnboost::function_types::detail
diff --git a/include/ndnboost/integer.hpp b/include/ndnboost/integer.hpp
index 6692bca..56e3ffe 100644
--- a/include/ndnboost/integer.hpp
+++ b/include/ndnboost/integer.hpp
@@ -25,7 +25,7 @@
 //
 // We simply cannot include this header on gcc without getting copious warnings of the kind:
 //
-// boost/integer.hpp:77:30: warning: use of C99 long long integer constant
+// ndnboost/integer.hpp:77:30: warning: use of C99 long long integer constant
 //
 // And yet there is no other reasonable implementation, so we declare this a system header
 // to suppress these warnings.
diff --git a/include/ndnboost/iterator/iterator_concepts.hpp b/include/ndnboost/iterator/iterator_concepts.hpp
index 5826135..cbfba5e 100644
--- a/include/ndnboost/iterator/iterator_concepts.hpp
+++ b/include/ndnboost/iterator/iterator_concepts.hpp
@@ -22,7 +22,7 @@
 
 #include <ndnboost/static_assert.hpp>
 
-// Use boost/limits to work around missing limits headers on some compilers
+// Use ndnboost/limits to work around missing limits headers on some compilers
 #include <ndnboost/limits.hpp>
 #include <ndnboost/config.hpp>
 
diff --git a/include/ndnboost/lambda/detail/lambda_config.hpp b/include/ndnboost/lambda/detail/lambda_config.hpp
index 9fd1a7b..c994383 100644
--- a/include/ndnboost/lambda/detail/lambda_config.hpp
+++ b/include/ndnboost/lambda/detail/lambda_config.hpp
@@ -13,7 +13,7 @@
 #ifndef BOOST_LAMBDA_LAMBDA_CONFIG_HPP
 #define BOOST_LAMBDA_LAMBDA_CONFIG_HPP
 
-// add to boost/config.hpp
+// add to ndnboost/config.hpp
 // for now
 
 
diff --git a/include/ndnboost/lexical_cast.hpp b/include/ndnboost/lexical_cast.hpp
index 40d1903..aed41ce 100644
--- a/include/ndnboost/lexical_cast.hpp
+++ b/include/ndnboost/lexical_cast.hpp
@@ -1421,7 +1421,7 @@
         // acts as a stream buffer which wraps around a pair of pointers
         //
         // This class is copied (and slightly changed) from
-        // boost/regex/v4/cpp_regex_traits.hpp
+        // ndnboost/regex/v4/cpp_regex_traits.hpp
         // Thanks John Maddock for it! (previous version had some
         // problems with libc++ and some other STL implementations)
         template <class BufferType, class charT>
diff --git a/include/ndnboost/memory_order.hpp b/include/ndnboost/memory_order.hpp
index 9e4290c..14d9162 100644
--- a/include/ndnboost/memory_order.hpp
+++ b/include/ndnboost/memory_order.hpp
@@ -7,7 +7,7 @@
 # pragma once
 #endif
 
-//  boost/memory_order.hpp
+//  ndnboost/memory_order.hpp
 //
 //  Defines enum ndnboost::memory_order per the C++0x working draft
 //
diff --git a/include/ndnboost/mpl/aux_/include_preprocessed.hpp b/include/ndnboost/mpl/aux_/include_preprocessed.hpp
index 860f294..ca47e08 100644
--- a/include/ndnboost/mpl/aux_/include_preprocessed.hpp
+++ b/include/ndnboost/mpl/aux_/include_preprocessed.hpp
@@ -30,11 +30,11 @@
 #endif
 
 #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
-#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(ndnboost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
 #   include AUX778076_INCLUDE_STRING
 #   undef AUX778076_INCLUDE_STRING
 #else
-#   include BOOST_PP_STRINGIZE(boost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
+#   include BOOST_PP_STRINGIZE(ndnboost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
 #endif
 
 #   undef AUX778076_PREPROCESSED_HEADER
diff --git a/include/ndnboost/mpl/list.hpp b/include/ndnboost/mpl/list.hpp
index 8ce6ad5..89655f3 100644
--- a/include/ndnboost/mpl/list.hpp
+++ b/include/ndnboost/mpl/list.hpp
@@ -33,7 +33,7 @@
     /**/
 #endif
 
-#   include BOOST_PP_STRINGIZE(boost/mpl/list/AUX778076_LIST_HEADER)
+#   include BOOST_PP_STRINGIZE(ndnboost/mpl/list/AUX778076_LIST_HEADER)
 #   undef AUX778076_LIST_HEADER
 #endif
 
diff --git a/include/ndnboost/mpl/list/aux_/include_preprocessed.hpp b/include/ndnboost/mpl/list/aux_/include_preprocessed.hpp
index 8ce5d6e..6f25939 100644
--- a/include/ndnboost/mpl/list/aux_/include_preprocessed.hpp
+++ b/include/ndnboost/mpl/list/aux_/include_preprocessed.hpp
@@ -23,11 +23,11 @@
 /**/
 
 #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
-#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/list/AUX778076_HEADER)
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(ndnboost/mpl/list/AUX778076_HEADER)
 #   include AUX778076_INCLUDE_STRING
 #   undef AUX778076_INCLUDE_STRING
 #else
-#   include BOOST_PP_STRINGIZE(boost/mpl/list/AUX778076_HEADER)
+#   include BOOST_PP_STRINGIZE(ndnboost/mpl/list/AUX778076_HEADER)
 #endif
 
 #   undef AUX778076_HEADER
diff --git a/include/ndnboost/mpl/vector.hpp b/include/ndnboost/mpl/vector.hpp
index 109d732..81b404d 100644
--- a/include/ndnboost/mpl/vector.hpp
+++ b/include/ndnboost/mpl/vector.hpp
@@ -33,7 +33,7 @@
     /**/
 #endif
 
-#   include BOOST_PP_STRINGIZE(boost/mpl/vector/AUX778076_VECTOR_HEADER)
+#   include BOOST_PP_STRINGIZE(ndnboost/mpl/vector/AUX778076_VECTOR_HEADER)
 #   undef AUX778076_VECTOR_HEADER
 #endif
 
diff --git a/include/ndnboost/mpl/vector/aux_/include_preprocessed.hpp b/include/ndnboost/mpl/vector/aux_/include_preprocessed.hpp
index 88fa58a..3cd7b7c 100644
--- a/include/ndnboost/mpl/vector/aux_/include_preprocessed.hpp
+++ b/include/ndnboost/mpl/vector/aux_/include_preprocessed.hpp
@@ -42,11 +42,11 @@
 
 
 #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
-#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(ndnboost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
 #   include AUX778076_INCLUDE_STRING
 #   undef AUX778076_INCLUDE_STRING
 #else
-#   include BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
+#   include BOOST_PP_STRINGIZE(ndnboost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
 #endif
 
 #   undef AUX778076_HEADER
diff --git a/include/ndnboost/numeric/conversion/detail/old_numeric_cast.hpp b/include/ndnboost/numeric/conversion/detail/old_numeric_cast.hpp
index 10d9596..e9cc453 100644
--- a/include/ndnboost/numeric/conversion/detail/old_numeric_cast.hpp
+++ b/include/ndnboost/numeric/conversion/detail/old_numeric_cast.hpp
@@ -21,7 +21,7 @@
 //             vc-stlport.
 //  20 Jan 01  Moved BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS to config.hpp.
 //             Removed unused BOOST_EXPLICIT_TARGET macro. Moved
-//             ndnboost::detail::type to boost/type.hpp. Made it compile with
+//             ndnboost::detail::type to ndnboost/type.hpp. Made it compile with
 //             stock gcc again (Dave Abrahams)
 //  29 Nov 00  Remove nested namespace cast, cleanup spacing before Formal
 //             Review (Beman Dawes)
@@ -58,7 +58,7 @@
 //  appear in the function's argument list.
 //
 //  TODO: Add this to config.hpp?
-//  FLC: This macro is repeated in boost/cast.hpp but only locally (is undefined at the bottom)
+//  FLC: This macro is repeated in ndnboost/cast.hpp but only locally (is undefined at the bottom)
 //       so is OK to reproduce it here.
 # if defined(BOOST_MSVC) && BOOST_MSVC < 1300
 #  define BOOST_EXPLICIT_DEFAULT_TARGET , ::ndnboost::type<Target>* = 0
diff --git a/include/ndnboost/range/iterator_range_io.hpp b/include/ndnboost/range/iterator_range_io.hpp
index 78ed7d6..faa3657 100644
--- a/include/ndnboost/range/iterator_range_io.hpp
+++ b/include/ndnboost/range/iterator_range_io.hpp
@@ -18,7 +18,7 @@
     #pragma warning( disable : 4996 )
 #endif
 
-// From boost/dynamic_bitset.hpp; thanks to Matthias Troyer for Cray X1 patch.
+// From ndnboost/dynamic_bitset.hpp; thanks to Matthias Troyer for Cray X1 patch.
 #ifndef BOOST_OLD_IOSTREAMS 
 # if defined(__STL_CONFIG_H) && \
     !defined (__STL_USE_NEW_IOSTREAMS) && !defined(__crayx1) \
diff --git a/include/ndnboost/smart_ptr/bad_weak_ptr.hpp b/include/ndnboost/smart_ptr/bad_weak_ptr.hpp
index dc1111b..df2879d 100644
--- a/include/ndnboost/smart_ptr/bad_weak_ptr.hpp
+++ b/include/ndnboost/smart_ptr/bad_weak_ptr.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/smart_ptr/bad_weak_ptr.hpp
+//  ndnboost/smart_ptr/bad_weak_ptr.hpp
 //
 //  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count.hpp b/include/ndnboost/smart_ptr/detail/atomic_count.hpp
index 01b661b..df19f10 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/atomic_count.hpp - thread/SMP safe reference counter
+//  ndnboost/detail/atomic_count.hpp - thread/SMP safe reference counter
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count_gcc.hpp b/include/ndnboost/smart_ptr/detail/atomic_count_gcc.hpp
index 0d87bde..2b34800 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count_gcc.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count_gcc.hpp
@@ -2,7 +2,7 @@
 #define BOOST_SMART_PTR_DETAIL_ATOMIC_COUNT_GCC_HPP_INCLUDED
 
 //
-//  boost/detail/atomic_count_gcc.hpp
+//  ndnboost/detail/atomic_count_gcc.hpp
 //
 //  atomic_count for GNU libstdc++ v3
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp b/include/ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp
index 664a2b9..60ac65c 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp
@@ -2,7 +2,7 @@
 #define BOOST_SMART_PTR_DETAIL_ATOMIC_COUNT_GCC_X86_HPP_INCLUDED
 
 //
-//  boost/detail/atomic_count_gcc_x86.hpp
+//  ndnboost/detail/atomic_count_gcc_x86.hpp
 //
 //  atomic_count for g++ on 486+/AMD64
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp b/include/ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp
index 0945566..85dbacf 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp
@@ -2,7 +2,7 @@
 #define BOOST_SMART_PTR_DETAIL_ATOMIC_COUNT_PTHREADS_HPP_INCLUDED
 
 //
-//  boost/detail/atomic_count_pthreads.hpp
+//  ndnboost/detail/atomic_count_pthreads.hpp
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count_sync.hpp b/include/ndnboost/smart_ptr/detail/atomic_count_sync.hpp
index 39300e1..45aa1b5 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count_sync.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count_sync.hpp
@@ -2,7 +2,7 @@
 #define BOOST_SMART_PTR_DETAIL_ATOMIC_COUNT_SYNC_HPP_INCLUDED
 
 //
-//  boost/detail/atomic_count_sync.hpp
+//  ndnboost/detail/atomic_count_sync.hpp
 //
 //  atomic_count for g++ 4.1+
 //
diff --git a/include/ndnboost/smart_ptr/detail/atomic_count_win32.hpp b/include/ndnboost/smart_ptr/detail/atomic_count_win32.hpp
index 0d0477a..de156ef 100644
--- a/include/ndnboost/smart_ptr/detail/atomic_count_win32.hpp
+++ b/include/ndnboost/smart_ptr/detail/atomic_count_win32.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/atomic_count_win32.hpp
+//  ndnboost/detail/atomic_count_win32.hpp
 //
 //  Copyright (c) 2001-2005 Peter Dimov
 //
diff --git a/include/ndnboost/smart_ptr/detail/lightweight_mutex.hpp b/include/ndnboost/smart_ptr/detail/lightweight_mutex.hpp
index a48bb45..f325bd5 100644
--- a/include/ndnboost/smart_ptr/detail/lightweight_mutex.hpp
+++ b/include/ndnboost/smart_ptr/detail/lightweight_mutex.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lightweight_mutex.hpp - lightweight mutex
+//  ndnboost/detail/lightweight_mutex.hpp - lightweight mutex
 //
 //  Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/lwm_nop.hpp b/include/ndnboost/smart_ptr/detail/lwm_nop.hpp
index 94d1fc5..58e3a8e 100644
--- a/include/ndnboost/smart_ptr/detail/lwm_nop.hpp
+++ b/include/ndnboost/smart_ptr/detail/lwm_nop.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lwm_nop.hpp
+//  ndnboost/detail/lwm_nop.hpp
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/lwm_pthreads.hpp b/include/ndnboost/smart_ptr/detail/lwm_pthreads.hpp
index 38bbc91..c7314ae 100644
--- a/include/ndnboost/smart_ptr/detail/lwm_pthreads.hpp
+++ b/include/ndnboost/smart_ptr/detail/lwm_pthreads.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lwm_pthreads.hpp
+//  ndnboost/detail/lwm_pthreads.hpp
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
diff --git a/include/ndnboost/smart_ptr/detail/lwm_win32_cs.hpp b/include/ndnboost/smart_ptr/detail/lwm_win32_cs.hpp
index e976c32..7433998 100644
--- a/include/ndnboost/smart_ptr/detail/lwm_win32_cs.hpp
+++ b/include/ndnboost/smart_ptr/detail/lwm_win32_cs.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/lwm_win32_cs.hpp
+//  ndnboost/detail/lwm_win32_cs.hpp
 //
 //  Copyright (c) 2002, 2003 Peter Dimov
 //
diff --git a/include/ndnboost/smart_ptr/detail/sp_has_sync.hpp b/include/ndnboost/smart_ptr/detail/sp_has_sync.hpp
index 16de21d..7d2b984 100644
--- a/include/ndnboost/smart_ptr/detail/sp_has_sync.hpp
+++ b/include/ndnboost/smart_ptr/detail/sp_has_sync.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/smart_ptr/detail/sp_has_sync.hpp
+//  ndnboost/smart_ptr/detail/sp_has_sync.hpp
 //
 //  Copyright (c) 2008, 2009 Peter Dimov
 //
diff --git a/include/ndnboost/smart_ptr/detail/spinlock.hpp b/include/ndnboost/smart_ptr/detail/spinlock.hpp
index ab6c807..80ae61a 100644
--- a/include/ndnboost/smart_ptr/detail/spinlock.hpp
+++ b/include/ndnboost/smart_ptr/detail/spinlock.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/spinlock.hpp
+//  ndnboost/detail/spinlock.hpp
 //
 //  Copyright (c) 2008 Peter Dimov
 //
diff --git a/include/ndnboost/smart_ptr/detail/spinlock_pool.hpp b/include/ndnboost/smart_ptr/detail/spinlock_pool.hpp
index f23a045..5ba249d 100644
--- a/include/ndnboost/smart_ptr/detail/spinlock_pool.hpp
+++ b/include/ndnboost/smart_ptr/detail/spinlock_pool.hpp
@@ -8,7 +8,7 @@
 #endif
 
 //
-//  boost/detail/spinlock_pool.hpp
+//  ndnboost/detail/spinlock_pool.hpp
 //
 //  Copyright (c) 2008 Peter Dimov
 //
diff --git a/include/ndnboost/throw_exception.hpp b/include/ndnboost/throw_exception.hpp
index e9212d1..08cef38 100644
--- a/include/ndnboost/throw_exception.hpp
+++ b/include/ndnboost/throw_exception.hpp
@@ -14,7 +14,7 @@
 #endif
 
 //
-//  boost/throw_exception.hpp
+//  ndnboost/throw_exception.hpp
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //  Copyright (c) 2008-2009 Emil Dotchevski and Reverge Studios, Inc.
diff --git a/include/ndnboost/type_traits.hpp b/include/ndnboost/type_traits.hpp
index 595d30b..01081e0 100644
--- a/include/ndnboost/type_traits.hpp
+++ b/include/ndnboost/type_traits.hpp
@@ -5,7 +5,7 @@
 //
 //  See http://www.boost.org/libs/type_traits for most recent version including documentation.
 
-//  See boost/type_traits/*.hpp for full copyright notices.
+//  See ndnboost/type_traits/*.hpp for full copyright notices.
 
 #ifndef BOOST_TYPE_TRAITS_HPP
 #define BOOST_TYPE_TRAITS_HPP
diff --git a/include/ndnboost/type_traits/detail/common_type_imp.hpp b/include/ndnboost/type_traits/detail/common_type_imp.hpp
index b3f2bd0..8dd12b4 100644
--- a/include/ndnboost/type_traits/detail/common_type_imp.hpp
+++ b/include/ndnboost/type_traits/detail/common_type_imp.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * boost/type_traits/detail/common_type_imp.hpp
+ * ndnboost/type_traits/detail/common_type_imp.hpp
  *
  * Copyright 2010, Jeffrey Hellrung.
  * Distributed under the Boost Software License, Version 1.0.  (See accompanying
diff --git a/include/ndnboost/type_traits/integral_promotion.hpp b/include/ndnboost/type_traits/integral_promotion.hpp
index 46cf118..0f26a9e 100644
--- a/include/ndnboost/type_traits/integral_promotion.hpp
+++ b/include/ndnboost/type_traits/integral_promotion.hpp
@@ -41,7 +41,7 @@
     template<> struct need_promotion<T>          \
         : public integral_constant<bool, (sizeof(T) < sizeof(int))> {};
 
-// Same set of integral types as in boost/type_traits/is_integral.hpp.
+// Same set of integral types as in ndnboost/type_traits/is_integral.hpp.
 // Please, keep in sync.
 #if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
     || (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \
diff --git a/include/ndnboost/type_traits/is_class.hpp b/include/ndnboost/type_traits/is_class.hpp
index 6629d0a..91e08e6 100644
--- a/include/ndnboost/type_traits/is_class.hpp
+++ b/include/ndnboost/type_traits/is_class.hpp
@@ -46,7 +46,7 @@
 // This is actually the conforming implementation which works with
 // abstract classes.  However, enough compilers have trouble with
 // it that most will use the one in
-// boost/type_traits/object_traits.hpp. This implementation
+// ndnboost/type_traits/object_traits.hpp. This implementation
 // actually works with VC7.0, but other interactions seem to fail
 // when we use it.
 
diff --git a/include/ndnboost/type_traits/is_integral.hpp b/include/ndnboost/type_traits/is_integral.hpp
index 72e13d3..c622b3d 100644
--- a/include/ndnboost/type_traits/is_integral.hpp
+++ b/include/ndnboost/type_traits/is_integral.hpp
@@ -44,7 +44,7 @@
 BOOST_TT_AUX_BOOL_TRAIT_CV_SPEC1(is_integral,wchar_t,true)
 #endif
 
-// Same set of integral types as in boost/type_traits/integral_promotion.hpp.
+// Same set of integral types as in ndnboost/type_traits/integral_promotion.hpp.
 // Please, keep in sync. -- Alexander Nasonov
 #if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
     || (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \