Renamed classes to be more verbose