diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs
index f8090fdef..b8e4f4236 100644
--- a/Modules/CustomRolesHelper.cs
+++ b/Modules/CustomRolesHelper.cs
@@ -1131,6 +1131,7 @@ internal static class CustomRolesHelper
             CustomRoles.PotionMaster or
             CustomRoles.Poache or
             CustomRoles.Reaper or
+            CustomRoles.Death or
             CustomRoles.VoodooMaster or
             CustomRoles.Goddess or
             CustomRoles.Augur or
diff --git a/Modules/Utils.cs b/Modules/Utils.cs
index 263ebb02d..bf403adf2 100644
--- a/Modules/Utils.cs
+++ b/Modules/Utils.cs
@@ -3381,7 +3381,9 @@ public static class Utils
             return name;
         }
 
-        name = name.Replace("nikocat233", "Niko", StringComparison.OrdinalIgnoreCase);
+        if (name.Contains("Niko", StringComparison.OrdinalIgnoreCase))
+            name = name.Replace("233(", "-").TrimEnd(')');
+
         return name;
     }