diff --git a/libretro-build.sh b/libretro-build.sh
index 01f9d3fc..4541b604 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -3,154 +3,152 @@
 die()
 {
    echo $1
-   exit 1
+   #exit 1
 }
 
-build_libsnes()
+build_libretro_bsnes()
 {
-   if [ -d "libsnes/perf" ]; then
+   if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
-      cd libsnes/perf
+      cd libretro-bsnes/perf
       make profile=performance -j4 || die "Failed to build bSNES performance core"
-      cp -f out/libsnes.so ../libsnes-performance.so
+      cp -f out/libretro.so ../libretro-performance.so
       cd ../..
    else
       echo "bSNES performance not fetched, skipping ..."
    fi
 
-   if [ -d "libsnes/compat" ]; then
+   if [ -d "libretro-bsnes/compat" ]; then
       echo "=== Building bSNES compatibility ==="
-      cd libsnes/compat
+      cd libretro-bsnes/compat
       make profile=compatibility -j4 || die "Failed to build bSNES compatibility core"
-      cp -f out/libsnes.so ../libsnes-compat.so
+      cp -f out/libretro.so ../libretro-compat.so
       cd ../..
    else
       echo "bSNES compat not fetched, skipping ..."
    fi
 
-   if [ -d "libsnes" ]; then
+   if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
-      cd libsnes
+      cd libretro-bsnes
       make profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
-      cp -f out/libsnes.so libsnes-accuracy.so
+      cp -f out/libretro.so libretro-accuracy.so
       cd ..
    fi
 }
 
-build_libsnes_s9x()
+build_libretro_s9x()
 {
-   if [ -d "libsnes-s9x" ]; then
+   if [ -d "libretro-s9x" ]; then
       echo "=== Building SNES9x ==="
-      cd libsnes-s9x/unix
+      cd libretro-s9x/libretro
       make -j4 || die "Failed to build SNES9x"
-      cp libsnes.so ../libsnes-snes9x.so
+      cp libretro.so ../libretro-snes9x.so
       cd ../..
    else
       echo "SNES9x not fetched, skipping ..."
    fi
 }
 
-build_libsnes_s9x_next()
+build_libretro_s9x_next()
 {
-   if [ -d "libsnes-s9x-next" ]; then
+   if [ -d "libretro-s9x-next" ]; then
       echo "=== Building SNES9x-Next ==="
-      cd libsnes-s9x-next/
-      make -f Makefile.libsnes -j4 || die "Failed to build SNES9x-Next"
-      cp libsnes.so libsnes-snes9x-next.so
+      cd libretro-s9x-next/
+      make -f Makefile.libretro -j4 || die "Failed to build SNES9x-Next"
+      cp libretro.so libretro-snes9x-next.so
       cd ..
    else
       echo "SNES9x-Next not fetched, skipping ..."
    fi
 }
 
-build_libsnes_genplus()
+build_libretro_genplus()
 {
-   if [ -d "libsnes-genplus" ]; then
+   if [ -d "libretro-genplus" ]; then
       echo "=== Building Genplus GX ==="
-      cd libsnes-genplus/
-      make -f Makefile.libsnes -j4 || die "Failed to build Genplus GX"
-      cp libsnes.so libsnes-genplus.so
+      cd libretro-genplus/
+      make -f Makefile.libretro -j4 || die "Failed to build Genplus GX"
+      cp libretro.so libretro-genplus.so
       cd ..
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
 }
 
-build_libsnes_fba()
+build_libretro_fba()
 {
-   if [ -d "libsnes-fba" ]; then
+   if [ -d "libretro-fba" ]; then
       echo "=== Building Final Burn Alpha ==="
-      cd libsnes-fba/
-      ./compile_libsnes.sh make || die "Failed to build Final Burn Alpha"
-      cp src-0.2.97.21/libsnes.so libsnes-fba.so
+      cd libretro-fba/
+      ./compile_libretro.sh make || die "Failed to build Final Burn Alpha"
+      cp src-0.2.97.24/libretro.so libretro-fba.so
       cd ..
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
 }
 
-build_libsnes_vba()
+build_libretro_vba()
 {
-   if [ -d "libsnes-vba" ]; then
+   if [ -d "libretro-vba" ]; then
       echo "=== Building VBA-Next ==="
-      cd libsnes-vba/
-      make -f Makefile.libsnes -j4 || die "Failed to build VBA-Next"
-      cp libsnes.so libsnes-vba.so
+      cd libretro-vba/
+      make -f Makefile.libretro -j4 || die "Failed to build VBA-Next"
+      cp libretro.so libretro-vba.so
       cd ..
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
 }
 
-build_libsnes_bnes()
+build_libretro_bnes()
 {
-   if [ -d "libsnes-bnes" ]; then
+   if [ -d "libretro-bnes" ]; then
       echo "=== Building bNES ==="
-      cd libsnes-bnes
+      cd libretro-bnes
       mkdir -p obj
       make -j4 || die "Failed to build bNES"
-      cp libnes.so libsnes-bnes.so
+      cp libretro.so libretro-bnes.so
       cd ..
    else
       echo "bNES not fetched, skipping ..."
    fi
 }
 
-build_libsnes_fceu()
+build_libretro_fceu()
 {
-   if [ -d "libsnes-fceu" ]; then
+   if [ -d "libretro-fceu" ]; then
       echo "=== Building FCEU ==="
-      cd libsnes-fceu
-      make -f Makefile.libsnes-fceumm -j4 || die "Failed to build FCEU"
-      cp libsnes.so libsnes-fceu.so
+      cd libretro-fceu
+      make -f Makefile.libretro-fceumm -j4 || die "Failed to build FCEU"
+      cp libretro.so libretro-fceu.so
       cd ..
    else
       echo "FCEU not fetched, skipping ..."
    fi
 }
 
-build_libsnes_gambatte()
+build_libretro_gambatte()
 {
-   if [ -d "libsnes-gambatte" ]; then
+   if [ -d "libretro-gambatte" ]; then
       echo "=== Building Gambatte ==="
-      cd libsnes-gambatte/libgambatte
-      make -j4 || die "Failed to build Gambatte"
-      cd libsnes
-      make -j4 || die "Failed to build Gambatte"
-      cp libsnes.so ../../libsnes-gambatte.so
-      cd ../../..
+      cd libretro-gambatte/libgambatte
+      make -f Makefile.libretro -j4 || die "Failed to build Gambatte"
+      cp libretro.so ../libretro-gambatte.so
+      cd ../..
    else
       echo "Gambatte not fetched, skipping ..."
    fi
 }
 
-build_libsnes_meteor()
+build_libretro_meteor()
 {
-   if [ -d "libsnes-meteor" ]; then
+   if [ -d "libretro-meteor" ]; then
       echo "=== Building Meteor ==="
-      cd libsnes-meteor/libsnes
+      cd libretro-meteor/libretro
       make -j4 || die "Failed to build Meteor"
-      cp libsnes.so ../libsnes-meteor.so
+      cp libretro.so ../libretro-meteor.so
       cd ../
    else
       echo "Meteor not fetched, skipping ..."
@@ -158,14 +156,14 @@ build_libsnes_meteor()
 }
 
 
-build_libsnes
-build_libsnes_s9x
-build_libsnes_s9x_next
-build_libsnes_genplus
-build_libsnes_fba
-build_libsnes_vba
-build_libsnes_bnes
-build_libsnes_fceu
-build_libsnes_gambatte
-build_libsnes_meteor
+build_libretro_bsnes
+build_libretro_s9x
+build_libretro_s9x_next
+build_libretro_genplus
+build_libretro_fba
+build_libretro_vba
+build_libretro_bnes
+build_libretro_fceu
+build_libretro_gambatte
+build_libretro_meteor
 
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 938f4aa2..93ba78ef 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -51,14 +51,14 @@ fetch_project()
 
 REPO_BASE="git://github.com"
 
-fetch_project_bsnes "$REPO_BASE/Themaister/libsnes.git" "libsnes" "libsnes/bSNES"
-fetch_project "$REPO_BASE/Themaister/snes9x-libsnes.git" "libsnes-s9x" "libsnes/SNES9x"
-fetch_project "$REPO_BASE/twinaphex/snes9x-next.git" "libsnes-s9x-next" "libsnes/SNES9x-Next"
-fetch_project "$REPO_BASE/twinaphex/genesis-next.git" "libsnes-genplus" "libsnes/Genplus GX"
-fetch_project "$REPO_BASE/twinaphex/fba-next-slim.git" "libsnes-fba" "libsnes/FBA"
-fetch_project "$REPO_BASE/twinaphex/vba-next.git" "libsnes-vba" "libsnes/VBA"
-fetch_project "$REPO_BASE/Themaister/bnes-libsnes.git" "libsnes-bnes" "libsnes/bNES"
-fetch_project "$REPO_BASE/twinaphex/fceu-next.git" "libsnes-fceu" "libsnes/FCEU"
-fetch_project "$REPO_BASE/Themaister/gambatte-libsnes.git" "libsnes-gambatte" "libsnes/Gambatte"
-fetch_project "git://git.code.sf.net/p/meteorgba/code.git" "libsnes-meteor" "libsnes/Meteor"
+fetch_project_bsnes "$REPO_BASE/Themaister/bsnes-libretro.git" "libretro-bsnes" "libretro/bSNES"
+fetch_project "$REPO_BASE/snes9xgit/snes9x.git" "libretro-s9x" "libretro/SNES9x"
+fetch_project "$REPO_BASE/twinaphex/snes9x-next.git" "libretro-s9x-next" "libretro/SNES9x-Next"
+fetch_project "$REPO_BASE/twinaphex/genesis-next.git" "libretro-genplus" "libretro/Genplus GX"
+fetch_project "$REPO_BASE/twinaphex/fba-libretro.git" "libretro-fba" "libretro/FBA"
+fetch_project "$REPO_BASE/twinaphex/vba-next.git" "libretro-vba" "libretro/VBA"
+fetch_project "$REPO_BASE/Themaister/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
+fetch_project "$REPO_BASE/twinaphex/fceu-next.git" "libretro-fceu" "libretro/FCEU"
+fetch_project "$REPO_BASE/Themaister/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"
+fetch_project "$REPO_BASE/Themaister/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
 
diff --git a/libretro-install.sh b/libretro-install.sh
index c63d4872..6a44ae47 100755
--- a/libretro-install.sh
+++ b/libretro-install.sh
@@ -1,33 +1,33 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-   LIBSNES_DIR="/usr/local/lib/libsnes"
+   LIBRETRO_DIR="/usr/local/lib/libretro"
 else
-   LIBSNES_DIR="$1"
+   LIBRETRO_DIR="$1"
 fi
 
-if [ ! -d "$PREFIX/lib/libsnes" ]; then
-   mkdir -p "$LIBSNES_DIR"
+if [ ! -d "$PREFIX/lib/libretro" ]; then
+   mkdir -p "$LIBRETRO_DIR"
 fi
 
 LIBS=""
-LIBS="$LIBS libsnes/libsnes-performance.so"
-LIBS="$LIBS libsnes/libsnes-compat.so"
-LIBS="$LIBS libsnes/libsnes-accuracy.so"
-LIBS="$LIBS libsnes-s9x/libsnes-snes9x.so"
-LIBS="$LIBS libsnes-s9x-next/libsnes-snes9x-next.so"
-LIBS="$LIBS libsnes-genplus/libsnes-genplus.so"
-LIBS="$LIBS libsnes-fba/libsnes-fba.so"
-LIBS="$LIBS libsnes-vba/libsnes-vba.so"
-LIBS="$LIBS libsnes-fceu/libsnes-fceu.so"
-LIBS="$LIBS libsnes-bnes/libsnes-bnes.so"
-LIBS="$LIBS libsnes-gambatte/libsnes-gambatte.so"
-LIBS="$LIBS libsnes-meteor/libsnes-meteor.so"
+LIBS="$LIBS libretro-bsnes/libretro-performance.so"
+LIBS="$LIBS libretro-bsnes/libretro-compat.so"
+LIBS="$LIBS libretro-bsnes/libretro-accuracy.so"
+LIBS="$LIBS libretro-s9x/libretro-snes9x.so"
+LIBS="$LIBS libretro-s9x-next/libretro-snes9x-next.so"
+LIBS="$LIBS libretro-genplus/libretro-genplus.so"
+LIBS="$LIBS libretro-fba/libretro-fba.so"
+LIBS="$LIBS libretro-vba/libretro-vba.so"
+LIBS="$LIBS libretro-fceu/libretro-fceu.so"
+LIBS="$LIBS libretro-bnes/libretro-bnes.so"
+LIBS="$LIBS libretro-gambatte/libretro-gambatte.so"
+LIBS="$LIBS libretro-meteor/libretro-meteor.so"
 
 for lib in $LIBS
 do
    if [ -f $lib ]; then
-      install -v -m644 $lib "$LIBSNES_DIR"
+      install -v -m644 $lib "$LIBRETRO_DIR"
    else
       echo "Library $lib not found, skipping ..."
    fi