More fixes to renaming and such...