diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index f9b2003718a..0d49e938c54 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -859,7 +859,7 @@ if ($socid > 0)
 	    				print $obj->description;
 	    				print '</td>';
 	    			}
-	    			print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.'</a></td>';
+	    			print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
 	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
 	    			if (! empty($conf->multicurrency->enabled))
 	    			{
@@ -1029,7 +1029,7 @@ if ($socid > 0)
 						print $obj->description;
 						print '</td>';
 					}
-					print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.'</a></td>';
+					print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (! empty($conf->multicurrency->enabled))
 					{
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 478c69d4fe5..162bee68128 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -472,8 +472,8 @@ function show_stats_for_company($product, $socid)
 function measuring_units_string($unit, $measuring_style = '')
 {
 	global $langs, $db;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/cmeasuringunits.class.php';
-	$measuringUnits= new CMeasuringUnits($db);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+	$measuringUnits= new CUnits($db);
 	$result = $measuringUnits->fetchAll('', '', 0, 0, array(
 			't.code' => $unit,
 			't.unit_type' => $measuring_style,
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 9c0da6c5b8d..4c6c420aa50 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -351,48 +351,48 @@ class modProduct extends DolibarrModules
         $this->import_convertvalue_array[$r] = array(
 				'p.weight_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'weight',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
 				'p.length_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'size',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
 				'p.width_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'size',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
 				'p.height_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'size',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
 				'p.surface_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'surface',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
 				'p.volume_units' => array(
 						'rule' => 'fetchidfromcodeunits',
-						'classfile' => '/core/class/cmeasuringunits.class.php',
-						'class' => 'CMeasuringUnits',
+						'classfile' => '/core/class/cunits.class.php',
+						'class' => 'CUnits',
 						'method' => 'fetch',
 						'units' => 'volume',
 						'dict' => 'DictionaryMeasuringUnits'
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index afd62525135..93d239cc207 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -318,8 +318,8 @@ class FormProduct
 
 		$measuring_units = array();
 
-		require_once DOL_DOCUMENT_ROOT . '/core/class/cmeasuringunits.class.php';
-		$measuringUnits = new CMeasuringUnits($db);
+		require_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+		$measuringUnits = new CUnits($db);
 		$result = $measuringUnits->fetchAll('', '', 0, 0, array(
 				't.unit_type' => $measuring_style,
 				't.active' => 1