Renamed and fixed the OrderItemEntityHydrator