diff --git a/include/mio/detail/mmap_impl.hpp b/include/mio/detail/basic_mmap.hpp
similarity index 99%
rename from include/mio/detail/mmap_impl.hpp
rename to include/mio/detail/basic_mmap.hpp
index 8fce86c..17acf08 100644
--- a/include/mio/detail/mmap_impl.hpp
+++ b/include/mio/detail/basic_mmap.hpp
@@ -180,6 +180,6 @@ bool operator>=(const basic_mmap<CharT, CharTraits>& a,
 } // namespace detail
 } // namespace mio
 
-#include "mmap_impl.ipp"
+#include "basic_mmap.ipp"
 
 #endif // MIO_BASIC_MMAP_HEADER
diff --git a/include/mio/detail/mmap_impl.ipp b/include/mio/detail/basic_mmap.ipp
similarity index 99%
rename from include/mio/detail/mmap_impl.ipp
rename to include/mio/detail/basic_mmap.ipp
index 35f5c5c..d0656ac 100644
--- a/include/mio/detail/mmap_impl.ipp
+++ b/include/mio/detail/basic_mmap.ipp
@@ -21,8 +21,8 @@
 #ifndef MIO_BASIC_MMAP_IMPL
 #define MIO_BASIC_MMAP_IMPL
 
-#include "mmap_impl.hpp"
-#include "type_traits.hpp"
+#include "basic_mmap.hpp"
+#include "string_util.hpp"
 #include "../page.hpp"
 
 #include <algorithm>
diff --git a/include/mio/detail/type_traits.hpp b/include/mio/detail/string_util.hpp
similarity index 95%
rename from include/mio/detail/type_traits.hpp
rename to include/mio/detail/string_util.hpp
index 6b9fa42..31cae45 100644
--- a/include/mio/detail/type_traits.hpp
+++ b/include/mio/detail/string_util.hpp
@@ -18,8 +18,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef MIO_TYPE_TRAITS_HEADER
-#define MIO_TYPE_TRAITS_HEADER
+#ifndef MIO_STRING_UTIL_HEADER
+#define MIO_STRING_UTIL_HEADER
 
 #include <type_traits>
 
@@ -70,4 +70,4 @@ template<
 } // namespace detail
 } // namespace mio
 
-#endif // MIO_TYPE_TRAITS_HEADER
+#endif // MIO_STRING_UTIL_HEADER
diff --git a/include/mio/mmap.hpp b/include/mio/mmap.hpp
index 7069ce3..5dc6c9c 100644
--- a/include/mio/mmap.hpp
+++ b/include/mio/mmap.hpp
@@ -21,7 +21,7 @@
 #ifndef MIO_MMAP_HEADER
 #define MIO_MMAP_HEADER
 
-#include "detail/mmap_impl.hpp"
+#include "detail/basic_mmap.hpp"
 
 #include <system_error>