diff --git a/docs/code-style.rst b/docs/code-style.rst
index 48984bb..dfad354 100644
--- a/docs/code-style.rst
+++ b/docs/code-style.rst
@@ -748,7 +748,7 @@
 
     .. code-block:: c++
 
-        #include "ndn-cxx/detail/pending-interest.hpp"
+        #include "ndn-cxx/impl/pending-interest.hpp"
         #include "ndn-cxx/util/random.hpp"
 
         #include <cstdlib>
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 4ed7c55..e7a7315 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -836,7 +836,7 @@
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */ndn-cxx/detail/* */ndn-cxx/*/detail/*
+EXCLUDE_PATTERNS       = */ndn-cxx/impl/* */ndn-cxx/*/impl/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/ndn-cxx/face.cpp b/ndn-cxx/face.cpp
index dd98273..c4dc023 100644
--- a/ndn-cxx/face.cpp
+++ b/ndn-cxx/face.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "ndn-cxx/face.hpp"
-#include "ndn-cxx/detail/face-impl.hpp"
 #include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/impl/face-impl.hpp"
 #include "ndn-cxx/net/face-uri.hpp"
 #include "ndn-cxx/security/signing-helpers.hpp"
 #include "ndn-cxx/util/random.hpp"
diff --git a/ndn-cxx/detail/container-with-on-empty-signal.hpp b/ndn-cxx/impl/container-with-on-empty-signal.hpp
similarity index 93%
rename from ndn-cxx/detail/container-with-on-empty-signal.hpp
rename to ndn-cxx/impl/container-with-on-empty-signal.hpp
index 3f2399b..3bb01d6 100644
--- a/ndn-cxx/detail/container-with-on-empty-signal.hpp
+++ b/ndn-cxx/impl/container-with-on-empty-signal.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
-#define NDN_DETAIL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
+#ifndef NDN_IMPL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
+#define NDN_IMPL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
 
 #include "ndn-cxx/common.hpp"
 #include "ndn-cxx/util/signal.hpp"
@@ -105,4 +105,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
+#endif // NDN_IMPL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
diff --git a/ndn-cxx/detail/face-impl.hpp b/ndn-cxx/impl/face-impl.hpp
similarity index 97%
rename from ndn-cxx/detail/face-impl.hpp
rename to ndn-cxx/impl/face-impl.hpp
index 5b97914..b676efb 100644
--- a/ndn-cxx/detail/face-impl.hpp
+++ b/ndn-cxx/impl/face-impl.hpp
@@ -19,14 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_FACE_IMPL_HPP
-#define NDN_DETAIL_FACE_IMPL_HPP
+#ifndef NDN_IMPL_FACE_IMPL_HPP
+#define NDN_IMPL_FACE_IMPL_HPP
 
 #include "ndn-cxx/face.hpp"
-#include "ndn-cxx/detail/container-with-on-empty-signal.hpp"
-#include "ndn-cxx/detail/lp-field-tag.hpp"
-#include "ndn-cxx/detail/pending-interest.hpp"
-#include "ndn-cxx/detail/registered-prefix.hpp"
+#include "ndn-cxx/impl/container-with-on-empty-signal.hpp"
+#include "ndn-cxx/impl/lp-field-tag.hpp"
+#include "ndn-cxx/impl/pending-interest.hpp"
+#include "ndn-cxx/impl/registered-prefix.hpp"
 #include "ndn-cxx/lp/packet.hpp"
 #include "ndn-cxx/lp/tags.hpp"
 #include "ndn-cxx/mgmt/nfd/command-options.hpp"
@@ -430,4 +430,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_FACE_IMPL_HPP
+#endif // NDN_IMPL_FACE_IMPL_HPP
diff --git a/ndn-cxx/detail/interest-filter-record.hpp b/ndn-cxx/impl/interest-filter-record.hpp
similarity index 93%
rename from ndn-cxx/detail/interest-filter-record.hpp
rename to ndn-cxx/impl/interest-filter-record.hpp
index e84624e..a8c7a81 100644
--- a/ndn-cxx/detail/interest-filter-record.hpp
+++ b/ndn-cxx/impl/interest-filter-record.hpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_INTEREST_FILTER_RECORD_HPP
-#define NDN_DETAIL_INTEREST_FILTER_RECORD_HPP
+#ifndef NDN_IMPL_INTEREST_FILTER_RECORD_HPP
+#define NDN_IMPL_INTEREST_FILTER_RECORD_HPP
 
-#include "ndn-cxx/detail/pending-interest.hpp"
+#include "ndn-cxx/impl/pending-interest.hpp"
 
 namespace ndn {
 
@@ -111,4 +111,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_INTEREST_FILTER_RECORD_HPP
+#endif // NDN_IMPL_INTEREST_FILTER_RECORD_HPP
diff --git a/ndn-cxx/detail/lp-field-tag.hpp b/ndn-cxx/impl/lp-field-tag.hpp
similarity index 93%
rename from ndn-cxx/detail/lp-field-tag.hpp
rename to ndn-cxx/impl/lp-field-tag.hpp
index d6a1146..b30e51a 100644
--- a/ndn-cxx/detail/lp-field-tag.hpp
+++ b/ndn-cxx/impl/lp-field-tag.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_LP_FIELD_TAG_HPP
-#define NDN_DETAIL_LP_FIELD_TAG_HPP
+#ifndef NDN_IMPL_LP_FIELD_TAG_HPP
+#define NDN_IMPL_LP_FIELD_TAG_HPP
 
 #include "ndn-cxx/lp/packet.hpp"
 #include "ndn-cxx/lp/tags.hpp"
@@ -48,4 +48,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_LP_FIELD_TAG_HPP
+#endif // NDN_IMPL_LP_FIELD_TAG_HPP
diff --git a/ndn-cxx/detail/name-component-types.hpp b/ndn-cxx/impl/name-component-types.hpp
similarity index 98%
rename from ndn-cxx/detail/name-component-types.hpp
rename to ndn-cxx/impl/name-component-types.hpp
index a84ebdd..aaa3606 100644
--- a/ndn-cxx/detail/name-component-types.hpp
+++ b/ndn-cxx/impl/name-component-types.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_NAME_COMPONENT_TYPES_HPP
-#define NDN_DETAIL_NAME_COMPONENT_TYPES_HPP
+#ifndef NDN_IMPL_NAME_COMPONENT_TYPES_HPP
+#define NDN_IMPL_NAME_COMPONENT_TYPES_HPP
 
 #include "ndn-cxx/name-component.hpp"
 #include "ndn-cxx/util/sha256.hpp"
@@ -344,4 +344,4 @@
 } // namespace name
 } // namespace ndn
 
-#endif // NDN_DETAIL_NAME_COMPONENT_TYPES_HPP
+#endif // NDN_IMPL_NAME_COMPONENT_TYPES_HPP
diff --git a/ndn-cxx/detail/pending-interest.hpp b/ndn-cxx/impl/pending-interest.hpp
similarity index 97%
rename from ndn-cxx/detail/pending-interest.hpp
rename to ndn-cxx/impl/pending-interest.hpp
index 7abd390..4bed422 100644
--- a/ndn-cxx/detail/pending-interest.hpp
+++ b/ndn-cxx/impl/pending-interest.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_PENDING_INTEREST_HPP
-#define NDN_DETAIL_PENDING_INTEREST_HPP
+#ifndef NDN_IMPL_PENDING_INTEREST_HPP
+#define NDN_IMPL_PENDING_INTEREST_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/face.hpp"
@@ -241,4 +241,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_PENDING_INTEREST_HPP
+#endif // NDN_IMPL_PENDING_INTEREST_HPP
diff --git a/ndn-cxx/detail/registered-prefix.hpp b/ndn-cxx/impl/registered-prefix.hpp
similarity index 92%
rename from ndn-cxx/detail/registered-prefix.hpp
rename to ndn-cxx/impl/registered-prefix.hpp
index 2d664d4..dce512b 100644
--- a/ndn-cxx/detail/registered-prefix.hpp
+++ b/ndn-cxx/impl/registered-prefix.hpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_REGISTERED_PREFIX_HPP
-#define NDN_DETAIL_REGISTERED_PREFIX_HPP
+#ifndef NDN_IMPL_REGISTERED_PREFIX_HPP
+#define NDN_IMPL_REGISTERED_PREFIX_HPP
 
 #include "ndn-cxx/interest.hpp"
-#include "ndn-cxx/detail/interest-filter-record.hpp"
+#include "ndn-cxx/impl/interest-filter-record.hpp"
 #include "ndn-cxx/mgmt/nfd/command-options.hpp"
 #include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
 
@@ -97,4 +97,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_REGISTERED_PREFIX_HPP
+#endif // NDN_IMPL_REGISTERED_PREFIX_HPP
diff --git a/ndn-cxx/name-component.cpp b/ndn-cxx/name-component.cpp
index f87aa16..cbfe05d 100644
--- a/ndn-cxx/name-component.cpp
+++ b/ndn-cxx/name-component.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "ndn-cxx/name-component.hpp"
-#include "ndn-cxx/detail/name-component-types.hpp"
+#include "ndn-cxx/impl/name-component-types.hpp"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/ndn-cxx/net/detail/link-type-helper-osx.mm b/ndn-cxx/net/impl/link-type-helper-osx.mm
similarity index 97%
rename from ndn-cxx/net/detail/link-type-helper-osx.mm
rename to ndn-cxx/net/impl/link-type-helper-osx.mm
index 9798696..048a780 100644
--- a/ndn-cxx/net/detail/link-type-helper-osx.mm
+++ b/ndn-cxx/net/impl/link-type-helper-osx.mm
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/net/impl/link-type-helper.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be compiled ..."
diff --git a/ndn-cxx/net/detail/link-type-helper.cpp b/ndn-cxx/net/impl/link-type-helper.cpp
similarity index 96%
rename from ndn-cxx/net/detail/link-type-helper.cpp
rename to ndn-cxx/net/impl/link-type-helper.cpp
index b251d57..6deb5fd 100644
--- a/ndn-cxx/net/detail/link-type-helper.cpp
+++ b/ndn-cxx/net/impl/link-type-helper.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/net/impl/link-type-helper.hpp"
 #include "ndn-cxx/config.hpp"
 
 #ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
diff --git a/ndn-cxx/net/detail/link-type-helper.hpp b/ndn-cxx/net/impl/link-type-helper.hpp
similarity index 90%
rename from ndn-cxx/net/detail/link-type-helper.hpp
rename to ndn-cxx/net/impl/link-type-helper.hpp
index 61f86d8..a1549f6 100644
--- a/ndn-cxx/net/detail/link-type-helper.hpp
+++ b/ndn-cxx/net/impl/link-type-helper.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_DETAIL_LINK_TYPE_HELPER_HPP
-#define NDN_NET_DETAIL_LINK_TYPE_HELPER_HPP
+#ifndef NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
+#define NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
 
 #include "ndn-cxx/encoding/nfd-constants.hpp"
 
@@ -38,4 +38,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_DETAIL_LINK_TYPE_HELPER_HPP
+#endif // NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
diff --git a/ndn-cxx/net/detail/linux-if-constants.cpp b/ndn-cxx/net/impl/linux-if-constants.cpp
similarity index 96%
rename from ndn-cxx/net/detail/linux-if-constants.cpp
rename to ndn-cxx/net/impl/linux-if-constants.cpp
index 7420ecc..68bb9db 100644
--- a/ndn-cxx/net/detail/linux-if-constants.cpp
+++ b/ndn-cxx/net/impl/linux-if-constants.cpp
@@ -23,7 +23,7 @@
 
 #ifdef __linux__
 
-#include "ndn-cxx/net/detail/linux-if-constants.hpp"
+#include "ndn-cxx/net/impl/linux-if-constants.hpp"
 
 #include <sys/socket.h>
 #include <linux/if.h>
diff --git a/ndn-cxx/net/detail/linux-if-constants.hpp b/ndn-cxx/net/impl/linux-if-constants.hpp
similarity index 100%
rename from ndn-cxx/net/detail/linux-if-constants.hpp
rename to ndn-cxx/net/impl/linux-if-constants.hpp
diff --git a/ndn-cxx/net/detail/netlink-message.hpp b/ndn-cxx/net/impl/netlink-message.hpp
similarity index 100%
rename from ndn-cxx/net/detail/netlink-message.hpp
rename to ndn-cxx/net/impl/netlink-message.hpp
diff --git a/ndn-cxx/net/detail/netlink-socket.cpp b/ndn-cxx/net/impl/netlink-socket.cpp
similarity index 99%
rename from ndn-cxx/net/detail/netlink-socket.cpp
rename to ndn-cxx/net/impl/netlink-socket.cpp
index 6589d0d..9f9d4ef 100644
--- a/ndn-cxx/net/detail/netlink-socket.cpp
+++ b/ndn-cxx/net/impl/netlink-socket.cpp
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "ndn-cxx/net/detail/netlink-socket.hpp"
-#include "ndn-cxx/net/detail/netlink-message.hpp"
+#include "ndn-cxx/net/impl/netlink-socket.hpp"
+#include "ndn-cxx/net/impl/netlink-message.hpp"
 #include "ndn-cxx/util/logger.hpp"
 #include "ndn-cxx/util/time.hpp"
 
diff --git a/ndn-cxx/net/detail/netlink-socket.hpp b/ndn-cxx/net/impl/netlink-socket.hpp
similarity index 100%
rename from ndn-cxx/net/detail/netlink-socket.hpp
rename to ndn-cxx/net/impl/netlink-socket.hpp
diff --git a/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp b/ndn-cxx/net/impl/network-monitor-impl-netlink.cpp
similarity index 98%
rename from ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
rename to ndn-cxx/net/impl/network-monitor-impl-netlink.cpp
index 17759b9..ccd555a 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-netlink.cpp
@@ -21,9 +21,9 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "ndn-cxx/net/detail/network-monitor-impl-netlink.hpp"
-#include "ndn-cxx/net/detail/linux-if-constants.hpp"
-#include "ndn-cxx/net/detail/netlink-message.hpp"
+#include "ndn-cxx/net/impl/network-monitor-impl-netlink.hpp"
+#include "ndn-cxx/net/impl/linux-if-constants.hpp"
+#include "ndn-cxx/net/impl/netlink-message.hpp"
 #include "ndn-cxx/net/network-address.hpp"
 #include "ndn-cxx/net/network-interface.hpp"
 #include "ndn-cxx/util/logger.hpp"
diff --git a/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp b/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
similarity index 98%
rename from ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
rename to ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
index 9416370..193e4f6 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
@@ -31,7 +31,7 @@
 #error "This file should not be included ..."
 #endif
 
-#include "ndn-cxx/net/detail/netlink-socket.hpp"
+#include "ndn-cxx/net/impl/netlink-socket.hpp"
 
 #include <map>
 
diff --git a/ndn-cxx/net/detail/network-monitor-impl-noop.hpp b/ndn-cxx/net/impl/network-monitor-impl-noop.hpp
similarity index 100%
rename from ndn-cxx/net/detail/network-monitor-impl-noop.hpp
rename to ndn-cxx/net/impl/network-monitor-impl-noop.hpp
diff --git a/ndn-cxx/net/detail/network-monitor-impl-osx.cpp b/ndn-cxx/net/impl/network-monitor-impl-osx.cpp
similarity index 99%
rename from ndn-cxx/net/detail/network-monitor-impl-osx.cpp
rename to ndn-cxx/net/impl/network-monitor-impl-osx.cpp
index d637b39..13d28d8 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-osx.cpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-osx.cpp
@@ -50,7 +50,7 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ndn-cxx/net/detail/network-monitor-impl-osx.hpp"
+#include "ndn-cxx/net/impl/network-monitor-impl-osx.hpp"
 #include "ndn-cxx/net/network-address.hpp"
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/util/cf-string-osx.hpp"
diff --git a/ndn-cxx/net/detail/network-monitor-impl-osx.hpp b/ndn-cxx/net/impl/network-monitor-impl-osx.hpp
similarity index 100%
rename from ndn-cxx/net/detail/network-monitor-impl-osx.hpp
rename to ndn-cxx/net/impl/network-monitor-impl-osx.hpp
diff --git a/ndn-cxx/net/network-interface.cpp b/ndn-cxx/net/network-interface.cpp
index 84d783b..d7a5e7f 100644
--- a/ndn-cxx/net/network-interface.cpp
+++ b/ndn-cxx/net/network-interface.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "ndn-cxx/net/network-interface.hpp"
-#include "ndn-cxx/net/detail/linux-if-constants.hpp"
+#include "ndn-cxx/net/impl/linux-if-constants.hpp"
 #include "ndn-cxx/util/logger.hpp"
 #include "ndn-cxx/util/string-helper.hpp"
 
diff --git a/ndn-cxx/net/network-monitor.cpp b/ndn-cxx/net/network-monitor.cpp
index b1c1bd7..78ddb7e 100644
--- a/ndn-cxx/net/network-monitor.cpp
+++ b/ndn-cxx/net/network-monitor.cpp
@@ -26,12 +26,12 @@
 #include "ndn-cxx/util/logger.hpp"
 
 #include "ndn-cxx/config.hpp"
-#include "ndn-cxx/net/detail/network-monitor-impl-noop.hpp"
+#include "ndn-cxx/net/impl/network-monitor-impl-noop.hpp"
 #if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS)
-#include "ndn-cxx/net/detail/network-monitor-impl-osx.hpp"
+#include "ndn-cxx/net/impl/network-monitor-impl-osx.hpp"
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplOsx
 #elif defined(NDN_CXX_HAVE_NETLINK)
-#include "ndn-cxx/net/detail/network-monitor-impl-netlink.hpp"
+#include "ndn-cxx/net/impl/network-monitor-impl-netlink.hpp"
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplNetlink
 #else
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplNoop
diff --git a/ndn-cxx/security/detail/openssl-helper.cpp b/ndn-cxx/security/impl/openssl-helper.cpp
similarity index 98%
rename from ndn-cxx/security/detail/openssl-helper.cpp
rename to ndn-cxx/security/impl/openssl-helper.cpp
index 1a9a01d..da4df1e 100644
--- a/ndn-cxx/security/detail/openssl-helper.cpp
+++ b/ndn-cxx/security/impl/openssl-helper.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/detail/openssl-helper.hpp b/ndn-cxx/security/impl/openssl-helper.hpp
similarity index 91%
rename from ndn-cxx/security/detail/openssl-helper.hpp
rename to ndn-cxx/security/impl/openssl-helper.hpp
index 6d3eff7..6c7668b 100644
--- a/ndn-cxx/security/detail/openssl-helper.hpp
+++ b/ndn-cxx/security/impl/openssl-helper.hpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_CXX_SECURITY_DETAIL_OPENSSL_HELPER_HPP
-#define NDN_CXX_SECURITY_DETAIL_OPENSSL_HELPER_HPP
+#ifndef NDN_CXX_SECURITY_IMPL_OPENSSL_HELPER_HPP
+#define NDN_CXX_SECURITY_IMPL_OPENSSL_HELPER_HPP
 
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 #include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
@@ -104,4 +104,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_CXX_SECURITY_DETAIL_OPENSSL_HELPER_HPP
+#endif // NDN_CXX_SECURITY_IMPL_OPENSSL_HELPER_HPP
diff --git a/ndn-cxx/security/detail/openssl.hpp b/ndn-cxx/security/impl/openssl.hpp
similarity index 92%
rename from ndn-cxx/security/detail/openssl.hpp
rename to ndn-cxx/security/impl/openssl.hpp
index 252d370..58dd1df 100644
--- a/ndn-cxx/security/detail/openssl.hpp
+++ b/ndn-cxx/security/impl/openssl.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_DETAIL_OPENSSL_HPP
-#define NDN_SECURITY_DETAIL_OPENSSL_HPP
+#ifndef NDN_SECURITY_IMPL_OPENSSL_HPP
+#define NDN_SECURITY_IMPL_OPENSSL_HPP
 
 // suppress deprecation warnings on macOS >= 10.7
 #if defined(__APPLE__) && defined(__clang__)
@@ -42,4 +42,4 @@
 #pragma clang diagnostic pop
 #endif
 
-#endif // NDN_SECURITY_DETAIL_OPENSSL_HPP
+#endif // NDN_SECURITY_IMPL_OPENSSL_HPP
diff --git a/ndn-cxx/security/pib/identity-container.cpp b/ndn-cxx/security/pib/identity-container.cpp
index dafa9a0..3353ab9 100644
--- a/ndn-cxx/security/pib/identity-container.cpp
+++ b/ndn-cxx/security/pib/identity-container.cpp
@@ -21,7 +21,7 @@
 
 #include "ndn-cxx/security/pib/identity-container.hpp"
 #include "ndn-cxx/security/pib/pib-impl.hpp"
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 #include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
diff --git a/ndn-cxx/security/pib/identity.cpp b/ndn-cxx/security/pib/identity.cpp
index 131701a..54a5f12 100644
--- a/ndn-cxx/security/pib/identity.cpp
+++ b/ndn-cxx/security/pib/identity.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/pib/identity.hpp"
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/detail/identity-impl.cpp b/ndn-cxx/security/pib/impl/identity-impl.cpp
similarity index 97%
rename from ndn-cxx/security/pib/detail/identity-impl.cpp
rename to ndn-cxx/security/pib/impl/identity-impl.cpp
index 3e27f69..e9267ac 100644
--- a/ndn-cxx/security/pib/detail/identity-impl.cpp
+++ b/ndn-cxx/security/pib/impl/identity-impl.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 #include "ndn-cxx/security/pib/pib-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 
diff --git a/ndn-cxx/security/pib/detail/identity-impl.hpp b/ndn-cxx/security/pib/impl/identity-impl.hpp
similarity index 96%
rename from ndn-cxx/security/pib/detail/identity-impl.hpp
rename to ndn-cxx/security/pib/impl/identity-impl.hpp
index 57f3676..b78ec58 100644
--- a/ndn-cxx/security/pib/detail/identity-impl.hpp
+++ b/ndn-cxx/security/pib/impl/identity-impl.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_DETAIL_IDENTITY_IMPL_HPP
-#define NDN_SECURITY_PIB_DETAIL_IDENTITY_IMPL_HPP
+#ifndef NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
+#define NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
 
 #include "ndn-cxx/security/pib/key-container.hpp"
 
@@ -136,4 +136,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_DETAIL_IDENTITY_IMPL_HPP
+#endif // NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
diff --git a/ndn-cxx/security/pib/detail/key-impl.cpp b/ndn-cxx/security/pib/impl/key-impl.cpp
similarity index 98%
rename from ndn-cxx/security/pib/detail/key-impl.cpp
rename to ndn-cxx/security/pib/impl/key-impl.cpp
index bbdfcaa..c2c8c32 100644
--- a/ndn-cxx/security/pib/detail/key-impl.cpp
+++ b/ndn-cxx/security/pib/impl/key-impl.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 #include "ndn-cxx/security/pib/pib-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/transform/public-key.hpp"
diff --git a/ndn-cxx/security/pib/detail/key-impl.hpp b/ndn-cxx/security/pib/impl/key-impl.hpp
similarity index 97%
rename from ndn-cxx/security/pib/detail/key-impl.hpp
rename to ndn-cxx/security/pib/impl/key-impl.hpp
index 619ff01..4448ec4 100644
--- a/ndn-cxx/security/pib/detail/key-impl.hpp
+++ b/ndn-cxx/security/pib/impl/key-impl.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_DETAIL_KEY_IMPL_HPP
-#define NDN_SECURITY_PIB_DETAIL_KEY_IMPL_HPP
+#ifndef NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
+#define NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
 
 #include "ndn-cxx/security/security-common.hpp"
 #include "ndn-cxx/security/pib/certificate-container.hpp"
@@ -184,4 +184,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_DETAIL_KEY_IMPL_HPP
+#endif // NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
diff --git a/ndn-cxx/security/pib/key-container.cpp b/ndn-cxx/security/pib/key-container.cpp
index 043ec8a..d28b8d2 100644
--- a/ndn-cxx/security/pib/key-container.cpp
+++ b/ndn-cxx/security/pib/key-container.cpp
@@ -21,7 +21,7 @@
 
 #include "ndn-cxx/security/pib/key-container.hpp"
 #include "ndn-cxx/security/pib/pib-impl.hpp"
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 #include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
diff --git a/ndn-cxx/security/pib/key.cpp b/ndn-cxx/security/pib/key.cpp
index 055fb1a..1b21aee 100644
--- a/ndn-cxx/security/pib/key.cpp
+++ b/ndn-cxx/security/pib/key.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/pib/key.hpp"
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 #include "ndn-cxx/security/v2/certificate.hpp"
 
 namespace ndn {
diff --git a/ndn-cxx/security/transform/base64-decode.cpp b/ndn-cxx/security/transform/base64-decode.cpp
index 784621b..7e47519 100644
--- a/ndn-cxx/security/transform/base64-decode.cpp
+++ b/ndn-cxx/security/transform/base64-decode.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/transform/base64-decode.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/base64-encode.cpp b/ndn-cxx/security/transform/base64-encode.cpp
index 9ff6600..0400de2 100644
--- a/ndn-cxx/security/transform/base64-encode.cpp
+++ b/ndn-cxx/security/transform/base64-encode.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/transform/base64-encode.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/block-cipher.cpp b/ndn-cxx/security/transform/block-cipher.cpp
index cf3f66f..a9bee3a 100644
--- a/ndn-cxx/security/transform/block-cipher.cpp
+++ b/ndn-cxx/security/transform/block-cipher.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/transform/block-cipher.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/digest-filter.cpp b/ndn-cxx/security/transform/digest-filter.cpp
index 63b1901..b0066b2 100644
--- a/ndn-cxx/security/transform/digest-filter.cpp
+++ b/ndn-cxx/security/transform/digest-filter.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/transform/digest-filter.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/hmac-filter.cpp b/ndn-cxx/security/transform/hmac-filter.cpp
index d81ab11..4ab4a97 100644
--- a/ndn-cxx/security/transform/hmac-filter.cpp
+++ b/ndn-cxx/security/transform/hmac-filter.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/security/transform/hmac-filter.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/private-key.cpp b/ndn-cxx/security/transform/private-key.cpp
index 06faaea..98358b8 100644
--- a/ndn-cxx/security/transform/private-key.cpp
+++ b/ndn-cxx/security/transform/private-key.cpp
@@ -25,7 +25,7 @@
 #include "ndn-cxx/security/transform/buffer-source.hpp"
 #include "ndn-cxx/security/transform/stream-sink.hpp"
 #include "ndn-cxx/security/transform/stream-source.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 #include "ndn-cxx/security/key-params.hpp"
 #include "ndn-cxx/encoding/buffer-stream.hpp"
 
diff --git a/ndn-cxx/security/transform/public-key.cpp b/ndn-cxx/security/transform/public-key.cpp
index 6ed5293..d6f8b20 100644
--- a/ndn-cxx/security/transform/public-key.cpp
+++ b/ndn-cxx/security/transform/public-key.cpp
@@ -25,7 +25,7 @@
 #include "ndn-cxx/security/transform/buffer-source.hpp"
 #include "ndn-cxx/security/transform/stream-sink.hpp"
 #include "ndn-cxx/security/transform/stream-source.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 #include "ndn-cxx/encoding/buffer-stream.hpp"
 
 #define ENSURE_PUBLIC_KEY_LOADED(key) \
diff --git a/ndn-cxx/security/transform/signer-filter.cpp b/ndn-cxx/security/transform/signer-filter.cpp
index 1e03754..b6ae6dd 100644
--- a/ndn-cxx/security/transform/signer-filter.cpp
+++ b/ndn-cxx/security/transform/signer-filter.cpp
@@ -21,7 +21,7 @@
 
 #include "ndn-cxx/security/transform/signer-filter.hpp"
 #include "ndn-cxx/security/transform/private-key.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/verifier-filter.cpp b/ndn-cxx/security/transform/verifier-filter.cpp
index 6ab96a8..51eb4b4 100644
--- a/ndn-cxx/security/transform/verifier-filter.cpp
+++ b/ndn-cxx/security/transform/verifier-filter.cpp
@@ -21,7 +21,7 @@
 
 #include "ndn-cxx/security/transform/verifier-filter.hpp"
 #include "ndn-cxx/security/transform/public-key.hpp"
-#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/impl/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/verification-helpers.cpp b/ndn-cxx/security/verification-helpers.cpp
index bdd5a9c..7b1d469 100644
--- a/ndn-cxx/security/verification-helpers.cpp
+++ b/ndn-cxx/security/verification-helpers.cpp
@@ -24,7 +24,7 @@
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
 #include "ndn-cxx/encoding/buffer-stream.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 #include "ndn-cxx/security/pib/key.hpp"
 #include "ndn-cxx/security/transform/bool-sink.hpp"
 #include "ndn-cxx/security/transform/buffer-source.hpp"
diff --git a/ndn-cxx/util/dummy-client-face.cpp b/ndn-cxx/util/dummy-client-face.cpp
index 4451bc6..6629757 100644
--- a/ndn-cxx/util/dummy-client-face.cpp
+++ b/ndn-cxx/util/dummy-client-face.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/dummy-client-face.hpp"
-#include "ndn-cxx/detail/lp-field-tag.hpp"
+#include "ndn-cxx/impl/lp-field-tag.hpp"
 #include "ndn-cxx/lp/packet.hpp"
 #include "ndn-cxx/lp/tags.hpp"
 #include "ndn-cxx/mgmt/nfd/controller.hpp"
diff --git a/ndn-cxx/util/detail/steady-timer.hpp b/ndn-cxx/util/impl/steady-timer.hpp
similarity index 93%
rename from ndn-cxx/util/detail/steady-timer.hpp
rename to ndn-cxx/util/impl/steady-timer.hpp
index 1f7d958..b7a35b3 100644
--- a/ndn-cxx/util/detail/steady-timer.hpp
+++ b/ndn-cxx/util/impl/steady-timer.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_DETAIL_STEADY_TIMER_HPP
-#define NDN_UTIL_DETAIL_STEADY_TIMER_HPP
+#ifndef NDN_UTIL_IMPL_STEADY_TIMER_HPP
+#define NDN_UTIL_IMPL_STEADY_TIMER_HPP
 
 #include "ndn-cxx/util/time.hpp"
 
@@ -57,4 +57,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_DETAIL_STEADY_TIMER_HPP
+#endif // NDN_UTIL_IMPL_STEADY_TIMER_HPP
diff --git a/ndn-cxx/util/random.cpp b/ndn-cxx/util/random.cpp
index c40347a..5358e23 100644
--- a/ndn-cxx/util/random.cpp
+++ b/ndn-cxx/util/random.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/random.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 #include <random>
 
diff --git a/ndn-cxx/util/scheduler.cpp b/ndn-cxx/util/scheduler.cpp
index 9b94566..0cbb311 100644
--- a/ndn-cxx/util/scheduler.cpp
+++ b/ndn-cxx/util/scheduler.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/scheduler.hpp"
-#include "ndn-cxx/util/detail/steady-timer.hpp"
+#include "ndn-cxx/util/impl/steady-timer.hpp"
 
 #include <boost/scope_exit.hpp>
 
diff --git a/ndn-cxx/util/sha256.cpp b/ndn-cxx/util/sha256.cpp
index bf4b448..6580114 100644
--- a/ndn-cxx/util/sha256.cpp
+++ b/ndn-cxx/util/sha256.cpp
@@ -21,7 +21,7 @@
 
 #include "ndn-cxx/util/sha256.hpp"
 #include "ndn-cxx/util/string-helper.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 #include "ndn-cxx/security/transform/digest-filter.hpp"
 #include "ndn-cxx/security/transform/stream-sink.hpp"
 #include "ndn-cxx/security/transform/stream-source.hpp"
diff --git a/ndn-cxx/util/time-unit-test-clock.cpp b/ndn-cxx/util/time-unit-test-clock.cpp
index 526e7ef..dd08f9f 100644
--- a/ndn-cxx/util/time-unit-test-clock.cpp
+++ b/ndn-cxx/util/time-unit-test-clock.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/time-unit-test-clock.hpp"
-#include "ndn-cxx/util/detail/steady-timer.hpp"
+#include "ndn-cxx/util/impl/steady-timer.hpp"
 
 #include <chrono>
 #include <thread>
diff --git a/tests/integrated/network-monitor.cpp b/tests/integrated/network-monitor.cpp
index 4c4467b..57cea97 100644
--- a/tests/integrated/network-monitor.cpp
+++ b/tests/integrated/network-monitor.cpp
@@ -26,7 +26,7 @@
 
 #include "ndn-cxx/net/network-address.hpp"
 #include "ndn-cxx/net/network-interface.hpp"
-#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/net/impl/link-type-helper.hpp"
 #include "ndn-cxx/util/string-helper.hpp"
 #include "ndn-cxx/util/time.hpp"
 
diff --git a/tests/unit/security/pib/identity.t.cpp b/tests/unit/security/pib/identity.t.cpp
index 5e2f28a..5769fde 100644
--- a/tests/unit/security/pib/identity.t.cpp
+++ b/tests/unit/security/pib/identity.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/pib/identity.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 
 #include "tests/boost-test.hpp"
 #include "tests/unit/security/pib/pib-data-fixture.hpp"
diff --git a/tests/unit/security/pib/detail/identity-impl.t.cpp b/tests/unit/security/pib/impl/identity-impl.t.cpp
similarity index 98%
rename from tests/unit/security/pib/detail/identity-impl.t.cpp
rename to tests/unit/security/pib/impl/identity-impl.t.cpp
index e3243e3..40bf424 100644
--- a/tests/unit/security/pib/detail/identity-impl.t.cpp
+++ b/tests/unit/security/pib/impl/identity-impl.t.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
 
diff --git a/tests/unit/security/pib/detail/key-impl.t.cpp b/tests/unit/security/pib/impl/key-impl.t.cpp
similarity index 99%
rename from tests/unit/security/pib/detail/key-impl.t.cpp
rename to tests/unit/security/pib/impl/key-impl.t.cpp
index ea9499c..e6860be 100644
--- a/tests/unit/security/pib/detail/key-impl.t.cpp
+++ b/tests/unit/security/pib/impl/key-impl.t.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
 
diff --git a/tests/unit/security/pib/key.t.cpp b/tests/unit/security/pib/key.t.cpp
index 86f7dfa..8dfe9c8 100644
--- a/tests/unit/security/pib/key.t.cpp
+++ b/tests/unit/security/pib/key.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/pib/key.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 
 #include "tests/boost-test.hpp"
 #include "tests/unit/security/pib/pib-data-fixture.hpp"
diff --git a/tests/unit/security/transform/digest-filter.t.cpp b/tests/unit/security/transform/digest-filter.t.cpp
index 67ccc4c..984611d 100644
--- a/tests/unit/security/transform/digest-filter.t.cpp
+++ b/tests/unit/security/transform/digest-filter.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/transform/digest-filter.hpp"
 
 #include "ndn-cxx/encoding/buffer-stream.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 #include "ndn-cxx/security/transform/buffer-source.hpp"
 #include "ndn-cxx/security/transform/step-source.hpp"
 #include "ndn-cxx/security/transform/stream-sink.hpp"
diff --git a/tests/unit/util/random.t.cpp b/tests/unit/util/random.t.cpp
index ee55f9e..9cf7325 100644
--- a/tests/unit/util/random.t.cpp
+++ b/tests/unit/util/random.t.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/random.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 #include "tests/boost-test.hpp"
 
diff --git a/tools/ndnsec/util.cpp b/tools/ndnsec/util.cpp
index f5069e7..5e5c341 100644
--- a/tools/ndnsec/util.cpp
+++ b/tools/ndnsec/util.cpp
@@ -21,7 +21,7 @@
 
 #include "util.hpp"
 
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 namespace ndn {
 namespace ndnsec {
diff --git a/wscript b/wscript
index 5f62e82..f5ec910 100644
--- a/wscript
+++ b/wscript
@@ -253,16 +253,16 @@
                                 excl=['ndn-cxx/**/*-osx.hpp',
                                       'ndn-cxx/**/*netlink*.hpp',
                                       'ndn-cxx/**/*-sqlite3.hpp',
-                                      'ndn-cxx/**/detail/**/*'])
+                                      'ndn-cxx/**/impl/**/*'])
 
     if bld.env['HAVE_OSX_FRAMEWORKS']:
-        headers += bld.path.ant_glob('ndn-cxx/**/*-osx.hpp', excl='ndn-cxx/**/detail/**/*')
+        headers += bld.path.ant_glob('ndn-cxx/**/*-osx.hpp', excl='ndn-cxx/**/impl/**/*')
 
     if bld.env['HAVE_NETLINK']:
-        headers += bld.path.ant_glob('ndn-cxx/**/*netlink*.hpp', excl='ndn-cxx/**/detail/**/*')
+        headers += bld.path.ant_glob('ndn-cxx/**/*netlink*.hpp', excl='ndn-cxx/**/impl/**/*')
 
     # In case we want to make it optional later
-    headers += bld.path.ant_glob('ndn-cxx/**/*-sqlite3.hpp', excl='ndn-cxx/**/detail/**/*')
+    headers += bld.path.ant_glob('ndn-cxx/**/*-sqlite3.hpp', excl='ndn-cxx/**/impl/**/*')
 
     bld.install_files(bld.env['INCLUDEDIR'], headers, relative_trick=True)