Renamed Classes to be more descriptive