diff --git a/dev/phpcheckstyle/phpstandard.cfg.xml b/dev/phpcheckstyle/phpstandard.cfg.xml
index b185d6dcffe..8170874372f 100644
--- a/dev/phpcheckstyle/phpstandard.cfg.xml
+++ b/dev/phpcheckstyle/phpstandard.cfg.xml
@@ -11,7 +11,7 @@
     -->
     
      <!-- Check Variable Naming -->
-    <test name="variableNaming" regexp="/^[a-z_][a-zA-Z0-9]*$/" />
+    <test name="variableNaming" regexp="/^[a-z_][a-zA-Z0-9_]*$/" />
     
     <!-- Check Function Naming -->
     <test name="functionNaming" regexp="/^[a-z_]/" level="ERROR"/>
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index faa90d168fa..3f75e8ef98d 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -117,7 +117,7 @@ class RemiseCheque extends CommonObject
 	 *	\param  	account_id 		Compte bancaire concerne
 	 *	\return		int				<0 if KO, >0 if OK
 	 */
-	function Create($user, $account_id)
+	function create($user, $account_id)
 	{
 		global $conf;
 
@@ -220,7 +220,7 @@ class RemiseCheque extends CommonObject
 
 			if ($this->id > 0 && $this->errno == 0)
 			{
-				if ($this->UpdateAmount() <> 0)
+				if ($this->updateAmount() <> 0)
 				{
 					$this->errno = -1027;
 					dol_syslog("RemiseCheque::Create ERREUR ($this->errno)");
@@ -254,7 +254,7 @@ class RemiseCheque extends CommonObject
 	 \brief  Supprime la remise en base
 	 \param  user utilisateur qui effectue l'operation
 	 */
-	function Delete($user='')
+	function delete($user='')
 	{
 		global $conf;
 
@@ -308,7 +308,7 @@ class RemiseCheque extends CommonObject
 	 *  \brief  Validate receipt
 	 *  \param  user 	User
 	 */
-	function Validate($user)
+	function validate($user)
 	{
 		global $langs,$conf;
 
@@ -530,7 +530,7 @@ class RemiseCheque extends CommonObject
 	 *	\brief  Mets a jour le montant total
 	 *	\return int, 0 en cas de succes
 	 */
-	function UpdateAmount()
+	function updateAmount()
 	{
 		global $conf;
 
@@ -563,13 +563,13 @@ class RemiseCheque extends CommonObject
 	  if (!$resql)
 	  {
 	  	$this->errno = -1030;
-	  	dol_syslog("RemiseCheque::UpdateAmount ERREUR UPDATE ($this->errno)");
+	  	dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 	  }
 		}
 		else
 		{
 			$this->errno = -1031;
-			dol_syslog("RemiseCheque::UpdateAmount ERREUR SELECT ($this->errno)");
+			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
 
 		if ($this->errno === 0)
@@ -579,7 +579,7 @@ class RemiseCheque extends CommonObject
 		else
 		{
 			$this->db->rollback();
-			dol_syslog("RemiseCheque::UpdateAmount ROLLBACK ($this->errno)");
+			dol_syslog("RemiseCheque::updateAmount ROLLBACK ($this->errno)");
 		}
 
 		return $this->errno;
@@ -590,7 +590,7 @@ class RemiseCheque extends CommonObject
 	 \param  user utilisateur qui effectue l'operation
 	 \param  account_id Compte bancaire concerne
 	 */
-	function RemoveCheck($account_id)
+	function removeCheck($account_id)
 	{
 		$this->errno = 0;
 
@@ -604,12 +604,12 @@ class RemiseCheque extends CommonObject
 			$resql = $this->db->query($sql);
 			if ($resql)
 	  {
-	  	$this->UpdateAmount();
+	  	$this->updateAmount();
 	  }
 	  else
 	  {
 	  	$this->errno = -1032;
-	  	dol_syslog("RemiseCheque::RemoveCheck ERREUR UPDATE ($this->errno)");
+	  	dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
 	  }
 		}
 		return 0;
@@ -688,10 +688,10 @@ class RemiseCheque extends CommonObject
 	}
 
 	/**
-	 *    	\brief      Renvoi le libelle d'un statut donne
-	 *    	\param      status      Statut
-	 *		\param      mode        0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    	\return     string      Libelle du statut
+	 *    	Return label of a status
+	 *    	@param      status      Statut
+	 *		@param      mode        0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *    	@return     string      Libelle du statut
 	 */
 	function LibStatut($status,$mode=0)
 	{
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index a27b0e65c8e..97bc397b13c 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *  \file       htdocs/ecm/class/ecm_directories.class.php
+ *  \file       htdocs/ecm/class/ecmdirectories.class.php
  *  \ingroup    ecm
  *  \brief      This file is an example for a class file
  *  \version    $Id$
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index df56895e45e..d1cc1ed4d9f 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/exports/class/xport.class.php
+ *	\file       htdocs/exports/class/export.class.php
  *	\ingroup    export
  *	\brief      Fichier de la classe des exports
  *	\version    $Id$
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 1a449ec421b..20b8d2ce176 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/import/class/import.class.php
+ *	\file       htdocs/imports/class/import.class.php
  *	\ingroup    import
  *	\brief      File of class to manage imports
  *	\version    $Id$
diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php
index c075d060608..a96b21d0aa6 100644
--- a/htdocs/includes/modules/facture/mod_facture_mercure.php
+++ b/htdocs/includes/modules/facture/mod_facture_mercure.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *	\file       htdocs/includes/modules/facture/mercure.modules.php
+ *	\file       htdocs/includes/modules/facture/mod_facture_mercure.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Mercure
  *	\version    $Id$
diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/includes/modules/facture/mod_facture_terre.php
index 8aae0dc04d3..837058163d1 100644
--- a/htdocs/includes/modules/facture/mod_facture_terre.php
+++ b/htdocs/includes/modules/facture/mod_facture_terre.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/includes/modules/facture/terre.modules.php
+ *	\file       htdocs/includes/modules/facture/mod_facture_terre.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Terre
  *	\version    $Id$
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index 3735a6781ae..761920db8b2 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *	\file       htdocs/includes/modules/members/cards/modules_cards.php
+ *	\file       htdocs/includes/modules/member/cards/modules_cards.php
  *	\ingroup    member
  *	\brief      File of parent class of document generator for members cards.
  *	\version    $Id$
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index ed5b843cb49..2d45143652b 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -775,10 +775,14 @@ class CMailFile
 		return $_retVal;
 	}
 
-	// This function has been modified as provided
-	// by SirSir to allow multiline responses when
-	// using SMTP Extensions.
-	//
+	/**
+	 * This function has been modified as provided
+     * by SirSir to allow multiline responses when
+	 * using SMTP Extensions.
+	 * @param      socket
+	 * @param      response
+	 * @return     boolean
+	 */
 	function server_parse($socket, $response)
 	{
 		/**