--- a/gamelib/main.py	Sat Jan 26 20:29:58 2013 +0200
+++ b/gamelib/main.py	Sun Jan 27 12:43:28 2013 +0200
@@ -1,7 +1,7 @@
 import scenes
 
 from constants import SSConstants
-from menu import MenuScreen
+from menu import SSMenuScreen
 from endscreen import EndScreen
 from ss_state import SSState
 
@@ -13,13 +13,13 @@
     INITIAL_SCENE = scenes.INITIAL_SCENE
     SCENE_LIST = scenes.SCENE_LIST
     SCREENS = {
-            'menu': MenuScreen,
+            'menu': SSMenuScreen,
             'end': EndScreen,
             }
     START_SCREEN = 'menu'
 
-    def game_state(self):
-        return SSState()
+    def game_state_class(self):
+        return SSState
 
     def game_constants(self):
         return SSConstants()