diff --git a/addons/sourcemod/configs/shavit-mapfixes.cfg b/addons/sourcemod/configs/shavit-mapfixes.cfg
index 9eaf60f3..57570b6b 100644
--- a/addons/sourcemod/configs/shavit-mapfixes.cfg
+++ b/addons/sourcemod/configs/shavit-mapfixes.cfg
@@ -41,11 +41,15 @@
 	{
 		"shavit_misc_resettargetname_main" "noobinside"
 		"shavit_misc_resettargetname_bonus" "filter_bonus"
+		"shavit_misc_resetclassname_main" "cp1"
+		"shavit_misc_resetclassname_bonus" "cp1"
 	}
 	"bhop_overthinker_go"
 	{
 		"shavit_misc_resettargetname_main" "noobinside"
 		"shavit_misc_resettargetname_bonus" "filter_bonus"
+		"shavit_misc_resetclassname_main" "cp1"
+		"shavit_misc_resetclassname_bonus" "cp1"
 	}
 	"bhop_shutdown"
 	{