Renaming pretty much done