8 files changed, 10 insertions, 10 deletions
diff --git a/engines/sword2/anims.cpp b/engines/sword2/anims.cpp
index e64903a61f..b4b5deecc6 100644
--- a/engines/sword2/anims.cpp
+++ b/engines/sword2/anims.cpp
@@ -30,7 +30,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index e749e7b497..a2f41f48b0 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -25,7 +25,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/console.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
diff --git a/engines/sword2/module.mk b/engines/sword2/module.mk
index 007f71d90f..bbc7f41eee 100644
--- a/engines/sword2/module.mk
+++ b/engines/sword2/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
 	_mouse.o \
 	animation.o \
 	anims.o \
-	build_display.o \
 	console.o \
 	controls.o \
 	d_draw.o \
@@ -26,7 +25,8 @@ MODULE_OBJS := \
 	render.o \
 	resman.o \
 	router.o \
-	save_rest.o \
+	saveload.o \
+	screen.o \
 	scroll.o \
 	sound.o \
 	speech.o \
diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index f8c315a47f..83a8b1faf2 100644
--- a/engines/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
@@ -383,7 +383,7 @@ void Mouse::systemMenuMouse() {
 	processMenu();
 
 	// Reset game palette, but not after a successful restore or restart!
-	// See RestoreFromBuffer() in save_rest.cpp
+	// See RestoreFromBuffer() in saveload.cpp
 
 	ScreenInfo *screenInfo = _vm->_screen->getScreenInfo();
 
diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index da60ecd6d9..261ba8b406 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -26,7 +26,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 
 #ifdef BACKEND_8BIT
 #include "sword2/animation.h"
diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index a0ba7f7189..a353180561 100644
--- a/engines/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
@@ -23,7 +23,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 6056d636b7..cf7178dcb7 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -666,7 +666,7 @@ void Sword2Engine::unpauseGame() {
 	_mouse->unpauseGame();
 	_sound->unpauseAllSound();
 
-	// Put back game screen palette; see build_display.cpp
+	// Put back game screen palette; see screen.cpp
 	_screen->setFullPalette(-1);
 
 	// If graphics level at max, turn up again
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index bcb80ec957..c7b844bffe 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -33,11 +33,11 @@
 
 #include "common/util.h"
 
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/object.h"
-#include "sword2/save_rest.h"
+#include "sword2/saveload.h"
 
 #define	MAX_starts	100
 #define	MAX_description	100