--- a/src/parpg/mainmenucontroller.py	Tue Jul 12 12:30:41 2011 +0200
+++ b/src/parpg/mainmenucontroller.py	Tue Jul 12 12:31:53 2011 +0200
@@ -55,7 +55,7 @@
         controller = CharacterCreationController(self.engine, view, self.model,
                                                  self.application)
         self.application.view = view
-        self.application.switchController(controller)
+        self.application.swap_modes(controller)
     
 #    def newGame(self):
 #        """Starts a new game"""
@@ -66,7 +66,7 @@
 #                                         self.model,
 #                                         self.application)        
 #        self.application.view = view
-#        self.application.switchController(controller)
+#        self.application.swap_modes(controller)
 #        start_map = self.model.settings.get("PARPG", "Map")
 #        self.model.changeMap(start_map)
 
@@ -81,10 +81,10 @@
                                          self.model,
                                          self.application)        
         self.application.view = view
-        self.application.switchController(controller)
+        self.application.swap_modes(controller)
         controller.loadGame(*args, **kwargs)
         
-    def onStop(self):
+    def on_deactivate(self):
         """Called when the controller is removed from the list"""
         self.view.hideMenu()