diff --git a/src/Model/Order/ConvertimOrderDataToOrderDataMapper.php b/src/Model/Order/ConvertimOrderDataToOrderDataMapper.php
index b82766a..9498ec8 100644
--- a/src/Model/Order/ConvertimOrderDataToOrderDataMapper.php
+++ b/src/Model/Order/ConvertimOrderDataToOrderDataMapper.php
@@ -124,8 +124,8 @@ public function mapConvertimOrderDataToOrderData(ConvertimOrderData $convertimOr
         $extraTransportData = $convertimOrderData->getTransportData()->getExtra();
 
         if ($extraTransportData !== null && $extraTransportData->getPickUpPointCode() !== null) {
-            $orderData->deliveryFirstName = $extraTransportData->getName();
-            $orderData->deliveryLastName = $extraTransportData->getLastName();
+            $orderData->deliveryFirstName = $convertimDeliveryAddressData->getName();
+            $orderData->deliveryLastName = $convertimDeliveryAddressData->getLastName();
             $orderData->deliveryCompanyName = $extraTransportData->getPickupPointCompanyName();
             $orderData->deliveryStreet = $extraTransportData->getPickupPointStreet();
             $orderData->deliveryCity = $extraTransportData->getPickupPointCity();