Renamed a couple of classes to a more streamlined convention
Merge origin/master