diff --git a/addons/mrp_subproduct/__init__.py b/addons/mrp_byproduct/__init__.py
similarity index 97%
rename from addons/mrp_subproduct/__init__.py
rename to addons/mrp_byproduct/__init__.py
index 5b48431ef16..7e507e0fe0a 100644
--- a/addons/mrp_subproduct/__init__.py
+++ b/addons/mrp_byproduct/__init__.py
@@ -18,5 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import mrp_subproduct
+import mrp_byproduct
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_byproduct/__openerp__.py
similarity index 88%
rename from addons/mrp_subproduct/__openerp__.py
rename to addons/mrp_byproduct/__openerp__.py
index 6475cbe4a91..58e7a194771 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_byproduct/__openerp__.py
@@ -21,14 +21,14 @@
 
 
 {
-    'name': 'MRP Subproducts',
+    'name': 'MRP Byproducts',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
 This module allows you to produce several products from one production order.
 =============================================================================
 
-You can configure sub-products in the bill of material.
+You can configure by-products in the bill of material.
 
 Without this module:
 --------------------
@@ -40,14 +40,14 @@ With this module:
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/bom_subproduct.jpeg'],
+    'images': ['images/bom_byproduct.jpeg'],
     'depends': ['base', 'mrp'],
     'data': [
        'security/ir.model.access.csv',
-       'mrp_subproduct_view.xml'
+       'mrp_byproduct_view.xml'
     ],
     'demo': [],
-    'test': ['test/mrp_subproduct.yml'],
+    'test': ['test/mrp_byproduct.yml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_byproduct/i18n/ab.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ab.po
rename to addons/mrp_byproduct/i18n/ab.po
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_byproduct/i18n/ar.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ar.po
rename to addons/mrp_byproduct/i18n/ar.po
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_byproduct/i18n/bg.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/bg.po
rename to addons/mrp_byproduct/i18n/bg.po
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_byproduct/i18n/bs.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/bs.po
rename to addons/mrp_byproduct/i18n/bs.po
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_byproduct/i18n/ca.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ca.po
rename to addons/mrp_byproduct/i18n/ca.po
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_byproduct/i18n/cs.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/cs.po
rename to addons/mrp_byproduct/i18n/cs.po
diff --git a/addons/mrp_subproduct/i18n/da.po b/addons/mrp_byproduct/i18n/da.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/da.po
rename to addons/mrp_byproduct/i18n/da.po
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/de.po
rename to addons/mrp_byproduct/i18n/de.po
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_byproduct/i18n/es.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es.po
rename to addons/mrp_byproduct/i18n/es.po
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_byproduct/i18n/es_AR.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_AR.po
rename to addons/mrp_byproduct/i18n/es_AR.po
diff --git a/addons/mrp_subproduct/i18n/es_CR.po b/addons/mrp_byproduct/i18n/es_CR.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_CR.po
rename to addons/mrp_byproduct/i18n/es_CR.po
diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_byproduct/i18n/es_EC.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_EC.po
rename to addons/mrp_byproduct/i18n/es_EC.po
diff --git a/addons/mrp_subproduct/i18n/es_MX.po b/addons/mrp_byproduct/i18n/es_MX.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_MX.po
rename to addons/mrp_byproduct/i18n/es_MX.po
diff --git a/addons/mrp_subproduct/i18n/es_VE.po b/addons/mrp_byproduct/i18n/es_VE.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_VE.po
rename to addons/mrp_byproduct/i18n/es_VE.po
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_byproduct/i18n/et.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/et.po
rename to addons/mrp_byproduct/i18n/et.po
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_byproduct/i18n/fi.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/fi.po
rename to addons/mrp_byproduct/i18n/fi.po
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/fr.po
rename to addons/mrp_byproduct/i18n/fr.po
diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_byproduct/i18n/gl.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/gl.po
rename to addons/mrp_byproduct/i18n/gl.po
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_byproduct/i18n/hr.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/hr.po
rename to addons/mrp_byproduct/i18n/hr.po
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_byproduct/i18n/hu.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/hu.po
rename to addons/mrp_byproduct/i18n/hu.po
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_byproduct/i18n/id.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/id.po
rename to addons/mrp_byproduct/i18n/id.po
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_byproduct/i18n/it.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/it.po
rename to addons/mrp_byproduct/i18n/it.po
diff --git a/addons/mrp_subproduct/i18n/ja.po b/addons/mrp_byproduct/i18n/ja.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ja.po
rename to addons/mrp_byproduct/i18n/ja.po
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ko.po
rename to addons/mrp_byproduct/i18n/ko.po
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/lt.po
rename to addons/mrp_byproduct/i18n/lt.po
diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_byproduct/i18n/mn.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/mn.po
rename to addons/mrp_byproduct/i18n/mn.po
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_byproduct/i18n/mrp_subproduct.pot
similarity index 100%
rename from addons/mrp_subproduct/i18n/mrp_subproduct.pot
rename to addons/mrp_byproduct/i18n/mrp_subproduct.pot
diff --git a/addons/mrp_subproduct/i18n/nb.po b/addons/mrp_byproduct/i18n/nb.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/nb.po
rename to addons/mrp_byproduct/i18n/nb.po
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/nl.po
rename to addons/mrp_byproduct/i18n/nl.po
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_byproduct/i18n/nl_BE.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/nl_BE.po
rename to addons/mrp_byproduct/i18n/nl_BE.po
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_byproduct/i18n/oc.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/oc.po
rename to addons/mrp_byproduct/i18n/oc.po
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_byproduct/i18n/pl.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/pl.po
rename to addons/mrp_byproduct/i18n/pl.po
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/pt.po
rename to addons/mrp_byproduct/i18n/pt.po
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_byproduct/i18n/pt_BR.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/pt_BR.po
rename to addons/mrp_byproduct/i18n/pt_BR.po
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_byproduct/i18n/ro.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ro.po
rename to addons/mrp_byproduct/i18n/ro.po
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_byproduct/i18n/ru.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/ru.po
rename to addons/mrp_byproduct/i18n/ru.po
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_byproduct/i18n/sk.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sk.po
rename to addons/mrp_byproduct/i18n/sk.po
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_byproduct/i18n/sl.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sl.po
rename to addons/mrp_byproduct/i18n/sl.po
diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_byproduct/i18n/sq.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sq.po
rename to addons/mrp_byproduct/i18n/sq.po
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_byproduct/i18n/sr.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sr.po
rename to addons/mrp_byproduct/i18n/sr.po
diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_byproduct/i18n/sr@latin.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sr@latin.po
rename to addons/mrp_byproduct/i18n/sr@latin.po
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/sv.po
rename to addons/mrp_byproduct/i18n/sv.po
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_byproduct/i18n/tlh.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/tlh.po
rename to addons/mrp_byproduct/i18n/tlh.po
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/tr.po
rename to addons/mrp_byproduct/i18n/tr.po
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/uk.po
rename to addons/mrp_byproduct/i18n/uk.po
diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_byproduct/i18n/vi.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/vi.po
rename to addons/mrp_byproduct/i18n/vi.po
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/zh_CN.po
rename to addons/mrp_byproduct/i18n/zh_CN.po
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_byproduct/i18n/zh_TW.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/zh_TW.po
rename to addons/mrp_byproduct/i18n/zh_TW.po
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
similarity index 92%
rename from addons/mrp_subproduct/mrp_subproduct.py
rename to addons/mrp_byproduct/mrp_byproduct.py
index bacdeb2c675..bf2a798aeff 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -30,10 +30,10 @@ class mrp_subproduct(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\
-  'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\
+        'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of byproducts will be set on the production orders using this BoM.\
+  'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\
   By opposition, 'Variable' means that the quantity will be computed as\
-    '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
+    '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
         'bom_id': fields.many2one('mrp.bom', 'BoM'),
     }
     _defaults={
@@ -59,7 +59,7 @@ class mrp_bom(osv.osv):
     _inherit='mrp.bom'
 
     _columns={
-        'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'),
+        'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'Byproducts'),
     }
 
 mrp_bom()
@@ -106,7 +106,7 @@ class mrp_production(osv.osv):
     def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None):
         """Compute the factor to compute the qty of procucts to produce for the given production_id. By default, 
             it's always equal to the quantity encoded in the production order or the production wizard, but with 
-            the module mrp_subproduct installed it can differ for subproducts having type 'variable'.
+            the module mrp_byproduct installed it can differ for byproducts having type 'variable'.
         :param production_id: ID of the mrp.order
         :param move_id: ID of the stock move that needs to be produced. Identify the product to produce.
         :return: The factor to apply to the quantity that we should produce for the given production order and stock move.
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_byproduct/mrp_byproduct_view.xml
similarity index 86%
rename from addons/mrp_subproduct/mrp_subproduct_view.xml
rename to addons/mrp_byproduct/mrp_byproduct_view.xml
index 94da87ef0de..754d7ef1b34 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_byproduct/mrp_byproduct_view.xml
@@ -7,15 +7,15 @@
             <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
             <field name="arch" type="xml">
              <notebook position="inside">
-                 <page string="Sub Products" position="inside">
+                 <page string="Byproducts" position="inside">
                      <field name="sub_products">
-                         <tree string="sub products"  editable="top">
+                         <tree string="Byproducts"  editable="top">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
                              <field name="product_uom" groups="product.group_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
-                         <form string="Sub Products">
+                         <form string="Byproducts">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
                              <field name="product_uom" groups="product.group_uom"/>
                              <field name="product_qty"/>
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_byproduct/security/ir.model.access.csv
similarity index 100%
rename from addons/mrp_subproduct/security/ir.model.access.csv
rename to addons/mrp_byproduct/security/ir.model.access.csv
diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml
similarity index 100%
rename from addons/mrp_subproduct/test/mrp_subproduct.yml
rename to addons/mrp_byproduct/test/mrp_byproduct.yml