diff --git a/blackberry-qnx/bb10/.cproject b/blackberry-qnx/cascades/.cproject
similarity index 100%
rename from blackberry-qnx/bb10/.cproject
rename to blackberry-qnx/cascades/.cproject
diff --git a/blackberry-qnx/bb10/.project b/blackberry-qnx/cascades/.project
similarity index 100%
rename from blackberry-qnx/bb10/.project
rename to blackberry-qnx/cascades/.project
diff --git a/blackberry-qnx/bb10/Makefile b/blackberry-qnx/cascades/Makefile
similarity index 100%
rename from blackberry-qnx/bb10/Makefile
rename to blackberry-qnx/cascades/Makefile
diff --git a/blackberry-qnx/bb10/RetroArch-Cascades.pro b/blackberry-qnx/cascades/RetroArch-Cascades.pro
similarity index 91%
rename from blackberry-qnx/bb10/RetroArch-Cascades.pro
rename to blackberry-qnx/cascades/RetroArch-Cascades.pro
index f01ca74e72..5e08d9a820 100644
--- a/blackberry-qnx/bb10/RetroArch-Cascades.pro
+++ b/blackberry-qnx/cascades/RetroArch-Cascades.pro
@@ -8,7 +8,7 @@ LIBS += -lbbcascadespickers -lbbdata -lbbdevice
DEFINES += HAVE_RGUI HAVE_MENU HAVE_NEON RARCH_MOBILE \
SINC_LOWER_QUALITY RARCH_INTERNAL \
HAVE_FBO HAVE_GRIFFIN __LIBRETRO__ \
- HAVE_DYNAMIC HAVE_ZLIB __BLACKBERRY_QNX__ HAVE_OPENGLES \
+ HAVE_DYNAMIC HAVE_ZLIB HAVE_OPENGLES \
HAVE_OPENGLES2 HAVE_NULLINPUT HAVE_BUILTIN_FILTERS \
HAVE_AL HAVE_THREADS WANT_MINIZ HAVE_OVERLAY HAVE_GLSL \
USING_GL20 HAVE_OPENGL __STDC_CONSTANT_MACROS HAVE_BB10
diff --git a/blackberry-qnx/bb10/assets/Controllers.qml b/blackberry-qnx/cascades/assets/Controllers.qml
similarity index 100%
rename from blackberry-qnx/bb10/assets/Controllers.qml
rename to blackberry-qnx/cascades/assets/Controllers.qml
diff --git a/blackberry-qnx/bb10/assets/MainMenu.qml b/blackberry-qnx/cascades/assets/MainMenu.qml
similarity index 100%
rename from blackberry-qnx/bb10/assets/MainMenu.qml
rename to blackberry-qnx/cascades/assets/MainMenu.qml
diff --git a/blackberry-qnx/bb10/assets/images/file.png b/blackberry-qnx/cascades/assets/images/file.png
similarity index 100%
rename from blackberry-qnx/bb10/assets/images/file.png
rename to blackberry-qnx/cascades/assets/images/file.png
diff --git a/blackberry-qnx/bb10/assets/images/icon.png b/blackberry-qnx/cascades/assets/images/icon.png
similarity index 100%
rename from blackberry-qnx/bb10/assets/images/icon.png
rename to blackberry-qnx/cascades/assets/images/icon.png
diff --git a/blackberry-qnx/bb10/assets/images/open.png b/blackberry-qnx/cascades/assets/images/open.png
similarity index 100%
rename from blackberry-qnx/bb10/assets/images/open.png
rename to blackberry-qnx/cascades/assets/images/open.png
diff --git a/blackberry-qnx/bb10/assets/images/search.png b/blackberry-qnx/cascades/assets/images/search.png
similarity index 100%
rename from blackberry-qnx/bb10/assets/images/search.png
rename to blackberry-qnx/cascades/assets/images/search.png
diff --git a/blackberry-qnx/bb10/assets/main.qml b/blackberry-qnx/cascades/assets/main.qml
similarity index 100%
rename from blackberry-qnx/bb10/assets/main.qml
rename to blackberry-qnx/cascades/assets/main.qml
diff --git a/blackberry-qnx/bb10/bar-descriptor.xml b/blackberry-qnx/cascades/bar-descriptor.xml
similarity index 100%
rename from blackberry-qnx/bb10/bar-descriptor.xml
rename to blackberry-qnx/cascades/bar-descriptor.xml
diff --git a/blackberry-qnx/cascades/icon.png b/blackberry-qnx/cascades/icon.png
new file mode 100644
index 0000000000..bcbc3f9615
Binary files /dev/null and b/blackberry-qnx/cascades/icon.png differ
diff --git a/blackberry-qnx/bb10/src/ButtonMap.cpp b/blackberry-qnx/cascades/src/ButtonMap.cpp
similarity index 100%
rename from blackberry-qnx/bb10/src/ButtonMap.cpp
rename to blackberry-qnx/cascades/src/ButtonMap.cpp
diff --git a/blackberry-qnx/bb10/src/ButtonMap.h b/blackberry-qnx/cascades/src/ButtonMap.h
similarity index 100%
rename from blackberry-qnx/bb10/src/ButtonMap.h
rename to blackberry-qnx/cascades/src/ButtonMap.h
diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp b/blackberry-qnx/cascades/src/RetroArch-Cascades.cpp
similarity index 100%
rename from blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
rename to blackberry-qnx/cascades/src/RetroArch-Cascades.cpp
diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.h b/blackberry-qnx/cascades/src/RetroArch-Cascades.h
similarity index 100%
rename from blackberry-qnx/bb10/src/RetroArch-Cascades.h
rename to blackberry-qnx/cascades/src/RetroArch-Cascades.h
diff --git a/blackberry-qnx/bb10/src/main.cpp b/blackberry-qnx/cascades/src/main.cpp
similarity index 100%
rename from blackberry-qnx/bb10/src/main.cpp
rename to blackberry-qnx/cascades/src/main.cpp
diff --git a/blackberry-qnx/bb10/translations/Makefile b/blackberry-qnx/cascades/translations/Makefile
similarity index 100%
rename from blackberry-qnx/bb10/translations/Makefile
rename to blackberry-qnx/cascades/translations/Makefile
diff --git a/blackberry-qnx/bb10/translations/RetroArch-Cascades.pro b/blackberry-qnx/cascades/translations/RetroArch-Cascades.pro
similarity index 100%
rename from blackberry-qnx/bb10/translations/RetroArch-Cascades.pro
rename to blackberry-qnx/cascades/translations/RetroArch-Cascades.pro
diff --git a/blackberry-qnx/bb10/translations/RetroArch-Cascades.ts b/blackberry-qnx/cascades/translations/RetroArch-Cascades.ts
similarity index 100%
rename from blackberry-qnx/bb10/translations/RetroArch-Cascades.ts
rename to blackberry-qnx/cascades/translations/RetroArch-Cascades.ts
diff --git a/blackberry-qnx/playbook/.cproject b/blackberry-qnx/playbook/.cproject
index f05bf5017f..e011751fa8 100644
--- a/blackberry-qnx/playbook/.cproject
+++ b/blackberry-qnx/playbook/.cproject
@@ -43,7 +43,6 @@
-
@@ -168,7 +167,6 @@
-
@@ -295,7 +293,6 @@
-
@@ -417,7 +414,6 @@
-
diff --git a/config.def.h b/config.def.h
index 884c191015..a2a12ad0f4 100644
--- a/config.def.h
+++ b/config.def.h
@@ -235,7 +235,7 @@ enum
#if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__)
#define DEFAULT_ASPECT_RATIO 1.7778f
-#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__BLACKBERRY_QNX__)
+#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__QNX__)
#define DEFAULT_ASPECT_RATIO 1.3333f
#else
#define DEFAULT_ASPECT_RATIO -1.0f
diff --git a/driver.c b/driver.c
index bdf61ab8e8..6f77a40011 100644
--- a/driver.c
+++ b/driver.c
@@ -175,7 +175,7 @@ static const input_driver_t *input_drivers[] = {
#if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds
&input_apple,
#endif
-#ifdef __BLACKBERRY_QNX__
+#ifdef __QNX__
&input_qnx,
#endif
#ifdef EMSCRIPTEN
diff --git a/file_path.c b/file_path.c
index a5a8e63d9c..f28d32f51e 100644
--- a/file_path.c
+++ b/file_path.c
@@ -23,7 +23,7 @@
#include "compat/posix_string.h"
#include "miscellaneous.h"
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__BLACKBERRY_QNX__) || defined(PSP)
+#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
#include //stat() is defined here
#endif
diff --git a/gfx/gfx_context.c b/gfx/gfx_context.c
index eea953a0bc..f917950772 100644
--- a/gfx/gfx_context.c
+++ b/gfx/gfx_context.c
@@ -47,7 +47,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(ANDROID)
&gfx_ctx_android,
#endif
-#if defined(__BLACKBERRY_QNX__)
+#if defined(__QNX__)
&gfx_ctx_bbqnx,
#endif
#if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds
diff --git a/griffin/griffin.c b/griffin/griffin.c
index a04248f62a..e094822902 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -107,7 +107,7 @@ VIDEO CONTEXT
#include "../gfx/context/d3d_ctx.cpp"
#elif defined(ANDROID)
#include "../gfx/context/androidegl_ctx.c"
-#elif defined(__BLACKBERRY_QNX__)
+#elif defined(__QNX__)
#include "../gfx/context/bbqnx_ctx.c"
#elif defined(IOS) || defined(OSX)
#include "../gfx/context/apple_gl_ctx.c"
@@ -310,7 +310,7 @@ INPUT
#elif defined(IOS) || defined(OSX)
#include "../input/apple_input.c"
#include "../input/apple_joypad.c"
-#elif defined(__BLACKBERRY_QNX__)
+#elif defined(__QNX__)
#include "../blackberry-qnx/qnx_input.c"
#elif defined(EMSCRIPTEN)
#include "../input/rwebinput_input.c"
diff --git a/libretro-test-gl/Makefile b/libretro-test-gl/Makefile
index 85bfa8d4f2..0389b42afe 100644
--- a/libretro-test-gl/Makefile
+++ b/libretro-test-gl/Makefile
@@ -47,7 +47,7 @@ else ifeq ($(platform), qnx)
CC = qcc -Vgcc_ntoarmv7le
AR = qcc -Vgcc_ntoarmv7le
- CFLAGS += -D__BLACKBERRY_QNX__ -DGLES
+ CFLAGS += -DGLES
GL_LIB := -lGLESv2
else ifneq (,$(findstring armv,$(platform)))
CC = gcc