diff --git a/cmake/sample_defs/targets.cmake b/cmake/sample_defs/targets.cmake
index 6ccb1d07c..b39453cf2 100644
--- a/cmake/sample_defs/targets.cmake
+++ b/cmake/sample_defs/targets.cmake
@@ -104,10 +104,12 @@ SET(MISSION_CPUNAMES cpu1)
 SET(cpu1_PROCESSORID 1)
 SET(cpu1_APPLIST ci_lab to_lab sch_lab)
 SET(cpu1_FILELIST cfe_es_startup.scr)
+SET(cpu1_SYSTEM i686-linux-gnu)
 
 # CPU2 example.  This is not built by default anymore but
 # serves as an example of how one would configure multiple cpus.
 SET(cpu2_PROCESSORID 2)
 SET(cpu2_APPLIST ci_lab to_lab sch_lab)
 SET(cpu2_FILELIST cfe_es_startup.scr)
+SET(cpu2_SYSTEM i686-linux-gnu)
 
diff --git a/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake b/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
index fcc78b0d5..7ddbf2ba6 100644
--- a/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
+++ b/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
@@ -30,6 +30,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE	ONLY)
 # abstraction layers are built when using this toolchain
 # Note that "pc-linux" works fine even though this is not technically a "pc"
 SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPTYPE     "pc-linux")
 SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-cpu2.cmake b/cmake/sample_defs/toolchain-cpu2.cmake
deleted file mode 100644
index 27a05d454..000000000
--- a/cmake/sample_defs/toolchain-cpu2.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# This example toolchain file describes the cross compiler to use for
-# the target architecture indicated in the configuration file.
-
-# Basic cross system configuration
-SET(CMAKE_SYSTEM_NAME           Linux)
-SET(CMAKE_SYSTEM_VERSION        1)
-SET(CMAKE_SYSTEM_PROCESSOR      i686)
-
-# Specify the cross compiler executables
-# Typically these would be installed in a home directory or somewhere
-# in /opt.  However in this example the system compiler is used.
-SET(CMAKE_C_COMPILER            "/usr/bin/gcc")
-SET(CMAKE_CXX_COMPILER          "/usr/bin/g++")
-
-# Configure the find commands
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM   NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY   NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   NEVER)
-
-# These variable settings are specific to cFE/OSAL and determines which 
-# abstraction layers are built when using this toolchain
-SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPNAME     "pc-linux")
-SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-cpu3.cmake b/cmake/sample_defs/toolchain-cpu3.cmake
deleted file mode 100644
index 27a05d454..000000000
--- a/cmake/sample_defs/toolchain-cpu3.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# This example toolchain file describes the cross compiler to use for
-# the target architecture indicated in the configuration file.
-
-# Basic cross system configuration
-SET(CMAKE_SYSTEM_NAME           Linux)
-SET(CMAKE_SYSTEM_VERSION        1)
-SET(CMAKE_SYSTEM_PROCESSOR      i686)
-
-# Specify the cross compiler executables
-# Typically these would be installed in a home directory or somewhere
-# in /opt.  However in this example the system compiler is used.
-SET(CMAKE_C_COMPILER            "/usr/bin/gcc")
-SET(CMAKE_CXX_COMPILER          "/usr/bin/g++")
-
-# Configure the find commands
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM   NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY   NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   NEVER)
-
-# These variable settings are specific to cFE/OSAL and determines which 
-# abstraction layers are built when using this toolchain
-SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPNAME     "pc-linux")
-SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-cpu1.cmake b/cmake/sample_defs/toolchain-i686-linux-gnu.cmake
similarity index 95%
rename from cmake/sample_defs/toolchain-cpu1.cmake
rename to cmake/sample_defs/toolchain-i686-linux-gnu.cmake
index 27a05d454..3046a3a34 100644
--- a/cmake/sample_defs/toolchain-cpu1.cmake
+++ b/cmake/sample_defs/toolchain-i686-linux-gnu.cmake
@@ -20,6 +20,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   NEVER)
 # These variable settings are specific to cFE/OSAL and determines which 
 # abstraction layers are built when using this toolchain
 SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPNAME     "pc-linux")
 SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake b/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
index 16aa8ca39..0043aa391 100644
--- a/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
+++ b/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
@@ -33,6 +33,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE	ONLY)
 # these settings are specific to cFE/OSAL and determines
 # which abstraction layers are built when this toolchain is used
 SET(CFE_SYSTEM_PSPNAME			pc-linux)
-SET(OSAL_SYSTEM_BSPTYPE			pc-linux)
 SET(OSAL_SYSTEM_OSTYPE			posix)
-