diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 88f00077d16..be73103125f 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import pos
+import point_of_sale
 import account_bank_statement
 import wizard
 import report
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 1c23a27acd1..6e742830148 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -62,18 +62,18 @@ Main features :
         'wizard/pos_payment.xml',
         'wizard/pos_scan_product_view.xml',
         'wizard/pos_return_view.xml',
-        'pos_report.xml',
-        'pos_view.xml',
+        'point_of_sale_report.xml',
+        'point_of_sale_view.xml',
         'report/report_pos_order_view.xml',
         'report/report_cash_register_view.xml',
-        'pos_sequence.xml',
-        'pos_workflow.xml',
-        'statement_view.xml',
-        'statement_report.xml',
+        'point_of_sale_sequence.xml',
+        'point_of_sale_workflow.xml',
+        'account_statement_view.xml',
+        'account_statement_report.xml',
     ],
-    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml'],
-    'test':['test/pos_test.yml',
-            'test/pos_report.yml',
+    'demo_xml': ['point_of_sale_demo.xml','account_statement_demo.xml'],
+    'test': ['test/point_of_sale_test.yml',
+            'test/point_of_sale_report.yml',
     ],
     'installable': True,
 }
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/account_statement_demo.xml
similarity index 100%
rename from addons/point_of_sale/singer_statement_demo.xml
rename to addons/point_of_sale/account_statement_demo.xml
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/account_statement_report.xml
similarity index 100%
rename from addons/point_of_sale/statement_report.xml
rename to addons/point_of_sale/account_statement_report.xml
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/account_statement_view.xml
similarity index 100%
rename from addons/point_of_sale/statement_view.xml
rename to addons/point_of_sale/account_statement_view.xml
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/account_statement_wizard.xml
similarity index 100%
rename from addons/point_of_sale/statement_wizard.xml
rename to addons/point_of_sale/account_statement_wizard.xml
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/point_of_sale.py
similarity index 100%
rename from addons/point_of_sale/pos.py
rename to addons/point_of_sale/point_of_sale.py
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/point_of_sale_data.xml
similarity index 100%
rename from addons/point_of_sale/posrule_data2.xml
rename to addons/point_of_sale/point_of_sale_data.xml
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
similarity index 100%
rename from addons/point_of_sale/pos_demo.xml
rename to addons/point_of_sale/point_of_sale_demo.xml
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/point_of_sale_report.xml
similarity index 100%
rename from addons/point_of_sale/pos_report.xml
rename to addons/point_of_sale/point_of_sale_report.xml
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/point_of_sale_sequence.xml
similarity index 100%
rename from addons/point_of_sale/pos_sequence.xml
rename to addons/point_of_sale/point_of_sale_sequence.xml
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/point_of_sale_view.xml
similarity index 100%
rename from addons/point_of_sale/pos_view.xml
rename to addons/point_of_sale/point_of_sale_view.xml
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
similarity index 100%
rename from addons/point_of_sale/pos_workflow.xml
rename to addons/point_of_sale/point_of_sale_workflow.xml
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
similarity index 100%
rename from addons/point_of_sale/test/pos_report.yml
rename to addons/point_of_sale/test/point_of_sale_report.yml
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml
similarity index 100%
rename from addons/point_of_sale/test/pos_test.yml
rename to addons/point_of_sale/test/point_of_sale_test.yml