First Round of name changes

Testing to see if those changes work correctly