diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 0db3c858..7d21ddd1 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -315,9 +315,9 @@ build_libretro_generic_makefile() {
 	cd "${SUBDIR}"
 
 	if [ "${COMMAND}" = "BSNES" ]; then
-		CORE="${NAME}_accuracy ${NAME}_balanced ${NAME}_performance"
+		CORE="${CORE:-${NAME}_accuracy ${NAME}_balanced ${NAME}_performance}"
 	elif [ "${NAME}" = "mame2014" ]; then
-		CORE="${NAME} mess2014 ume2014"
+		CORE="${CORE:-${NAME} mess2014 ume2014}"
 	else
 		CORE="${NAME}"
 	fi
@@ -472,7 +472,7 @@ build_libretro_generic_jni() {
 	fi
 
 	if [ "${COMMAND}" = "BSNES_JNI" ]; then
-		CORE="${NAME}_accuracy ${NAME}_balanced ${NAME}_performance"
+		CORE="${CORE:-${NAME}_accuracy ${NAME}_balanced ${NAME}_performance}"
 	else
 		CORE="${NAME}"
 	fi
diff --git a/travis/build-3ds.sh b/travis/build-3ds.sh
index 3a2ad81e..566f61d8 100755
--- a/travis/build-3ds.sh
+++ b/travis/build-3ds.sh
@@ -20,5 +20,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"
diff --git a/travis/build-linux_x64.sh b/travis/build-linux_x64.sh
index 6e8aa2c6..c101afba 100755
--- a/travis/build-linux_x64.sh
+++ b/travis/build-linux_x64.sh
@@ -10,5 +10,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"
diff --git a/travis/build-ngc.sh b/travis/build-ngc.sh
index 4ad71d5e..8d98ce29 100755
--- a/travis/build-ngc.sh
+++ b/travis/build-ngc.sh
@@ -21,5 +21,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"
diff --git a/travis/build-osx_x64.sh b/travis/build-osx_x64.sh
index d096d525..2067b66d 100755
--- a/travis/build-osx_x64.sh
+++ b/travis/build-osx_x64.sh
@@ -10,5 +10,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"
diff --git a/travis/build-wii.sh b/travis/build-wii.sh
index 3a614c38..8fe3edd6 100755
--- a/travis/build-wii.sh
+++ b/travis/build-wii.sh
@@ -21,5 +21,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"
diff --git a/travis/build-wiiu.sh b/travis/build-wiiu.sh
index 98184005..b33d1d00 100755
--- a/travis/build-wiiu.sh
+++ b/travis/build-wiiu.sh
@@ -20,5 +20,7 @@ if [ "${TRAVIS_BUILD_DIR}" ]; then
   mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME}
 fi
 
+[ -z "${NAME:-}" ] && NAME="${CORE}"
+
 # only build the one core specified in $CORE
-FORCE=YES SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}
+FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"