diff --git a/evennia/contrib/tutorial_world/build.ev b/evennia/contrib/tutorial_world/build.ev
index 8780400e6c..b7daf71c3e 100644
--- a/evennia/contrib/tutorial_world/build.ev
+++ b/evennia/contrib/tutorial_world/build.ev
@@ -433,7 +433,7 @@ north
 #
 # Create the weapon rack (the barrel)
 #
-@create/drop barrel: tutorial_world.objects.WeaponRack
+@create/drop barrel: tutorial_world.objects.TutorialWeaponRack
 #
 @desc barrel =
  This barrel has the air of leftovers - it contains an assorted
@@ -1299,7 +1299,7 @@ Tomb of the hero
 # The sarcophagus is a "weapon rack" from which you can extract one
 # single weapon.
 #
-@create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.WeaponRack
+@create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.TutorialWeaponRack
 #
 @desc stone =
  The lid of the coffin is adorned with a stone statue in full size.
diff --git a/evennia/contrib/tutorial_world/objects.py b/evennia/contrib/tutorial_world/objects.py
index 512eca91c2..20a0561fe9 100644
--- a/evennia/contrib/tutorial_world/objects.py
+++ b/evennia/contrib/tutorial_world/objects.py
@@ -14,8 +14,8 @@ TutorialClimbable
 Obelisk
 LightSource
 CrumblingWall
-Weapon
-WeaponRack
+TutorialWeapon
+TutorialWeaponRack
 
 """
 
@@ -790,7 +790,7 @@ class CrumblingWall(TutorialObject, DefaultExit):
 
 # -------------------------------------------------------------
 #
-# Weapon - object type
+# TutorialWeapon - object type
 #
 # A weapon is necessary in order to fight in the tutorial
 # world. A weapon (which here is assumed to be a bladed
@@ -929,7 +929,7 @@ class CmdSetWeapon(CmdSet):
         self.add(CmdAttack())
 
 
-class Weapon(TutorialObject):
+class TutorialWeapon(TutorialObject):
     """
     This defines a bladed weapon.
 
@@ -980,7 +980,7 @@ class Weapon(TutorialObject):
 
 WEAPON_PROTOTYPES = {
     "weapon": {
-        "typeclass": "evennia.contrib.tutorial_world.objects.Weapon",
+        "typeclass": "evennia.contrib.tutorial_world.objects.TutorialWeapon",
         "key": "Weapon",
         "hit": 0.2,
         "parry": 0.2,
@@ -1125,7 +1125,7 @@ class CmdSetWeaponRack(CmdSet):
         self.add(CmdGetWeapon())
 
 
-class WeaponRack(TutorialObject):
+class TutorialWeaponRack(TutorialObject):
     """
     This object represents a weapon store. When people use the
     "get weapon" command on this rack, it will produce one