Fix controller names and other stuff.