Some more minor name changes.

Next commit will have a lot more name changes