diff --git a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
index 0db16a6675b7671c06903351b160229e47566b3b..e1bfabe71e6622f289e0ae4c30cb9ec3908f06e2 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle module
------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
+----------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
-----------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_factory module
+------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst
index a93a5fc4096ee9a1fedeb5c2141b40e22456bcd3..bc15d4ccf54e88665df9360316efeaf233202dff 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst
@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.csv_extractor.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_bundle module
-----------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source module
+---------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_bundle
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source module
----------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_factory module
+-----------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
index 0d90d4a58cfd87477922ea9af947b4c9fca5c450..da727e9a6af5b41d38fcdf6d526171b182d4c1f2 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle module
----------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
+---------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
----------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_factory module
+----------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst
index febc1cb487e5b89984ef0c82d5aadd2e7cd5058b..f16cfb6acd559c4adbe26caf68d77a9f0b0a8a8a 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst
@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.dummy_dakota.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_bundle module
---------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator module
+--------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator module
---------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_factory module
+---------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
index f6b31d3bbaf5a90a1f95755423a1d36931a5d168..d0d5addb2c0a48e5275c71354717efcb9ec278aa 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
@@ -19,10 +19,10 @@ force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle module
--------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_factory module
+--------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst
index 84c724a0bce909180744f3812a3617e28a318f56..ba04010fb22db50b2deaa4600a371471331f3ffd 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst
@@ -12,10 +12,10 @@ force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source mod
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_bundle module
-------------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_factory module
+-------------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
index c02d6eeef6e62d171fcccee196f8d65bc9dfc1a3..c4b53e3047db8eb77157baf3a2ef0a6a36d01dd3 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
@@ -19,10 +19,10 @@ force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle module
--------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_factory module
+--------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst
index db2590a127da10f57b08460b12d490a0c80acda9..99dbeff87ae0a0c817f993ad482d41fbe10ddc5e 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst
@@ -12,10 +12,10 @@ force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculat
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle module
-------------------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_factory module
+-------------------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
index e50d5f5412539c27e21d7a476823ff9408d26987..67bf40270dfca751a9ca1209b0d2c2f0221a9287 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle module
----------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
+-------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
--------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_factory module
+----------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst
index 1f08d8f05b81fa6c261c8425825427ff1fcb3fe8..bde777c1c1b0c216340ec0449c5c30fbe1bd2efa 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst
@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.kpi_adder.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle module
---------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator module
+------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator module
-------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_factory module
+---------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
index 62d415bda34bce5ccd29614de5ba6673580cda08..5796f32993d0a6c988b4f6cd0035958ae8c553be 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.tests.data_source_bundle_test_mixin module
-------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.tests.data_source_factory_test_mixin module
+-------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.tests.data_source_bundle_test_mixin
+.. automodule:: force_bdss.core_plugins.dummy.tests.data_source_factory_test_mixin
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin module
----------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.tests.kpi_calculator_factory_test_mixin module
+----------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin
+.. automodule:: force_bdss.core_plugins.dummy.tests.kpi_calculator_factory_test_mixin
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.data_sources.rst b/doc/source/api/force_bdss.data_sources.rst
index 0d7330fb60412b83b9723f41098044db8536f0d3..f984d6d4fb4bb990dd81d2abdb4a9a92dac2390d 100644
--- a/doc/source/api/force_bdss.data_sources.rst
+++ b/doc/source/api/force_bdss.data_sources.rst
@@ -19,10 +19,10 @@ force_bdss.data_sources.base_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.base_data_source_bundle module
-------------------------------------------------------
+force_bdss.data_sources.base_data_source_factory module
+-------------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.base_data_source_bundle
+.. automodule:: force_bdss.data_sources.base_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -35,10 +35,10 @@ force_bdss.data_sources.base_data_source_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.i_data_source_bundle module
----------------------------------------------------
+force_bdss.data_sources.i_data_source_factory module
+----------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.i_data_source_bundle
+.. automodule:: force_bdss.data_sources.i_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.data_sources.tests.rst b/doc/source/api/force_bdss.data_sources.tests.rst
index 7e3cc42616275ffc306d47b5deccba358e3ddfae..16d8fcd8f8effc282886f912b4bb638ca1f62118 100644
--- a/doc/source/api/force_bdss.data_sources.tests.rst
+++ b/doc/source/api/force_bdss.data_sources.tests.rst
@@ -12,10 +12,10 @@ force_bdss.data_sources.tests.test_base_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.tests.test_base_data_source_bundle module
------------------------------------------------------------------
+force_bdss.data_sources.tests.test_base_data_source_factory module
+------------------------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.tests.test_base_data_source_bundle
+.. automodule:: force_bdss.data_sources.tests.test_base_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.kpi.rst b/doc/source/api/force_bdss.kpi.rst
index 55b751599bfeada834e14115e197c0aef1f07799..2215a99b3293d2d4d969d19dbb3dafb47371613c 100644
--- a/doc/source/api/force_bdss.kpi.rst
+++ b/doc/source/api/force_bdss.kpi.rst
@@ -19,10 +19,10 @@ force_bdss.kpi.base_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.base_kpi_calculator_bundle module
-------------------------------------------------
+force_bdss.kpi.base_kpi_calculator_factory module
+-------------------------------------------------
 
-.. automodule:: force_bdss.kpi.base_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.base_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -35,10 +35,10 @@ force_bdss.kpi.base_kpi_calculator_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.i_kpi_calculator_bundle module
----------------------------------------------
+force_bdss.kpi.i_kpi_calculator_factory module
+----------------------------------------------
 
-.. automodule:: force_bdss.kpi.i_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.i_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.kpi.tests.rst b/doc/source/api/force_bdss.kpi.tests.rst
index 96c191623081ab254267fe0e4fab43df8b63de66..3ab64ce53fa147e534b9d9ec5a333285df68475b 100644
--- a/doc/source/api/force_bdss.kpi.tests.rst
+++ b/doc/source/api/force_bdss.kpi.tests.rst
@@ -12,10 +12,10 @@ force_bdss.kpi.tests.test_base_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.tests.test_base_kpi_calculator_bundle module
------------------------------------------------------------
+force_bdss.kpi.tests.test_base_kpi_calculator_factory module
+------------------------------------------------------------
 
-.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.rst b/doc/source/api/force_bdss.mco.rst
index c8047b33691b51c57d8f3ac75629b1c6f206f8ff..9e86c876080494051ae0b990cd0d400202f99065 100644
--- a/doc/source/api/force_bdss.mco.rst
+++ b/doc/source/api/force_bdss.mco.rst
@@ -20,18 +20,18 @@ force_bdss.mco.base_mco module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_mco_bundle module
--------------------------------------
+force_bdss.mco.base_mco_communicator module
+-------------------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_bundle
+.. automodule:: force_bdss.mco.base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_mco_communicator module
--------------------------------------------
+force_bdss.mco.base_mco_factory module
+--------------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_communicator
+.. automodule:: force_bdss.mco.base_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -44,10 +44,10 @@ force_bdss.mco.base_mco_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.i_mco_bundle module
-----------------------------------
+force_bdss.mco.i_mco_factory module
+-----------------------------------
 
-.. automodule:: force_bdss.mco.i_mco_bundle
+.. automodule:: force_bdss.mco.i_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.tests.rst b/doc/source/api/force_bdss.mco.tests.rst
index 6dbcf8432a56e54097c8d928f481e2ee23fed06b..f1af86e01f9d3bd09bc5b3c560cba6cc4c83758a 100644
--- a/doc/source/api/force_bdss.mco.tests.rst
+++ b/doc/source/api/force_bdss.mco.tests.rst
@@ -12,18 +12,18 @@ force_bdss.mco.tests.test_base_mco module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_mco_bundle module
-------------------------------------------------
+force_bdss.mco.tests.test_base_mco_communicator module
+------------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_mco_bundle
+.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_mco_communicator module
-------------------------------------------------------
+force_bdss.mco.tests.test_base_mco_factory module
+-------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
+.. automodule:: force_bdss.mco.tests.test_base_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.rst b/doc/source/api/force_bdss.rst
index 6d71a20103c8f9654c5945b43c271cc403f66549..bbf6b646456c28936d93e09d10eb383fb0366118 100644
--- a/doc/source/api/force_bdss.rst
+++ b/doc/source/api/force_bdss.rst
@@ -50,14 +50,6 @@ force_bdss.bdss_application module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.bundle_registry_plugin module
-----------------------------------------
-
-.. automodule:: force_bdss.bundle_registry_plugin
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 force_bdss.core_evaluation_driver module
 ----------------------------------------
 
@@ -74,6 +66,14 @@ force_bdss.core_mco_driver module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.factory_registry_plugin module
+-----------------------------------------
+
+.. automodule:: force_bdss.factory_registry_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.ids module
 ---------------------
 
diff --git a/doc/source/api/force_bdss.tests.rst b/doc/source/api/force_bdss.tests.rst
index 67e8a0a030b89259487618e57a8ba36557186aa0..b84321511be4824b60dc79d0823675aacdd91ab2 100644
--- a/doc/source/api/force_bdss.tests.rst
+++ b/doc/source/api/force_bdss.tests.rst
@@ -19,18 +19,18 @@ force_bdss.tests.test_bdss_application module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.tests.test_bundle_registry_plugin module
+force_bdss.tests.test_core_evaluation_driver module
 ---------------------------------------------------
 
-.. automodule:: force_bdss.tests.test_bundle_registry_plugin
+.. automodule:: force_bdss.tests.test_core_evaluation_driver
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.tests.test_core_evaluation_driver module
----------------------------------------------------
+force_bdss.tests.test_factory_registry_plugin module
+----------------------------------------------------
 
-.. automodule:: force_bdss.tests.test_core_evaluation_driver
+.. automodule:: force_bdss.tests.test_factory_registry_plugin
     :members:
     :undoc-members:
     :show-inheritance: