73 files changed, 226 insertions, 226 deletions

diff --git a/engines/gargoyle/blorb.cpp b/engines/glk/blorb.cpp
index 064f9c48a1..24340fa2e5 100644
--- a/engines/gargoyle/blorb.cpp
+++ b/engines/glk/blorb.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/blorb.h"
+#include "glk/blorb.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/blorb.h b/engines/glk/blorb.h
index 9de1947cb0..75f811ccfd 100644
--- a/engines/gargoyle/blorb.h
+++ b/engines/glk/blorb.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_BLORB_H
-#define GARGOYLE_BLORB_H
+#ifndef GLK_BLORB_H
+#define GLK_BLORB_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/streams.h"
+#include "glk/glk_types.h"
+#include "glk/streams.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/conf.cpp b/engines/glk/conf.cpp
index 9a0d6482aa..45d6168a8f 100644
--- a/engines/gargoyle/conf.cpp
+++ b/engines/glk/conf.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/conf.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/utils.h"
-#include "gargoyle/windows.h"
+#include "glk/conf.h"
+#include "glk/fonts.h"
+#include "glk/utils.h"
+#include "glk/windows.h"
 #include "common/config-manager.h"
 #include "common/system.h"
 
diff --git a/engines/gargoyle/conf.h b/engines/glk/conf.h
index 05dc6c9b46..6c9dbf9f56 100644
--- a/engines/gargoyle/conf.h
+++ b/engines/glk/conf.h
@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_CONF_H
-#define GARGOYLE_CONF_H
+#ifndef GLK_CONF_H
+#define GLK_CONF_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/windows.h"
+#include "glk/glk_types.h"
+#include "glk/fonts.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/configure.engine b/engines/glk/configure.engine
index 3569297cbd..7f4efd6ca6 100644
--- a/engines/gargoyle/configure.engine
+++ b/engines/glk/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine gargoyle "Interactive Fiction games" no "" "" "freetype2"
+add_engine glk "ScummGlk Interactive Fiction games" no "" "" "freetype2"
diff --git a/engines/gargoyle/detection.cpp b/engines/glk/detection.cpp
index 61cf20118c..9266825fa2 100644
--- a/engines/gargoyle/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/gargoyle.h"
+#include "glk/gargoyle.h"
 
 #include "base/plugins.h"
 #include "common/md5.h"
@@ -68,7 +68,7 @@ const Common::String &GargoyleEngine::getGameMD5() const {
 
 } // End of namespace Gargoyle
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 #define ZCODE(ID, NAME) { ID, Gargoyle::Frotz::NAME##_DESC }
 
 static const PlainGameDescriptor gargoyleGames[] = {
@@ -140,11 +140,11 @@ static const PlainGameDescriptor gargoyleGames[] = {
 
 #include "common/config-manager.h"
 #include "common/file.h"
-#include "gargoyle/detection_tables.h"
-#include "gargoyle/frotz/detection.h"
-#include "gargoyle/frotz/frotz.h"
-#include "gargoyle/scott/detection.h"
-#include "gargoyle/scott/scott.h"
+#include "glk/detection_tables.h"
+#include "glk/frotz/detection.h"
+#include "glk/frotz/frotz.h"
+#include "glk/scott/detection.h"
+#include "glk/scott/scott.h"
 
 class GargoyleMetaEngine : public AdvancedMetaEngine {
 public:
@@ -153,11 +153,11 @@ public:
 	}
 
 	virtual const char *getName() const {
-		return "Gargoyle Engine";
+		return "ScummGlk Engine";
 	}
 
 	virtual const char *getOriginalCopyright() const {
-		return "Gargoyle Engine (c) 2018";
+		return "ScummGlk Engine (c) 2018";
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const override;
@@ -316,8 +316,8 @@ ADDetectedGames GargoyleMetaEngine::detectGame(const Common::FSNode &parent, con
 	return results;
 }
 
-#if PLUGIN_ENABLED_DYNAMIC(GARGOYLE)
-REGISTER_PLUGIN_DYNAMIC(Gargoyle, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(GLK)
+REGISTER_PLUGIN_DYNAMIC(GLK, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
 #else
-REGISTER_PLUGIN_STATIC(GARGOYLE, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
+REGISTER_PLUGIN_STATIC(GLK, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
 #endif
diff --git a/engines/gargoyle/detection_tables.h b/engines/glk/detection_tables.h
index 30491f6d9b..30491f6d9b 100644
--- a/engines/gargoyle/detection_tables.h
+++ b/engines/glk/detection_tables.h
diff --git a/engines/gargoyle/events.cpp b/engines/glk/events.cpp
index 6c0cd71985..74a108e074 100644
--- a/engines/gargoyle/events.cpp
+++ b/engines/glk/events.cpp
@@ -20,12 +20,12 @@
  *
  */
 
-#include "gargoyle/events.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/windows.h"
+#include "glk/events.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/windows.h"
 #include "graphics/cursorman.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/events.h b/engines/glk/events.h
index 745f1ae697..537813f314 100644
--- a/engines/gargoyle/events.h
+++ b/engines/glk/events.h
@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_EVENTS_H
-#define GARGOYLE_EVENTS_H
+#ifndef GLK_EVENTS_H
+#define GLK_EVENTS_H
 
 #include "common/events.h"
 #include "graphics/surface.h"
-#include "gargoyle/utils.h"
+#include "glk/utils.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/fonts.cpp b/engines/glk/fonts.cpp
index 9c074127df..ee958b0e0c 100644
--- a/engines/gargoyle/fonts.cpp
+++ b/engines/glk/fonts.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/fonts.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
+#include "glk/fonts.h"
+#include "glk/glk_types.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
 #include "common/memstream.h"
 #include "common/unzip.h"
 #include "graphics/fonts/ttf.h"
diff --git a/engines/gargoyle/fonts.h b/engines/glk/fonts.h
index 737618e41d..db547aabc4 100644
--- a/engines/gargoyle/fonts.h
+++ b/engines/glk/fonts.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FONTS_H
-#define GARGOYLE_FONTS_H
+#ifndef GLK_FONTS_H
+#define GLK_FONTS_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/utils.h"
+#include "glk/glk_types.h"
+#include "glk/utils.h"
 #include "common/archive.h"
 #include "common/array.h"
 #include "common/file.h"
diff --git a/engines/gargoyle/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index fff8005e5f..57965c8efb 100644
--- a/engines/gargoyle/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/frotz/detection.h"
+#include "glk/frotz/detection.h"
 #include "common/file.h"
 #include "common/md5.h"
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/detection.h b/engines/glk/frotz/detection.h
index 2e70d7cc88..7630cb3f0f 100644
--- a/engines/gargoyle/frotz/detection.h
+++ b/engines/glk/frotz/detection.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_DETECTION
-#define GARGOYLE_FROTZ_DETECTION
+#ifndef GLK_FROTZ_DETECTION
+#define GLK_FROTZ_DETECTION
 
 #include "common/fs.h"
 #include "engines/game.h"
diff --git a/engines/gargoyle/frotz/detection_tables.cpp b/engines/glk/frotz/detection_tables.cpp
index af856ed3e6..3f619a5e4f 100644
--- a/engines/gargoyle/frotz/detection_tables.cpp
+++ b/engines/glk/frotz/detection_tables.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/detection_tables.h b/engines/glk/frotz/detection_tables.h
index 48e0eb0a5a..48e0eb0a5a 100644
--- a/engines/gargoyle/frotz/detection_tables.h
+++ b/engines/glk/frotz/detection_tables.h
diff --git a/engines/gargoyle/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp
index 3a7b913da4..0e516f0496 100644
--- a/engines/gargoyle/frotz/frotz.cpp
+++ b/engines/glk/frotz/frotz.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/frotz.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/frotz.h"
+#include "glk/frotz/frotz_types.h"
 #include "common/config-manager.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/frotz/frotz.h b/engines/glk/frotz/frotz.h
index f7211f7c3d..c1fe5dcab6 100644
--- a/engines/gargoyle/frotz/frotz.h
+++ b/engines/glk/frotz/frotz.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_FROTZ
-#define GARGOYLE_FROTZ_FROTZ
+#ifndef GLK_FROTZ_FROTZ
+#define GLK_FROTZ_FROTZ
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/frotz_types.h b/engines/glk/frotz/frotz_types.h
index 6b4fe675f1..5aae3d07c3 100644
--- a/engines/gargoyle/frotz/frotz_types.h
+++ b/engines/glk/frotz/frotz_types.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_FROTZ_TYPES
-#define GARGOYLE_FROTZ_FROTZ_TYPES
+#ifndef GLK_FROTZ_FROTZ_TYPES
+#define GLK_FROTZ_FROTZ_TYPES
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 #include "common/algorithm.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index c376dc0056..b2534385e4 100644
--- a/engines/gargoyle/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/glk_interface.h"
+#include "glk/frotz/glk_interface.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h
index 5393c5de10..e3fa2c9081 100644
--- a/engines/gargoyle/frotz/glk_interface.h
+++ b/engines/glk/frotz/glk_interface.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_GLK_INTERFACE
-#define GARGOYLE_FROTZ_GLK_INTERFACE
+#ifndef GLK_FROTZ_GLK_INTERFACE
+#define GLK_FROTZ_GLK_INTERFACE
 
-#include "gargoyle/glk.h"
-#include "gargoyle/frotz/mem.h"
+#include "glk/glk.h"
+#include "glk/frotz/mem.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/mem.cpp b/engines/glk/frotz/mem.cpp
index e327fbaecf..a7747f5698 100644
--- a/engines/gargoyle/frotz/mem.cpp
+++ b/engines/glk/frotz/mem.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/mem.h"
-#include "gargoyle/frotz/frotz.h"
+#include "glk/frotz/mem.h"
+#include "glk/frotz/frotz.h"
 #include "common/memstream.h"
 #include "common/textconsole.h"
 
diff --git a/engines/gargoyle/frotz/mem.h b/engines/glk/frotz/mem.h
index a2e0e347b6..de22006a33 100644
--- a/engines/gargoyle/frotz/mem.h
+++ b/engines/glk/frotz/mem.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_MEM
-#define GARGOYLE_FROTZ_MEM
+#ifndef GLK_FROTZ_MEM
+#define GLK_FROTZ_MEM
 
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/frotz_types.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor.cpp b/engines/glk/frotz/processor.cpp
index 3336aaec8b..1cdc67a589 100644
--- a/engines/gargoyle/frotz/processor.cpp
+++ b/engines/glk/frotz/processor.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
-#include "gargoyle/frotz/frotz.h"
+#include "glk/frotz/processor.h"
+#include "glk/frotz/frotz.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor.h b/engines/glk/frotz/processor.h
index 3ead900762..b5c113def0 100644
--- a/engines/gargoyle/frotz/processor.h
+++ b/engines/glk/frotz/processor.h
@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_PROCESSOR
-#define GARGOYLE_FROTZ_PROCESSOR
+#ifndef GLK_FROTZ_PROCESSOR
+#define GLK_FROTZ_PROCESSOR
 
-#include "gargoyle/frotz/mem.h"
-#include "gargoyle/frotz/glk_interface.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/mem.h"
+#include "glk/frotz/glk_interface.h"
+#include "glk/frotz/frotz_types.h"
 #include "common/stack.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/frotz/processor_buffer.cpp b/engines/glk/frotz/processor_buffer.cpp
index 62980fb20e..faec6ef33d 100644
--- a/engines/gargoyle/frotz/processor_buffer.cpp
+++ b/engines/glk/frotz/processor_buffer.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 #include "common/algorithm.h"
 #include "common/textconsole.h"
 
diff --git a/engines/gargoyle/frotz/processor_input.cpp b/engines/glk/frotz/processor_input.cpp
index fa9da21795..6dda853fa0 100644
--- a/engines/gargoyle/frotz/processor_input.cpp
+++ b/engines/glk/frotz/processor_input.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_maths.cpp b/engines/glk/frotz/processor_maths.cpp
index e64dd55a1a..90e09ca8b9 100644
--- a/engines/gargoyle/frotz/processor_maths.cpp
+++ b/engines/glk/frotz/processor_maths.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_mem.cpp b/engines/glk/frotz/processor_mem.cpp
index d46402c53c..7c7af0d2f5 100644
--- a/engines/gargoyle/frotz/processor_mem.cpp
+++ b/engines/glk/frotz/processor_mem.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_objects.cpp b/engines/glk/frotz/processor_objects.cpp
index 986bf879d0..7e1fe6de0c 100644
--- a/engines/gargoyle/frotz/processor_objects.cpp
+++ b/engines/glk/frotz/processor_objects.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 77e2e94295..87c190f3c5 100644
--- a/engines/gargoyle/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_streams.cpp b/engines/glk/frotz/processor_streams.cpp
index 50d642585d..b7b23b2db9 100644
--- a/engines/gargoyle/frotz/processor_streams.cpp
+++ b/engines/glk/frotz/processor_streams.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
-#include "gargoyle/frotz/quetzal.h"
+#include "glk/frotz/processor.h"
+#include "glk/frotz/quetzal.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_table.cpp b/engines/glk/frotz/processor_table.cpp
index d4490628e3..bb163899af 100644
--- a/engines/gargoyle/frotz/processor_table.cpp
+++ b/engines/glk/frotz/processor_table.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_text.cpp b/engines/glk/frotz/processor_text.cpp
index 0852dc4b38..e05879398e 100644
--- a/engines/gargoyle/frotz/processor_text.cpp
+++ b/engines/glk/frotz/processor_text.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/processor_variables.cpp b/engines/glk/frotz/processor_variables.cpp
index 19a40b9088..0162f84d17 100644
--- a/engines/gargoyle/frotz/processor_variables.cpp
+++ b/engines/glk/frotz/processor_variables.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/frotz/quetzal.cpp b/engines/glk/frotz/quetzal.cpp
index 183217a390..a7b48fc699 100644
--- a/engines/gargoyle/frotz/quetzal.cpp
+++ b/engines/glk/frotz/quetzal.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/quetzal.h"
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/quetzal.h"
+#include "glk/frotz/processor.h"
 #include "common/memstream.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/frotz/quetzal.h b/engines/glk/frotz/quetzal.h
index 69751553e2..bbd4496a45 100644
--- a/engines/gargoyle/frotz/quetzal.h
+++ b/engines/glk/frotz/quetzal.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_QUETZAL
-#define GARGOYLE_FROTZ_QUETZAL
+#ifndef GLK_FROTZ_QUETZAL
+#define GLK_FROTZ_QUETZAL
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/glk_types.h"
+#include "glk/frotz/frotz_types.h"
 
 namespace Gargoyle {
 namespace Frotz {
diff --git a/engines/gargoyle/gargoyle.cpp b/engines/glk/gargoyle.cpp
index 021323cd6a..702efe7443 100644
--- a/engines/gargoyle/gargoyle.cpp
+++ b/engines/glk/gargoyle.cpp
@@ -28,14 +28,14 @@
 #include "engines/util.h"
 #include "graphics/scaler.h"
 #include "graphics/thumbnail.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/streams.h"
-#include "gargoyle/windows.h"
+#include "glk/gargoyle.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/picture.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/streams.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/gargoyle.h b/engines/glk/gargoyle.h
index 676708ff41..d3019ca039 100644
--- a/engines/gargoyle/gargoyle.h
+++ b/engines/glk/gargoyle.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_GARGOLE_H
-#define GARGOYLE_GARGOLE_H
+#ifndef GLK_GARGOLE_H
+#define GLK_GARGOLE_H
 
 #include "common/scummsys.h"
 #include "common/random.h"
@@ -29,7 +29,7 @@
 #include "common/serializer.h"
 #include "engines/advancedDetector.h"
 #include "engines/engine.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
@@ -68,7 +68,7 @@ enum GargoyleDebugChannels {
 };
 
 
-#define GARGOYLE_SAVEGAME_VERSION 1
+#define GLK_SAVEGAME_VERSION 1
 
 struct GargoyleGameDescription;
 
diff --git a/engines/gargoyle/glk.cpp b/engines/glk/glk.cpp
index 58293f7902..77fb242b8b 100644
--- a/engines/gargoyle/glk.cpp
+++ b/engines/glk/glk.cpp
@@ -20,16 +20,16 @@
  *
  */
 
-#include "gargoyle/glk.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/streams.h"
-#include "gargoyle/unicode.h"
-#include "gargoyle/windows.h"
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/window_pair.h"
+#include "glk/glk.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/picture.h"
+#include "glk/streams.h"
+#include "glk/unicode.h"
+#include "glk/windows.h"
+#include "glk/window_graphics.h"
+#include "glk/window_text_buffer.h"
+#include "glk/window_pair.h"
 
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/glk.h b/engines/glk/glk.h
index 2f3620f876..f71ad764ac 100644
--- a/engines/gargoyle/glk.h
+++ b/engines/glk/glk.h
@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef GARGOYLE_GLK_H
-#define GARGOYLE_GLK_H
-
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/blorb.h"
-#include "gargoyle/time.h"
-#include "gargoyle/windows.h"
+#ifndef GLK_GLK_H
+#define GLK_GLK_H
+
+#include "glk/gargoyle.h"
+#include "glk/glk_types.h"
+#include "glk/blorb.h"
+#include "glk/time.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/glk_types.h b/engines/glk/glk_types.h
index 21a8b7599e..32b0968761 100644
--- a/engines/gargoyle/glk_types.h
+++ b/engines/glk/glk_types.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_GLK_TYPES_H
-#define GARGOYLE_GLK_TYPES_H
+#ifndef GLK_GLK_TYPES_H
+#define GLK_GLK_TYPES_H
 
 #include "common/scummsys.h"
 #include "common/stream.h"
diff --git a/engines/gargoyle/module.mk b/engines/glk/module.mk
index 3c09b32595..e3fa26b684 100644
--- a/engines/gargoyle/module.mk
+++ b/engines/glk/module.mk
@@ -1,4 +1,4 @@
-MODULE := engines/gargoyle
+MODULE := engines/glk
 
 MODULE_OBJS := \
 	blorb.o \
@@ -42,7 +42,7 @@ MODULE_OBJS := \
 	scott/scott.o
 
 # This module can be built as a plugin
-ifeq ($(ENABLE_GARGOYLE), DYNAMIC_PLUGIN)
+ifeq ($(ENABLE_GLK), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
diff --git a/engines/gargoyle/picture.cpp b/engines/glk/picture.cpp
index fd33e718dd..444589bde8 100644
--- a/engines/gargoyle/picture.cpp
+++ b/engines/glk/picture.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/picture.h"
+#include "glk/picture.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/picture.h b/engines/glk/picture.h
index c9527c5663..e29d420bdf 100644
--- a/engines/gargoyle/picture.h
+++ b/engines/glk/picture.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_PICTURE_H
-#define GARGOYLE_PICTURE_H
+#ifndef GLK_PICTURE_H
+#define GLK_PICTURE_H
 
 #include "graphics/surface.h"
 
diff --git a/engines/gargoyle/scott/detection.cpp b/engines/glk/scott/detection.cpp
index e4047a5300..900f6507fc 100644
--- a/engines/gargoyle/scott/detection.cpp
+++ b/engines/glk/scott/detection.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/scott/detection.h"
+#include "glk/scott/detection.h"
 #include "common/file.h"
 #include "common/md5.h"
 
diff --git a/engines/gargoyle/scott/detection.h b/engines/glk/scott/detection.h
index 01e1ffe64d..cd487bdfdd 100644
--- a/engines/gargoyle/scott/detection.h
+++ b/engines/glk/scott/detection.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_SCOTT_DETECTION
-#define GARGOYLE_SCOTT_DETECTION
+#ifndef GLK_SCOTT_DETECTION
+#define GLK_SCOTT_DETECTION
 
 #include "common/fs.h"
 #include "engines/game.h"
diff --git a/engines/gargoyle/scott/scott.cpp b/engines/glk/scott/scott.cpp
index 698a2ea0c3..a5e866796a 100644
--- a/engines/gargoyle/scott/scott.cpp
+++ b/engines/glk/scott/scott.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/scott/scott.h"
+#include "glk/scott/scott.h"
 #include "common/config-manager.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/scott/scott.h b/engines/glk/scott/scott.h
index 168476c158..ec6a8601ba 100644
--- a/engines/gargoyle/scott/scott.h
+++ b/engines/glk/scott/scott.h
@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef GARGOYLE_SCOTT
-#define GARGOYLE_SCOTT
+#ifndef GLK_SCOTT
+#define GLK_SCOTT
 
 /*
  *  Controlling block
  */
 
 #include "common/scummsys.h"
-#include "gargoyle/glk.h"
+#include "glk/glk.h"
 
 namespace Gargoyle {
 namespace Scott {
diff --git a/engines/gargoyle/screen.cpp b/engines/glk/screen.cpp
index 6aed8f9e30..ff46f1b57b 100644
--- a/engines/gargoyle/screen.cpp
+++ b/engines/glk/screen.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/screen.h"
-#include "gargoyle/conf.h"
+#include "glk/screen.h"
+#include "glk/conf.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/screen.h b/engines/glk/screen.h
index aa43b1bfdb..e81cf9faa4 100644
--- a/engines/gargoyle/screen.h
+++ b/engines/glk/screen.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_DRAW_H
-#define GARGOYLE_DRAW_H
+#ifndef GLK_DRAW_H
+#define GLK_DRAW_H
 
 #include "graphics/screen.h"
-#include "gargoyle/fonts.h"
+#include "glk/fonts.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/selection.cpp b/engines/glk/selection.cpp
index 27cfbe7083..f1c5bb86dc 100644
--- a/engines/gargoyle/selection.cpp
+++ b/engines/glk/selection.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/selection.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/windows.h"
+#include "glk/selection.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/windows.h"
 #include "common/system.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/selection.h b/engines/glk/selection.h
index a82af6d2a0..aa44a1d115 100644
--- a/engines/gargoyle/selection.h
+++ b/engines/glk/selection.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_SELECTION_H
-#define GARGOYLE_SELECTION_H
+#ifndef GLK_SELECTION_H
+#define GLK_SELECTION_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/utils.h"
+#include "glk/glk_types.h"
+#include "glk/utils.h"
 #include "common/array.h"
 #include "common/rect.h"
 #include "common/ustr.h"
diff --git a/engines/gargoyle/speech.h b/engines/glk/speech.h
index 1ff2cb178d..5f9255565a 100644
--- a/engines/gargoyle/speech.h
+++ b/engines/glk/speech.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_SPEECH_H
-#define GARGOYLE_SPEECH_H
+#ifndef GLK_SPEECH_H
+#define GLK_SPEECH_H
 
 #include "common/events.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/streams.cpp b/engines/glk/streams.cpp
index 6a8708425a..d53f5d72a1 100644
--- a/engines/gargoyle/streams.cpp
+++ b/engines/glk/streams.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/streams.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/windows.h"
+#include "glk/streams.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/gargoyle.h"
+#include "glk/windows.h"
 #include "gui/saveload.h"
 #include "common/file.h"
 #include "common/savefile.h"
diff --git a/engines/gargoyle/streams.h b/engines/glk/streams.h
index ea9c651e45..24ecc68eb5 100644
--- a/engines/gargoyle/streams.h
+++ b/engines/glk/streams.h
@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef GARGOYLE_STREAMS_H
-#define GARGOYLE_STREAMS_H
+#ifndef GLK_STREAMS_H
+#define GLK_STREAMS_H
 
 #include "common/scummsys.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/str.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/time.cpp b/engines/glk/time.cpp
index 39c3b7cfd5..9442102779 100644
--- a/engines/gargoyle/time.cpp
+++ b/engines/glk/time.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/time.h"
+#include "glk/time.h"
 #include "common/system.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/time.h b/engines/glk/time.h
index 3e658d29f3..119fab76e5 100644
--- a/engines/gargoyle/time.h
+++ b/engines/glk/time.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_TIME_H
-#define GARGOYLE_TIME_H
+#ifndef GLK_TIME_H
+#define GLK_TIME_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/unicode.cpp b/engines/glk/unicode.cpp
index f32093b2f5..dd88c9571a 100644
--- a/engines/gargoyle/unicode.cpp
+++ b/engines/glk/unicode.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/unicode.h"
-#include "gargoyle/unicode_gen.h"
+#include "glk/unicode.h"
+#include "glk/unicode_gen.h"
 #include "common/textconsole.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/unicode.h b/engines/glk/unicode.h
index e9fa9280d9..249ab5dade 100644
--- a/engines/gargoyle/unicode.h
+++ b/engines/glk/unicode.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_UNICODE_H
-#define GARGOYLE_UNICODE_H
+#ifndef GLK_UNICODE_H
+#define GLK_UNICODE_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/unicode_gen.cpp b/engines/glk/unicode_gen.cpp
index 56e44c350f..ac8a149f7e 100644
--- a/engines/gargoyle/unicode_gen.cpp
+++ b/engines/glk/unicode_gen.cpp
@@ -25,7 +25,7 @@
  * Derived from Unicode data files, Unicode version 4.0.1.
  */
 
-#include "gargoyle/unicode_gen.h"
+#include "glk/unicode_gen.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/unicode_gen.h b/engines/glk/unicode_gen.h
index 7c86e9b39f..f601bf6b92 100644
--- a/engines/gargoyle/unicode_gen.h
+++ b/engines/glk/unicode_gen.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_UNICODE_GEN_H
-#define GARGOYLE_UNICODE_GEN_H
+#ifndef GLK_UNICODE_GEN_H
+#define GLK_UNICODE_GEN_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/utils.cpp b/engines/glk/utils.cpp
index 6857301bb7..12f9e304e5 100644
--- a/engines/gargoyle/utils.cpp
+++ b/engines/glk/utils.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/utils.h"
+#include "glk/utils.h"
 #include "common/textconsole.h"
 
 namespace Gargoyle {
diff --git a/engines/gargoyle/utils.h b/engines/glk/utils.h
index b8a8e027ee..361c65fa20 100644
--- a/engines/gargoyle/utils.h
+++ b/engines/glk/utils.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_UTILS_H
-#define GARGOYLE_UTILS_H
+#ifndef GLK_UTILS_H
+#define GLK_UTILS_H
 
 #include "common/rect.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_graphics.cpp b/engines/glk/window_graphics.cpp
index 322d642a1b..4eea5c0316 100644
--- a/engines/gargoyle/window_graphics.cpp
+++ b/engines/glk/window_graphics.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
+#include "glk/window_graphics.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_graphics.h b/engines/glk/window_graphics.h
index 67963bc9a1..1ddc26c1cc 100644
--- a/engines/gargoyle/window_graphics.h
+++ b/engines/glk/window_graphics.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_GRAPHICS_H
-#define GARGOYLE_WINDOW_GRAPHICS_H
+#ifndef GLK_WINDOW_GRAPHICS_H
+#define GLK_WINDOW_GRAPHICS_H
 
-#include "gargoyle/windows.h"
-#include "gargoyle/picture.h"
+#include "glk/windows.h"
+#include "glk/picture.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_pair.cpp b/engines/glk/window_pair.cpp
index 9bd562ddb9..56e5b453e0 100644
--- a/engines/gargoyle/window_pair.cpp
+++ b/engines/glk/window_pair.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/window_pair.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
+#include "glk/window_pair.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_pair.h b/engines/glk/window_pair.h
index a5b9081eda..11b4e499ee 100644
--- a/engines/gargoyle/window_pair.h
+++ b/engines/glk/window_pair.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_PAIR_H
-#define GARGOYLE_WINDOW_PAIR_H
+#ifndef GLK_WINDOW_PAIR_H
+#define GLK_WINDOW_PAIR_H
 
-#include "gargoyle/windows.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_text_buffer.cpp b/engines/glk/window_text_buffer.cpp
index 5cf8f34da5..1506f4e163 100644
--- a/engines/gargoyle/window_text_buffer.cpp
+++ b/engines/glk/window_text_buffer.cpp
@@ -20,12 +20,12 @@
  *
  */
 
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/unicode.h"
+#include "glk/window_text_buffer.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/unicode.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_text_buffer.h b/engines/glk/window_text_buffer.h
index 199aeb42f6..a26a95b5bc 100644
--- a/engines/gargoyle/window_text_buffer.h
+++ b/engines/glk/window_text_buffer.h
@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_TEXT_BUFFER_H
-#define GARGOYLE_WINDOW_TEXT_BUFFER_H
+#ifndef GLK_WINDOW_TEXT_BUFFER_H
+#define GLK_WINDOW_TEXT_BUFFER_H
 
-#include "gargoyle/windows.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/speech.h"
+#include "glk/windows.h"
+#include "glk/picture.h"
+#include "glk/speech.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_text_grid.cpp b/engines/glk/window_text_grid.cpp
index c232fb11da..963083659f 100644
--- a/engines/gargoyle/window_text_grid.cpp
+++ b/engines/glk/window_text_grid.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/window_text_grid.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/screen.h"
+#include "glk/window_text_grid.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/selection.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/window_text_grid.h b/engines/glk/window_text_grid.h
index fa9fe8b18b..acfd366cb2 100644
--- a/engines/gargoyle/window_text_grid.h
+++ b/engines/glk/window_text_grid.h
@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_TEXT_GRID_H
-#define GARGOYLE_WINDOW_TEXT_GRID_H
+#ifndef GLK_WINDOW_TEXT_GRID_H
+#define GLK_WINDOW_TEXT_GRID_H
 
-#include "gargoyle/windows.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 
diff --git a/engines/gargoyle/windows.cpp b/engines/glk/windows.cpp
index 883e3d6da4..d982f6ccb5 100644
--- a/engines/gargoyle/windows.cpp
+++ b/engines/glk/windows.cpp
@@ -20,15 +20,15 @@
  *
  */
 
-#include "gargoyle/windows.h"
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/window_pair.h"
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/window_text_grid.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/streams.h"
+#include "glk/windows.h"
+#include "glk/window_graphics.h"
+#include "glk/window_pair.h"
+#include "glk/window_text_buffer.h"
+#include "glk/window_text_grid.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/streams.h"
 #include "common/algorithm.h"
 #include "common/textconsole.h"
 
diff --git a/engines/gargoyle/windows.h b/engines/glk/windows.h
index 4838d7b245..5bf5f2aa32 100644
--- a/engines/gargoyle/windows.h
+++ b/engines/glk/windows.h
@@ -20,18 +20,18 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOWS_H
-#define GARGOYLE_WINDOWS_H
+#ifndef GLK_WINDOWS_H
+#define GLK_WINDOWS_H
 
 #include "common/array.h"
 #include "common/list.h"
 #include "common/rect.h"
 #include "graphics/screen.h"
-#include "gargoyle/events.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/streams.h"
+#include "glk/events.h"
+#include "glk/glk_types.h"
+#include "glk/fonts.h"
+#include "glk/selection.h"
+#include "glk/streams.h"
 
 namespace Gargoyle {