Name Refactoring

Clean up on awkward names.