Some Naming Changes

Some of the changes discussed in #93