Merge "Make the API name more idiomatic" into sc-dev