Refactoring a la ReSharper (member renaming, mostly)