diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 8a26fa1fb1c..c572b1864a2 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -231,7 +231,7 @@
 <!--Journals for OpenERP IN-->
          <record id="sales_journal_multi_in" model="account.journal">
             <field name="name">Sales Journal - (OpenERP IN)</field>
-            <field name="code">SAJ - (OpenERP IN)</field>
+            <field name="code">SAJ-OpenERP IN</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
@@ -244,7 +244,7 @@
 
         <record id="refund_sales_journal_multi_in" model="account.journal">
             <field name="name">Sales Credit Note Journal - (OpenERP IN)</field>
-            <field name="code">SCNJ- (OpenERP IN)</field>
+            <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -258,7 +258,7 @@
 
         <record id="expenses_journal_multi_in" model="account.journal">
             <field name="name">Expenses Journal - (OpenERP IN)</field>
-            <field name="code">EXJ- (OpenERP IN)</field>
+            <field name="code">EXJ-OpenERP IN</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
@@ -271,7 +271,7 @@
 
         <record id="refund_expenses_journal_multi_in" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
-            <field name="code">ECNJ- (OpenERP IN)</field>
+            <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -285,7 +285,7 @@
 
         <record id="bank_journal_multi_in" model="account.journal">
             <field name="name">Bank Journal - (OpenERP IN)</field>
-            <field name="code">BNK- (OpenERP IN)</field>
+            <field name="code">BNK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
@@ -298,7 +298,7 @@
 
         <record id="check_journal_multi_in" model="account.journal">
             <field name="name">Checks Journal - (OpenERP IN)</field>
-            <field name="code">CHK- (OpenERP IN)</field>
+            <field name="code">CHK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
@@ -311,7 +311,7 @@
 
         <record id="cash_journal_multi_in" model="account.journal">
             <field name="name">Cash Journal - (OpenERP IN)</field>
-            <field name="code">CSH- (OpenERP IN)</field>
+            <field name="code">CSH-OpenERP IN</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
@@ -325,7 +325,7 @@
 <!-- Journals for OpenERP US-->
         <record id="sales_journal_multi_us" model="account.journal">
             <field name="name">Sales Journal - (OpenERP US)</field>
-            <field name="code">SAJ - (OpenERP US)</field>
+            <field name="code">SAJ-OpenERP US</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
@@ -338,7 +338,7 @@
 
         <record id="refund_sales_journal_multi_us" model="account.journal">
             <field name="name">Sales Credit Note Journal - (OpenERP US)</field>
-            <field name="code">SCNJ- (OpenERP US)</field>
+            <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -352,7 +352,7 @@
 
         <record id="expenses_journal_multi_us" model="account.journal">
             <field name="name">Expenses Journal - (OpenERP US)</field>
-            <field name="code">EXJ- (OpenERP US)</field>
+            <field name="code">EXJ-OpenERP US</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
@@ -365,7 +365,7 @@
 
         <record id="refund_expenses_journal_multi_us" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field>
-            <field name="code">ECNJ- (OpenERP US)</field>
+            <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -379,7 +379,7 @@
 
         <record id="bank_journal_multi_us" model="account.journal">
             <field name="name">Bank Journal - (OpenERP US)</field>
-            <field name="code">BNK- (OpenERP US)</field>
+            <field name="code">BNK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
@@ -392,7 +392,7 @@
 
         <record id="check_journal_multi_us" model="account.journal">
             <field name="name">Checks Journal - (OpenERP US)</field>
-            <field name="code">CHK- (OpenERP US)</field>
+            <field name="code">CHK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
@@ -405,7 +405,7 @@
 
         <record id="cash_journal_multi_us" model="account.journal">
             <field name="name">Cash Journal - (OpenERP US)</field>
-            <field name="code">CSH- (OpenERP US)</field>
+            <field name="code">CSH-OpenERP US</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
@@ -420,7 +420,7 @@
 
         <record id="sales_journal_multi_be" model="account.journal">
             <field name="name">Sales Journal - (OpenERP BE)</field>
-            <field name="code">SAJ - (OpenERP BE)</field>
+            <field name="code">SAJ-OpenERP BE</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
@@ -433,7 +433,7 @@
 
         <record id="refund_sales_journal_multi_be" model="account.journal">
             <field name="name">Sales Credit Note Journal - (OpenERP BE)</field>
-            <field name="code">SCNJ- (OpenERP BE)</field>
+            <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -447,7 +447,7 @@
 
         <record id="expenses_journal_multi_be" model="account.journal">
             <field name="name">Expenses Journal - (OpenERP BE)</field>
-            <field name="code">EXJ- (OpenERP BE)</field>
+            <field name="code">EXJ-OpenERP BE</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
@@ -460,7 +460,7 @@
 
         <record id="refund_expenses_journal_multi_be" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field>
-            <field name="code">ECNJ- (OpenERP BE)</field>
+            <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
@@ -474,7 +474,7 @@
 
         <record id="bank_journal_multi_be" model="account.journal">
             <field name="name">Bank Journal - (OpenERP BE)</field>
-            <field name="code">BNK- (OpenERP BE)</field>
+            <field name="code">BNK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
@@ -487,7 +487,7 @@
 
         <record id="check_journal_multi_be" model="account.journal">
             <field name="name">Checks Journal - (OpenERP BE)</field>
-            <field name="code">CHK- (OpenERP BE)</field>
+            <field name="code">CHK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
@@ -500,7 +500,7 @@
 
         <record id="cash_journal_multi_be" model="account.journal">
             <field name="name">Cash Journal - (OpenERP BE)</field>
-            <field name="code">CSH- (OpenERP BE)</field>
+            <field name="code">CSH-OpenERP BE</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>