I'm not completely ok with all the name changes here; I agree they make the file look better, but they really make the diff more difficult to read, and I don't feel they're necessary.