diff --git a/include/scripting.h b/include/scripting.h
index 98982e44..873e24c2 100644
--- a/include/scripting.h
+++ b/include/scripting.h
@@ -4,7 +4,7 @@
 
 #include "mainwindow.h"
 #include "block.h"
-#include "api_util.h"
+#include "scriptutility.h"
 
 #include <QStringList>
 #include <QJSEngine>
diff --git a/include/api_util.h b/include/scriptutility.h
similarity index 97%
rename from include/api_util.h
rename to include/scriptutility.h
index 85ad3f1b..e7cbc0cf 100644
--- a/include/api_util.h
+++ b/include/scriptutility.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef APIUTIL_H
-#define APIUTIL_H
+#ifndef SCRIPTUTILITY_H
+#define SCRIPTUTILITY_H
 
 #include "mainwindow.h"
 
@@ -51,4 +51,4 @@ private:
     QMap<QString, QString> actionMap;
 };
 
-#endif // APIUTIL_H
+#endif // SCRIPTUTILITY_H
diff --git a/porymap.pro b/porymap.pro
index e1edf4e0..4e3b4614 100644
--- a/porymap.pro
+++ b/porymap.pro
@@ -37,10 +37,10 @@ SOURCES += src/core/block.cpp \
     src/lib/fex/parser_util.cpp \
     src/lib/orderedjson.cpp \
     src/core/regionmapeditcommands.cpp \
-    src/script_api/api_map.cpp \
-    src/script_api/api_overlay.cpp \
-    src/script_api/api_util.cpp \
-    src/script_api/scripting.cpp \
+    src/scriptapi/apimap.cpp \
+    src/scriptapi/apioverlay.cpp \
+    src/scriptapi/apiutility.cpp \
+    src/scriptapi/scripting.cpp \
     src/ui/aboutporymap.cpp \
     src/ui/draggablepixmapitem.cpp \
     src/ui/bordermetatilespixmapitem.cpp \
@@ -169,12 +169,12 @@ HEADERS  += include/core/block.h \
     include/ui/preferenceeditor.h \
     include/ui/regionmappropertiesdialog.h \
     include/ui/colorpicker.h \
-    include/api_util.h \
     include/config.h \
     include/editor.h \
     include/mainwindow.h \
     include/project.h \
     include/scripting.h \
+    include/scriptutility.h \
     include/settings.h \
     include/log.h
 
diff --git a/src/script_api/api_map.cpp b/src/scriptapi/apimap.cpp
similarity index 100%
rename from src/script_api/api_map.cpp
rename to src/scriptapi/apimap.cpp
diff --git a/src/script_api/api_overlay.cpp b/src/scriptapi/apioverlay.cpp
similarity index 100%
rename from src/script_api/api_overlay.cpp
rename to src/scriptapi/apioverlay.cpp
diff --git a/src/script_api/api_util.cpp b/src/scriptapi/apiutility.cpp
similarity index 100%
rename from src/script_api/api_util.cpp
rename to src/scriptapi/apiutility.cpp
diff --git a/src/script_api/scripting.cpp b/src/scriptapi/scripting.cpp
similarity index 100%
rename from src/script_api/scripting.cpp
rename to src/scriptapi/scripting.cpp