diff --git a/mass_sorting/__manifest__.py b/mass_sorting/__openerp__.py
similarity index 97%
rename from mass_sorting/__manifest__.py
rename to mass_sorting/__openerp__.py
index b268bbafb..a827b7c7e 100644
--- a/mass_sorting/__manifest__.py
+++ b/mass_sorting/__openerp__.py
@@ -6,7 +6,7 @@
 
 {
     'name': 'Mass Sorting',
-    'version': "10.0.1.0.0",
+    'version': "8.0.1.0.0",
     'author': 'GRAP,Odoo Community Association (OCA)',
     'summary': 'Sort any models by any fields list',
     'category': 'Tools',
diff --git a/mass_sorting/demo/function.xml b/mass_sorting/demo/function.xml
index aeefe564c..825fc2d0b 100644
--- a/mass_sorting/demo/function.xml
+++ b/mass_sorting/demo/function.xml
@@ -5,8 +5,8 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo noupdate="1">
+<openerp><data noupdate="1">
 
     <function model="mass.sort.config" name="create_action" eval="[ref('mass_sort_config_demo')]"/>
 
-</odoo>
+</data></openerp>
diff --git a/mass_sorting/demo/mass_sort_config.xml b/mass_sorting/demo/mass_sort_config.xml
index c5e580b34..6e7b4a970 100644
--- a/mass_sorting/demo/mass_sort_config.xml
+++ b/mass_sorting/demo/mass_sort_config.xml
@@ -5,7 +5,7 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo>
+<openerp><data>
 
     <record id="mass_sort_config_demo" model="mass.sort.config">
         <field name="name">Self Mass Sort Demo</field>
@@ -13,4 +13,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="one2many_field_id" ref="mass_sorting.field_mass_sort_config_line_ids"/>
     </record>
 
-</odoo>
+</data></openerp>
diff --git a/mass_sorting/demo/mass_sort_config_line.xml b/mass_sorting/demo/mass_sort_config_line.xml
index 6865ac6d9..d1fc5f9c6 100644
--- a/mass_sorting/demo/mass_sort_config_line.xml
+++ b/mass_sorting/demo/mass_sort_config_line.xml
@@ -5,7 +5,7 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo>
+<openerp><data>
 
     <record id="mass_sort_config_demo_line_1" model="mass.sort.config.line">
         <field name="config_id" ref="mass_sort_config_demo"/>
@@ -17,4 +17,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="field_id" ref="mass_sorting.field_mass_sort_config_line_desc"/>
     </record>
 
-</odoo>
+</data></openerp>
diff --git a/mass_sorting/models/mass_sort_config.py b/mass_sorting/models/mass_sort_config.py
index efad37b85..1ae233ee0 100644
--- a/mass_sorting/models/mass_sort_config.py
+++ b/mass_sorting/models/mass_sort_config.py
@@ -5,8 +5,8 @@
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from openerp import _, api, fields, models
+from openerp.exceptions import ValidationError
 
 
 class MassSortConfig(models.Model):
@@ -74,10 +74,12 @@ class MassSortConfig(models.Model):
                     " you uncheck 'Allow Custom Setting'."))
 
     # Overload Section
+    @api.multi
     def unlink(self):
         self.unlink_action()
         return super(MassSortConfig, self).unlink()
 
+    @api.multi
     def copy(self, default=None):
         default = default or {}
         default.update({
diff --git a/mass_sorting/models/mass_sort_config_line.py b/mass_sorting/models/mass_sort_config_line.py
index d961327ca..3cf1f390b 100644
--- a/mass_sorting/models/mass_sort_config_line.py
+++ b/mass_sorting/models/mass_sort_config_line.py
@@ -3,8 +3,8 @@
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from openerp import _, api, fields, models
+from openerp.exceptions import ValidationError
 
 
 class MassSortConfigLine(models.Model):
diff --git a/mass_sorting/models/mass_sort_wizard.py b/mass_sorting/models/mass_sort_wizard.py
index 1f1dd8b96..662ae6e81 100644
--- a/mass_sorting/models/mass_sort_wizard.py
+++ b/mass_sorting/models/mass_sort_wizard.py
@@ -3,8 +3,8 @@
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from openerp import _, api, fields, models
+from openerp.exceptions import ValidationError
 
 
 class MassSortWizard(models.TransientModel):
@@ -72,6 +72,7 @@ class MassSortWizard(models.TransientModel):
                     "Please Select at least one Sorting Criteria."))
 
     # Action Section
+    @api.multi
     def button_apply(self):
         self.ensure_one()
         wizard = self
diff --git a/mass_sorting/models/mass_sort_wizard_line.py b/mass_sorting/models/mass_sort_wizard_line.py
index 371ba2e74..a8e2de823 100644
--- a/mass_sorting/models/mass_sort_wizard_line.py
+++ b/mass_sorting/models/mass_sort_wizard_line.py
@@ -3,7 +3,7 @@
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import fields, models
+from openerp import fields, models
 
 
 class TransientModelLine(models.TransientModel):
diff --git a/mass_sorting/views/menu.xml b/mass_sorting/views/menu.xml
index 5755fd686..cc1807bed 100644
--- a/mass_sorting/views/menu.xml
+++ b/mass_sorting/views/menu.xml
@@ -5,10 +5,10 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo>
+<openerp><data>
 
     <menuitem id="menu_mass_sort_config"
         action="action_mass_sort_config"
         parent="base.menu_custom" sequence="30"/>
 
-</odoo>
+</data></openerp>
diff --git a/mass_sorting/views/view_mass_sort_config.xml b/mass_sorting/views/view_mass_sort_config.xml
index 7ea016716..d743f5743 100644
--- a/mass_sorting/views/view_mass_sort_config.xml
+++ b/mass_sorting/views/view_mass_sort_config.xml
@@ -5,7 +5,7 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo>
+<openerp><data>
 
     <record id="view_mass_sort_config_search" model="ir.ui.view">
         <field name="model">mass.sort.config</field>
@@ -65,4 +65,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         </field>
     </record>
 
-</odoo>
+</data></openerp>
diff --git a/mass_sorting/views/view_mass_sort_wizard.xml b/mass_sorting/views/view_mass_sort_wizard.xml
index 674d21afe..c99272d7d 100644
--- a/mass_sorting/views/view_mass_sort_wizard.xml
+++ b/mass_sorting/views/view_mass_sort_wizard.xml
@@ -5,7 +5,7 @@ Copyright (C) 2016-Today GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
-<odoo>
+<openerp><data>
 
     <record id="view_mass_sort_wizard_form" model="ir.ui.view">
         <field name="model">mass.sort.wizard</field>
@@ -34,4 +34,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         </field>
     </record>
 
-</odoo>
+</data></openerp>