diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
index 28509678..3b8b7e46 100644
--- a/server/gameserver/android.cc
+++ b/server/gameserver/android.cc
@@ -4,7 +4,7 @@
 #include "room.h"
 #include "app.h"
 #include "android_agent.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "battledatacontext.h"
 
 #include "f8/btmgr.h"
diff --git a/server/gameserver/android_agent.cc b/server/gameserver/android_agent.cc
index 58592ac5..0eee8a7e 100644
--- a/server/gameserver/android_agent.cc
+++ b/server/gameserver/android_agent.cc
@@ -3,7 +3,7 @@
 #include "android_agent.h"
 #include "android.h"
 #include "room.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "trigger.h"
 #include "glmhelper.h"
 
diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc
index 462bfa1f..fc5d4054 100644
--- a/server/gameserver/base_agent.cc
+++ b/server/gameserver/base_agent.cc
@@ -4,7 +4,7 @@
 #include "room.h"
 #include "creature.h"
 #include "human.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "glmhelper.h"
 
 #include "f8/btmgr.h"
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 09cab851..fdfe7b0b 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -14,7 +14,7 @@
 #include "bullet.h"
 #include "skillhelper.h"
 #include "shot.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "trigger.h"
 #include "ability.h"
 #include "battledatacontext.h"
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 35a34256..1dea348e 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -37,7 +37,7 @@
 #include "shot.h"
 #include "battledatacontext.h"
 #include "mapinstance.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "pbutils.h"
 #include "trigger.h"
 #include "ability.h"
diff --git a/server/gameserver/movehelper.cc b/server/gameserver/movement.cc
similarity index 99%
rename from server/gameserver/movehelper.cc
rename to server/gameserver/movement.cc
index ea150ee1..c0ef12df 100644
--- a/server/gameserver/movehelper.cc
+++ b/server/gameserver/movement.cc
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <glm/glm.hpp>
 
-#include "movehelper.h"
+#include "movement.h"
 #include "moveableentity.h"
 #include "room.h"
 #include "mapinstance.h"
diff --git a/server/gameserver/movehelper.h b/server/gameserver/movement.h
similarity index 100%
rename from server/gameserver/movehelper.h
rename to server/gameserver/movement.h
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index d3323184..e6f2abe6 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -25,7 +25,7 @@
 #include "team.h"
 #include "httpproxy.h"
 #include "roommgr.h"
-#include "movehelper.h"
+#include "movement.h"
 #include "trigger.h"
 #include "ability.h"
 #include "buff.h"