Revert "Revert "Revert "First pass renaming sreen and widgets."""

This reverts commit 87821f04c9565450d8e724be76993ae5ea2c20c4.

6 files changed, 22 insertions, 22 deletions

diff --git a/src/client/chat.c b/src/client/chat.c
index b446b08..6ca9ec9 100644
--- a/src/client/chat.c
+++ b/src/client/chat.c
@@ -11,7 +11,7 @@
 #include "serverSendMsg.h"
 
 #include "net_multiplayer.h"
-#include "world.h"
+#include "screen_world.h"
 #include "proto.h"
 #include "interface.h"
 #include "chat.h"
diff --git a/src/client/client.c b/src/client/client.c
index 1902be6..e92a238 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -23,8 +23,8 @@
 
 #include "client.h"
 
-#include "analyze.h"
-#include "world.h"
+#include "screen_analyze.h"
+#include "screen_world.h"
 #include "buffer.h"
 
 #include "udp.h"
diff --git a/src/client/game.c b/src/client/game.c
index 87676d5..e96805b 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -20,7 +20,7 @@
 #include "interface.h"
 #include "screen.h"
 #include "font.h"
-#include "settingKeys.h"
+#include "screen_settingKeys.h"
 #include "panel.h"
 #include "radar.h"
 
@@ -30,17 +30,17 @@
 #    include "music.h"
 #endif
 
-#include "world.h"
-#include "mainMenu.h"
-#include "analyze.h"
-#include "setting.h"
-#include "settingKeys.h"
-#include "gameType.h"
-#include "downArena.h"
-#include "choiceArena.h"
-#include "table.h"
-#include "credits.h"
-#include "browser.h"
+#include "screen_world.h"
+#include "screen_mainMenu.h"
+#include "screen_analyze.h"
+#include "screen_setting.h"
+#include "screen_settingKeys.h"
+#include "screen_gameType.h"
+#include "screen_downArena.h"
+#include "screen_choiceArena.h"
+#include "screen_table.h"
+#include "screen_credits.h"
+#include "screen_browser.h"
 
 static void initGame()
 {
diff --git a/src/client/layer.c b/src/client/layer.c
index c50be65..983a9c8 100644
--- a/src/client/layer.c
+++ b/src/client/layer.c
@@ -10,7 +10,7 @@
 #include "layer.h"
 #include "image.h"
 
-#include "world.h"
+#include "screen_world.h"
 
 static list_t *listLayer;
 
diff --git a/src/client/saveDialog.c b/src/client/saveDialog.c
index d8cfa29..1c832e7 100644
--- a/src/client/saveDialog.c
+++ b/src/client/saveDialog.c
@@ -17,9 +17,9 @@
 #include "hotKey.h"
 
 #include "widget.h"
-#include "label.h"
-#include "button.h"
-#include "textfield.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_textfield.h"
 
 static image_t *g_background;
 static bool_t activeSaveDialog;
@@ -64,7 +64,7 @@ void initSaveDialog()
 {
 	activeSaveDialog = FALSE;
 
-	g_background = getImage(IMAGE_GROUP_BASE, "main");
+	g_background = getImage(IMAGE_GROUP_BASE, "screen_main");
 
 	widgetLabelMsg = newWidgetLabel("name", SAVE_DIALOG_LOCATIN_X + 20,
 						SAVE_DIALOG_LOCATIN_Y + 20,
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index 0448a4f..b5dbdf2 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -16,8 +16,8 @@
 
 #include "saveLoad.h"
 
-#include "choiceArena.h"
-#include "world.h"
+#include "screen_choiceArena.h"
+#include "screen_world.h"
 
 static void action_saveTux(space_t * space, tux_t * tux, textFile_t * textFile)
 {