Renamed controllers to work with naming convention.