diff --git a/Build/.keep b/Build/.keep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cmake/configs/config_nuttx_sim_simple.cmake b/cmake/configs/config_nuttx_sim_simple.cmake
index 0440bfed14c..a44f8e9597e 100644
--- a/cmake/configs/config_nuttx_sim_simple.cmake
+++ b/cmake/configs/config_nuttx_sim_simple.cmake
@@ -2,7 +2,7 @@ include(nuttx/px4_impl_nuttx)
 
 message(WARNING "this is a work in progress and doesn't build yet")
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		platforms/nuttx
diff --git a/cmake/configs/config_posix_eagle_default.mk b/cmake/configs/config_posix_eagle_default.cmake
similarity index 93%
rename from cmake/configs/config_posix_eagle_default.mk
rename to cmake/configs/config_posix_eagle_default.cmake
index 589c44a05e1..77b6716e88d 100644
--- a/cmake/configs/config_posix_eagle_default.mk
+++ b/cmake/configs/config_posix_eagle_default.cmake
@@ -1,6 +1,6 @@
 include(posix/px4_impl_posix-arm)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_posix_eagle_hil.cmake b/cmake/configs/config_posix_eagle_hil.cmake
index ebe148ab37d..fb1c82ddbe0 100644
--- a/cmake/configs/config_posix_eagle_hil.cmake
+++ b/cmake/configs/config_posix_eagle_hil.cmake
@@ -1,6 +1,6 @@
 include(posix/px4_impl_posix-arm)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_posix_eagle_muorb.cmake b/cmake/configs/config_posix_eagle_muorb.cmake
index 70235928ec9..b8e75586beb 100644
--- a/cmake/configs/config_posix_eagle_muorb.cmake
+++ b/cmake/configs/config_posix_eagle_muorb.cmake
@@ -1,6 +1,6 @@
 include(posix/px4_impl_posix-arm)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_posix_eagle_release.cmake b/cmake/configs/config_posix_eagle_release.cmake
index 745fa36826d..9b7b315727e 100644
--- a/cmake/configs/config_posix_eagle_release.cmake
+++ b/cmake/configs/config_posix_eagle_release.cmake
@@ -1,6 +1,6 @@
 include(posix/px4_impl_posix-arm)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_qurt_eagle_hello.cmake b/cmake/configs/config_qurt_eagle_hello.cmake
index 6da3d115744..38028ff57eb 100644
--- a/cmake/configs/config_qurt_eagle_hello.cmake
+++ b/cmake/configs/config_qurt_eagle_hello.cmake
@@ -1,6 +1,6 @@
 include(qurt/px4_impl_qurt)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_qurt_eagle_hil.cmake b/cmake/configs/config_qurt_eagle_hil.cmake
index 5e7e7fc16c2..857ad6b5703 100644
--- a/cmake/configs/config_qurt_eagle_hil.cmake
+++ b/cmake/configs/config_qurt_eagle_hil.cmake
@@ -1,6 +1,6 @@
 include(qurt/px4_impl_qurt)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_qurt_eagle_muorb.cmake b/cmake/configs/config_qurt_eagle_muorb.cmake
index 5cf884baf19..38618dc2bd2 100644
--- a/cmake/configs/config_qurt_eagle_muorb.cmake
+++ b/cmake/configs/config_qurt_eagle_muorb.cmake
@@ -1,6 +1,6 @@
 include(qurt/px4_impl_qurt)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_qurt_eagle_release.cmake b/cmake/configs/config_qurt_eagle_release.cmake
index 3bf19fb16ff..5cbd611cdfe 100644
--- a/cmake/configs/config_qurt_eagle_release.cmake
+++ b/cmake/configs/config_qurt_eagle_release.cmake
@@ -19,7 +19,7 @@ set(target_libraries
 	rc_receiver
 	)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		#
diff --git a/cmake/configs/config_qurt_eagle_test.cmake b/cmake/configs/config_qurt_eagle_test.cmake
index bbb837b3630..1845568e8b1 100644
--- a/cmake/configs/config_qurt_eagle_test.cmake
+++ b/cmake/configs/config_qurt_eagle_test.cmake
@@ -1,6 +1,6 @@
 include(qurt/px4_impl_qurt)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device
diff --git a/cmake/configs/config_qurt_eagle_travis.cmake b/cmake/configs/config_qurt_eagle_travis.cmake
index b8a21017b62..713c858a440 100644
--- a/cmake/configs/config_qurt_eagle_travis.cmake
+++ b/cmake/configs/config_qurt_eagle_travis.cmake
@@ -3,7 +3,7 @@ include(qurt/px4_impl_qurt)
 # Run a full link with build stubs to make sure qurt target isn't broken
 set(QURT_ENABLE_STUBS 1)
 
-function(px4_set_config_modules out_module_list)
+function(px4_get_config out_module_list)
 
 	set(config_module_list
 		drivers/device