Fixed controller package names