diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c76e2c..710b3a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ INCLUDE(ExternalProject)
 # C++11 support
 OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" ON)
 IF(LIBTINS_ENABLE_CXX11)
-    INCLUDE(CheckCXX11Features)
+    INCLUDE(CheckCXXFeatures)
     # We only use declval and decltype on gcc/clang as VC fails to build that code,
     # at least on VC2013
     IF(HAS_CXX11_RVALUE_REFERENCES AND ((HAS_CXX11_DECLVAL AND HAS_CXX11_DECLTYPE) OR MSVC))
diff --git a/cmake/Modules/CheckCXX11Features.cmake b/cmake/Modules/CheckCXXFeatures.cmake
similarity index 81%
rename from cmake/Modules/CheckCXX11Features.cmake
rename to cmake/Modules/CheckCXXFeatures.cmake
index fceca53..293bb21 100644
--- a/cmake/Modules/CheckCXX11Features.cmake
+++ b/cmake/Modules/CheckCXXFeatures.cmake
@@ -69,11 +69,11 @@ endif ()
 
 function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
     if (NOT DEFINED ${RESULT_VAR})
-        set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/cxx11_${FEATURE_NAME}")
+        set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${FEATURE_NAME}")
 
-        set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/CheckCXX11Features/cxx11-test-${FEATURE_NAME})
+        set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/CheckCXXFeatures/cxx-test-${FEATURE_NAME})
         set(_LOG_NAME "\"${FEATURE_NAME}\"")
-        message(STATUS "Checking C++11 support for ${_LOG_NAME}")
+        message(STATUS "Checking C++ support for ${_LOG_NAME}")
 
         set(_SRCFILE "${_SRCFILE_BASE}.cpp")
         set(_SRCFILE_FAIL "${_SRCFILE_BASE}_fail.cpp")
@@ -117,28 +117,28 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
         endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL_COMPILE})
 
         if (${RESULT_VAR})
-            message(STATUS "Checking C++11 support for ${_LOG_NAME}: works")
+            message(STATUS "Checking C++ support for ${_LOG_NAME}: works")
         else (${RESULT_VAR})
-            message(STATUS "Checking C++11 support for ${_LOG_NAME}: not supported")
+            message(STATUS "Checking C++ support for ${_LOG_NAME}: not supported")
         endif (${RESULT_VAR})
-        set(${RESULT_VAR} ${${RESULT_VAR}} CACHE INTERNAL "C++11 support for ${_LOG_NAME}")
+        set(${RESULT_VAR} ${${RESULT_VAR}} CACHE INTERNAL "C++ support for ${_LOG_NAME}")
     endif (NOT DEFINED ${RESULT_VAR})
 endfunction(cxx11_check_feature)
 
-cxx11_check_feature("__func__" HAS_CXX11_FUNC)
-cxx11_check_feature("auto" HAS_CXX11_AUTO)
-cxx11_check_feature("auto_ret_type" HAS_CXX11_AUTO_RET_TYPE)
-cxx11_check_feature("class_override_final" HAS_CXX11_CLASS_OVERRIDE)
-cxx11_check_feature("constexpr" HAS_CXX11_CONSTEXPR)
-cxx11_check_feature("cstdint" HAS_CXX11_CSTDINT_H)
+#cxx11_check_feature("regex" HAS_CXX11_LIB_REGEX)
+#cxx11_check_feature("__func__" HAS_CXX11_FUNC)
+#cxx11_check_feature("auto" HAS_CXX11_AUTO)
+#cxx11_check_feature("auto_ret_type" HAS_CXX11_AUTO_RET_TYPE)
+#cxx11_check_feature("class_override_final" HAS_CXX11_CLASS_OVERRIDE)
+#cxx11_check_feature("constexpr" HAS_CXX11_CONSTEXPR)
+#cxx11_check_feature("cstdint" HAS_CXX11_CSTDINT_H)
+#cxx11_check_feature("lambda" HAS_CXX11_LAMBDA)
+#cxx11_check_feature("long_long" HAS_CXX11_LONG_LONG)
+#cxx11_check_feature("nullptr" HAS_CXX11_NULLPTR)
+#cxx11_check_feature("sizeof_member" HAS_CXX11_SIZEOF_MEMBER)
+#cxx11_check_feature("static_assert" HAS_CXX11_STATIC_ASSERT)
+#cxx11_check_feature("variadic_templates" HAS_CXX11_VARIADIC_TEMPLATES)
 cxx11_check_feature("decltype" HAS_CXX11_DECLTYPE)
 cxx11_check_feature("declval" HAS_CXX11_DECLVAL)
 cxx11_check_feature("initializer_list" HAS_CXX11_INITIALIZER_LIST)
-cxx11_check_feature("lambda" HAS_CXX11_LAMBDA)
-cxx11_check_feature("long_long" HAS_CXX11_LONG_LONG)
-cxx11_check_feature("nullptr" HAS_CXX11_NULLPTR)
-cxx11_check_feature("regex" HAS_CXX11_LIB_REGEX)
 cxx11_check_feature("rvalue-references" HAS_CXX11_RVALUE_REFERENCES)
-cxx11_check_feature("sizeof_member" HAS_CXX11_SIZEOF_MEMBER)
-cxx11_check_feature("static_assert" HAS_CXX11_STATIC_ASSERT)
-cxx11_check_feature("variadic_templates" HAS_CXX11_VARIADIC_TEMPLATES)
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-__func__.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-__func__.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-__func__.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-__func__.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-auto.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-auto.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-auto.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-auto.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-auto_fail_compile.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-auto_fail_compile.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-auto_fail_compile.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-auto_fail_compile.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-auto_ret_type.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-auto_ret_type.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-auto_ret_type.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-auto_ret_type.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-class_override_final.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-class_override_final.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-class_override_final.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-class_override_final.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-class_override_final_fail_compile.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-class_override_final_fail_compile.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-class_override_final_fail_compile.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-class_override_final_fail_compile.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-constexpr.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-constexpr.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-constexpr.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-constexpr.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-cstdint.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-cstdint.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-cstdint.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-cstdint.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-decltype.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-decltype.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-decltype.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-decltype.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-declval.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-declval.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-declval.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-declval.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-initializer_list.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-initializer_list.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-initializer_list.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-initializer_list.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-lambda.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-lambda.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-lambda.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-lambda.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-long_long.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-long_long.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-long_long.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-long_long.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-nullptr.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-nullptr.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-nullptr.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-nullptr.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-nullptr_fail_compile.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-nullptr_fail_compile.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-nullptr_fail_compile.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-nullptr_fail_compile.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-regex.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-regex.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-regex.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-regex.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-rvalue-references.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-rvalue-references.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-rvalue-references.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-rvalue-references.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-sizeof_member.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-sizeof_member.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-sizeof_member.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-sizeof_member.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-sizeof_member_fail.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-sizeof_member_fail.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-sizeof_member_fail.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-sizeof_member_fail.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-static_assert.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-static_assert.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-static_assert.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-static_assert.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-static_assert_fail_compile.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-static_assert_fail_compile.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-static_assert_fail_compile.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-static_assert_fail_compile.cpp
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-variadic_templates.cpp b/cmake/Modules/CheckCXXFeatures/cxx-test-variadic_templates.cpp
similarity index 100%
rename from cmake/Modules/CheckCXX11Features/cxx11-test-variadic_templates.cpp
rename to cmake/Modules/CheckCXXFeatures/cxx-test-variadic_templates.cpp