diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index 01d712ef41e..c8c80cd2e3a 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -28,13 +28,13 @@
         "static/src/js/list-editable.js",
         "static/src/js/search.js",
         "static/src/js/view_tree.js",
-        "static/src/js/export.js",
+        "static/src/js/data_export.js",
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",
         "static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css",
         "static/lib/jquery.ui.notify/css/ui.notify.css",
         "static/src/css/base.css",
-        "static/src/css/export.css",
+        "static/src/css/data_export.css",
     ],
 }
diff --git a/addons/base/static/src/css/export.css b/addons/base/static/src/css/data_export.css
similarity index 100%
rename from addons/base/static/src/css/export.css
rename to addons/base/static/src/css/data_export.css
diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index 25ab0bda632..5f86a73ed5e 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -86,8 +86,8 @@ openerp.base = function(instance) {
     if (openerp.base.view_tree) {
         openerp.base.view_tree(instance);
     }
-    if (openerp.base.export) {
-        openerp.base.export(instance);
+    if (openerp.base.data_export) {
+        openerp.base.data_export(instance);
     }
 };
 
diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/data_export.js
similarity index 99%
rename from addons/base/static/src/js/export.js
rename to addons/base/static/src/js/data_export.js
index cec141aefcd..9a04dbf4c4e 100644
--- a/addons/base/static/src/js/export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,5 +1,5 @@
-openerp.base.export = function(openerp) {
-openerp.base.Export = openerp.base.Dialog.extend({
+openerp.base.data_export = function(openerp) {
+openerp.base.DataExport = openerp.base.Dialog.extend({
     init: function(parent, dataset, views){
         this._super(parent);
         this.dataset = dataset
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index d25e34a26f4..36fce76d40c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -222,7 +222,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             if(this.active_view == 'list' || this.active_view == 'form') {
                 this.views[this.active_view].controller.$element.after(QWeb.render('ExportView'))
                 this.$element.find('#exportview').click(function(ev) {
-                    var export_view = new openerp.base.Export(self, self.dataset, self.views);
+                    var export_view = new openerp.base.DataExport(self, self.dataset, self.views);
                     export_view.start(false);
                     ev.preventDefault();
                 });