Merge "Change API name"