diff --git a/Makefile.common b/Makefile.common
index 0ae74f5022..34dd5ee7b6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -389,8 +389,8 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
       HAVE_MATERIALUI = 1
    endif
 
-   #ifeq ($(HAVE_ZAHNRAD),)
-      #HAVE_ZAHNRAD = 1
+   #ifeq ($(HAVE_NUKLEAR),)
+      #HAVE_NUKLEAR = 1
    #endif
 
    ifeq ($(HAVE_XMB),)
@@ -399,7 +399,7 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
 else
    HAVE_ZARCH = 0
    HAVE_MATERIALUI  = 0
-   #HAVE_ZAHNRAD = 0
+   #HAVE_NUKLEAR = 0
    HAVE_XMB   = 0
 endif
 
@@ -411,11 +411,11 @@ ifeq ($(HAVE_MATERIALUI), 1)
    OBJ += menu/drivers/materialui.o
    DEFINES += -DHAVE_MATERIALUI
 endif
-ifeq ($(HAVE_ZAHNRAD), 1)
+ifeq ($(HAVE_NUKLEAR), 1)
    OBJ += menu/drivers/nk_common.o
    OBJ += menu/drivers/nk_menu.o
-   OBJ += menu/drivers/zr.o
-   DEFINES += -DHAVE_ZAHNRAD
+   OBJ += menu/drivers/nuklear.o
+   DEFINES += -DHAVE_NUKLEAR
 endif
 ifeq ($(HAVE_ZARCH), 1)
    OBJ += menu/drivers/zarch.o
diff --git a/config.def.h b/config.def.h
index 2138b092ec..1b3953f4d6 100644
--- a/config.def.h
+++ b/config.def.h
@@ -125,6 +125,7 @@ enum
    MENU_XUI,
    MENU_MATERIALUI,
    MENU_XMB,
+   MENU_NUKLEAR,
 
    RECORD_FFMPEG,
    RECORD_NULL
diff --git a/configuration.c b/configuration.c
index c93025e959..d0a13abdaa 100644
--- a/configuration.c
+++ b/configuration.c
@@ -373,6 +373,8 @@ const char *config_get_default_menu(void)
          return "glui";
       case MENU_XMB:
          return "xmb";
+      case MENU_NUKLEAR:
+         return "nuklear";
       default:
          break;
    }
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5966f9fe90..4750ff58ed 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -895,10 +895,10 @@ MENU
 #include "../menu/drivers/materialui.c"
 #endif
 
-#ifdef HAVE_ZAHNRAD
+#ifdef HAVE_NUKLEAR
 #include "../menu/drivers/nk_common.c"
 #include "../menu/drivers/nk_menu.c"
-#include "../menu/drivers/zr.c"
+#include "../menu/drivers/nuklear.c"
 #endif
 
 #ifdef HAVE_ZARCH
diff --git a/menu/drivers/zr.c b/menu/drivers/nuklear.c
similarity index 99%
rename from menu/drivers/zr.c
rename to menu/drivers/nuklear.c
index ee8368a2b8..96b4f3dcf7 100644
--- a/menu/drivers/zr.c
+++ b/menu/drivers/nuklear.c
@@ -458,7 +458,7 @@ static int zrmenu_iterate(void *data, void *userdata, enum menu_action action)
    return 0;
 }
 
-menu_ctx_driver_t menu_ctx_zr = {
+menu_ctx_driver_t menu_ctx_nuklear = {
    NULL,
    zrmenu_get_message,
    zrmenu_iterate,
@@ -490,7 +490,7 @@ menu_ctx_driver_t menu_ctx_zr = {
    NULL,
    NULL,
    NULL,
-   "zahnrad",
+   "nuklear",
    zrmenu_environ,
    NULL,
 };
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 96c1a04a65..1531a78e7f 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -46,8 +46,8 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #if defined(HAVE_MATERIALUI)
    &menu_ctx_mui,
 #endif
-#if defined(HAVE_ZAHNRAD)
-   &menu_ctx_zr,
+#if defined(HAVE_NUKLEAR)
+   &menu_ctx_nuklear,
 #endif
 #if defined(HAVE_XMB)
    &menu_ctx_xmb,
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index eb4072b847..889bff607a 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -471,7 +471,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
 extern menu_ctx_driver_t menu_ctx_xui;
 extern menu_ctx_driver_t menu_ctx_rgui;
 extern menu_ctx_driver_t menu_ctx_mui;
-extern menu_ctx_driver_t menu_ctx_zr;
+extern menu_ctx_driver_t menu_ctx_nuklear;
 extern menu_ctx_driver_t menu_ctx_xmb;
 extern menu_ctx_driver_t menu_ctx_zarch;
 extern menu_ctx_driver_t menu_ctx_null;
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 7cc10a3e26..16c576a2a6 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -3,7 +3,7 @@ HAVE_RGUI=yes              # RGUI menu
 HAVE_MATERIALUI=auto       # MaterialUI menu 
 HAVE_CHEEVOS=no            # Cheevos (achievements)
 HAVE_XMB=auto              # XMB menu
-HAVE_ZAHNRAD=no            # Zahnrad menu
+HAVE_NUKLEAR=no            # Nuklear menu
 HAVE_DYNAMIC=yes           # Dynamic loading of libretro library
 HAVE_SDL=auto              # SDL support
 C89_SDL=no