Renamed classes to be easier to understand