Implemented renaming in executor