Heavy nomenclature changes to match the service's rebranding.