diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp
index a6ee29d282c..ef1560db55e 100644
--- a/src/server/game/Movement/MovementStructures.cpp
+++ b/src/server/game/Movement/MovementStructures.cpp
@@ -2908,7 +2908,7 @@ MovementStatusElements const MovementSetCanFlyAck[] =
 
 MovementStatusElements MoveForceSwimBackSpeedChangeAck[] =
 {
-    MSESpeedSwimBack,
+    MSEExtraElement,
     MSEPositionX,
     MSEPositionZ,
     MSEPositionY,
@@ -2971,7 +2971,7 @@ MovementStatusElements MoveForceSwimBackSpeedChangeAck[] =
     MSETransportOrientation,
     MSETransportPositionZ,
     MSETransportGuidByte7,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte3,
     MSETransportGuidByte2,
@@ -2995,7 +2995,7 @@ MovementStatusElements MoveForceFlightBackSpeedChangeAck[] =
     MSEPositionZ,
     MSECounter,
     MSEPositionX,
-    MSESpeedFlightBack,
+    MSEExtraElement,
     MSEHasSplineElevation,
     MSEHasPitch,
     MSEHasFallData,
@@ -3051,7 +3051,7 @@ MovementStatusElements MoveForceFlightBackSpeedChangeAck[] =
     MSETransportPositionZ,
     MSETransportGuidByte4,
     MSETransportGuidByte7,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte5,
     MSETransportTime2,
     MSETransportPositionY,
@@ -3605,8 +3605,8 @@ MovementStatusElements MoveUpdateSwimBackSpeed[] =
     MSEGuidByte4,
     MSEPositionY,
 
-    MSETransportGuidByte7,	
-    MSETransportTime3,
+    MSETransportGuidByte7,
+    MSETransportVehicleId,
     MSETransportGuidByte6,
     MSETransportGuidByte4,
     MSETransportGuidByte2,
@@ -3631,7 +3631,7 @@ MovementStatusElements MoveUpdateSwimBackSpeed[] =
     MSEPitch,
     MSEGuidByte2,
     MSEGuidByte7,
-    MSESpeedSwimBack,
+    MSEExtraElement,
     MSESplineElevation,
     MSEPositionZ,
     MSEGuidByte3,
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index ce48943cdb1..3231eb4af66 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -86,7 +86,6 @@ enum MovementStatusElements
     MSETransportSeat,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportTime3,
     MSETransportVehicleId,
     MSEPitch,
     MSEFallTime,
@@ -98,17 +97,6 @@ enum MovementStatusElements
 
     MSECounter,
 
-    // Speed
-    MSESpeedWalk,
-    MSESpeedRun,
-    MSESpeedRunBack,
-    MSESpeedSwim,
-    MSESpeedSwimBack,
-    MSESpeedTurnRate,
-    MSESpeedFlight,
-    MSESpeedFlightBack,
-    MSESpeedPitchRate,
-
     // Special
     MSEZeroBit,         // writes bit value 1 or skips read bit
     MSEOneBit,          // writes bit value 0 or skips read bit