Cleaned up some of the concept names

Tried to be consistent when naming stuff, let me know if you know of something better. :)