diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index 7a3970f9f44..08f3f214ba0 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import stock
+import stock_location
 import mrp_pull
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 8c58fcc2c13..96e5bfe41ba 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -39,7 +39,7 @@ This module may be useful for different purposes:
     'author': 'Tiny',
     'depends': ['procurement','stock'],
     'init_xml': [],
-    'update_xml': ['stock_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
+    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
     'demo_xml': [],
     'installable': True,
     'test':[
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock_location.py
similarity index 100%
rename from addons/stock_location/stock.py
rename to addons/stock_location/stock_location.py
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_location_view.xml
similarity index 100%
rename from addons/stock_location/stock_view.xml
rename to addons/stock_location/stock_location_view.xml