Restore changes lost due to renaming