renaming controllers for consistancy