ERT-385 - Renamed some classes and removed some unnecessary classes.