diff --git a/addons/account/account.py b/addons/account/account.py
index 51599b37b1d..f79e36c7681 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -204,7 +204,7 @@ class account_account(osv.osv):
                 args[pos] = ('id', 'in', ids1)
             pos += 1
 
-        if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
+        if context and context.has_key('consolidate_children'): #add consolidated children of accounts
             ids = super(account_account, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
             for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
@@ -1921,7 +1921,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
         total = 0.0
@@ -2016,7 +2016,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
         total = 0.0
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 12ab0236759..4a2f40ec708 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -63,7 +63,7 @@ class account_move_line_select(osv.osv_memory):
         if context['active_id']:
             acc_data = account_obj.browse(cr, uid, context['active_id']).child_consol_ids
             if acc_data:
-                result['context'].update({'consolidate_childs': True})
+                result['context'].update({'consolidate_children': True})
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 983bdeb0144..20442f16250 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -186,7 +186,7 @@ class aie_category(osv.osv):
        'name': fields.char('Name', size=64, required=True),
        'code':fields.char('Code', size=64),
        'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
-       'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+       'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category")
     }
 
     def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 2366d44d9d5..66c5eb6c020 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -1441,7 +1441,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index c51602cd82d..831fe2c7421 100644
--- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -251,8 +251,8 @@ class DomApi(DomApiGeneral):
             parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("utf-8")
             res = self.getStylePropertiesDict(parent)
 
-        childs = self.style_dict[style_name].childNodes
-        for c in childs:
+        children = self.style_dict[style_name].childNodes
+        for c in children:
             if c.nodeType == c.ELEMENT_NODE and c.nodeName.find("properties")>0 :
                 for attr in c._attrs.keys():
                     res[attr] = c.getAttribute(attr).encode("utf-8")
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 65b17a52c51..7580a8831cf 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -386,7 +386,7 @@ class abstracted_fs(object):
     def rename(self, src, datacr):
         """ Renaming operation, the effect depends on the src:
             * A file: read, create and remove
-            * A directory: change the parent and reassign childs to ressource
+            * A directory: change the parent and reassign children to ressource
         """
         cr = datacr[0]
         try:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index dd46d8959ae..7db6ce49d98 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -376,9 +376,9 @@ class openerp_dav_handler(dav_interface):
                     cr.close()
         return self.db_name_list
 
-    def get_childs(self, uri, filters=None):
+    def get_children(self,uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """
-        self.parent.log_message('get childs: %s' % uri)
+        self.parent.log_message('get children: %s' % uri)
         cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
 
         if not dbname:
@@ -395,7 +395,7 @@ class openerp_dav_handler(dav_interface):
                 fp = node.full_path()
                 if fp and len(fp):
                     fp = '/'.join(fp)
-                    self.parent.log_message('childs for: %s' % fp)
+                    self.parent.log_message('children for: %s' % fp)
                 else:
                     fp = None
                 domain = None
@@ -433,7 +433,7 @@ class openerp_dav_handler(dav_interface):
         except DAV_Error:
             raise
         except Exception, e:
-            self.parent.log_error("cannot get_childs: "+ str(e))
+            self.parent.log_error("cannot get_children: "+ str(e))
             raise
         finally:
             if cr: cr.close()
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d00f69bc0de..160105a69ad 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -199,15 +199,15 @@ class hr_evaluation(osv.osv):
         for evaluation in self.browse(cr, uid, ids, context=context):
             wait = False
             for phase in evaluation.plan_id.phase_ids:
-                childs = []
+                children = []
                 if phase.action == "bottom-up":
-                    childs = evaluation.employee_id.child_ids
+                    children = evaluation.employee_id.child_ids
                 elif phase.action in ("top-down", "final"):
                     if evaluation.employee_id.parent_id:
-                        childs = [evaluation.employee_id.parent_id]
+                        children = [evaluation.employee_id.parent_id]
                 elif phase.action == "self":
-                    childs = [evaluation.employee_id]
-                for child in childs:
+                    children = [evaluation.employee_id]
+                for child in children:
 #                    if not child.user_id:
 #                        continue
 
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 36644321589..4d36296ab2c 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -2116,6 +2116,6 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 1468cd45200..ad11edff47c 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -541,7 +541,7 @@ class product_pricelist_item(osv.osv):
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Set a template if this rule only apply to a template of product. Keep empty for all products"),
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
-        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
+        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
         'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index dc89bcd4d31..46cc225153e 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -64,12 +64,12 @@ class report_account_analytic_planning(osv.osv):
             ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
             if ids_dept:
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
-                childs = map(lambda x: x['member_ids'], data_dept)
-                childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
-                if user_id in childs:
-                    childs.remove(user_id)
-                child_ids.extend(tools.flatten(childs))
+                children = map(lambda x: x['member_ids'], data_dept)
+                children = tools.flatten(children)
+                children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
+                if user_id in children:
+                    children.remove(user_id)
+                child_ids.extend(tools.flatten(children))
                 set = {}
                 map(set.__setitem__, child_ids, [])
                 child_ids = set.keys()
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index f6bcd60ad5e..41acade696a 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report
 -
   !python {model: stock.location}: |
     import netsvc, tools, os
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index f3503936c78..2236f1f69ce 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -86,7 +86,7 @@ class wiki_group(osv.osv):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a8b56db8534..a8f53a5c3a5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -85,8 +85,8 @@
         </record>
 
         <!-- wiki Tree view For child -->
-        <record id="view_wiki_tree_childs" model="ir.ui.view">
-            <field name="name">wiki.wiki.tree.childs</field>
+        <record id="view_wiki_tree_children" model="ir.ui.view">
+            <field name="name">wiki.wiki.tree.children</field>
             <field name="model">wiki.wiki</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index f95c1e2dffd..e337fc9fdff 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -72,7 +72,7 @@ class wiki_create_menu(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 1fe4f8acc49..d2458c796ff 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -54,7 +54,7 @@ class wiki_wiki_page_open(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'