diff --git a/src/Coffee/Position.php b/src/Coffee/Position.php
index 55e0126..b1b3ac2 100644
--- a/src/Coffee/Position.php
+++ b/src/Coffee/Position.php
@@ -71,26 +71,26 @@ class Position {
     }
 
     /**
-     * @param Tile $position
+     * @param Position $position
      * @return bool
      */
-    public function isTheSameColumn(Tile $position) {
+    public function isTheSameColumn(Position $position) {
         return $this->getColumn() == $position->getColumn();
     }
 
     /**
-     * @param Tile $position
+     * @param Position $position
      * @return bool
      */
-    public function isTheSameRow(Tile $position) {
+    public function isTheSameRow(Position $position) {
         return $this->getRow() == $position->getRow();
     }
 
     /**
-     * @param Tile $position
+     * @param Position $position
      * @return bool
      */
-    public function isTheSamePosition(Tile $position) {
+    public function isTheSamePosition(Position $position) {
         return $this->isTheSameColumn($position) && $this->isTheSameRow($position);
     }
 
@@ -184,11 +184,11 @@ class Position {
     /**
      * @param $row
      * @param $column
-     * @return Tile|null
+     * @return Position|null
      */
     protected function getSafeNeighbourPosition($row, $column) {
         if ($this->fitsIntoLowerBound($row, $column)) {
-            return new Tile($row, $column);
+            return new Position($row, $column);
         }
 
         return null;
diff --git a/tests/Coffee/PositionTest.php b/tests/Coffee/PositionTest.php
index a0d14bb..5492a25 100644
--- a/tests/Coffee/PositionTest.php
+++ b/tests/Coffee/PositionTest.php
@@ -8,126 +8,126 @@ require __DIR__ . '/../../vendor/autoload.php';
 class PositionTest extends \PHPUnit_Framework_TestCase {
 
 	public function testColumnIndex() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 
 		$this->assertEquals(1, $position->getColumnIndex());
 	}
 
 	public function testRowIndex() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 
 		$this->assertEquals(1, $position->getRowIndex());
 	}
 
 	public function testTheSameColumn() {
-		$positionA = new Tile(2, 2);
-		$positionB = new Tile(2, 2);
+		$positionA = new Position(2, 2);
+		$positionB = new Position(2, 2);
 
 		$this->assertTrue($positionA->isTheSameColumn($positionB));
 	}
 
 	public function testTheSameRow() {
-		$positionA = new Tile(2, 2);
-		$positionB = new Tile(2, 2);
+		$positionA = new Position(2, 2);
+		$positionB = new Position(2, 2);
 
 		$this->assertTrue($positionA->isTheSameRow($positionB));
 	}
 
 	public function testTheSamePosition() {
-		$positionA = new Tile(2, 2);
-		$positionB = new Tile(2, 2);
+		$positionA = new Position(2, 2);
+		$positionB = new Position(2, 2);
 
 		$this->assertTrue($positionA->isTheSamePosition($positionB));
 	}
 
 	public function testNorthEastPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northEastPositionA = $position->getNorthEastPosition();
-		$northEastPositionB = new Tile(1, 3);
+		$northEastPositionB = new Position(1, 3);
 
 		$this->assertTrue($northEastPositionA->isTheSamePosition($northEastPositionB));
 	}
 
 	public function testEastPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getEastPosition();
-		$northPositionB = new Tile(2, 3);
+		$northPositionB = new Position(2, 3);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testSouthEastPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getSouthEastPosition();
-		$northPositionB = new Tile(3, 3);
+		$northPositionB = new Position(3, 3);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testSouthPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getSouthPosition();
-		$northPositionB = new Tile(3, 2);
+		$northPositionB = new Position(3, 2);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testsSouthWestPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getSouthWestPosition();
-		$northPositionB = new Tile(3, 1);
+		$northPositionB = new Position(3, 1);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testWestPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getWestPosition();
-		$northPositionB = new Tile(2, 1);
+		$northPositionB = new Position(2, 1);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testNorthWestPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getNorthWestPosition();
-		$northPositionB = new Tile(1, 1);
+		$northPositionB = new Position(1, 1);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testNorthPosition() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		$northPositionA = $position->getNorthPosition();
-		$northPositionB = new Tile(1, 2);
+		$northPositionB = new Position(1, 2);
 
 		$this->assertTrue($northPositionA->isTheSamePosition($northPositionB));
 	}
 
 	public function testOpenSpaceNeighbours() {
-		$position = new Tile(2, 2);
+		$position = new Position(2, 2);
 		// Neighbours from NE to N, in CW direction
 		$neighbours = [
-			new Tile(1, 3),
-			new Tile(2, 3),
-			new Tile(3, 3),
-			new Tile(3, 2),
-			new Tile(3, 1),
-			new Tile(2, 1),
-			new Tile(1, 1),
-			new Tile(1, 2),
+			new Position(1, 3),
+			new Position(2, 3),
+			new Position(3, 3),
+			new Position(3, 2),
+			new Position(3, 1),
+			new Position(2, 1),
+			new Position(1, 1),
+			new Position(1, 2),
 		];
 
 		$this->assertEquals($neighbours, $position->getNeighbouringPositions());
 	}
 
 	public function testCornerNeighbours() {
-		$position = new Tile(1, 1);
+		$position = new Position(1, 1);
 		// Return just E, SE and S neighbours
 		$neighbours = [
-			new Tile(1, 2),
-			new Tile(2, 2),
-			new Tile(2, 1),
+			new Position(1, 2),
+			new Position(2, 2),
+			new Position(2, 1),
 		];
 
 		$this->assertEquals($neighbours, $position->getNeighbouringPositions());