diff --git a/addons/hr_payroll_l10n_be/__init__.py b/addons/l10n_be_hr_payroll/__init__.py
similarity index 86%
rename from addons/hr_payroll_l10n_be/__init__.py
rename to addons/l10n_be_hr_payroll/__init__.py
index 61db034b52c..fb327bcb6c4 100644
--- a/addons/hr_payroll_l10n_be/__init__.py
+++ b/addons/l10n_be_hr_payroll/__init__.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,9 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-import hr_payroll_l10n_be
-import hr_contract
-import hr_payroll
+import l10n_be_hr_payroll
diff --git a/addons/hr_payroll_l10n_be/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
similarity index 80%
rename from addons/hr_payroll_l10n_be/__openerp__.py
rename to addons/l10n_be_hr_payroll/__openerp__.py
index b9f887f3ff8..ca0851ed9eb 100644
--- a/addons/hr_payroll_l10n_be/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,19 +15,18 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
-    'name': 'hr_payroll_l10n_be',
+    'name': 'Belgian Payroll Rules',
     'category': 'payroll',
-    'init_xml':[],
-    'author': 'OpenERP',
+    'author': 'OpenERP SA',
     'depends': ['hr_payroll','hr_contract'],
     'version': '1.0',
     'description': """
-Belgian Payroll system.
-=======================
+Belgian Payroll Rules
+=====================
 
     * Employee Details
     * Employee Contracts
@@ -41,12 +40,12 @@ Belgian Payroll system.
     """,
 
     'active': False,
-    'demo_xml': [
-     'hr_payroll_l10n_be_demo.xml',
+    'demo': [
+     'l10n_be_hr_payroll_demo.xml',
     ],
-    'update_xml':[
-     'hr_payroll_l10n_be_view.xml',
-     'hr_payroll_l10n_be_data.xml',
+    'data':[
+     'l10n_be_hr_payroll_view.xml',
+     'l10n_be_hr_payroll_data.xml',
      'data/hr.salary.rule.csv',
     ],
     'installable': True
diff --git a/addons/hr_payroll_l10n_be/data/hr.salary.rule.csv b/addons/l10n_be_hr_payroll/data/hr.salary.rule.csv
similarity index 100%
rename from addons/hr_payroll_l10n_be/data/hr.salary.rule.csv
rename to addons/l10n_be_hr_payroll/data/hr.salary.rule.csv
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
similarity index 90%
rename from addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py
rename to addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
index 3c98e99cd71..761374da283 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be.py
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
@@ -2,8 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    d$
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -20,18 +19,7 @@
 #
 ##############################################################################
 
-import time
-from datetime import date
-from datetime import datetime
-from datetime import timedelta
-
-import netsvc
 from osv import fields, osv
-import tools
-from tools.translate import _
-import decimal_precision as dp
-
-
 
 class hr_contract_be(osv.osv):
     _inherit = 'hr.contract'
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
similarity index 100%
rename from addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml
rename to addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
similarity index 100%
rename from addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml
rename to addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
similarity index 100%
rename from addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
rename to addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
diff --git a/addons/hr_payroll_l10n_be/security/hr.salary.rule.csv b/addons/l10n_be_hr_payroll/security/hr.salary.rule.csv
similarity index 100%
rename from addons/hr_payroll_l10n_be/security/hr.salary.rule.csv
rename to addons/l10n_be_hr_payroll/security/hr.salary.rule.csv