diff --git a/gso/api/v1/imports.py b/gso/api/v1/imports.py
index 8920765a83efa12cc50f2bf56ae9465c9e746c6e..dd77bc80e6145ae35d75fdd9514cf564d606d98c 100644
--- a/gso/api/v1/imports.py
+++ b/gso/api/v1/imports.py
@@ -16,7 +16,7 @@ from gso.products.product_blocks.site import SiteTier
from gso.services import subscriptions
from gso.services.crm import CustomerNotFoundError, get_customer_by_name
from gso.utils.helpers import BaseSiteValidatorModel, LAGMember
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
router = APIRouter(prefix="/imports", tags=["Imports"], dependencies=[Depends(opa_security_default)])
diff --git a/gso/products/product_blocks/office_router.py b/gso/products/product_blocks/office_router.py
index 83471d8f66f903f8d7c4f2b7129e197cd650c2a7..fec7ad8d16366baf12ec3528748f71aa2fa36d90 100644
--- a/gso/products/product_blocks/office_router.py
+++ b/gso/products/product_blocks/office_router.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class OfficeRouterBlockInactive(
diff --git a/gso/products/product_blocks/router.py b/gso/products/product_blocks/router.py
index 04f1b91df6cecaaedcfbdd80dbf87592b26f7527..f91bf1c70507a2f7814bfe69643c70489cb0c4c2 100644
--- a/gso/products/product_blocks/router.py
+++ b/gso/products/product_blocks/router.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class RouterRole(strEnum):
diff --git a/gso/products/product_blocks/super_pop_switch.py b/gso/products/product_blocks/super_pop_switch.py
index 2e2d5b7c1aa548ce5bbbf9d586370edfdb6153ee..af2f2ba74c98cc41806842d9877e8b0168ec3748 100644
--- a/gso/products/product_blocks/super_pop_switch.py
+++ b/gso/products/product_blocks/super_pop_switch.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class SuperPopSwitchBlockInactive(
diff --git a/gso/utils/helpers.py b/gso/utils/helpers.py
index 237d080e67facb6a4381223641613ca7e3f01225..6c30324ed0b81064bdc4c84e862f1a0ff671b9da 100644
--- a/gso/utils/helpers.py
+++ b/gso/utils/helpers.py
@@ -18,7 +18,7 @@ from gso.products.product_blocks.site import SiteTier
from gso.products.product_types.router import Router
from gso.services.netbox_client import NetboxClient
from gso.services.subscriptions import get_active_subscriptions_by_field_and_value
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
class LAGMember(BaseModel):
diff --git a/gso/utils/shared_choices.py b/gso/utils/shared_enums.py
similarity index 100%
rename from gso/utils/shared_choices.py
rename to gso/utils/shared_enums.py
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 8a094e404e3f0b97b3a61a3c00961db320f1bee0..e9e304d224c5a9c36314a21050bf878846c8ef70 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -37,7 +37,7 @@ from gso.utils.helpers import (
validate_router_in_netbox,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
def initial_input_form_generator(product_name: str) -> FormGenerator:
diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py
index edcc87dff51864dab5ae3e66d9e6c8bb18e82cce..5f1240c56e74c0b16fe76bec4a72b962fbbec7c3 100644
--- a/gso/workflows/iptrunk/migrate_iptrunk.py
+++ b/gso/workflows/iptrunk/migrate_iptrunk.py
@@ -40,7 +40,7 @@ from gso.utils.helpers import (
validate_interface_name_list,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from gso.utils.workflow_steps import set_isis_to_90000
diff --git a/gso/workflows/iptrunk/modify_trunk_interface.py b/gso/workflows/iptrunk/modify_trunk_interface.py
index 0e0aa5254bceb4c70bf55835a9427b5070aa66b1..d4e6edb19160c77a429f5a7f307b5897ec5df055 100644
--- a/gso/workflows/iptrunk/modify_trunk_interface.py
+++ b/gso/workflows/iptrunk/modify_trunk_interface.py
@@ -33,7 +33,7 @@ from gso.utils.helpers import (
validate_iptrunk_unique_interface,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
def initialize_ae_members(subscription: Iptrunk, initial_user_input: dict, side_index: int) -> type[LAGMember]:
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index aa5a91eaae3dd0526dbce2effdafb44492ae9ce2..330c90c3fddb35253180b8668d61947f484ce9b7 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -24,7 +24,7 @@ from gso.services import infoblox
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import execute_playbook, pp_interaction
from gso.utils.helpers import get_router_vendor, validate_tt_number
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from gso.utils.workflow_steps import set_isis_to_90000
diff --git a/gso/workflows/router/create_router.py b/gso/workflows/router/create_router.py
index bdf829b7b9ad1857b05d36e5e95d3fe72cbb26ba..f33dcec56f8314c2ebd188f7e5d9df6865caa032 100644
--- a/gso/workflows/router/create_router.py
+++ b/gso/workflows/router/create_router.py
@@ -21,7 +21,7 @@ from gso.services.crm import get_customer_by_name
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import pp_interaction
from gso.utils.helpers import generate_fqdn, iso_from_ipv4
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
from gso.utils.workflow_steps import deploy_base_config_dry, deploy_base_config_real, run_checks_after_base_config
diff --git a/gso/workflows/router/terminate_router.py b/gso/workflows/router/terminate_router.py
index 1c5052b55f7f6d07179e43135e51a5cd1106cb4b..20ac88dd053c7d231cdf8445d186f02ee81fa2f8 100644
--- a/gso/workflows/router/terminate_router.py
+++ b/gso/workflows/router/terminate_router.py
@@ -22,7 +22,7 @@ from gso.products.product_types.router import Router
from gso.services import infoblox
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import execute_playbook, pp_interaction
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
logger = logging.getLogger(__name__)
diff --git a/gso/workflows/tasks/import_office_router.py b/gso/workflows/tasks/import_office_router.py
index ce7b3664c9cdf93735d519d92ead73c9fdcd9530..9b8de86fa099e328971b2d052098839f6f66ff1b 100644
--- a/gso/workflows/tasks/import_office_router.py
+++ b/gso/workflows/tasks/import_office_router.py
@@ -15,7 +15,7 @@ from gso.products.product_types.office_router import OfficeRouterInactive
from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/gso/workflows/tasks/import_router.py b/gso/workflows/tasks/import_router.py
index e7e332ff6fc9522434d875760376534cdb3732e9..8346b973d51bf959c3397f5df73e0285a9474d4d 100644
--- a/gso/workflows/tasks/import_router.py
+++ b/gso/workflows/tasks/import_router.py
@@ -18,7 +18,7 @@ from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
from gso.utils.helpers import generate_fqdn
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/gso/workflows/tasks/import_super_pop_switch.py b/gso/workflows/tasks/import_super_pop_switch.py
index e13896f20f31e2f499e62425eb6c26c745137673..5d7aa4ab214f630e4db5fa206fc8650681016df1 100644
--- a/gso/workflows/tasks/import_super_pop_switch.py
+++ b/gso/workflows/tasks/import_super_pop_switch.py
@@ -16,7 +16,7 @@ from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
from gso.utils.helpers import generate_fqdn
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/test/api/test_imports.py b/test/api/test_imports.py
index 0737860921c930bb3928efcf859ed67c6a0ac676..b4d58f86cef94b2992973cc487fcede995819f14 100644
--- a/test/api/test_imports.py
+++ b/test/api/test_imports.py
@@ -9,7 +9,7 @@ from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
from gso.products.product_blocks.router import RouterRole
from gso.products.product_blocks.site import SiteTier
from gso.utils.helpers import iso_from_ipv4
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
SITE_IMPORT_ENDPOINT = "/api/v1/imports/sites"
ROUTER_IMPORT_ENDPOINT = "/api/v1/imports/routers"
diff --git a/test/fixtures.py b/test/fixtures.py
index 933fcfc14738460aea302adba8d5af2c080be08f..732439527e0b34f346488fae687dfff98a80a577 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -18,7 +18,7 @@ from gso.products.product_types.iptrunk import IptrunkInactive
from gso.products.product_types.router import Router, RouterInactive
from gso.products.product_types.site import Site, SiteInactive
from gso.services import subscriptions
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
CUSTOMER_ID: UUIDstr = "2f47f65a-0911-e511-80d0-005056956c1a"
diff --git a/test/utils/test_helpers.py b/test/utils/test_helpers.py
index a7a09ade563cbea460f2884ae718e1545b6975c2..5dee0aa8f7a5cb981771a63cdfec933986423991 100644
--- a/test/utils/test_helpers.py
+++ b/test/utils/test_helpers.py
@@ -4,7 +4,7 @@ import pytest
from gso.products.product_blocks.iptrunk import IptrunkInterfaceBlock
from gso.utils.helpers import available_interfaces_choices_including_current_members, validate_tt_number
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
@pytest.fixture()
diff --git a/test/workflows/iptrunk/test_create_iptrunk.py b/test/workflows/iptrunk/test_create_iptrunk.py
index d8ca8c09c719a5bf27f666074d66f6bb2a21cf0e..b85f6d3fc586949dd07d53f5694e23d251eb69f5 100644
--- a/test/workflows/iptrunk/test_create_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_iptrunk.py
@@ -7,7 +7,7 @@ from gso.products import Iptrunk, ProductType
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
from gso.services.subscriptions import get_product_id_by_name
from gso.utils.helpers import LAGMember
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test.services.conftest import MockedNetboxClient
from test.workflows import (
assert_complete,
diff --git a/test/workflows/iptrunk/test_migrate_iptrunk.py b/test/workflows/iptrunk/test_migrate_iptrunk.py
index 634bd52774a45370594b4413d94db40ea59db6bd..825b9e7c779287e3b42ff11d01413562ff66d44b 100644
--- a/test/workflows/iptrunk/test_migrate_iptrunk.py
+++ b/test/workflows/iptrunk/test_migrate_iptrunk.py
@@ -5,7 +5,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_types.router import Router
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM
from test.conftest import UseJuniperSide
from test.workflows import (
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 5a7d1596c4fb0c53a3ddb840bfa89f1d96bbb233..78bedca5562302e2b6e6c12e3e71bbbb93bf7758 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -4,7 +4,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test.conftest import UseJuniperSide
from test.workflows import (
assert_complete,
diff --git a/test/workflows/router/test_create_router.py b/test/workflows/router/test_create_router.py
index 1f54bba29c148de31783a4ed9d906ab90eb57c48..efa7e6732c524cbf1d6edf0584fe207b070efcdf 100644
--- a/test/workflows/router/test_create_router.py
+++ b/test/workflows/router/test_create_router.py
@@ -7,7 +7,7 @@ from gso.products import ProductType, Site
from gso.products.product_blocks.router import RouterRole
from gso.products.product_types.router import Router
from gso.services.subscriptions import get_product_id_by_name
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM
from test.workflows import (
assert_complete,