diff --git a/addons/account_check_printing/__init__.py b/addons/account_check_printing/__init__.py
index 86524733c84..e2b122e1a08 100644
--- a/addons/account_check_printing/__init__.py
+++ b/addons/account_check_printing/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
 
-import account_journal
-import account_journal_dashboard
-import account_payment
-
+import models
 import wizard
diff --git a/addons/account_check_printing/__openerp__.py b/addons/account_check_printing/__openerp__.py
index c3d380b4fdd..93ce80a6ea7 100644
--- a/addons/account_check_printing/__openerp__.py
+++ b/addons/account_check_printing/__openerp__.py
@@ -10,13 +10,13 @@ It must be used as a dependency for modules that provide country-specific check
 The check settings are located in the accounting journals configuration page.
     """,
     'website': 'https://www.odoo.com/page/accounting',
-    'depends' : ['account'],
+    'depends': ['account'],
     'data': [
-        'data/check_printing.xml',
-        'views/account_journal_dashboard_view.xml',
-        'views/account_journal_view.xml',
-        'views/account_payment_view.xml',
-        'wizard/print_pre_numbered_checks.xml'
+        'data/account_check_printing_data.xml',
+        'views/account_journal_dashboard_views.xml',
+        'views/account_journal_views.xml',
+        'views/account_payment_views.xml',
+        'wizard/print_prenumbered_checks_views.xml'
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_check_printing/data/check_printing.xml b/addons/account_check_printing/data/account_check_printing_data.xml
similarity index 100%
rename from addons/account_check_printing/data/check_printing.xml
rename to addons/account_check_printing/data/account_check_printing_data.xml
diff --git a/addons/account_check_printing/models/__init__.py b/addons/account_check_printing/models/__init__.py
new file mode 100644
index 00000000000..9c4ae23a06d
--- /dev/null
+++ b/addons/account_check_printing/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import account_journal
+import account_journal_dashboard
+import account_payment
diff --git a/addons/account_check_printing/account_journal.py b/addons/account_check_printing/models/account_journal.py
similarity index 100%
rename from addons/account_check_printing/account_journal.py
rename to addons/account_check_printing/models/account_journal.py
diff --git a/addons/account_check_printing/account_journal_dashboard.py b/addons/account_check_printing/models/account_journal_dashboard.py
similarity index 100%
rename from addons/account_check_printing/account_journal_dashboard.py
rename to addons/account_check_printing/models/account_journal_dashboard.py
diff --git a/addons/account_check_printing/account_payment.py b/addons/account_check_printing/models/account_payment.py
similarity index 100%
rename from addons/account_check_printing/account_payment.py
rename to addons/account_check_printing/models/account_payment.py
diff --git a/addons/account_check_printing/views/account_journal_dashboard_view.xml b/addons/account_check_printing/views/account_journal_dashboard_views.xml
similarity index 100%
rename from addons/account_check_printing/views/account_journal_dashboard_view.xml
rename to addons/account_check_printing/views/account_journal_dashboard_views.xml
diff --git a/addons/account_check_printing/views/account_journal_view.xml b/addons/account_check_printing/views/account_journal_views.xml
similarity index 100%
rename from addons/account_check_printing/views/account_journal_view.xml
rename to addons/account_check_printing/views/account_journal_views.xml
diff --git a/addons/account_check_printing/views/account_payment_view.xml b/addons/account_check_printing/views/account_payment_views.xml
similarity index 100%
rename from addons/account_check_printing/views/account_payment_view.xml
rename to addons/account_check_printing/views/account_payment_views.xml
diff --git a/addons/account_check_printing/wizard/__init__.py b/addons/account_check_printing/wizard/__init__.py
index 0d305b91dc3..118be64634d 100644
--- a/addons/account_check_printing/wizard/__init__.py
+++ b/addons/account_check_printing/wizard/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import print_pre_numbered_checks
+import print_prenumbered_checks
diff --git a/addons/account_check_printing/wizard/print_pre_numbered_checks.py b/addons/account_check_printing/wizard/print_prenumbered_checks.py
similarity index 100%
rename from addons/account_check_printing/wizard/print_pre_numbered_checks.py
rename to addons/account_check_printing/wizard/print_prenumbered_checks.py
diff --git a/addons/account_check_printing/wizard/print_pre_numbered_checks.xml b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
similarity index 100%
rename from addons/account_check_printing/wizard/print_pre_numbered_checks.xml
rename to addons/account_check_printing/wizard/print_prenumbered_checks_views.xml