diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt
index e9bfdc9ca..ebed8135d 100644
--- a/src/net/torvald/terrarum/StateInGame.kt
+++ b/src/net/torvald/terrarum/StateInGame.kt
@@ -59,7 +59,7 @@ constructor() : BasicGameState() {
     lateinit var debugWindow: UIHandler
     lateinit var notifier: UIHandler
 
-    lateinit internal var playerWrapper: AnyPlayer
+    lateinit internal var playerWrapper: PossessedPlayerWrapper
     internal val player: ActorHumanoid // currently POSSESSED actor :)
         get() = playerWrapper.actor
 
@@ -126,7 +126,7 @@ constructor() : BasicGameState() {
 
 
         // add new player and put it to actorContainer
-        playerWrapper = AnyPlayer(PlayerBuilderSigrid.create())
+        playerWrapper = PossessedPlayerWrapper(PlayerBuilderSigrid.create())
         //player = PBCynthia.create()
         //player.setNoClip(true);
         addActor(player)
@@ -242,7 +242,7 @@ constructor() : BasicGameState() {
             changePossession(Player.PLAYER_REF_ID) // TODO completely other behaviour?
     }
 
-    private fun changePossession(newActor: AnyPlayer) {
+    private fun changePossession(newActor: PossessedPlayerWrapper) {
         if (!hasActor(player)) {
             throw IllegalArgumentException("No such actor in actorContainer: $newActor")
         }
@@ -256,7 +256,7 @@ constructor() : BasicGameState() {
             throw IllegalArgumentException("No such actor in actorContainer: $refid")
         }
 
-        playerWrapper = AnyPlayer(getActorByID(refid) as ActorHumanoid)
+        playerWrapper = PossessedPlayerWrapper(getActorByID(refid) as ActorHumanoid)
         WorldSimulator(world, player, UPDATE_DELTA)
     }
 
diff --git a/src/net/torvald/terrarum/gameactors/AnyPlayer.kt b/src/net/torvald/terrarum/gameactors/PossessedPlayerWrapper.kt
similarity index 82%
rename from src/net/torvald/terrarum/gameactors/AnyPlayer.kt
rename to src/net/torvald/terrarum/gameactors/PossessedPlayerWrapper.kt
index 91c0588a3..9103089ac 100644
--- a/src/net/torvald/terrarum/gameactors/AnyPlayer.kt
+++ b/src/net/torvald/terrarum/gameactors/PossessedPlayerWrapper.kt
@@ -6,9 +6,10 @@ import org.newdawn.slick.Input
 /**
  * A wrapper to support instant player changing (or possessing other NPCs maybe)
  *
+ * @param actor : here you 'snap in' the actor you wish to control
  * Created by minjaesong on 16-10-23.
  */
-class AnyPlayer(val actor: ActorHumanoid) {
+class PossessedPlayerWrapper(val actor: ActorHumanoid) {
 
     init {
         if (actor !is Controllable)