Renamed classes that map join row objects to actual objects