diff --git a/frontend/frontend.c b/frontend/frontend.c
index 0477fcb1f1..d229f968ed 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -117,7 +117,7 @@ void main_exit(args_type() args)
       driver->frontend_ctx->exitspawn(settings->libretro,
             sizeof(settings->libretro));
 
-   rarch_main_state_free();
+   rarch_main_free();
 
    if (driver->frontend_ctx && driver->frontend_ctx->shutdown)
       driver->frontend_ctx->shutdown(false);
@@ -286,7 +286,7 @@ returntype main_entry(signature())
    settings_t *settings = NULL;
    driver_t *driver     = NULL;
    
-   rarch_main_state_alloc();
+   rarch_main_alloc();
 
    driver = driver_get_ptr();
 
@@ -299,7 +299,7 @@ returntype main_entry(signature())
    if (driver->frontend_ctx && driver->frontend_ctx->init)
       driver->frontend_ctx->init(args);
 
-   rarch_main_state_new();
+   rarch_main_new();
 
    if (driver->frontend_ctx)
    {
diff --git a/retroarch.c b/retroarch.c
index 9f24d83715..43308a2bf0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1691,7 +1691,7 @@ static void main_init_state_config(void)
       settings->input.libretro_device[i] = RETRO_DEVICE_JOYPAD;
 }
 
-void rarch_main_state_alloc(void)
+void rarch_main_alloc(void)
 {
    settings_t *settings = config_get_ptr();
 
@@ -1709,14 +1709,14 @@ void rarch_main_state_alloc(void)
 }
 
 /**
- * rarch_main_state_new:
+ * rarch_main_new:
  *
  * Will teardown drivers and clears all 
  * internal state of RetroArch.
  * If @inited is true, will initialize all
  * drivers again after teardown.
  **/
-void rarch_main_state_new(void)
+void rarch_main_new(void)
 {
    main_clear_state_drivers();
    init_state();
@@ -1725,7 +1725,7 @@ void rarch_main_state_new(void)
    rarch_main_command(RARCH_CMD_MSG_QUEUE_INIT);
 }
 
-void rarch_main_state_free(void)
+void rarch_main_free(void)
 {
    rarch_main_command(RARCH_CMD_MSG_QUEUE_DEINIT);
    rarch_main_command(RARCH_CMD_LOG_FILE_DEINIT);
diff --git a/retroarch.h b/retroarch.h
index 24c878b27a..3c2c07b243 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -218,11 +218,11 @@ struct rarch_main_wrap
    bool touched;
 };
 
-void rarch_main_state_alloc(void);
+void rarch_main_alloc(void);
 
-void rarch_main_state_new(void);
+void rarch_main_new(void);
 
-void rarch_main_state_free(void);
+void rarch_main_free(void);
 
 void rarch_main_set_state(unsigned action);