diff --git a/olympics/olympics.rb b/olympics/olympics.rb
index 4f1a487..8c11166 100644
--- a/olympics/olympics.rb
+++ b/olympics/olympics.rb
@@ -5,7 +5,7 @@ module Z
 end
 
 
-class OlympicsGame < Game
+class Olympics < Game
   resolution [160*4, 100*4]
 
   def setup
diff --git a/play.rb b/play.rb
index d7fa2e6..5317fb4 100755
--- a/play.rb
+++ b/play.rb
@@ -23,8 +23,7 @@
 println "no game #{$game_name} found" and exit unless $game_name.is_folder?
 
 # PLAY!
-class_name = "#{$game_name.capitalize}_game"
-$game_class = class_name.instantiate rescue quit("Your game class needs to be called #{class_name}")
+$game_class = $game_name.classify.instantiate rescue quit("Your game class needs to be called #{class_name}")
 
 begin
   $game_class.run
diff --git a/shufflepuit_cafe/shufflepuit_cafe.rb b/shufflepuit_cafe/shufflepuit_cafe.rb
index 60bc467..b6ad5ca 100644
--- a/shufflepuit_cafe/shufflepuit_cafe.rb
+++ b/shufflepuit_cafe/shufflepuit_cafe.rb
@@ -1,7 +1,7 @@
 # http://en.wikipedia.org/wiki/Shufflepuck_Cafe
 # thx http://youtube.com/watch?v=9pUmfxM9h54
 
-class ShufflepuitCafeGame < Game
+class ShufflepuitCafe < Game
   def setup
     @objects << Ball.new
   end
diff --git a/spaceinvaders/spaceinvaders.rb b/spaceinvaders/spaceinvaders.rb
index d30d2e5..8594a6b 100644
--- a/spaceinvaders/spaceinvaders.rb
+++ b/spaceinvaders/spaceinvaders.rb
@@ -2,7 +2,7 @@
 # cc oneup
 # thx kingpepe
 
-class SpaceinvadersGame < Game
+class Spaceinvaders < Game
   attr_accessor :player
 
   def setup