diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 651adf4037..0099f9a462 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -28,7 +28,7 @@ set(MYGUI_FILES
     openmw_container_window.layout
     openmw_count_window.layout
     openmw_dialogue_window.layout
-    openmw_dialogue_window_skin.xml
+    openmw_dialogue_window.skin.xml
     openmw_edit.skin.xml
     openmw_font.xml
     openmw_hud_box.skin.xml
@@ -38,19 +38,19 @@ set(MYGUI_FILES
     openmw_interactive_messagebox.layout
     openmw_inventory_window.layout
     openmw_journal.layout
-    openmw_journal_skin.xml
+    openmw_journal.skin.xml
     openmw_layers.xml
     openmw_list.skin.xml
     openmw_mainmenu.layout
-    openmw_mainmenu_skin.xml
+    openmw_mainmenu.skin.xml
     openmw_map_window.layout
-    openmw_map_window_skin.xml
+    openmw_map_window.skin.xml
     openmw_messagebox.layout
     openmw_pointer.xml
     openmw_progress.skin.xml
     openmw_resources.xml
     openmw_scroll.layout
-    openmw_scroll_skin.xml
+    openmw_scroll.skin.xml
     openmw_settings_window.layout
     openmw_settings.xml
     openmw_spell_window.layout
diff --git a/files/mygui/core.xml b/files/mygui/core.xml
index 1331093759..f3b482d50d 100644
--- a/files/mygui/core.xml
+++ b/files/mygui/core.xml
@@ -15,12 +15,12 @@
         <List file="openmw_progress.skin.xml" />
         <List file="openmw_hud_energybar.skin.xml" />
         <List file="openmw_hud_box.skin.xml" />
-        <List file="openmw_mainmenu_skin.xml" />
+        <List file="openmw_mainmenu.skin.xml" />
         <List file="openmw_console.skin.xml" />
-        <List file="openmw_journal_skin.xml" />
-        <List file="openmw_map_window_skin.xml" />
-        <List file="openmw_dialogue_window_skin.xml" />
-        <List file="openmw_scroll_skin.xml" />
+        <List file="openmw_journal.skin.xml" />
+        <List file="openmw_map_window.skin.xml" />
+        <List file="openmw_dialogue_window.skin.xml" />
+        <List file="openmw_scroll.skin.xml" />
         <List file="openmw_settings.xml" />
         <List file="openmw_debug_window.skin.xml" />
     </MyGUI>
diff --git a/files/mygui/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window.skin.xml
similarity index 100%
rename from files/mygui/openmw_dialogue_window_skin.xml
rename to files/mygui/openmw_dialogue_window.skin.xml
diff --git a/files/mygui/openmw_journal_skin.xml b/files/mygui/openmw_journal.skin.xml
similarity index 100%
rename from files/mygui/openmw_journal_skin.xml
rename to files/mygui/openmw_journal.skin.xml
diff --git a/files/mygui/openmw_mainmenu_skin.xml b/files/mygui/openmw_mainmenu.skin.xml
similarity index 100%
rename from files/mygui/openmw_mainmenu_skin.xml
rename to files/mygui/openmw_mainmenu.skin.xml
diff --git a/files/mygui/openmw_map_window_skin.xml b/files/mygui/openmw_map_window.skin.xml
similarity index 100%
rename from files/mygui/openmw_map_window_skin.xml
rename to files/mygui/openmw_map_window.skin.xml
diff --git a/files/mygui/openmw_scroll_skin.xml b/files/mygui/openmw_scroll.skin.xml
similarity index 100%
rename from files/mygui/openmw_scroll_skin.xml
rename to files/mygui/openmw_scroll.skin.xml