Renamed pricing provider and order handlers