diff --git a/lib/Blinky.cpp b/lib/Blinky.cpp
index 7dba87b..577fe96 100644
--- a/lib/Blinky.cpp
+++ b/lib/Blinky.cpp
@@ -3,7 +3,7 @@
 namespace pacman {
 
 Blinky::Blinky()
-  : Ghost(Atlas::Ghost::blinky, pacman::initialBlinkyPosition()) {
+  : Ghost(Atlas::Ghost::blinky, initialBlinkyPosition()) {
 }
 
 double Blinky::speed(const GameState & gameState) const {
@@ -19,7 +19,7 @@ Position Blinky::target(const GameState & gameState) const {
     return startingPosition;
 
   if (isInPen())
-    return pacman::penDoorPosition();
+    return penDoorPosition();
 
   return blinkyScatterTarget();
 }
diff --git a/lib/Ghost.cpp b/lib/Ghost.cpp
index f05a347..0f1f020 100644
--- a/lib/Ghost.cpp
+++ b/lib/Ghost.cpp
@@ -152,7 +152,7 @@ void Ghost::updateDirection(const GameState & gameState) {
       continue;
 
     const GridPosition grid_position = { size_t(move.position.x), size_t(move.position.y) };
-    const bool can_walk = pacman::isWalkableForGhost(grid_position, current_grid_position, isEyes());
+    const bool can_walk = isWalkableForGhost(grid_position, current_grid_position, isEyes());
     if (!can_walk)
       continue;
 
diff --git a/lib/Inky.cpp b/lib/Inky.cpp
index cf853ae..7badf41 100644
--- a/lib/Inky.cpp
+++ b/lib/Inky.cpp
@@ -3,7 +3,7 @@
 namespace pacman {
 
 Inky::Inky()
-  : Ghost(Atlas::Ghost::inky, pacman::initialInkyPosition()) {
+  : Ghost(Atlas::Ghost::inky, initialInkyPosition()) {
 }
 
 double Inky::speed(const GameState & gameState) const {
@@ -19,7 +19,7 @@ Position Inky::target(const GameState & gameState) const {
     return startingPosition;
 
   if (isInPen())
-    return pacman::penDoorPosition();
+    return penDoorPosition();
 
   return inkyScatterTarget();
 }
diff --git a/lib/PacMan.cpp b/lib/PacMan.cpp
index ade67db..e0a2187 100644
--- a/lib/PacMan.cpp
+++ b/lib/PacMan.cpp
@@ -25,7 +25,7 @@ void PacMan::reset() {
   dead = false;
   direction = Direction::NONE;
   desired_direction = Direction::NONE;
-  pos = pacman::initialPacManPosition();
+  pos = initialPacManPosition();
 }
 
 void PacMan::update(std::chrono::milliseconds time_delta, Direction input_direction) {
@@ -76,7 +76,7 @@ void PacMan::updateMazePosition(std::chrono::milliseconds time_delta) {
   };
 
   auto canGo = [&](Direction move_direction) {
-    return pacman::isWalkableForPacMan(moveToPosition(pos, move_direction));
+    return isWalkableForPacMan(moveToPosition(pos, move_direction));
   };
 
   if (canGo(desired_direction)) {
diff --git a/lib/Pinky.cpp b/lib/Pinky.cpp
index 4d7f3a9..fe72740 100644
--- a/lib/Pinky.cpp
+++ b/lib/Pinky.cpp
@@ -3,7 +3,7 @@
 namespace pacman {
 
 Pinky::Pinky()
-  : Ghost(Atlas::Ghost::speedy, pacman::initialSpeedyPosition()) {
+  : Ghost(Atlas::Ghost::speedy, initialSpeedyPosition()) {
 }
 
 double Pinky::speed(const GameState & gameState) const {
@@ -19,7 +19,7 @@ Position Pinky::target(const GameState & gameState) const {
     return startingPosition;
 
   if (isInPen())
-    return pacman::penDoorPosition();
+    return penDoorPosition();
 
   return speedyScatterTarget();
 }