Fix controller names