diff --git a/CMakeLists.txt b/CMakeLists.txt
index b859fee3a..84fd2a502 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,10 +97,10 @@ read_targetconfig()
 # The custom script may override functions such as the
 # cfe_exec_do_install() and cfe_app_do_install() functions for this
 if (IS_CFS_ARCH_BUILD)
-    include("${MISSION_DEFS}/arch_build.cmake" OPTIONAL)
-    include("${MISSION_DEFS}/arch_build_${TARGETSYSTEM}.cmake" OPTIONAL)
+    include("${MISSION_DEFS}/arch_build_custom.cmake" OPTIONAL)
+    include("${MISSION_DEFS}/arch_build_custom_${TARGETSYSTEM}.cmake" OPTIONAL)
 elseif (IS_CFS_MISSION_BUILD)
-    include("${MISSION_DEFS}/mission_build.cmake" OPTIONAL)
+    include("${MISSION_DEFS}/mission_build_custom.cmake" OPTIONAL)
 endif (IS_CFS_ARCH_BUILD)
 
 # Call the prepare function defined by the sub-script
diff --git a/cmake/sample_defs/arch_build.cmake b/cmake/sample_defs/arch_build_custom.cmake
similarity index 91%
rename from cmake/sample_defs/arch_build.cmake
rename to cmake/sample_defs/arch_build_custom.cmake
index aa0c1ec35..14d41a517 100644
--- a/cmake/sample_defs/arch_build.cmake
+++ b/cmake/sample_defs/arch_build_custom.cmake
@@ -1,6 +1,6 @@
 #
-# Example arch_build.cmake
-# -------------------------
+# Example arch_build_custom.cmake
+# -------------------------------
 #
 # This file will be automatically included in the arch-specific build scope
 #
@@ -19,7 +19,7 @@
 # compiler from the same vendor and/or are all GCC based such that they accept similar 
 # command line options.
 #
-# This file can alternatively be named as "arch_build_${TARGETSYSTEM}.cmake" 
+# This file can alternatively be named as "arch_build_custom_${TARGETSYSTEM}.cmake" 
 # where ${TARGETSYSTEM} represents the system type, matching the toolchain.
 #
 # These example options assume a GCC-style toolchain is used for cross compilation,
diff --git a/cmake/sample_defs/mission_build.cmake b/cmake/sample_defs/mission_build_custom.cmake
similarity index 94%
rename from cmake/sample_defs/mission_build.cmake
rename to cmake/sample_defs/mission_build_custom.cmake
index 0cd78732e..ae256ba9b 100644
--- a/cmake/sample_defs/mission_build.cmake
+++ b/cmake/sample_defs/mission_build_custom.cmake
@@ -1,6 +1,6 @@
 #
-# Example mission_build.cmake
-# ---------------------------
+# Example mission_build_custom.cmake
+# ----------------------------------
 #
 # This file will be automatically included in the top level ("mission") build scope
 #