diff --git a/openair3/NAS/COMMON/NR_NAS_defs.h b/openair3/NAS/COMMON/NR_NAS_defs.h
index f49852f62c..5549e5e1e2 100644
--- a/openair3/NAS/COMMON/NR_NAS_defs.h
+++ b/openair3/NAS/COMMON/NR_NAS_defs.h
@@ -72,9 +72,9 @@ typedef enum {
   TYPE_DEF(FGS_DEREGISTRATION_ACCEPT_UE_ORIGINATING, 0x46)   \
   TYPE_DEF(DeregistrationrequestUEterminated, 0x47)          \
   TYPE_DEF(DeregistrationacceptUEterminated, 0x48)           \
-  TYPE_DEF(Servicerequest, 0x4c)                             \
-  TYPE_DEF(Servicereject, 0x4d)                              \
-  TYPE_DEF(Serviceaccept, 0x4e)                              \
+  TYPE_DEF(FGS_SERVICE_REQUEST, 0x4c)                        \
+  TYPE_DEF(FGS_SERVICE_REJECT, 0x4d)                         \
+  TYPE_DEF(FGS_SERVICE_ACCEPT, 0x4e)                         \
   TYPE_DEF(Controlplaneservicerequest, 0x4f)                 \
   TYPE_DEF(Networkslicespecificauthenticationcommand, 0x50)  \
   TYPE_DEF(Networkslicespecificauthenticationcomplete, 0x51) \