Deleted two classes, modified names slightly. Should modify them a bit more and redraw the UML diagram.