Clean up an renaming