diff --git a/openair-cn/NAS/EURECOM-NAS/src/esm/msg/PdnConnectivityRequest.h b/openair-cn/NAS/EURECOM-NAS/src/esm/msg/PdnConnectivityRequest.h
index e6f53da4eb..1a1e23f2c0 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/esm/msg/PdnConnectivityRequest.h
+++ b/openair-cn/NAS/EURECOM-NAS/src/esm/msg/PdnConnectivityRequest.h
@@ -6,7 +6,7 @@
 #include "EpsBearerIdentity.h"
 #include "ProcedureTransactionIdentity.h"
 #include "MessageType.h"
-#include "RequestType.h"
+#include "NasRequestType.h"
 #include "PdnType.h"
 #include "EsmInformationTransferFlag.h"
 #include "AccessPointName.h"
diff --git a/openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.c b/openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.c
similarity index 98%
rename from openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.c
rename to openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.c
index 2206ed922f..7ebac87bfd 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.c
@@ -5,7 +5,7 @@
 
 #include "TLVEncoder.h"
 #include "TLVDecoder.h"
-#include "RequestType.h"
+#include "NasRequestType.h"
 
 int decode_request_type(RequestType *requesttype, uint8_t iei, uint8_t *buffer, uint32_t len)
 {
diff --git a/openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.h b/openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.h
similarity index 89%
rename from openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.h
rename to openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.h
index d15e73d9e1..9e1303f211 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/ies/RequestType.h
+++ b/openair-cn/NAS/EURECOM-NAS/src/ies/NasRequestType.h
@@ -4,8 +4,8 @@
 
 #include "OctetString.h"
 
-#ifndef REQUEST_TYPE_H_
-#define REQUEST_TYPE_H_
+#ifndef NAS_REQUEST_TYPE_H_
+#define NAS_REQUEST_TYPE_H_
 
 #define REQUEST_TYPE_MINIMUM_LENGTH 1
 #define REQUEST_TYPE_MAXIMUM_LENGTH 1
@@ -26,5 +26,5 @@ int decode_request_type(RequestType *requesttype, uint8_t iei, uint8_t *buffer,
 
 int decode_u8_request_type(RequestType *requesttype, uint8_t iei, uint8_t value, uint32_t len);
 
-#endif /* REQUEST TYPE_H_ */
+#endif /* NAS_REQUEST_TYPE_H_ */
 
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/nas_data.h b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/nas_data.h
index 25ad7557e4..6a86ca5cb2 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/nas_data.h
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/nas_data.h
@@ -28,7 +28,7 @@ Description	Defines constants and functions used by the AS simulator
 #include "EpsMobileIdentity.h"
 #include "MobileIdentity.h"
 #include "IdentityType2.h"
-#include "RequestType.h"
+#include "NasRequestType.h"
 #include "PdnType.h"
 #include "PdnAddress.h"
 #include "NasSecurityAlgorithms.h"
diff --git a/openair-cn/NAS/Makefile.UE b/openair-cn/NAS/Makefile.UE
index 795669f143..cb0d3c01f7 100644
--- a/openair-cn/NAS/Makefile.UE
+++ b/openair-cn/NAS/Makefile.UE
@@ -182,7 +182,7 @@ libnas_ies_OBJS =													\
     EURECOM-NAS/src/ies/PdnAddress.o								\
     EURECOM-NAS/src/ies/MobileStationClassmark3.o					\
     EURECOM-NAS/src/ies/ServiceType.o								\
-    EURECOM-NAS/src/ies/RequestType.o								\
+    EURECOM-NAS/src/ies/NasRequestType.o							\
     EURECOM-NAS/src/ies/PlmnList.o									\
     EURECOM-NAS/src/ies/EpsQualityOfService.o						\
     EURECOM-NAS/src/ies/NasMessageContainer.o						\
diff --git a/openair-cn/NAS/Makefile.inc b/openair-cn/NAS/Makefile.inc
index 3f5f3b37fc..8e66de5609 100644
--- a/openair-cn/NAS/Makefile.inc
+++ b/openair-cn/NAS/Makefile.inc
@@ -247,7 +247,7 @@ libnas_ies_SRCS =													\
     EURECOM-NAS/src/ies/PdnAddress.c								\
     EURECOM-NAS/src/ies/MobileStationClassmark3.c					\
     EURECOM-NAS/src/ies/ServiceType.c								\
-    EURECOM-NAS/src/ies/RequestType.c								\
+    EURECOM-NAS/src/ies/NasRequestType.c							\
     EURECOM-NAS/src/ies/PlmnList.c									\
     EURECOM-NAS/src/ies/EpsQualityOfService.c						\
     EURECOM-NAS/src/ies/NasMessageContainer.c						\
@@ -341,7 +341,7 @@ libnas_ies_SRCS =													\
     EURECOM-NAS/src/ies/RadioPriority.h								\
     EURECOM-NAS/src/ies/Nonce.h										\
     EURECOM-NAS/src/ies/KsiAndSequenceNumber.h						\
-    EURECOM-NAS/src/ies/RequestType.h								\
+    EURECOM-NAS/src/ies/NasRequestType.h							\
     EURECOM-NAS/src/ies/ProtocolConfigurationOptions.h				\
     EURECOM-NAS/src/ies/AuthenticationResponseParameter.h			\
     EURECOM-NAS/src/ies/MobileStationClassmark3.h					\