Renamed some fields of the controller to be more sensible