diff --git a/rest/index.php b/rest/index.php
index 574136dd65598d1df4a657a72fb0876b8e89d057..e34f6af20e37fee9c150c2291963f0292dffadf3 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -279,15 +279,16 @@ $app->post('/acknowledgementReceipt', \AcknowledgementReceipt\controllers\Acknow
 //PreProcess
 $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/checkAcknowledgementReceipt', \Action\controllers\PreProcessActionController::class . ':checkAcknowledgementReceipt');
 $app->get('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/getRedirect', \Action\controllers\PreProcessActionController::class . ':getRedirectInformations');
+//$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkShippings', \Action\controllers\PreProcessActionController::class . ':checkShippings');
 $app->get('/resources/{resId}/users/{userId}/isDestinationChanging', \Action\controllers\PreProcessActionController::class . ':isDestinationChanging');
 
 //shipping
-$app->get('/administration/shippings', \Shipping\controllers\ShippingController::class . ':get');
-$app->get('/administration/shippings/new', \Shipping\controllers\ShippingController::class . ':initShipping');
-$app->get('/administration/shippings/{id}', \Shipping\controllers\ShippingController::class . ':getById');
-$app->post('/administration/shippings', \Shipping\controllers\ShippingController::class . ':create');
-$app->put('/administration/shippings/{id}', \Shipping\controllers\ShippingController::class . ':update');
-$app->delete('/administration/shippings/{id}', \Shipping\controllers\ShippingController::class . ':delete');
+$app->get('/administration/shippings', \Shipping\controllers\ShippingTemplateController::class . ':get');
+$app->get('/administration/shippings/new', \Shipping\controllers\ShippingTemplateController::class . ':initShipping');
+$app->get('/administration/shippings/{id}', \Shipping\controllers\ShippingTemplateController::class . ':getById');
+$app->post('/administration/shippings', \Shipping\controllers\ShippingTemplateController::class . ':create');
+$app->put('/administration/shippings/{id}', \Shipping\controllers\ShippingTemplateController::class . ':update');
+$app->delete('/administration/shippings/{id}', \Shipping\controllers\ShippingTemplateController::class . ':delete');
 $app->put('/attachments/{id}/inSendAttachment', \Attachment\controllers\AttachmentController::class . ':setInSendAttachment');
 
 //SignatureBook
diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php
index 8e90674f6ab29cd6b32ed62db7e2996db1aa8f9e..4c2976226a73177ae2e29e1c952afd0a62309fe6 100644
--- a/src/app/email/controllers/EmailController.php
+++ b/src/app/email/controllers/EmailController.php
@@ -20,7 +20,6 @@ use Configuration\models\ConfigurationModel;
 use Docserver\models\DocserverModel;
 use Docserver\models\DocserverTypeModel;
 use Email\models\EmailModel;
-use Email\scripts\EmailScript;
 use Entity\models\EntityModel;
 use Group\models\ServiceModel;
 use History\controllers\HistoryController;
diff --git a/src/app/shipping/controllers/ShippingController.php b/src/app/shipping/controllers/ShippingTemplateController.php
similarity index 100%
rename from src/app/shipping/controllers/ShippingController.php
rename to src/app/shipping/controllers/ShippingTemplateController.php
diff --git a/src/app/shipping/models/ShippingModel.php b/src/app/shipping/models/ShippingTemplateModel.php
similarity index 100%
rename from src/app/shipping/models/ShippingModel.php
rename to src/app/shipping/models/ShippingTemplateModel.php
diff --git a/src/app/shipping/models/ShippingModelAbstract.php b/src/app/shipping/models/ShippingTemplateModelAbstract.php
similarity index 100%
rename from src/app/shipping/models/ShippingModelAbstract.php
rename to src/app/shipping/models/ShippingTemplateModelAbstract.php
diff --git a/test/unitTests/app/shipping/ShippingControllerTest.php b/test/unitTests/app/shipping/ShippingControllerTest.php
index c150e3e187cba345ebec38070654280de286c4af..8a5fe740b1347f0dd350553826cec5e878c1b3ed 100755
--- a/test/unitTests/app/shipping/ShippingControllerTest.php
+++ b/test/unitTests/app/shipping/ShippingControllerTest.php
@@ -9,7 +9,7 @@
 
 use PHPUnit\Framework\TestCase;
 
-class ShippingControllerTest extends TestCase
+class ShippingTemplateControllerTest extends TestCase
 {
     private static $id = null;
 
@@ -17,7 +17,7 @@ class ShippingControllerTest extends TestCase
     {
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $aArgs = [
             'label'           => 'TEST',
@@ -61,7 +61,7 @@ class ShippingControllerTest extends TestCase
     {
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $response  = $shipping->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody = json_decode((string)$response->getBody());
@@ -89,7 +89,7 @@ class ShippingControllerTest extends TestCase
     {
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $response  = $shipping->get($request, new \Slim\Http\Response());
         $responseBody = json_decode((string)$response->getBody());
@@ -119,7 +119,7 @@ class ShippingControllerTest extends TestCase
 
         $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
 
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
         $response = $shipping->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
 
         $responseBody = json_decode((string)$response->getBody());
@@ -128,7 +128,7 @@ class ShippingControllerTest extends TestCase
 
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $response  = $shipping->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody = json_decode((string)$response->getBody());
@@ -149,7 +149,7 @@ class ShippingControllerTest extends TestCase
     {
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'DELETE']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $response = $shipping->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody = json_decode((string)$response->getBody());
@@ -166,7 +166,7 @@ class ShippingControllerTest extends TestCase
     {
         $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
         $request     = \Slim\Http\Request::createFromEnvironment($environment);
-        $shipping    = new \Shipping\controllers\ShippingController();
+        $shipping    = new \Shipping\controllers\ShippingTemplateController();
 
         $response  = $shipping->initShipping($request, new \Slim\Http\Response());
         $responseBody = json_decode((string)$response->getBody());