Prepared modifications for renaming