diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 93fe871d6ee..201dd6acb8e 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -18,7 +18,7 @@ that have no counterpart in the general financial accounts.
     'data': [
         'security/analytic_security.xml',
         'security/ir.model.access.csv',
-        'views/analytic_view.xml',
+        'views/analytic_account_views.xml',
     ],
     'demo': [
         'data/analytic_demo.xml',
diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml
index 5e7478605ee..e1c2244f1a8 100644
--- a/addons/analytic/data/analytic_account_demo.xml
+++ b/addons/analytic/data/analytic_account_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
@@ -70,4 +70,4 @@
             <field name="name">Commercial &amp; Marketing</field>
         </record>
     </data>
-</openerp>
+</odoo>
diff --git a/addons/analytic/data/analytic_demo.xml b/addons/analytic/data/analytic_demo.xml
index 7b8635d3c1b..8e97402670d 100644
--- a/addons/analytic/data/analytic_demo.xml
+++ b/addons/analytic/data/analytic_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
         <record id="tag_contract" model="account.analytic.tag">
@@ -7,4 +7,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/addons/analytic/models/__init__.py b/addons/analytic/models/__init__.py
index dca9f87f0ec..dc527355f7a 100644
--- a/addons/analytic/models/__init__.py
+++ b/addons/analytic/models/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import analytic
+import analytic_account
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic_account.py
similarity index 94%
rename from addons/analytic/models/analytic.py
rename to addons/analytic/models/analytic_account.py
index 8a1a6646f83..0a35ec1fc2a 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic_account.py
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp import api, fields, models
+from odoo import api, fields, models
 
 
-class account_analytic_tag(models.Model):
+class AccountAnalyticTag(models.Model):
     _name = 'account.analytic.tag'
     _description = 'Analytic Tags'
     name = fields.Char(string='Analytic Tag', index=True, required=True)
     color = fields.Integer('Color Index')
 
 
-class account_analytic_account(models.Model):
+class AccountAnalyticAccount(models.Model):
     _name = 'account.analytic.account'
     _inherit = ['mail.thread']
     _description = 'Analytic Account'
@@ -74,7 +74,7 @@ class account_analytic_account(models.Model):
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
         if operator not in ('ilike', 'like', '=', '=like', '=ilike'):
-            return super(account_analytic_account, self).name_search(name, args, operator, limit)
+            return super(AccountAnalyticAccount, self).name_search(name, args, operator, limit)
         args = args or []
         domain = ['|', ('code', operator, name), ('name', operator, name)]
         partners = self.env['res.partner'].search([('name', operator, name)], limit=limit)
@@ -84,7 +84,7 @@ class account_analytic_account(models.Model):
         return recs.name_get()
 
 
-class account_analytic_line(models.Model):
+class AccountAnalyticLine(models.Model):
     _name = 'account.analytic.line'
     _description = 'Analytic Line'
     _order = 'date desc, id desc'
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_account_views.xml
similarity index 99%
rename from addons/analytic/views/analytic_view.xml
rename to addons/analytic/views/analytic_account_views.xml
index 8160065057e..927470cb6d9 100644
--- a/addons/analytic/views/analytic_view.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <record id="account_analytic_tag_tree_view" model="ir.ui.view">
             <field name="name">account.analytic.tag.tree</field>
             <field name="model">account.analytic.tag</field>
@@ -267,6 +266,4 @@
               </p>
             </field>
         </record>
-
-     </data>
-</openerp>
+</odoo>