diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
index 09610e774e..ca2c8bc71a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -392,6 +392,9 @@ public class ChatCommandsPlugin extends Plugin
 				unsetPb(boss);
 				unsetKc(boss.replace(":", "."));
 				unsetPb(boss.replace(":", "."));
+				// Unset old story mode
+				unsetKc("Theatre of Blood Story Mode");
+				unsetPb("Theatre of Blood Story Mode");
 			}
 
 			setKc(renamedBoss, kc);
@@ -1965,13 +1968,17 @@ public class ChatCommandsPlugin extends Plugin
 			case "raids 2":
 				return "Theatre of Blood";
 
-			case "Theatre of Blood: Story Mode":
+			case "theatre of blood: story mode":
 			case "tob sm":
 			case "tob story mode":
 			case "tob story":
-				return "Theatre of Blood Story Mode";
+			case "Theatre of Blood: Entry Mode":
+			case "tob em":
+			case "tob entry mode":
+			case "tob entry":
+				return "Theatre of Blood Entry Mode";
 
-			case "Theatre of Blood: Hard Mode":
+			case "theatre of blood: hard mode":
 			case "tob cm":
 			case "tob hm":
 			case "tob hard mode":
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
index 77acb81b63..7fa2c8dde5 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
@@ -189,17 +189,17 @@ public class ChatCommandsPluginTest
 	}
 
 	@Test
-	public void testTheatreOfBloodStoryMode()
+	public void testTheatreOfBloodEntryMode()
 	{
 		ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "",
-			"Wave 'The Final Challenge' (Story Mode) complete!<br>Duration: <col=ff0000>2:42</col><br>Theatre of Blood wave completion time: <col=ff0000>17:00</col> (new personal best)", null, 0);
+			"Wave 'The Final Challenge' (Entry Mode) complete!<br>Duration: <col=ff0000>2:42</col><br>Theatre of Blood wave completion time: <col=ff0000>17:00</col> (new personal best)", null, 0);
 		chatCommandsPlugin.onChatMessage(chatMessage);
 
-		ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your completed Theatre of Blood: Story Mode count is: <col=ff0000>73</col>.", null, 0);
+		ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your completed Theatre of Blood: Entry Mode count is: <col=ff0000>73</col>.", null, 0);
 		chatCommandsPlugin.onChatMessage(chatMessageEvent);
 
-		verify(configManager).setRSProfileConfiguration("killcount", "theatre of blood story mode", 73);
-		verify(configManager).setRSProfileConfiguration("personalbest", "theatre of blood story mode", 17 * 60.);
+		verify(configManager).setRSProfileConfiguration("killcount", "theatre of blood entry mode", 73);
+		verify(configManager).setRSProfileConfiguration("personalbest", "theatre of blood entry mode", 17 * 60.);
 	}
 
 	@Test