diff --git a/data/gui/gpedit.stkgui b/data/gui/edit_gp.stkgui
similarity index 100%
rename from data/gui/gpedit.stkgui
rename to data/gui/edit_gp.stkgui
diff --git a/data/gui/gpeditor.stkgui b/data/gui/grand_prix_editor.stkgui
similarity index 100%
rename from data/gui/gpeditor.stkgui
rename to data/gui/grand_prix_editor.stkgui
diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index ec3884762..026f30a22 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -35,7 +35,7 @@ using namespace GUIEngine;
 DEFINE_SCREEN_SINGLETON( EditGPScreen );
 
 // -----------------------------------------------------------------------------
-EditGPScreen::EditGPScreen() : Screen("gpedit.stkgui"), m_gp(NULL),
+EditGPScreen::EditGPScreen() : Screen("edit_gp.stkgui"), m_gp(NULL),
               m_list(NULL), m_icon_bank(NULL),
               m_selected(-1), m_modified(false)
 {
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 5bd16efb3..7fb1ef731 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -40,8 +40,9 @@ DEFINE_SCREEN_SINGLETON( GrandPrixEditorScreen );
 
 
 // -----------------------------------------------------------------------------
-GrandPrixEditorScreen::GrandPrixEditorScreen()
-    : Screen("gpeditor.stkgui"), m_selection(NULL), m_gpgroup(GrandPrixData::GP_NONE)
+GrandPrixEditorScreen::GrandPrixEditorScreen() 
+                     : Screen("grand_prix_editor.stkgui"), m_selection(NULL),
+                       m_gpgroup(GrandPrixData::GP_NONE)
 {
 }