cleanup of renaming