diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 648dca7..99b573f 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -12,7 +12,7 @@
 
 nodeSelectors:
   enabled: false
-  spgwu:
+  upf:
     label: omec-upf
     value: enabled
 
@@ -51,7 +51,7 @@
   coreDump:
     enabled: false
     path: /tmp/coredump
-  spgwu:
+  upf:
     hugepage:
       enabled: true
     sriov:
@@ -61,10 +61,10 @@
     cniPlugin: vfioveth
     enb:
       subnet: 192.168.251.0/24
-    s1u:
+    access:
       gateway: 192.168.252.1
       ip: 192.168.252.3/24
-    sgi:
+    core:
       gateway: 192.168.250.1
       ip: 192.168.250.3/24
     cfgFiles:
@@ -75,10 +75,10 @@
         cpiface:
           nb_dst_ip: spgwc-headless
           hostname: upf-bess
-        s1u:
-          ifname: s1u
-        sgi:
-          ifname: sgi
+        access:
+          ifname: access
+        core:
+          ifname: core
         measure: true
     bess:
       web: