diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index a6af114308e..35a4f905eda 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -40,7 +40,7 @@ $substitutionarrayfortest=array(
 '__EMAIL__' => 'TESTEMail',
 '__LASTNAME__' => 'TESTLastname',
 '__FIRSTNAME__' => 'TESTFirstname',
-'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
+'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
 //'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 03ae84cb051..9616acdd5f0 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -88,7 +88,7 @@ $object->substitutionarrayfortest=array(
     '__OTHER3__' => 'TESTOther3',
     '__OTHER4__' => 'TESTOther4',
     '__OTHER5__' => 'TESTOther5',
-	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
+	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
     //'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
 );
 if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 66824a28199..bc057f0a768 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -213,7 +213,7 @@ if ($resql)
 			$productstatic->ref=$obj->pref;
 			print $productstatic->getNomUrl(1,'',20);
             print $obj->label?' - '.dol_trunc($obj->label,16):'';
-            if (! empty($obj->description) && ! empty($conf->global->PRODUIT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
+            if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
 		}
 		else
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 02da6c5737d..f5fde411c8f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3491,7 +3491,7 @@ function make_substitutions($chaine,$substitutionarray)
 	// Make substitition
 	foreach ($substitutionarray as $key => $value)
 	{
-		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIL_DO_NOT_USE_SIGN))) $value='';
+		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';
 		$chaine=str_replace("$key","$value",$chaine);	// We must keep the " to work when value is 123.5 for example
 	}