diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index cbbf6676352..5c78d7aacc9 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -97,7 +97,7 @@ ALTER TABLE llx_product_lot_extrafields ADD INDEX idx_product_lot_extrafields (f
 
 ALTER TABLE llx_website_page MODIFY content MEDIUMTEXT;
 
-create table llx_product_stock_entrepot
+create table llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
   tms             		timestamp,
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
index ced4a2e8abb..7b485ca26f6 100644
--- a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
@@ -18,7 +18,7 @@
 --
 -- ============================================================================
 
-create table llx_product_stock_entrepot
+create table llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
   tms             		timestamp,
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 89a7ac8a910..1128bcd4a66 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -926,7 +926,7 @@ class Product extends CommonObject
    			// Delete all child tables
 			if (! $error)
 			{
-				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_stock_entrepot');
+				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_warehouse_properties');
     			foreach($elements as $table)
     			{
     				if (! $error)
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index d99de70f506..acbde6a8b07 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -221,7 +221,7 @@ class Entrepot extends CommonObject
 	{
 		$this->db->begin();
 
-		$elements = array('stock_mouvement','product_stock','product_stock_entrepot');
+		$elements = array('stock_mouvement','product_stock','product_warehouse_properties');
 		foreach($elements as $table)
 		{
 			if (! $error)
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index e11467940d7..84c1735ff6e 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -47,7 +47,7 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'product_stock_entrepot';
+	public $table_element = 'product_warehouse_properties';
 
 	/**
 	 */
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ca71f36b8a6..e256cfeaab8 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -270,7 +270,7 @@ $sql.= ' FROM ' . MAIN_DB_PREFIX . 'product as p';
 $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s';
 $sql.= ' ON p.rowid = s.fk_product';
 if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock_entrepot pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
 }
 $sql.= ' WHERE p.entity IN (' . getEntity("product", 1) . ')';
 if ($sall) {