Some renaming and cleaning up

I'm pretty happy with this version as it is. I need to probably work on
consistency and more theory.