Update scope names according to API changes