Consistent names

This PR applies the class renaming that we talked about in last week's hangout. It includes all the ones that we talked about and a couple more for consistency. Say if there are any that you don't like.