diff --git a/account_journal_period_close/__openerp__.py b/account_journal_period_close/__openerp__.py
index ab9b61686..fa90ca293 100644
--- a/account_journal_period_close/__openerp__.py
+++ b/account_journal_period_close/__openerp__.py
@@ -52,7 +52,7 @@ a given period, while leaving the miscellaneous journal open.
 From a technical standpoint, the module leverages the
 account.journal.period model that is present in Odoo core.
 """,
-    "data": ['view/account_view.xml'],
+    "data": ['view/account_period_view.xml'],
     "demo": [],
     "test": [],
     "licence": "AGPL-3",
diff --git a/account_journal_period_close/model/__init__.py b/account_journal_period_close/model/__init__.py
index 123722270..277c5ad55 100644
--- a/account_journal_period_close/model/__init__.py
+++ b/account_journal_period_close/model/__init__.py
@@ -26,4 +26,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
-from . import account
+from . import account_journal_period
+from . import account_period
diff --git a/account_journal_period_close/model/account.py b/account_journal_period_close/model/account_journal_period.py
similarity index 85%
rename from account_journal_period_close/model/account.py
rename to account_journal_period_close/model/account_journal_period.py
index ecaa924d4..d6cafbb29 100644
--- a/account_journal_period_close/model/account.py
+++ b/account_journal_period_close/model/account_journal_period.py
@@ -31,15 +31,7 @@ from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class account_period(orm.Model):
-    _inherit = 'account.period'
-    _columns = {
-        'journal_period_ids': fields.one2many('account.journal.period',
-                                              'period_id', 'Journal states'),
-    }
-
-
-class account_journal_period(orm.Model):
+class AccountJournalPeriod(orm.Model):
     _inherit = 'account.journal.period'
     _order = "type,name"
     _columns = {
@@ -80,7 +72,7 @@ class account_journal_period(orm.Model):
                     .browse(cr, uid, values['period_id'], context=context)
                 values.update({'name': (journal.code or journal.name)+':' +
                                (period.name or '')}),
-        return super(account_journal_period, self).create(cr,
-                                                          uid,
-                                                          values,
-                                                          context=context)
+        return super(AccountJournalPeriod, self).create(cr,
+                                                        uid,
+                                                        values,
+                                                        context=context)
diff --git a/account_journal_period_close/model/account_period.py b/account_journal_period_close/model/account_period.py
new file mode 100644
index 000000000..72902209e
--- /dev/null
+++ b/account_journal_period_close/model/account_period.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+#
+#    Authors: Adrien Peiffer
+#    Copyright (c) 2014 Acsone SA/NV (http://www.acsone.eu)
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsibility of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs.
+#    End users who are looking for a ready-to-use solution with commercial
+#    guarantees and support are strongly advised to contact a Free Software
+#    Service Company.
+#
+#    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 the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+#
+
+from openerp.osv import orm, fields
+
+
+class AccountPeriod(orm.Model):
+    _inherit = 'account.period'
+    _columns = {
+        'journal_period_ids': fields.one2many('account.journal.period',
+                                              'period_id', 'Journal states'),
+    }
diff --git a/account_journal_period_close/view/account_view.xml b/account_journal_period_close/view/account_period_view.xml
similarity index 100%
rename from account_journal_period_close/view/account_view.xml
rename to account_journal_period_close/view/account_period_view.xml