Naming

I made some of the naming more consistent.