diff --git a/360/menu.cpp b/360/menu.cpp
index 83e0235a1c..de72ff28fb 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -46,7 +46,7 @@ static void return_to_dashboard (void)
 }
 
 /* Register custom classes */
-HRESULT CSSNES::RegisterXuiClasses (void)
+HRESULT CRetroArch::RegisterXuiClasses (void)
 {
    CSSNESMain::Register();
    CSSNESFileBrowser::Register();
@@ -58,7 +58,7 @@ HRESULT CSSNES::RegisterXuiClasses (void)
 }
 
 /* Unregister custom classes */
-HRESULT CSSNES::UnregisterXuiClasses (void)
+HRESULT CRetroArch::UnregisterXuiClasses (void)
 {
    CSSNESMain::Unregister();
    CSSNESCoreBrowser::Unregister();
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index c130b0f2ab..bb8c9406d5 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -163,7 +163,7 @@ MAIN
 /*============================================================
 SSNES
 ============================================================ */
-#include "../../ssnes.c"
+#include "../../retroarch.c"
 
 /*============================================================
 THREAD
diff --git a/console/griffin/ssnes_func_hooks.h b/console/griffin/rarch_func_hooks.h
similarity index 100%
rename from console/griffin/ssnes_func_hooks.h
rename to console/griffin/rarch_func_hooks.h