diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index ac6b336490993c1366675cd196cc78cbe2021783..5cf1687eb5999ab521012dc143caec2ab2461b19 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -130,17 +130,17 @@ function pdf_format_address($outputlangs,$object)
     // Zip/Town/State
     if (in_array($object->pays_code,array('US')))   // US: town, state, zip
     {
-        $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->ville);
+        $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->town);
         if ($object->departement && in_array($object->pays_code,$countriesusingstate))
         {
             $ret.=", ".$outputlangs->convToOutputCharset($object->departement);
         }
-        if ($object->cp) $ret .= ', '.$outputlangs->convToOutputCharset($object->cp);
+        if ($object->cp) $ret .= ', '.$outputlangs->convToOutputCharset($object->zip);
     }
     else                                        // Other: zip town, state
     {
-        $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->cp);
-        $ret .= ' '.$outputlangs->convToOutputCharset($object->ville);
+        $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->zip);
+        $ret .= ' '.$outputlangs->convToOutputCharset($object->town);
         if ($object->departement && in_array($object->pays_code,$countriesusingstate))
         {
             $ret.=", ".$outputlangs->convToOutputCharset($object->departement);
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 5e6794d01ce413cc04e8b2eed9bfb1c776de7ac6..a0924d4b28cce988a1c04f00935348edf5c1105e 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -211,10 +211,15 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 	$mysoc=new Societe($db);
 
 	$mysoc->id=0;
+	$mysoc->nom=$conf->global->MAIN_INFO_SOCIETE_NOM; 			// TODO deprecated
 	$mysoc->name=$conf->global->MAIN_INFO_SOCIETE_NOM;
+	$mysoc->adresse=$conf->global->MAIN_INFO_SOCIETE_ADRESSE; 	// TODO deprecated
 	$mysoc->address=$conf->global->MAIN_INFO_SOCIETE_ADRESSE;
+	$mysoc->cp=$conf->global->MAIN_INFO_SOCIETE_CP; 			// TODO deprecated
 	$mysoc->zip=$conf->global->MAIN_INFO_SOCIETE_CP;
+	$mysoc->ville=$conf->global->MAIN_INFO_SOCIETE_VILLE; 		// TODO deprecated
 	$mysoc->town=$conf->global->MAIN_INFO_SOCIETE_VILLE;
+	$mysoc->departement_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;	// TODO deprecated
 	$mysoc->state_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
 	$mysoc->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
 
@@ -241,7 +246,8 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
     if (is_object($langs)) $mysoc->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
     $mysoc->pays=$mysoc->country;    	// TODO deprecated
 
-	$mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
+	$mysoc->tel=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;   // TODO deprecated
+    $mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 	$mysoc->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
 	$mysoc->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
 	// Anciens id prof