CDiscount with "drop shipping" methods do not correctly format the address

[infiniweb]

Expected behaviour

For "drop shipping" methods, the pickup-point name should be filled as the company name (if not already filled) or in the street name in the shipping address.

Actual behaviour

For CDiscount, the pickup-point is returned in the shipping address as the last name, and the client first name and last name are returned in the first name.

Steps to reproduce the behaviour

Receive an order (getOrders) from CDiscount with the shipping methods SO1, REL or RCO and observe the shipping address.

In the below image we can confirm that SO1, REL and RCO are the drop shopping methods.