diff --git a/config/functions b/config/functions
index 87bec908b9..4aa19da2b0 100644
--- a/config/functions
+++ b/config/functions
@@ -269,7 +269,7 @@ setup_toolchain() {
   fi
 
   case "$1:$2" in
-    meson:target)
+    target:meson)
       export DESTIMAGE="target"
       export AWK="gawk"
       export CC="$TOOLCHAIN/bin/host-gcc"
@@ -308,7 +308,7 @@ setup_toolchain() {
       export _python_exec_prefix=/usr
       ;;
 
-    *:target|*:init)
+    target:*|init:*)
       export DESTIMAGE="target"
       export CC="${TARGET_PREFIX}gcc"
       export CXX="${TARGET_PREFIX}g++"
@@ -354,7 +354,7 @@ setup_toolchain() {
       export _python_prefix=/usr
       export _python_exec_prefix=/usr
       ;;
-    *:host|*:bootstrap)
+    host:*|bootstrap:*)
       export DESTIMAGE="host"
       export AWK="gawk"
       export CC="$TOOLCHAIN/bin/host-gcc"
diff --git a/scripts/build b/scripts/build
index 9f9558e76c..22c9f7fb7b 100755
--- a/scripts/build
+++ b/scripts/build
@@ -112,7 +112,7 @@ fi
 build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
 
 # setup toolchain
-setup_toolchain ${PKG_TOOLCHAIN} ${TARGET}
+setup_toolchain ${TARGET} ${PKG_TOOLCHAIN}
 
 # configure install directory
 if [ "${TARGET}" = "target" ]; then
diff --git a/scripts/build_mt b/scripts/build_mt
index fdcf4e4f5a..d7b35168df 100755
--- a/scripts/build_mt
+++ b/scripts/build_mt
@@ -10,7 +10,7 @@ ${SCRIPTS}/checkdeps
 
 # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
 # Use a fork for host to isolate any variable modifications.
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 MTADDONBUILD=no start_multithread_build ${@}
diff --git a/scripts/create_addon b/scripts/create_addon
index 79624b0fba..4961f0cd9d 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -132,8 +132,8 @@ fi
 # check environment and configure toolchains
 ${SCRIPTS}/checkdeps
 
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 # collect list of addons for building
 addons=
diff --git a/scripts/image b/scripts/image
index ea91914251..f2a8740100 100755
--- a/scripts/image
+++ b/scripts/image
@@ -25,8 +25,8 @@ ${SCRIPTS}/checkdeps
 
 # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
 # Use a fork for host to isolate any variable modifications.
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 function do_mkimage() {
   # Variables used in mkimage script must be passed
diff --git a/scripts/install_addon b/scripts/install_addon
index 787f4e1251..c6d006676e 100755
--- a/scripts/install_addon
+++ b/scripts/install_addon
@@ -6,7 +6,7 @@
 . config/options "${1}"
 
 # Make sure we have a value for STRIP
-setup_toolchain generic target
+setup_toolchain target
 
 [ -n "${2}" ] && PKG_ADDON_ID=${2}