Merge "Update api usage for rename"