diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 9f74e6d1419..b63326ca276 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -41,7 +41,17 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 */
 	public $error = '';
 
-	public $nom = 'Immaculate';
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Immaculate';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Immaculate';
 
 	public $code_auto=1;
 
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index eaafade561f..98380d9fae5 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -42,8 +42,18 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 */
 	public $error='';
 
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
 	public $nom='Madonna';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='Madonna';
+
 	public $code_auto=1;
 
 
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 03f727e8759..60dc9bf6c15 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -38,7 +38,7 @@ class ImportCsv extends ModeleImports
      */
     public $db;
 
-    var $datatoimport;
+    public $datatoimport;
 
 	/**
 	 * @var string Error code (or message)
@@ -69,17 +69,21 @@ class ImportCsv extends ModeleImports
 	public $version = 'dolibarr';
 
 	public $label_lib;    // Label of external lib used by driver
+
 	public $version_lib;  // Version of external lib used by driver
 
 	public $separator;
 
 	public $file;      // Path of file
+
 	public $handle;    // Handle fichier
 
 	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+
 	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
 	public $nbinsert = 0; // # of insert done during the import
+
 	public $nbupdate = 0; // # of update done during the import
 
 
@@ -91,7 +95,7 @@ class ImportCsv extends ModeleImports
 	 */
 	function __construct($db,$datatoimport)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		$this->db = $db;
 
 		$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index e79ef688782..36b57e2d69a 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -69,18 +69,23 @@ class ImportXlsx extends ModeleImports
 	public $version = 'dolibarr';
 
 	public $label_lib;    // Label of external lib used by driver
+
 	public $version_lib;  // Version of external lib used by driver
 
 	public $separator;
 
     public $file;      // Path of file
+
 	public $handle;    // Handle fichier
 
 	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+
 	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
 	public $workbook; // temporary import file
+
 	public $record; // current record
+
 	public $headers;
 
 
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index b69ea8dcf7c..214c04ad857 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -37,7 +37,10 @@ class ModeleImports
 
     public $datatoimport;
 
-    public $error='';
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 
     /**
 	 * @var int id of driver
@@ -58,14 +61,18 @@ class ModeleImports
 	public $version = 'dolibarr';
 
 	public $label_lib;    // Label of external lib used by driver
+
 	public $version_lib;  // Version of external lib used by driver
 
 	// Array of all drivers
 	public $driverlabel=array();
+
 	public $driverdesc=array();
+
 	public $driverversion=array();
 
 	public $liblabel=array();
+
 	public $libversion=array();