Renamed all the classes to be a little more sane.