diff --git a/addons/account/account.py b/addons/account/account.py
index cabf51586fc..5181028c17b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -763,7 +763,7 @@ account_period()
 
 class account_journal_period(osv.osv):
     _name = "account.journal.period"
-    _description = "Journal - Period"
+    _description = "Journal Period"
 
     def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}):
         result = {}.fromkeys(ids, 'STOCK_NEW')
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index ce6341cc9b2..20181514341 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -30,7 +30,7 @@ from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     _columns = {
         'product_uom_id' : fields.many2one('product.uom', 'UoM'),
         'product_id' : fields.many2one('product.product', 'Product'),
@@ -118,7 +118,7 @@ account_analytic_line()
 
 class timesheet_invoice(osv.osv):
     _name = "report.hr.timesheet.invoice.journal"
-    _description = "Analytic account costs and revenues"
+    _description = "Analytic Account Costs and Revenues"
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c23bd35b6a7..9b1497b563f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -387,7 +387,7 @@ account_bank_statement()
 
 class account_bank_statement_reconcile(osv.osv):
     _name = "account.bank.statement.reconcile"
-    _description = "Statement reconcile"
+    _description = "Statement Reconcile"
 
     def _total_entry(self, cursor, user, ids, name, attr, context=None):
         result = {}
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d4f913a32ce..36b65d20dca 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -30,7 +30,7 @@ import tools
 
 class account_move_line(osv.osv):
     _name = "account.move.line"
-    _description = "Entry lines"
+    _description = "Entry Lines"
 
     def _query_get(self, cr, uid, obj='l', context={}):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a289c7af93d..61383a8aac0 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1169,7 +1169,7 @@ class account_invoice_line(osv.osv):
         return 0
 
     _name = "account.invoice.line"
-    _description = "Invoice line"
+    _description = "Invoice Line"
     _columns = {
         'name': fields.char('Description', size=256, required=True),
         'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 7e4807a3f81..742ef74cc84 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -393,7 +393,7 @@ account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
-    _description = "Hours summary by user"
+    _description = "Hours Summary by User"
     _order='user'
     _auto = False
     _rec_name = 'user'
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 6ee1a1ce68c..84fd933d9a9 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -25,7 +25,7 @@ import time
 
 class account_analytic_default(osv.osv):
     _name = 'account.analytic.default'
-    _description = 'Analytic Distributions'
+    _description = 'Analytic Distribution'
     _rec_name = 'analytic_id'
     _order = 'sequence'
     _columns = {
@@ -69,7 +69,7 @@ account_analytic_default()
 
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
-    _description = 'account invoice line'
+    _description = 'Invoice Line'
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context)
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 828d1b1e847..db441d0931f 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -54,7 +54,7 @@ class one2many_mod2(fields.one2many):
 
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
-    _description = "Analytic Plans"
+    _description = "Analytic Plan"
     _columns = {
         'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
         'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
@@ -63,7 +63,7 @@ account_analytic_plan()
 
 class account_analytic_plan_line(osv.osv):
     _name = "account.analytic.plan.line"
-    _description = "Analytic Plan Lines"
+    _description = "Analytic Plan Line"
     _columns = {
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index 98694a3d5dd..ac2dffbfd22 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_order(osv.osv):
     _name = "purchase.order"
     _inherit = "purchase.order"
-    _description = "Purchase order"
+    _description = "Purchase Order"
 
     def inv_line_create(self, cr, uid, a, ol):
         line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
@@ -37,5 +37,4 @@ class purchase_order(osv.osv):
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                 line[2].update({'account_id': a})
         return line
-purchase_order()        
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:        
\ No newline at end of file
+purchase_order()
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 0fdb10c89a6..0e2ef2a363d 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -239,7 +239,7 @@ class crossovered_budget_lines(osv.osv):
                 res[line.id]=0.00
         return res
     _name="crossovered.budget.lines"
-    _description = "Budget Lines"
+    _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index 5eaa2a4e25a..c8bf9537f13 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Follow-Ups'
+    _description = 'Follow-Up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
@@ -34,7 +34,7 @@ followup()
 
 class followup_line(osv.osv):
     _name = 'account_followup.followup.line'
-    _description = 'Follow-Ups Criteria'
+    _description = 'Follow-Up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/followup_report.py
index 79cd6006e2b..5ce062ebd0b 100644
--- a/addons/account_followup/followup_report.py
+++ b/addons/account_followup/followup_report.py
@@ -30,7 +30,7 @@ def _code_get(self, cr, uid, context={}):
 
 class account_followup_stat(osv.osv):
     _name = "account_followup.stat"
-    _description = "Followup statistics"
+    _description = "Followup Statistics"
     _auto = False
     _columns = {
         'name': fields.many2one('res.partner', 'Partner', readonly=True),
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 8f68bdaf46f..8e300f7072a 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -28,7 +28,7 @@ import pooler
 
 class payment_type(osv.osv):
     _name= 'payment.type'
-    _description= 'Payment type'
+    _description= 'Payment Type'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Payment Type'),
         'code': fields.char('Code', size=64, required=True,help='Specifies the Code for Payment Type'),
@@ -43,7 +43,7 @@ payment_type()
 
 class payment_mode(osv.osv):
     _name= 'payment.mode'
-    _description= 'Payment mode'
+    _description= 'Payment Mode'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Mode of Payment'),
         'bank_id': fields.many2one('res.partner.bank', "Bank account",
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 7a6d65878f0..a3f92676111 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -32,7 +32,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class account_report(osv.osv):
     _name = "account.report.report"
-    _description = "Account reporting"
+    _description = "Account Reporting"
 #    _color = [
 #            ('', ''),
 #            ('green','Green'),
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index ad1ce59f769..0b4a16b0dd8 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -30,7 +30,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class color_rml(osv.osv):
     _name = "color.rml"
-    _description = "Rml Colors"
+    _description = "Rml Color"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'code': fields.char('code',size=64,required=True),
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index c3f9eb28fcb..a3425c3925b 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -31,7 +31,7 @@ import decimal_precision as dp
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
-    _description = 'Analytic Accounts'
+    _description = 'Analytic Account'
 
     def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, acc_set, context={}):
         # Handle multi-currency on each level of analytic account
@@ -285,7 +285,7 @@ account_analytic_account()
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     def _amount_currency(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         for rec in self.browse(cr, uid, ids, context):
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index b98d20adc84..0aaf0b5c0c4 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -25,7 +25,7 @@ class res_partner_contact(osv.osv):
     """ Partner Contact """
 
     _name = "res.partner.contact"
-    _description = "res.partner.contact"
+    _description = "Contact"
 
     def _title_get(self,cr, user, context={}):
         """
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0b970da2bca..fe0eb82c52a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -32,7 +32,7 @@ class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
 
     _name = "crm.lead"
-    _description = "Leads Cases"
+    _description = "Lead"
     _order = "priority, id desc"
     _inherit = ['res.partner.address', 'mailgate.thread']
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 67af5bfff16..3b68173d8bc 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -41,7 +41,7 @@ class crm_meeting(osv.osv, crm_case):
     """ CRM Meeting Cases """
 
     _name = 'crm.meeting'
-    _description = "Meeting Cases"
+    _description = "Meeting"
     _order = "id desc"
     _inherit = ["mailgate.thread", "calendar.event"]
 
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 308954c297d..3bc9fdd6d81 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -36,12 +36,10 @@ AVAILABLE_STATES = [
 
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
-
     _name = "crm.lead"
-    _description = "Opportunity Cases"
+    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
-
     _columns = {
         # From crm.case
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -56,7 +54,6 @@ class crm_opportunity(osv.osv):
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action'),
          }
-    
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting probability and close date
         @param self: The object pointer
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6244ba1807a..49d1cefbbd1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -29,7 +29,7 @@ class crm_phonecall(osv.osv, crm_case):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
-    _description = "Phonecall Cases"
+    _description = "Phonecall"
     _order = "id desc"
     _inherit = 'mailgate.thread'
 
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 35b3ed481e9..4b87e4c790e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -26,7 +26,7 @@ from tools.translate import _
 
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
-    _description = "Carrier and delivery grids"
+    _description = "Carrier"
 
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
@@ -144,7 +144,7 @@ delivery_grid()
 
 class delivery_grid_line(osv.osv):
     _name = "delivery.grid.line"
-    _description = "Delivery line of grid"
+    _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 5a5d0528cf3..91dfed96f11 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -29,7 +29,7 @@ import decimal_precision as dp
 # Overloaded stock_picking to manage carriers :
 class stock_picking(osv.osv):
     _name = "stock.picking"
-    _description = "Picking list"
+    _description = "Packing List"
     _inherit = 'stock.picking'
 
     def _cal_weight(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 25e172d2817..56e52aa9b69 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -31,7 +31,7 @@ from tools.translate import _
 
 class document_directory(osv.osv):
     _name = 'document.directory'
-    _description = 'Document directory'
+    _description = 'Directory'
     _order = 'name desc'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
@@ -286,7 +286,7 @@ class document_directory_dctx(osv.osv):
         appended to all children down the tree.
     """
     _name = 'document.directory.dctx'
-    _description = 'Directory dynamic context'
+    _description = 'Directory Dynamic Context'
     _columns = {
         'dir_id': fields.many2one('document.directory', 'Directory', required=True),
         'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 421c423b900..d20870ff825 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -95,7 +95,7 @@ class document_storage(osv.osv):
     the same tree of filesystem storage.
     """
     _name = 'document.storage'
-    _description = 'Document storage media'
+    _description = 'Storage Media'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py
index 72011c39759..1399bc276b5 100644
--- a/addons/document_ftp/doc_conf_wizard.py
+++ b/addons/document_ftp/doc_conf_wizard.py
@@ -30,7 +30,7 @@ import os
 class document_configuration_wizard(osv.osv_memory):
 
     _name='document.configuration.wizard'
-    _description = 'Auto Directory configuration'
+    _description = 'Auto Directory Configuration'
     _inherit = 'res.config'
     _rec_name = 'host'
     _columns = {
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index ef1160132a5..f31969129d8 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -101,7 +101,7 @@ ir_action_window()
 
 class res_users(osv.osv):
     _inherit = 'res.users'
-    _description = 'res.users'
+    _description = 'User'
 
     def _parent_compute(self, cr, uid, ids, name, args, context={}):
         result = {}
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 27458ac2e85..043941eed88 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -27,7 +27,7 @@ from tools.translate import _
 
 class hr_action_reason(osv.osv):
     _name = "hr.action.reason"
-    _description = "Action reason"
+    _description = "Action Reason"
     _columns = {
         'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
         'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4e1e3033a92..5e40e6e5773 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -50,7 +50,7 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
     _name = "hr.expense.expense"
-    _description = "HR Expense"
+    _description = "Expense"
     _columns = {
         'name': fields.char('Expense Sheet', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1ac61fe7909..1d99a417d34 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -29,7 +29,7 @@ from tools.translate import _
 
 class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
-    _description = "Leave Types"
+    _description = "Leave Type"
 
     def get_days_cat(self, cr, uid, ids, category_id, return_false, context={}):
         res = {}
@@ -106,7 +106,7 @@ hr_holidays_status()
 
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
-    _description = "Holidays"
+    _description = "Leave"
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
@@ -432,7 +432,7 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-                }
+    }
 
 resource_calendar_leaves()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f8372527a6c..5875f813dfe 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -55,7 +55,7 @@ hr_recruitment_stage()
 
 class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
-    _description = "Applicant Cases"
+    _description = "Applicant"
     _order = "id desc"
     _inherit ='mailgate.thread'
 
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index fc120aa2b4c..1530f18981c 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -39,7 +39,7 @@ hr_employee()
 class hr_analytic_timesheet(osv.osv):
     _name = "hr.analytic.timesheet"
     _table = 'hr_analytic_timesheet'
-    _description = "Timesheet line"
+    _description = "Timesheet Line"
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4b8fad8fab5..c20c7110b63 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -25,7 +25,7 @@ from tools.translate import _
 
 class hr_timesheet_invoice_factor(osv.osv):
     _name = "hr_timesheet_invoice.factor"
-    _description = "Invoice rate"
+    _description = "Invoice Rate"
     _columns = {
         'name': fields.char('Internal name', size=128, required=True),
         'customer_name': fields.char('Name', size=128),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b6078648147..d6d9e38247b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -581,7 +581,7 @@ hr_attendance()
 
 class hr_timesheet_sheet_sheet_day(osv.osv):
     _name = "hr_timesheet_sheet.sheet.day"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {
@@ -662,7 +662,7 @@ hr_timesheet_sheet_sheet_day()
 
 class hr_timesheet_sheet_sheet_account(osv.osv):
     _name = "hr_timesheet_sheet.sheet.account"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 2a6aafe2989..e46115c5639 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -31,7 +31,7 @@ class idea_category(osv.osv):
     """ Category of Idea """
 
     _name = "idea.category"
-    _description = "Category for an idea"
+    _description = "Idea Category"
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
@@ -251,7 +251,7 @@ class idea_comment(osv.osv):
     """ Apply Idea for Comment """
 
     _name = 'idea.comment'
-    _description = 'Comments'
+    _description = 'Comment'
     _rec_name = 'content'
 
     _columns = {
@@ -274,7 +274,7 @@ class idea_vote(osv.osv):
     """ Apply Idea for Vote """
 
     _name = 'idea.vote'
-    _description = 'Vote for Idea'
+    _description = 'Idea Vote'
     _rec_name = 'score'
 
     _columns = {
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 1a29940ada6..8a53b029fa7 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -22,7 +22,7 @@ from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
-    _description = 'res.company'
+    _description = 'Company'
 
     def _get_default_ad(self, addresses):
         city = post_code = address = country_code = ""
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index a986dc25953..88d080c11bd 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -91,7 +91,7 @@ class lunch_cashmove(osv.osv):
     """ Move cash """
 
     _name = 'lunch.cashmove'
-    _description = "Move cash"
+    _description = "Cash Move"
 
     _columns = {
         'name': fields.char('Name', size=128),
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 7bdf579157f..0beab1bf38d 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -33,7 +33,7 @@ _intervalTypes = {
 
 class marketing_campaign(osv.osv): #{{{
     _name = "marketing.campaign"
-    _description = "Marketing Campaigns"
+    _description = "Marketing Campaign"
     
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -58,7 +58,7 @@ marketing_campaign()#}}}
 
 class marketing_campaign_segment(osv.osv): #{{{
     _name = "marketing.campaign.segment"
-    _description = "Marketing Campaign Segments"
+    _description = "Campaign Segment"
 
     _columns = {
         'name': fields.char('Name', size=64,required=True),
@@ -85,7 +85,7 @@ marketing_campaign_segment()#}}}
 
 class marketing_campaign_activity(osv.osv): #{{{
     _name = "marketing.campaign.activity"
-    _description = "Marketing Campaign Activities"
+    _description = "Campaign Activity"
 
     _columns = {
         'name': fields.char('Name', size=64),
@@ -135,7 +135,7 @@ marketing_campaign_activity()#}}}
 
 class marketing_campaign_transition(osv.osv): #{{{
     _name = "marketing.campaign.transition"
-    _description = "Campaign Transitions"
+    _description = "Campaign Transition"
 
     _columns = {
         'activity_from_id': fields.many2one('marketing.campaign.activity',
@@ -159,7 +159,7 @@ marketing_campaign_transition() #}}}
 
 class marketing_campaign_workitem(osv.osv): #{{{
     _name = "marketing.campaign.workitem"
-    _description = "Campaign Workitems"
+    _description = "Campaign Workitem"
 
     _columns = {
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 96a575289da..23f9cd19275 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -458,8 +458,6 @@ class Product(osv.osv):
 
     '''Product'''
     _inherit = 'product.product'
-    _description = 'product.product'
-
     _columns = {
             'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
             'membership_date_from': fields.date('Date from'),
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d5cea81933b..d8900592fe2 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -94,7 +94,7 @@ class mrp_routing_workcenter(osv.osv):
     Defines working cycles and hours of a workcenter using routings.
     """
     _name = 'mrp.routing.workcenter'
-    _description = 'Routing workcenter usage'
+    _description = 'Workcenter Usage'
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
@@ -118,7 +118,7 @@ class mrp_bom(osv.osv):
     Defines bills of material for a product.
     """
     _name = 'mrp.bom'
-    _description = 'Bills of Material'
+    _description = 'Bill of Material'
     
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
         """ Gets child bom.
@@ -351,8 +351,7 @@ mrp_bom()
 
 class mrp_bom_revision(osv.osv):
     _name = 'mrp.bom.revision'
-    _description = 'Bill of material revisions'
-    
+    _description = 'Bill of Material Revision'
     _columns = {
         'name': fields.char('Modification name', size=64, required=True),
         'description': fields.text('Description'),
@@ -934,7 +933,7 @@ mrp_production()
 
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
-    _description = 'Work Orders'
+    _description = 'Work Order'
     _order = 'sequence'
     
     _columns = {
@@ -954,8 +953,7 @@ mrp_production_workcenter_line()
 
 class mrp_production_product_line(osv.osv):
     _name = 'mrp.production.product.line'
-    _description = 'Production scheduled products'
-    
+    _description = 'Production Scheduled Product'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 9ff3c038582..d5e00b9cbda 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -32,4 +32,3 @@
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_product_price","mrp.product_price","model_mrp_product_price","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_workcenter_load","mrp.workcenter.load","model_mrp_workcenter_load","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_procurement_compute","mrp.procurement.compute","model_mrp_procurement_compute","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 9b06391c749..9bcc92e5c81 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -33,7 +33,7 @@ class stock_warehouse_orderpoint(osv.osv):
     Defines Minimum stock rules.
     """
     _name = "stock.warehouse.orderpoint"
-    _description = "Orderpoint minimum rule"
+    _description = "Minimum Inventory Rule"
     
     _columns = {
         'name': fields.char('Name', size=32, required=True),
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 3cff3741c7d..e31b4e05594 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -30,7 +30,7 @@ import decimal_precision as dp
 
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
-    _description = 'Repairs Order'
+    _description = 'Repair Order'
 
     def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
         """ Calculates untaxed amount.
@@ -590,7 +590,7 @@ class ProductChangeMixin(object):
 
 class mrp_repair_line(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.line'
-    _description = 'Repair Operations Lines'
+    _description = 'Repair Line'
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
@@ -678,7 +678,7 @@ mrp_repair_line()
 
 class mrp_repair_fee(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.fee'
-    _description = 'Repair Fees line'
+    _description = 'Repair Fees Line'
     
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 3549398c4f3..e64e757868f 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -24,7 +24,7 @@ from osv import osv
 
 class mrp_subproduct(osv.osv):
     _name = 'mrp.subproduct'
-    _description = 'Mrp Sub Product'
+    _description = 'Sub Product'
     _columns={
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Product Qty', required=True),
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 57276219861..1f8ccc80162 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -49,7 +49,7 @@ class singer_statement(osv.osv):
     """ Singer Statements """
     
     _name = 'singer.statement'
-    _description = 'Statements'
+    _description = 'Statement'
 
     def _sub_total(self, cr, uid, ids, name, arg, context=None):
        
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index ede0f7bd15c..e2c41c118c0 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -31,11 +31,9 @@ import re
 import decimal_precision as dp
 
 class pos_config_journal(osv.osv):
-    
     """ Point of Sale journal configuration"""
-    
     _name = 'pos.config.journal'
-    _description = "Point of Sale journal configuration"
+    _description = "Journal Configuration"
     _columns = {
         'name': fields.char('Description', size=64),
         'code': fields.char('Code', size=64),
diff --git a/addons/process/process.py b/addons/process/process.py
index 94f3a46d779..0d68fb460be 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -296,7 +296,7 @@ process_process()
 
 class process_node(osv.osv):
     _name = 'process.node'
-    _description ='Process Nodes'
+    _description ='Process Node'
     _columns = {
         'name': fields.char('Name', size=30,required=True, translate=True),
         'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'),
@@ -342,7 +342,7 @@ process_node_condition()
 
 class process_transition(osv.osv):
     _name = 'process.transition'
-    _description ='Process Transitions'
+    _description ='Process Transition'
     _columns = {
         'name': fields.char('Name', size=32, required=True, translate=True),
         'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'),
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index d26a3cd2fb2..2c79d0e3a50 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -53,7 +53,7 @@ class price_type(osv.osv):
         return comp.currency_id.id
 
     _name = "product.price.type"
-    _description = "Price type"
+    _description = "Price Type"
     _columns = {
         "name" : fields.char("Price Name", size=32, required=True, translate=True, help="Name of this kind of price."),
         "active" : fields.boolean("Active"),
diff --git a/addons/project/project.py b/addons/project/project.py
index f96740219e5..cae9849b3f5 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -250,7 +250,7 @@ project()
 
 class task(osv.osv):
     _name = "project.task"
-    _description = "Tasks"
+    _description = "Task"
     _date_name = "date_start"
 
     def _str_get(self, task, level=0, border='***', context={}):
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index d45576cabb1..059c19e0f40 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -39,7 +39,7 @@ except ImportError:
 
 class project_gtd_context(osv.osv):
     _name = "project.gtd.context"
-    _description = "Contexts"
+    _description = "Context"
     _columns = {
         'name': fields.char('Context', size=64, required=True, select=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a925aeeb7aa..ebcc62b7bc3 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -244,7 +244,6 @@ project_resource_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
-    _description = "Project"
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
@@ -254,7 +253,6 @@ project()
 
 class task(osv.osv):
     _inherit = "project.task"
-    _description = "Task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
         'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'),
@@ -368,4 +366,4 @@ class task(osv.osv):
         return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index bfd2af5566c..09a105cfb53 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -184,7 +184,6 @@ report_account_analytic_planning_line()
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _inherit = 'account.analytic.account'
-    _description = 'Analytic Accounts'
     _columns = {
         'planning_ids': fields.one2many('report_account_analytic.planning.line', 'account_id', 'Plannings'),
     }
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index 60c8279f16f..3300ac0eebe 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -26,7 +26,6 @@ from datetime import datetime
 
 class project_project(osv.osv):
     _inherit = 'project.project'
-    _description = 'project.project'
 
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date' in vals and vals['date']:
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 3ab09a390cc..f332067b88f 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -28,7 +28,6 @@ from tools.translate import _
 
 class project_work(osv.osv):
     _inherit = "project.task.work"
-    _description = "Task Work"
 
     def get_user_related_details(self, cr, uid, user_id):
         res = {}
@@ -144,7 +143,6 @@ project_work()
 
 class task(osv.osv):
     _inherit = "project.task"
-    _description = "Tasks"
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for task_obj in self.browse(cr, uid, ids, *args, **kwargs):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 42658a0e25f..b9e439517bb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -210,7 +210,7 @@ class purchase_order(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
     _name = "purchase.order"
-    _description = "Purchase order"
+    _description = "Purchase Order"
     _order = "name desc"
 
     def unlink(self, cr, uid, ids, context=None):
@@ -611,7 +611,7 @@ class purchase_order_line(osv.osv):
     }
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
-    _description = 'Purchase Order lines'
+    _description = 'Purchase Order Line'
     def copy_data(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 14ff085a4c4..75bbb73a507 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -27,7 +27,7 @@ import time
 
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
-    _description="Purchase requisition"
+    _description="Purchase Requisition"
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Origin', size=32),
@@ -110,7 +110,6 @@ purchase_requisition_line()
 
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
-    _description = "purchase order"
     _columns = {
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
     }
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 890abe49bb1..4813062ca04 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -811,7 +811,7 @@ class sale_order_line(osv.osv):
         return res
 
     _name = 'sale.order.line'
-    _description = 'Sale Order line'
+    _description = 'Sale Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 613d8af7b7a..14c1a07e336 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,7 +23,6 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-    _description = 'Sale orders'
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index c041a934274..8b636241285 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -25,7 +25,7 @@ import time
 
 class sale_journal_invoice_type(osv.osv):
     _name = 'sale_journal.invoice.type'
-    _description = 'Invoice Types'
+    _description = 'Invoice Type'
     _columns = {
         'name': fields.char('Invoice Type', size=64, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."),
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index ace86d4a1db..ca36c8460a7 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -43,8 +43,6 @@
 "access_stock_traceability_lot_downstream","stock.traceability.lot.downstream","model_stock_traceability_lot_downstream","stock.group_stock_user",1,0,0,0
 "access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking","stock.group_stock_user",1,0,0,0
 "access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
-"access_stock_return_picking","stock.return.picking","model_stock_return_picking","stock.group_stock_user",1,0,0,0
 "access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
 "access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
 "access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
-"access_stock_picking_make","stock.picking.make","model_stock_picking_make","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 04326f0a9a5..6470ac9cedd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2027,7 +2027,7 @@ stock_inventory()
 
 class stock_inventory_line(osv.osv):
     _name = "stock.inventory.line"
-    _description = "Inventory line"
+    _description = "Inventory Line"
     _columns = {
         'inventory_id': fields.many2one('stock.inventory', 'Inventory', ondelete='cascade', select=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index e9899156326..b05bf099d09 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -29,7 +29,7 @@ from tools.translate import _
 
 class subscription_document(osv.osv):
     _name = "subscription.document"
-    _description = "Subscription document"
+    _description = "Subscription Document"
     _columns = {
         'name': fields.char('Name', size=60, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the subscription document without removing it."),
@@ -49,7 +49,7 @@ subscription_document()
 
 class subscription_document_fields(osv.osv):
     _name = "subscription.document.fields"
-    _description = "Subscription document fields"
+    _description = "Subscription Document Fields"
     _rec_name = 'field'
     _columns = {
         'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),