Pulling some simple (mostly renaming) changes up
Pulling some simple (mostly renaming) changes up