Merge "Rename API based on API review" into sc-dev