7 files changed, 6 insertions, 6 deletions
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index c96ccc816..bebe2f037 100644
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(lua_api)
 
 # Used by server and client
 set(common_SCRIPT_SRCS
-	${CMAKE_CURRENT_SOURCE_DIR}/serverscripting.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
 	${common_SCRIPT_COMMON_SRCS}
 	${common_SCRIPT_CPP_API_SRCS}
 	${common_SCRIPT_LUA_API_SRCS}
@@ -13,7 +13,7 @@ set(common_SCRIPT_SRCS
 # Used by client only
 set(client_SCRIPT_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_mainmenu.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/clientscripting.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/scripting_client.cpp
 	${client_SCRIPT_COMMON_SRCS}
 	${client_SCRIPT_CPP_API_SRCS}
 	${client_SCRIPT_LUA_API_SRCS}
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 75b07fa37..85791f90b 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_vmanip.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 #include "environment.h"
 #include "server.h"
 #include "nodedef.h"
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 95e977f9e..9668f76f7 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "server.h"
 #include "hud.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 
 struct EnumString es_HudElementType[] =
 {
diff --git a/src/script/clientscripting.cpp b/src/script/scripting_client.cpp
index ba3f910c0..8ff5abcc4 100644
--- a/src/script/clientscripting.cpp
+++ b/src/script/scripting_client.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "clientscripting.h"
+#include "scripting_client.h"
 #include "client.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_client.h"
diff --git a/src/script/clientscripting.h b/src/script/scripting_client.h
index df94e8b71..df94e8b71 100644
--- a/src/script/clientscripting.h
+++ b/src/script/scripting_client.h
diff --git a/src/script/serverscripting.cpp b/src/script/scripting_server.cpp
index 215b2cfd7..ce56fcf19 100644
--- a/src/script/serverscripting.cpp
+++ b/src/script/scripting_server.cpp
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "serverscripting.h"
+#include "scripting_server.h"
 #include "server.h"
 #include "log.h"
 #include "settings.h"
diff --git a/src/script/serverscripting.h b/src/script/scripting_server.h
index fd97ea40b..fd97ea40b 100644
--- a/src/script/serverscripting.h
+++ b/src/script/scripting_server.h