diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ebc8c0a2d..67312683d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,7 @@ endif(NOT NESTED_CMAKE_CALL)
 message("OS = ${OS}")
 
 # prefer board implementation module over os implmementation module
-set(config_module "configs/config_${OS}_${BOARD}_${LABEL}")
+set(config_module "configs/${OS}_${BOARD}_${LABEL}")
 set(config_path "${CMAKE_SOURCE_DIR}/cmake/${config_module}.cmake")
 if (EXISTS ${config_path})
 	include(${config_module})
diff --git a/cmake/configs/posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake
index 228b4e50ae..17fcc337ff 100644
--- a/cmake/configs/posix_eagle_default.cmake
+++ b/cmake/configs/posix_eagle_default.cmake
@@ -1,4 +1,4 @@
-include(posix/px4_impl_posix-arm)
+include(posix/px4_impl_posix)
 
 set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
 
diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake
index af3785f5c7..aa87bd6bb6 100644
--- a/cmake/configs/posix_eagle_hil.cmake
+++ b/cmake/configs/posix_eagle_hil.cmake
@@ -1,4 +1,4 @@
-include(posix/px4_impl_posix-arm)
+include(posix/px4_impl_posix)
 
 set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
 
diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake
index cc220cb306..fad14f595f 100644
--- a/cmake/configs/posix_eagle_release.cmake
+++ b/cmake/configs/posix_eagle_release.cmake
@@ -1,4 +1,4 @@
-include(posix/px4_impl_posix-arm)
+include(posix/px4_impl_posix)
 
 set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)