diff --git a/README.md b/README.md
index f48cf09d47554acb0d1e32a4fe098fb6b5e619ee..909a22cd7b977e3c8527efcd640a4faa6141957e 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is a dummy implementation of a trunk service in workflow orchestrator. The
 - ``pip install -e .``
 - Create ``oss-params.json``
 - Export the oss-params file: ``export OSS_PARAMS_FILENAME="/path/to/file.json"``
-- The core of workflow orchestrator can be started with ``uvicorn --host 0.0.0.0 --port 8080 main:app`` from inside the ``geant_service_orchestrator`` directory of this repo.
+- The core of workflow orchestrator can be started with ``uvicorn --host 0.0.0.0 --port 8080 main:app`` from inside the ``gso`` directory of this repo.
 - The GUI can be started with ``yarn start``.
 
 ## Structure description
diff --git a/gso/main.py b/gso/main.py
index 9ea59ed79b973e8cb0d4dd20d43865f58e9a2f6f..ba2582a89cd363aa761b67b6dbcf4cddc388344e 100644
--- a/gso/main.py
+++ b/gso/main.py
@@ -1,8 +1,8 @@
 from orchestrator import OrchestratorCore
 from orchestrator.cli.main import app as core_cli
 from orchestrator.settings import AppSettings
-import geant_service_orchestrator.products  # noqa: F401
-import geant_service_orchestrator.workflows  # noqa: F401
+import gso.products  # noqa: F401
+import gso.workflows  # noqa: F401
 
 
 app = OrchestratorCore(base_settings=AppSettings())
diff --git a/gso/products/__init__.py b/gso/products/__init__.py
index 057aaececbed1e7ceaba8759cbbc68258d387675..e9a3658f1111f568b9460d58ec12aa893e255773 100644
--- a/gso/products/__init__.py
+++ b/gso/products/__init__.py
@@ -1,6 +1,6 @@
 from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
 
-from geant_service_orchestrator.products.product_types.device import Device
+from gso.products.product_types.device import Device
 
 SUBSCRIPTION_MODEL_REGISTRY.update(
     {
diff --git a/gso/products/product_types/device.py b/gso/products/product_types/device.py
index 0b20fa9080744ee682734b83bf0c0866be42c680..e79762c12f9fae68b409955b9e4a5a49e08c75dc 100644
--- a/gso/products/product_types/device.py
+++ b/gso/products/product_types/device.py
@@ -1,7 +1,7 @@
 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle, strEnum
 
-from geant_service_orchestrator.products.product_blocks.device \
+from gso.products.product_blocks.device \
     import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
 
 
diff --git a/gso/services/ipam.py b/gso/services/ipam.py
index 021bcb4480859835a7fe081d294f91fa7f44f33a..6e63130c6ed1cb00934b216bc6aee4ec8e2d80c5 100644
--- a/gso/services/ipam.py
+++ b/gso/services/ipam.py
@@ -1,6 +1,6 @@
 import ipaddress
 from pydantic import BaseSettings
-from geant_service_orchestrator import settings
+from gso import settings
 
 
 class ServiceNetworks(BaseSettings):
diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py
index 2a3626d3976ad735a82b72759c32f7a3d662f8b9..d06bfafad2f2e0948a9f11fe05e9dbbc8beaa290 100644
--- a/gso/services/provisioning_proxy.py
+++ b/gso/services/provisioning_proxy.py
@@ -1,6 +1,6 @@
-from geant_service_orchestrator.products.product_types.device \
+from gso.products.product_types.device \
     import DeviceBlock
-from geant_service_orchestrator import settings
+from gso import settings
 import requests
 
 
diff --git a/gso/services/resource_manager.py b/gso/services/resource_manager.py
index f591e8a3ea96e7ac0b25366d104e6aafd83a2e34..334e7b3e93b5093152014278a75169cd549a68b9 100644
--- a/gso/services/resource_manager.py
+++ b/gso/services/resource_manager.py
@@ -1,4 +1,4 @@
-from geant_service_orchestrator import settings
+from gso import settings
 import requests
 
 
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index f8bffe75ebf21421d1f59fbfecf13171e1bf58e4..19d06a7d5ff160491dc24b255d317b3e123029ae 100644
--- a/gso/workflows/device/create_device.py
+++ b/gso/workflows/device/create_device.py
@@ -11,8 +11,8 @@ from orchestrator.workflow import done, init, step, workflow
 from orchestrator.workflows.steps import resync, set_status
 from orchestrator.workflows.steps import store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
-from geant_service_orchestrator.products.product_types import device
-from geant_service_orchestrator.services import ipam, provisioning_proxy
+from gso.products.product_types import device
+from gso.services import ipam, provisioning_proxy
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:
diff --git a/gso/workflows/device/terminate_device.py b/gso/workflows/device/terminate_device.py
index 5c175778ca3e302dd13bf809001087e698fe6d27..686128a19e0464a0d579b1370c21af3a746ba17b 100644
--- a/gso/workflows/device/terminate_device.py
+++ b/gso/workflows/device/terminate_device.py
@@ -11,7 +11,7 @@ from orchestrator.workflows.steps import (
 )
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
-from geant_service_orchestrator.products.product_types.device import Device
+from gso.products.product_types.device import Device
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> InputForm:
diff --git a/tox.ini b/tox.ini
index 733d4a3712c670ce5d2a16107a74386366c606bb..7973b25a04d0a5a1e560b7fe9fe03fea63887bc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps =
 
 commands =
     coverage erase
-    coverage run --source geant_service_orchestrator -m pytest {posargs}
+    coverage run --source gso -m pytest {posargs}
     coverage xml
     coverage html
     # coverage report --fail-under 80