diff --git a/README.md b/README.md
index e361846..93575a5 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ This is not an official Boost C++ library. It wasn't reviewed and can't be downl
 ...
 
 boost::function<int(int)> c_func
-    = boost::plugin::shared_function<int(int)>(
+    = boost::dll::shared_function<int(int)>(
         path_to_shared_library, "c_func_name"
     );
 
diff --git a/doc/getting_started.qbk b/doc/getting_started.qbk
index 924618d..2899537 100644
--- a/doc/getting_started.qbk
+++ b/doc/getting_started.qbk
@@ -18,12 +18,12 @@ using namespace boost;
 
 [table:starting
 [[ In DLL/DSL sources: ]                    [ In code that uses DLL/DSL: ]              [ Function description: ]]
-[[ [getting_started_exports_c_function] ]   [ [getting_started_imports_c_function] ]    [ [funcref boost::plugin::shared_function shared_function ] ]]
-[[ [getting_started_exports_c_variable] ]   [ [getting_started_imports_c_variable] ]    [ [funcref boost::plugin::shared_variable shared_variable ] ]]
+[[ [getting_started_exports_c_function] ]   [ [getting_started_imports_c_function] ]    [ [funcref boost::dll::shared_function shared_function ] ]]
+[[ [getting_started_exports_c_variable] ]   [ [getting_started_imports_c_variable] ]    [ [funcref boost::dll::shared_variable shared_variable ] ]]
 [[ [getting_started_exports_cpp_function] ] [ [getting_started_imports_cpp_function] ]  [ [macroref
-BOOST_PLUGIN_ALIAS] [funcref boost::plugin::shared_function_alias shared_function_alias] ]]
+BOOST_PLUGIN_ALIAS] [funcref boost::dll::shared_function_alias shared_function_alias] ]]
 [[ [getting_started_exports_cpp_variable] ] [ [getting_started_imports_cpp_variable] ]  [ [macroref
-BOOST_PLUGIN_ALIAS] [funcref boost::plugin::shared_variable_alias shared_variable_alias] ]]
+BOOST_PLUGIN_ALIAS] [funcref boost::dll::shared_variable_alias shared_variable_alias] ]]
 ]
 
 In all the cases above it is safe to use imported variable or function because the
@@ -33,10 +33,10 @@ In all the cases above it is safe to use imported variable or function because t
 
 [note On Linux/POSIX link with library "dl". "-fvisibility=hidden" flag is also recomended for use on Linux/POSIX.]
 
-If you need a low level api [classref boost::plugin::shared_library] and [funcref boost::plugin::alias] will suit you. If you want to load a library,
+If you need a low level api [classref boost::dll::shared_library] and [funcref boost::dll::alias] will suit you. If you want to load a library,
 just construct that class with a path to the library as a parameter:
 ```
-boost::plugin::shared_library lib("/test/boost/application/libtest_library.so");
+boost::dll::shared_library lib("/test/boost/application/libtest_library.so");
 
 ```
 Now you can easily import symbols from that library using the `get` member function:
@@ -44,6 +44,6 @@ Now you can easily import symbols from that library using the `get` member funct
 int plugin_constant = lib.get<const int>("integer_variable");
 boost::function<int()> f = lib.get<int()>("function_returning_int");
 ```
-In case of `boost::plugin::shared_library` it is safe to use imported symbols only until instance `boost::plugin::shared_library` is not destroyed.
+In case of `boost::dll::shared_library` it is safe to use imported symbols only until instance `boost::dll::shared_library` is not destroyed.
 
 [endsect]
diff --git a/doc/tutorial.qbk b/doc/tutorial.qbk
index c1321e0..a6690a6 100644
--- a/doc/tutorial.qbk
+++ b/doc/tutorial.qbk
@@ -24,7 +24,7 @@ Now let's make a DLL/DSO library that will holds implementation of plugin interf
 [import ../example/tutorial1/my_plugin_sum.cpp]
 [plugcpp_my_plugin_sum]
 
-Simple application that loads plugin using the [funcref boost::plugin::shared_variable_alias]:
+Simple application that loads plugin using the [funcref boost::dll::shared_variable_alias]:
 
 [import ../example/tutorial1/tutorial1.cpp]
 [callplugcpp_tutorial1]
@@ -59,7 +59,7 @@ using [macroref BOOST_PLUGIN_ALIAS].
 [import ../example/tutorial2/tutorial2.cpp]
 [callplugcpp_tutorial2]
 
-In that application we have imported the factory method using [funcref boost::plugin::shared_function_alias].
+In that application we have imported the factory method using [funcref boost::dll::shared_function_alias].
 
 [caution Be careful: `creator` variable holds a reference to the loaded shared library. If this
 variable goes out of scope or will be reset, then the *DLL/DSO will be unloaded* and any attempt to
diff --git a/example/getting_started.cpp b/example/getting_started.cpp
index 6ff0f93..713677a 100644
--- a/example/getting_started.cpp
+++ b/example/getting_started.cpp
@@ -21,7 +21,7 @@ int test_main(int argc, char* argv[]) {
     filesystem::path path_to_shared_library = shared_lib_path(argv[1], L"getting_started_library");
     
     //[getting_started_imports_c_function
-    function<int(int)> c_func = plugin::shared_function<int(int)>(
+    function<int(int)> c_func = dll::shared_function<int(int)>(
         path_to_shared_library, "c_func_name"
     );
     //]
@@ -31,7 +31,7 @@ int test_main(int argc, char* argv[]) {
 
 
     //[getting_started_imports_c_variable
-    shared_ptr<int> c_var = plugin::shared_variable<int>(
+    shared_ptr<int> c_var = dll::shared_variable<int>(
         path_to_shared_library, "c_variable_name"
     );
     //]
@@ -45,7 +45,7 @@ int test_main(int argc, char* argv[]) {
     typedef std::string(func_type)(const std::string&);
 
     function<func_type> cpp_func
-        = plugin::shared_function_alias<func_type>(
+        = dll::shared_function_alias<func_type>(
             path_to_shared_library, "cpp_function_alias_name"
         );
     //]
@@ -56,7 +56,7 @@ int test_main(int argc, char* argv[]) {
 
     //[getting_started_imports_cpp_variable    
     shared_ptr<std::string> cpp_var
-        = plugin::shared_variable_alias<std::string>(
+        = dll::shared_variable_alias<std::string>(
             path_to_shared_library, "cpp_variable_alias_name"
         );
     //]
diff --git a/example/tutorial1/tutorial1.cpp b/example/tutorial1/tutorial1.cpp
index a2b20f9..e3f150a 100644
--- a/example/tutorial1/tutorial1.cpp
+++ b/example/tutorial1/tutorial1.cpp
@@ -26,7 +26,7 @@ int main(int argc, char* argv[]) {
 
     std::cout << "Loading the plugin" << std::endl;
     boost::shared_ptr<my_plugin_api> plugin
-        = boost::plugin::shared_variable_alias<my_plugin_api>(
+        = boost::dll::shared_variable_alias<my_plugin_api>(
             shared_library_path, "plugin"
         );
 
diff --git a/example/tutorial2/tutorial2.cpp b/example/tutorial2/tutorial2.cpp
index 5de4dc1..497a940 100644
--- a/example/tutorial2/tutorial2.cpp
+++ b/example/tutorial2/tutorial2.cpp
@@ -24,7 +24,7 @@ int main(int argc, char* argv[]) {
 
     typedef boost::shared_ptr<my_plugin_api> (pluginapi_create_t)();
     boost::function<pluginapi_create_t> creator
-        = boost::plugin::shared_function_alias<pluginapi_create_t>(shared_library_path, "create_plugin");
+        = boost::dll::shared_function_alias<pluginapi_create_t>(shared_library_path, "create_plugin");
 
     boost::shared_ptr<my_plugin_api> plugin = creator();
 
diff --git a/example/tutorial3/tutorial3.cpp b/example/tutorial3/tutorial3.cpp
index df559e6..69ded2f 100644
--- a/example/tutorial3/tutorial3.cpp
+++ b/example/tutorial3/tutorial3.cpp
@@ -21,7 +21,7 @@
 
 #include "../tutorial_common/plugin_api.hpp"
 
-namespace pl = boost::plugin;
+namespace pl = boost::dll;
 
 std::size_t search_for_symbols(const std::vector<boost::filesystem::path>& plugins) {
     std::size_t plugins_found = 0;
diff --git a/example/tutorial4/load_self.cpp b/example/tutorial4/load_self.cpp
index 86b307c..f0a712f 100644
--- a/example/tutorial4/load_self.cpp
+++ b/example/tutorial4/load_self.cpp
@@ -14,7 +14,7 @@
 #include "static_plugin.hpp"
 #include <iostream>
 
-namespace pl = boost::plugin;
+namespace pl = boost::dll;
 
 int main() {
     std::cout << "Application started" << std::endl;
diff --git a/example/tutorial5/load_all.cpp b/example/tutorial5/load_all.cpp
index 94baade..bd5e6fa 100644
--- a/example/tutorial5/load_all.cpp
+++ b/example/tutorial5/load_all.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 //[plugcpp_plugins_collector_def
-namespace pl = boost::plugin;
+namespace pl = boost::dll;
 
 class plugins_collector {
     // Name => plugin
diff --git a/include/boost/plugin/alias.hpp b/include/boost/plugin/alias.hpp
index 02bc756..3d567aa 100644
--- a/include/boost/plugin/alias.hpp
+++ b/include/boost/plugin/alias.hpp
@@ -30,7 +30,7 @@
 /// boost/plugin/shared_library.hpp to reduce dependencies
 /// in case you do not use the refcountable functions.
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 #if BOOST_OS_WINDOWS
 
@@ -133,7 +133,7 @@ inline T& alias(const shared_library& lib, const boost::string_ref &symbol) {
     return *lib.get<T*>(symbol);
 }
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_ALIAS_HPP
 
diff --git a/include/boost/plugin/detail/aggressive_ptr_cast.hpp b/include/boost/plugin/detail/aggressive_ptr_cast.hpp
index 0f6d78d..437ed8b 100644
--- a/include/boost/plugin/detail/aggressive_ptr_cast.hpp
+++ b/include/boost/plugin/detail/aggressive_ptr_cast.hpp
@@ -28,7 +28,7 @@
 #include <boost/type_traits/is_const.hpp>
 #include <stdint.h> // cstdint is not good because it does not define std::uintptr_t
 
-namespace boost { namespace plugin { namespace detail {
+namespace boost { namespace dll { namespace detail {
 
 // GCC warns when reinterpret_cast between function pointer and object pointer occur.
 // This method supress the warnings and ensures that such casts are safe.
@@ -49,7 +49,7 @@ BOOST_FORCEINLINE To aggressive_ptr_cast(From* v) BOOST_NOEXCEPT {
     );
 }
 
-}}} // boost::plugin::detail
+}}} // boost::dll::detail
 
 #endif // BOOST_PLUGIN_DETAIL_AGGRESSIVE_PTR_CAST_HPP
 
diff --git a/include/boost/plugin/detail/posix/library_info.hpp b/include/boost/plugin/detail/posix/library_info.hpp
index 570e3b3..28677af 100644
--- a/include/boost/plugin/detail/posix/library_info.hpp
+++ b/include/boost/plugin/detail/posix/library_info.hpp
@@ -31,7 +31,7 @@
 #include <link.h>
 #include <elf.h>
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 class library_info {
     boost::filesystem::ifstream f_;
@@ -170,6 +170,6 @@ public:
     }
 };
 
-}} // namespace boost::plugin
+}} // namespace boost::dll
 
 #endif // BOOST_PLUGIN_DETAIL_POSIX_LIBRARY_INFO_HPP
diff --git a/include/boost/plugin/detail/posix/shared_library_impl.hpp b/include/boost/plugin/detail/posix/shared_library_impl.hpp
index 895ace7..904f19f 100644
--- a/include/boost/plugin/detail/posix/shared_library_impl.hpp
+++ b/include/boost/plugin/detail/posix/shared_library_impl.hpp
@@ -37,7 +37,7 @@
 # pragma once
 #endif
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 class shared_library_impl {
 
@@ -191,7 +191,7 @@ private:
     native_handle_t handle_;
 };
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_SHARED_LIBRARY_IMPL_HPP
 
diff --git a/include/boost/plugin/detail/system_error.hpp b/include/boost/plugin/detail/system_error.hpp
index 8a370ad..7174e8f 100644
--- a/include/boost/plugin/detail/system_error.hpp
+++ b/include/boost/plugin/detail/system_error.hpp
@@ -32,7 +32,7 @@
 #   pragma once
 #endif
 
-namespace boost { namespace plugin { namespace detail {
+namespace boost { namespace dll { namespace detail {
 
     inline void report_error(const boost::system::error_code& ec, const char* message) {
 #if !BOOST_OS_WINDOWS
@@ -54,7 +54,7 @@ namespace boost { namespace plugin { namespace detail {
         );
     }
 
-}}} // boost::plugin::detail
+}}} // boost::dll::detail
 
 #endif // BOOST_PLUGIN_SYSTEM_ERROR_HPP
 
diff --git a/include/boost/plugin/detail/windows/library_info.hpp b/include/boost/plugin/detail/windows/library_info.hpp
index 73549d2..595af1b 100644
--- a/include/boost/plugin/detail/windows/library_info.hpp
+++ b/include/boost/plugin/detail/windows/library_info.hpp
@@ -32,7 +32,7 @@
 #include <windows.h>
 #include <boost/plugin/shared_library.hpp>
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 // reference:
 // http://www.joachim-bauch.de/tutorials/loading-a-dll-from-memory/
@@ -220,6 +220,6 @@ public:
     }
 };
 
-}} // namespace boost::plugin
+}} // namespace boost::dll
 
 #endif // BOOST_PLUGIN_DETAIL_WINDOWS_LIBRARY_INFO_HPP
diff --git a/include/boost/plugin/detail/windows/shared_library_impl.hpp b/include/boost/plugin/detail/windows/shared_library_impl.hpp
index 72c7939..1b3bc0b 100644
--- a/include/boost/plugin/detail/windows/shared_library_impl.hpp
+++ b/include/boost/plugin/detail/windows/shared_library_impl.hpp
@@ -33,7 +33,7 @@
 # pragma once
 #endif
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 class shared_library_impl {
 
@@ -183,7 +183,7 @@ public:
         // at GetProcAddress there is no version for UNICODE.
         // There can be it and is correct, as in executed
         // units names of functions are stored in narrow characters.
-        void* const symbol = boost::plugin::detail::aggressive_ptr_cast<void*>(
+        void* const symbol = boost::dll::detail::aggressive_ptr_cast<void*>(
             boost::detail::winapi::GetProcAddress(handle_, sb.data())
         );
         if (symbol == NULL) {
@@ -201,7 +201,7 @@ private:
     native_handle_t handle_;
 };
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_SHARED_LIBRARY_IMPL_HPP
 
diff --git a/include/boost/plugin/refcountable.hpp b/include/boost/plugin/refcountable.hpp
index 3fd3af2..250acc4 100644
--- a/include/boost/plugin/refcountable.hpp
+++ b/include/boost/plugin/refcountable.hpp
@@ -29,10 +29,10 @@
 
 /// \file boost/plugin/refcountable.hpp
 /// \brief Includes all the reference counting functions that hold a shared pointer to the instance of
-/// boost::plugin::shared_library. Those methods use boost::shared_ptr<T>
+/// boost::dll::shared_library. Those methods use boost::shared_ptr<T>
 /// and boost::function<T> classes.
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 namespace detail {
 
@@ -74,7 +74,7 @@ namespace detail {
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For importing function by it alias name use boost::plugin::shared_function_alias method.
+* For importing function by it alias name use boost::dll::shared_function_alias method.
 *
 * This method has an overload that accepts boost::filesystem::path as a first argument.
 *
@@ -100,7 +100,7 @@ namespace detail {
 */
 template <class T>
 boost::function<T> shared_function(const boost::shared_ptr<shared_library>& lib, boost::string_ref func_name) {
-    return boost::plugin::detail::refc_function<T>(lib, &lib->get<T>(func_name));
+    return boost::dll::detail::refc_function<T>(lib, &lib->get<T>(func_name));
 }
 
 /*!
@@ -111,7 +111,7 @@ boost::function<T> shared_function(const boost::shared_ptr<shared_library>& lib,
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For importing function by it's alias name use boost::plugin::shared_function_alias method.
+* For importing function by it's alias name use boost::dll::shared_function_alias method.
 *
 * \b Example:
 * \code
@@ -150,7 +150,7 @@ boost::function<T> shared_function(const boost::filesystem::path& lib_path, boos
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For non alias names use boost::plugin::shared_function method.
+* For non alias names use boost::dll::shared_function method.
 *
 * This method has an overload that accepts boost::filesystem::path as a first argument.
 *
@@ -176,7 +176,7 @@ boost::function<T> shared_function(const boost::filesystem::path& lib_path, boos
 */
 template <class T>
 boost::function<T> shared_function_alias(const boost::shared_ptr<shared_library>& lib, boost::string_ref func_name) {
-    return boost::plugin::detail::refc_function<T>(lib, lib->get<T*>(func_name));
+    return boost::dll::detail::refc_function<T>(lib, lib->get<T*>(func_name));
 }
 
 /*!
@@ -187,7 +187,7 @@ boost::function<T> shared_function_alias(const boost::shared_ptr<shared_library>
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For non alias names use boost::plugin::shared_function method.
+* For non alias names use boost::dll::shared_function method.
 *
 * \b Example:
 * \code
@@ -226,7 +226,7 @@ boost::function<T> shared_function_alias(const boost::filesystem::path& lib_path
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For importing variable by it's alias name use boost::plugin::shared_variable_alias method.
+* For importing variable by it's alias name use boost::dll::shared_variable_alias method.
 *
 * This method has an overload that accepts boost::filesystem::path as a first argument.
 *
@@ -252,7 +252,7 @@ boost::function<T> shared_function_alias(const boost::filesystem::path& lib_path
 */
 template <class T>
 boost::shared_ptr<T> shared_variable(const boost::shared_ptr<shared_library>& lib, boost::string_ref variable_name) {
-    return boost::shared_ptr<T>(&lib->get<T>(variable_name), boost::plugin::detail::ptr_holding_empty_deleter(lib));
+    return boost::shared_ptr<T>(&lib->get<T>(variable_name), boost::dll::detail::ptr_holding_empty_deleter(lib));
 }
 
 /*!
@@ -263,7 +263,7 @@ boost::shared_ptr<T> shared_variable(const boost::shared_ptr<shared_library>& li
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For importing variable by it's alias name use boost::plugin::shared_variable_alias method.
+* For importing variable by it's alias name use boost::dll::shared_variable_alias method.
 *
 * \b Example:
 * \code
@@ -302,7 +302,7 @@ boost::shared_ptr<T> shared_variable(const boost::filesystem::path& lib_path, bo
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For non alias names use boost::plugin::shared_variable method.
+* For non alias names use boost::dll::shared_variable method.
 *
 * This method has an overload that accepts boost::filesystem::path as a first argument.
 *
@@ -328,7 +328,7 @@ boost::shared_ptr<T> shared_variable(const boost::filesystem::path& lib_path, bo
 */
 template <class T>
 boost::shared_ptr<T> shared_variable_alias(const boost::shared_ptr<shared_library>& lib, boost::string_ref variable_name) {
-    return boost::shared_ptr<T>(lib->get<T*>(variable_name), boost::plugin::detail::ptr_holding_empty_deleter(lib));
+    return boost::shared_ptr<T>(lib->get<T*>(variable_name), boost::dll::detail::ptr_holding_empty_deleter(lib));
 }
 
 /*!
@@ -339,7 +339,7 @@ boost::shared_ptr<T> shared_variable_alias(const boost::shared_ptr<shared_librar
 * This call will succeed if call to `shared_library::search_symbol(const boost::string_ref &)`
 * function with the same symbol name returned `true`.
 *
-* For non alias names use boost::plugin::shared_variable method.
+* For non alias names use boost::dll::shared_variable method.
 *
 * \b Example:
 * \code
@@ -367,7 +367,7 @@ boost::shared_ptr<T> shared_variable_alias(const boost::filesystem::path& lib_pa
     );
 }
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_REFCOUNTABLE_HPP
 
diff --git a/include/boost/plugin/shared_library.hpp b/include/boost/plugin/shared_library.hpp
index 96165cb..a71673e 100644
--- a/include/boost/plugin/shared_library.hpp
+++ b/include/boost/plugin/shared_library.hpp
@@ -18,7 +18,7 @@
 #define BOOST_PLUGIN_SHARED_LIBRARY_HPP
 
 /// \file boost/plugin/shared_library.hpp
-/// \brief Contains the boost::plugin::shared_library class, main class for all the
+/// \brief Contains the boost::dll::shared_library class, main class for all the
 /// DLL/DSO operations.
 
 #include <boost/config.hpp>
@@ -36,7 +36,7 @@
 # pragma once
 #endif
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
 /*!
 * \brief This class can be used to load a
@@ -175,7 +175,7 @@ public:
         base_t::load(sl, load_mode::default_mode, ec);
 
         if (ec) {
-            boost::plugin::detail::report_error(ec, "load() failed");
+            boost::dll::detail::report_error(ec, "load() failed");
         }
     }
 
@@ -200,7 +200,7 @@ public:
         base_t::load_self(ec);
 
         if (ec) {
-            boost::plugin::detail::report_error(ec, "load_self() failed");
+            boost::dll::detail::report_error(ec, "load_self() failed");
         }
     }
 
@@ -266,7 +266,7 @@ public:
         base_t::load(sl, mode, ec);
 
         if (ec) {
-            boost::plugin::detail::report_error(ec, "load() failed");
+            boost::dll::detail::report_error(ec, "load() failed");
         }
     }
 
@@ -353,7 +353,7 @@ public:
     */
     template <typename T>
     inline T& get(const boost::string_ref &sb) const {
-        return *boost::plugin::detail::aggressive_ptr_cast<T*>(
+        return *boost::dll::detail::aggressive_ptr_cast<T*>(
             get_impl(sb)
         );
     }
@@ -380,7 +380,7 @@ private:
 
         void* const ret = base_t::symbol_addr(sb, ec);
         if (ec || !ret) {
-            boost::plugin::detail::report_error(ec, "get() failed");
+            boost::dll::detail::report_error(ec, "get() failed");
         }
 
         return ret;
@@ -436,7 +436,7 @@ public:
         boost::filesystem::path full_path = base_t::full_module_path(ec);
 
         if (ec) {
-            boost::plugin::detail::report_error(ec, "full_module_path() failed");
+            boost::dll::detail::report_error(ec, "full_module_path() failed");
         }
 
         return full_path;
@@ -544,7 +544,7 @@ inline void swap(shared_library& lhs, shared_library& rhs) BOOST_NOEXCEPT {
     lhs.swap(rhs);
 }
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_SHARED_LIBRARY_HPP
 
diff --git a/include/boost/plugin/shared_library_load_mode.hpp b/include/boost/plugin/shared_library_load_mode.hpp
index 09151f6..a12d10f 100644
--- a/include/boost/plugin/shared_library_load_mode.hpp
+++ b/include/boost/plugin/shared_library_load_mode.hpp
@@ -31,7 +31,7 @@
 # pragma once
 #endif
 
-namespace boost { namespace plugin {
+namespace boost { namespace dll {
 
    /*! \enum Modes of load library.
     *
@@ -184,6 +184,6 @@ namespace boost { namespace plugin {
         return (left);
     }
 
-}} // boost::plugin
+}} // boost::dll
 
 #endif // BOOST_PLUGIN_SHARED_LIBRARY_MODE_HPP
diff --git a/test/library_info_test.cpp b/test/library_info_test.cpp
index 0c87d38..31ab435 100644
--- a/test/library_info_test.cpp
+++ b/test/library_info_test.cpp
@@ -20,7 +20,7 @@ int test_main(int argc, char* argv[])
     boost::filesystem::path shared_library_path = shared_lib_path(argv[1], L"test_library");
     std::cout << "Library: " << shared_library_path;
 
-    boost::plugin::library_info lib_info(shared_library_path);
+    boost::dll::library_info lib_info(shared_library_path);
     std::vector<std::string> sec = lib_info.sections();
     //std::copy(sec.begin(), sec.end(), std::ostream_iterator<std::string>(std::cout, ",  "));
     BOOST_CHECK(std::find(sec.begin(), sec.end(), "boost_aliases") != sec.end());
@@ -42,7 +42,7 @@ int test_main(int argc, char* argv[])
 
     // Self testing
     std::cout << "Self: " << argv[0];
-    boost::plugin::library_info self_info(argv[0]);
+    boost::dll::library_info self_info(argv[0]);
 
     sec = self_info.sections();
     //std::copy(sec.begin(), sec.end(), std::ostream_iterator<std::string>(std::cout, ",  "));
diff --git a/test/shared_library_errors.cpp b/test/shared_library_errors.cpp
index 1a64de8..1d6df96 100644
--- a/test/shared_library_errors.cpp
+++ b/test/shared_library_errors.cpp
@@ -16,7 +16,7 @@
 
 // Unit Tests
 int test_main(int argc, char* argv[]) {
-    using namespace boost::plugin;
+    using namespace boost::dll;
 
     BOOST_CHECK(argc >= 2);
     boost::filesystem::path shared_library_path = shared_lib_path(argv[1], L"test_library");
diff --git a/test/shared_library_get_symbol_test.cpp b/test/shared_library_get_symbol_test.cpp
index 569e6a9..fb7ec70 100644
--- a/test/shared_library_get_symbol_test.cpp
+++ b/test/shared_library_get_symbol_test.cpp
@@ -36,7 +36,7 @@ typedef boost::shared_ptr<do_share_res_t> (do_share_t)(
         );
 
 void refcountable_test(boost::filesystem::path shared_library_path) {
-    using namespace boost::plugin;
+    using namespace boost::dll;
     using namespace boost::fusion;
 
     std::vector<int> v(1000);
@@ -115,7 +115,7 @@ extern "C" int BOOST_SYMBOL_EXPORT exef() {
 
 // Unit Tests
 int test_main(int argc, char* argv[]) {
-    using namespace boost::plugin;
+    using namespace boost::dll;
 
     BOOST_CHECK(argc >= 2);
     boost::filesystem::path shared_library_path = shared_lib_path(argv[1], L"test_library");
diff --git a/test/shared_library_load_test.cpp b/test/shared_library_load_test.cpp
index a18bcba..c455b52 100644
--- a/test/shared_library_load_test.cpp
+++ b/test/shared_library_load_test.cpp
@@ -22,7 +22,7 @@ inline bool lib_path_equal(const boost::filesystem::path& lhs, const boost::file
 
 int test_main(int argc, char* argv[])
 {
-   using namespace boost::plugin;
+   using namespace boost::dll;
 
    BOOST_CHECK(argc >= 2);
    boost::filesystem::path shared_library_path = shared_lib_path(argv[1], L"test_library");
diff --git a/test/shared_library_search_symbol_test.cpp b/test/shared_library_search_symbol_test.cpp
index 95b42cb..837f626 100644
--- a/test/shared_library_search_symbol_test.cpp
+++ b/test/shared_library_search_symbol_test.cpp
@@ -18,7 +18,7 @@ extern "C" void BOOST_SYMBOL_EXPORT exef() {
 
 int test_main(int argc, char* argv[])
 {
-   using namespace boost::plugin;
+   using namespace boost::dll;
 
    BOOST_CHECK(argc >= 2);
    boost::filesystem::path shared_library_path = shared_lib_path(argv[1], L"test_library");