diff --git a/apps/openmw-mp/Script/Functions/CharClass.hpp b/apps/openmw-mp/Script/Functions/CharClass.hpp
index bfa54852e..42eda912a 100644
--- a/apps/openmw-mp/Script/Functions/CharClass.hpp
+++ b/apps/openmw-mp/Script/Functions/CharClass.hpp
@@ -7,23 +7,23 @@
 
 #include "../Types.hpp"
 
-#define CHARCLASSFUNCTIONS \
-{"SetDefaultClass",     CharClassFunctions::SetDefaultClass},\
-{"SetClassName",        CharClassFunctions::SetClassName},\
-{"SetClassDesc",        CharClassFunctions::SetClassDesc},\
-{"SetClassMajorAttribute", CharClassFunctions::SetClassMajorAttribute},\
-{"SetClassSpecialization", CharClassFunctions::SetClassSpecialization},\
-{"SetClassMajorSkill", CharClassFunctions::SetClassMajorSkill},\
-{"SetClassMinorSkill", CharClassFunctions::SetClassMinorSkill},\
-{"GetDefaultClass",     CharClassFunctions::GetDefaultClass},\
-{"GetClassName",        CharClassFunctions::GetClassName},\
-{"GetClassDesc",        CharClassFunctions::GetClassDesc},\
-{"GetClassMajorAttribute", CharClassFunctions::GetClassMajorAttribute},\
-{"GetClassSpecialization", CharClassFunctions::GetClassSpecialization},\
-{"GetClassMajorSkill", CharClassFunctions::GetClassMajorSkill},\
-{"GetClassMinorSkill", CharClassFunctions::GetClassMinorSkill},\
-{"IsClassDefault", CharClassFunctions::IsClassDefault},\
-{"SendClass",           CharClassFunctions::SendClass}
+#define CHARCLASSAPI \
+    {"SetDefaultClass",        CharClassFunctions::SetDefaultClass},\
+    {"SetClassName",           CharClassFunctions::SetClassName},\
+    {"SetClassDesc",           CharClassFunctions::SetClassDesc},\
+    {"SetClassMajorAttribute", CharClassFunctions::SetClassMajorAttribute},\
+    {"SetClassSpecialization", CharClassFunctions::SetClassSpecialization},\
+    {"SetClassMajorSkill",     CharClassFunctions::SetClassMajorSkill},\
+    {"SetClassMinorSkill",     CharClassFunctions::SetClassMinorSkill},\
+    {"GetDefaultClass",        CharClassFunctions::GetDefaultClass},\
+    {"GetClassName",           CharClassFunctions::GetClassName},\
+    {"GetClassDesc",           CharClassFunctions::GetClassDesc},\
+    {"GetClassMajorAttribute", CharClassFunctions::GetClassMajorAttribute},\
+    {"GetClassSpecialization", CharClassFunctions::GetClassSpecialization},\
+    {"GetClassMajorSkill",     CharClassFunctions::GetClassMajorSkill},\
+    {"GetClassMinorSkill",     CharClassFunctions::GetClassMinorSkill},\
+    {"IsClassDefault",         CharClassFunctions::IsClassDefault},\
+    {"SendClass",              CharClassFunctions::SendClass}
 
 
 class CharClassFunctions
diff --git a/apps/openmw-mp/Script/Functions/GUI.hpp b/apps/openmw-mp/Script/Functions/GUI.hpp
index 5cdb4a51d..8d51e4a3e 100644
--- a/apps/openmw-mp/Script/Functions/GUI.hpp
+++ b/apps/openmw-mp/Script/Functions/GUI.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_GUI_HPP
 #define OPENMW_GUI_HPP
 
-#define GUIFUNCTIONS \
+#define GUIAPI \
     {"MessageBox",          GUIFunctions::_MessageBox},\
     {"CustomMessageBox",    GUIFunctions::CustomMessageBox},\
     {"InputDialog",         GUIFunctions::InputDialog},\
diff --git a/apps/openmw-mp/Script/Functions/Stats.hpp b/apps/openmw-mp/Script/Functions/Stats.hpp
index 64aaaab1b..47d13ebb1 100644
--- a/apps/openmw-mp/Script/Functions/Stats.hpp
+++ b/apps/openmw-mp/Script/Functions/Stats.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_STATS_HPP
 #define OPENMW_STATS_HPP
 
-#define STATSFUNCTIONS \
+#define STATSAPI \
     {"GetName",                 StatsFunctions::GetName},\
     {"SetName",                 StatsFunctions::SetName},\
     \
diff --git a/apps/openmw-mp/Script/Functions/World.hpp b/apps/openmw-mp/Script/Functions/World.hpp
index 749e48ef7..d8f9664bf 100644
--- a/apps/openmw-mp/Script/Functions/World.hpp
+++ b/apps/openmw-mp/Script/Functions/World.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_WORLD_HPP
 #define OPENMW_WORLD_HPP
 
-#define WORLDFUNCTIONS \
+#define WORLDAPI \
     {"InitScriptEvent",             WorldFunctions::InitScriptEvent},\
     \
     {"GetObjectChangesSize",        WorldFunctions::GetObjectChangesSize},\
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index 4065062c5..59b59e171 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -94,13 +94,13 @@ public:
 
             POSITIONAPI,
             CELLAPI,
-            STATSFUNCTIONS,
+            STATSAPI,
             ITEMAPI,
             QUESTAPI,
             SPELLAPI,
-            GUIFUNCTIONS,
-            CHARCLASSFUNCTIONS,
-            WORLDFUNCTIONS,
+            GUIAPI,
+            CHARCLASSAPI,
+            WORLDAPI,
             MISCELLANEOUSAPI
     };