diff --git a/mrp_production_putaway_strategy/README.rst b/mrp_production_putaway_strategy/README.rst
index 754f59699..0f31ff54a 100644
--- a/mrp_production_putaway_strategy/README.rst
+++ b/mrp_production_putaway_strategy/README.rst
@@ -23,7 +23,7 @@ MRP Production Putaway Strategy
     :target: https://runbot.odoo-community.org/runbot/129/13.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module allows to apply putaway strategies to the products resulting from
 the manufacturing orders.
@@ -78,13 +78,13 @@ Credits
 Authors
 ~~~~~~~
 
-* Eficent
+* ForgeFlow
 
 Contributors
 ~~~~~~~~~~~~
 
-* Jordi Ballester <jordi.ballester@eficent.com>
-* Lois Rilo <lois.rilo@eficent.com>
+* Jordi Ballester <jordi.ballester@forgeflow.com>
+* Lois Rilo <lois.rilo@forgeflow.com>
 * Sudhir Arya <sudhir@erpharbor.com>
 
 Maintainers
diff --git a/mrp_production_putaway_strategy/__manifest__.py b/mrp_production_putaway_strategy/__manifest__.py
index ca8055628..667bc9d66 100644
--- a/mrp_production_putaway_strategy/__manifest__.py
+++ b/mrp_production_putaway_strategy/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
@@ -6,7 +6,7 @@
     "summary": "Applies putaway strategies to manufacturing orders for "
     "finished products.",
     "version": "13.0.1.0.0",
-    "author": "Eficent, " "Odoo Community Association (OCA)",
+    "author": "ForgeFlow, " "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/manufacture",
     "category": "Manufacture",
     "depends": ["mrp"],
diff --git a/mrp_production_putaway_strategy/models/mrp_production.py b/mrp_production_putaway_strategy/models/mrp_production.py
index 9ac47f417..c0103b181 100644
--- a/mrp_production_putaway_strategy/models/mrp_production.py
+++ b/mrp_production_putaway_strategy/models/mrp_production.py
@@ -1,4 +1,4 @@
-# Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017-18 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, models
diff --git a/mrp_production_putaway_strategy/readme/CONTRIBUTORS.rst b/mrp_production_putaway_strategy/readme/CONTRIBUTORS.rst
index 8bfbff100..3899fc188 100644
--- a/mrp_production_putaway_strategy/readme/CONTRIBUTORS.rst
+++ b/mrp_production_putaway_strategy/readme/CONTRIBUTORS.rst
@@ -1,3 +1,3 @@
-* Jordi Ballester <jordi.ballester@eficent.com>
-* Lois Rilo <lois.rilo@eficent.com>
+* Jordi Ballester <jordi.ballester@forgeflow.com>
+* Lois Rilo <lois.rilo@forgeflow.com>
 * Sudhir Arya <sudhir@erpharbor.com>
diff --git a/mrp_production_putaway_strategy/static/description/index.html b/mrp_production_putaway_strategy/static/description/index.html
index 0ee700bc4..82c7bd74f 100644
--- a/mrp_production_putaway_strategy/static/description/index.html
+++ b/mrp_production_putaway_strategy/static/description/index.html
@@ -425,14 +425,14 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <div class="section" id="authors">
 <h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <ul class="simple">
-<li>Eficent</li>
+<li>ForgeFlow</li>
 </ul>
 </div>
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
-<li>Jordi Ballester &lt;<a class="reference external" href="mailto:jordi.ballester&#64;eficent.com">jordi.ballester&#64;eficent.com</a>&gt;</li>
-<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
+<li>Jordi Ballester &lt;<a class="reference external" href="mailto:jordi.ballester&#64;forgeflow.com">jordi.ballester&#64;forgeflow.com</a>&gt;</li>
+<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
 <li>Sudhir Arya &lt;<a class="reference external" href="mailto:sudhir&#64;erpharbor.com">sudhir&#64;erpharbor.com</a>&gt;</li>
 </ul>
 </div>
diff --git a/mrp_production_putaway_strategy/tests/test_mrp_production.py b/mrp_production_putaway_strategy/tests/test_mrp_production.py
index 4dcb9f1ff..8b9ebb8a3 100644
--- a/mrp_production_putaway_strategy/tests/test_mrp_production.py
+++ b/mrp_production_putaway_strategy/tests/test_mrp_production.py
@@ -1,4 +1,4 @@
-# Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
+# Copyright 2017-18 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo.tests.common import TransactionCase