diff --git a/src/Backend.cs b/src/Backend.cs
index 375c2df..cae9716 100644
--- a/src/Backend.cs
+++ b/src/Backend.cs
@@ -47,12 +47,12 @@ namespace Frontend
 			return Players[playerId];
 		}
 
-		public Player getDragon (int dragonId)
+		public Dragon getDragon (int dragonId)
 		{
 			return Dragons[dragonId];
 		}
 
-		public Map getMap ()
+		public Map getMapObject ()
 		{
 			return Map;
 		}
diff --git a/src/Entity.cs b/src/Entity.cs
index b9a1b14..fdef504 100644
--- a/src/Entity.cs
+++ b/src/Entity.cs
@@ -39,7 +39,7 @@ namespace WorldOfPeacecraft
 			this.PosX = x;
 		}
 
-		public int GetXPosition ()
+		public int getXPosition ()
 		{
 			return PosX;
 		}
@@ -49,7 +49,7 @@ namespace WorldOfPeacecraft
 			this.PosY = y;
 		}
 
-		public int GetYPosition ()
+		public int getYPosition ()
 		{
 			return PosY;
 		}