Renamed settings to be more consistent