diff --git a/addons/account/account.py b/addons/account/account.py
index fe52decd9f3..469c5b1d838 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -56,7 +56,7 @@ def check_cycle(self, cr, uid, ids, context=None):
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
-    _description = "Payment Terms"
+    _description = "Payment Term"
     _columns = {
         'name': fields.char('Payment Terms', size=64, translate=True, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
@@ -101,7 +101,7 @@ class account_payment_term(osv.osv):
 
 class account_payment_term_line(osv.osv):
     _name = "account.payment.term.line"
-    _description = "Payment Terms Line"
+    _description = "Payment Term Line"
     _columns = {
         'value': fields.selection([('procent', 'Percent'),
                                    ('balance', 'Balance'),
@@ -128,7 +128,7 @@ class account_payment_term_line(osv.osv):
         return True
 
     _constraints = [
-        (_check_percent, 'Percentages for Payment Terms Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
+        (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
     ]
 
 account_payment_term_line()
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a50b1d4e432..dd58ce4aa69 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1548,7 +1548,7 @@
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <tree string="Payment Terms">
+                <tree string="Payment Term">
                     <field name="value"/>
                     <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
                     <field name="days"/>
@@ -1560,7 +1560,7 @@
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <form string="Payment Terms" version="7.0">
+                <form string="Payment Term" version="7.0">
                     <group>
                         <group string="Amount Computation">
 	                        <field name="value"/>
@@ -1582,7 +1582,7 @@
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <search string="Payment Terms">
+                <search string="Payment Term">
                     <field name="name" string="Payment Terms"/>
                     <field name="active"/>
                 </search>
@@ -1592,7 +1592,7 @@
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <form string="Payment Terms" version="7.0">
+                <form string="Payment Term" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -2296,17 +2296,17 @@
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                        <field name="subtotal_opening" string="Opening Amount"/>
+                                        <field name="subtotal_opening" string="Opening Subtotal"/>
                                     </tree>
                                 </field>
                                 <field name="closing_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                     <tree string="Closing Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_opening" string="Opening Unit Numbers" readonly="1" />
-                                        <field name="subtotal_opening" string="Opening Amount" readonly="1" />
+                                        <field name="subtotal_opening" string="Opening Subtotal" readonly="1" />
 
                                         <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                        <field name="subtotal_closing" string="Closing Amount"/>
+                                        <field name="subtotal_closing" string="Closing Subtotal"/>
                                     </tree>
                                 </field>
                             </group>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 24b4325020e..f8a0fcdfcaa 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -38,7 +38,7 @@
         </record>
 
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
-            <field name="name">Payment Terms</field>
+            <field name="name">Payment Term</field>
             <field name="digits">6</field>
         </record>
 
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 9ee821aab0f..6918ad44702 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -128,7 +128,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <!-- Payment Terms -->
+        <!-- Payment Term -->
         
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days End of Month</field>
diff --git a/addons/account/partner.py b/addons/account/partner.py
index c2a8bcfc241..346cc38f5df 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -221,14 +221,14 @@ class res_partner(osv.osv):
             'account.payment.term',
             type='many2one',
             relation='account.payment.term',
-            string ='Customer Payment Terms',
+            string ='Customer Payment Term',
             view_load=True,
             help="This payment term will be used instead of the default one for sale orders and customer invoices"),
         'property_supplier_payment_term': fields.property(
             'account.payment.term',
              type='many2one',
              relation='account.payment.term',
-             string ='Supplier Payment Terms',
+             string ='Supplier Payment Term',
              view_load=True,
              help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',