diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index fe49256e42e..081306c1d48 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -71,7 +71,7 @@ $tabname[14]= MAIN_DB_PREFIX."c_ecotaxe";
 $tabname[15]= MAIN_DB_PREFIX."c_paper_format";
 $tabname[16]= MAIN_DB_PREFIX."c_prospectlevel";
 $tabname[17]= MAIN_DB_PREFIX."c_type_fees";
-$tabname[18]= MAIN_DB_PREFIX."expedition_methode";
+$tabname[18]= MAIN_DB_PREFIX."c_shipment_mode";
 $tabname[19]= MAIN_DB_PREFIX."c_effectif";
 
 // Dictionary labels
@@ -113,7 +113,7 @@ $tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.org
 $tabsql[15]= "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
 $tabsql[16]= "SELECT code, label as libelle, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
 $tabsql[17]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_fees";
-$tabsql[18]= "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."expedition_methode";
+$tabsql[18]= "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 $tabsql[19]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
 
 // Critere de tri du dictionnaire
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 016727c94c5..f3a3131026c 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -146,7 +146,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	$classname = "methode_expedition_$module";
 	$expem = new $classname($db);
 
-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode";
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 	$sql.= " WHERE rowid = ".$moduleid;
 
 	$resql = $db->query($sql);
@@ -154,7 +154,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	{
 		$db->begin();
 
-		$sqlu = "UPDATE ".MAIN_DB_PREFIX."expedition_methode";
+		$sqlu = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode";
 		$sqlu.= " SET statut=1";
 		$sqlu.= " WHERE rowid=".$moduleid;
 
@@ -173,7 +173,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	{
 		$db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,statut)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (rowid,code,libelle,description,statut)";
 		$sql.= " VALUES (".$moduleid.",'".$expem->code."','".$expem->name."','".$expem->description."',1)";
 		$result=$db->query($sql);
 		if ($result)
@@ -190,7 +190,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	{
 		$db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition_methode";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode";
 		$sql.= " SET statut=0";
 		$sql.= " WHERE rowid=".$moduleid;
 		$result=$db->query($sql);
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 4573b7c2d63..7540a3ead16 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -359,7 +359,7 @@ class Translate {
 		}
 		else if (preg_match('/SendingMethod([0-9A-Z]+)$/i',$key,$reg))
 		{
-			$newstr=$this->getLabelFromKey($db,$reg[1],'expedition_methode','code','libelle');
+			$newstr=$this->getLabelFromKey($db,$reg[1],'c_shipment_mode','code','libelle');
 		}
 		return $newstr;
 	}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index a73baa571ed..4fbf5aef231 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -999,7 +999,7 @@ class Expedition extends CommonObject
 		$meths = array();
 
 		$sql = "SELECT em.rowid, em.code, em.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expedition_methode as em";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
 		$sql.= " WHERE em.active = 1";
 		$sql.= " ORDER BY em.libelle ASC";
 
@@ -1020,7 +1020,7 @@ class Expedition extends CommonObject
 	function GetUrlTrackingStatus()
 	{
 		$sql = "SELECT em.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expedition_methode as em";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
 		$sql.= " WHERE em.rowid = ".$this->expedition_method_id;
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 246518b9646..4841f955b2d 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -912,7 +912,7 @@ else
 				if ($expedition->expedition_method_id > 0)
 				{
 					// Get code using getLabelFromKey
-					$code=$langs->getLabelFromKey($db,$expedition->expedition_method_id,'expedition_methode','rowid','code');
+					$code=$langs->getLabelFromKey($db,$expedition->expedition_method_id,'c_shipment_mode','rowid','code');
 					print $langs->trans("SendingMethod".strtoupper($code));
 				}
 			}
diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
index 34271f3d6b6..3a535a5098e 100644
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -28,8 +28,8 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (1,'RECEP',       1,1, 'A réception','Réception de facture',0,0);
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (2,'30D',         2,1, '30 jours','Réglement à 30 jours',0,30);
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (3,'30DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 30 jours fin de mois',1,30);
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (4,'60D',         4,1, '60 jours','Réglement à 60 jours',0,60);
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (5,'60DENDMONTH', 5,1, '60 jours fin de mois','Réglement à 60 jours fin de mois',1,60);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (1,'RECEP',       1,1, 'A réception','Réception de facture',0,0);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (2,'30D',         2,1, '30 jours','Réglement à 30 jours',0,30);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (3,'30DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 30 jours fin de mois',1,30);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (4,'60D',         4,1, '60 jours','Réglement à 60 jours',0,60);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (5,'60DENDMONTH', 5,1, '60 jours fin de mois','Réglement à 60 jours fin de mois',1,60);
diff --git a/htdocs/install/mysql/data/llx_expedition_methode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
similarity index 78%
rename from htdocs/install/mysql/data/llx_expedition_methode.sql
rename to htdocs/install/mysql/data/llx_c_shipment_mode.sql
index 325980ee4f9..88e23b1d0a9 100644
--- a/htdocs/install/mysql/data/llx_expedition_methode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -31,6 +31,6 @@
 --
 -- Sending method
 --
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
index 95e8653918d..ebb939fd04c 100644
--- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
+++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
@@ -46,3 +46,4 @@ ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) DEFAULT NULL AFTER default
 --UPDATE llx_societe SET canvas='individual' WHERE fk_typent = 8;
 
 RENAME TABLE llx_cond_reglement TO llx_c_payment_term;
+RENAME TABLE llx_expedition_method TO llx_c_shipment_mode;
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql
index 6800c0596d7..43bd5d382fe 100644
--- a/htdocs/install/mysql/tables/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql
@@ -18,7 +18,7 @@
 -- $Id$
 -- ============================================================================
 
-create table llx_cond_reglement
+create table llx_c_payment_term
 (
   rowid           integer PRIMARY KEY,
   code            varchar(16),
diff --git a/htdocs/install/mysql/tables/llx_expedition_methode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
similarity index 97%
rename from htdocs/install/mysql/tables/llx_expedition_methode.sql
rename to htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index e7bab7b13b4..bf549de3c67 100644
--- a/htdocs/install/mysql/tables/llx_expedition_methode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -18,7 +18,7 @@
 -- $Id$
 -- ===================================================================
 
-create table llx_expedition_methode
+create table llx_c_shipment_mode
 (
   rowid            integer PRIMARY KEY,
   tms              timestamp,
diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql
index 73eb05737d3..de99fd52fea 100644
--- a/htdocs/install/mysql/tables/llx_expedition.key.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.key.sql
@@ -31,5 +31,5 @@ ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_ex
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc					FOREIGN KEY (fk_soc)				REFERENCES llx_societe (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author			FOREIGN KEY (fk_user_author)		REFERENCES llx_user (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid 			FOREIGN KEY (fk_user_valid)			REFERENCES llx_user (rowid);
-ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode 	FOREIGN KEY (fk_expedition_methode) REFERENCES llx_expedition_methode (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode 	FOREIGN KEY (fk_expedition_methode) REFERENCES llx_c_shipment_mode (rowid);
 -- obsolete ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison	FOREIGN KEY (fk_adresse_livraison)	REFERENCES llx_societe_address (rowid);
\ No newline at end of file