diff --git a/CMakeLists.txt b/CMakeLists.txt
index cde16461..56b28832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,5 +38,5 @@ add_subdirectory(source/frontends/common2)
 add_subdirectory(source/frontends/ncurses)
 add_subdirectory(source/frontends/qt)
 add_subdirectory(source/frontends/sdl)
-add_subdirectory(source/frontends/retro)
+add_subdirectory(source/frontends/libretro)
 add_subdirectory(test/TestCPU6502)
diff --git a/linux.md b/linux.md
index c790a497..02c20498 100644
--- a/linux.md
+++ b/linux.md
@@ -111,7 +111,7 @@ Must be manually configured:
 ``cmake -DLIBRETRO_PATH=/path/to/libretro-common``
 
 Easiest way to run from the ``build`` folder:
-``retroarch -L source/frontends/retro/libra2.so ../Disks/NoSlotClockTest.dsk``
+``retroarch -L source/frontends/libretro/libra2.so ../Disks/NoSlotClockTest.dsk``
 
 ## Build
 
diff --git a/source/frontends/retro/CMakeLists.txt b/source/frontends/libretro/CMakeLists.txt
similarity index 92%
rename from source/frontends/retro/CMakeLists.txt
rename to source/frontends/libretro/CMakeLists.txt
index c7097808..3c22a273 100644
--- a/source/frontends/retro/CMakeLists.txt
+++ b/source/frontends/libretro/CMakeLists.txt
@@ -2,7 +2,7 @@
 # this requires user input
 set(LIBRETRO_PATH NONE CACHE PATH "path to libretro-common")
 
-if (IS_DIRECTORY ${LIBRETRO_PATH})
+if (EXISTS ${LIBRETRO_PATH}/include/libretro.h)
   message("Using LIBRETRO_PATH=${LIBRETRO_PATH}")
 
   add_library(ra2 SHARED
diff --git a/source/frontends/retro/analog.cpp b/source/frontends/libretro/analog.cpp
similarity index 87%
rename from source/frontends/retro/analog.cpp
rename to source/frontends/libretro/analog.cpp
index 79b7bec4..048505fc 100644
--- a/source/frontends/retro/analog.cpp
+++ b/source/frontends/libretro/analog.cpp
@@ -1,5 +1,5 @@
-#include "frontends/retro/analog.h"
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/analog.h"
+#include "frontends/libretro/environment.h"
 
 #include "libretro.h"
 
diff --git a/source/frontends/retro/analog.h b/source/frontends/libretro/analog.h
similarity index 82%
rename from source/frontends/retro/analog.h
rename to source/frontends/libretro/analog.h
index edc6efbe..52b796f9 100644
--- a/source/frontends/retro/analog.h
+++ b/source/frontends/libretro/analog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "frontends/retro/joypadbase.h"
+#include "frontends/libretro/joypadbase.h"
 
 #include <vector>
 
diff --git a/source/frontends/retro/bitmaps.cpp b/source/frontends/libretro/bitmaps.cpp
similarity index 98%
rename from source/frontends/retro/bitmaps.cpp
rename to source/frontends/libretro/bitmaps.cpp
index 5499cbc4..efba7665 100644
--- a/source/frontends/retro/bitmaps.cpp
+++ b/source/frontends/libretro/bitmaps.cpp
@@ -1,4 +1,4 @@
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/environment.h"
 
 #include <linux/interface.h>
 #include <linux/windows/misc.h>
diff --git a/source/frontends/retro/environment.cpp b/source/frontends/libretro/environment.cpp
similarity index 94%
rename from source/frontends/retro/environment.cpp
rename to source/frontends/libretro/environment.cpp
index eed3c702..2f2cbac8 100644
--- a/source/frontends/retro/environment.cpp
+++ b/source/frontends/libretro/environment.cpp
@@ -1,4 +1,4 @@
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/environment.h"
 
 #include <cstdarg>
 #include <iostream>
diff --git a/source/frontends/retro/environment.h b/source/frontends/libretro/environment.h
similarity index 100%
rename from source/frontends/retro/environment.h
rename to source/frontends/libretro/environment.h
diff --git a/source/frontends/retro/game.cpp b/source/frontends/libretro/game.cpp
similarity index 99%
rename from source/frontends/retro/game.cpp
rename to source/frontends/libretro/game.cpp
index 953ab7a1..2a07fba4 100644
--- a/source/frontends/retro/game.cpp
+++ b/source/frontends/libretro/game.cpp
@@ -1,5 +1,5 @@
 #include "StdAfx.h"
-#include "frontends/retro/game.h"
+#include "frontends/libretro/game.h"
 
 #include "Frame.h"
 
diff --git a/source/frontends/retro/game.h b/source/frontends/libretro/game.h
similarity index 95%
rename from source/frontends/retro/game.h
rename to source/frontends/libretro/game.h
index 90037705..b9bf5620 100644
--- a/source/frontends/retro/game.h
+++ b/source/frontends/libretro/game.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "frontends/common2/speed.h"
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/environment.h"
 
 class Game
 {
diff --git a/source/frontends/retro/interface.cpp b/source/frontends/libretro/interface.cpp
similarity index 88%
rename from source/frontends/retro/interface.cpp
rename to source/frontends/libretro/interface.cpp
index 923aafae..bcca887e 100644
--- a/source/frontends/retro/interface.cpp
+++ b/source/frontends/libretro/interface.cpp
@@ -1,6 +1,6 @@
 #include "linux/interface.h"
 
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/environment.h"
 #include "linux/win.h"
 
 int MessageBox(HWND, const char * text, const char * caption, UINT type)
diff --git a/source/frontends/retro/joypad.cpp b/source/frontends/libretro/joypad.cpp
similarity index 86%
rename from source/frontends/retro/joypad.cpp
rename to source/frontends/libretro/joypad.cpp
index a10366dd..8ed0ec6d 100644
--- a/source/frontends/retro/joypad.cpp
+++ b/source/frontends/libretro/joypad.cpp
@@ -1,5 +1,5 @@
-#include "frontends/retro/joypad.h"
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/joypad.h"
+#include "frontends/libretro/environment.h"
 
 #include "libretro.h"
 
diff --git a/source/frontends/retro/joypad.h b/source/frontends/libretro/joypad.h
similarity index 83%
rename from source/frontends/retro/joypad.h
rename to source/frontends/libretro/joypad.h
index c180a89c..edab74d7 100644
--- a/source/frontends/retro/joypad.h
+++ b/source/frontends/libretro/joypad.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "frontends/retro/joypadbase.h"
+#include "frontends/libretro/joypadbase.h"
 
 #include <vector>
 #include <map>
diff --git a/source/frontends/retro/joypadbase.cpp b/source/frontends/libretro/joypadbase.cpp
similarity index 78%
rename from source/frontends/retro/joypadbase.cpp
rename to source/frontends/libretro/joypadbase.cpp
index 9769e741..55265a63 100644
--- a/source/frontends/retro/joypadbase.cpp
+++ b/source/frontends/libretro/joypadbase.cpp
@@ -1,5 +1,5 @@
-#include "frontends/retro/joypadbase.h"
-#include "frontends/retro/environment.h"
+#include "frontends/libretro/joypadbase.h"
+#include "frontends/libretro/environment.h"
 
 #include "libretro.h"
 
diff --git a/source/frontends/retro/joypadbase.h b/source/frontends/libretro/joypadbase.h
similarity index 100%
rename from source/frontends/retro/joypadbase.h
rename to source/frontends/libretro/joypadbase.h
diff --git a/source/frontends/retro/libretro.cpp b/source/frontends/libretro/libretro.cpp
similarity index 97%
rename from source/frontends/retro/libretro.cpp
rename to source/frontends/libretro/libretro.cpp
index e453e602..f7a3c191 100644
--- a/source/frontends/retro/libretro.cpp
+++ b/source/frontends/libretro/libretro.cpp
@@ -8,10 +8,10 @@
 #include "linux/version.h"
 #include "linux/paddle.h"
 
-#include "frontends/retro/game.h"
-#include "frontends/retro/environment.h"
-#include "frontends/retro/joypad.h"
-#include "frontends/retro/analog.h"
+#include "frontends/libretro/game.h"
+#include "frontends/libretro/environment.h"
+#include "frontends/libretro/joypad.h"
+#include "frontends/libretro/analog.h"
 
 namespace
 {
diff --git a/source/frontends/retro/rdirectsound.cpp b/source/frontends/libretro/rdirectsound.cpp
similarity index 100%
rename from source/frontends/retro/rdirectsound.cpp
rename to source/frontends/libretro/rdirectsound.cpp
diff --git a/source/frontends/retro/run b/source/frontends/libretro/run
similarity index 100%
rename from source/frontends/retro/run
rename to source/frontends/libretro/run