diff --git a/src/osmo_gsm_tester/obj/epc.py b/src/osmo_gsm_tester/obj/epc.py
index 4c43f5e..90a6cbb 100644
--- a/src/osmo_gsm_tester/obj/epc.py
+++ b/src/osmo_gsm_tester/obj/epc.py
@@ -71,7 +71,7 @@
         elif epc_type == 'srsepc':
             from .epc_srs import srsEPC
             epc_class = srsEPC
-        elif epc_type == 'open5gsepc':
+        elif epc_type == 'open5gs':
             from .epc_open5gs import Open5gsEPC
             epc_class = Open5gsEPC
         else:
diff --git a/src/osmo_gsm_tester/obj/epc_open5gs.py b/src/osmo_gsm_tester/obj/epc_open5gs.py
index feff901..3759dfc 100644
--- a/src/osmo_gsm_tester/obj/epc_open5gs.py
+++ b/src/osmo_gsm_tester/obj/epc_open5gs.py
@@ -45,7 +45,7 @@
     REMOTE_DIR = '/osmo-gsm-tester-open5gs'
 
     def __init__(self, testenv, run_node):
-        super().__init__(testenv, run_node, 'open5gs_epc')
+        super().__init__(testenv, run_node, 'open5gs')
         self.run_dir = None
         self.pcrf = None
         self.upf = None
@@ -57,7 +57,7 @@
         self.subscriber_list = []
 
     def configure(self):
-        values = super().configure(['open5gsepc'])
+        values = super().configure(['open5gs'])
         db_host = values['epc']['db_host']
         db_uri = 'mongodb://'+db_host+'/open5gs'
         config.overlay(values, dict(epc=dict(db_uri=db_uri,