diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py
index f3eae93be..34d4ac67b 100644
--- a/account_move_template/account_document_template.py
+++ b/account_move_template/account_document_template.py
@@ -24,7 +24,7 @@ from openerp.tools.translate import _
 import re
 
 
-class account_document_template(orm.Model):
+class AccountDocumentTemplate(orm.Model):
 
     _computed_lines = {}
     _current_template_id = 0
@@ -107,7 +107,7 @@ class account_document_template(orm.Model):
         return False
 
 
-class account_document_template_line(orm.Model):
+class AccountDocumentTemplateLine(orm.Model):
 
     _name = 'account.document.template.line'
 
diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py
index e39864fff..1ac318b3a 100644
--- a/account_move_template/account_move_template.py
+++ b/account_move_template/account_move_template.py
@@ -22,7 +22,7 @@
 from openerp.osv import fields, orm
 
 
-class account_move_template(orm.Model):
+class AccountMoveTemplate(orm.Model):
 
     _inherit = 'account.document.template'
     _name = 'account.move.template'
@@ -82,7 +82,7 @@ class account_move_template(orm.Model):
     ]
 
 
-class account_move_template_line(orm.Model):
+class AccountMoveTemplateLine(orm.Model):
     _name = 'account.move.template.line'
     _inherit = 'account.document.template.line'
 
diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py
index a074c6bfa..a311597e8 100644
--- a/account_move_template/wizard/select_template.py
+++ b/account_move_template/wizard/select_template.py
@@ -24,7 +24,7 @@ import time
 from openerp.tools.translate import _
 
 
-class wizard_select_template(orm.TransientModel):
+class WizardSelectMoveTemplate(orm.TransientModel):
 
     _name = "wizard.select.move.template"
     _columns = {
@@ -245,7 +245,7 @@ class wizard_select_template(orm.TransientModel):
         return id_line
 
 
-class wizard_select_template_line(orm.TransientModel):
+class WizardSelectMoveTemplateLine(orm.TransientModel):
     _description = 'Template Lines'
     _name = "wizard.select.move.template.line"
     _columns = {