diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 745442ac..63fb4490 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -62,83 +62,102 @@ build_libretro_mednafen()
    fi
 }
 
-build_libretro_mednafen_ngp()
+build_libretro_beetle_ngp()
 {
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen-ngp" ]; then
-      cd libretro-mednafen-ngp
+   if [ -d "libretro-beetle-ngp" ]; then
+      cd libretro-beetle-ngp
       cd jni
-      echo "=== Building Mednafen NGP ==="
+      echo "=== Building Beetle NGP ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen NGP"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle NGP"
       fi
-      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen NGP"
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle NGP"
       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 "Mednafen NGP not fetched, skipping ..."
+      echo "Beetle NGP not fetched, skipping ..."
    fi
 }
 
-build_libretro_mednafen_psx()
+build_libretro_beetle_wswan()
 {
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen-psx" ]; then
-      cd libretro-mednafen-psx
+   if [ -d "libretro-beetle-wswan" ]; then
+      cd libretro-beetle-wswan
       cd jni
-      echo "=== Building Mednafen PSX ==="
+      echo "=== Building Beetle WSwan ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen PSX"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle WSwan"
       fi
-      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen PSX"
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle WSwan"
+      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 ..."
+   fi
+}
+
+build_libretro_beetle_psx()
+{ cd $BASE_DIR
+   pwd
+   if [ -d "libretro-beetle-psx" ]; then
+      cd libretro-beetle-psx
+      cd jni
+      echo "=== Building Beetle PSX ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle PSX"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle PSX"
       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 "Mednafen PSX not fetched, skipping ..."
+      echo "Beetle PSX not fetched, skipping ..."
    fi
 }
 
-build_libretro_mednafen_vb()
+build_libretro_beetle_vb()
 {
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen-vb" ]; then
-      cd libretro-mednafen-vb
+   if [ -d "libretro-beetle-vb" ]; then
+      cd libretro-beetle-vb
       cd jni
-      echo "=== Building Mednafen VB ==="
+      echo "=== Building Beetle VB ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen PSX"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle VB"
       fi
-      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen VB"
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle VB"
       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 "Mednafen VB not fetched, skipping ..."
+      echo "Beetle VB not fetched, skipping ..."
    fi
 }
 
-build_libretro_mednafen_pce_fast()
+build_libretro_beetle_pce_fast()
 {
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen-pce-fast" ]; then
-      cd libretro-mednafen-pce-fast
+   if [ -d "libretro-beetle-pce-fast" ]; then
+      cd libretro-beetle-pce-fast
       cd jni
-      echo "=== Building Mednafen PCE Fast ==="
+      echo "=== Building Beetle PCE Fast ==="
       if [ -z "${NOCLEAN}" ]; then
-         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen PCE Fast"
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle PCE Fast"
       fi
-      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen PCE Fast"
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle PCE Fast"
       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 "Mednafen PCE Fast not fetched, skipping ..."
+      echo "Beetle PCE Fast not fetched, skipping ..."
    fi
 }
 
@@ -703,6 +722,7 @@ else
    build_libretro_mednafen_ngp
    build_libretro_mednafen_pce_fast
    build_libretro_mednafen_vb
+   build_libretro_mednafen_wswan
    build_libretro_mednafen_psx
    #build_libretro_mednafen_gba
    #build_libretro_mednafen_snes
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index a9d3ea24..380bc1d0 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -8,7 +8,7 @@ die()
 
 build_libretro_mednafen()
 {
-   for core in pcfx wswan gba; do
+   for core in pcfx gba; do
    	cd $BASE_DIR
    	if [ -d "libretro-mednafen" ]; then
       		echo "=== Building Mednafen ${core} ==="
@@ -22,45 +22,59 @@ build_libretro_mednafen()
    done
 }
 
-build_libretro_mednafen_ngp()
+build_libretro_beetle_wswan()
 {
    cd $BASE_DIR
-   if [ -d "libretro-mednafen-ngp" ]; then
-      echo "=== Building Mednafen NGP ==="
-      cd libretro-mednafen-ngp
+   if [ -d "libretro-beetle-wswan" ]; then
+      echo "=== Building Beetle WSwan ==="
+      cd libretro-beetle-wswan
+      cd msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_wswan_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Beetle WSwan not fetched, skipping ..."
+   fi
+}
+
+build_libretro_beetle_ngp()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-beetle-ngp" ]; then
+      echo "=== Building Beetle NGP ==="
+      cd libretro-beetle-ngp
       cd msvc
       cmd.exe /k $MSVC_NAME.bat
       cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT
    else
-      echo "Mednafen NGP not fetched, skipping ..."
+      echo "Beetle NGP not fetched, skipping ..."
    fi
 }
 
-build_libretro_mednafen_pce_fast()
+build_libretro_beetle_pce_fast()
 {
    cd $BASE_DIR
-   if [ -d "libretro-mednafen-pce-fast" ]; then
-      echo "=== Building Mednafen PCE Fast ==="
-      cd libretro-mednafen-pce-fast
+   if [ -d "libretro-beetle-pce-fast" ]; then
+      echo "=== Building Beetle PCE Fast ==="
+      cd libretro-beetle-pce-fast
       cd msvc
       cmd.exe /k $MSVC_NAME.bat
       cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT
    else
-      echo "Mednafen PCE Fast not fetched, skipping ..."
+      echo "Beetle PCE Fast not fetched, skipping ..."
    fi
 }
 
-build_libretro_mednafen_vb()
+build_libretro_beetle_vb()
 {
    cd $BASE_DIR
-   if [ -d "libretro-mednafen-vb" ]; then
-      echo "=== Building Mednafen VB ==="
-      cd libretro-mednafen-vb
+   if [ -d "libretro-beetle-vb" ]; then
+      echo "=== Building Beetle VB ==="
+      cd libretro-beetle-vb
       cd msvc
       cmd.exe /k $MSVC_NAME.bat
       cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_vb_libretro$FORMAT.$FORMAT_EXT
    else
-      echo "Mednafen VB not fetched, skipping ..."
+      echo "Beetle VB not fetched, skipping ..."
    fi
 }
 
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index d9d28397..631acb60 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -180,7 +180,7 @@ build_libretro_mednafen() {
       echo '=== Building Mednafen ==='
       cd libretro-mednafen
 
-      for core in pcfx lynx wswan gba; do
+      for core in pcfx lynx gba; do
          if [ -z "${NOCLEAN}" ]; then
             "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/${core}"
          fi
@@ -192,66 +192,80 @@ build_libretro_mednafen() {
    fi
 }
 
-build_libretro_mednafen_ngp() {
+build_libretro_beetle_wswan() {
    cd "${BASE_DIR}"
-   if [ -d 'libretro-mednafen-ngp' ]; then
-      echo '=== Building Mednafen NGP ==='
-      cd libretro-mednafen-ngp
+   if [ -d 'libretro-beetle-wswan' ]; then
+      echo '=== Building Beetle WSwan ==='
+      cd libretro-beetle-wswan
 
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/ngp"
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/ngp"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/wswan"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/wswan"
+      cp "mednafen_wswan_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+   else
+      echo 'Beetle WSwan not fetched, skipping ...'
+   fi
+}
+
+build_libretro_beetle_ngp() {
+   cd "${BASE_DIR}"
+   if [ -d 'libretro-beetle-ngp' ]; then
+      echo '=== Building Beetle NGP ==='
+      cd libretro-beetle-ngp
+
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/ngp"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/ngp"
       cp "mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
-      echo 'Mednafen NGP not fetched, skipping ...'
+      echo 'Beetle NGP not fetched, skipping ...'
    fi
 }
 
-build_libretro_mednafen_pce_fast() {
+build_libretro_beetle_pce_fast() {
    cd "${BASE_DIR}"
-   if [ -d 'libretro-mednafen-pce-fast' ]; then
-      echo '=== Building Mednafen PCE Fast ==='
-      cd libretro-mednafen-pce-fast
+   if [ -d 'libretro-beetle-pce-fast' ]; then
+      echo '=== Building Beetle PCE Fast ==='
+      cd libretro-beetle-pce-fast
 
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/pce_fast"
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/pce_fast"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/pce_fast"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/pce_fast"
       cp "mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
-      echo 'Mednafen PCE Fast not fetched, skipping ...'
+      echo 'Beetle PCE Fast not fetched, skipping ...'
    fi
 }
 
-build_libretro_mednafen_vb() {
+build_libretro_beetle_vb() {
    cd "${BASE_DIR}"
-   if [ -d 'libretro-mednafen-vb' ]; then
-      echo '=== Building Mednafen VB ==='
-      cd libretro-mednafen-vb
+   if [ -d 'libretro-beetle-vb' ]; then
+      echo '=== Building Beetle VB ==='
+      cd libretro-beetle-vb
 
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/vb"
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/vb"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/vb"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/vb"
       cp "mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
-      echo 'Mednafen VB not fetched, skipping ...'
+      echo 'Beetle VB not fetched, skipping ...'
    fi
 }
 
-build_libretro_mednafen_psx() {
+build_libretro_beetle_psx() {
    cd "${BASE_DIR}"
-   if [ -d 'libretro-mednafen-psx' ]; then
-      echo '=== Building Mednafen PSX ==='
-      cd libretro-mednafen-psx
+   if [ -d 'libretro-beetle-psx' ]; then
+      echo '=== Building Beetle PSX ==='
+      cd libretro-beetle-psx
 
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/psx"
-      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/psx"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean Beetle/psx"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build Beetle/psx"
       cp "mednafen_psx_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
-      echo 'Mednafen PSX not fetched, skipping ...'
+      echo 'Beetle PSX not fetched, skipping ...'
    fi
 }
 
-build_libretro_mednafen_snes() {
+build_libretro_beetle_snes() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-mednafen' ]; then
-      echo '=== Building Mednafen bSNES ==='
+      echo '=== Building Beetle bSNES ==='
       cd libretro-mednafen
 
       for core in snes; do
@@ -262,7 +276,7 @@ build_libretro_mednafen_snes() {
          cp "mednafen_${core//-/_}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
       done
    else
-      echo 'Mednafen not fetched, skipping ...'
+      echo 'Beetle bSNES not fetched, skipping ...'
    fi
 }
 
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 95233d56..57b7e66b 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -30,11 +30,12 @@ else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
-   build_libretro_mednafen_psx
-   #build_libretro_mednafen_snes
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
+   build_libretro_beetle_psx
+   #build_libretro_beetle_snes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 6d601aa9..7a227f57 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -18,9 +18,10 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index cf9a57e2..a457b522 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -17,10 +17,11 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
-   build_libretro_mednafen_psx
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
+   build_libretro_beetle_psx
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index 81fcb48b..8c4e5b9a 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -16,9 +16,10 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_mednafen
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 734a1520..1c6fbd57 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -19,9 +19,10 @@ else
    build_libretro_bsnes_cplusplus98
    #build_libretro_bsnes
    build_libretro_mednafen
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_pce_vb
-   build_libretro_mednafen_psx
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
+   build_libretro_beetle_psx
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index e767849b..2d97da7a 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -18,10 +18,11 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_psx
-   build_libretro_mednafen_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_psx
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index aa0f5ecc..f3cfb525 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -21,8 +21,10 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_pce_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 1a540c73..1dc5d9d4 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -80,9 +80,10 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 92c11f0d..bd2d6b13 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -36,9 +36,10 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build.sh b/libretro-build.sh
index 199b6423..1c453df4 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -97,11 +97,12 @@ else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_vb
-   build_libretro_mednafen_psx
-   build_libretro_mednafen_snes
+   build_libretro_beetle_ngp
+   build_libretro_beetle_pce_fast
+   build_libretro_beetle_vb
+   build_libretro_beetle_wswan
+   build_libretro_beetle_psx
+   build_libretro_beetle_snes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 7f275861..de5a2778 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -95,10 +95,11 @@ fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/N
 fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/tyrquake"
 fetch_project "$REPO_BASE/libretro/pcsx_rearmed.git" "libretro-pcsx-rearmed" "libretro/pcsx_rearmed"
 fetch_project "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen"
-fetch_project "$REPO_BASE/libretro/mednafen-ngp-libretro.git" "libretro-mednafen-ngp" "libretro/Mednafen NGP"
-fetch_project "$REPO_BASE/libretro/mednafen-pce-fast-libretro.git" "libretro-mednafen-pce-fast" "libretro/Mednafen PCE Fast"
-fetch_project "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen-psx" "libretro/Mednafen PSX"
-fetch_project "$REPO_BASE/libretro/mednafen-vb-libretro.git" "libretro-mednafen-vb" "libretro/Mednafen VB"
+fetch_project "$REPO_BASE/libretro/beetle-ngp-libretro.git" "libretro-beetle-ngp" "libretro/Mednafen NGP"
+fetch_project "$REPO_BASE/libretro/beetle-pce-fast-libretro.git" "libretro-beetle-pce-fast" "libretro/Mednafen PCE Fast"
+fetch_project "$REPO_BASE/libretro/beetle-psx-libretro.git" "libretro-beetle-psx" "libretro/Mednafen PSX"
+fetch_project "$REPO_BASE/libretro/beetle-vb-libretro.git" "libretro-beetle-vb" "libretro/Mednafen VB"
+fetch_project "$REPO_BASE/libretro/beetle-wswan-libretro.git" "libretro-beetle-wswan" "libretro/Mednafen WSwan"
 fetch_project "$REPO_BASE/libretro/scummvm.git" "libretro-scummvm" "libretro/scummvm"
 fetch_project "$REPO_BASE/libretro/yabause.git" "libretro-yabause" "libretro/yabause"
 fetch_project "$REPO_BASE/libretro/dosbox-libretro.git" "libretro-dosbox" "libretro/dosbox"