Fixed controller names to be unique