Merge "Change API names and constants by API review" into sc-dev