diff --git a/sql/develop.sql b/sql/develop.sql
index f229bfaacde7a9963a6e6684efd1f711992daec3..4efb26a7d3e803881af248776c1d875e0c749357 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -80,9 +80,9 @@ CONSTRAINT emails_pkey PRIMARY KEY (id)
 )
 WITH (OIDS=FALSE);
 
-/* SHIPPINGS */
-DROP TABLE IF EXISTS shippings;
-CREATE TABLE shippings
+/* SHIPPING TEMPLATES */
+DROP TABLE IF EXISTS shipping_templates;
+CREATE TABLE shipping_templates
 (
 id serial NOT NULL,
 label character varying(64) NOT NULL,
@@ -91,7 +91,7 @@ options json DEFAULT '{}',
 fee json DEFAULT '{}',
 entities json DEFAULT '{}',
 account json DEFAULT '{}',
-CONSTRAINT shippings_pkey PRIMARY KEY (id)
+CONSTRAINT shipping_templates_pkey PRIMARY KEY (id)
 )
 WITH (OIDS=FALSE);
 
diff --git a/sql/structure.sql b/sql/structure.sql
index df1b14a5664c1a7e038a6b7ab9e0c3a996c18e83..06e24d684d5bba395e695b42f302bbd9cb258eea 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -1566,9 +1566,9 @@ process_comment character varying(255),
 CONSTRAINT listinstance_history_details_pkey PRIMARY KEY (listinstance_history_details_id)
 ) WITH ( OIDS=FALSE );
 
-/* SHIPPINGS */
-DROP TABLE IF EXISTS shippings;
-CREATE TABLE shippings
+/* SHIPPING TEMPLATES */
+DROP TABLE IF EXISTS shipping_templates;
+CREATE TABLE shipping_templates
 (
 id serial NOT NULL,
 label character varying(64) NOT NULL,
@@ -1577,7 +1577,7 @@ options json DEFAULT '{}',
 fee json DEFAULT '{}',
 entities json DEFAULT '{}',
 account json DEFAULT '{}',
-CONSTRAINT shippings_pkey PRIMARY KEY (id)
+CONSTRAINT shipping_templates_pkey PRIMARY KEY (id)
 )
 WITH (OIDS=FALSE);
 
diff --git a/src/app/shipping/controllers/ShippingController.php b/src/app/shipping/controllers/ShippingController.php
index 3c7593dba15bc9c6200425ea523e953d9a699b88..6da8097d0c0764a3114964f9fa8cd90cddc64bab 100755
--- a/src/app/shipping/controllers/ShippingController.php
+++ b/src/app/shipping/controllers/ShippingController.php
@@ -107,7 +107,7 @@ class ShippingController
         $id = ShippingModel::create($body);
 
         HistoryController::add([
-            'tableName' => 'shippings',
+            'tableName' => 'shipping_templates',
             'recordId'  => $id,
             'eventType' => 'ADD',
             'eventId'   => 'shippingadd',
@@ -146,7 +146,7 @@ class ShippingController
         ShippingModel::update($body);
 
         HistoryController::add([
-            'tableName' => 'shippings',
+            'tableName' => 'shipping_templates',
             'recordId'  => $aArgs['id'],
             'eventType' => 'UP',
             'eventId'   => 'shippingup',
@@ -174,7 +174,7 @@ class ShippingController
         ShippingModel::delete(['id' => $aArgs['id']]);
 
         HistoryController::add([
-            'tableName' => 'shippings',
+            'tableName' => 'shipping_templates',
             'recordId'  => $aArgs['id'],
             'eventType' => 'DEL',
             'eventId'   => 'shippingdel',
diff --git a/src/app/shipping/models/ShippingModelAbstract.php b/src/app/shipping/models/ShippingModelAbstract.php
index 9e52a20a82f91262c14aeaa70c834bc29b63707c..0b088a77efc75be67891f092fd46463f8c6954de 100755
--- a/src/app/shipping/models/ShippingModelAbstract.php
+++ b/src/app/shipping/models/ShippingModelAbstract.php
@@ -26,7 +26,7 @@ abstract class ShippingModelAbstract
 
         $shippings = DatabaseModel::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'     => ['shippings'],
+            'table'     => ['shipping_templates'],
             'where'     => empty($aArgs['where']) ? [] : $aArgs['where'],
             'data'      => empty($aArgs['data']) ? [] : $aArgs['data'],
             'order_by'  => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
@@ -44,7 +44,7 @@ abstract class ShippingModelAbstract
 
         $shipping = DatabaseModel::select([
             'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'  => ['shippings'],
+            'table'  => ['shipping_templates'],
             'where'  => ['id = ?'],
             'data'   => [$aArgs['id']]
         ]);
@@ -58,11 +58,11 @@ abstract class ShippingModelAbstract
 
     public static function create(array $aArgs)
     {
-        $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'shippings_id_seq']);
+        $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'shipping_templates_id_seq']);
 
         $aArgs['id'] = $nextSequenceId;
         DatabaseModel::insert([
-            'table'         => 'shippings',
+            'table'         => 'shipping_templates',
             'columnsValues' => $aArgs
         ]);
 
@@ -75,7 +75,7 @@ abstract class ShippingModelAbstract
         ValidatorModel::intVal($aArgs, ['id']);
         
         DatabaseModel::update([
-            'table'     => 'shippings',
+            'table'     => 'shipping_templates',
             'set'       => [
                 'label'         => $aArgs['label'],
                 'description'   => $aArgs['description'],
@@ -97,7 +97,7 @@ abstract class ShippingModelAbstract
         ValidatorModel::intVal($aArgs, ['id']);
 
         DatabaseModel::delete([
-            'table' => 'shippings',
+            'table' => 'shipping_templates',
             'where' => ['id = ?'],
             'data'  => [$aArgs['id']]
         ]);