Renamed classes to be more clear