diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java
index 31ca8d6e..1cac9962 100644
--- a/src/main/java/electrosphere/controls/ControlHandler.java
+++ b/src/main/java/electrosphere/controls/ControlHandler.java
@@ -92,7 +92,7 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing;
 import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
-import electrosphere.entity.state.movement.sprint.SprintTree;
+import electrosphere.entity.state.movement.sprint.ClientSprintTree;
 import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.types.camera.CameraEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
@@ -824,7 +824,7 @@ public class ControlHandler {
         mainGameControlList.add(controls.get(INPUT_CODE_SPRINT));
         controls.get(INPUT_CODE_SPRINT).setOnPress(new ControlMethod(){public void execute(){
             if(Globals.playerEntity != null){
-                SprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
+                ClientSprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
                 if(sprintTree != null){
                     sprintTree.start();
                 }
@@ -832,7 +832,7 @@ public class ControlHandler {
         }});
         controls.get(INPUT_CODE_SPRINT).setOnRelease(new ControlMethod(){public void execute(){
             if(Globals.playerEntity != null){
-                SprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
+                ClientSprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
                 if(sprintTree != null){
                     sprintTree.stop();
                 }
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
index 527e848d..9a864d95 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
@@ -20,7 +20,7 @@ import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.movement.FallTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState;
-import electrosphere.entity.state.movement.sprint.SprintTree;
+import electrosphere.entity.state.movement.sprint.ClientSprintTree;
 import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
@@ -87,7 +87,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
     @SyncedField
     MovementRelativeFacing facing = MovementRelativeFacing.FORWARD;
     
-    SprintTree sprintTree;
+    ClientSprintTree sprintTree;
     ClientJumpTree jumpTree;
     FallTree fallTree;
 
@@ -451,7 +451,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
         this.animationSprintWindDown = animationSprintWindDown;
     }
     
-    public void setSprintTree(SprintTree sprintTree){
+    public void setSprintTree(ClientSprintTree sprintTree){
         this.sprintTree = sprintTree;
     }
 
diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/SprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
similarity index 93%
rename from src/main/java/electrosphere/entity/state/movement/sprint/SprintTree.java
rename to src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
index 125d1847..fe2ec4a2 100644
--- a/src/main/java/electrosphere/entity/state/movement/sprint/SprintTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
@@ -8,7 +8,7 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.M
 /**
  * Client sprint tree
  */
-public class SprintTree implements BehaviorTree {
+public class ClientSprintTree implements BehaviorTree {
     
     public static enum SprintTreeState {
         SPRINTING,
@@ -26,7 +26,7 @@ public class SprintTree implements BehaviorTree {
     
     float maxVelocity;
     
-    public SprintTree(Entity e, float maxVelocity, int staminaMax){
+    public ClientSprintTree(Entity e, float maxVelocity, int staminaMax){
         state = SprintTreeState.NOT_SPRINTING;
         parent = e;
         this.maxVelocity = maxVelocity;
diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
index 02fc0ed2..470eab63 100644
--- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
+++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
@@ -41,7 +41,7 @@ import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
 import electrosphere.entity.state.movement.sprint.ServerSprintTree;
-import electrosphere.entity.state.movement.sprint.SprintTree;
+import electrosphere.entity.state.movement.sprint.ClientSprintTree;
 import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.state.movement.walk.ServerWalkTree;
 import electrosphere.entity.state.physicssync.upright.ClientAlwaysUprightTree;
@@ -148,7 +148,7 @@ public class CreatureUtils {
                     //sprint system
                     if(groundMovementSystem.getSprintSystem() != null){
                         SprintSystem sprintSystem = groundMovementSystem.getSprintSystem();
-                        SprintTree sprintTree = new SprintTree(rVal,sprintSystem.getMaxVelocity(),sprintSystem.getStaminaMax());
+                        ClientSprintTree sprintTree = new ClientSprintTree(rVal,sprintSystem.getMaxVelocity(),sprintSystem.getStaminaMax());
                         if(sprintSystem.getAnimationStartUp()!= null){
                             moveTree.setAnimationSprintStartUp(sprintSystem.getAnimationStartUp().getNameThirdPerson());
                         }
@@ -844,8 +844,8 @@ public class CreatureUtils {
         return (ClientIdleTree)e.getData(EntityDataStrings.TREE_IDLE);
     }
     
-    public static SprintTree clientGetSprintTree(Entity e){
-        return (SprintTree)e.getData(EntityDataStrings.CLIENT_SPRINT_TREE);
+    public static ClientSprintTree clientGetSprintTree(Entity e){
+        return (ClientSprintTree)e.getData(EntityDataStrings.CLIENT_SPRINT_TREE);
     }
 
     public static ServerSprintTree serverGetSprintTree(Entity e){