diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 39ce8cbdc55..cd7e7783f7e 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -93,7 +93,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month"
                             domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month"
+                        <filter string="Scheduled Date" icon="terp-go-month"
                             domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange"
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c2436d651b9..59d84dfe6a7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -634,10 +634,10 @@ class stock_picking(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Location where the system will stock the finished products.", select=True),
         'move_type': fields.selection([('direct', 'Partial'), ('one', 'All at once')], 'Delivery Method', required=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="It specifies goods to be deliver partially or all at once"),
         'state': fields.selection(PICK_STATE, 'State', readonly=True, select=True,
-            help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
-                 "* Confirmed: still waiting for the availability of products\n"\
-                 "* Available: products reserved, simply waiting for confirmation.\n"\
-                 "* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"\
+             help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
+                 "* Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"\
+                 "* Waiting Availability: still waiting for the availability of products\n"\
+                 "* Ready to Process: products reserved, simply waiting for confirmation.\n"\
                  "* Done: has been processed, can't be modified or cancelled anymore\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
@@ -705,24 +705,38 @@ class stock_picking(osv.osv):
                 # To update the states label according to shipping type
                 if field == 'state':
                     _state = []
+                    _tooltip_state_assigned = ''
+                    _tooltip_state_done = ''
                     for key, value in PICK_STATE:
                         if type == 'in':
                             if key == 'assigned':
                                 value = _('Ready to Receive')
+                                _tooltip_state_assigned = _('Ready to Receive')
                             elif key == 'done':
                                 value = _('Received')
+                                _tooltip_state_done = _('Received')
                         elif type == 'internal':
                             if key == 'assigned':
                                 value = _('Ready to Transfer')
+                                _tooltip_state_assigned = _('Ready to Transfer')
                             elif key == 'done':
                                 value = _('Transferred')
+                                _tooltip_state_done = _('Transferred')
                         elif type == 'out':
                             if key == 'assigned':
                                 value = _('Ready to Deliver')
+                                _tooltip_state_assigned = _('Ready to Deliver')
                             elif key == 'done':
                                 value = _('Delivered')
+                                _tooltip_state_done = _('Delivered')
                         _state.append((key,value))
                     res['fields']['state']['selection'] = _state
+                    res['fields']['state']['help'] = _("* Draft: not confirmed yet and will not be scheduled until confirmed\n"\
+                                                       "* Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"\
+                                                       "* Waiting Availability: still waiting for the availability of products\n"\
+                                                       "* %s: products reserved, simply waiting for confirmation.\n"\
+                                                       "* %s: has been processed, can't be modified or cancelled anymore\n"\
+                                                       "* Cancelled: has been cancelled, can't be confirmed anymore") %(_tooltip_state_assigned, _tooltip_state_done)
                 # To update the fields tooltips according to shipping type
                 if field == 'address_id':
                     _tooltip = ''
@@ -1672,8 +1686,11 @@ class stock_move(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
         'state': fields.selection(MOVE_STATE, 'State', readonly=True, select=True,
-              help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
-              \nThe state is \'Waiting\' if the move is waiting for another one.'),
+             help="* Draft: When the stock move is created it is in the \'Draft\' state.\n"\
+            "* Waiting Another Move: it is set to \'Waiting Another Move\' state if the scheduler did not find the products.\n"\
+             "* Waiting Availability: The state is \'Waiting Availability\' if the move is waiting for another one.\n"\
+            "* Available: When products are reserved it is set to \'Available\'.\n"\
+            "* Done: When the shipment is done the state is \'Done\'."),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
@@ -1718,24 +1735,37 @@ class stock_move(osv.osv):
                 # To update the states label according to the containing shipping type
                 if field == 'state':
                     _state = []
+                    _tooltip_state_assigned = ''
+                    _tooltip_state_done = ''
                     for key, value in MOVE_STATE:
                         if type == 'in':
                             if key == 'assigned':
                                 value = _('Ready to Receive')
+                                _tooltip_state_assigned = _('Ready to Receive')
                             elif key == 'done':
                                 value = _('Received')
+                                _tooltip_state_done = _('Received')
                         elif type == 'internal':
                             if key == 'assigned':
                                 value = _('Ready to Transfer')
+                                _tooltip_state_assigned = _('Ready to Transfer')
                             elif key == 'done':
                                 value = _('Transferred')
+                                _tooltip_state_done = _('Transferred')
                         elif type == 'out':
                             if key == 'assigned':
                                 value = _('Ready to Deliver')
+                                _tooltip_state_assigned = _('Ready to Deliver')
                             elif key == 'done':
                                 value = _('Delivered')
+                                _tooltip_state_done = _('Delivered')
                         _state.append((key,value))
                     res['fields']['state']['selection'] = _state
+                    res['fields']['state']['help'] = _("* Draft: When the stock move is created it is in the \'Draft\' state.\n"\
+                                                       "* Waiting Another Move: it is set to \'Waiting Another Move\' state if the scheduler did not find the products.\n"\
+                                                       "* Waiting Availability: The state is \'Waiting Availability\' if the move is waiting for another one.\n"\
+                                                       "* %s: When products are reserved it is set to %s.\n"\
+                                                       "* %s: When the shipment is done the state is %s.") % (_tooltip_state_assigned, _tooltip_state_assigned, _tooltip_state_done, _tooltip_state_done)
                     res['arch'] = etree.tostring(doc)
         return res
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 353f79f59f1..0a789ae84ac 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -750,7 +750,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
+                                        <field name="product_uom" string="Unit of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -943,7 +943,7 @@
                                                 string="Scrap" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4" />
+                                        <field name="product_uom" string="Unit of Measure" colspan="4" />
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" />
@@ -1045,7 +1045,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
@@ -1165,7 +1165,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
+                                        <field name="product_uom" string="Unit of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -1262,7 +1262,7 @@
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
@@ -1321,7 +1321,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <separator orientation="vertical" />
@@ -1417,7 +1417,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure"/>
+                        <field name="product_uom" string="Unit of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1436,7 +1436,7 @@
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
+                        <separator string="Shipment" colspan="2" />
                         <field name="picking_id" context="{'default_picking_id':picking_id}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -1501,7 +1501,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
+                        <filter string="Shipment" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
                         <filter string="Pack" name="groupby_tracking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'tracking_id'}"/>
                         <separator orientation="vertical"/>
@@ -1605,7 +1605,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure"/>
+                        <field name="product_uom" string="Unit of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1624,7 +1624,7 @@
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
+                        <separator string="Shipment" colspan="2" />
                         <field name="picking_id" context="{'default_picking_id':picking_id}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -1812,7 +1812,7 @@
             context="{'default_type': 'internal'}"
             domain="[('move_lines','=',active_id)]"
             id="act_relate_picking"
-            name="Related Picking"
+            name="Related Shipment"
             res_model="stock.picking"
             src_model="stock.move"/>