diff --git a/contrib/tutorial_world/objects.py b/contrib/tutorial_world/objects.py
index 1e7561ff99..d84377b9ea 100644
--- a/contrib/tutorial_world/objects.py
+++ b/contrib/tutorial_world/objects.py
@@ -23,7 +23,7 @@ import time
 import random
 
 from ev import create_object
-from ev import Object, Exit, Command, CmdSet, Script
+from ev import DefaultObject, DefaultExit, Command, CmdSet, Script
 
 #------------------------------------------------------------
 #
@@ -42,7 +42,7 @@ from ev import Object, Exit, Command, CmdSet, Script
 #------------------------------------------------------------
 
 
-class TutorialObject(Object):
+class TutorialObject(DefaultObject):
     """
     This is the baseclass for all objects in the tutorial.
     """
@@ -558,7 +558,7 @@ class CmdSetCrumblingWall(CmdSet):
         self.add(CmdPressButton())
 
 
-class CrumblingWall(TutorialObject, Exit):
+class CrumblingWall(TutorialObject, DefaultExit):
     """
     The CrumblingWall can be examined in various
     ways, but only if a lit light source is in the room. The traversal
diff --git a/contrib/tutorial_world/rooms.py b/contrib/tutorial_world/rooms.py
index 514124a477..753a199191 100644
--- a/contrib/tutorial_world/rooms.py
+++ b/contrib/tutorial_world/rooms.py
@@ -5,7 +5,7 @@ Room Typeclasses for the TutorialWorld.
 """
 
 import random
-from ev import CmdSet, Script, Command, Room
+from ev import CmdSet, Script, Command, DefaultRoom
 from ev import utils, create_object, search_object
 from contrib.tutorial_world import scripts as tut_scripts
 from contrib.tutorial_world.objects import LightSource, TutorialObject
@@ -67,7 +67,7 @@ class TutorialRoomCmdSet(CmdSet):
         self.add(CmdTutorial())
 
 
-class TutorialRoom(Room):
+class TutorialRoom(DefaultRoom):
     """
     This is the base room type for all rooms in the tutorial world.
     It defines a cmdset on itself for reading tutorial info about the location.