Rename Delivery to DeliveryProfile.
Delivery profile left-overs.