Renamed main controllers