diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index b44dcafd..070cdbeb 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -37,208 +37,221 @@ die()
 
 build_libretro_beetle_bsnes()
 {
+   CORENAME="beetle-bsnes"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-bsnes" ]; then
-      cd libretro-beetle-bsnes
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle bSNES ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle bSNES"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle bSNES"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle bSNES not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_lynx()
 {
+   CORENAME="beetle-lynx"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-lynx" ]; then
-      cd libretro-beetle-lynx
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle Lynx ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle Lynx"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle Lynx"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle Lynx not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_gba()
 {
+   CORENAME="beetle-gba"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-gba" ]; then
-      cd libretro-beetle-gba
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle GBA ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle GBA"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle GBA"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_gba_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_gba_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_gba_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle GBA not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_ngp()
 {
+   CORENAME="beetle-ngp"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-ngp" ]; then
-      cd libretro-beetle-ngp
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle NGP ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle NGP"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle NGP"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle NGP not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_wswan()
 {
+   CORENAME="beetle-wswan"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-wswan" ]; then
-      cd libretro-beetle-wswan
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle WSwan ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle WSwan"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle WSwan"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_wswan_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_wswan_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_wswan_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle WSwan not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_psx()
-{ cd $BASE_DIR
+{
+   CORENAME="beetle-psx"
+   cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-psx" ]; then
-      cd libretro-beetle-psx
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle PSX ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle PSX"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle PSX"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_psx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_psx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_psx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle PSX not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_pcfx()
-{ cd $BASE_DIR
+{
+   CORENAME="beetle-pcfx"
+   cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-pcfx" ]; then
-      cd libretro-beetle-pcfx
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle PCFX ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle PCFX"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle PCFX"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_pcfx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_pcfx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_pcfx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle PCFX not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_vb()
 {
+   CORENAME="beetle-vb"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-vb" ]; then
-      cd libretro-beetle-vb
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle VB ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle VB"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle VB"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle VB not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_pce_fast()
 {
+   CORENAME="beetle-pce-fast"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-pce-fast" ]; then
-      cd libretro-beetle-pce-fast
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle PCE Fast ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle PCE Fast"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle PCE Fast"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle PCE Fast not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_beetle_supergrafx()
 {
+   CORENAME="beetle-supergrafx"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-beetle-supergrafx" ]; then
-      cd libretro-beetle-supergrafx
+   if [ -d "libretro-${CORENAME}" ]; then
+      cd libretro-${CORENAME}
       cd jni
-      echo "=== Building Beetle SuperGrafx ==="
+      echo "=== Building ${CORENAME} ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle SuperGrafx"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean ${CORENAME}"
       fi
-      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle SuperGrafx"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86" || die "Failed to build ${CORENAME}"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Beetle SuperGrafx not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_s9x()
 {
+   CORENAME="s9x"
    cd $BASE_DIR
-   if [ -d "libretro-s9x" ]; then
-      echo "=== Building SNES9x ==="
-      cd libretro-s9x/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -248,16 +261,17 @@ build_libretro_s9x()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/snes9x_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/snes9x_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "SNES9x not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_s9x_next()
 {
+   CORENAME="s9x-next"
    cd $BASE_DIR
-   if [ -d "libretro-s9x-next" ]; then
-      echo "=== Building SNES9x-Next ==="
-      cd libretro-s9x-next/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -267,16 +281,17 @@ build_libretro_s9x_next()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/snes9x_next_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/snes9x_next_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "SNES9x-Next not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_2048()
 {
+   CORENAME="2048"
    cd $BASE_DIR
-   if [ -d "libretro-2048" ]; then
-      echo "=== Building 2048 ==="
-      cd libretro-2048/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -286,16 +301,17 @@ build_libretro_2048()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/2048_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/2048_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "2048 not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_stella()
 {
+   CORENAME="stella"
    cd $BASE_DIR
-   if [ -d "libretro-stella" ]; then
-      echo "=== Building Stella ==="
-      cd libretro-stella/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -305,16 +321,17 @@ build_libretro_stella()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/stella_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/stella_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Stella not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_genplus()
 {
+   CORENAME="genplus"
    cd $BASE_DIR
-   if [ -d "libretro-genplus" ]; then
-      echo "=== Building Genplus GX ==="
-      cd libretro-genplus/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -324,16 +341,17 @@ build_libretro_genplus()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/genesis_plus_gx_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/genesis_plus_gx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Genplus GX not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_fba_full()
 {
+   CORENAME="fba"
    cd $BASE_DIR
-   if [ -d "libretro-fba" ]; then
-      echo "=== Building Final Burn Alpha ==="
-      cd libretro-fba
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd svn-current/trunk
       cd projectfiles/libretro-android/jni
       if [ -z "${NOCLEAN}" ]; then
@@ -344,16 +362,17 @@ build_libretro_fba_full()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/fb_alpha_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/fb_alpha_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Final Burn Alpha not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_vbam()
 {
+   CORENAME="vbam"
    cd $BASE_DIR
-   if [ -d "libretro-vbam" ]; then
-      echo '=== Building VBA-M ==='
-      cd libretro-vbam/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo '=== Building ${CORENAME} ==='
+      cd libretro-${CORENAME}/
       cd src/libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -363,16 +382,17 @@ build_libretro_vbam()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/vbam_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/vbam_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo 'VBA-M not fetched, skipping ...'
+      echo '${CORENAME} not fetched, skipping ...'
    fi
 }
 
 build_libretro_vba_next()
 {
+   CORENAME="vba-next"
    cd $BASE_DIR
-   if [ -d "libretro-vba-next" ]; then
-      echo "=== Building VBA-Next ==="
-      cd libretro-vba-next/
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -382,16 +402,17 @@ build_libretro_vba_next()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/vba_next_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/vba_next_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "VBA-Next not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_fceumm()
 {
+   CORENAME="fceumm"
    cd $BASE_DIR
-   if [ -d "libretro-fceumm" ]; then
-      echo "=== Building FCEUmm ==="
-      cd libretro-fceumm
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd src/drivers/libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -401,17 +422,18 @@ build_libretro_fceumm()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/fceumm_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/fceumm_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "FCEUmm not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_gambatte()
 {
+   CORENAME="gambatte"
    cd $BASE_DIR
-   if [ -d "libretro-gambatte" ]; then
-      echo "=== Building Gambatte ==="
-      cd libretro-gambatte/libgambatte
-      cd libretro/jni
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
+      cd libgambatte/libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
       fi
@@ -420,16 +442,17 @@ build_libretro_gambatte()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/gambatte_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/gambatte_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Gambatte not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_nx()
 {
+   CORENAME="nx"
    cd $BASE_DIR
-   if [ -d "libretro-nx" ]; then
-      echo "=== Building NXEngine ==="
-      cd libretro-nx
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -439,16 +462,17 @@ build_libretro_nx()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/nxengine_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/nxengine_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "NXEngine not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_prboom()
 {
+   CORENAME="prboom"
    cd $BASE_DIR
-   if [ -d "libretro-prboom" ]; then
-      echo "=== Building PRBoom ==="
-      cd libretro-prboom
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -458,16 +482,17 @@ build_libretro_prboom()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/prboom_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/prboom_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "PRBoom not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_dinothawr()
 {
+   CORENAME="dinothawr"
    cd $BASE_DIR
-   if [ -d "libretro-dinothawr" ]; then
-      echo "=== Building Dinothawr ==="
-      cd libretro-dinothawr
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd android/eclipse/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -477,17 +502,18 @@ build_libretro_dinothawr()
       cp ../libs/mips/libretro_dino.${FORMAT_EXT} $RARCH_DIST_DIR/mips/dinothawr_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro_dino.${FORMAT_EXT} $RARCH_DIST_DIR/x86/dinothawr_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Dinothawr not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_nestopia()
 {
+   CORENAME="nestopia"
    cd $BASE_DIR
-   if [ -d "libretro-nestopia" ]; then
-      echo "=== Building Nestopia ==="
-      cd libretro-nestopia/libretro
-      cd jni
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
+      cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
       fi
@@ -496,17 +522,18 @@ build_libretro_nestopia()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/nestopia_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/nestopia_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Nestopia not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_pcsx_rearmed()
 {
+   CORENAME="pcsx-rearmed"
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-pcsx-rearmed" ]; then
-      echo "=== Building PCSX ReARMed ==="
-      cd libretro-pcsx-rearmed
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       #ndk-build clean APP_ABI=armeabi-v7a
       #ndk-build -j$JOBS NO_NEON=1 APP_ABI=armeabi-v7a
@@ -517,16 +544,17 @@ build_libretro_pcsx_rearmed()
       ndk-build -j$JOBS APP_ABI=armeabi-v7a
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/pcsx_rearmed_libretro_neon${FORMAT}.${FORMAT_EXT}
    else
-      echo "PCSX ReARMed not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_tyrquake()
 {
+   CORENAME="tyrquake"
    cd $BASE_DIR
-   if [ -d "libretro-tyrquake" ]; then
-      echo "=== Building TyrQuake ==="
-      cd libretro-tyrquake
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -536,16 +564,17 @@ build_libretro_tyrquake()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/tyrquake_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/tyrquake_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "TyrQuake not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_modelviewer()
 {
+   CORENAME="gl-modelviewer"
    cd $BASE_DIR
-   if [ -d "libretro-gl-modelviewer" ]; then
-      echo "=== Building Modelviewer (GL) ==="
-      cd libretro-gl-modelviewer
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -555,16 +584,17 @@ build_libretro_modelviewer()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/modelviewer_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/modelviewer_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "ModelViewer not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_modelviewer_location()
 {
+   CORENAME="gl-modelviewer-location"
    cd $BASE_DIR
-   if [ -d "libretro-gl-modelviewer-location" ]; then
-      echo "=== Building Modelviewer Location (GL) ==="
-      cd libretro-gl-modelviewer-location
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -574,16 +604,17 @@ build_libretro_modelviewer_location()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/modelviewer_location_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/modelviewer_location_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "ModelViewer Location not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_instancingviewer()
 {
+   CORENAME="gl-instancingviewer"
    cd $BASE_DIR
-   if [ -d "libretro-gl-instancingviewer" ]; then
-      echo "=== Building InstancingViewer (GL) ==="
-      cd libretro-gl-instancingviewer
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -593,16 +624,17 @@ build_libretro_instancingviewer()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/instancingviewer_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/instancingviewer_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "InstancingViewer not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_instancingviewer_camera()
 {
+   CORENAME="gl-instancingviewer-camera"
    cd $BASE_DIR
-   if [ -d "libretro-gl-instancingviewer-camera" ]; then
-      echo "=== Building InstancingViewer Camera (GL) ==="
-      cd libretro-gl-instancingviewer-camera
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -612,16 +644,15 @@ build_libretro_instancingviewer_camera()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/instancingviewer_camera_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/instancingviewer_camera_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "InstancingViewer Camera not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
-CORENAME="3dengine"
-
 build_libretro_3dengine() {
+   CORENAME="3dengine"
    cd "${BASE_DIR}"
-   if [ -d 'libretro-3dengine' ]; then
-      echo '=== Building 3DEngine (GL) ==='
+   if [ -d 'libretro-${CORENAME}' ]; then
+      echo '=== Building ${CORENAME} ==='
       cd libretro-${CORENAME}
       cd jni
 
@@ -633,16 +664,17 @@ build_libretro_3dengine() {
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/${CORENAME}_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/${CORENAME}_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo '3DEngine not fetched, skipping ...'
+      echo '${CORENAME} not fetched, skipping ...'
    fi
 }
 
 build_libretro_scenewalker()
 {
+   CORENAME="gl-scenewalker"
    cd $BASE_DIR
-   if [ -d "libretro-gl-scenewalker" ]; then
-      echo "=== Building SceneWalker (GL) ==="
-      cd libretro-gl-scenewalker
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -652,16 +684,17 @@ build_libretro_scenewalker()
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/scenewalker_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/scenewalker_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "SceneWalker not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_picodrive()
 {
+   CORENAME="picodrive"
    cd $BASE_DIR
-   if [ -d "libretro-picodrive" ]; then
-      echo "=== Building Picodrive ==="
-      cd libretro-picodrive
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI=armeabi-v7a
@@ -669,16 +702,17 @@ build_libretro_picodrive()
       ndk-build -j$JOBS APP_ABI=armeabi-v7a
       cp ../libs/armeabi-v7a/libretro_picodrive.${FORMAT_EXT} "$RARCH_DIST_DIR"/armeabi-v7a/picodrive_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Picodrive not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_handy()
 {
+   CORENAME="handy"
    cd $BASE_DIR
-   if [ -d "libretro-handy" ]; then
-      echo "=== Building Handy ==="
-      cd libretro-handy
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -688,17 +722,18 @@ build_libretro_handy()
       cp ../libs/mips/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/mips/handy_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/x86/handy_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Handy not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_desmume()
 {
+   CORENAME="desmume"
    cd $BASE_DIR
-   if [ -d "libretro-desmume" ]; then
-      echo "=== Building Desmume ==="
-      cd libretro-desmume/desmume/src/libretro
-      cd jni
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
+      cd desmume/src/libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean
       fi
@@ -710,16 +745,17 @@ build_libretro_desmume()
       ndk-build -j$JOBS APP_ABI=x86
       cp ../libs/x86/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/x86/desmume_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Desmume not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_quicknes()
 {
+   CORENAME="quicknes"
    cd $BASE_DIR
-   if [ -d "libretro-quicknes" ]; then
-      echo "=== Building QuickNES ==="
-      cd libretro-quicknes
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -729,7 +765,7 @@ build_libretro_quicknes()
       cp ../libs/mips/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/mips/quicknes_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/x86/quicknes_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "QuickNES not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
@@ -768,12 +804,13 @@ create_dist_dir()
 
 build_libretro_bsnes()
 {
+   CORENAME="bsnes"
    #TODO - maybe accuracy/balanced cores as well
    cd $BASE_DIR
-   if [ -d "libretro-bsnes" ]; then
-      echo "=== Building bsnes (performance core) ==="
-      cd libretro-bsnes/perf
-      cd target-libretro/jni
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo "=== Building ${CORENAME} ==="
+      cd libretro-${CORENAME}/
+      cd perf/target-libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a x86"
       fi
@@ -781,16 +818,17 @@ build_libretro_bsnes()
       cp ../libs/armeabi-v7a/libretro_bsnes_performance.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/bsnes_performance_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro_bsnes_performance.${FORMAT_EXT} $RARCH_DIST_DIR/x86/bsnes_performance_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "bsnes not fetched, skipping ..."
+      echo "${CORENAME} not fetched, skipping ..."
    fi
 }
 
 build_libretro_mupen64()
 {
+   CORENAME="mupen64plus"
    cd $BASE_DIR
-   if [ -d "libretro-mupen64plus" ]; then
-      echo '=== Building Mupen 64 Plus ==='
-      cd libretro-mupen64plus
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo '=== Building ${CORENAME} ==='
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a x86"
@@ -799,16 +837,17 @@ build_libretro_mupen64()
       cp ../libs/armeabi-v7a/libretro_mupen64plus.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mupen64plus_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro_mupen64plus.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mupen64plus_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo 'Mupen64 Plus not fetched, skipping ...'
+      echo '${CORENAME} not fetched, skipping ...'
    fi
 }
 
 build_libretro_yabause()
 {
+   CORENAME="yabause"
    cd $BASE_DIR
-   if [ -d "libretro-yabause" ]; then
-      echo '=== Building Yabause ==='
-      cd libretro-yabause
+   if [ -d "libretro-${CORENAME}" ]; then
+      echo '=== Building ${CORENAME} ==='
+      cd libretro-${CORENAME}/
       cd libretro/jni
       if [ -z "${NOCLEAN}" ]; then
          ndk-build clean APP_ABI="armeabi-v7a mips x86"
@@ -818,7 +857,7 @@ build_libretro_yabause()
       cp ../libs/mips/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/mips/yabause_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/x86/yabause_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo 'Yabause not fetched, skipping ...'
+      echo '${CORENAME} not fetched, skipping ...'
    fi
 }