diff --git a/wasp/apps/gameoflife.py b/apps/GameOfLife.py
similarity index 100%
rename from wasp/apps/gameoflife.py
rename to apps/GameOfLife.py
diff --git a/docs/apps.rst b/docs/apps.rst
index 78940e5..0ee4272 100644
--- a/docs/apps.rst
+++ b/docs/apps.rst
@@ -53,7 +53,7 @@ Applications
 
 .. automodule:: apps.flashlight
 
-.. automodule:: Gallery
+.. automodule:: apps.gallery
 
 .. automodule:: apps.haiku
 
@@ -72,7 +72,7 @@ Applications
 Games
 -----
 
-.. automodule:: apps.gameoflife
+.. automodule:: GameOfLife
 
 .. automodule:: apps.play2048
 
diff --git a/docs/main/apps.py b/docs/main/apps.py
index e80d61f..b6321c4 100644
--- a/docs/main/apps.py
+++ b/docs/main/apps.py
@@ -10,4 +10,4 @@ wasp.system.schedule()
 # watch will still (partially) boot even if we end up taking
 # an exception during application init.
 wasp.system.register('apps.flashlight.TorchApp')
-wasp.system.register('apps.gameoflife.GameOfLifeApp')
+wasp.system.register('apps.gallery.GalleryApp')
diff --git a/apps/Gallery.py b/wasp/apps/gallery.py
similarity index 100%
rename from apps/Gallery.py
rename to wasp/apps/gallery.py
diff --git a/wasp/apps/software.py b/wasp/apps/software.py
index 7ee1461..381f6a0 100644
--- a/wasp/apps/software.py
+++ b/wasp/apps/software.py
@@ -43,7 +43,7 @@ class SoftwareApp():
         db.append(('calc', factory('Calculator')))
         db.append(('disaBLE', factory('DisaBLE')))
         db.append(('faces', factory('Faces')))
-        db.append(('gameoflife', factory('Game Of Life')))
+        db.append(('gallery', factory('Gallery')))
         db.append(('musicplayer', factory('Music Player')))
         db.append(('play2048', factory('Play 2048')))
         db.append(('snake', factory('Snake Game')))
diff --git a/wasp/boards/manifest_240x240.py b/wasp/boards/manifest_240x240.py
index 8dd9110..fb350d7 100644
--- a/wasp/boards/manifest_240x240.py
+++ b/wasp/boards/manifest_240x240.py
@@ -12,7 +12,7 @@ manifest = (
     'apps/faces.py',
     'apps/fibonacci_clock.py',
     'apps/flashlight.py',
-    'apps/gameoflife.py',
+    'apps/gallery.py',
     'apps/haiku.py',
     'apps/heart.py',
     'apps/musicplayer.py',