Clean up some renaming business