diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index ea3aec979..007a93085 100644
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1075,7 +1075,7 @@ public class NPCCommands {
         }
         Location prev = npc.isSpawned() ? npc.getEntity().getLocation() : null;
         npc.despawn(DespawnReason.PENDING_RESPAWN);
-        npc.setName(newName);
+        npc.setName(Colorizer.parseColors(newName));
         if (prev != null)
             npc.spawn(prev);
 
diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java
index 0f2e65f7c..4c43e7aee 100644
--- a/src/main/java/net/citizensnpcs/trait/Controllable.java
+++ b/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -353,6 +353,10 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
             handle.motY *= 0.98F;
         }
     }
+    
+    public static void registerControllerType(EntityType type, Class<? extends MovementController> clazz) {
+        controllerTypes.put(type, clazz);
+    }
 
     private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps
             .newEnumMap(EntityType.class);