diff --git a/docs/source/module/products/product_blocks/geant_ip.rst b/docs/source/module/products/product_blocks/geant_ip.rst
deleted file mode 100644
index 46958f8dac1681d3afd8ecdd59cc6398f588cf93..0000000000000000000000000000000000000000
--- a/docs/source/module/products/product_blocks/geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.products.product_blocks.geant_ip``
-========================================
-
-.. automodule:: gso.products.product_blocks.geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/products/product_blocks/index.rst b/docs/source/module/products/product_blocks/index.rst
index 65474b437b327a89345a5d12378e15ffd3a3cd68..f7f2c86785d04b746ad14c7750a51f8b0b3b030f 100644
--- a/docs/source/module/products/product_blocks/index.rst
+++ b/docs/source/module/products/product_blocks/index.rst
@@ -16,9 +16,9 @@ Submodules
 
    bgp_session
    edge_port
-   geant_ip
    iptrunk
    lan_switch_interconnect
+   nren_l3_core_service
    office_router
    opengear
    pop_vlan
diff --git a/docs/source/module/products/product_blocks/nren_l3_core_service.rst b/docs/source/module/products/product_blocks/nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..53e849d98c7b948468f21fb21280431a670274a2
--- /dev/null
+++ b/docs/source/module/products/product_blocks/nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.products.product_blocks.nren_l3_core_service``
+====================================================
+
+.. automodule:: gso.products.product_blocks.nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/products/product_types/geant_ip.rst b/docs/source/module/products/product_types/geant_ip.rst
deleted file mode 100644
index bb2167f1123b1a0e4a54f2433ad3ee3b3636994e..0000000000000000000000000000000000000000
--- a/docs/source/module/products/product_types/geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.products.product_types.geant_ip``
-=======================================
-
-.. automodule:: gso.products.product_types.geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/products/product_types/index.rst b/docs/source/module/products/product_types/index.rst
index b2636eaf5139fb23291be3c45e2bac8b5a504af7..70f882d3632166aa86d3b46f85c33493c043da0f 100644
--- a/docs/source/module/products/product_types/index.rst
+++ b/docs/source/module/products/product_types/index.rst
@@ -15,9 +15,9 @@ Submodules
    :maxdepth: 1
 
    edge_port
-   geant_ip
    iptrunk
    lan_switch_interconnect
+   nren_l3_core_service
    office_router
    opengear
    pop_vlan
diff --git a/docs/source/module/products/product_types/nren_l3_core_service.rst b/docs/source/module/products/product_types/nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..4440d033bb1f7e439b51eaba6429d7d2f5f63883
--- /dev/null
+++ b/docs/source/module/products/product_types/nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.products.product_types.nren_l3_core_service``
+===================================================
+
+.. automodule:: gso.products.product_types.nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/utils/types/country_code.rst b/docs/source/module/utils/types/country_code.rst
index 604feaf1fa4c8668348c734b6e8cf6052c734de0..130b77afb0254aa77fabde7f2f5f5801e27adfc4 100644
--- a/docs/source/module/utils/types/country_code.rst
+++ b/docs/source/module/utils/types/country_code.rst
@@ -1,5 +1,5 @@
 ``gso.utils.types.country_code``
-===============================
+================================
 
 .. automodule:: gso.utils.types.country_code
    :members:
diff --git a/docs/source/module/workflows/geant_ip/create_geant_ip.rst b/docs/source/module/workflows/geant_ip/create_geant_ip.rst
deleted file mode 100644
index fdeb8f2eec7dd6a1fe0214c81cec2f2ab93a8d54..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/create_geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.workflows.geant_ip.create_geant_ip``
-==========================================
-
-.. automodule:: gso.workflows.geant_ip.create_geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/workflows/geant_ip/create_imported_geant_ip.rst b/docs/source/module/workflows/geant_ip/create_imported_geant_ip.rst
deleted file mode 100644
index 390e1ecb0b8ebdff9291561f5229b7035667f7d2..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/create_imported_geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.workflows.geant_ip.create_imported_geant_ip``
-====================================================
-
-.. automodule:: gso.workflows.geant_ip.create_imported_geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/workflows/geant_ip/import_geant_ip.rst b/docs/source/module/workflows/geant_ip/import_geant_ip.rst
deleted file mode 100644
index 8582bb7a994aba1f399c7250143fba864847dc2c..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/import_geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.workflows.geant_ip.import_geant_ip``
-==========================================
-
-.. automodule:: gso.workflows.geant_ip.import_geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/workflows/geant_ip/index.rst b/docs/source/module/workflows/geant_ip/index.rst
deleted file mode 100644
index c2dd7576ef9f1c3882b97c782aa00a3e5ff894c9..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/index.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-``gso.workflows.geant_ip``
-==========================
-
-.. automodule:: gso.workflows.geant_ip
-   :members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 2
-   :titlesonly:
-
-   create_geant_ip
-   create_imported_geant_ip
-   import_geant_ip
-   migrate_geant_ip
-   modify_geant_ip
diff --git a/docs/source/module/workflows/geant_ip/migrate_geant_ip.rst b/docs/source/module/workflows/geant_ip/migrate_geant_ip.rst
deleted file mode 100644
index fccea90684ed789a58198c2295a261a1a4eab166..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/migrate_geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.workflows.geant_ip.migrate_geant_ip``
-===========================================
-
-.. automodule:: gso.workflows.geant_ip.migrate_geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/workflows/geant_ip/modify_geant_ip.rst b/docs/source/module/workflows/geant_ip/modify_geant_ip.rst
deleted file mode 100644
index 4554d54516514b3b9bb813318c793f1d08564fe2..0000000000000000000000000000000000000000
--- a/docs/source/module/workflows/geant_ip/modify_geant_ip.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``gso.workflows.geant_ip.modify_geant_ip``
-==========================================
-
-.. automodule:: gso.workflows.geant_ip.modify_geant_ip
-   :members:
-   :show-inheritance:
diff --git a/docs/source/module/workflows/index.rst b/docs/source/module/workflows/index.rst
index 3698c9f825ac87b9de266ffd73e4ccb8a9f95bd4..774573c9e67c1a069175fc5aa7e39b74c2283a32 100644
--- a/docs/source/module/workflows/index.rst
+++ b/docs/source/module/workflows/index.rst
@@ -12,12 +12,12 @@ Subpackages
    :maxdepth: 2
    :titlesonly:
 
+   edge_port/index
    iptrunk/index
+   nren_l3_core_service/index
    office_router/index
    opengear/index
    router/index
    site/index
    super_pop_switch/index
    tasks/index
-   edge_port/index
-   geant_ip/index
\ No newline at end of file
diff --git a/docs/source/module/workflows/nren_l3_core_service/create_imported_nren_l3_core_service.rst b/docs/source/module/workflows/nren_l3_core_service/create_imported_nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..249f9b824661d6ed6773b3695c6084b5aa3348be
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/create_imported_nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.workflows.nren_l3_core_service.create_imported_nren_l3_core_service``
+===========================================================================
+
+.. automodule:: gso.workflows.nren_l3_core_service.create_imported_nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/workflows/nren_l3_core_service/create_nren_l3_core_service.rst b/docs/source/module/workflows/nren_l3_core_service/create_nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e1418b4c915bd2e0c43130f9a344090ee0b4472a
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/create_nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.workflows.nren_l3_core_service.create_nren_l3_core_service``
+==================================================================
+
+.. automodule:: gso.workflows.nren_l3_core_service.create_nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/workflows/nren_l3_core_service/import_nren_l3_core_service.rst b/docs/source/module/workflows/nren_l3_core_service/import_nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fdb67a1e8c8b2e65774149001da612d34d5f312f
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/import_nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.workflows.nren_l3_core_service.import_nren_l3_core_service``
+==================================================================
+
+.. automodule:: gso.workflows.nren_l3_core_service.import_nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/workflows/nren_l3_core_service/index.rst b/docs/source/module/workflows/nren_l3_core_service/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..aa55ff08c8e565e7304ff1c4082f9d3e0b4caae3
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/index.rst
@@ -0,0 +1,19 @@
+``gso.workflows.nren_l3_core_service``
+======================================
+
+.. automodule:: gso.workflows.nren_l3_core_service
+   :members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   create_nren_l3_core_service
+   create_imported_nren_l3_core_service
+   import_nren_l3_core_service
+   migrate_nren_l3_core_service
+   modify_nren_l3_core_service
diff --git a/docs/source/module/workflows/nren_l3_core_service/migrate_nren_l3_core_service.rst b/docs/source/module/workflows/nren_l3_core_service/migrate_nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9a550c827f43ee3e06ddcd88440897592c83eff5
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/migrate_nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.workflows.nren_l3_core_service.migrate_nren_l3_core_service``
+===================================================================
+
+.. automodule:: gso.workflows.nren_l3_core_service.migrate_nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/docs/source/module/workflows/nren_l3_core_service/modify_nren_l3_core_service.rst b/docs/source/module/workflows/nren_l3_core_service/modify_nren_l3_core_service.rst
new file mode 100644
index 0000000000000000000000000000000000000000..bd33ee2260284b4ec67883e6bb6bc17af4bdbfe5
--- /dev/null
+++ b/docs/source/module/workflows/nren_l3_core_service/modify_nren_l3_core_service.rst
@@ -0,0 +1,6 @@
+``gso.workflows.nren_l3_core_service.modify_nren_l3_core_service``
+==================================================================
+
+.. automodule:: gso.workflows.nren_l3_core_service.modify_nren_l3_core_service
+   :members:
+   :show-inheritance:
diff --git a/gso/workflows/nren_l3_core_service/modify_nren_l3_core_service.py b/gso/workflows/nren_l3_core_service/modify_nren_l3_core_service.py
index c3cef39fb66313a31efff400122f506e78c82e94..4331de2bcabc767d2a53904669fa2e1be7b8d724 100644
--- a/gso/workflows/nren_l3_core_service/modify_nren_l3_core_service.py
+++ b/gso/workflows/nren_l3_core_service/modify_nren_l3_core_service.py
@@ -254,7 +254,7 @@ def modify_existing_sbp_blocks(subscription: NRENL3CoreService, modified_sbp_lis
 
 @step("Instantiate new Service Binding Ports")
 def create_new_sbp_blocks(subscription: NRENL3CoreService, added_service_binding_ports: list[dict[str, Any]]) -> State:
-    """Add new :term:`SBP`s to the :term:`NREN` L3 Core Service subscription."""
+    """Add new two :term:`SBP` to the :term:`NREN` L3 Core Service subscription."""
     for sbp_input in added_service_binding_ports:
         edge_port = EdgePort.from_subscription(sbp_input["edge_port_id"])
         bgp_session_list = [