Implemented renaming