Fix for controller names