diff --git a/extras/crystal.py b/extras/crystal.py
index 1e836ac9a..4a14b1cb9 100644
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -3435,11 +3435,15 @@ class TrainerFragment(Command):
         # give this object a possibly better label
         label = "Trainer"
         if "uses_numeric_trainer_ids" in trainer_group_names[trainer_group].keys():
-            label += string.capwords(trainer_group_names[trainer_group]["constant"]).replace("Lt_surge", "Lt_Surge")
+            label += string.capwords(trainer_group_names[trainer_group]["constant"])
+            if len(trainer_group_names[trainer_group]["trainer_names"]) > 1:
+                label += str(trainer_id)
         else:
             label += string.capwords(trainer_group_names[trainer_group]["constant"]) + \
                      string.capwords(trainer_group_names[trainer_group]["trainer_names"][trainer_id-1])
 
+        label = label.replace("Gruntm", "GruntM").replace("Gruntf", "GruntF").replace("Lt_surge", "LtSurge")
+
         self.label = Label(name=label, address=self.address, object=self)
 
         # ---- give better labels to the objects created by TrainerFragment ----