Added hard-coded renaming