diff --git a/local/modules/Colissimo/Model/Config/FedExConfigValue.php b/local/modules/Colissimo/Model/Config/ColissimoConfigValue.php
similarity index 100%
rename from local/modules/Colissimo/Model/Config/FedExConfigValue.php
rename to local/modules/Colissimo/Model/Config/ColissimoConfigValue.php
diff --git a/local/modules/DHL/DHL.php b/local/modules/DHL/DHL.php
index d94754f6..58b07421 100644
--- a/local/modules/DHL/DHL.php
+++ b/local/modules/DHL/DHL.php
@@ -161,15 +161,7 @@ class DHL extends AbstractDeliveryModule
             ->orderByMaxWeight(Criteria::ASC)
             ->findOne();
 
-        while (prev($areaPrices)) {
-            if ($weight > key($areaPrices)) {
-                break;
-            }
-
-            $postage = current($areaPrices);
-        }
-        return $postage;
-
+        return $deliveryPrice->getPriceWithTax();
     }
 
     /**