Renamed settings sub-groups to make them more consistent.