Fixed naming inconsistencies in controller.