Merge "Update for rename"