Broom: modified entity name to Motor Controller.