Merge "Add rename code back"