cleanup: ServiceTypesController renamed PsServiceTypesController, to follow the convention