--- a/src/parpg/charactercreationcontroller.py	Tue Jul 12 12:30:41 2011 +0200
+++ b/src/parpg/charactercreationcontroller.py	Tue Jul 12 12:31:53 2011 +0200
@@ -144,7 +144,7 @@
         controller = GameSceneController(self.engine, view, self.model,
                                          self.application)
         self.application.view = view
-        self.application.switchController(controller)
+        self.application.swap_modes(controller)
         start_map = self.settings.parpg.Map
         self.model.changeMap(start_map)
     
@@ -159,9 +159,9 @@
         controller = MainMenuController(self.engine, view, self.model,
                                         self.application)
         self.application.view = view
-        self.application.switchController(controller)
+        self.application.activate_mode(controller)
     
-    def onStop(self):
+    def on_deactivate(self):
         """Called when the controller is removed from the list.
            @return: None"""
         self.view.hide()