Fixed controller names