Handle some renaming