Minor name changes and prep for further changes