Renamed the classes to be more clear