Changed name of classes to use Ride instead of carpolling and update datamodel