Clean up names for consistency

Kevin Paxmanrequested to merge
feature/kpaxman-name-cleanup into 8.x-1.x

Could you just double check for me that the changes I've made don't cause any problems?

Also...will tests need to be updated?

Merge request reports