diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
index 7871eecf97e7791b5babd97c7ee445fed0c6ce8b..17ce65521e9e1d738355d7f77e3f552b1ab8ecd9 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-CommonDataTypes.asn
@@ -12,16 +12,16 @@ DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
-Criticality		::= ENUMERATED { reject, ignore, notify }
+S1ap-Criticality		::= ENUMERATED { reject, ignore, notify }
 
-Presence		::= ENUMERATED { optional, conditional, mandatory }
+S1ap-Presence		::= ENUMERATED { optional, conditional, mandatory }
 
-PrivateIE-ID	::= CHOICE {
+S1ap-PrivateIE-ID	::= CHOICE {
 	local				INTEGER (0..65535),
 	global				OBJECT IDENTIFIER
 }
 
-ProcedureCode       ::= INTEGER {
+S1ap-ProcedureCode       ::= INTEGER {
     id-HandoverPreparation(0),
     id-HandoverResourceAllocation(1),
     id-HandoverNotification(2),
@@ -72,9 +72,9 @@ ProcedureCode       ::= INTEGER {
     id-uplinkNonUEAssociatedLPPaTransport(47)
 } (0..255)
 
-ProtocolExtensionID	::= INTEGER (0..65535)
+S1ap-ProtocolExtensionID	::= INTEGER (0..65535)
 
-ProtocolIE-ID		::= INTEGER {
+S1ap-ProtocolIE-ID		::= INTEGER {
     id-MME-UE-S1AP-ID                           (0),
     id-HandoverType                             (1),
     id-Cause                                    (2),
@@ -227,6 +227,6 @@ ProtocolIE-ID		::= INTEGER {
     id-PrivacyIndicator                             (166)
 } (0..65535)
 
-TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
+S1ap-TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
 
 END
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
index 5c6ce8cf086d5c54dfa19ecdfe214e406114c296..98af5fbffb74264038bcdb0609b5af27031f4af8 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Constants.asn
@@ -19,8 +19,8 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	ProcedureCode,
-	ProtocolIE-ID
+	S1ap-ProcedureCode,
+	S1ap-ProtocolIE-ID
 
 FROM S1AP-CommonDataTypes;
 
@@ -31,54 +31,54 @@ FROM S1AP-CommonDataTypes;
 --
 -- **************************************************************
 
-id-HandoverPreparation 				ProcedureCode ::= 0
-id-HandoverResourceAllocation 		ProcedureCode ::= 1
-id-HandoverNotification 			ProcedureCode ::= 2
-id-PathSwitchRequest 				ProcedureCode ::= 3
-id-HandoverCancel 					ProcedureCode ::= 4
-id-E-RABSetup						ProcedureCode ::= 5
-id-E-RABModify 						ProcedureCode ::= 6
-id-E-RABRelease						ProcedureCode ::= 7
-id-E-RABReleaseIndication			ProcedureCode ::= 8
-id-InitialContextSetup				ProcedureCode ::= 9
-id-Paging							ProcedureCode ::= 10
-id-downlinkNASTransport				ProcedureCode ::= 11
-id-initialUEMessage					ProcedureCode ::= 12
-id-uplinkNASTransport				ProcedureCode ::= 13
-id-Reset							ProcedureCode::= 14
-id-ErrorIndication					ProcedureCode ::= 15
-id-NASNonDeliveryIndication			ProcedureCode ::= 16
-id-S1Setup							ProcedureCode ::= 17
-id-UEContextReleaseRequest			ProcedureCode ::= 18
-id-DownlinkS1cdma2000tunneling		ProcedureCode ::= 19
-id-UplinkS1cdma2000tunneling		ProcedureCode ::= 20
-id-UEContextModification			ProcedureCode ::= 21
-id-UECapabilityInfoIndication		ProcedureCode ::= 22
-id-UEContextRelease					ProcedureCode ::= 23
-id-eNBStatusTransfer				ProcedureCode ::= 24
-id-MMEStatusTransfer				ProcedureCode ::= 25
-id-DeactivateTrace					ProcedureCode ::= 26
-id-TraceStart						ProcedureCode ::= 27
-id-TraceFailureIndication			ProcedureCode ::= 28
-id-ENBConfigurationUpdate			ProcedureCode ::= 29
-id-MMEConfigurationUpdate			ProcedureCode ::= 30
-id-LocationReportingControl			ProcedureCode ::= 31
-id-LocationReportingFailureIndication	ProcedureCode ::= 32
-id-LocationReport					ProcedureCode ::= 33
-id-OverloadStart					ProcedureCode ::= 34
-id-OverloadStop						ProcedureCode ::= 35
-id-WriteReplaceWarning				ProcedureCode ::= 36
-id-eNBDirectInformationTransfer		ProcedureCode ::= 37
-id-MMEDirectInformationTransfer		ProcedureCode ::= 38
-id-PrivateMessage					ProcedureCode ::= 39
-id-eNBConfigurationTransfer			ProcedureCode ::= 40
-id-MMEConfigurationTransfer			ProcedureCode ::= 41
-id-CellTrafficTrace					ProcedureCode ::= 42
-id-Kill								ProcedureCode ::= 43
-id-downlinkUEAssociatedLPPaTransport	ProcedureCode ::= 44
-id-uplinkUEAssociatedLPPaTransport		ProcedureCode ::= 45
-id-downlinkNonUEAssociatedLPPaTransport	ProcedureCode ::= 46
-id-uplinkNonUEAssociatedLPPaTransport	ProcedureCode ::= 47
+id-HandoverPreparation 				S1ap-ProcedureCode ::= 0
+id-HandoverResourceAllocation 		S1ap-ProcedureCode ::= 1
+id-HandoverNotification 			S1ap-ProcedureCode ::= 2
+id-PathSwitchRequest 				S1ap-ProcedureCode ::= 3
+id-HandoverCancel 					S1ap-ProcedureCode ::= 4
+id-E-RABSetup						S1ap-ProcedureCode ::= 5
+id-E-RABModify 						S1ap-ProcedureCode ::= 6
+id-E-RABRelease						S1ap-ProcedureCode ::= 7
+id-E-RABReleaseIndication			S1ap-ProcedureCode ::= 8
+id-InitialContextSetup				S1ap-ProcedureCode ::= 9
+id-Paging							S1ap-ProcedureCode ::= 10
+id-downlinkNASTransport				S1ap-ProcedureCode ::= 11
+id-initialUEMessage					S1ap-ProcedureCode ::= 12
+id-uplinkNASTransport				S1ap-ProcedureCode ::= 13
+id-Reset							S1ap-ProcedureCode::= 14
+id-ErrorIndication					S1ap-ProcedureCode ::= 15
+id-NASNonDeliveryIndication			S1ap-ProcedureCode ::= 16
+id-S1Setup							S1ap-ProcedureCode ::= 17
+id-UEContextReleaseRequest			S1ap-ProcedureCode ::= 18
+id-DownlinkS1cdma2000tunneling		S1ap-ProcedureCode ::= 19
+id-UplinkS1cdma2000tunneling		S1ap-ProcedureCode ::= 20
+id-UEContextModification			S1ap-ProcedureCode ::= 21
+id-UECapabilityInfoIndication		S1ap-ProcedureCode ::= 22
+id-UEContextRelease					S1ap-ProcedureCode ::= 23
+id-eNBStatusTransfer				S1ap-ProcedureCode ::= 24
+id-MMEStatusTransfer				S1ap-ProcedureCode ::= 25
+id-DeactivateTrace					S1ap-ProcedureCode ::= 26
+id-TraceStart						S1ap-ProcedureCode ::= 27
+id-TraceFailureIndication			S1ap-ProcedureCode ::= 28
+id-ENBConfigurationUpdate			S1ap-ProcedureCode ::= 29
+id-MMEConfigurationUpdate			S1ap-ProcedureCode ::= 30
+id-LocationReportingControl			S1ap-ProcedureCode ::= 31
+id-LocationReportingFailureIndication	S1ap-ProcedureCode ::= 32
+id-LocationReport					S1ap-ProcedureCode ::= 33
+id-OverloadStart					S1ap-ProcedureCode ::= 34
+id-OverloadStop						S1ap-ProcedureCode ::= 35
+id-WriteReplaceWarning				S1ap-ProcedureCode ::= 36
+id-eNBDirectInformationTransfer		S1ap-ProcedureCode ::= 37
+id-MMEDirectInformationTransfer		S1ap-ProcedureCode ::= 38
+id-PrivateMessage					S1ap-ProcedureCode ::= 39
+id-eNBConfigurationTransfer			S1ap-ProcedureCode ::= 40
+id-MMEConfigurationTransfer			S1ap-ProcedureCode ::= 41
+id-CellTrafficTrace					S1ap-ProcedureCode ::= 42
+id-Kill								S1ap-ProcedureCode ::= 43
+id-downlinkUEAssociatedLPPaTransport	S1ap-ProcedureCode ::= 44
+id-uplinkUEAssociatedLPPaTransport		S1ap-ProcedureCode ::= 45
+id-downlinkNonUEAssociatedLPPaTransport	S1ap-ProcedureCode ::= 46
+id-uplinkNonUEAssociatedLPPaTransport	S1ap-ProcedureCode ::= 47
 
 -- **************************************************************
 --
@@ -86,41 +86,41 @@ id-uplinkNonUEAssociatedLPPaTransport	ProcedureCode ::= 47
 --
 -- **************************************************************
 
-maxPrivateIEs 						INTEGER ::= 65535
-maxProtocolExtensions 				INTEGER ::= 65535
-maxProtocolIEs						INTEGER ::= 65535
+s1ap-maxPrivateIEs 						INTEGER ::= 65535
+s1ap-maxProtocolExtensions 				INTEGER ::= 65535
+s1ap-maxProtocolIEs						INTEGER ::= 65535
 -- **************************************************************
 --
 -- Lists
 --
 -- **************************************************************
 
-maxNrOfCSGs								INTEGER ::= 256
-maxNrOfE-RABs							INTEGER ::= 256
-maxnoofTAIs								INTEGER ::= 256
-maxnoofTACs								INTEGER ::= 256
-maxNrOfErrors							INTEGER ::= 256
-maxnoofBPLMNs							INTEGER ::= 6
-maxnoofPLMNsPerMME						INTEGER ::= 32
-maxnoofEPLMNs							INTEGER ::= 15
-maxnoofEPLMNsPlusOne					INTEGER ::= 16
-maxnoofForbLACs							INTEGER ::= 4096
-maxnoofForbTACs							INTEGER ::= 4096
-maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
-maxnoofCells							INTEGER ::= 16
-maxnoofTAIforWarning					INTEGER ::= 65535 
-maxnoofCellID							INTEGER ::= 65535 
-maxnoofEmergencyAreaID					INTEGER ::= 65535 
-maxnoofCellinTAI						INTEGER ::= 65535 
-maxnoofCellinEAI						INTEGER ::= 65535 
-maxnoofeNBX2TLAs						INTEGER ::= 2
-maxnoofeNBX2ExtTLAs						INTEGER ::= 16
-maxnoofeNBX2GTPTLAs						INTEGER ::= 16
-maxnoofRATs								INTEGER ::= 8
-maxnoofGroupIDs							INTEGER ::= 65535
-maxnoofMMECs							INTEGER ::= 256
-maxnoofCellIDforMDT						INTEGER ::= 32
-maxnoofTAforMDT							INTEGER ::= 8
+s1ap-maxNrOfCSGs								INTEGER ::= 256
+s1ap-maxNrOfE-RABs							INTEGER ::= 256
+s1ap-maxnoofTAIs								INTEGER ::= 256
+s1ap-maxnoofTACs								INTEGER ::= 256
+s1ap-maxNrOfErrors							INTEGER ::= 256
+s1ap-maxnoofBPLMNs							INTEGER ::= 6
+s1ap-maxnoofPLMNsPerMME						INTEGER ::= 32
+s1ap-maxnoofEPLMNs							INTEGER ::= 15
+s1ap-maxnoofEPLMNsPlusOne					INTEGER ::= 16
+s1ap-maxnoofForbLACs							INTEGER ::= 4096
+s1ap-maxnoofForbTACs							INTEGER ::= 4096
+s1ap-maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
+s1ap-maxnoofCells							INTEGER ::= 16
+s1ap-maxnoofTAIforWarning					INTEGER ::= 65535
+s1ap-maxnoofCellID							INTEGER ::= 65535
+s1ap-maxnoofEmergencyAreaID					INTEGER ::= 65535
+s1ap-maxnoofCellinTAI						INTEGER ::= 65535
+s1ap-maxnoofCellinEAI						INTEGER ::= 65535
+s1ap-maxnoofeNBX2TLAs						INTEGER ::= 2
+s1ap-maxnoofeNBX2ExtTLAs						INTEGER ::= 16
+s1ap-maxnoofeNBX2GTPTLAs						INTEGER ::= 16
+s1ap-maxnoofRATs								INTEGER ::= 8
+s1ap-maxnoofGroupIDs							INTEGER ::= 65535
+s1ap-maxnoofMMECs							INTEGER ::= 256
+s1ap-maxnoofCellIDforMDT						INTEGER ::= 32
+s1ap-maxnoofTAforMDT							INTEGER ::= 8
 
 
 -- **************************************************************
@@ -129,155 +129,155 @@ maxnoofTAforMDT							INTEGER ::= 8
 --
 -- **************************************************************
 
-id-MME-UE-S1AP-ID							ProtocolIE-ID ::= 0
-id-HandoverType								ProtocolIE-ID ::= 1
-id-Cause									ProtocolIE-ID ::= 2
-id-SourceID									ProtocolIE-ID ::= 3
-id-TargetID									ProtocolIE-ID ::= 4
-id-eNB-UE-S1AP-ID							ProtocolIE-ID ::= 8
-id-E-RABSubjecttoDataForwardingList			ProtocolIE-ID ::= 12
-id-E-RABtoReleaseListHOCmd					ProtocolIE-ID ::= 13
-id-E-RABDataForwardingItem					ProtocolIE-ID ::= 14
-id-E-RABReleaseItemBearerRelComp			ProtocolIE-ID ::= 15
-id-E-RABToBeSetupListBearerSUReq			ProtocolIE-ID ::= 16
-id-E-RABToBeSetupItemBearerSUReq			ProtocolIE-ID ::= 17
-id-E-RABAdmittedList						ProtocolIE-ID ::= 18
-id-E-RABFailedToSetupListHOReqAck			ProtocolIE-ID ::= 19
-id-E-RABAdmittedItem						ProtocolIE-ID ::= 20
-id-E-RABFailedtoSetupItemHOReqAck			ProtocolIE-ID ::= 21
-id-E-RABToBeSwitchedDLList					ProtocolIE-ID ::= 22
-id-E-RABToBeSwitchedDLItem					ProtocolIE-ID ::= 23
-id-E-RABToBeSetupListCtxtSUReq				ProtocolIE-ID ::= 24
-id-TraceActivation							ProtocolIE-ID ::= 25
-id-NAS-PDU									ProtocolIE-ID ::= 26
-id-E-RABToBeSetupItemHOReq					ProtocolIE-ID ::= 27
-id-E-RABSetupListBearerSURes				ProtocolIE-ID ::= 28
-id-E-RABFailedToSetupListBearerSURes		ProtocolIE-ID ::= 29
-id-E-RABToBeModifiedListBearerModReq		ProtocolIE-ID ::= 30
-id-E-RABModifyListBearerModRes				ProtocolIE-ID ::= 31
-id-E-RABFailedToModifyList					ProtocolIE-ID ::= 32
-id-E-RABToBeReleasedList					ProtocolIE-ID ::= 33
-id-E-RABFailedToReleaseList					ProtocolIE-ID ::= 34
-id-E-RABItem								ProtocolIE-ID ::= 35
-id-E-RABToBeModifiedItemBearerModReq		ProtocolIE-ID ::= 36
-id-E-RABModifyItemBearerModRes				ProtocolIE-ID ::= 37
-id-E-RABReleaseItem							ProtocolIE-ID ::= 38
-id-E-RABSetupItemBearerSURes				ProtocolIE-ID ::= 39
-id-SecurityContext							ProtocolIE-ID ::= 40
-id-HandoverRestrictionList					ProtocolIE-ID ::= 41
-id-UEPagingID 								ProtocolIE-ID ::= 43
-id-pagingDRX 								ProtocolIE-ID ::= 44
-id-TAIList									ProtocolIE-ID ::= 46
-id-TAIItem									ProtocolIE-ID ::= 47
-id-E-RABFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
-id-E-RABReleaseItemHOCmd					ProtocolIE-ID ::= 49
-id-E-RABSetupItemCtxtSURes					ProtocolIE-ID ::= 50
-id-E-RABSetupListCtxtSURes					ProtocolIE-ID ::= 51
-id-E-RABToBeSetupItemCtxtSUReq				ProtocolIE-ID ::= 52
-id-E-RABToBeSetupListHOReq					ProtocolIE-ID ::= 53
-id-GERANtoLTEHOInformationRes					ProtocolIE-ID ::= 55
-id-UTRANtoLTEHOInformationRes					ProtocolIE-ID ::= 57
-id-CriticalityDiagnostics 						ProtocolIE-ID ::= 58
-id-Global-ENB-ID								ProtocolIE-ID ::= 59
-id-eNBname										ProtocolIE-ID ::= 60
-id-MMEname										ProtocolIE-ID ::= 61
-id-ServedPLMNs									ProtocolIE-ID ::= 63
-id-SupportedTAs									ProtocolIE-ID ::= 64
-id-TimeToWait									ProtocolIE-ID ::= 65
-id-uEaggregateMaximumBitrate					ProtocolIE-ID ::= 66
-id-TAI											ProtocolIE-ID ::= 67
-id-E-RABReleaseListBearerRelComp				ProtocolIE-ID ::= 69
-id-cdma2000PDU									ProtocolIE-ID ::= 70
-id-cdma2000RATType								ProtocolIE-ID ::= 71
-id-cdma2000SectorID								ProtocolIE-ID ::= 72
-id-SecurityKey									ProtocolIE-ID ::= 73
-id-UERadioCapability							ProtocolIE-ID ::= 74
-id-GUMMEI-ID									ProtocolIE-ID ::= 75
-id-E-RABInformationListItem						ProtocolIE-ID ::= 78
-id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
-id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
-id-cdma2000HOStatus								ProtocolIE-ID ::= 83
-id-cdma2000HORequiredIndication					ProtocolIE-ID ::= 84
-id-E-UTRAN-Trace-ID								ProtocolIE-ID ::= 86
-id-RelativeMMECapacity							ProtocolIE-ID ::= 87
-id-SourceMME-UE-S1AP-ID							ProtocolIE-ID ::= 88
-id-Bearers-SubjectToStatusTransfer-Item			ProtocolIE-ID ::= 89
-id-eNB-StatusTransfer-TransparentContainer		ProtocolIE-ID ::= 90
-id-UE-associatedLogicalS1-ConnectionItem		ProtocolIE-ID ::= 91
-id-ResetType									ProtocolIE-ID ::= 92
-id-UE-associatedLogicalS1-ConnectionListResAck	ProtocolIE-ID ::= 93
-id-E-RABToBeSwitchedULItem						ProtocolIE-ID ::= 94
-id-E-RABToBeSwitchedULList						ProtocolIE-ID ::= 95
-id-S-TMSI										ProtocolIE-ID ::= 96
-id-cdma2000OneXRAND								ProtocolIE-ID ::= 97
-id-RequestType									ProtocolIE-ID ::= 98
-id-UE-S1AP-IDs									ProtocolIE-ID ::= 99
-id-EUTRAN-CGI									ProtocolIE-ID ::= 100
-id-OverloadResponse								ProtocolIE-ID ::= 101
-id-cdma2000OneXSRVCCInfo						ProtocolIE-ID ::= 102
-id-E-RABFailedToBeReleasedList					ProtocolIE-ID ::= 103
-id-Source-ToTarget-TransparentContainer			ProtocolIE-ID ::= 104
-id-ServedGUMMEIs								ProtocolIE-ID ::= 105
-id-SubscriberProfileIDforRFP					ProtocolIE-ID ::= 106
-id-UESecurityCapabilities						ProtocolIE-ID ::= 107
-id-CSFallbackIndicator							ProtocolIE-ID ::= 108
-id-CNDomain										ProtocolIE-ID ::= 109
-id-E-RABReleasedList							ProtocolIE-ID ::= 110
-id-MessageIdentifier							ProtocolIE-ID ::= 111
-id-SerialNumber									ProtocolIE-ID ::= 112
-id-WarningAreaList								ProtocolIE-ID ::= 113
-id-RepetitionPeriod								ProtocolIE-ID ::= 114
-id-NumberofBroadcastRequest						ProtocolIE-ID ::= 115
-id-WarningType									ProtocolIE-ID ::= 116
-id-WarningSecurityInfo							ProtocolIE-ID ::= 117
-id-DataCodingScheme								ProtocolIE-ID ::= 118
-id-WarningMessageContents						ProtocolIE-ID ::= 119
-id-BroadcastCompletedAreaList					ProtocolIE-ID ::= 120
-id-Inter-SystemInformationTransferTypeEDT		ProtocolIE-ID ::= 121
-id-Inter-SystemInformationTransferTypeMDT		ProtocolIE-ID ::= 122
-id-Target-ToSource-TransparentContainer			ProtocolIE-ID ::= 123
-id-SRVCCOperationPossible						ProtocolIE-ID ::= 124
-id-SRVCCHOIndication							ProtocolIE-ID ::= 125
-id-NAS-DownlinkCount							ProtocolIE-ID ::= 126
-id-CSG-Id										ProtocolIE-ID ::= 127
-id-CSG-IdList									ProtocolIE-ID ::= 128
-id-SONConfigurationTransferECT					ProtocolIE-ID ::= 129
-id-SONConfigurationTransferMCT					ProtocolIE-ID ::= 130
-id-TraceCollectionEntityIPAddress				ProtocolIE-ID ::= 131
-id-MSClassmark2									ProtocolIE-ID ::= 132
-id-MSClassmark3									ProtocolIE-ID ::= 133
-id-RRC-Establishment-Cause						ProtocolIE-ID ::= 134
-id-NASSecurityParametersfromE-UTRAN				ProtocolIE-ID ::= 135
-id-NASSecurityParameterstoE-UTRAN				ProtocolIE-ID ::= 136
-id-DefaultPagingDRX								ProtocolIE-ID ::= 137
-id-Source-ToTarget-TransparentContainer-Secondary	ProtocolIE-ID ::= 138
-id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID ::= 139
-id-EUTRANRoundTripDelayEstimationInfo			ProtocolIE-ID ::= 140
-id-BroadcastCancelledAreaList					ProtocolIE-ID ::= 141
-id-ConcurrentWarningMessageIndicator			ProtocolIE-ID ::= 142
-id-Data-Forwarding-Not-Possible					ProtocolIE-ID ::= 143
-id-ExtendedRepetitionPeriod						ProtocolIE-ID ::= 144
-id-CellAccessMode								ProtocolIE-ID ::= 145
-id-CSGMembershipStatus 							ProtocolIE-ID ::= 146
-id-LPPa-PDU										ProtocolIE-ID ::= 147
-id-Routing-ID									ProtocolIE-ID ::= 148
-id-Time-Synchronization-Info					ProtocolIE-ID ::= 149
-id-PS-ServiceNotAvailable						ProtocolIE-ID ::= 150
-id-PagingPriority								ProtocolIE-ID ::= 151
-id-x2TNLConfigurationInfo						ProtocolIE-ID ::= 152
-id-eNBX2ExtendedTransportLayerAddresses			ProtocolIE-ID ::= 153
-id-GUMMEIList									ProtocolIE-ID ::= 154
-id-GW-TransportLayerAddress						ProtocolIE-ID ::= 155
-id-Correlation-ID								ProtocolIE-ID ::= 156
-id-SourceMME-GUMMEI								ProtocolIE-ID ::= 157
-id-MME-UE-S1AP-ID-2								ProtocolIE-ID ::= 158
-id-RegisteredLAI								ProtocolIE-ID ::= 159
-id-RelayNode-Indicator							ProtocolIE-ID ::= 160
-id-TrafficLoadReductionIndication				ProtocolIE-ID ::= 161
-id-MDTConfiguration								ProtocolIE-ID ::= 162
-id-MMERelaySupportIndicator						ProtocolIE-ID ::= 163
-id-GWContextReleaseIndication					ProtocolIE-ID ::= 164
-id-ManagementBasedMDTAllowed					ProtocolIE-ID ::= 165
-id-PrivacyIndicator								ProtocolIE-ID ::= 166
+id-MME-UE-S1AP-ID							S1ap-ProtocolIE-ID ::= 0
+id-HandoverType								S1ap-ProtocolIE-ID ::= 1
+id-Cause									S1ap-ProtocolIE-ID ::= 2
+id-SourceID									S1ap-ProtocolIE-ID ::= 3
+id-TargetID									S1ap-ProtocolIE-ID ::= 4
+id-eNB-UE-S1AP-ID							S1ap-ProtocolIE-ID ::= 8
+id-E-RABSubjecttoDataForwardingList			S1ap-ProtocolIE-ID ::= 12
+id-E-RABtoReleaseListHOCmd					S1ap-ProtocolIE-ID ::= 13
+id-E-RABDataForwardingItem					S1ap-ProtocolIE-ID ::= 14
+id-E-RABReleaseItemBearerRelComp			S1ap-ProtocolIE-ID ::= 15
+id-E-RABToBeSetupListBearerSUReq			S1ap-ProtocolIE-ID ::= 16
+id-E-RABToBeSetupItemBearerSUReq			S1ap-ProtocolIE-ID ::= 17
+id-E-RABAdmittedList						S1ap-ProtocolIE-ID ::= 18
+id-E-RABFailedToSetupListHOReqAck			S1ap-ProtocolIE-ID ::= 19
+id-E-RABAdmittedItem						S1ap-ProtocolIE-ID ::= 20
+id-E-RABFailedtoSetupItemHOReqAck			S1ap-ProtocolIE-ID ::= 21
+id-E-RABToBeSwitchedDLList					S1ap-ProtocolIE-ID ::= 22
+id-E-RABToBeSwitchedDLItem					S1ap-ProtocolIE-ID ::= 23
+id-E-RABToBeSetupListCtxtSUReq				S1ap-ProtocolIE-ID ::= 24
+id-TraceActivation							S1ap-ProtocolIE-ID ::= 25
+id-NAS-PDU									S1ap-ProtocolIE-ID ::= 26
+id-E-RABToBeSetupItemHOReq					S1ap-ProtocolIE-ID ::= 27
+id-E-RABSetupListBearerSURes				S1ap-ProtocolIE-ID ::= 28
+id-E-RABFailedToSetupListBearerSURes		S1ap-ProtocolIE-ID ::= 29
+id-E-RABToBeModifiedListBearerModReq		S1ap-ProtocolIE-ID ::= 30
+id-E-RABModifyListBearerModRes				S1ap-ProtocolIE-ID ::= 31
+id-E-RABFailedToModifyList					S1ap-ProtocolIE-ID ::= 32
+id-E-RABToBeReleasedList					S1ap-ProtocolIE-ID ::= 33
+id-E-RABFailedToReleaseList					S1ap-ProtocolIE-ID ::= 34
+id-E-RABItem								S1ap-ProtocolIE-ID ::= 35
+id-E-RABToBeModifiedItemBearerModReq		S1ap-ProtocolIE-ID ::= 36
+id-E-RABModifyItemBearerModRes				S1ap-ProtocolIE-ID ::= 37
+id-E-RABReleaseItem							S1ap-ProtocolIE-ID ::= 38
+id-E-RABSetupItemBearerSURes				S1ap-ProtocolIE-ID ::= 39
+id-SecurityContext							S1ap-ProtocolIE-ID ::= 40
+id-HandoverRestrictionList					S1ap-ProtocolIE-ID ::= 41
+id-UEPagingID 								S1ap-ProtocolIE-ID ::= 43
+id-pagingDRX 								S1ap-ProtocolIE-ID ::= 44
+id-TAIList									S1ap-ProtocolIE-ID ::= 46
+id-TAIItem									S1ap-ProtocolIE-ID ::= 47
+id-E-RABFailedToSetupListCtxtSURes			S1ap-ProtocolIE-ID ::= 48
+id-E-RABReleaseItemHOCmd					S1ap-ProtocolIE-ID ::= 49
+id-E-RABSetupItemCtxtSURes					S1ap-ProtocolIE-ID ::= 50
+id-E-RABSetupListCtxtSURes					S1ap-ProtocolIE-ID ::= 51
+id-E-RABToBeSetupItemCtxtSUReq				S1ap-ProtocolIE-ID ::= 52
+id-E-RABToBeSetupListHOReq					S1ap-ProtocolIE-ID ::= 53
+id-GERANtoLTEHOInformationRes					S1ap-ProtocolIE-ID ::= 55
+id-UTRANtoLTEHOInformationRes					S1ap-ProtocolIE-ID ::= 57
+id-CriticalityDiagnostics 						S1ap-ProtocolIE-ID ::= 58
+id-Global-ENB-ID								S1ap-ProtocolIE-ID ::= 59
+id-eNBname										S1ap-ProtocolIE-ID ::= 60
+id-MMEname										S1ap-ProtocolIE-ID ::= 61
+id-ServedPLMNs									S1ap-ProtocolIE-ID ::= 63
+id-SupportedTAs									S1ap-ProtocolIE-ID ::= 64
+id-TimeToWait									S1ap-ProtocolIE-ID ::= 65
+id-uEaggregateMaximumBitrate					S1ap-ProtocolIE-ID ::= 66
+id-TAI											S1ap-ProtocolIE-ID ::= 67
+id-E-RABReleaseListBearerRelComp				S1ap-ProtocolIE-ID ::= 69
+id-cdma2000PDU									S1ap-ProtocolIE-ID ::= 70
+id-cdma2000RATType								S1ap-ProtocolIE-ID ::= 71
+id-cdma2000SectorID								S1ap-ProtocolIE-ID ::= 72
+id-SecurityKey									S1ap-ProtocolIE-ID ::= 73
+id-UERadioCapability							S1ap-ProtocolIE-ID ::= 74
+id-GUMMEI-ID									S1ap-ProtocolIE-ID ::= 75
+id-E-RABInformationListItem						S1ap-ProtocolIE-ID ::= 78
+id-Direct-Forwarding-Path-Availability			S1ap-ProtocolIE-ID ::= 79
+id-UEIdentityIndexValue							S1ap-ProtocolIE-ID ::= 80
+id-cdma2000HOStatus								S1ap-ProtocolIE-ID ::= 83
+id-cdma2000HORequiredIndication					S1ap-ProtocolIE-ID ::= 84
+id-E-UTRAN-Trace-ID								S1ap-ProtocolIE-ID ::= 86
+id-RelativeMMECapacity							S1ap-ProtocolIE-ID ::= 87
+id-SourceMME-UE-S1AP-ID							S1ap-ProtocolIE-ID ::= 88
+id-Bearers-SubjectToStatusTransfer-Item			S1ap-ProtocolIE-ID ::= 89
+id-eNB-StatusTransfer-TransparentContainer		S1ap-ProtocolIE-ID ::= 90
+id-UE-associatedLogicalS1-ConnectionItem		S1ap-ProtocolIE-ID ::= 91
+id-ResetType									S1ap-ProtocolIE-ID ::= 92
+id-UE-associatedLogicalS1-ConnectionListResAck	S1ap-ProtocolIE-ID ::= 93
+id-E-RABToBeSwitchedULItem						S1ap-ProtocolIE-ID ::= 94
+id-E-RABToBeSwitchedULList						S1ap-ProtocolIE-ID ::= 95
+id-S-TMSI										S1ap-ProtocolIE-ID ::= 96
+id-cdma2000OneXRAND								S1ap-ProtocolIE-ID ::= 97
+id-RequestType									S1ap-ProtocolIE-ID ::= 98
+id-UE-S1AP-IDs									S1ap-ProtocolIE-ID ::= 99
+id-EUTRAN-CGI									S1ap-ProtocolIE-ID ::= 100
+id-OverloadResponse								S1ap-ProtocolIE-ID ::= 101
+id-cdma2000OneXSRVCCInfo						S1ap-ProtocolIE-ID ::= 102
+id-E-RABFailedToBeReleasedList					S1ap-ProtocolIE-ID ::= 103
+id-Source-ToTarget-TransparentContainer			S1ap-ProtocolIE-ID ::= 104
+id-ServedGUMMEIs								S1ap-ProtocolIE-ID ::= 105
+id-SubscriberProfileIDforRFP					S1ap-ProtocolIE-ID ::= 106
+id-UESecurityCapabilities						S1ap-ProtocolIE-ID ::= 107
+id-CSFallbackIndicator							S1ap-ProtocolIE-ID ::= 108
+id-CNDomain										S1ap-ProtocolIE-ID ::= 109
+id-E-RABReleasedList							S1ap-ProtocolIE-ID ::= 110
+id-MessageIdentifier							S1ap-ProtocolIE-ID ::= 111
+id-SerialNumber									S1ap-ProtocolIE-ID ::= 112
+id-WarningAreaList								S1ap-ProtocolIE-ID ::= 113
+id-RepetitionPeriod								S1ap-ProtocolIE-ID ::= 114
+id-NumberofBroadcastRequest						S1ap-ProtocolIE-ID ::= 115
+id-WarningType									S1ap-ProtocolIE-ID ::= 116
+id-WarningSecurityInfo							S1ap-ProtocolIE-ID ::= 117
+id-DataCodingScheme								S1ap-ProtocolIE-ID ::= 118
+id-WarningMessageContents						S1ap-ProtocolIE-ID ::= 119
+id-BroadcastCompletedAreaList					S1ap-ProtocolIE-ID ::= 120
+id-Inter-SystemInformationTransferTypeEDT		S1ap-ProtocolIE-ID ::= 121
+id-Inter-SystemInformationTransferTypeMDT		S1ap-ProtocolIE-ID ::= 122
+id-Target-ToSource-TransparentContainer			S1ap-ProtocolIE-ID ::= 123
+id-SRVCCOperationPossible						S1ap-ProtocolIE-ID ::= 124
+id-SRVCCHOIndication							S1ap-ProtocolIE-ID ::= 125
+id-NAS-DownlinkCount							S1ap-ProtocolIE-ID ::= 126
+id-CSG-Id										S1ap-ProtocolIE-ID ::= 127
+id-CSG-IdList									S1ap-ProtocolIE-ID ::= 128
+id-SONConfigurationTransferECT					S1ap-ProtocolIE-ID ::= 129
+id-SONConfigurationTransferMCT					S1ap-ProtocolIE-ID ::= 130
+id-TraceCollectionEntityIPAddress				S1ap-ProtocolIE-ID ::= 131
+id-MSClassmark2									S1ap-ProtocolIE-ID ::= 132
+id-MSClassmark3									S1ap-ProtocolIE-ID ::= 133
+id-RRC-Establishment-Cause						S1ap-ProtocolIE-ID ::= 134
+id-NASSecurityParametersfromE-UTRAN				S1ap-ProtocolIE-ID ::= 135
+id-NASSecurityParameterstoE-UTRAN				S1ap-ProtocolIE-ID ::= 136
+id-DefaultPagingDRX								S1ap-ProtocolIE-ID ::= 137
+id-Source-ToTarget-TransparentContainer-Secondary	S1ap-ProtocolIE-ID ::= 138
+id-Target-ToSource-TransparentContainer-Secondary	S1ap-ProtocolIE-ID ::= 139
+id-EUTRANRoundTripDelayEstimationInfo			S1ap-ProtocolIE-ID ::= 140
+id-BroadcastCancelledAreaList					S1ap-ProtocolIE-ID ::= 141
+id-ConcurrentWarningMessageIndicator			S1ap-ProtocolIE-ID ::= 142
+id-Data-Forwarding-Not-Possible					S1ap-ProtocolIE-ID ::= 143
+id-ExtendedRepetitionPeriod						S1ap-ProtocolIE-ID ::= 144
+id-CellAccessMode								S1ap-ProtocolIE-ID ::= 145
+id-CSGMembershipStatus 							S1ap-ProtocolIE-ID ::= 146
+id-LPPa-PDU										S1ap-ProtocolIE-ID ::= 147
+id-Routing-ID									S1ap-ProtocolIE-ID ::= 148
+id-Time-Synchronization-Info					S1ap-ProtocolIE-ID ::= 149
+id-PS-ServiceNotAvailable						S1ap-ProtocolIE-ID ::= 150
+id-PagingPriority								S1ap-ProtocolIE-ID ::= 151
+id-x2TNLConfigurationInfo						S1ap-ProtocolIE-ID ::= 152
+id-eNBX2ExtendedTransportLayerAddresses			S1ap-ProtocolIE-ID ::= 153
+id-GUMMEIList									S1ap-ProtocolIE-ID ::= 154
+id-GW-TransportLayerAddress						S1ap-ProtocolIE-ID ::= 155
+id-Correlation-ID								S1ap-ProtocolIE-ID ::= 156
+id-SourceMME-GUMMEI								S1ap-ProtocolIE-ID ::= 157
+id-MME-UE-S1AP-ID-2								S1ap-ProtocolIE-ID ::= 158
+id-RegisteredLAI								S1ap-ProtocolIE-ID ::= 159
+id-RelayNode-Indicator							S1ap-ProtocolIE-ID ::= 160
+id-TrafficLoadReductionIndication				S1ap-ProtocolIE-ID ::= 161
+id-MDTConfiguration								S1ap-ProtocolIE-ID ::= 162
+id-MMERelaySupportIndicator						S1ap-ProtocolIE-ID ::= 163
+id-GWContextReleaseIndication					S1ap-ProtocolIE-ID ::= 164
+id-ManagementBasedMDTAllowed					S1ap-ProtocolIE-ID ::= 165
+id-PrivacyIndicator								S1ap-ProtocolIE-ID ::= 166
 
 END
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
index 58490bd75a77cfbdbe0bad8ad3e79e6686d147a9..b3dc098148f4f61b46840c386c26911bfcdbc532 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-Containers.asn
@@ -19,16 +19,16 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	Criticality,
-	Presence,
-	PrivateIE-ID,
-	ProtocolExtensionID,
-	ProtocolIE-ID
+    S1ap-Criticality,
+    S1ap-Presence,
+    S1ap-PrivateIE-ID,
+    S1ap-ProtocolExtensionID,
+    S1ap-ProtocolIE-ID
 FROM S1AP-CommonDataTypes
 
-	maxPrivateIEs,
-	maxProtocolExtensions,
-	maxProtocolIEs
+    s1ap-maxPrivateIEs,
+    s1ap-maxProtocolExtensions,
+    s1ap-maxProtocolIEs
 FROM S1AP-Constants;
 
 -- **************************************************************
@@ -38,10 +38,10 @@ FROM S1AP-Constants;
 -- **************************************************************
 
 S1AP-PROTOCOL-IES ::= CLASS {
-	&id				ProtocolIE-ID 					UNIQUE,
-	&criticality			Criticality,
-	&Value,
-	&presence			Presence
+    &id				S1ap-ProtocolIE-ID 					UNIQUE,
+    &criticality			S1ap-Criticality,
+    &Value,
+    &presence			S1ap-Presence
 }
 WITH SYNTAX {
 	ID				&id
@@ -57,20 +57,20 @@ WITH SYNTAX {
 -- **************************************************************
 
 S1AP-PROTOCOL-IES-PAIR ::= CLASS {
-	&id				ProtocolIE-ID 					UNIQUE,
-	&firstCriticality		Criticality,
-	&FirstValue,
-	&secondCriticality		Criticality,
-	&SecondValue,
-	&presence			Presence
+    &id				S1ap-ProtocolIE-ID 					UNIQUE,
+    &firstCriticality		S1ap-Criticality,
+    &FirstValue,
+    &secondCriticality		S1ap-Criticality,
+    &SecondValue,
+    &presence			S1ap-Presence
 }
 WITH SYNTAX {
-	ID				&id
-	FIRST CRITICALITY 		&firstCriticality
-	FIRST TYPE			&FirstValue
-	SECOND CRITICALITY 		&secondCriticality
-	SECOND TYPE			&SecondValue
-	PRESENCE			&presence
+    ID				&id
+    FIRST CRITICALITY 		&firstCriticality
+    FIRST TYPE			&FirstValue
+    SECOND CRITICALITY 		&secondCriticality
+    SECOND TYPE			&SecondValue
+    PRESENCE			&presence
 }
 
 -- **************************************************************
@@ -80,16 +80,16 @@ WITH SYNTAX {
 -- **************************************************************
 
 S1AP-PROTOCOL-EXTENSION ::= CLASS {
-	&id				ProtocolExtensionID 				UNIQUE,
-	&criticality			Criticality,
-	&Extension,
-	&presence		Presence
+    &id			S1ap-ProtocolExtensionID 				UNIQUE,
+    &criticality	S1ap-Criticality,
+    &Extension,
+    &presence		S1ap-Presence
 }
 WITH SYNTAX {
-	ID				&id
-	CRITICALITY			&criticality
-	EXTENSION			&Extension
-	PRESENCE		&presence
+    ID			&id
+    CRITICALITY		&criticality
+    EXTENSION		&Extension
+    PRESENCE		&presence
 }
 
 -- **************************************************************
@@ -99,16 +99,16 @@ WITH SYNTAX {
 -- **************************************************************
 
 S1AP-PRIVATE-IES ::= CLASS {
-	&id				PrivateIE-ID,
-	&criticality			Criticality,
-	&Value,
-	&presence		Presence
+    &id			S1ap-PrivateIE-ID,
+    &criticality	S1ap-Criticality,
+    &Value,
+    &presence		S1ap-Presence
 }
 WITH SYNTAX {
-	ID				&id
-	CRITICALITY			&criticality
-	TYPE			&Value
-	PRESENCE		&presence
+    ID			&id
+    CRITICALITY		&criticality
+    TYPE		&Value
+    PRESENCE		&presence
 }
 
 -- **************************************************************
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
index 9a7db5f5925caeee965bb6d274cff241125d72d0..4fa0160c9bb98700cce2a035e17f4d01b97f1db3 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-IEs.asn
@@ -13,775 +13,754 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-	id-E-RABInformationListItem,
-	id-E-RABItem,
-	id-Bearers-SubjectToStatusTransfer-Item, 
-	id-Time-Synchronization-Info,
-	id-x2TNLConfigurationInfo,
-	id-eNBX2ExtendedTransportLayerAddresses,
-	id-MDTConfiguration,
-	maxNrOfCSGs,
-	maxNrOfE-RABs,
-	maxNrOfErrors,
-	maxnoofBPLMNs,
-	maxnoofPLMNsPerMME,
-	maxnoofTACs,
-	maxnoofEPLMNs,
-	maxnoofEPLMNsPlusOne,
-	maxnoofForbLACs,
-	maxnoofForbTACs,
-	maxnoofCells,
-	maxnoofCellID,
-	maxnoofEmergencyAreaID,
-	maxnoofTAIforWarning,
-	maxnoofCellinTAI,
-	maxnoofCellinEAI,
-	maxnoofeNBX2TLAs,
-	maxnoofeNBX2ExtTLAs,
-	maxnoofeNBX2GTPTLAs,
-	maxnoofRATs,
-	maxnoofGroupIDs,
-	maxnoofMMECs,
-	maxnoofTAforMDT,
-	maxnoofCellIDforMDT,
-    maxProtocolExtensions,
-    maxNrOfIndividualS1ConnectionsToReset,
-    maxnoofTAIs
+    s1ap-id-E-RABInformationListItem,
+    s1ap-id-E-RABItem,
+    s1ap-id-Bearers-SubjectToStatusTransfer-Item,
+    s1ap-id-Time-Synchronization-Info,
+    s1ap-id-x2TNLConfigurationInfo,
+    s1ap-id-eNBX2ExtendedTransportLayerAddresses,
+    s1ap-id-MDTConfiguration,
+    s1ap-maxNrOfCSGs,
+    s1ap-maxNrOfE-RABs,
+    s1ap-maxNrOfErrors,
+    s1ap-maxnoofBPLMNs,
+    s1ap-maxnoofPLMNsPerMME,
+    s1ap-maxnoofTACs,
+    s1ap-maxnoofEPLMNs,
+    s1ap-maxnoofEPLMNsPlusOne,
+    s1ap-maxnoofForbLACs,
+    s1ap-maxnoofForbTACs,
+    s1ap-maxnoofCells,
+    s1ap-maxnoofCellID,
+    s1ap-maxnoofEmergencyAreaID,
+    s1ap-maxnoofTAIforWarning,
+    s1ap-maxnoofCellinTAI,
+    s1ap-maxnoofCellinEAI,
+    s1ap-maxnoofeNBX2TLAs,
+    s1ap-maxnoofeNBX2ExtTLAs,
+    s1ap-maxnoofeNBX2GTPTLAs,
+    s1ap-maxnoofRATs,
+    s1ap-maxnoofGroupIDs,
+    s1ap-maxnoofMMECs,
+    s1ap-maxnoofTAforMDT,
+    s1ap-maxnoofCellIDforMDT,
+    s1ap-maxProtocolExtensions,
+    s1ap-maxNrOfIndividualS1ConnectionsToReset,
+    s1ap-maxnoofTAIs
 
 FROM S1AP-Constants
 
-    IE
+    S1ap-IE
 FROM S1AP-PDU
 
-	Criticality,
-	ProcedureCode,
-	ProtocolIE-ID,
-	TriggeringMessage
+    S1ap-Criticality,
+    S1ap-ProcedureCode,
+    S1ap-ProtocolIE-ID,
+    S1ap-TriggeringMessage
 FROM S1AP-CommonDataTypes;
 
-IE-Extensions ::= SEQUENCE (SIZE (1..maxProtocolExtensions)) OF IE
+S1ap-IE-Extensions ::= SEQUENCE (SIZE (1..s1ap-maxProtocolExtensions)) OF S1ap-IE
 
 -- A
 
-AreaScopeOfMDT ::= CHOICE {	
-	cellBased					CellBasedMDT,
-	tABased						TABasedMDT,
-	pLMNWide					NULL,
-	...
+S1ap-AreaScopeOfMDT ::= CHOICE {
+    cellBased                    S1ap-CellBasedMDT,
+    tABased                      S1ap-TABasedMDT,
+    pLMNWide                     NULL,
+    ...
 }
 
-AllocationAndRetentionPriority ::= SEQUENCE {
-	priorityLevel				PriorityLevel,
-	pre-emptionCapability		Pre-emptionCapability,
-	pre-emptionVulnerability	Pre-emptionVulnerability,
- -- iE-Extensions               ProtocolExtensionContainer { {AllocationAndRetentionPriority-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-AllocationAndRetentionPriority ::= SEQUENCE {
+    priorityLevel                S1ap-PriorityLevel,
+    pre-emptionCapability        S1ap-Pre-emptionCapability,
+    pre-emptionVulnerability     S1ap-Pre-emptionVulnerability,
+    iE-Extensions                S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
 -- B
 
--- Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
-Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
+S1ap-Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
 
-Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
-	e-RAB-ID								E-RAB-ID,
-	uL-COUNTvalue							COUNTvalue,
-	dL-COUNTvalue							COUNTvalue,
-	receiveStatusofULPDCPSDUs				ReceiveStatusofULPDCPSDUs			OPTIONAL,
-	-- iE-Extensions                            ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
+    e-RAB-ID                                S1ap-E-RAB-ID,
+    uL-COUNTvalue                           S1ap-COUNTvalue,
+    dL-COUNTvalue                           S1ap-COUNTvalue,
+    receiveStatusofULPDCPSDUs               S1ap-ReceiveStatusofULPDCPSDUs            OPTIONAL,
+    iE-Extensions                           S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-BitRate	::= INTEGER (0..10000000000) 
+S1ap-BitRate    ::= INTEGER (0..10000000000)
 
-BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
+S1ap-BPLMNs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofBPLMNs)) OF S1ap-PLMNidentity
 
-BroadcastCancelledAreaList ::= CHOICE {
-	cellID-Cancelled				CellID-Cancelled,
-	tAI-Cancelled					TAI-Cancelled,
-	emergencyAreaID-Cancelled		EmergencyAreaID-Cancelled,
-	...
+S1ap-BroadcastCancelledAreaList ::= CHOICE {
+    cellID-Cancelled                S1ap-CellID-Cancelled,
+    tAI-Cancelled                   S1ap-TAI-Cancelled,
+    emergencyAreaID-Cancelled       S1ap-EmergencyAreaID-Cancelled,
+    ...
 }
 
-BroadcastCompletedAreaList ::= CHOICE {
-	cellID-Broadcast				CellID-Broadcast,
-	tAI-Broadcast					TAI-Broadcast,
-	emergencyAreaID-Broadcast		EmergencyAreaID-Broadcast,
-	...
+S1ap-BroadcastCompletedAreaList ::= CHOICE {
+    cellID-Broadcast                S1ap-CellID-Broadcast,
+    tAI-Broadcast                   S1ap-TAI-Broadcast,
+    emergencyAreaID-Broadcast       S1ap-EmergencyAreaID-Broadcast,
+    ...
 }
 
 
 -- C
 
-CancelledCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CancelledCellinEAI-Item
-
-CancelledCellinEAI-Item ::= SEQUENCE {
-	eCGI					EUTRAN-CGI,
-	numberOfBroadcasts		NumberOfBroadcasts,
- -- iE-Extensions           ProtocolExtensionContainer { {CancelledCellinEAI-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
-}
-
-CancelledCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CancelledCellinTAI-Item
-
-CancelledCellinTAI-Item ::= SEQUENCE{
-	eCGI				EUTRAN-CGI,
-	numberOfBroadcasts	NumberOfBroadcasts,
- -- iE-Extensions       ProtocolExtensionContainer { {CancelledCellinTAI-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
-}
-
-Cause ::= CHOICE {
-	radioNetwork		CauseRadioNetwork,
-	transport			CauseTransport,
-	nas					CauseNas,
-	protocol			CauseProtocol,
-	misc				CauseMisc,
-	...
-}
-
-CauseMisc ::= ENUMERATED {
-	control-processing-overload,
-	not-enough-user-plane-processing-resources,
-	hardware-failure,
-	om-intervention,
-	unspecified,
-	unknown-PLMN,
-    ...
-}
-
-CauseProtocol ::= ENUMERATED {
-	transfer-syntax-error,
-	abstract-syntax-error-reject,
-	abstract-syntax-error-ignore-and-notify,
-	message-not-compatible-with-receiver-state,
-	semantic-error,
-	abstract-syntax-error-falsely-constructed-message,
-	unspecified,
-	...
-}
-
-CauseRadioNetwork ::= ENUMERATED {
-	unspecified,
-	tx2relocoverall-expiry,
-	successful-handover,
-	release-due-to-eutran-generated-reason,
-	handover-cancelled,	
-	partial-handover,	
-	ho-failure-in-target-EPC-eNB-or-target-system,
-	ho-target-not-allowed,
-	tS1relocoverall-expiry,
-	tS1relocprep-expiry,
-	cell-not-available,
-	unknown-targetID,
-	no-radio-resources-available-in-target-cell,
-	unknown-mme-ue-s1ap-id,
-	unknown-enb-ue-s1ap-id,
-	unknown-pair-ue-s1ap-id,
-	handover-desirable-for-radio-reason,
-	time-critical-handover,
-	resource-optimisation-handover,
-	reduce-load-in-serving-cell,
-	user-inactivity,
-	radio-connection-with-ue-lost,
-	load-balancing-tau-required,
-	cs-fallback-triggered,
-	ue-not-available-for-ps-service,
-	radio-resources-not-available,
-	failure-in-radio-interface-procedure,
-	invalid-qos-combination,
-	interrat-redirection,
-	interaction-with-other-procedure,
-	unknown-E-RAB-ID,
-	multiple-E-RAB-ID-instances,
-	encryption-and-or-integrity-protection-algorithms-not-supported,
-	s1-intra-system-handover-triggered,
-	s1-inter-system-handover-triggered,
-	x2-handover-triggered,
-	...,
-	redirection-towards-1xRTT,
-	not-supported-QCI-value,
-	invalid-CSG-Id
+S1ap-CancelledCellinEAI ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellinEAI)) OF S1ap-CancelledCellinEAI-Item
 
+S1ap-CancelledCellinEAI-Item ::= SEQUENCE {
+    eCGI                    S1ap-EUTRAN-CGI,
+    numberOfBroadcasts      S1ap-NumberOfBroadcasts,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CauseTransport ::= ENUMERATED {
-	transport-resource-unavailable,
-	unspecified,
-	...
-}
+S1ap-CancelledCellinTAI ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellinTAI)) OF S1ap-CancelledCellinTAI-Item
 
-CauseNas ::= ENUMERATED {
-	normal-release,
-	authentication-failure,
-	detach,
-	unspecified,
-	...,
-	csg-subscription-expiry
+S1ap-CancelledCellinTAI-Item ::= SEQUENCE{
+    eCGI                S1ap-EUTRAN-CGI,
+    numberOfBroadcasts  S1ap-NumberOfBroadcasts,
+    iE-Extensions       S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CellAccessMode ::= ENUMERATED {
-	hybrid, 
-	...
+S1ap-Cause ::= CHOICE {
+    radioNetwork        S1ap-CauseRadioNetwork,
+    transport           S1ap-CauseTransport,
+    nas                 S1ap-CauseNas,
+    protocol            S1ap-CauseProtocol,
+    misc                S1ap-CauseMisc,
+    ...
 }
 
-CellIdentity			::= BIT STRING (SIZE (28))
+S1ap-CauseMisc ::= ENUMERATED {
+    control-processing-overload,
+    not-enough-user-plane-processing-resources,
+    hardware-failure,
+    om-intervention,
+    unspecified,
+    unknown-PLMN,
+    ...
+}
 
-CellID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Broadcast-Item
+S1ap-CauseProtocol ::= ENUMERATED {
+    transfer-syntax-error,
+    abstract-syntax-error-reject,
+    abstract-syntax-error-ignore-and-notify,
+    message-not-compatible-with-receiver-state,
+    semantic-error,
+    abstract-syntax-error-falsely-constructed-message,
+    unspecified,
+    ...
+}
 
-CellID-Broadcast-Item ::= SEQUENCE {
-	eCGI				EUTRAN-CGI,
- -- iE-Extensions       ProtocolExtensionContainer { {CellID-Broadcast-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CauseRadioNetwork ::= ENUMERATED {
+    unspecified,
+    tx2relocoverall-expiry,
+    successful-handover,
+    release-due-to-eutran-generated-reason,
+    handover-cancelled,
+    partial-handover,
+    ho-failure-in-target-EPC-eNB-or-target-system,
+    ho-target-not-allowed,
+    tS1relocoverall-expiry,
+    tS1relocprep-expiry,
+    cell-not-available,
+    unknown-targetID,
+    no-radio-resources-available-in-target-cell,
+    unknown-mme-ue-s1ap-id,
+    unknown-enb-ue-s1ap-id,
+    unknown-pair-ue-s1ap-id,
+    handover-desirable-for-radio-reason,
+    time-critical-handover,
+    resource-optimisation-handover,
+    reduce-load-in-serving-cell,
+    user-inactivity,
+    radio-connection-with-ue-lost,
+    load-balancing-tau-required,
+    cs-fallback-triggered,
+    ue-not-available-for-ps-service,
+    radio-resources-not-available,
+    failure-in-radio-interface-procedure,
+    invals1ap-id-qos-combination,
+    interrat-redirection,
+    interaction-with-other-procedure,
+    unknown-E-RAB-ID,
+    multiple-E-RAB-ID-instances,
+    encryption-and-or-integrity-protection-algorithms-not-supported,
+    s1-intra-system-handover-triggered,
+    s1-inter-system-handover-triggered,
+    x2-handover-triggered,
+    ...,
+    redirection-towards-1xRTT,
+    not-supported-QCI-value,
+    invals1ap-id-CSG-Id
+
+}
+
+S1ap-CauseTransport ::= ENUMERATED {
+    transport-resource-unavailable,
+    unspecified,
+    ...
 }
 
-CellID-Cancelled::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Cancelled-Item
+S1ap-CauseNas ::= ENUMERATED {
+    normal-release,
+    authentication-failure,
+    detach,
+    unspecified,
+    ...,
+    csg-subscription-expiry
+}
 
-CellID-Cancelled-Item ::= SEQUENCE {
-	eCGI				EUTRAN-CGI,
-	numberOfBroadcasts	NumberOfBroadcasts,
- -- iE-Extensions       ProtocolExtensionContainer { {CellID-Cancelled-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CellAccessMode ::= ENUMERATED {
+    hybrid,
+    ...
 }
 
-CellBasedMDT::= SEQUENCE {
-	cellIdListforMDT	CellIdListforMDT,
- -- iE-Extensions       ProtocolExtensionContainer { {CellBasedMDT-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CellIdentity            ::= BIT STRING (SIZE (28))
+
+S1ap-CellID-Broadcast ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellID)) OF S1ap-CellID-Broadcast-Item
+
+S1ap-CellID-Broadcast-Item ::= SEQUENCE {
+    eCGI                S1ap-EUTRAN-CGI,
+    iE-Extensions       S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CellIdListforMDT ::= SEQUENCE (SIZE(1..maxnoofCellIDforMDT)) OF EUTRAN-CGI
+S1ap-CellID-Cancelled::= SEQUENCE (SIZE(1..s1ap-maxnoofCellID)) OF S1ap-CellID-Cancelled-Item
 
-Cdma2000PDU	::= OCTET STRING
+S1ap-CellID-Cancelled-Item ::= SEQUENCE {
+    eCGI                S1ap-EUTRAN-CGI,
+    numberOfBroadcasts  S1ap-NumberOfBroadcasts,
+    iE-Extensions       S1ap-IE-Extensions OPTIONAL,
+    ...
+}
 
-Cdma2000RATType ::= ENUMERATED {
-	hRPD,
-	onexRTT,
-	...
+S1ap-CellBasedMDT::= SEQUENCE {
+    cellIdListforMDT    S1ap-CellIdListforMDT,
+    iE-Extensions       S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-Cdma2000SectorID ::= OCTET STRING
+S1ap-CellIdListforMDT ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellIDforMDT)) OF S1ap-EUTRAN-CGI
 
-Cdma2000HOStatus ::= ENUMERATED {
-	hOSuccess,
-	hOFailure,
-	...
+S1ap-Cdma2000PDU    ::= OCTET STRING
+
+S1ap-Cdma2000RATType ::= ENUMERATED {
+    hRPD,
+    onexRTT,
+    ...
 }
 
-Cdma2000HORequiredIndication ::= ENUMERATED {
-	true,
-	...
+S1ap-Cdma2000SectorID ::= OCTET STRING
+
+S1ap-Cdma2000HOStatus ::= ENUMERATED {
+    hOSuccess,
+    hOFailure,
+    ...
 }
 
-Cdma2000OneXSRVCCInfo ::= SEQUENCE {
-	cdma2000OneXMEID			Cdma2000OneXMEID,
-	cdma2000OneXMSI				Cdma2000OneXMSI,
-	cdma2000OneXPilot			Cdma2000OneXPilot,
- -- iE-Extensions               ProtocolExtensionContainer { {Cdma2000OneXSRVCCInfo-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-Cdma2000HORequiredIndication ::= ENUMERATED {
+    true,
+    ...
 }
 
-Cdma2000OneXMEID ::= OCTET STRING
+S1ap-Cdma2000OneXSRVCCInfo ::= SEQUENCE {
+    cdma2000OneXMEID            S1ap-Cdma2000OneXMEID,
+    cdma2000OneXMSI             S1ap-Cdma2000OneXMSI,
+    cdma2000OneXPilot           S1ap-Cdma2000OneXPilot,
+    iE-Extensions               S1ap-IE-Extensions OPTIONAL,
+    ...
+}
 
-Cdma2000OneXMSI ::= OCTET STRING
+S1ap-Cdma2000OneXMEID ::= OCTET STRING
 
-Cdma2000OneXPilot ::= OCTET STRING
+S1ap-Cdma2000OneXMSI ::= OCTET STRING
 
-Cdma2000OneXRAND ::= OCTET STRING
+S1ap-Cdma2000OneXPilot ::= OCTET STRING
 
+S1ap-Cdma2000OneXRAND ::= OCTET STRING
 
-Cell-Size ::= ENUMERATED {verysmall, small, medium, large, ...}
+S1ap-Cell-Size ::= ENUMERATED {verysmall, small, medium, large, ...}
 
-CellType ::= SEQUENCE {
-	cell-Size				Cell-Size,
- -- iE-Extensions           ProtocolExtensionContainer { { CellType-ExtIEs}}    OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CellType ::= SEQUENCE {
+    cell-Size               S1ap-Cell-Size,
+    iE-Extensions           S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CGI ::= SEQUENCE {
-	pLMNidentity				PLMNidentity,
-	lAC				LAC,
-	cI				CI,
-	rAC				RAC						OPTIONAL,
- -- iE-Extensions   ProtocolExtensionContainer { {CGI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
-	}
+S1ap-CGI ::= SEQUENCE {
+    pLMNidentity        S1ap-PLMNidentity,
+    lAC                 S1ap-LAC,
+    cI                  S1ap-CI,
+    rAC                 S1ap-RAC           OPTIONAL,
+    iE-Extensions       S1ap-IE-Extensions OPTIONAL,
+    ...
+}
 
-CI					::= OCTET STRING (SIZE (2))
+S1ap-CI ::= OCTET STRING (SIZE (2))
 
-CNDomain ::= ENUMERATED {
-	ps, 
-	cs 
+S1ap-CNDomain ::= ENUMERATED {
+    ps,
+    cs
 }
 
-ConcurrentWarningMessageIndicator ::= ENUMERATED {
-	true
+S1ap-ConcurrentWarningMessageIndicator ::= ENUMERATED {
+    true
 }
 
-Correlation-ID		::= OCTET STRING (SIZE (4))
+S1ap-Correlation-ID        ::= OCTET STRING (SIZE (4))
 
-CSFallbackIndicator ::= ENUMERATED { 
-	cs-fallback-required,
-	...,
-	cs-fallback-high-priority 
+S1ap-CSFallbackIndicator ::= ENUMERATED { 
+    cs-fallback-required,
+    ...,
+    cs-fallback-high-priority
 }
 
-CSG-Id		::= BIT STRING (SIZE (27))
+S1ap-CSG-Id ::= BIT STRING (SIZE (27))
 
 
-CSG-IdList ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF CSG-IdList-Item
+S1ap-CSG-IdList ::= SEQUENCE (SIZE (1..s1ap-maxNrOfCSGs)) OF S1ap-CSG-IdList-Item
 
-CSG-IdList-Item ::= SEQUENCE {
-	cSG-Id			CSG-Id,
- -- iE-Extensions   ProtocolExtensionContainer { {CSG-IdList-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CSG-IdList-Item ::= SEQUENCE {
+    cSG-Id          S1ap-CSG-Id,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CSGMembershipStatus ::= ENUMERATED { 
-	member, 
-	not-member
+S1ap-CSGMembershipStatus ::= ENUMERATED { 
+    member,
+    not-member
 }
 
 
-COUNTvalue ::= SEQUENCE {
-	pDCP-SN			PDCP-SN,
-	hFN				HFN,
- -- iE-Extensions   ProtocolExtensionContainer { {COUNTvalue-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-COUNTvalue ::= SEQUENCE {
+    pDCP-SN            S1ap-PDCP-SN,
+    hFN                S1ap-HFN,
+    iE-Extensions      S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CriticalityDiagnostics ::= SEQUENCE {
-	procedureCode					ProcedureCode					OPTIONAL,
-	triggeringMessage				TriggeringMessage				OPTIONAL,
-	procedureCriticality			Criticality						OPTIONAL,
-	iEsCriticalityDiagnostics		CriticalityDiagnostics-IE-List 	OPTIONAL,
- -- iE-Extensions                   ProtocolExtensionContainer {{CriticalityDiagnostics-ExtIEs}} OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CriticalityDiagnostics ::= SEQUENCE {
+    procedureCode                    S1ap-ProcedureCode                    OPTIONAL,
+    triggeringMessage                S1ap-TriggeringMessage                OPTIONAL,
+    procedureCriticality             S1ap-Criticality                      OPTIONAL,
+    iEsCriticalityDiagnostics        S1ap-CriticalityDiagnostics-IE-List   OPTIONAL,
+    iE-Extensions                    S1ap-IE-Extensions                    OPTIONAL,
+    ...
 }
 
-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-Item
+S1ap-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..s1ap-maxNrOfErrors)) OF S1ap-CriticalityDiagnostics-IE-Item
 
-CriticalityDiagnostics-IE-Item ::= 	SEQUENCE {
-	iECriticality			Criticality,
-	iE-ID					ProtocolIE-ID,
-	typeOfError 			TypeOfError,
- -- iE-Extensions           ProtocolExtensionContainer {{CriticalityDiagnostics-IE-Item-ExtIEs}} OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CriticalityDiagnostics-IE-Item ::=     SEQUENCE {
+    iECriticality            S1ap-Criticality,
+    iE-ID                    S1ap-ProtocolIE-ID,
+    typeOfError              S1ap-TypeOfError,
+    iE-Extensions            S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
 -- D
 
-DataCodingScheme ::= BIT STRING (SIZE (8))
+S1ap-DataCodingScheme ::= BIT STRING (SIZE (8))
 
-DL-Forwarding ::= ENUMERATED {
-	dL-Forwarding-proposed,
-	...
+S1ap-DL-Forwarding ::= ENUMERATED {
+    dL-Forwarding-proposed,
+    ...
 }
 
-Direct-Forwarding-Path-Availability ::= ENUMERATED {
-	directPathAvailable,
-	...
+S1ap-Direct-Forwarding-Path-Availability ::= ENUMERATED {
+    directPathAvailable,
+    ...
 }
 
-Data-Forwarding-Not-Possible ::= ENUMERATED {
-	data-Forwarding-not-Possible,
-	...
+S1ap-Data-Forwarding-Not-Possible ::= ENUMERATED {
+    data-Forwarding-not-Possible,
+    ...
 }
 
 -- E
 
-ECGIList ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
+S1ap-ECGIList ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellID)) OF S1ap-EUTRAN-CGI
 
-EmergencyAreaIDList ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID
+S1ap-EmergencyAreaIDList ::= SEQUENCE (SIZE(1..s1ap-maxnoofEmergencyAreaID)) OF S1ap-EmergencyAreaID
 
-EmergencyAreaID ::= OCTET STRING (SIZE (3))
+S1ap-EmergencyAreaID ::= OCTET STRING (SIZE (3))
 
-EmergencyAreaID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Broadcast-Item
+S1ap-EmergencyAreaID-Broadcast ::= SEQUENCE (SIZE(1..s1ap-maxnoofEmergencyAreaID)) OF S1ap-EmergencyAreaID-Broadcast-Item
 
-EmergencyAreaID-Broadcast-Item ::= SEQUENCE {
-	emergencyAreaID			EmergencyAreaID,
-	completedCellinEAI		CompletedCellinEAI,
- -- iE-Extensions           ProtocolExtensionContainer { {EmergencyAreaID-Broadcast-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-EmergencyAreaID-Broadcast-Item ::= SEQUENCE {
+    emergencyAreaID            S1ap-EmergencyAreaID,
+    completedCellinEAI         S1ap-CompletedCellinEAI,
+    iE-Extensions              S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-EmergencyAreaID-Cancelled ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Cancelled-Item
+S1ap-EmergencyAreaID-Cancelled ::= SEQUENCE (SIZE(1..s1ap-maxnoofEmergencyAreaID)) OF S1ap-EmergencyAreaID-Cancelled-Item
 
-EmergencyAreaID-Cancelled-Item ::= SEQUENCE {
-	emergencyAreaID			EmergencyAreaID,
-	cancelledCellinEAI		CancelledCellinEAI,
- -- iE-Extensions           ProtocolExtensionContainer { {EmergencyAreaID-Cancelled-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-EmergencyAreaID-Cancelled-Item ::= SEQUENCE {
+    emergencyAreaID            S1ap-EmergencyAreaID,
+    cancelledCellinEAI         S1ap-CancelledCellinEAI,
+    iE-Extensions              S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-CompletedCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CompletedCellinEAI-Item
+S1ap-CompletedCellinEAI ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellinEAI)) OF S1ap-CompletedCellinEAI-Item
 
-CompletedCellinEAI-Item ::= SEQUENCE {
-	eCGI					EUTRAN-CGI,
- -- iE-Extensions           ProtocolExtensionContainer { {CompletedCellinEAI-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-CompletedCellinEAI-Item ::= SEQUENCE {
+    eCGI                    S1ap-EUTRAN-CGI,
+    iE-Extensions           S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ENB-ID ::= CHOICE {
-	macroENB-ID			BIT STRING (SIZE(20)),
-	homeENB-ID			BIT STRING (SIZE(28)),
-	...
+S1ap-ENB-ID ::= CHOICE {
+    macroENB-ID            BIT STRING (SIZE(20)),
+    homeENB-ID             BIT STRING (SIZE(28)),
+    ...
 }
 
-GERAN-Cell-ID ::= SEQUENCE {
-	lAI				LAI,
-    rAC				RAC, 
-	cI				CI,
- -- iE-Extensions           ProtocolExtensionContainer { { GERAN-Cell-ID-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-GERAN-Cell-ID ::= SEQUENCE {
+    lAI               S1ap-LAI,
+    rAC               S1ap-RAC,
+    cI                S1ap-CI,
+    iE-Extensions     S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-Global-ENB-ID ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
-	eNB-ID					ENB-ID,
- -- iE-Extensions           ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-Global-ENB-ID ::= SEQUENCE {
+    pLMNidentity            S1ap-PLMNidentity,
+    eNB-ID                  S1ap-ENB-ID,
+    iE-Extensions           S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-GUMMEIList::= SEQUENCE (SIZE (1.. maxnoofMMECs)) OF GUMMEI
+S1ap-GUMMEIList::= SEQUENCE (SIZE (1.. s1ap-maxnoofMMECs)) OF S1ap-GUMMEI
 
-ENB-StatusTransfer-TransparentContainer		::= SEQUENCE {
-	bearers-SubjectToStatusTransferList		Bearers-SubjectToStatusTransfer-List,
- -- iE-Extensions           ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-ENB-StatusTransfer-TransparentContainer        ::= SEQUENCE {
+    bearers-SubjectToStatusTransferList         S1ap-Bearers-SubjectToStatusTransfer-List,
+    iE-Extensions                               S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ENB-UE-S1AP-ID				::= INTEGER (0..16777215)
+S1ap-ENB-UE-S1AP-ID                ::= INTEGER (0..16777215)
 
-ENBname ::= PrintableString (SIZE (1..150,...))
+S1ap-ENBname ::= PrintableString (SIZE (1..150,...))
 
-ENBX2TLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2TLAs)) OF TransportLayerAddress
+S1ap-ENBX2TLAs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofeNBX2TLAs)) OF S1ap-TransportLayerAddress
 
-EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))
+S1ap-EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))
 
-EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
-EventType	::= ENUMERATED {
-	direct,
-	change-of-serve-cell,
-	stop-change-of-serve-cell,
-	...
+S1ap-EPLMNs ::= SEQUENCE (SIZE(1..s1ap-maxnoofEPLMNs)) OF S1ap-PLMNidentity
+
+S1ap-EventType    ::= ENUMERATED {
+    direct,
+    change-of-serve-cell,
+    stop-change-of-serve-cell,
+    ...
 }
 
-E-RAB-ID		::= INTEGER (0..15, ...)
+S1ap-E-RAB-ID        ::= INTEGER (0..15, ...)
 
-E-RABDataForwardingItem ::= SEQUENCE {
-    e-RAB-ID                            E-RAB-ID,
-    dL-transportLayerAddress            TransportLayerAddress                                                   OPTIONAL,
-    dL-gTP-TEID                         GTP-TEID                                                                OPTIONAL,
-    uL-TransportLayerAddress            TransportLayerAddress                                                   OPTIONAL,
-    uL-GTP-TEID                         GTP-TEID                                                                OPTIONAL,
+S1ap-E-RABDataForwardingItem ::= SEQUENCE {
+    e-RAB-ID                            S1ap-E-RAB-ID,
+    dL-transportLayerAddress            S1ap-TransportLayerAddress                                                   OPTIONAL,
+    dL-gTP-TEID                         S1ap-GTP-TEID                                                                OPTIONAL,
+    uL-TransportLayerAddress            S1ap-TransportLayerAddress                                                   OPTIONAL,
+    uL-GTP-TEID                         S1ap-GTP-TEID                                                                OPTIONAL,
 --    iE-Extensions                       ProtocolExtensionContainer { { E-RABDataForwardingItem-ExtIEs} }    OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeSetupItemHOReq ::= SEQUENCE {
-    e-RAB-ID                            E-RAB-ID,
-    transportLayerAddress               TransportLayerAddress,
-    gTP-TEID                            GTP-TEID,
-    e-RABlevelQosParameters             E-RABLevelQoSParameters,
+S1ap-E-RABToBeSetupItemHOReq ::= SEQUENCE {
+    e-RAB-ID                            S1ap-E-RAB-ID,
+    transportLayerAddress               S1ap-TransportLayerAddress,
+    gTP-TEID                            S1ap-GTP-TEID,
+    e-RABlevelQosParameters             S1ap-E-RABLevelQoSParameters,
     -- iE-Extensions                       ProtocolExtensionContainer { {E-RABToBeSetupItemHOReq-ExtIEs} }         OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABAdmittedItem ::= SEQUENCE {
-    e-RAB-ID                        E-RAB-ID,
-    transportLayerAddress           TransportLayerAddress,
-    gTP-TEID                        GTP-TEID,
-    dL-transportLayerAddress        TransportLayerAddress   OPTIONAL,
-    dL-gTP-TEID                     GTP-TEID                OPTIONAL,
-    uL-TransportLayerAddress        TransportLayerAddress   OPTIONAL,
-    uL-GTP-TEID                     GTP-TEID                OPTIONAL,
+S1ap-E-RABAdmittedItem ::= SEQUENCE {
+    e-RAB-ID                        S1ap-E-RAB-ID,
+    transportLayerAddress           S1ap-TransportLayerAddress,
+    gTP-TEID                        S1ap-GTP-TEID,
+    dL-transportLayerAddress        S1ap-TransportLayerAddress   OPTIONAL,
+    dL-gTP-TEID                     S1ap-GTP-TEID                OPTIONAL,
+    uL-TransportLayerAddress        S1ap-TransportLayerAddress   OPTIONAL,
+    uL-GTP-TEID                     S1ap-GTP-TEID                OPTIONAL,
     -- iE-Extensions                   ProtocolExtensionContainer { {E-RABAdmittedItem-ExtIEs} }   OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeSwitchedDLItem ::= SEQUENCE {
-    e-RAB-ID                        E-RAB-ID,
-    transportLayerAddress               TransportLayerAddress,
-    gTP-TEID                    GTP-TEID,
+S1ap-E-RABToBeSwitchedDLItem ::= SEQUENCE {
+    e-RAB-ID                            S1ap-E-RAB-ID,
+    transportLayerAddress               S1ap-TransportLayerAddress,
+    gTP-TEID                            S1ap-GTP-TEID,
     -- iE-Extensions                   ProtocolExtensionContainer { { E-RABToBeSwitchedDLItem-ExtIEs} }            OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeSwitchedULItem ::= SEQUENCE {
-    e-RAB-ID                            E-RAB-ID,
-    transportLayerAddress               TransportLayerAddress,
-    gTP-TEID                            GTP-TEID,
+S1ap-E-RABToBeSwitchedULItem ::= SEQUENCE {
+    e-RAB-ID                            S1ap-E-RAB-ID,
+    transportLayerAddress               S1ap-TransportLayerAddress,
+    gTP-TEID                            S1ap-GTP-TEID,
     -- iE-Extensions                       ProtocolExtensionContainer { { E-RABToBeSwitchedULItem-ExtIEs} }            OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
-    e-RAB-ID                        E-RAB-ID,
-    e-RABlevelQoSParameters         E-RABLevelQoSParameters,
-    transportLayerAddress           TransportLayerAddress,
-    gTP-TEID                        GTP-TEID,
-    nAS-PDU                         NAS-PDU,
+S1ap-E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
+    e-RAB-ID                        S1ap-E-RAB-ID,
+    e-RABlevelQoSParameters         S1ap-E-RABLevelQoSParameters,
+    transportLayerAddress           S1ap-TransportLayerAddress,
+    gTP-TEID                        S1ap-GTP-TEID,
+    nAS-PDU                         S1ap-NAS-PDU,
     -- iE-Extensions                   ProtocolExtensionContainer { {E-RABToBeSetupItemBearerSUReqExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABSetupItemBearerSURes ::= SEQUENCE {
-    e-RAB-ID                    E-RAB-ID,
-    transportLayerAddress       TransportLayerAddress,
-    gTP-TEID                    GTP-TEID,
+S1ap-E-RABSetupItemBearerSURes ::= SEQUENCE {
+    e-RAB-ID                    S1ap-E-RAB-ID,
+    transportLayerAddress       S1ap-TransportLayerAddress,
+    gTP-TEID                    S1ap-GTP-TEID,
     -- iE-Extensions               ProtocolExtensionContainer { {E-RABSetupItemBearerSUResExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeModifiedItemBearerModReq ::= SEQUENCE {
-    e-RAB-ID                        E-RAB-ID,
-    e-RABLevelQoSParameters         E-RABLevelQoSParameters,
-    nAS-PDU                         NAS-PDU,
+S1ap-E-RABToBeModifiedItemBearerModReq ::= SEQUENCE {
+    e-RAB-ID                        S1ap-E-RAB-ID,
+    e-RABLevelQoSParameters         S1ap-E-RABLevelQoSParameters,
+    nAS-PDU                         S1ap-NAS-PDU,
     -- iE-Extensions                   ProtocolExtensionContainer { {E-RABToBeModifyItemBearerModReqExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABReleaseItemBearerRelComp ::= SEQUENCE {
-    e-RAB-ID                    E-RAB-ID,
+S1ap-E-RABReleaseItemBearerRelComp ::= SEQUENCE {
+    e-RAB-ID                    S1ap-E-RAB-ID,
     -- iE-Extensions                   ProtocolExtensionContainer { {E-RABReleaseItemBearerRelCompExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
-    e-RAB-ID                    E-RAB-ID,
-    e-RABlevelQoSParameters     E-RABLevelQoSParameters,
-    transportLayerAddress       TransportLayerAddress,
-    gTP-TEID                    GTP-TEID,
-    nAS-PDU                     NAS-PDU       OPTIONAL,
-    iE-Extensions               IE-Extensions OPTIONAL,
+S1ap-E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
+    e-RAB-ID                    S1ap-E-RAB-ID,
+    e-RABlevelQoSParameters     S1ap-E-RABLevelQoSParameters,
+    transportLayerAddress       S1ap-TransportLayerAddress,
+    gTP-TEID                    S1ap-GTP-TEID,
+    nAS-PDU                     S1ap-NAS-PDU       OPTIONAL,
+    iE-Extensions               S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABSetupItemCtxtSURes ::= SEQUENCE {
-    e-RAB-ID                E-RAB-ID,
-    transportLayerAddress   TransportLayerAddress,
-    gTP-TEID                GTP-TEID,
-    iE-Extensions           IE-Extensions OPTIONAL,
+S1ap-E-RABSetupItemCtxtSURes ::= SEQUENCE {
+    e-RAB-ID                S1ap-E-RAB-ID,
+    transportLayerAddress   S1ap-TransportLayerAddress,
+    gTP-TEID                S1ap-GTP-TEID,
+    iE-Extensions           S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABInformationList    ::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF IE
-E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABDataForwardingList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABFailedToSetupListHOReqAck ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABAdmittedList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABToBeSwitchedDLList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABToBeSwitchedULList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-E-RABToBeSetupListHOReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
-
-TAIList::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF IE
-UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF IE
-UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF IE
-
-E-RABModifyItemBearerModRes ::= SEQUENCE {
-    e-RAB-ID                    E-RAB-ID,
+S1ap-E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABInformationList    ::= SEQUENCE (SIZE (1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABDataForwardingList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABFailedToSetupListHOReqAck ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABAdmittedList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABToBeSwitchedDLList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABToBeSwitchedULList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+S1ap-E-RABToBeSetupListHOReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
+
+S1ap-TAIList::= SEQUENCE (SIZE(1.. s1ap-maxnoofTAIs)) OF S1ap-IE
+S1ap-UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfIndividualS1ConnectionsToReset)) OF S1ap-IE
+S1ap-UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfIndividualS1ConnectionsToReset)) OF S1ap-IE
+
+S1ap-E-RABModifyItemBearerModRes ::= SEQUENCE {
+    e-RAB-ID                    S1ap-E-RAB-ID,
     -- iE-Extensions                   ProtocolExtensionContainer { {E-RABModifyItemBearerModResExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABFailedToSetupItemHOReqAck ::= SEQUENCE {
-    e-RAB-ID                        E-RAB-ID,
-    cause               Cause,
+S1ap-E-RABFailedToSetupItemHOReqAck ::= SEQUENCE {
+    e-RAB-ID                        S1ap-E-RAB-ID,
+    cause                           S1ap-Cause,
     -- iE-Extensions                   ProtocolExtensionContainer { { E-RABFailedToSetupItemHOReqAckExtIEs} }          OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-E-RABInformationListItem ::= SEQUENCE {
-	e-RAB-ID						E-RAB-ID,
-	dL-Forwarding					DL-Forwarding		OPTIONAL,
+S1ap-E-RABInformationListItem ::= SEQUENCE {
+    e-RAB-ID                         S1ap-E-RAB-ID,
+    dL-Forwarding                    S1ap-DL-Forwarding        OPTIONAL,
  -- iE-Extensions                   ProtocolExtensionContainer { {E-RABInformationListItem-ExtIEs} }            OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
--- E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} }
-E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF IE
+-- E-RABList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} }
+S1ap-E-RABList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE
 
-E-RABItem ::= SEQUENCE {
-	e-RAB-ID					E-RAB-ID,
-	cause						Cause,
+S1ap-E-RABItem ::= SEQUENCE {
+    e-RAB-ID                    S1ap-E-RAB-ID,
+    cause                       S1ap-Cause,
  -- iE-Extensions               ProtocolExtensionContainer { {E-RABItem-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-E-RABLevelQoSParameters ::= SEQUENCE {
-	qCI			QCI,
-	allocationRetentionPriority			AllocationAndRetentionPriority,
-	gbrQosInformation					GBR-QosInformation			OPTIONAL,
+S1ap-E-RABLevelQoSParameters ::= SEQUENCE {
+    qCI            S1ap-QCI,
+    allocationRetentionPriority            S1ap-AllocationAndRetentionPriority,
+    gbrQosInformation                    S1ap-GBR-QosInformation            OPTIONAL,
  -- iE-Extensions                       ProtocolExtensionContainer { {E-RABQoSParameters-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-EUTRAN-CGI ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
-	cell-ID					CellIdentity,
+S1ap-EUTRAN-CGI ::= SEQUENCE {
+    pLMNidentity            S1ap-PLMNidentity,
+    cell-ID                 S1ap-CellIdentity,
  -- iE-Extensions           ProtocolExtensionContainer { {EUTRAN-CGI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..2047)
+S1ap-EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..2047)
 
-ExtendedRNC-ID					::= INTEGER (4096..65535)
+S1ap-ExtendedRNC-ID                    ::= INTEGER (4096..65535)
 
-ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
+S1ap-ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
 
 -- F
 
-ForbiddenInterRATs ::= ENUMERATED {
-	all,
-	geran,
-	utran,
-	cdma2000,
-	...,
-	geranandutran,
-	cdma2000andutran
+S1ap-ForbiddenInterRATs ::= ENUMERATED {
+    all,
+    geran,
+    utran,
+    cdma2000,
+    ...,
+    geranandutran,
+    cdma2000andutran
 
 }
 
-ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
+S1ap-ForbiddenTAs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofEPLMNsPlusOne)) OF S1ap-ForbiddenTAs-Item
 
-ForbiddenTAs-Item ::= SEQUENCE {
-	pLMN-Identity		PLMNidentity,
-	forbiddenTACs		ForbiddenTACs,
+S1ap-ForbiddenTAs-Item ::= SEQUENCE {
+    pLMN-Identity        S1ap-PLMNidentity,
+    forbiddenTACs        S1ap-ForbiddenTACs,
  -- iE-Extensions       ProtocolExtensionContainer { {ForbiddenTAs-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
+S1ap-ForbiddenTACs ::= SEQUENCE (SIZE(1..s1ap-maxnoofForbTACs)) OF S1ap-TAC
 
-ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
+S1ap-ForbiddenLAs ::= SEQUENCE (SIZE(1..s1ap-maxnoofEPLMNsPlusOne)) OF S1ap-ForbiddenLAs-Item
 
-ForbiddenLAs-Item ::= SEQUENCE {
-	pLMN-Identity		PLMNidentity,
-	forbiddenLACs		ForbiddenLACs,
+S1ap-ForbiddenLAs-Item ::= SEQUENCE {
+    pLMN-Identity        S1ap-PLMNidentity,
+    forbiddenLACs        S1ap-ForbiddenLACs,
  -- iE-Extensions       ProtocolExtensionContainer { {ForbiddenLAs-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
+S1ap-ForbiddenLACs ::= SEQUENCE (SIZE(1..s1ap-maxnoofForbLACs)) OF S1ap-LAC
 
 -- G
 
-GBR-QosInformation ::= SEQUENCE {
-	e-RAB-MaximumBitrateDL			BitRate,
-	e-RAB-MaximumBitrateUL			BitRate,
-	e-RAB-GuaranteedBitrateDL		BitRate,
-	e-RAB-GuaranteedBitrateUL		BitRate,
+S1ap-GBR-QosInformation ::= SEQUENCE {
+    e-RAB-MaximumBitrateDL            S1ap-BitRate,
+    e-RAB-MaximumBitrateUL            S1ap-BitRate,
+    e-RAB-GuaranteedBitrateDL         S1ap-BitRate,
+    e-RAB-GuaranteedBitrateUL         S1ap-BitRate,
  -- iE-Extensions                   ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-GTP-TEID					::= OCTET STRING (SIZE (4))
+S1ap-GTP-TEID                    ::= OCTET STRING (SIZE (4))
 
-GUMMEI			::= SEQUENCE {
-	pLMN-Identity		PLMNidentity,
-	mME-Group-ID		MME-Group-ID,
-	mME-Code			MME-Code,
+S1ap-GUMMEI            ::= SEQUENCE {
+    pLMN-Identity        S1ap-PLMNidentity,
+    mME-Group-ID         S1ap-MME-Group-ID,
+    mME-Code             S1ap-MME-Code,
  -- iE-Extensions       ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions        S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-GWContextReleaseIndication ::= ENUMERATED {
-	true,
-	...
+S1ap-GWContextReleaseIndication ::= ENUMERATED {
+    true,
+    ...
 }
 
 -- H
 
-HandoverRestrictionList ::= SEQUENCE {
-	servingPLMN					PLMNidentity,
-	equivalentPLMNs				EPLMNs					OPTIONAL,
-	forbiddenTAs				ForbiddenTAs			OPTIONAL,
-	forbiddenLAs				ForbiddenLAs			OPTIONAL,
-	forbiddenInterRATs			ForbiddenInterRATs		OPTIONAL, 
+S1ap-HandoverRestrictionList ::= SEQUENCE {
+    servingPLMN                    S1ap-PLMNidentity,
+    equivalentPLMNs                S1ap-EPLMNs                    OPTIONAL,
+    forbiddenTAs                   S1ap-ForbiddenTAs            OPTIONAL,
+    forbiddenLAs                   S1ap-ForbiddenLAs            OPTIONAL,
+    forbiddenInterRATs             S1ap-ForbiddenInterRATs        OPTIONAL,
  -- iE-Extensions               ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-HandoverType ::= ENUMERATED {
-	intralte,
-	ltetoutran,
-	ltetogeran,
-	utrantolte,
-	gerantolte,
-	...
+S1ap-HandoverType ::= ENUMERATED {
+    intralte,
+    ltetoutran,
+    ltetogeran,
+    utrantolte,
+    gerantolte,
+    ...
 }
 
-HFN ::= INTEGER (0..1048575)
+S1ap-HFN ::= INTEGER (0..1048575)
 
 -- I
 
-ImmediateMDT ::= SEQUENCE { 
-	measurementsToActivate		MeasurementsToActivate,
-	reportingTriggerMDT			ReportingTriggerMDT,
-	thresholdeventA2			ThresholdEventA2				OPTIONAL,
+S1ap-ImmediateMDT ::= SEQUENCE { 
+    measurementsToActivate         S1ap-MeasurementsToActivate,
+    reportingTriggerMDT            S1ap-ReportingTriggerMDT,
+    thresholdeventA2               S1ap-ThresholdEventA2                OPTIONAL,
 -- Included in case of event-triggered reporting for measurement M1
-	periodicReportingMDT		PeriodicReportingMDT			OPTIONAL,
+    periodicReportingMDT           S1ap-PeriodicReportingMDT            OPTIONAL,
 -- Included in case of periodic reporting
  -- iE-Extensions               ProtocolExtensionContainer { { ImmediateMDT-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-IMSI	::=	OCTET STRING (SIZE (3..8))
+S1ap-IMSI    ::=    OCTET STRING (SIZE (3..8))
 
-IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
+S1ap-IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
 
-InterfacesToTrace ::= BIT STRING (SIZE (8))
+S1ap-InterfacesToTrace ::= BIT STRING (SIZE (8))
 
-Inter-SystemInformationTransferType ::= CHOICE {
-    rIMTransfer     RIMTransfer,
+S1ap-Inter-SystemInformationTransferType ::= CHOICE {
+    rIMTransfer     S1ap-RIMTransfer,
     ...
 }
 
@@ -790,653 +769,652 @@ Inter-SystemInformationTransferType ::= CHOICE {
 -- L
 
 
-LAC	::= OCTET STRING (SIZE (2))
+S1ap-LAC    ::= OCTET STRING (SIZE (2))
 
-LAI ::= SEQUENCE {
-	pLMNidentity				PLMNidentity,
-	lAC				LAC,
+S1ap-LAI ::= SEQUENCE {
+    pLMNidentity                S1ap-PLMNidentity,
+    lAC                S1ap-LAC,
  -- iE-Extensions           ProtocolExtensionContainer { {LAI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-LastVisitedCell-Item ::= CHOICE {
-	e-UTRAN-Cell					LastVisitedEUTRANCellInformation,
-	uTRAN-Cell						LastVisitedUTRANCellInformation,
-	gERAN-Cell						LastVisitedGERANCellInformation,
-	...
+S1ap-LastVisitedCell-Item ::= CHOICE {
+    e-UTRAN-Cell                      S1ap-LastVisitedEUTRANCellInformation,
+    uTRAN-Cell                        S1ap-LastVisitedUTRANCellInformation,
+    gERAN-Cell                        S1ap-LastVisitedGERANCellInformation,
+    ...
 }
-LastVisitedEUTRANCellInformation ::= SEQUENCE {
-	global-Cell-ID					EUTRAN-CGI,
-	cellType						CellType,
-	time-UE-StayedInCell			Time-UE-StayedInCell,
+
+S1ap-LastVisitedEUTRANCellInformation ::= SEQUENCE {
+    global-Cell-ID                    S1ap-EUTRAN-CGI,
+    cellType                          S1ap-CellType,
+    time-UE-StayedInCell              S1ap-Time-UE-StayedInCell,
  -- iE-Extensions                   ProtocolExtensionContainer { { LastVisitedEUTRANCellInformation-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-LastVisitedUTRANCellInformation	::= OCTET STRING
+S1ap-LastVisitedUTRANCellInformation    ::= OCTET STRING
 
-LastVisitedGERANCellInformation ::= CHOICE {
-	undefined						NULL,
-	...
+S1ap-LastVisitedGERANCellInformation ::= CHOICE {
+    undefined                        NULL,
+    ...
 }
 
-L3-Information				::= OCTET STRING
+S1ap-L3-Information                ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
-LPPa-PDU ::=  OCTET STRING
+S1ap-LPPa-PDU ::=  OCTET STRING
 
-LoggedMDT ::= SEQUENCE {
-	loggingInterval				LoggingInterval,
-	loggingDuration				LoggingDuration,
+S1ap-LoggedMDT ::= SEQUENCE {
+    loggingInterval                S1ap-LoggingInterval,
+    loggingDuration                S1ap-LoggingDuration,
  -- iE-Extensions               ProtocolExtensionContainer { {LoggedMDT-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-LoggingInterval ::= ENUMERATED {ms128, ms256, ms512, ms1024, ms2048, ms3072, ms4096, ms6144}
+S1ap-LoggingInterval ::= ENUMERATED {ms128, ms256, ms512, ms1024, ms2048, ms3072, ms4096, ms6144}
 
-LoggingDuration ::= ENUMERATED {m10, m20, m40, m60, m90, m120}
+S1ap-LoggingDuration ::= ENUMERATED {m10, m20, m40, m60, m90, m120}
 
 -- M
 
-MDT-Activation 	::= ENUMERATED { 
-	immediate-MDT-only,
-	immediate-MDT-and-Trace,
-	logged-MDT-only,
-	...
+S1ap-MDT-Activation     ::= ENUMERATED {
+    immediate-MDT-only,
+    immediate-MDT-and-Trace,
+    logged-MDT-only,
+    ...
 }
 
-MDT-Configuration ::= SEQUENCE {
-	mdt-Activation				MDT-Activation,
-	areaScopeOfMDT				AreaScopeOfMDT,
-	mDTMode						MDTMode,
+S1ap-MDT-Configuration ::= SEQUENCE {
+    mdt-Activation                S1ap-MDT-Activation,
+    areaScopeOfMDT                S1ap-AreaScopeOfMDT,
+    mDTMode                       S1ap-MDTMode,
  -- iE-Extensions               ProtocolExtensionContainer { { MDT-Configuration-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions                 S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ManagementBasedMDTAllowed ::= ENUMERATED {allowed, ...}
+S1ap-ManagementBasedMDTAllowed ::= ENUMERATED {allowed, ...}
 
-PrivacyIndicator ::= ENUMERATED {
-	immediate-MDT,
-	logged-MDT,
-	...
+S1ap-PrivacyIndicator ::= ENUMERATED {
+    immediate-MDT,
+    logged-MDT,
+    ...
 }
 
-MDTMode ::= CHOICE {
-	immediateMDT				ImmediateMDT,
-	loggedMDT					LoggedMDT,
-	...
+S1ap-MDTMode ::= CHOICE {
+    immediateMDT                S1ap-ImmediateMDT,
+    loggedMDT                   S1ap-LoggedMDT,
+    ...
 }
 
-MeasurementsToActivate ::= BIT STRING (SIZE (8))
+S1ap-MeasurementsToActivate ::= BIT STRING (SIZE (8))
 
-MeasurementThresholdA2 ::= CHOICE { 
-	threshold-RSRP				Threshold-RSRP,
-	threshold-RSRQ				Threshold-RSRQ,
-	...
+S1ap-MeasurementThresholdA2 ::= CHOICE { 
+    threshold-RSRP                S1ap-Threshold-RSRP,
+    threshold-RSRQ                S1ap-Threshold-RSRQ,
+    ...
 }
 
-MessageIdentifier	::= BIT STRING (SIZE (16))
+S1ap-MessageIdentifier    ::= BIT STRING (SIZE (16))
 
-MMEname ::= PrintableString (SIZE (1..150,...))
+S1ap-MMEname ::= PrintableString (SIZE (1..150,...))
 
-MMERelaySupportIndicator ::= ENUMERATED {true, ...}
+S1ap-MMERelaySupportIndicator ::= ENUMERATED {true, ...}
 
-MME-Group-ID	::= OCTET STRING (SIZE (2))
+S1ap-MME-Group-ID    ::= OCTET STRING (SIZE (2))
 
-MME-Code		::= OCTET STRING (SIZE (1))
+S1ap-MME-Code        ::= OCTET STRING (SIZE (1))
 
-MME-UE-S1AP-ID	::= INTEGER (0..4294967295)
-M-TMSI			::= OCTET STRING (SIZE (4))
+S1ap-MME-UE-S1AP-ID    ::= INTEGER (0..4294967295)
+S1ap-M-TMSI            ::= OCTET STRING (SIZE (4))
 
-MSClassmark2	::= OCTET STRING
-MSClassmark3	::= OCTET STRING
+S1ap-MSClassmark2    ::= OCTET STRING
+S1ap-MSClassmark3    ::= OCTET STRING
 
 -- N
 
-NAS-PDU ::=  OCTET STRING
+S1ap-NAS-PDU ::=  OCTET STRING
 
-NASSecurityParametersfromE-UTRAN ::= OCTET STRING
+S1ap-NASSecurityParametersfromE-UTRAN ::= OCTET STRING
 
-NASSecurityParameterstoE-UTRAN ::= OCTET STRING
+S1ap-NASSecurityParameterstoE-UTRAN ::= OCTET STRING
 
-NumberofBroadcastRequest ::= INTEGER (0..65535)
+S1ap-NumberofBroadcastRequest ::= INTEGER (0..65535)
 
-NumberOfBroadcasts ::= INTEGER (0..65535)
+S1ap-NumberOfBroadcasts ::= INTEGER (0..65535)
 
 -- O
-OldBSS-ToNewBSS-Information		::= OCTET STRING
+S1ap-OldBSS-ToNewBSS-Information        ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
-OverloadAction ::= ENUMERATED {
-	reject-non-emergency-mo-dt,
-	reject-rrc-cr-signalling,
-	permit-emergency-sessions-and-mobile-terminated-services-only,
-	...,
-	permit-high-priority-sessions-and-mobile-terminated-services-only,
-	reject-delay-tolerant-access
+S1ap-OverloadAction ::= ENUMERATED {
+    reject-non-emergency-mo-dt,
+    reject-rrc-cr-signalling,
+    permit-emergency-sessions-and-mobile-terminated-services-only,
+    ...,
+    permit-high-priority-sessions-and-mobile-terminated-services-only,
+    reject-delay-tolerant-access
 }
 
-OverloadResponse ::= CHOICE {
-	overloadAction					OverloadAction,
-	...
+S1ap-OverloadResponse ::= CHOICE {
+    overloadAction                    S1ap-OverloadAction,
+    ...
 }
 
 
 -- P
 
-PagingDRX ::= ENUMERATED {
-	v32,
-	v64,
-	v128,
-	v256,
-	...
-	}
-
-PagingPriority ::= ENUMERATED {
-	priolevel1,
-	priolevel2,
-	priolevel3,
-	priolevel4,
-	priolevel5,
-	priolevel6,
-	priolevel7,
-	priolevel8,
-	...
-}
-
-PDCP-SN ::= INTEGER (0..4095) 
-
-PeriodicReportingMDT ::= SEQUENCE { 
-	reportInterval				ReportIntervalMDT,
-	reportAmount				ReportAmountMDT,
+S1ap-PagingDRX ::= ENUMERATED {
+    v32,
+    v64,
+    v128,
+    v256,
+    ...
+    }
+
+S1ap-PagingPriority ::= ENUMERATED {
+    priolevel1,
+    priolevel2,
+    priolevel3,
+    priolevel4,
+    priolevel5,
+    priolevel6,
+    priolevel7,
+    priolevel8,
+    ...
+}
+
+S1ap-PDCP-SN ::= INTEGER (0..4095) 
+
+S1ap-PeriodicReportingMDT ::= SEQUENCE { 
+    reportInterval                S1ap-ReportIntervalMDT,
+    reportAmount                  S1ap-ReportAmountMDT,
  -- iE-Extensions               ProtocolExtensionContainer { { PeriodicReportingMDT-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-PLMNidentity 				::= TBCD-STRING 
+S1ap-PLMNidentity                 ::= S1ap-TBCD-STRING
 
-Pre-emptionCapability ::= ENUMERATED {
-	shall-not-trigger-pre-emption,
-	may-trigger-pre-emption
+S1ap-Pre-emptionCapability ::= ENUMERATED {
+    shall-not-trigger-pre-emption,
+    may-trigger-pre-emption
 }
 
-Pre-emptionVulnerability ::= ENUMERATED {
-	not-pre-emptable,
-	pre-emptable
+S1ap-Pre-emptionVulnerability ::= ENUMERATED {
+    not-pre-emptable,
+    pre-emptable
 }
 
-PriorityLevel				::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15) } (0..15)
+S1ap-PriorityLevel                ::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15) } (0..15)
 
-PS-ServiceNotAvailable ::= ENUMERATED {
-	ps-service-not-available,
-	...
+S1ap-PS-ServiceNotAvailable ::= ENUMERATED {
+    ps-service-not-available,
+    ...
 }
 
 -- Q
 
-QCI						::= INTEGER (0..255)
+S1ap-QCI                        ::= INTEGER (0..255)
 
 -- R
 
-ResetType ::= CHOICE {
-    s1-Interface        ResetAll,
-    partOfS1-Interface      UE-associatedLogicalS1-ConnectionListRes,
+S1ap-ResetType ::= CHOICE {
+    s1-Interface                S1ap-ResetAll,
+    partOfS1-Interface          S1ap-UE-associatedLogicalS1-ConnectionListRes,
     ...
 }
 
-ResetAll ::= ENUMERATED {
+S1ap-ResetAll ::= ENUMERATED {
     reset-all,
     ...
 }
 
-ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
+S1ap-ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
 
-RelativeMMECapacity				::= INTEGER (0..255)
+S1ap-RelativeMMECapacity                ::= INTEGER (0..255)
 
-RelayNode-Indicator ::= ENUMERATED {
-	true,
-	...
+S1ap-RelayNode-Indicator ::= ENUMERATED {
+    true,
+    ...
 }
 
-RAC					::= OCTET STRING (SIZE (1))
+S1ap-RAC                    ::= OCTET STRING (SIZE (1))
 
-ReportAmountMDT ::= ENUMERATED{r1, r2, r4, r8, r16, r32, r64, rinfinity}
+S1ap-ReportAmountMDT ::= ENUMERATED{r1, r2, r4, r8, r16, r32, r64, rinfinity}
 
-ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60} 
+S1ap-ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60} 
 
-ReportingTriggerMDT ::= ENUMERATED{
-	periodic,
-	a2eventtriggered,
-	...
+S1ap-ReportingTriggerMDT ::= ENUMERATED{
+    periodic,
+    a2eventtriggered,
+    ...
 }
 
-RequestType	::= SEQUENCE {
-	eventType 				EventType,
-	reportArea 				ReportArea,
+S1ap-RequestType    ::= SEQUENCE {
+    eventType                  S1ap-EventType,
+    reportArea                 S1ap-ReportArea,
  -- iE-Extensions           ProtocolExtensionContainer { { RequestType-ExtIEs} }    OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-RIMTransfer ::= SEQUENCE {
-	rIMInformation			RIMInformation,
-	rIMRoutingAddress		RIMRoutingAddress		OPTIONAL,
+S1ap-RIMTransfer ::= SEQUENCE {
+    rIMInformation            S1ap-RIMInformation,
+    rIMRoutingAddress         S1ap-RIMRoutingAddress        OPTIONAL,
  -- iE-Extensions           ProtocolExtensionContainer { { RIMTransfer-ExtIEs} }            OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-RIMInformation ::= OCTET STRING
+S1ap-RIMInformation ::= OCTET STRING
 
-RIMRoutingAddress ::= CHOICE {
-	gERAN-Cell-ID			GERAN-Cell-ID,
-	...,
-	targetRNC-ID			TargetRNC-ID
+S1ap-RIMRoutingAddress ::= CHOICE {
+    gERAN-Cell-ID            S1ap-GERAN-Cell-ID,
+    ...,
+    targetRNC-ID             S1ap-TargetRNC-ID
 }
 
-ReportArea ::= ENUMERATED {
-	ecgi,
-	...
+S1ap-ReportArea ::= ENUMERATED {
+    ecgi,
+    ...
 }
 
-RepetitionPeriod ::= INTEGER (0..4095)
-
+S1ap-RepetitionPeriod ::= INTEGER (0..4095)
 
-RNC-ID					::= INTEGER (0..4095)
+S1ap-RNC-ID                    ::= INTEGER (0..4095)
 
-RRC-Container	::= OCTET STRING
+S1ap-RRC-Container    ::= OCTET STRING
 
-RRC-Establishment-Cause ::= ENUMERATED {
-	emergency,
-	highPriorityAccess,
-	mt-Access,
-	mo-Signalling,
-	mo-Data,
-	...,
-	delay-TolerantAccess
+S1ap-RRC-Establishment-Cause ::= ENUMERATED {
+    emergency,
+    highPriorityAccess,
+    mt-Access,
+    mo-Signalling,
+    mo-Data,
+    ...,
+    delay-TolerantAccess
 }
 
-Routing-ID		::= INTEGER (0..255)
+S1ap-Routing-ID        ::= INTEGER (0..255)
 
 -- S
 
 
-SecurityKey	::= BIT STRING (SIZE(256))
+S1ap-SecurityKey    ::= BIT STRING (SIZE(256))
 
-
-
-SecurityContext ::= SEQUENCE {
-	nextHopChainingCount		INTEGER (0..7),
-	nextHopParameter			SecurityKey,
+S1ap-SecurityContext ::= SEQUENCE {
+    nextHopChainingCount        INTEGER (0..7),
+    nextHopParameter            S1ap-SecurityKey,
  -- iE-Extensions               ProtocolExtensionContainer { { SecurityContext-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-SerialNumber ::= BIT STRING (SIZE (16))
+S1ap-SerialNumber ::= BIT STRING (SIZE (16))
 
-SONInformation ::= CHOICE{
-	sONInformationRequest		SONInformationRequest,
-	sONInformationReply			SONInformationReply,
-	...
+S1ap-SONInformation ::= CHOICE{
+    sONInformationRequest        S1ap-SONInformationRequest,
+    sONInformationReply          S1ap-SONInformationReply,
+    ...
 }
 
-SONInformationRequest ::= ENUMERATED { 
-	x2TNL-Configuration-Info,
-	...,
-	time-Synchronization-Info}
+S1ap-SONInformationRequest ::= ENUMERATED { 
+    x2TNL-Configuration-Info,
+    ...,
+    time-Synchronization-Info
+}
 
-SONInformationReply ::= SEQUENCE {
-	x2TNLConfigurationInfo			X2TNLConfigurationInfo			OPTIONAL,
+S1ap-SONInformationReply ::= SEQUENCE {
+    x2TNLConfigurationInfo            S1ap-X2TNLConfigurationInfo            OPTIONAL,
  -- iE-Extensions                   ProtocolExtensionContainer {{SONInformationReply-ExtIEs}} OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-SONConfigurationTransfer ::= SEQUENCE {
-	targeteNB-ID					TargeteNB-ID,
-	sourceeNB-ID					SourceeNB-ID,
-	sONInformation					SONInformation,
+S1ap-SONConfigurationTransfer ::= SEQUENCE {
+    targeteNB-ID                    S1ap-TargeteNB-ID,
+    sourceeNB-ID                    S1ap-SourceeNB-ID,
+    sONInformation                  S1ap-SONInformation,
  -- iE-Extensions           ProtocolExtensionContainer { { SONConfigurationTransfer-ExtIEs} }           OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-Source-ToTarget-TransparentContainer ::= OCTET STRING
+S1ap-Source-ToTarget-TransparentContainer ::= OCTET STRING
 -- This IE includes a transparent container from the source RAN node to the target RAN node. 
 -- The octets of the OCTET STRING are encoded according to the specifications of the target system.
 
-SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
+S1ap-SourceBSS-ToTargetBSS-TransparentContainer        ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
-SourceeNB-ID ::= SEQUENCE {
-	global-ENB-ID	Global-ENB-ID,
-	selected-TAI	TAI,
+S1ap-SourceeNB-ID ::= SEQUENCE {
+    global-ENB-ID    S1ap-Global-ENB-ID,
+    selected-TAI     S1ap-TAI,
  -- iE-Extensions   ProtocolExtensionContainer { {SourceeNB-ID-ExtIEs} } OPTIONAL
-    iE-Extensions   IE-Extensions OPTIONAL
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL
 }
 
-SRVCCOperationPossible ::= ENUMERATED {
-	possible,
-	...
+S1ap-SRVCCOperationPossible ::= ENUMERATED {
+    possible,
+    ...
 }
 
-SRVCCHOIndication ::= ENUMERATED {
-	pSandCS,
-	cSonly,
-	...
+S1ap-SRVCCHOIndication ::= ENUMERATED {
+    pSandCS,
+    cSonly,
+    ...
 }
 
-SourceeNB-ToTargeteNB-TransparentContainer		::= SEQUENCE {
-	rRC-Container					RRC-Container,
-	e-RABInformationList			E-RABInformationList		OPTIONAL,
-	targetCell-ID					EUTRAN-CGI,
-	subscriberProfileIDforRFP		SubscriberProfileIDforRFP		OPTIONAL,
-	uE-HistoryInformation			UE-HistoryInformation,
+S1ap-SourceeNB-ToTargeteNB-TransparentContainer        ::= SEQUENCE {
+    rRC-Container                    S1ap-RRC-Container,
+    e-RABInformationList             S1ap-E-RABInformationList        OPTIONAL,
+    targetCell-ID                    S1ap-EUTRAN-CGI,
+    subscriberProfileIDforRFP        S1ap-SubscriberProfileIDforRFP        OPTIONAL,
+    uE-HistoryInformation            S1ap-UE-HistoryInformation,
  -- iE-Extensions           ProtocolExtensionContainer { {SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-SourceRNC-ToTargetRNC-TransparentContainer		::= OCTET STRING
+S1ap-SourceRNC-ToTargetRNC-TransparentContainer        ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
 
-ServedGUMMEIs ::= SEQUENCE (SIZE (1.. maxnoofRATs)) OF ServedGUMMEIsItem
+S1ap-ServedGUMMEIs ::= SEQUENCE (SIZE (1.. s1ap-maxnoofRATs)) OF S1ap-ServedGUMMEIsItem
 
-ServedGUMMEIsItem ::= SEQUENCE {
-	servedPLMNs				ServedPLMNs,
-	servedGroupIDs			ServedGroupIDs,
-	servedMMECs				ServedMMECs,
+S1ap-ServedGUMMEIsItem ::= SEQUENCE {
+    servedPLMNs                S1ap-ServedPLMNs,
+    servedGroupIDs             S1ap-ServedGroupIDs,
+    servedMMECs                S1ap-ServedMMECs,
  -- iE-Extensions           ProtocolExtensionContainer { {ServedGUMMEIsItem-ExtIEs} }   OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ServedGroupIDs ::= SEQUENCE (SIZE(1.. maxnoofGroupIDs)) OF MME-Group-ID
-ServedMMECs ::= SEQUENCE (SIZE(1.. maxnoofMMECs)) OF MME-Code
+S1ap-ServedGroupIDs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofGroupIDs)) OF S1ap-MME-Group-ID
+S1ap-ServedMMECs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofMMECs)) OF S1ap-MME-Code
 
-ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
+S1ap-ServedPLMNs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofPLMNsPerMME)) OF S1ap-PLMNidentity
 
-SubscriberProfileIDforRFP ::= INTEGER (1..256) 
+S1ap-SubscriberProfileIDforRFP ::= INTEGER (1..256) 
 
-SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
+S1ap-SupportedTAs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofTACs)) OF S1ap-SupportedTAs-Item
 
-SupportedTAs-Item ::=	SEQUENCE  {
-	tAC					TAC,
-	broadcastPLMNs		BPLMNs,
+S1ap-SupportedTAs-Item ::=    SEQUENCE  {
+    tAC                    S1ap-TAC,
+    broadcastPLMNs         S1ap-BPLMNs,
  -- iE-Extensions       ProtocolExtensionContainer { {SupportedTAs-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-StratumLevel ::= INTEGER (0..3, ...)
+S1ap-StratumLevel ::= INTEGER (0..3, ...)
 
-SynchronizationStatus ::= ENUMERATED { synchronous, asynchronous, ... }
+S1ap-SynchronizationStatus ::= ENUMERATED { synchronous, asynchronous, ... }
 
-TimeSynchronizationInfo ::= SEQUENCE {
-	stratumLevel					StratumLevel,
-	synchronizationStatus			SynchronizationStatus,
+S1ap-TimeSynchronizationInfo ::= SEQUENCE {
+    stratumLevel                    S1ap-StratumLevel,
+    synchronizationStatus           S1ap-SynchronizationStatus,
  -- iE-Extensions                   ProtocolExtensionContainer { { TimeSynchronizationInfo-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-S-TMSI ::= SEQUENCE {
-	mMEC	MME-Code,
-	m-TMSI	M-TMSI,
+S1ap-S-TMSI ::= SEQUENCE {
+    mMEC      S1ap-MME-Code,
+    m-TMSI    S1ap-M-TMSI,
  -- iE-Extensions       ProtocolExtensionContainer { {S-TMSI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
 -- T
 
-TAC ::= OCTET STRING (SIZE (2))
+S1ap-TAC ::= OCTET STRING (SIZE (2))
 
-TAIListforWarning ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI
+S1ap-TAIListforWarning ::= SEQUENCE (SIZE(1..s1ap-maxnoofTAIforWarning)) OF S1ap-TAI
 
-TAI ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
-	tAC						TAC,
+S1ap-TAI ::= SEQUENCE {
+    pLMNidentity            S1ap-PLMNidentity,
+    tAC                     S1ap-TAC,
  -- iE-Extensions           ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TAIItem ::= SEQUENCE {
-    tAI                             TAI,
+S1ap-TAIItem ::= SEQUENCE {
+    tAI                             S1ap-TAI,
     -- iE-Extensions                   ProtocolExtensionContainer { {TAIItemExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
     ...
 }
 
-TAI-Broadcast ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Broadcast-Item
+S1ap-TAI-Broadcast ::= SEQUENCE (SIZE(1..s1ap-maxnoofTAIforWarning)) OF S1ap-TAI-Broadcast-Item
 
-TAI-Broadcast-Item ::= SEQUENCE {
-	tAI					TAI,
-	completedCellinTAI	CompletedCellinTAI,
+S1ap-TAI-Broadcast-Item ::= SEQUENCE {
+    tAI                    S1ap-TAI,
+    completedCellinTAI     S1ap-CompletedCellinTAI,
  -- iE-Extensions       ProtocolExtensionContainer { {TAI-Broadcast-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TAI-Cancelled ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Cancelled-Item
+S1ap-TAI-Cancelled ::= SEQUENCE (SIZE(1..s1ap-maxnoofTAIforWarning)) OF S1ap-TAI-Cancelled-Item
 
-TAI-Cancelled-Item ::= SEQUENCE {
-	tAI					TAI,
-	cancelledCellinTAI	CancelledCellinTAI,
+S1ap-TAI-Cancelled-Item ::= SEQUENCE {
+    tAI                    S1ap-TAI,
+    cancelledCellinTAI     S1ap-CancelledCellinTAI,
  -- iE-Extensions       ProtocolExtensionContainer { {TAI-Cancelled-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TABasedMDT ::= SEQUENCE {
-	tAListforMDT			TAListforMDT,
+S1ap-TABasedMDT ::= SEQUENCE {
+    tAListforMDT            S1ap-TAListforMDT,
  -- iE-Extensions           ProtocolExtensionContainer { {TABasedMDT-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+ iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TAListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAC
+S1ap-TAListforMDT ::= SEQUENCE (SIZE(1..s1ap-maxnoofTAforMDT)) OF S1ap-TAC
 
-CompletedCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
+S1ap-CompletedCellinTAI ::= SEQUENCE (SIZE(1..s1ap-maxnoofCellinTAI)) OF S1ap-CompletedCellinTAI-Item
 
-CompletedCellinTAI-Item ::= SEQUENCE{
-	eCGI				EUTRAN-CGI,
+S1ap-CompletedCellinTAI-Item ::= SEQUENCE{
+    eCGI                S1ap-EUTRAN-CGI,
  -- iE-Extensions       ProtocolExtensionContainer { {CompletedCellinTAI-Item-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions  S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TBCD-STRING ::= OCTET STRING (SIZE (3))
+S1ap-TBCD-STRING ::= OCTET STRING (SIZE (3))
 
-TargetID ::= CHOICE {
-	targeteNB-ID			TargeteNB-ID,
-	targetRNC-ID			TargetRNC-ID,
-	cGI						CGI,
-	...
+S1ap-TargetID ::= CHOICE {
+    targeteNB-ID            S1ap-TargeteNB-ID,
+    targetRNC-ID            S1ap-TargetRNC-ID,
+    cGI                     S1ap-CGI,
+    ...
 }
 
-TargeteNB-ID ::= SEQUENCE {
-	global-ENB-ID	Global-ENB-ID,
-	selected-TAI	TAI,
+S1ap-TargeteNB-ID ::= SEQUENCE {
+    global-ENB-ID    S1ap-Global-ENB-ID,
+    selected-TAI     S1ap-TAI,
  -- iE-Extensions   ProtocolExtensionContainer { {TargeteNB-ID-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions    S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TargetRNC-ID ::= SEQUENCE {
-	lAI					LAI,
-	rAC					RAC 		OPTIONAL,
-	rNC-ID				RNC-ID,
-	extendedRNC-ID		ExtendedRNC-ID		OPTIONAL,
+S1ap-TargetRNC-ID ::= SEQUENCE {
+    lAI                    S1ap-LAI,
+    rAC                    S1ap-RAC         OPTIONAL,
+    rNC-ID                 S1ap-RNC-ID,
+    extendedRNC-ID         S1ap-ExtendedRNC-ID        OPTIONAL,
  -- iE-Extensions       ProtocolExtensionContainer { {TargetRNC-ID-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
-	}
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
+}
 
-TargeteNB-ToSourceeNB-TransparentContainer		::= SEQUENCE {
-	rRC-Container			RRC-Container,
+S1ap-TargeteNB-ToSourceeNB-TransparentContainer        ::= SEQUENCE {
+    rRC-Container            S1ap-RRC-Container,
  -- iE-Extensions           ProtocolExtensionContainer { {TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-Target-ToSource-TransparentContainer ::= OCTET STRING
+S1ap-Target-ToSource-TransparentContainer ::= OCTET STRING
 -- This IE includes a transparent container from the target RAN node to the source RAN node. 
 -- The octets of the OCTET STRING are coded according to the specifications of the target system.
 
-TargetRNC-ToSourceRNC-TransparentContainer		::= OCTET STRING
+S1ap-TargetRNC-ToSourceRNC-TransparentContainer        ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
-TargetBSS-ToSourceBSS-TransparentContainer		::= OCTET STRING
+S1ap-TargetBSS-ToSourceBSS-TransparentContainer        ::= OCTET STRING
 -- This is a dummy IE used only as a reference to the actual definition in relevant specification.
 
-ThresholdEventA2 ::= SEQUENCE { 
-	measurementThreshold		MeasurementThresholdA2,
+S1ap-ThresholdEventA2 ::= SEQUENCE { 
+    measurementThreshold        S1ap-MeasurementThresholdA2,
  -- iE-Extensions               ProtocolExtensionContainer { { ThresholdEventA2-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-Threshold-RSRP ::= INTEGER(0..97)
+S1ap-Threshold-RSRP ::= INTEGER(0..97)
 
-Threshold-RSRQ ::= INTEGER(0..34)
+S1ap-Threshold-RSRQ ::= INTEGER(0..34)
 
-TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
+S1ap-TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
 
-Time-UE-StayedInCell ::= INTEGER (0..4095)
+S1ap-Time-UE-StayedInCell ::= INTEGER (0..4095)
 
-TransportLayerAddress		::= BIT STRING (SIZE(1..160, ...))
+S1ap-TransportLayerAddress        ::= BIT STRING (SIZE(1..160, ...))
 
-TraceActivation ::= SEQUENCE {
-	e-UTRAN-Trace-ID					E-UTRAN-Trace-ID,
-	interfacesToTrace				InterfacesToTrace,
-traceDepth						TraceDepth,
-traceCollectionEntityIPAddress	TransportLayerAddress,
+S1ap-TraceActivation ::= SEQUENCE {
+    e-UTRAN-Trace-ID                    S1ap-E-UTRAN-Trace-ID,
+    interfacesToTrace                   S1ap-InterfacesToTrace,
+    traceDepth                          S1ap-TraceDepth,
+    traceCollectionEntityIPAddress      S1ap-TransportLayerAddress,
  -- iE-Extensions                   ProtocolExtensionContainer { { TraceActivation-ExtIEs} }        OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-TraceDepth ::= ENUMERATED { 
-	minimum,
-	medium,
-	maximum,
-	minimumWithoutVendorSpecificExtension,
-	mediumWithoutVendorSpecificExtension,
-	maximumWithoutVendorSpecificExtension,
-	...
+S1ap-TraceDepth ::= ENUMERATED { 
+    minimum,
+    medium,
+    s1ap-maximum,
+    minimumWithoutVendorSpecificExtension,
+    mediumWithoutVendorSpecificExtension,
+    s1ap-maximumWithoutVendorSpecificExtension,
+    ...
 }
 
-E-UTRAN-Trace-ID ::=  OCTET STRING (SIZE (8))
+S1ap-E-UTRAN-Trace-ID ::=  OCTET STRING (SIZE (8))
 
-TrafficLoadReductionIndication ::= INTEGER (1..99)
+S1ap-TrafficLoadReductionIndication ::= INTEGER (1..99)
 
-TypeOfError ::= ENUMERATED {
-	not-understood,
-	missing,
-	...
+S1ap-TypeOfError ::= ENUMERATED {
+    not-understood,
+    missing,
+    ...
 }
 
 -- U
 
-UEAggregateMaximumBitrate ::= SEQUENCE {
-	uEaggregateMaximumBitRateDL				BitRate,
-	uEaggregateMaximumBitRateUL				BitRate,
+S1ap-UEAggregateMaximumBitrate ::= SEQUENCE {
+    uEaggregateMaximumBitRateDL                S1ap-BitRate,
+    uEaggregateMaximumBitRateUL                S1ap-BitRate,
  -- iE-Extensions                           ProtocolExtensionContainer { {UEAggregate-MaximumBitrates-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-UE-S1AP-IDs ::= CHOICE{
-	uE-S1AP-ID-pair		UE-S1AP-ID-pair,
-	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
-	...
+S1ap-UE-S1AP-IDs ::= CHOICE{
+    uE-S1AP-ID-pair        S1ap-UE-S1AP-ID-pair,
+    mME-UE-S1AP-ID         S1ap-MME-UE-S1AP-ID,
+    ...
 }
 
-UE-S1AP-ID-pair ::= SEQUENCE{
-	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
-	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID,
- -- iE-Extensions       ProtocolExtensionContainer { {UE-S1AP-ID-pair-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+S1ap-UE-S1AP-ID-pair ::= SEQUENCE{
+    mME-UE-S1AP-ID        S1ap-MME-UE-S1AP-ID,
+    eNB-UE-S1AP-ID        S1ap-ENB-UE-S1AP-ID,
+ -- iE-Extensions       ProtocolExtensionContainer { {S1ap-UE-S1AP-ID-pair-ExtIEs} } OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE {
-	mME-UE-S1AP-ID					MME-UE-S1AP-ID OPTIONAL,
-	eNB-UE-S1AP-ID					ENB-UE-S1AP-ID OPTIONAL,
+S1ap-UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE {
+    mME-UE-S1AP-ID                    S1ap-MME-UE-S1AP-ID OPTIONAL,
+    eNB-UE-S1AP-ID                    S1ap-ENB-UE-S1AP-ID OPTIONAL,
  -- iE-Extensions                   ProtocolExtensionContainer { { UE-associatedLogicalS1-ConnectionItemExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-UEIdentityIndexValue	::=	BIT STRING (SIZE (10))
+S1ap-UEIdentityIndexValue    ::=    BIT STRING (SIZE (10))
 
-UE-HistoryInformation ::= SEQUENCE (SIZE(1..maxnoofCells)) OF LastVisitedCell-Item
+S1ap-UE-HistoryInformation ::= SEQUENCE (SIZE(1..s1ap-maxnoofCells)) OF S1ap-LastVisitedCell-Item
 
-UEPagingID ::= CHOICE {
-	s-TMSI		S-TMSI,
-	iMSI		IMSI,
-	...
-	}
+S1ap-UEPagingID ::= CHOICE {
+    s-TMSI        S1ap-S-TMSI,
+    iMSI          S1ap-IMSI,
+    ...
+}
 
-UERadioCapability ::= OCTET STRING
+S1ap-UERadioCapability ::= OCTET STRING
 
-UESecurityCapabilities ::= SEQUENCE {
-	encryptionAlgorithms			EncryptionAlgorithms,
-	integrityProtectionAlgorithms	IntegrityProtectionAlgorithms,
+S1ap-UESecurityCapabilities ::= SEQUENCE {
+    encryptionAlgorithms            S1ap-EncryptionAlgorithms,
+    integrityProtectionAlgorithms   S1ap-IntegrityProtectionAlgorithms,
  -- iE-Extensions                   ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} }     OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
 ...
 }
 
 -- V
 -- W
 
-WarningAreaList ::= CHOICE {
-	cellIDList						ECGIList,
-	trackingAreaListforWarning		TAIListforWarning,
-	emergencyAreaIDList				EmergencyAreaIDList,
-	...
+S1ap-WarningAreaList ::= CHOICE {
+    cellIDList                        S1ap-ECGIList,
+    trackingAreaListforWarning        S1ap-TAIListforWarning,
+    emergencyAreaIDList               S1ap-EmergencyAreaIDList,
+    ...
 }
 
 
-WarningType ::= OCTET STRING (SIZE (2))
+S1ap-WarningType ::= OCTET STRING (SIZE (2))
 
-WarningSecurityInfo ::= OCTET STRING (SIZE (50))
+S1ap-WarningSecurityInfo ::= OCTET STRING (SIZE (50))
 
 
-WarningMessageContents ::= OCTET STRING (SIZE(1..9600))
+S1ap-WarningMessageContents ::= OCTET STRING (SIZE(1..9600))
 
 
 -- X
 
 
-X2TNLConfigurationInfo ::= SEQUENCE {
-	eNBX2TransportLayerAddresses	ENBX2TLAs,
+S1ap-X2TNLConfigurationInfo ::= SEQUENCE {
+    eNBX2TransportLayerAddresses    S1ap-ENBX2TLAs,
  -- iE-Extensions                   ProtocolExtensionContainer { { X2TNLConfigurationInfo-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ENBX2ExtTLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2ExtTLAs)) OF ENBX2ExtTLA
+S1ap-ENBX2ExtTLAs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofeNBX2ExtTLAs)) OF S1ap-ENBX2ExtTLA
 
-ENBX2ExtTLA ::= SEQUENCE {
-	iPsecTLA					TransportLayerAddress		OPTIONAL,
-	gTPTLAa						ENBX2GTPTLAs				OPTIONAL,
+S1ap-ENBX2ExtTLA ::= SEQUENCE {
+    iPsecTLA                    S1ap-TransportLayerAddress        OPTIONAL,
+    gTPTLAa                     S1ap-ENBX2GTPTLAs                OPTIONAL,
  -- iE-Extensions               ProtocolExtensionContainer { { ENBX2ExtTLA-ExtIEs} } OPTIONAL,
-    iE-Extensions   IE-Extensions OPTIONAL,
-	...
+    iE-Extensions   S1ap-IE-Extensions OPTIONAL,
+    ...
 }
 
-ENBX2GTPTLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2GTPTLAs)) OF TransportLayerAddress
+S1ap-ENBX2GTPTLAs ::= SEQUENCE (SIZE(1.. s1ap-maxnoofeNBX2GTPTLAs)) OF S1ap-TransportLayerAddress
 
 -- Y
 -- Z
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
index a0e57fe8509098fb2f34d43e7e3b9de534b8b26e..767466d745da79bfa248456877c9abe7bbb2bd48 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Contents.asn
@@ -19,283 +19,279 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	
-	UEAggregateMaximumBitrate,
-	Cause,
-	CellAccessMode,
-	Cdma2000HORequiredIndication,
-	Cdma2000HOStatus,
-	Cdma2000OneXSRVCCInfo,
-	Cdma2000OneXRAND,
-	Cdma2000PDU,
-	Cdma2000RATType,
-	Cdma2000SectorID,
-	EUTRANRoundTripDelayEstimationInfo,
-	CNDomain,
-	ConcurrentWarningMessageIndicator,
-	CriticalityDiagnostics,
-	CSFallbackIndicator,
-	CSG-Id,
-	CSG-IdList, 
-	CSGMembershipStatus,
-	Data-Forwarding-Not-Possible,
-	Direct-Forwarding-Path-Availability,
-	Global-ENB-ID,
-	EUTRAN-CGI,
-	ENBname,
-	ENB-StatusTransfer-TransparentContainer,
-	ENB-UE-S1AP-ID,
-	ExtendedRepetitionPeriod,
-	GTP-TEID,
-	GUMMEI,
-	HandoverRestrictionList,
-	HandoverType,
-	LAI,
-	LPPa-PDU,
-	ManagementBasedMDTAllowed,
-	MMEname,
-	MMERelaySupportIndicator,
-	MME-UE-S1AP-ID,
-	MSClassmark2,
-	MSClassmark3,
-	NAS-PDU,
-	NASSecurityParametersfromE-UTRAN,
-	NASSecurityParameterstoE-UTRAN,
-	OverloadResponse,
-	PagingDRX,
-	PagingPriority,
-	PLMNidentity,
-	RIMTransfer,
-	RelativeMMECapacity,
-	RequestType,
-	E-RAB-ID,
-	E-RABLevelQoSParameters,
-	E-RABList,
-	RelayNode-Indicator,
-	Routing-ID,
-	SecurityKey,
-	SecurityContext,
-	ServedGUMMEIs,
-	SONConfigurationTransfer,
-	Source-ToTarget-TransparentContainer,
-	SourceBSS-ToTargetBSS-TransparentContainer,
-	SourceeNB-ToTargeteNB-TransparentContainer,
-	SourceRNC-ToTargetRNC-TransparentContainer,
-	SubscriberProfileIDforRFP,
-	SRVCCOperationPossible,
-	SRVCCHOIndication,
-	SupportedTAs,
-	TAI,
-	Target-ToSource-TransparentContainer,
-	TargetBSS-ToSourceBSS-TransparentContainer,	
-	TargeteNB-ToSourceeNB-TransparentContainer,
-	TargetID,
-	TargetRNC-ToSourceRNC-TransparentContainer,
-	TimeToWait,
-	TraceActivation,
-	TrafficLoadReductionIndication,
-	E-UTRAN-Trace-ID,
-	TransportLayerAddress,
-	UEIdentityIndexValue,
-	UEPagingID,
-	UERadioCapability,
-	UE-S1AP-IDs,
-	UE-associatedLogicalS1-ConnectionItem,
-	UESecurityCapabilities,
-	S-TMSI,
-	MessageIdentifier,
-	SerialNumber,
-	WarningAreaList,
-	RepetitionPeriod,
-	NumberofBroadcastRequest,
-	WarningType,
-	WarningSecurityInfo,
-	DataCodingScheme,
-	WarningMessageContents,
-	BroadcastCompletedAreaList,
-	RRC-Establishment-Cause,
-	BroadcastCancelledAreaList,
-	PS-ServiceNotAvailable,
-	GUMMEIList,
-	Correlation-ID,
-	GWContextReleaseIndication,
-	PrivacyIndicator
-
-
-
-FROM S1AP-IEs
-
-	PrivateIE-Container{},
-	ProtocolExtensionContainer{},
-	ProtocolIE-Container{},
-	ProtocolIE-ContainerList{},
-	ProtocolIE-ContainerPair{},
-	ProtocolIE-ContainerPairList{},
-	ProtocolIE-SingleContainer{},
-	S1AP-PRIVATE-IES,
-	S1AP-PROTOCOL-EXTENSION,
-	S1AP-PROTOCOL-IES,
-	S1AP-PROTOCOL-IES-PAIR
-FROM S1AP-Containers
-
-
-	id-uEaggregateMaximumBitrate,
-	id-Cause,
-	id-CellAccessMode,
-	id-cdma2000HORequiredIndication,
-	id-cdma2000HOStatus,
-	id-cdma2000OneXSRVCCInfo,
-	id-cdma2000OneXRAND,
-	id-cdma2000PDU,
-	id-cdma2000RATType,
-	id-cdma2000SectorID,
-	id-EUTRANRoundTripDelayEstimationInfo,
-	id-CNDomain,
-	id-ConcurrentWarningMessageIndicator,
-	id-CriticalityDiagnostics,
-	id-CSFallbackIndicator,
-	id-CSG-Id,
-	id-CSG-IdList, 
-	id-CSGMembershipStatus, 
-	id-Data-Forwarding-Not-Possible,
-	id-DefaultPagingDRX,
-	id-Direct-Forwarding-Path-Availability,
-	id-Global-ENB-ID,
-	id-EUTRAN-CGI,
-	id-eNBname,
-	id-eNB-StatusTransfer-TransparentContainer,
-	id-eNB-UE-S1AP-ID, 
-	id-GERANtoLTEHOInformationRes,
-	id-GUMMEI-ID,
-	id-HandoverRestrictionList,
-	id-HandoverType,
-	id-InitialContextSetup,
-	id-Inter-SystemInformationTransferTypeEDT,
-	id-Inter-SystemInformationTransferTypeMDT,
-	id-LPPa-PDU,
-	id-NAS-DownlinkCount,
-	id-ManagementBasedMDTAllowed,
-	id-MMEname,
-	id-MME-UE-S1AP-ID,
-	id-MSClassmark2,
-	id-MSClassmark3,
-	id-NAS-PDU,
-	id-NASSecurityParametersfromE-UTRAN,
-	id-NASSecurityParameterstoE-UTRAN,
-	id-OverloadResponse,
-	id-pagingDRX,
-	id-PagingPriority,
-	id-RelativeMMECapacity,
-	id-RequestType,
-	id-Routing-ID,
-	id-E-RABAdmittedItem,
-	id-E-RABAdmittedList,
-	id-E-RABDataForwardingItem,
-	id-E-RABFailedToModifyList,
-	id-E-RABFailedToReleaseList,
-	id-E-RABFailedToSetupItemHOReqAck,
-	id-E-RABFailedToSetupListBearerSURes,
-	id-E-RABFailedToSetupListCtxtSURes,
-	id-E-RABFailedToSetupListHOReqAck,
-	id-E-RABFailedToBeReleasedList,
-	id-E-RABModify,
-	id-E-RABModifyItemBearerModRes,
-	id-E-RABModifyListBearerModRes,
-	id-E-RABRelease,
-	id-E-RABReleaseItemBearerRelComp,
-	id-E-RABReleaseItemHOCmd,
-	id-E-RABReleaseListBearerRelComp,
-	id-E-RABReleaseIndication,
-	id-E-RABSetup,
-	id-E-RABSetupItemBearerSURes,
-	id-E-RABSetupItemCtxtSURes,
-	id-E-RABSetupListBearerSURes,
-	id-E-RABSetupListCtxtSURes,
-	id-E-RABSubjecttoDataForwardingList,
-	id-E-RABToBeModifiedItemBearerModReq,
-	id-E-RABToBeModifiedListBearerModReq,
-	id-E-RABToBeReleasedList,
-	id-E-RABReleasedList,
-	id-E-RABToBeSetupItemBearerSUReq,
-	id-E-RABToBeSetupItemCtxtSUReq,
-	id-E-RABToBeSetupItemHOReq,
-	id-E-RABToBeSetupListBearerSUReq,
-	id-E-RABToBeSetupListCtxtSUReq,
-	id-E-RABToBeSetupListHOReq,
-	id-E-RABToBeSwitchedDLItem,
-	id-E-RABToBeSwitchedDLList,
-	id-E-RABToBeSwitchedULList,
-	id-E-RABToBeSwitchedULItem,
-	id-E-RABtoReleaseListHOCmd,
-	id-SecurityKey,
-	id-SecurityContext,
-	id-ServedGUMMEIs,
-	id-SONConfigurationTransferECT,
-	id-SONConfigurationTransferMCT,
-	id-Source-ToTarget-TransparentContainer,
-	id-Source-ToTarget-TransparentContainer-Secondary,
-	id-SourceMME-UE-S1AP-ID,
-	id-SRVCCOperationPossible,
-	id-SRVCCHOIndication,
-	id-SubscriberProfileIDforRFP,
-	id-SupportedTAs,
-	id-S-TMSI,
-	id-TAI,
-	id-TAIItem,
-	id-TAIList,
-	id-Target-ToSource-TransparentContainer,
-	id-Target-ToSource-TransparentContainer-Secondary,
-	id-TargetID,
-	id-TimeToWait,
-	id-TraceActivation,
-	id-TrafficLoadReductionIndication,
-	id-E-UTRAN-Trace-ID,
-	id-UEIdentityIndexValue,
-	id-UEPagingID,
-	id-UERadioCapability,
-	id-UTRANtoLTEHOInformationRes,
-	id-UE-associatedLogicalS1-ConnectionListResAck,
-	id-UE-associatedLogicalS1-ConnectionItem,
-	id-UESecurityCapabilities,
-	id-UE-S1AP-IDs,
-	id-ResetType,
-	id-MessageIdentifier,
-	id-SerialNumber,
-	id-WarningAreaList,
-	id-RepetitionPeriod,
-	id-NumberofBroadcastRequest,
-	id-WarningType,
-	id-WarningSecurityInfo,
-	id-DataCodingScheme,
-	id-WarningMessageContents,
-	id-BroadcastCompletedAreaList,
-	id-BroadcastCancelledAreaList,
-	id-RRC-Establishment-Cause,
-	id-TraceCollectionEntityIPAddress,
-	maxnoofTAIs,
-	maxNrOfErrors,
-	maxNrOfE-RABs,
-	maxNrOfIndividualS1ConnectionsToReset,
-	maxnoofEmergencyAreaID,
-	maxnoofCellID,
-	maxnoofTAIforWarning,
-	maxnoofCellinTAI,
-	maxnoofCellinEAI,
-	id-ExtendedRepetitionPeriod,
-	id-PS-ServiceNotAvailable,
-	id-RegisteredLAI,
-	id-GUMMEIList,
-	id-SourceMME-GUMMEI,
-	id-MME-UE-S1AP-ID-2,
-	id-GW-TransportLayerAddress,
-	id-RelayNode-Indicator,
-	id-Correlation-ID,
-	id-MMERelaySupportIndicator,
-	id-GWContextReleaseIndication,
-	id-PrivacyIndicator
-
-
-FROM S1AP-Constants;
+
+    S1ap-UEAggregateMaximumBitrate,
+    S1ap-Cause,
+    S1ap-CellAccessMode,
+    S1ap-Cdma2000HORequiredIndication,
+    S1ap-Cdma2000HOStatus,
+    S1ap-Cdma2000OneXSRVCCInfo,
+    S1ap-Cdma2000OneXRAND,
+    S1ap-Cdma2000PDU,
+    S1ap-Cdma2000RATType,
+    S1ap-Cdma2000SectorID,
+    S1ap-EUTRANRoundTripDelayEstimationInfo,
+    S1ap-CNDomain,
+    S1ap-ConcurrentWarningMessageIndicator,
+    S1ap-CriticalityDiagnostics,
+    S1ap-CSFallbackIndicator,
+    S1ap-CSG-Id,
+    S1ap-CSG-IdList,
+    S1ap-CSGMembershipStatus,
+    S1ap-Data-Forwarding-Not-Possible,
+    S1ap-Direct-Forwarding-Path-Availability,
+    S1ap-Global-ENB-ID,
+    S1ap-EUTRAN-CGI,
+    S1ap-ENBname,
+    S1ap-ENB-StatusTransfer-TransparentContainer,
+    S1ap-ENB-UE-S1AP-ID,
+    S1ap-ExtendedRepetitionPeriod,
+    S1ap-GTP-TEID,
+    S1ap-GUMMEI,
+    S1ap-HandoverRestrictionList,
+    S1ap-HandoverType,
+    S1ap-LAI,
+    S1ap-LPPa-PDU,
+    S1ap-ManagementBasedMDTAllowed,
+    S1ap-MMEname,
+    S1ap-MMERelaySupportIndicator,
+    S1ap-MME-UE-S1AP-ID,
+    S1ap-MSClassmark2,
+    S1ap-MSClassmark3,
+    S1ap-NAS-PDU,
+    S1ap-NASSecurityParametersfromE-UTRAN,
+    S1ap-NASSecurityParameterstoE-UTRAN,
+    S1ap-OverloadResponse,
+    S1ap-PagingDRX,
+    S1ap-PagingPriority,
+    S1ap-PLMNidentity,
+    S1ap-RIMTransfer,
+    S1ap-RelativeMMECapacity,
+    S1ap-RequestType,
+    S1ap-E-RAB-ID,
+    S1ap-E-RABLevelQoSParameters,
+    S1ap-E-RABList,
+    S1ap-RelayNode-Indicator,
+    S1ap-Routing-ID,
+    S1ap-SecurityKey,
+    S1ap-SecurityContext,
+    S1ap-ServedGUMMEIs,
+    S1ap-SONConfigurationTransfer,
+    S1ap-Source-ToTarget-TransparentContainer,
+    S1ap-SourceBSS-ToTargetBSS-TransparentContainer,
+    S1ap-SourceeNB-ToTargeteNB-TransparentContainer,
+    S1ap-SourceRNC-ToTargetRNC-TransparentContainer,
+    S1ap-SubscriberProfileIDforRFP,
+    S1ap-SRVCCOperationPossible,
+    S1ap-SRVCCHOIndication,
+    S1ap-SupportedTAs,
+    S1ap-TAI,
+    S1ap-Target-ToSource-TransparentContainer,
+    S1ap-TargetBSS-ToSourceBSS-TransparentContainer,
+    S1ap-TargeteNB-ToSourceeNB-TransparentContainer,
+    S1ap-TargetID,
+    S1ap-TargetRNC-ToSourceRNC-TransparentContainer,
+    S1ap-TimeToWait,
+    S1ap-TraceActivation,
+    S1ap-TrafficLoadReductionIndication,
+    S1ap-E-UTRAN-Trace-ID,
+    S1ap-TransportLayerAddress,
+    S1ap-UEIdentityIndexValue,
+    S1ap-UEPagingID,
+    S1ap-UERadioCapability,
+    S1ap-UE-S1AP-IDs,
+    S1ap-UE-associatedLogicalS1-ConnectionItem,
+    S1ap-UESecurityCapabilities,
+    S1ap-S-TMSI,
+    S1ap-MessageIdentifier,
+    S1ap-SerialNumber,
+    S1ap-WarningAreaList,
+    S1ap-RepetitionPeriod,
+    S1ap-NumberofBroadcastRequest,
+    S1ap-WarningType,
+    S1ap-WarningSecurityInfo,
+    S1ap-DataCodingScheme,
+    S1ap-WarningMessageContents,
+    S1ap-BroadcastCompletedAreaList,
+    S1ap-RRC-Establishment-Cause,
+    S1ap-BroadcastCancelledAreaList,
+    S1ap-PS-ServiceNotAvailable,
+    S1ap-GUMMEIList,
+    S1ap-Correlation-ID,
+    S1ap-GWContextReleaseIndication,
+    S1ap-PrivacyIndicator
+S1ap-FROM S1AP-IEs
+
+    PrivateIE-Container{},
+    ProtocolExtensionContainer{},
+    ProtocolIE-Container{},
+    ProtocolIE-ContainerList{},
+    ProtocolIE-ContainerPair{},
+    ProtocolIE-ContainerPairList{},
+    ProtocolIE-SingleContainer{},
+    S1AP-PRIVATE-IES,
+    S1AP-PROTOCOL-EXTENSION,
+    S1AP-PROTOCOL-IES,
+    S1AP-PROTOCOL-IES-PAIR
+S1ap-FROM S1AP-Containers
+
+    id-uEaggregateMaximumBitrate,
+    id-Cause,
+    id-CellAccessMode,
+    id-cdma2000HORequiredIndication,
+    id-cdma2000HOStatus,
+    id-cdma2000OneXSRVCCInfo,
+    id-cdma2000OneXRAND,
+    id-cdma2000PDU,
+    id-cdma2000RATType,
+    id-cdma2000SectorID,
+    id-EUTRANRoundTripDelayEstimationInfo,
+    id-CNDomain,
+    id-ConcurrentWarningMessageIndicator,
+    id-CriticalityDiagnostics,
+    id-CSFallbackIndicator,
+    id-CSG-Id,
+    id-CSG-IdList,
+    id-CSGMembershipStatus,
+    id-Data-Forwarding-Not-Possible,
+    id-DefaultPagingDRX,
+    id-Direct-Forwarding-Path-Availability,
+    id-Global-ENB-ID,
+    id-EUTRAN-CGI,
+    id-eNBname,
+    id-eNB-StatusTransfer-TransparentContainer,
+    id-eNB-UE-S1AP-ID,
+    id-GERANtoLTEHOInformationRes,
+    id-GUMMEI-ID,
+    id-HandoverRestrictionList,
+    id-HandoverType,
+    id-InitialContextSetup,
+    id-Inter-SystemInformationTransferTypeEDT,
+    id-Inter-SystemInformationTransferTypeMDT,
+    id-LPPa-PDU,
+    id-NAS-DownlinkCount,
+    id-ManagementBasedMDTAllowed,
+    id-MMEname,
+    id-MME-UE-S1AP-ID,
+    id-MSClassmark2,
+    id-MSClassmark3,
+    id-NAS-PDU,
+    id-NASSecurityParametersfromE-UTRAN,
+    id-NASSecurityParameterstoE-UTRAN,
+    id-OverloadResponse,
+    id-pagingDRX,
+    id-PagingPriority,
+    id-RelativeMMECapacity,
+    id-RequestType,
+    id-Routing-ID,
+    id-E-RABAdmittedItem,
+    id-E-RABAdmittedList,
+    id-E-RABDataForwardingItem,
+    id-E-RABFailedToModifyList,
+    id-E-RABFailedToReleaseList,
+    id-E-RABFailedToSetupItemHOReqAck,
+    id-E-RABFailedToSetupListBearerSURes,
+    id-E-RABFailedToSetupListCtxtSURes,
+    id-E-RABFailedToSetupListHOReqAck,
+    id-E-RABFailedToBeReleasedList,
+    id-E-RABModify,
+    id-E-RABModifyItemBearerModRes,
+    id-E-RABModifyListBearerModRes,
+    id-E-RABRelease,
+    id-E-RABReleaseItemBearerRelComp,
+    id-E-RABReleaseItemHOCmd,
+    id-E-RABReleaseListBearerRelComp,
+    id-E-RABReleaseIndication,
+    id-E-RABSetup,
+    id-E-RABSetupItemBearerSURes,
+    id-E-RABSetupItemCtxtSURes,
+    id-E-RABSetupListBearerSURes,
+    id-E-RABSetupListCtxtSURes,
+    id-E-RABSubjecttoDataForwardingList,
+    id-E-RABToBeModifiedItemBearerModReq,
+    id-E-RABToBeModifiedListBearerModReq,
+    id-E-RABToBeReleasedList,
+    id-E-RABReleasedList,
+    id-E-RABToBeSetupItemBearerSUReq,
+    id-E-RABToBeSetupItemCtxtSUReq,
+    id-E-RABToBeSetupItemHOReq,
+    id-E-RABToBeSetupListBearerSUReq,
+    id-E-RABToBeSetupListCtxtSUReq,
+    id-E-RABToBeSetupListHOReq,
+    id-E-RABToBeSwitchedDLItem,
+    id-E-RABToBeSwitchedDLList,
+    id-E-RABToBeSwitchedULList,
+    id-E-RABToBeSwitchedULItem,
+    id-E-RABtoReleaseListHOCmd,
+    id-SecurityKey,
+    id-SecurityContext,
+    id-ServedGUMMEIs,
+    id-SONConfigurationTransferECT,
+    id-SONConfigurationTransferMCT,
+    id-Source-ToTarget-TransparentContainer,
+    id-Source-ToTarget-TransparentContainer-Secondary,
+    id-SourceMME-UE-S1AP-ID,
+    id-SRVCCOperationPossible,
+    id-SRVCCHOIndication,
+    id-SubscriberProfileIDforRFP,
+    id-SupportedTAs,
+    id-S-TMSI,
+    id-TAI,
+    id-TAIItem,
+    id-TAIList,
+    id-Target-ToSource-TransparentContainer,
+    id-Target-ToSource-TransparentContainer-Secondary,
+    id-TargetID,
+    id-TimeToWait,
+    id-TraceActivation,
+    id-TrafficLoadReductionIndication,
+    id-E-UTRAN-Trace-ID,
+    id-UEIdentityIndexValue,
+    id-UEPagingID,
+    id-UERadioCapability,
+    id-UTRANtoLTEHOInformationRes,
+    id-UE-associatedLogicalS1-ConnectionListResAck,
+    id-UE-associatedLogicalS1-ConnectionItem,
+    id-UESecurityCapabilities,
+    id-UE-S1AP-IDs,
+    id-ResetType,
+    id-MessageIdentifier,
+    id-SerialNumber,
+    id-WarningAreaList,
+    id-RepetitionPeriod,
+    id-NumberofBroadcastRequest,
+    id-WarningType,
+    id-WarningSecurityInfo,
+    id-DataCodingScheme,
+    id-WarningMessageContents,
+    id-BroadcastCompletedAreaList,
+    id-BroadcastCancelledAreaList,
+    id-RRC-Establishment-Cause,
+    id-TraceCollectionEntityIPAddress,
+    s1ap-maxnoofTAIs,
+    s1ap-maxNrOfErrors,
+    s1ap-maxNrOfE-RABs,
+    s1ap-maxNrOfIndividualS1ConnectionsToReset,
+    s1ap-maxnoofEmergencyAreaID,
+    s1ap-maxnoofCellID,
+    s1ap-maxnoofTAIforWarning,
+    s1ap-maxnoofCellinTAI,
+    s1ap-maxnoofCellinEAI,
+    id-ExtendedRepetitionPeriod,
+    id-PS-ServiceNotAvailable,
+    id-RegisteredLAI,
+    id-GUMMEIList,
+    id-SourceMME-GUMMEI,
+    id-MME-UE-S1AP-ID-2,
+    id-GW-TransportLayerAddress,
+    id-RelayNode-Indicator,
+    id-Correlation-ID,
+    id-MMERelaySupportIndicator,
+    id-GWContextReleaseIndication,
+    id-PrivacyIndicator
+
+
+S1ap-FROM S1AP-Constants;
 
 -- **************************************************************
 --
@@ -303,9 +299,9 @@ FROM S1AP-Constants;
 --
 -- **************************************************************
 
-E-RAB-IE-ContainerList			{ S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
-E-RAB-IE-ContainerPairList		{ S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfE-RABs,   {IEsSetParam} }
-ProtocolError-IE-ContainerList	{ S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
+E-RAB-IE-ContainerList            { S1AP-PROTOCOL-IES      : IEsSetParam }    ::= ProtocolIE-ContainerList     { 1, s1ap-maxNrOfE-RABs,   {IEsSetParam} }
+E-RAB-IE-ContainerPairList        { S1AP-PROTOCOL-IES-PAIR : IEsSetParam }    ::= ProtocolIE-ContainerPairList { 1, s1ap-maxNrOfE-RABs,   {IEsSetParam} }
+ProtocolError-IE-ContainerList    { S1AP-PROTOCOL-IES      : IEsSetParam }    ::= ProtocolIE-ContainerList     { 1, s1ap-maxNrOfE-RABs,   {IEsSetParam} }
 
 -- **************************************************************
 --
@@ -313,281 +309,281 @@ ProtocolError-IE-ContainerList	{ S1AP-PROTOCOL-IES      : IEsSetParam }	::= Prot
 --
 -- **************************************************************
 
-Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
-    { ID id-Bearers-SubjectToStatusTransfer-Item    CRITICALITY ignore  TYPE Bearers-SubjectToStatusTransfer-Item   PRESENCE mandatory  },
+S1ap-Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Bearers-SubjectToStatusTransfer-Item    CRITICALITY ignore  TYPE S1ap-Bearers-SubjectToStatusTransfer-Item   PRESENCE mandatory  },
     ...
 }
 
-E-RABInformationItemIEs S1AP-PROTOCOL-IES ::= {
-    { ID id-E-RABInformationListItem            CRITICALITY ignore  TYPE E-RABInformationListItem           PRESENCE mandatory  },
+S1ap-E-RABInformationItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABInformationListItem            CRITICALITY ignore  TYPE S1ap-E-RABInformationListItem           PRESENCE mandatory  },
     ...
 }
 
-E-RABItemIEs    S1AP-PROTOCOL-IES ::= {
-    { ID id-E-RABItem    CRITICALITY ignore     TYPE E-RABItem  PRESENCE mandatory },
+S1ap-E-RABItemIEs    S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABItem    CRITICALITY ignore     TYPE S1ap-E-RABItem  PRESENCE mandatory },
     ...
 }
 
-SONInformationReply-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SONInformationReply-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     -- Extension for Release 9 to transfer Time synchronization information --
-    {ID id-Time-Synchronization-Info    CRITICALITY ignore      EXTENSION TimeSynchronizationInfo       PRESENCE optional},
+    {ID id-Time-Synchronization-Info    CRITICALITY ignore      EXTENSION S1ap-TimeSynchronizationInfo       PRESENCE optional},
     ...
 }
 
-SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     -- Extension for Release 10 to transfer the IP addresses of the eNB initiating the ANR action --
-    {ID id-x2TNLConfigurationInfo   CRITICALITY ignore  EXTENSION X2TNLConfigurationInfo    PRESENCE conditional
+    {ID id-x2TNLConfigurationInfo   CRITICALITY ignore  EXTENSION S1ap-X2TNLConfigurationInfo    PRESENCE conditional
     -- This IE shall be present if the SON Information IE contains the SON Information Request IE and the SON Information Request IE is set to “X2TNL Configuration Info” -- },
     ...
 }
 
-SourceeNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SourceeNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ServedGUMMEIsItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ServedGUMMEIsItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-SupportedTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SupportedTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-S-TMSI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-S-TMSI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TimeSynchronizationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TimeSynchronizationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TAI-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TAI-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TAI-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TAI-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TABasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TABasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CompletedCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CompletedCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TargeteNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TargeteNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TargetRNC-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TargetRNC-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ThresholdEventA2-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ThresholdEventA2-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     -- Extension for Rel-10 to support MDT --
-    { ID id-MDTConfiguration    CRITICALITY ignore  EXTENSION MDT-Configuration     PRESENCE    optional },
+    { ID id-MDTConfiguration    CRITICALITY ignore  EXTENSION S1ap-MDT-Configuration     PRESENCE    optional },
     ...
 }
 
-UEAggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-UEAggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-UE-S1AP-ID-pair-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-UE-S1AP-ID-pair-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-UESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-UESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     -- Extension for Release 10 to transfer the IPsec and U-plane addresses during ANR action --
-    {ID id-eNBX2ExtendedTransportLayerAddresses CRITICALITY ignore  EXTENSION ENBX2ExtTLAs  PRESENCE optional},
+    {ID id-eNBX2ExtendedTransportLayerAddresses CRITICALITY ignore  EXTENSION S1ap-ENBX2ExtTLAs  PRESENCE optional},
     ...
 }
 
-ENBX2ExtTLA-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ENBX2ExtTLA-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-AllocationAndRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-AllocationAndRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CancelledCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CancelledCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CancelledCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CancelledCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CellID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CellID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CellID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CellID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CellBasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CellBasedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-Cdma2000OneXSRVCCInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-Cdma2000OneXSRVCCInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CellType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CellType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CSG-IdList-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CSG-IdList-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-COUNTvalue-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-COUNTvalue-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CompletedCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CompletedCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CriticalityDiagnostics-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CriticalityDiagnostics-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-EmergencyAreaID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-EmergencyAreaID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-EmergencyAreaID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-EmergencyAreaID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-EUTRAN-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-EUTRAN-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ForbiddenTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ForbiddenTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ForbiddenLAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ForbiddenLAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-GBR-QosInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-GBR-QosInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-GERAN-Cell-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-GERAN-Cell-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-GlobalENB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-GlobalENB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-GUMMEI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-GUMMEI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-ImmediateMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-ImmediateMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-LastVisitedEUTRANCellInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-LastVisitedEUTRANCellInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-LoggedMDT-ExtIEs    S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-LoggedMDT-ExtIEs    S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-MDT-Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-MDT-Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-PeriodicReportingMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-PeriodicReportingMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-RIMTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-RIMTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+S1ap-SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
     ...
 }
 
-Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
+S1ap-Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { S1ap-Bearers-SubjectToStatusTransfer-ItemIEs } }
 
-E-RABInformationList    ::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { E-RABInformationItemIEs } }
+S1ap-E-RABInformationList    ::= SEQUENCE (SIZE (1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { S1ap-E-RABInformationItemIEs } }
 
 -- **************************************************************
 --
@@ -595,27 +591,27 @@ E-RABInformationList    ::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF ProtocolIE-Si
 --
 -- **************************************************************
 
-HandoverRequired ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverRequiredIEs} },
-	...
+S1ap-HandoverRequired ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverRequiredIEs} },
+    ...
 }
 
-HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID		 							PRESENCE mandatory }|
-	{ ID id-eNB-UE-S1AP-ID							CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 							PRESENCE mandatory }|
-	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType		 							PRESENCE mandatory }|
-	{ ID id-Cause									CRITICALITY ignore	TYPE Cause		 									PRESENCE mandatory }|
-	{ ID id-TargetID								CRITICALITY reject	TYPE TargetID	 									PRESENCE mandatory }|
-	{ ID id-Direct-Forwarding-Path-Availability		CRITICALITY ignore	TYPE Direct-Forwarding-Path-Availability		PRESENCE optional }|
-	{ ID id-SRVCCHOIndication						CRITICALITY reject	TYPE SRVCCHOIndication								PRESENCE optional }|
-	{ ID id-Source-ToTarget-TransparentContainer	CRITICALITY reject	TYPE Source-ToTarget-TransparentContainer 	PRESENCE mandatory }|
-	{ ID id-Source-ToTarget-TransparentContainer-Secondary 	CRITICALITY reject 	TYPE Source-ToTarget-TransparentContainer	PRESENCE optional }|
-	{ ID id-MSClassmark2							CRITICALITY reject	TYPE MSClassmark2									PRESENCE conditional }|
-	{ ID id-MSClassmark3							CRITICALITY ignore	TYPE MSClassmark3									PRESENCE conditional }|
-	{ ID id-CSG-Id									CRITICALITY reject	TYPE CSG-Id											PRESENCE optional }|
-	{ ID id-CellAccessMode							CRITICALITY reject	TYPE CellAccessMode									PRESENCE optional }|
-	{ ID id-PS-ServiceNotAvailable					CRITICALITY ignore	TYPE PS-ServiceNotAvailable						PRESENCE optional },
-	...
+S1ap-HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                                     PRESENCE mandatory }|
+    { ID id-eNB-UE-S1AP-ID                            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                                     PRESENCE mandatory }|
+    { ID id-HandoverType                            CRITICALITY reject    TYPE S1ap-HandoverType                                     PRESENCE mandatory }|
+    { ID id-Cause                                    CRITICALITY ignore    TYPE S1ap-Cause                                             PRESENCE mandatory }|
+    { ID id-TargetID                                CRITICALITY reject    TYPE S1ap-TargetID                                         PRESENCE mandatory }|
+    { ID id-Direct-Forwarding-Path-Availability        CRITICALITY ignore    TYPE S1ap-Direct-Forwarding-Path-Availability        PRESENCE optional }|
+    { ID id-SRVCCHOIndication                        CRITICALITY reject    TYPE S1ap-SRVCCHOIndication                                PRESENCE optional }|
+    { ID id-Source-ToTarget-TransparentContainer    CRITICALITY reject    TYPE S1ap-Source-ToTarget-TransparentContainer     PRESENCE mandatory }|
+    { ID id-Source-ToTarget-TransparentContainer-Secondary     CRITICALITY reject     TYPE S1ap-Source-ToTarget-TransparentContainer    PRESENCE optional }|
+    { ID id-MSClassmark2                            CRITICALITY reject    TYPE S1ap-MSClassmark2                                    PRESENCE conditional }|
+    { ID id-MSClassmark3                            CRITICALITY ignore    TYPE S1ap-MSClassmark3                                    PRESENCE conditional }|
+    { ID id-CSG-Id                                    CRITICALITY reject    TYPE S1ap-CSG-Id                                            PRESENCE optional }|
+    { ID id-CellAccessMode                            CRITICALITY reject    TYPE S1ap-CellAccessMode                                    PRESENCE optional }|
+    { ID id-PS-ServiceNotAvailable                    CRITICALITY ignore    TYPE S1ap-PS-ServiceNotAvailable                        PRESENCE optional },
+    ...
 }
 
 
@@ -625,37 +621,37 @@ HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-HandoverCommand ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container { { HandoverCommandIEs} },
-	...
+S1ap-HandoverCommand ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container { { S1ap-HandoverCommandIEs} },
+    ...
 }
 
-HandoverCommandIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID		 									PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID							CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 									PRESENCE mandatory	} |
-	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType		 									PRESENCE mandatory	} |
-	{ ID id-NASSecurityParametersfromE-UTRAN		CRITICALITY reject	TYPE NASSecurityParametersfromE-UTRAN					PRESENCE conditional
-	-- This IE shall be present if HandoverType IE is set to value "LTEtoUTRAN" or "LTEtoGERAN" --			}|
-	{ ID id-E-RABSubjecttoDataForwardingList		CRITICALITY ignore	TYPE E-RABDataForwardingList		 			PRESENCE optional	} |
-	{ ID id-E-RABtoReleaseListHOCmd					CRITICALITY ignore	TYPE E-RABList		 										PRESENCE optional	} |
-	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY	reject	TYPE Target-ToSource-TransparentContainer			PRESENCE mandatory }|
-	{ ID id-Target-ToSource-TransparentContainer-Secondary	CRITICALITY	reject	TYPE Target-ToSource-TransparentContainer			PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics								PRESENCE optional	},
-	...
+S1ap-HandoverCommandIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                                             PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                                             PRESENCE mandatory    } |
+    { ID id-HandoverType                            CRITICALITY reject    TYPE S1ap-HandoverType                                             PRESENCE mandatory    } |
+    { ID id-NASSecurityParametersfromE-UTRAN        CRITICALITY reject    TYPE S1ap-NASSecurityParametersfromE-UTRAN                    PRESENCE conditional
+    -- This IE shall be present if HandoverType IE is set to value "LTEtoUTRAN" or "LTEtoGERAN" --            }|
+    { ID id-E-RABSubjecttoDataForwardingList        CRITICALITY ignore    TYPE S1ap-E-RABDataForwardingList                     PRESENCE optional    } |
+    { ID id-E-RABtoReleaseListHOCmd                    CRITICALITY ignore    TYPE S1ap-E-RABList                                                 PRESENCE optional    } |
+    { ID id-Target-ToSource-TransparentContainer    CRITICALITY    reject    TYPE S1ap-Target-ToSource-TransparentContainer            PRESENCE mandatory }|
+    { ID id-Target-ToSource-TransparentContainer-Secondary    CRITICALITY    reject    TYPE S1ap-Target-ToSource-TransparentContainer            PRESENCE optional }|
+    { ID id-CriticalityDiagnostics                    CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics                                PRESENCE optional    },
+    ...
 }
 
-E-RABDataForwardingList ::= E-RAB-IE-ContainerList { {E-RABDataForwardingItemIEs} }
+S1ap-E-RABDataForwardingList ::= E-RAB-IE-ContainerList { {S1ap-E-RABDataForwardingItemIEs} }
 
-E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABDataForwardingItem			CRITICALITY ignore	TYPE E-RABDataForwardingItem			PRESENCE mandatory	},
-	...
+S1ap-E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABDataForwardingItem            CRITICALITY ignore    TYPE S1ap-E-RABDataForwardingItem            PRESENCE mandatory    },
+    ...
 }
 
-E-RABDataForwardingItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABDataForwardingItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
-E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} }
+S1ap-E-RABList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABItemIEs} }
 
 -- **************************************************************
 --
@@ -663,17 +659,17 @@ E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer {
 --
 -- **************************************************************
 
-HandoverPreparationFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverPreparationFailureIEs} },
-	...
+S1ap-HandoverPreparationFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverPreparationFailureIEs} },
+    ...
 }
 
-HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause							CRITICALITY ignore	TYPE Cause		 					PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-Cause                            CRITICALITY ignore    TYPE S1ap-Cause                             PRESENCE mandatory    }|
+    { ID id-CriticalityDiagnostics            CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -688,44 +684,44 @@ HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-HandoverRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {HandoverRequestIEs} },
-	...
+S1ap-HandoverRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-HandoverRequestIEs} },
+    ...
 }
 
-HandoverRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID						PRESENCE mandatory}|
-	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType						PRESENCE mandatory}|
-	{ ID id-Cause									CRITICALITY ignore	TYPE Cause		 						PRESENCE mandatory}|
-	{ ID id-uEaggregateMaximumBitrate				CRITICALITY reject	TYPE UEAggregateMaximumBitrate			PRESENCE mandatory}|
-	{ ID id-E-RABToBeSetupListHOReq					CRITICALITY reject	TYPE E-RABToBeSetupListHOReq			PRESENCE mandatory}|
-	{ ID id-Source-ToTarget-TransparentContainer	CRITICALITY reject	TYPE Source-ToTarget-TransparentContainer	PRESENCE mandatory}|
-	{ ID id-UESecurityCapabilities					CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE mandatory}|
-	{ ID id-HandoverRestrictionList					CRITICALITY ignore	TYPE HandoverRestrictionList			PRESENCE optional}|
-	{ ID id-TraceActivation							CRITICALITY ignore	TYPE TraceActivation					PRESENCE optional}|
-	{ ID id-RequestType								CRITICALITY ignore	TYPE RequestType						PRESENCE optional}|
-	{ ID id-SRVCCOperationPossible					CRITICALITY ignore	TYPE SRVCCOperationPossible			PRESENCE optional}|
-	{ ID id-SecurityContext							CRITICALITY reject	TYPE SecurityContext					PRESENCE mandatory}|
-	{ ID id-NASSecurityParameterstoE-UTRAN			CRITICALITY reject	TYPE NASSecurityParameterstoE-UTRAN		PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" --}|
-	{ ID id-CSG-Id									CRITICALITY reject	TYPE CSG-Id								PRESENCE optional}|
-	{ ID id-CSGMembershipStatus						CRITICALITY ignore	TYPE CSGMembershipStatus				PRESENCE optional}|
-	{ ID id-GUMMEI-ID								CRITICALITY ignore	TYPE GUMMEI								PRESENCE optional}|
-	{ ID id-MME-UE-S1AP-ID-2						CRITICALITY ignore	TYPE MME-UE-S1AP-ID						PRESENCE optional}|
-	{ ID id-ManagementBasedMDTAllowed				CRITICALITY ignore	TYPE ManagementBasedMDTAllowed			PRESENCE optional},
-	...
+S1ap-HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                        PRESENCE mandatory}|
+    { ID id-HandoverType                            CRITICALITY reject    TYPE S1ap-HandoverType                        PRESENCE mandatory}|
+    { ID id-Cause                                    CRITICALITY ignore    TYPE S1ap-Cause                                 PRESENCE mandatory}|
+    { ID id-uEaggregateMaximumBitrate                CRITICALITY reject    TYPE S1ap-UEAggregateMaximumBitrate            PRESENCE mandatory}|
+    { ID id-E-RABToBeSetupListHOReq                    CRITICALITY reject    TYPE S1ap-E-RABToBeSetupListHOReq            PRESENCE mandatory}|
+    { ID id-Source-ToTarget-TransparentContainer    CRITICALITY reject    TYPE S1ap-Source-ToTarget-TransparentContainer    PRESENCE mandatory}|
+    { ID id-UESecurityCapabilities                    CRITICALITY reject    TYPE S1ap-UESecurityCapabilities            PRESENCE mandatory}|
+    { ID id-HandoverRestrictionList                    CRITICALITY ignore    TYPE S1ap-HandoverRestrictionList            PRESENCE optional}|
+    { ID id-TraceActivation                            CRITICALITY ignore    TYPE S1ap-TraceActivation                    PRESENCE optional}|
+    { ID id-RequestType                                CRITICALITY ignore    TYPE S1ap-RequestType                        PRESENCE optional}|
+    { ID id-SRVCCOperationPossible                    CRITICALITY ignore    TYPE S1ap-SRVCCOperationPossible            PRESENCE optional}|
+    { ID id-SecurityContext                            CRITICALITY reject    TYPE S1ap-SecurityContext                    PRESENCE mandatory}|
+    { ID id-NASSecurityParameterstoE-UTRAN            CRITICALITY reject    TYPE S1ap-NASSecurityParameterstoE-UTRAN        PRESENCE conditional
+    -- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" --}|
+    { ID id-CSG-Id                                    CRITICALITY reject    TYPE S1ap-CSG-Id                                PRESENCE optional}|
+    { ID id-CSGMembershipStatus                        CRITICALITY ignore    TYPE S1ap-CSGMembershipStatus                PRESENCE optional}|
+    { ID id-GUMMEI-ID                                CRITICALITY ignore    TYPE S1ap-GUMMEI                                PRESENCE optional}|
+    { ID id-MME-UE-S1AP-ID-2                        CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                        PRESENCE optional}|
+    { ID id-ManagementBasedMDTAllowed                CRITICALITY ignore    TYPE S1ap-ManagementBasedMDTAllowed            PRESENCE optional},
+    ...
 }
 
-E-RABToBeSetupListHOReq 					::= E-RAB-IE-ContainerList { {E-RABToBeSetupItemHOReqIEs} }
+S1ap-E-RABToBeSetupListHOReq                     ::= E-RAB-IE-ContainerList { {S1ap-E-RABToBeSetupItemHOReqIEs} }
 
-E-RABToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSetupItemHOReq			CRITICALITY reject	TYPE E-RABToBeSetupItemHOReq			PRESENCE mandatory	},
-	...
+S1ap-E-RABToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeSetupItemHOReq            CRITICALITY reject    TYPE S1ap-E-RABToBeSetupItemHOReq            PRESENCE mandatory    },
+    ...
 }
 
-E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	{ID	id-Data-Forwarding-Not-Possible	   CRITICALITY ignore	EXTENSION  Data-Forwarding-Not-Possible   PRESENCE optional},
-	...
+S1ap-E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    {ID    id-Data-Forwarding-Not-Possible       CRITICALITY ignore    EXTENSION  S1ap-Data-Forwarding-Not-Possible   PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -734,49 +730,49 @@ E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-HandoverRequestAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {HandoverRequestAcknowledgeIEs} },
-	...
+S1ap-HandoverRequestAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-HandoverRequestAcknowledgeIEs} },
+    ...
 }
 
-HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID							CRITICALITY ignore	TYPE MME-UE-S1AP-ID									PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID							CRITICALITY ignore	TYPE ENB-UE-S1AP-ID									PRESENCE mandatory	} |
-	{ ID id-E-RABAdmittedList						CRITICALITY ignore	TYPE E-RABAdmittedList								PRESENCE mandatory	} |
-	{ ID id-E-RABFailedToSetupListHOReqAck			CRITICALITY ignore	TYPE E-RABFailedToSetupListHOReqAck			PRESENCE optional	} |
-	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY reject	TYPE Target-ToSource-TransparentContainer	PRESENCE mandatory }|
-	{ ID id-CSG-Id									CRITICALITY ignore	TYPE CSG-Id											PRESENCE optional } |
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional	},
-	...
+S1ap-HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                            CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                                    PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                            CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                                    PRESENCE mandatory    } |
+    { ID id-E-RABAdmittedList                        CRITICALITY ignore    TYPE S1ap-E-RABAdmittedList                                PRESENCE mandatory    } |
+    { ID id-E-RABFailedToSetupListHOReqAck            CRITICALITY ignore    TYPE S1ap-E-RABFailedToSetupListHOReqAck            PRESENCE optional    } |
+    { ID id-Target-ToSource-TransparentContainer    CRITICALITY reject    TYPE S1ap-Target-ToSource-TransparentContainer    PRESENCE mandatory }|
+    { ID id-CSG-Id                                    CRITICALITY ignore    TYPE S1ap-CSG-Id                                            PRESENCE optional } |
+    { ID id-CriticalityDiagnostics                    CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics                        PRESENCE optional    },
+    ...
 }
 
-E-RABAdmittedList 					::= E-RAB-IE-ContainerList { {E-RABAdmittedItemIEs} }
+S1ap-E-RABAdmittedList                     ::= E-RAB-IE-ContainerList { {S1ap-E-RABAdmittedItemIEs} }
 
-E-RABAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABAdmittedItem			CRITICALITY ignore	TYPE E-RABAdmittedItem			PRESENCE mandatory	},
-	...
+S1ap-E-RABAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABAdmittedItem            CRITICALITY ignore    TYPE S1ap-E-RABAdmittedItem            PRESENCE mandatory    },
+    ...
 }
 
-E-RABAdmittedItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABAdmittedItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
-E-RABFailedToSetupListHOReqAck 					::= E-RAB-IE-ContainerList { {E-RABFailedToSetupItemHOReqAckIEs} }
+S1ap-E-RABFailedToSetupListHOReqAck                     ::= E-RAB-IE-ContainerList { {S1ap-E-RABFailedToSetupItemHOReqAckIEs} }
 
-E-RABFailedToSetupItemHOReqAckIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABFailedToSetupItemHOReqAck			CRITICALITY ignore	TYPE E-RABFailedToSetupItemHOReqAck			PRESENCE mandatory	},
-	...
+S1ap-E-RABFailedToSetupItemHOReqAckIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABFailedToSetupItemHOReqAck            CRITICALITY ignore    TYPE S1ap-E-RABFailedToSetupItemHOReqAck            PRESENCE mandatory    },
+    ...
 }
 
-E-RABFailedToSetupItemHOReqAck ::= SEQUENCE {
-	e-RAB-ID						E-RAB-ID,
-	cause				Cause,
-	iE-Extensions					ProtocolExtensionContainer { { E-RABFailedToSetupItemHOReqAckExtIEs} }			OPTIONAL,
-	...
+S1ap-E-RABFailedToSetupItemHOReqAck ::= SEQUENCE {
+    e-RAB-ID                        E-RAB-ID,
+    cause                Cause,
+    iE-Extensions                    ProtocolExtensionContainer { { S1ap-E-RABFailedToSetupItemHOReqAckExtIEs} }            OPTIONAL,
+    ...
 }
 
-E-RABFailedToSetupItemHOReqAckExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABFailedToSetupItemHOReqAckExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 
@@ -786,16 +782,16 @@ E-RABFailedToSetupItemHOReqAckExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-HandoverFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverFailureIEs} },
-	...
+S1ap-HandoverFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverFailureIEs} },
+    ...
 }
 
-HandoverFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause		 				PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional	},
-	...
+S1ap-HandoverFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory    } |
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                         PRESENCE mandatory    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics        PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -810,17 +806,17 @@ HandoverFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-HandoverNotify ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverNotifyIEs} },
-	...
+S1ap-HandoverNotify ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverNotifyIEs} },
+    ...
 }
 
-HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID			PRESENCE mandatory	} |
-	{ ID id-EUTRAN-CGI				CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory}|
-	{ ID id-TAI						CRITICALITY ignore	TYPE TAI					PRESENCE mandatory},
-	...
+S1ap-HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID            PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID            PRESENCE mandatory    } |
+    { ID id-EUTRAN-CGI                CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                PRESENCE mandatory}|
+    { ID id-TAI                        CRITICALITY ignore    TYPE S1ap-TAI                    PRESENCE mandatory},
+    ...
 }
 
 -- **************************************************************
@@ -835,33 +831,33 @@ HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-PathSwitchRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { PathSwitchRequestIEs} },
-	...
+S1ap-PathSwitchRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-PathSwitchRequestIEs} },
+    ...
 }
 
-PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 			PRESENCE mandatory}|
-	{ ID id-E-RABToBeSwitchedDLList			CRITICALITY reject	TYPE E-RABToBeSwitchedDLList	PRESENCE mandatory}|
-	{ ID id-SourceMME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID	 			PRESENCE mandatory}|
-	{ ID id-EUTRAN-CGI						CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory}|
-	{ ID id-TAI								CRITICALITY ignore	TYPE TAI						PRESENCE mandatory}|
-	{ ID id-UESecurityCapabilities			CRITICALITY ignore	TYPE UESecurityCapabilities		PRESENCE mandatory}|
-	{ ID id-CSG-Id							CRITICALITY ignore	TYPE CSG-Id						PRESENCE optional}|
-	{ ID id-CellAccessMode					CRITICALITY ignore	TYPE CellAccessMode				PRESENCE optional}|
-	{ ID id-SourceMME-GUMMEI				CRITICALITY ignore	TYPE GUMMEI						PRESENCE optional},
-	...
+S1ap-PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                 PRESENCE mandatory}|
+    { ID id-E-RABToBeSwitchedDLList            CRITICALITY reject    TYPE S1ap-E-RABToBeSwitchedDLList    PRESENCE mandatory}|
+    { ID id-SourceMME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                 PRESENCE mandatory}|
+    { ID id-EUTRAN-CGI                        CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                    PRESENCE mandatory}|
+    { ID id-TAI                                CRITICALITY ignore    TYPE S1ap-TAI                        PRESENCE mandatory}|
+    { ID id-UESecurityCapabilities            CRITICALITY ignore    TYPE S1ap-UESecurityCapabilities        PRESENCE mandatory}|
+    { ID id-CSG-Id                            CRITICALITY ignore    TYPE S1ap-CSG-Id                        PRESENCE optional}|
+    { ID id-CellAccessMode                    CRITICALITY ignore    TYPE S1ap-CellAccessMode                PRESENCE optional}|
+    { ID id-SourceMME-GUMMEI                CRITICALITY ignore    TYPE S1ap-GUMMEI                        PRESENCE optional},
+    ...
 }
 
-E-RABToBeSwitchedDLList 					::= E-RAB-IE-ContainerList { {E-RABToBeSwitchedDLItemIEs} }
+S1ap-E-RABToBeSwitchedDLList                     ::= E-RAB-IE-ContainerList { {S1ap-E-RABToBeSwitchedDLItemIEs} }
 
-E-RABToBeSwitchedDLItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSwitchedDLItem			CRITICALITY reject	TYPE E-RABToBeSwitchedDLItem			PRESENCE mandatory	},
-	...
+S1ap-E-RABToBeSwitchedDLItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeSwitchedDLItem            CRITICALITY reject    TYPE S1ap-E-RABToBeSwitchedDLItem            PRESENCE mandatory    },
+    ...
 }
 
-E-RABToBeSwitchedDLItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABToBeSwitchedDLItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 -- **************************************************************
@@ -870,32 +866,32 @@ E-RABToBeSwitchedDLItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-PathSwitchRequestAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { PathSwitchRequestAcknowledgeIEs} },
-	...
+S1ap-PathSwitchRequestAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-PathSwitchRequestAcknowledgeIEs} },
+    ...
 }
 
-PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID					PRESENCE mandatory}|
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional}|
-	{ ID id-E-RABToBeSwitchedULList			CRITICALITY ignore	TYPE E-RABToBeSwitchedULList		PRESENCE optional}|
-	{ ID id-E-RABToBeReleasedList			CRITICALITY ignore	TYPE E-RABList						PRESENCE optional}|
-	{ ID id-SecurityContext					CRITICALITY reject	TYPE SecurityContext				PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional}|
-	{ ID id-MME-UE-S1AP-ID-2				CRITICALITY ignore	TYPE MME-UE-S1AP-ID					PRESENCE optional},
-	...
+S1ap-PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                    PRESENCE mandatory}|
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                    PRESENCE mandatory}|
+    { ID id-uEaggregateMaximumBitrate        CRITICALITY ignore    TYPE S1ap-UEAggregateMaximumBitrate        PRESENCE optional}|
+    { ID id-E-RABToBeSwitchedULList            CRITICALITY ignore    TYPE S1ap-E-RABToBeSwitchedULList        PRESENCE optional}|
+    { ID id-E-RABToBeReleasedList            CRITICALITY ignore    TYPE S1ap-E-RABList                        PRESENCE optional}|
+    { ID id-SecurityContext                    CRITICALITY reject    TYPE S1ap-SecurityContext                PRESENCE mandatory}|
+    { ID id-CriticalityDiagnostics            CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional}|
+    { ID id-MME-UE-S1AP-ID-2                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                    PRESENCE optional},
+    ...
 }
 
-E-RABToBeSwitchedULList ::= E-RAB-IE-ContainerList { {E-RABToBeSwitchedULItemIEs} }
+S1ap-E-RABToBeSwitchedULList ::= E-RAB-IE-ContainerList { {S1ap-E-RABToBeSwitchedULItemIEs} }
 
-E-RABToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSwitchedULItem		CRITICALITY ignore	TYPE E-RABToBeSwitchedULItem	PRESENCE mandatory	},
-	...
+S1ap-E-RABToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeSwitchedULItem        CRITICALITY ignore    TYPE S1ap-E-RABToBeSwitchedULItem    PRESENCE mandatory    },
+    ...
 }
 
-E-RABToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 
@@ -905,17 +901,17 @@ E-RABToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-PathSwitchRequestFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { PathSwitchRequestFailureIEs} },
-	...
+S1ap-PathSwitchRequestFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-PathSwitchRequestFailureIEs} },
+    ...
 }
 
-PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	} |
-	{ ID id-Cause							CRITICALITY ignore	TYPE Cause		 					PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-Cause                            CRITICALITY ignore    TYPE S1ap-Cause                             PRESENCE mandatory    }|
+    { ID id-CriticalityDiagnostics            CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -930,16 +926,16 @@ PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-HandoverCancel ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverCancelIEs} },
-	...
+S1ap-HandoverCancel ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverCancelIEs} },
+    ...
 }
 
-HandoverCancelIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	},
-	...
+S1ap-HandoverCancelIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-Cause                    CRITICALITY ignore    TYPE S1ap-Cause                     PRESENCE mandatory    },
+    ...
 }
 
 -- **************************************************************
@@ -948,16 +944,16 @@ HandoverCancelIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-HandoverCancelAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { HandoverCancelAcknowledgeIEs} },
-	...
+S1ap-HandoverCancelAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-HandoverCancelAcknowledgeIEs} },
+    ...
 }
 
-HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -972,29 +968,29 @@ HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-E-RABSetupRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABSetupRequestIEs} },
-	...
+S1ap-E-RABSetupRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-E-RABSetupRequestIEs} },
+    ...
 }
 
-E-RABSetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID	 						PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 						PRESENCE mandatory	}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate				PRESENCE optional	}|
-	{ ID id-E-RABToBeSetupListBearerSUReq	CRITICALITY reject	TYPE E-RABToBeSetupListBearerSUReq		PRESENCE mandatory	},
-	...
+S1ap-E-RABSetupRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                             PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                             PRESENCE mandatory    }|
+    { ID id-uEaggregateMaximumBitrate        CRITICALITY reject    TYPE S1ap-UEAggregateMaximumBitrate                PRESENCE optional    }|
+    { ID id-E-RABToBeSetupListBearerSUReq    CRITICALITY reject    TYPE S1ap-E-RABToBeSetupListBearerSUReq        PRESENCE mandatory    },
+    ...
 }
 
-E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemBearerSUReqIEs} }
+S1ap-E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABToBeSetupItemBearerSUReqIEs} }
 
-E-RABToBeSetupItemBearerSUReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSetupItemBearerSUReq	 CRITICALITY reject 	TYPE E-RABToBeSetupItemBearerSUReq 	PRESENCE mandatory },
-	...
+S1ap-E-RABToBeSetupItemBearerSUReqIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeSetupItemBearerSUReq     CRITICALITY reject     TYPE S1ap-E-RABToBeSetupItemBearerSUReq     PRESENCE mandatory },
+    ...
 }
 
-E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Correlation-ID		CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional},
-	...
+S1ap-E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    { ID id-Correlation-ID        CRITICALITY ignore    EXTENSION S1ap-Correlation-ID        PRESENCE optional},
+    ...
 }
 
 
@@ -1004,30 +1000,30 @@ E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-E-RABSetupResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABSetupResponseIEs} },
-	...
+S1ap-E-RABSetupResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-E-RABSetupResponseIEs} },
+    ...
 }
 
-E-RABSetupResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-E-RABSetupListBearerSURes				CRITICALITY ignore	TYPE E-RABSetupListBearerSURes			PRESENCE optional	}|
-	{ ID id-E-RABFailedToSetupListBearerSURes		CRITICALITY ignore	TYPE E-RABList					PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-E-RABSetupResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-E-RABSetupListBearerSURes                CRITICALITY ignore    TYPE S1ap-E-RABSetupListBearerSURes            PRESENCE optional    }|
+    { ID id-E-RABFailedToSetupListBearerSURes        CRITICALITY ignore    TYPE S1ap-E-RABList                    PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 
-E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemBearerSUResIEs} }
+S1ap-E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABSetupItemBearerSUResIEs} }
 
-E-RABSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABSetupItemBearerSURes	 CRITICALITY ignore 	TYPE E-RABSetupItemBearerSURes 	PRESENCE mandatory },
-	...
+S1ap-E-RABSetupItemBearerSUResIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABSetupItemBearerSURes     CRITICALITY ignore     TYPE S1ap-E-RABSetupItemBearerSURes     PRESENCE mandatory },
+    ...
 }
 
-E-RABSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 
@@ -1044,28 +1040,28 @@ E-RABSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-E-RABModifyRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABModifyRequestIEs} },
-	...
+S1ap-E-RABModifyRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-E-RABModifyRequestIEs} },
+    ...
 }
 
-E-RABModifyRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID						CRITICALITY reject	TYPE MME-UE-S1AP-ID								PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID						CRITICALITY reject	TYPE ENB-UE-S1AP-ID								PRESENCE mandatory	}|
-	{ ID id-uEaggregateMaximumBitrate			CRITICALITY reject	TYPE UEAggregateMaximumBitrate				PRESENCE optional	}|
-	{ ID id-E-RABToBeModifiedListBearerModReq	CRITICALITY reject	TYPE E-RABToBeModifiedListBearerModReq		PRESENCE mandatory	},
-	...
+S1ap-E-RABModifyRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                        CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                                PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                        CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                                PRESENCE mandatory    }|
+    { ID id-uEaggregateMaximumBitrate            CRITICALITY reject    TYPE S1ap-UEAggregateMaximumBitrate                PRESENCE optional    }|
+    { ID id-E-RABToBeModifiedListBearerModReq    CRITICALITY reject    TYPE S1ap-E-RABToBeModifiedListBearerModReq        PRESENCE mandatory    },
+    ...
 }
 
-E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeModifiedItemBearerModReqIEs} }
+S1ap-E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABToBeModifiedItemBearerModReqIEs} }
 
-E-RABToBeModifiedItemBearerModReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeModifiedItemBearerModReq	 CRITICALITY reject 	TYPE E-RABToBeModifiedItemBearerModReq 	PRESENCE mandatory },
-	...
+S1ap-E-RABToBeModifiedItemBearerModReqIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeModifiedItemBearerModReq     CRITICALITY reject     TYPE S1ap-E-RABToBeModifiedItemBearerModReq     PRESENCE mandatory },
+    ...
 }
 
-E-RABToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 
@@ -1076,30 +1072,30 @@ E-RABToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-E-RABModifyResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABModifyResponseIEs} },
-	...
+S1ap-E-RABModifyResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-E-RABModifyResponseIEs} },
+    ...
 }
 
-E-RABModifyResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-E-RABModifyListBearerModRes				CRITICALITY ignore	TYPE E-RABModifyListBearerModRes		PRESENCE optional	}|
-	{ ID id-E-RABFailedToModifyList		CRITICALITY ignore	TYPE E-RABList				PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-E-RABModifyResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-E-RABModifyListBearerModRes                CRITICALITY ignore    TYPE S1ap-E-RABModifyListBearerModRes        PRESENCE optional    }|
+    { ID id-E-RABFailedToModifyList        CRITICALITY ignore    TYPE S1ap-E-RABList                PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 
-E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABModifyItemBearerModResIEs} }
+S1ap-E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABModifyItemBearerModResIEs} }
 
-E-RABModifyItemBearerModResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABModifyItemBearerModRes	 CRITICALITY ignore 	TYPE E-RABModifyItemBearerModRes 	PRESENCE mandatory },
-	...
+S1ap-E-RABModifyItemBearerModResIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABModifyItemBearerModRes     CRITICALITY ignore     TYPE S1ap-E-RABModifyItemBearerModRes     PRESENCE mandatory },
+    ...
 }
 
-E-RABModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 -- **************************************************************
@@ -1114,18 +1110,18 @@ E-RABModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-E-RABReleaseCommand ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container		{ {E-RABReleaseCommandIEs} },
-	...
+S1ap-E-RABReleaseCommand ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container        { {S1ap-E-RABReleaseCommandIEs} },
+    ...
 }
 
-E-RABReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
-	{ ID id-E-RABToBeReleasedList		CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	}|
-	{ ID id-NAS-PDU							CRITICALITY ignore	TYPE NAS-PDU						PRESENCE optional	},
-	...
+S1ap-E-RABReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-uEaggregateMaximumBitrate        CRITICALITY reject    TYPE S1ap-UEAggregateMaximumBitrate        PRESENCE optional    }|
+    { ID id-E-RABToBeReleasedList        CRITICALITY ignore    TYPE S1ap-E-RABList                    PRESENCE mandatory    }|
+    { ID id-NAS-PDU                            CRITICALITY ignore    TYPE S1ap-NAS-PDU                        PRESENCE optional    },
+    ...
 }
 
 
@@ -1135,30 +1131,30 @@ E-RABReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-E-RABReleaseResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { E-RABReleaseResponseIEs } },
-	...
+S1ap-E-RABReleaseResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-E-RABReleaseResponseIEs } },
+    ...
 }
 
-E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-E-RABReleaseListBearerRelComp				CRITICALITY ignore	TYPE E-RABReleaseListBearerRelComp		PRESENCE optional	}|
-	{ ID id-E-RABFailedToReleaseList		CRITICALITY ignore	TYPE E-RABList				PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-E-RABReleaseListBearerRelComp                CRITICALITY ignore    TYPE S1ap-E-RABReleaseListBearerRelComp        PRESENCE optional    }|
+    { ID id-E-RABFailedToReleaseList        CRITICALITY ignore    TYPE S1ap-E-RABList                PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 
-E-RABReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABReleaseItemBearerRelCompIEs} }
+S1ap-E-RABReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABReleaseItemBearerRelCompIEs} }
 
-E-RABReleaseItemBearerRelCompIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABReleaseItemBearerRelComp	 CRITICALITY ignore 	TYPE E-RABReleaseItemBearerRelComp 	PRESENCE mandatory },
-	...
+S1ap-E-RABReleaseItemBearerRelCompIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABReleaseItemBearerRelComp     CRITICALITY ignore     TYPE S1ap-E-RABReleaseItemBearerRelComp     PRESENCE mandatory },
+    ...
 }
 
-E-RABReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 -- **************************************************************
@@ -1173,16 +1169,16 @@ E-RABReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-E-RABReleaseIndication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABReleaseIndicationIEs} },
-	...
+S1ap-E-RABReleaseIndication ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-E-RABReleaseIndicationIEs} },
+    ...
 }
 
-E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-E-RABReleasedList			CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	},
-	...
+S1ap-E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    }|
+    { ID id-E-RABReleasedList            CRITICALITY ignore    TYPE S1ap-E-RABList                    PRESENCE mandatory    },
+    ...
 }
 -- **************************************************************
 --
@@ -1196,42 +1192,42 @@ E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-InitialContextSetupRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {InitialContextSetupRequestIEs} },
-	...
+S1ap-InitialContextSetupRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-InitialContextSetupRequestIEs} },
+    ...
 }
 
-InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory}|
-	{ ID id-uEaggregateMaximumBitrate	CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE mandatory}|
-	{ ID id-E-RABToBeSetupListCtxtSUReq	CRITICALITY reject	TYPE E-RABToBeSetupListCtxtSUReq	PRESENCE mandatory}|
-	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE mandatory}|
-	{ ID id-SecurityKey					CRITICALITY reject	TYPE SecurityKey					PRESENCE mandatory}|
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 			PRESENCE optional}|
-	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList		PRESENCE optional}|
-	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional}|
-	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP		PRESENCE optional}|
-	{ ID id-CSFallbackIndicator			CRITICALITY reject	TYPE CSFallbackIndicator			PRESENCE optional}|
-	{ ID id-SRVCCOperationPossible		CRITICALITY ignore	TYPE SRVCCOperationPossible			PRESENCE optional}|
-	{ ID id-CSGMembershipStatus			CRITICALITY ignore	TYPE CSGMembershipStatus			PRESENCE optional}|
-	{ ID id-RegisteredLAI				CRITICALITY ignore	TYPE LAI							PRESENCE optional}|
-	{ ID id-GUMMEI-ID					CRITICALITY ignore	TYPE GUMMEI							PRESENCE optional}|
-	{ ID id-MME-UE-S1AP-ID-2			CRITICALITY ignore	TYPE MME-UE-S1AP-ID					PRESENCE optional}|
-	{ ID id-ManagementBasedMDTAllowed	CRITICALITY ignore	TYPE ManagementBasedMDTAllowed		PRESENCE optional},
-	...
+S1ap-InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory}|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory}|
+    { ID id-uEaggregateMaximumBitrate    CRITICALITY reject    TYPE S1ap-UEAggregateMaximumBitrate        PRESENCE mandatory}|
+    { ID id-E-RABToBeSetupListCtxtSUReq    CRITICALITY reject    TYPE S1ap-E-RABToBeSetupListCtxtSUReq    PRESENCE mandatory}|
+    { ID id-UESecurityCapabilities        CRITICALITY reject    TYPE S1ap-UESecurityCapabilities            PRESENCE mandatory}|
+    { ID id-SecurityKey                    CRITICALITY reject    TYPE S1ap-SecurityKey                    PRESENCE mandatory}|
+    { ID id-TraceActivation                CRITICALITY ignore    TYPE S1ap-TraceActivation                 PRESENCE optional}|
+    { ID id-HandoverRestrictionList        CRITICALITY ignore    TYPE S1ap-HandoverRestrictionList        PRESENCE optional}|
+    { ID id-UERadioCapability            CRITICALITY ignore    TYPE S1ap-UERadioCapability                PRESENCE optional}|
+    { ID id-SubscriberProfileIDforRFP    CRITICALITY ignore    TYPE S1ap-SubscriberProfileIDforRFP        PRESENCE optional}|
+    { ID id-CSFallbackIndicator            CRITICALITY reject    TYPE S1ap-CSFallbackIndicator            PRESENCE optional}|
+    { ID id-SRVCCOperationPossible        CRITICALITY ignore    TYPE S1ap-SRVCCOperationPossible            PRESENCE optional}|
+    { ID id-CSGMembershipStatus            CRITICALITY ignore    TYPE S1ap-CSGMembershipStatus            PRESENCE optional}|
+    { ID id-RegisteredLAI                CRITICALITY ignore    TYPE S1ap-LAI                            PRESENCE optional}|
+    { ID id-GUMMEI-ID                    CRITICALITY ignore    TYPE S1ap-GUMMEI                            PRESENCE optional}|
+    { ID id-MME-UE-S1AP-ID-2            CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                    PRESENCE optional}|
+    { ID id-ManagementBasedMDTAllowed    CRITICALITY ignore    TYPE S1ap-ManagementBasedMDTAllowed        PRESENCE optional},
+    ...
 }
 
-E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemCtxtSUReqIEs} }
+S1ap-E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABToBeSetupItemCtxtSUReqIEs} }
 
-E-RABToBeSetupItemCtxtSUReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSetupItemCtxtSUReq	 CRITICALITY reject 	TYPE E-RABToBeSetupItemCtxtSUReq 	PRESENCE mandatory },
-	...
+S1ap-E-RABToBeSetupItemCtxtSUReqIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABToBeSetupItemCtxtSUReq     CRITICALITY reject     TYPE S1ap-E-RABToBeSetupItemCtxtSUReq     PRESENCE mandatory },
+    ...
 }
 
-E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Correlation-ID		CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional},
-	...
+S1ap-E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    { ID id-Correlation-ID        CRITICALITY ignore    EXTENSION S1ap-Correlation-ID        PRESENCE optional},
+    ...
 }
 
 
@@ -1241,29 +1237,29 @@ E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-InitialContextSetupResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {InitialContextSetupResponseIEs} },
-	...
+S1ap-InitialContextSetupResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-InitialContextSetupResponseIEs} },
+    ...
 }
 
-InitialContextSetupResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID						CRITICALITY ignore	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory }|
-	{ ID id-eNB-UE-S1AP-ID						CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory }|
-	{ ID id-E-RABSetupListCtxtSURes				CRITICALITY ignore	TYPE E-RABSetupListCtxtSURes		PRESENCE mandatory }|
-	{ ID id-E-RABFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE E-RABList						PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics				CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
-	...
+S1ap-InitialContextSetupResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                        CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory }|
+    { ID id-eNB-UE-S1AP-ID                        CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory }|
+    { ID id-E-RABSetupListCtxtSURes                CRITICALITY ignore    TYPE S1ap-E-RABSetupListCtxtSURes        PRESENCE mandatory }|
+    { ID id-E-RABFailedToSetupListCtxtSURes        CRITICALITY ignore    TYPE S1ap-E-RABList                        PRESENCE optional }|
+    { ID id-CriticalityDiagnostics                CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional },
+    ...
 }
 
-E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemCtxtSUResIEs} }
+S1ap-E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {S1ap-E-RABSetupItemCtxtSUResIEs} }
 
-E-RABSetupItemCtxtSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABSetupItemCtxtSURes	 CRITICALITY ignore 	TYPE E-RABSetupItemCtxtSURes 	PRESENCE mandatory },
-	...
+S1ap-E-RABSetupItemCtxtSUResIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-E-RABSetupItemCtxtSURes     CRITICALITY ignore     TYPE S1ap-E-RABSetupItemCtxtSURes     PRESENCE mandatory },
+    ...
 }
 
-E-RABSetupItemCtxtSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-E-RABSetupItemCtxtSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 -- **************************************************************
@@ -1272,17 +1268,17 @@ E-RABSetupItemCtxtSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-InitialContextSetupFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {InitialContextSetupFailureIEs} },
-	...
+S1ap-InitialContextSetupFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-InitialContextSetupFailureIEs} },
+    ...
 }
 
-InitialContextSetupFailureIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory }|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory }|
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause							PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
-	...
+S1ap-InitialContextSetupFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory }|
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                            PRESENCE mandatory }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional },
+    ...
 }
 
 -- **************************************************************
@@ -1298,31 +1294,31 @@ InitialContextSetupFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-Paging ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{PagingIEs}},
-	...
+S1ap-Paging ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{S1ap-PagingIEs}},
+    ...
 }
 
-PagingIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-UEIdentityIndexValue		CRITICALITY ignore	TYPE UEIdentityIndexValue	PRESENCE mandatory}|
-	{ ID id-UEPagingID					CRITICALITY ignore	TYPE UEPagingID				PRESENCE mandatory}|
-	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX				PRESENCE optional}|
-	{ ID id-CNDomain					CRITICALITY ignore	TYPE CNDomain				PRESENCE mandatory}|
-	{ ID id-TAIList						CRITICALITY ignore	TYPE TAIList				PRESENCE mandatory}|
-	{ ID id-CSG-IdList					CRITICALITY ignore	TYPE CSG-IdList				PRESENCE optional}|
-	{ ID id-PagingPriority				CRITICALITY ignore	TYPE PagingPriority			PRESENCE optional},
-	...
+S1ap-PagingIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-UEIdentityIndexValue        CRITICALITY ignore    TYPE S1ap-UEIdentityIndexValue    PRESENCE mandatory}|
+    { ID id-UEPagingID                    CRITICALITY ignore    TYPE S1ap-UEPagingID                PRESENCE mandatory}|
+    { ID id-pagingDRX                    CRITICALITY ignore    TYPE S1ap-PagingDRX                PRESENCE optional}|
+    { ID id-CNDomain                    CRITICALITY ignore    TYPE S1ap-CNDomain                PRESENCE mandatory}|
+    { ID id-TAIList                        CRITICALITY ignore    TYPE S1ap-TAIList                PRESENCE mandatory}|
+    { ID id-CSG-IdList                    CRITICALITY ignore    TYPE S1ap-CSG-IdList                PRESENCE optional}|
+    { ID id-PagingPriority                CRITICALITY ignore    TYPE S1ap-PagingPriority            PRESENCE optional},
+    ...
 }
 
-TAIList::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}
+S1ap-TAIList::= SEQUENCE (SIZE(1.. s1ap-maxnoofTAIs)) OF ProtocolIE-SingleContainer {{S1ap-TAIItemIEs}}
 
-TAIItemIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-TAIItem	 CRITICALITY ignore		TYPE TAIItem	PRESENCE mandatory },
-	...
+S1ap-TAIItemIEs     S1AP-PROTOCOL-IES ::= {
+    { ID id-TAIItem     CRITICALITY ignore        TYPE S1ap-TAIItem    PRESENCE mandatory },
+    ...
 }
 
-TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
+S1ap-TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+    ...
 }
 
 -- **************************************************************
@@ -1337,17 +1333,17 @@ TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
-UEContextReleaseRequest ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseRequest-IEs}},
-	...
+S1ap-UEContextReleaseRequest ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-UEContextReleaseRequest-IEs}},
+    ...
 }
 
-UEContextReleaseRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID					PRESENCE mandatory}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory}|
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause							PRESENCE mandatory}|
-	{ ID id-GWContextReleaseIndication	CRITICALITY reject	TYPE GWContextReleaseIndication		PRESENCE optional},
-	...
+S1ap-UEContextReleaseRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                    PRESENCE mandatory}|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                    PRESENCE mandatory}|
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                            PRESENCE mandatory}|
+    { ID id-GWContextReleaseIndication    CRITICALITY reject    TYPE S1ap-GWContextReleaseIndication        PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -1356,16 +1352,16 @@ UEContextReleaseRequestIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UEContextReleaseCommand ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseCommand-IEs}},
-	...
+S1ap-UEContextReleaseCommand ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-UEContextReleaseCommand-IEs}},
+    ...
 }
 
-UEContextReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-UE-S1AP-IDs				CRITICALITY reject	TYPE UE-S1AP-IDs					PRESENCE mandatory} |
-	
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
-	...
+S1ap-UEContextReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-UE-S1AP-IDs                CRITICALITY reject    TYPE S1ap-UE-S1AP-IDs                    PRESENCE mandatory} |
+    
+    { ID id-Cause                    CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -1374,16 +1370,16 @@ UEContextReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UEContextReleaseComplete ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseComplete-IEs}},
-	...
+S1ap-UEContextReleaseComplete ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-UEContextReleaseComplete-IEs}},
+    ...
 }
 
-UEContextReleaseCompleteIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional },
-	...
+S1ap-UEContextReleaseCompleteIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics        PRESENCE optional },
+    ...
 }
 
 
@@ -1399,22 +1395,22 @@ UEContextReleaseCompleteIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UEContextModificationRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { UEContextModificationRequestIEs} },
-	...
+S1ap-UEContextModificationRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-UEContextModificationRequestIEs} },
+    ...
 }
 
-UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory}|
-	{ ID id-SecurityKey					CRITICALITY reject	TYPE SecurityKey		 			PRESENCE optional}|
-	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP		PRESENCE optional}|
-	{ ID id-uEaggregateMaximumBitrate	CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional}|
-	{ ID id-CSFallbackIndicator			CRITICALITY reject	TYPE CSFallbackIndicator			PRESENCE optional}|
-	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE optional}|
-	{ ID id-CSGMembershipStatus			CRITICALITY ignore	TYPE CSGMembershipStatus			PRESENCE optional}|
-	{ ID id-RegisteredLAI				CRITICALITY ignore	TYPE LAI							PRESENCE optional},
-	...
+S1ap-UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory}|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                    PRESENCE mandatory}|
+    { ID id-SecurityKey                    CRITICALITY reject    TYPE S1ap-SecurityKey                     PRESENCE optional}|
+    { ID id-SubscriberProfileIDforRFP    CRITICALITY ignore    TYPE S1ap-SubscriberProfileIDforRFP        PRESENCE optional}|
+    { ID id-uEaggregateMaximumBitrate    CRITICALITY ignore    TYPE S1ap-UEAggregateMaximumBitrate        PRESENCE optional}|
+    { ID id-CSFallbackIndicator            CRITICALITY reject    TYPE S1ap-CSFallbackIndicator            PRESENCE optional}|
+    { ID id-UESecurityCapabilities        CRITICALITY reject    TYPE S1ap-UESecurityCapabilities            PRESENCE optional}|
+    { ID id-CSGMembershipStatus            CRITICALITY ignore    TYPE S1ap-CSGMembershipStatus            PRESENCE optional}|
+    { ID id-RegisteredLAI                CRITICALITY ignore    TYPE S1ap-LAI                            PRESENCE optional},
+    ...
 }
 -- **************************************************************
 --
@@ -1422,33 +1418,33 @@ UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UEContextModificationResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { UEContextModificationResponseIEs} },
-	...
+S1ap-UEContextModificationResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-UEContextModificationResponseIEs} },
+    ...
 }
 
-UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory }|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional },
-	...
+S1ap-UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics        PRESENCE optional },
+    ...
 }-- **************************************************************
 --
 -- UE Context Modification Failure
 --
 -- **************************************************************
 
-UEContextModificationFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { UEContextModificationFailureIEs} },
-	...
+S1ap-UEContextModificationFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-UEContextModificationFailureIEs} },
+    ...
 }
 
-UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory }|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory }|
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional },
-	...
+S1ap-UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory }|
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory }|
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics        PRESENCE optional },
+    ...
 }
 
 -- **************************************************************
@@ -1463,18 +1459,18 @@ UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-DownlinkNASTransport ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{DownlinkNASTransport-IEs}},
-	...
+S1ap-DownlinkNASTransport ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-DownlinkNASTransport-IEs}},
+    ...
 }
 
-DownlinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID					PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory} |
-	{ ID id-NAS-PDU						CRITICALITY reject	TYPE NAS-PDU						PRESENCE mandatory} |
-	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList		PRESENCE optional} |
-	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP		PRESENCE optional},
-	...
+S1ap-DownlinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                    PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                    PRESENCE mandatory} |
+    { ID id-NAS-PDU                        CRITICALITY reject    TYPE S1ap-NAS-PDU                        PRESENCE mandatory} |
+    { ID id-HandoverRestrictionList        CRITICALITY ignore    TYPE S1ap-HandoverRestrictionList        PRESENCE optional} |
+    { ID id-SubscriberProfileIDforRFP    CRITICALITY ignore    TYPE S1ap-SubscriberProfileIDforRFP        PRESENCE optional},
+    ...
 }
 
 
@@ -1484,24 +1480,24 @@ DownlinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-InitialUEMessage ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{InitialUEMessage-IEs}},
-	...
+S1ap-InitialUEMessage ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-InitialUEMessage-IEs}},
+    ...
 }
 
-InitialUEMessageIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory} |
-	{ ID id-NAS-PDU						CRITICALITY reject	TYPE NAS-PDU						PRESENCE mandatory} |
-	{ ID id-TAI							CRITICALITY reject	TYPE TAI							PRESENCE mandatory} |
-	{ ID id-EUTRAN-CGI					CRITICALITY ignore	TYPE EUTRAN-CGI						PRESENCE mandatory} |
-	{ ID id-RRC-Establishment-Cause		CRITICALITY ignore	TYPE RRC-Establishment-Cause		PRESENCE mandatory} |
-	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI							PRESENCE optional} |
-	{ ID id-CSG-Id						CRITICALITY reject	TYPE CSG-Id							PRESENCE optional} |
-	{ ID id-GUMMEI-ID					CRITICALITY reject	TYPE GUMMEI							PRESENCE optional} |
-	{ ID id-CellAccessMode				CRITICALITY reject	TYPE CellAccessMode					PRESENCE optional} |
-	{ ID id-GW-TransportLayerAddress	CRITICALITY ignore	TYPE TransportLayerAddress			PRESENCE optional} |
-	{ ID id-RelayNode-Indicator			CRITICALITY reject	TYPE RelayNode-Indicator			PRESENCE optional},
-	...
+S1ap-InitialUEMessageIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                    PRESENCE mandatory} |
+    { ID id-NAS-PDU                        CRITICALITY reject    TYPE S1ap-NAS-PDU                        PRESENCE mandatory} |
+    { ID id-TAI                            CRITICALITY reject    TYPE S1ap-TAI                            PRESENCE mandatory} |
+    { ID id-EUTRAN-CGI                    CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                        PRESENCE mandatory} |
+    { ID id-RRC-Establishment-Cause        CRITICALITY ignore    TYPE S1ap-RRC-Establishment-Cause        PRESENCE mandatory} |
+    { ID id-S-TMSI                        CRITICALITY reject    TYPE S1ap-S-TMSI                            PRESENCE optional} |
+    { ID id-CSG-Id                        CRITICALITY reject    TYPE S1ap-CSG-Id                            PRESENCE optional} |
+    { ID id-GUMMEI-ID                    CRITICALITY reject    TYPE S1ap-GUMMEI                            PRESENCE optional} |
+    { ID id-CellAccessMode                CRITICALITY reject    TYPE S1ap-CellAccessMode                    PRESENCE optional} |
+    { ID id-GW-TransportLayerAddress    CRITICALITY ignore    TYPE S1ap-TransportLayerAddress            PRESENCE optional} |
+    { ID id-RelayNode-Indicator            CRITICALITY reject    TYPE S1ap-RelayNode-Indicator            PRESENCE optional},
+    ...
 }
 
 
@@ -1511,19 +1507,19 @@ InitialUEMessageIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UplinkNASTransport ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{UplinkNASTransport-IEs}},
-	...
+S1ap-UplinkNASTransport ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-UplinkNASTransport-IEs}},
+    ...
 }
 
-UplinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-NAS-PDU						CRITICALITY reject	TYPE NAS-PDU					PRESENCE mandatory} |
-	{ ID id-EUTRAN-CGI					CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory} |
-	{ ID id-TAI							CRITICALITY ignore	TYPE TAI						PRESENCE mandatory} |
-	{ ID id-GW-TransportLayerAddress	CRITICALITY ignore	TYPE TransportLayerAddress		PRESENCE optional},
-	...
+S1ap-UplinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-NAS-PDU                        CRITICALITY reject    TYPE S1ap-NAS-PDU                    PRESENCE mandatory} |
+    { ID id-EUTRAN-CGI                    CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                    PRESENCE mandatory} |
+    { ID id-TAI                            CRITICALITY ignore    TYPE S1ap-TAI                        PRESENCE mandatory} |
+    { ID id-GW-TransportLayerAddress    CRITICALITY ignore    TYPE S1ap-TransportLayerAddress        PRESENCE optional},
+    ...
 }
 -- **************************************************************
 --
@@ -1531,17 +1527,17 @@ UplinkNASTransportIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-NASNonDeliveryIndication ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{NASNonDeliveryIndication-IEs}},
-	...
+S1ap-NASNonDeliveryIndication ::= SEQUENCE {
+    protocolIEs                     ProtocolIE-Container       {{S1ap-NASNonDeliveryIndication-IEs}},
+    ...
 }
 
-NASNonDeliveryIndication-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-NAS-PDU					CRITICALITY ignore	TYPE NAS-PDU				PRESENCE mandatory} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause				PRESENCE mandatory} ,
-	...
+S1ap-NASNonDeliveryIndication-IEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-NAS-PDU                    CRITICALITY ignore    TYPE S1ap-NAS-PDU                PRESENCE mandatory} |
+    { ID id-Cause                    CRITICALITY ignore    TYPE S1ap-Cause                PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -1556,22 +1552,22 @@ NASNonDeliveryIndication-IEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-Reset ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ResetIEs} },
-	...
+S1ap-Reset ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ResetIEs} },
+    ...
 }
 
-ResetIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
-	{ ID id-ResetType				CRITICALITY reject	TYPE ResetType			PRESENCE mandatory	},
-	...
+S1ap-ResetIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory    }|
+    { ID id-ResetType                CRITICALITY reject    TYPE S1ap-ResetType            PRESENCE mandatory    },
+    ...
 }
 
-UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemRes } }
+S1ap-UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { S1ap-UE-associatedLogicalS1-ConnectionItemRes } }
 
-UE-associatedLogicalS1-ConnectionItemRes 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-UE-associatedLogicalS1-ConnectionItem	 CRITICALITY reject 	TYPE UE-associatedLogicalS1-ConnectionItem 	PRESENCE mandatory },
-	...
+S1ap-UE-associatedLogicalS1-ConnectionItemRes     S1AP-PROTOCOL-IES ::= {
+    { ID id-UE-associatedLogicalS1-ConnectionItem     CRITICALITY reject     TYPE S1ap-UE-associatedLogicalS1-ConnectionItem     PRESENCE mandatory },
+    ...
 }
 
 
@@ -1581,22 +1577,22 @@ UE-associatedLogicalS1-ConnectionItemRes 	S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ResetAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ResetAcknowledgeIEs} },
-	...
+S1ap-ResetAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ResetAcknowledgeIEs} },
+    ...
 }
 
-ResetAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-UE-associatedLogicalS1-ConnectionListResAck		CRITICALITY ignore	TYPE UE-associatedLogicalS1-ConnectionListResAck			PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-ResetAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-UE-associatedLogicalS1-ConnectionListResAck        CRITICALITY ignore    TYPE S1ap-UE-associatedLogicalS1-ConnectionListResAck            PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
-UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemResAck } }
+S1ap-UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { S1ap-UE-associatedLogicalS1-ConnectionItemResAck } }
 
-UE-associatedLogicalS1-ConnectionItemResAck 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-UE-associatedLogicalS1-ConnectionItem	 CRITICALITY ignore 	TYPE UE-associatedLogicalS1-ConnectionItem  	PRESENCE mandatory },
-	...
+S1ap-UE-associatedLogicalS1-ConnectionItemResAck     S1AP-PROTOCOL-IES ::= {
+    { ID id-UE-associatedLogicalS1-ConnectionItem     CRITICALITY ignore     TYPE S1ap-UE-associatedLogicalS1-ConnectionItem      PRESENCE mandatory },
+    ...
 }
 
 -- **************************************************************
@@ -1611,17 +1607,17 @@ UE-associatedLogicalS1-ConnectionItemResAck 	S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ErrorIndication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ErrorIndicationIEs}},
-	...
+S1ap-ErrorIndication ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{S1ap-ErrorIndicationIEs}},
+    ...
 }
 
-ErrorIndicationIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE optional	} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE optional	} |
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE optional	} |
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional	} ,
-	...
+S1ap-ErrorIndicationIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE optional    } |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY ignore    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE optional    } |
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE optional    } |
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics        PRESENCE optional    } ,
+    ...
 }
 
 -- **************************************************************
@@ -1636,18 +1632,18 @@ ErrorIndicationIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-S1SetupRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {S1SetupRequestIEs} },
-	...
+S1ap-S1SetupRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-S1SetupRequestIEs} },
+    ...
 }
 
-S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Global-ENB-ID	CRITICALITY reject	TYPE Global-ENB-ID	PRESENCE mandatory}|
-	{ ID id-eNBname	CRITICALITY ignore	TYPE ENBname	PRESENCE optional}|
-	{ ID id-SupportedTAs	CRITICALITY reject	TYPE SupportedTAs	PRESENCE mandatory}|
-	{ ID id-DefaultPagingDRX	CRITICALITY ignore	TYPE PagingDRX	PRESENCE mandatory}|
-	{ ID id-CSG-IdList	CRITICALITY reject	TYPE CSG-IdList	PRESENCE optional},
-	...
+S1ap-S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Global-ENB-ID    CRITICALITY reject    TYPE S1ap-Global-ENB-ID    PRESENCE mandatory}|
+    { ID id-eNBname    CRITICALITY ignore    TYPE S1ap-ENBname    PRESENCE optional}|
+    { ID id-SupportedTAs    CRITICALITY reject    TYPE S1ap-SupportedTAs    PRESENCE mandatory}|
+    { ID id-DefaultPagingDRX    CRITICALITY ignore    TYPE S1ap-PagingDRX    PRESENCE mandatory}|
+    { ID id-CSG-IdList    CRITICALITY reject    TYPE S1ap-CSG-IdList    PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -1656,19 +1652,19 @@ S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-S1SetupResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {S1SetupResponseIEs} },
-	...
+S1ap-S1SetupResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-S1SetupResponseIEs} },
+    ...
 }
 
 
-S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MMEname						CRITICALITY ignore	TYPE MMEname						PRESENCE optional}|
-	{ ID id-ServedGUMMEIs				CRITICALITY reject	TYPE ServedGUMMEIs					PRESENCE mandatory}|
-	{ ID id-RelativeMMECapacity			CRITICALITY ignore	TYPE RelativeMMECapacity			PRESENCE mandatory}|
-	{ ID id-MMERelaySupportIndicator	CRITICALITY ignore	TYPE MMERelaySupportIndicator		PRESENCE optional}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional},
-	...
+S1ap-S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MMEname                        CRITICALITY ignore    TYPE S1ap-MMEname                        PRESENCE optional}|
+    { ID id-ServedGUMMEIs                CRITICALITY reject    TYPE S1ap-ServedGUMMEIs                    PRESENCE mandatory}|
+    { ID id-RelativeMMECapacity            CRITICALITY ignore    TYPE S1ap-RelativeMMECapacity            PRESENCE mandatory}|
+    { ID id-MMERelaySupportIndicator    CRITICALITY ignore    TYPE S1ap-MMERelaySupportIndicator        PRESENCE optional}|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -1677,16 +1673,16 @@ S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-S1SetupFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {S1SetupFailureIEs} },
-	...
+S1ap-S1SetupFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-S1SetupFailureIEs} },
+    ...
 }
 
-S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
-	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory    }|
+    { ID id-TimeToWait                    CRITICALITY ignore    TYPE S1ap-TimeToWait                    PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -1701,17 +1697,17 @@ S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBConfigurationUpdate ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateIEs} },
-	...
+S1ap-ENBConfigurationUpdate ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ENBConfigurationUpdateIEs} },
+    ...
 }
 
-ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-eNBname				CRITICALITY ignore	TYPE ENBname			PRESENCE optional	}|
-	{ ID id-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE optional	}|
-	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional}|
-	{ ID id-DefaultPagingDRX	CRITICALITY	ignore	TYPE PagingDRX		PRESENCE optional	},
-	...
+S1ap-ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-eNBname                CRITICALITY ignore    TYPE S1ap-ENBname            PRESENCE optional    }|
+    { ID id-SupportedTAs        CRITICALITY reject    TYPE S1ap-SupportedTAs         PRESENCE optional    }|
+    { ID id-CSG-IdList                    CRITICALITY reject    TYPE S1ap-CSG-IdList                PRESENCE optional}|
+    { ID id-DefaultPagingDRX    CRITICALITY    ignore    TYPE S1ap-PagingDRX        PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -1720,15 +1716,15 @@ ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateAcknowledgeIEs} },
-	...
+S1ap-ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ENBConfigurationUpdateAcknowledgeIEs} },
+    ...
 }
 
 
-ENBConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-ENBConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -1737,15 +1733,15 @@ ENBConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBConfigurationUpdateFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateFailureIEs} },
-	...
+S1ap-ENBConfigurationUpdateFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ENBConfigurationUpdateFailureIEs} },
+    ...
 }
 
-ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
-	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
+S1ap-ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory    }|
+    { ID id-TimeToWait                    CRITICALITY ignore    TYPE S1ap-TimeToWait                    PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics    PRESENCE optional },
 ...
 }
 
@@ -1762,16 +1758,16 @@ ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEConfigurationUpdate ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateIEs} },
-	...
+S1ap-MMEConfigurationUpdate ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-MMEConfigurationUpdateIEs} },
+    ...
 }
 
-MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE optional	}|
-	{ ID id-ServedGUMMEIs			CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE optional	}|
-	{ ID id-RelativeMMECapacity	CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional},
-	...
+S1ap-MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MMEname                CRITICALITY ignore    TYPE S1ap-MMEname             PRESENCE optional    }|
+    { ID id-ServedGUMMEIs            CRITICALITY reject    TYPE S1ap-ServedGUMMEIs                PRESENCE optional    }|
+    { ID id-RelativeMMECapacity    CRITICALITY reject    TYPE S1ap-RelativeMMECapacity    PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -1780,15 +1776,15 @@ MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateAcknowledgeIEs} },
-	...
+S1ap-MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-MMEConfigurationUpdateAcknowledgeIEs} },
+    ...
 }
 
 
-MMEConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-MMEConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -1797,16 +1793,16 @@ MMEConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEConfigurationUpdateFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateFailureIEs} },
-	...
+S1ap-MMEConfigurationUpdateFailure ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-MMEConfigurationUpdateFailureIEs} },
+    ...
 }
 
-MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
-	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
-	...
+S1ap-MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory    }|
+    { ID id-TimeToWait                    CRITICALITY ignore    TYPE S1ap-TimeToWait                    PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional    },
+    ...
 }
 
 -- **************************************************************
@@ -1821,19 +1817,19 @@ MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-DownlinkS1cdma2000tunneling ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {DownlinkS1cdma2000tunnelingIEs} },
-	...
+S1ap-DownlinkS1cdma2000tunneling ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-DownlinkS1cdma2000tunnelingIEs} },
+    ...
 }
 
-DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-E-RABSubjecttoDataForwardingList		CRITICALITY ignore	TYPE E-RABDataForwardingList		 			PRESENCE optional	} |
-	{ ID id-cdma2000HOStatus				CRITICALITY ignore	TYPE Cdma2000HOStatus 			PRESENCE optional	} |
-	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
-	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
-	...
+S1ap-DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory    } |
+    { ID id-E-RABSubjecttoDataForwardingList        CRITICALITY ignore    TYPE S1ap-E-RABDataForwardingList                     PRESENCE optional    } |
+    { ID id-cdma2000HOStatus                CRITICALITY ignore    TYPE S1ap-Cdma2000HOStatus             PRESENCE optional    } |
+    { ID id-cdma2000RATType                CRITICALITY reject    TYPE S1ap-Cdma2000RATType             PRESENCE mandatory    } |
+    { ID id-cdma2000PDU                    CRITICALITY reject    TYPE S1ap-Cdma2000PDU                 PRESENCE mandatory    },
+    ...
 }
 
 -- **************************************************************
@@ -1848,23 +1844,23 @@ DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UplinkS1cdma2000tunneling ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {UplinkS1cdma2000tunnelingIEs} },
-	...
+S1ap-UplinkS1cdma2000tunneling ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-UplinkS1cdma2000tunnelingIEs} },
+    ...
 }
 
-UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	} |
-	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
-	{ ID id-cdma2000SectorID			CRITICALITY reject	TYPE Cdma2000SectorID 			PRESENCE mandatory	} |
-	{ ID id-cdma2000HORequiredIndication	CRITICALITY ignore	TYPE Cdma2000HORequiredIndication 			PRESENCE optional	} |
-	{ ID id-cdma2000OneXSRVCCInfo		CRITICALITY reject	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
-	{ ID id-cdma2000OneXRAND			CRITICALITY reject	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
-	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	}|
-	{ ID id-EUTRANRoundTripDelayEstimationInfo	CRITICALITY ignore	TYPE EUTRANRoundTripDelayEstimationInfo		PRESENCE optional},
-	-- Extension for Release 9 to assist target HRPD access with the acquisition of the UE --
-	...
+S1ap-UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory    } |
+    { ID id-cdma2000RATType                CRITICALITY reject    TYPE S1ap-Cdma2000RATType             PRESENCE mandatory    } |
+    { ID id-cdma2000SectorID            CRITICALITY reject    TYPE S1ap-Cdma2000SectorID             PRESENCE mandatory    } |
+    { ID id-cdma2000HORequiredIndication    CRITICALITY ignore    TYPE S1ap-Cdma2000HORequiredIndication             PRESENCE optional    } |
+    { ID id-cdma2000OneXSRVCCInfo        CRITICALITY reject    TYPE S1ap-Cdma2000OneXSRVCCInfo             PRESENCE optional    } |
+    { ID id-cdma2000OneXRAND            CRITICALITY reject    TYPE S1ap-Cdma2000OneXRAND             PRESENCE optional    } |
+    { ID id-cdma2000PDU                    CRITICALITY reject    TYPE S1ap-Cdma2000PDU                 PRESENCE mandatory    }|
+    { ID id-EUTRANRoundTripDelayEstimationInfo    CRITICALITY ignore    TYPE S1ap-EUTRANRoundTripDelayEstimationInfo        PRESENCE optional},
+    -- Extension for Release 9 to assist target HRPD access with the acquisition of the UE --
+    ...
 }
 
 
@@ -1880,16 +1876,16 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UECapabilityInfoIndication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { UECapabilityInfoIndicationIEs} },
-	...
+S1ap-UECapabilityInfoIndication ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-UECapabilityInfoIndicationIEs} },
+    ...
 }
 
-UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	} |
-	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE mandatory	} ,
-	...
+S1ap-UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                     PRESENCE mandatory    } |
+    { ID id-UERadioCapability            CRITICALITY ignore    TYPE S1ap-UERadioCapability                PRESENCE mandatory    } ,
+    ...
 }
 
 -- **************************************************************
@@ -1904,16 +1900,16 @@ UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBStatusTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {ENBStatusTransferIEs} },
-	...
+S1ap-ENBStatusTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-ENBStatusTransferIEs} },
+    ...
 }
 
-ENBStatusTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-StatusTransfer-TransparentContainer	CRITICALITY reject	TYPE ENB-StatusTransfer-TransparentContainer		PRESENCE mandatory} ,
-	...
+S1ap-ENBStatusTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-StatusTransfer-TransparentContainer    CRITICALITY reject    TYPE S1ap-ENB-StatusTransfer-TransparentContainer        PRESENCE mandatory} ,
+    ...
 }
 
 
@@ -1929,16 +1925,16 @@ ENBStatusTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEStatusTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {MMEStatusTransferIEs} },
-	...
+S1ap-MMEStatusTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-MMEStatusTransferIEs} },
+    ...
 }
 
-MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-StatusTransfer-TransparentContainer	CRITICALITY reject	TYPE ENB-StatusTransfer-TransparentContainer		PRESENCE mandatory} ,
-	...
+S1ap-MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-StatusTransfer-TransparentContainer    CRITICALITY reject    TYPE S1ap-ENB-StatusTransfer-TransparentContainer        PRESENCE mandatory} ,
+    ...
 }
 
 
@@ -1953,16 +1949,16 @@ MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-TraceStart ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {TraceStartIEs} },
-	...
+S1ap-TraceStart ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-TraceStartIEs} },
+    ...
 }
 
-TraceStartIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation			PRESENCE mandatory	},
-	...
+S1ap-TraceStartIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-TraceActivation                CRITICALITY ignore    TYPE S1ap-TraceActivation            PRESENCE mandatory    },
+    ...
 }
 
 -- **************************************************************
@@ -1971,17 +1967,17 @@ TraceStartIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-TraceFailureIndication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {TraceFailureIndicationIEs} },
-	...
+S1ap-TraceFailureIndication ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-TraceFailureIndicationIEs} },
+    ...
 }
 
-TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-E-UTRAN-Trace-ID			CRITICALITY ignore	TYPE E-UTRAN-Trace-ID			PRESENCE mandatory} |
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
-	...
+S1ap-TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID                CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-E-UTRAN-Trace-ID            CRITICALITY ignore    TYPE S1ap-E-UTRAN-Trace-ID            PRESENCE mandatory} |
+    { ID id-Cause                        CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -1996,16 +1992,16 @@ TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-DeactivateTrace ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { DeactivateTraceIEs} },
-	...
+S1ap-DeactivateTrace ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-DeactivateTraceIEs} },
+    ...
 }
 
-DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID		CRITICALITY reject	TYPE MME-UE-S1AP-ID		PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID		CRITICALITY reject	TYPE ENB-UE-S1AP-ID		PRESENCE mandatory} |
-	{ ID id-E-UTRAN-Trace-ID		CRITICALITY ignore	TYPE E-UTRAN-Trace-ID	 	PRESENCE mandatory	},
-	...
+S1ap-DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID        CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID        PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID        CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID        PRESENCE mandatory} |
+    { ID id-E-UTRAN-Trace-ID        CRITICALITY ignore    TYPE S1ap-E-UTRAN-Trace-ID         PRESENCE mandatory    },
+    ...
 }
 
 -- **************************************************************
@@ -2020,19 +2016,19 @@ DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-CellTrafficTrace ::= SEQUENCE {
-    protocolIEs		ProtocolIE-Container	{ { CellTrafficTraceIEs } },
+S1ap-CellTrafficTrace ::= SEQUENCE {
+    protocolIEs        ProtocolIE-Container    { { S1ap-CellTrafficTraceIEs } },
     ...
 }
 
-CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= {
-	{ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory}|
-	{ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory}|
-	{ID id-E-UTRAN-Trace-ID					CRITICALITY ignore	TYPE E-UTRAN-Trace-ID			PRESENCE mandatory}|
-	{ID id-EUTRAN-CGI						CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory}|
-	{ID id-TraceCollectionEntityIPAddress	CRITICALITY ignore	TYPE TransportLayerAddress		PRESENCE mandatory}|
-	{ID id-PrivacyIndicator					CRITICALITY ignore	TYPE PrivacyIndicator			PRESENCE optional},
-	...
+S1ap-CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= {
+    {ID id-MME-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory}|
+    {ID id-eNB-UE-S1AP-ID                    CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory}|
+    {ID id-E-UTRAN-Trace-ID                    CRITICALITY ignore    TYPE S1ap-E-UTRAN-Trace-ID            PRESENCE mandatory}|
+    {ID id-EUTRAN-CGI                        CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                    PRESENCE mandatory}|
+    {ID id-TraceCollectionEntityIPAddress    CRITICALITY ignore    TYPE S1ap-TransportLayerAddress        PRESENCE mandatory}|
+    {ID id-PrivacyIndicator                    CRITICALITY ignore    TYPE S1ap-PrivacyIndicator            PRESENCE optional},
+    ...
 }
 
 -- **************************************************************
@@ -2047,16 +2043,16 @@ CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-LocationReportingControl ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { LocationReportingControlIEs} },
-	...
+S1ap-LocationReportingControl ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-LocationReportingControlIEs} },
+    ...
 }
 
-LocationReportingControlIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory	} ,
-	...
+S1ap-LocationReportingControlIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-RequestType                CRITICALITY ignore    TYPE S1ap-RequestType                PRESENCE mandatory    } ,
+    ...
 }
 
 -- **************************************************************
@@ -2065,16 +2061,16 @@ LocationReportingControlIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-LocationReportingFailureIndication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { LocationReportingFailureIndicationIEs} },
-	...
+S1ap-LocationReportingFailureIndication ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-LocationReportingFailureIndicationIEs} },
+    ...
 }
 
-LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE mandatory},
-	...
+S1ap-LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-Cause                    CRITICALITY ignore    TYPE S1ap-Cause                        PRESENCE mandatory},
+    ...
 }
 
 -- **************************************************************
@@ -2083,18 +2079,18 @@ LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-LocationReport ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { LocationReportIEs} },
-	...
+S1ap-LocationReport ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { { S1ap-LocationReportIEs} },
+    ...
 }
 
-LocationReportIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-EUTRAN-CGI				CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory} |
-	{ ID id-TAI						CRITICALITY ignore	TYPE TAI						PRESENCE mandatory} |
-	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory} ,
-	...
+S1ap-LocationReportIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-EUTRAN-CGI                CRITICALITY ignore    TYPE S1ap-EUTRAN-CGI                    PRESENCE mandatory} |
+    { ID id-TAI                        CRITICALITY ignore    TYPE S1ap-TAI                        PRESENCE mandatory} |
+    { ID id-RequestType                CRITICALITY ignore    TYPE S1ap-RequestType                PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -2109,16 +2105,16 @@ LocationReportIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-OverloadStart ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {OverloadStartIEs} },
-	...
+S1ap-OverloadStart ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-OverloadStartIEs} },
+    ...
 }
 
-OverloadStartIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-OverloadResponse					CRITICALITY reject	TYPE OverloadResponse				PRESENCE mandatory}|
-	{ ID id-GUMMEIList							CRITICALITY ignore	TYPE GUMMEIList						PRESENCE optional}|
-	{ ID id-TrafficLoadReductionIndication		CRITICALITY ignore	TYPE TrafficLoadReductionIndication	PRESENCE optional},
-	...
+S1ap-OverloadStartIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-OverloadResponse                    CRITICALITY reject    TYPE S1ap-OverloadResponse                PRESENCE mandatory}|
+    { ID id-GUMMEIList                            CRITICALITY ignore    TYPE S1ap-GUMMEIList                        PRESENCE optional}|
+    { ID id-TrafficLoadReductionIndication        CRITICALITY ignore    TYPE S1ap-TrafficLoadReductionIndication    PRESENCE optional},
+    ...
 }
 -- **************************************************************
 --
@@ -2126,14 +2122,14 @@ OverloadStartIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-OverloadStop ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {OverloadStopIEs} },
-	...
+S1ap-OverloadStop ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-OverloadStopIEs} },
+    ...
 }
 
-OverloadStopIEs S1AP-PROTOCOL-IES ::= {	
-{ ID id-GUMMEIList							CRITICALITY ignore	TYPE GUMMEIList				PRESENCE optional },
-	...
+S1ap-OverloadStopIEs S1AP-PROTOCOL-IES ::= {
+{ ID id-GUMMEIList                            CRITICALITY ignore    TYPE S1ap-GUMMEIList                PRESENCE optional },
+    ...
 }
 -- **************************************************************
 --
@@ -2148,24 +2144,24 @@ OverloadStopIEs S1AP-PROTOCOL-IES ::= {
 -- **************************************************************
 
 
-WriteReplaceWarningRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {WriteReplaceWarningRequestIEs} },
-	...
+S1ap-WriteReplaceWarningRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-WriteReplaceWarningRequestIEs} },
+    ...
 }
 
-WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory		}|
-	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber			PRESENCE mandatory		}|
-	{ ID id-WarningAreaList				CRITICALITY ignore	TYPE WarningAreaList		PRESENCE optional		}|
-	{ ID id-RepetitionPeriod			CRITICALITY reject	TYPE RepetitionPeriod		PRESENCE mandatory		}|
-	{ ID id-ExtendedRepetitionPeriod	CRITICALITY reject	TYPE ExtendedRepetitionPeriod	PRESENCE optional	}|
-	{ ID id-NumberofBroadcastRequest	CRITICALITY reject	TYPE NumberofBroadcastRequest	PRESENCE mandatory	}|
-	{ ID id-WarningType					CRITICALITY ignore	TYPE WarningType			PRESENCE optional		}|
-	{ ID id-WarningSecurityInfo			CRITICALITY ignore	TYPE WarningSecurityInfo	PRESENCE optional		}|
-	{ ID id-DataCodingScheme			CRITICALITY ignore	TYPE DataCodingScheme		PRESENCE optional		}|
-	{ ID id-WarningMessageContents		CRITICALITY ignore	TYPE WarningMessageContents		PRESENCE optional		}|
-	{ ID id-ConcurrentWarningMessageIndicator	CRITICALITY reject	TYPE ConcurrentWarningMessageIndicator		PRESENCE optional		},
-	...
+S1ap-WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MessageIdentifier            CRITICALITY reject    TYPE S1ap-MessageIdentifier        PRESENCE mandatory        }|
+    { ID id-SerialNumber                CRITICALITY reject    TYPE S1ap-SerialNumber            PRESENCE mandatory        }|
+    { ID id-WarningAreaList                CRITICALITY ignore    TYPE S1ap-WarningAreaList        PRESENCE optional        }|
+    { ID id-RepetitionPeriod            CRITICALITY reject    TYPE S1ap-RepetitionPeriod        PRESENCE mandatory        }|
+    { ID id-ExtendedRepetitionPeriod    CRITICALITY reject    TYPE S1ap-ExtendedRepetitionPeriod    PRESENCE optional    }|
+    { ID id-NumberofBroadcastRequest    CRITICALITY reject    TYPE S1ap-NumberofBroadcastRequest    PRESENCE mandatory    }|
+    { ID id-WarningType                    CRITICALITY ignore    TYPE S1ap-WarningType            PRESENCE optional        }|
+    { ID id-WarningSecurityInfo            CRITICALITY ignore    TYPE S1ap-WarningSecurityInfo    PRESENCE optional        }|
+    { ID id-DataCodingScheme            CRITICALITY ignore    TYPE S1ap-DataCodingScheme        PRESENCE optional        }|
+    { ID id-WarningMessageContents        CRITICALITY ignore    TYPE S1ap-WarningMessageContents        PRESENCE optional        }|
+    { ID id-ConcurrentWarningMessageIndicator    CRITICALITY reject    TYPE S1ap-ConcurrentWarningMessageIndicator        PRESENCE optional        },
+    ...
 }
 -- **************************************************************
 --
@@ -2173,17 +2169,17 @@ WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-WriteReplaceWarningResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container		{ {WriteReplaceWarningResponseIEs} },
-	...
+S1ap-WriteReplaceWarningResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container        { {S1ap-WriteReplaceWarningResponseIEs} },
+    ...
 }
 
-WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier					PRESENCE mandatory }|
-	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber						PRESENCE mandatory }|
-	{ ID id-BroadcastCompletedAreaList	CRITICALITY ignore	TYPE BroadcastCompletedAreaList			PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional },
-	...
+S1ap-WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MessageIdentifier            CRITICALITY reject    TYPE S1ap-MessageIdentifier                    PRESENCE mandatory }|
+    { ID id-SerialNumber                CRITICALITY reject    TYPE S1ap-SerialNumber                        PRESENCE mandatory }|
+    { ID id-BroadcastCompletedAreaList    CRITICALITY ignore    TYPE S1ap-BroadcastCompletedAreaList            PRESENCE optional    }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics                PRESENCE optional },
+    ...
 }
 
 -- **************************************************************
@@ -2198,14 +2194,14 @@ WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBDirectInformationTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ ENBDirectInformationTransferIEs}},
-	...
+S1ap-ENBDirectInformationTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{ S1ap-ENBDirectInformationTransferIEs}},
+    ...
 }
 
-ENBDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Inter-SystemInformationTransferTypeEDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType			PRESENCE mandatory}  ,
-	...
+S1ap-ENBDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Inter-SystemInformationTransferTypeEDT        CRITICALITY reject    TYPE S1ap-Inter-SystemInformationTransferType            PRESENCE mandatory}  ,
+    ...
 }
 
 -- **************************************************************
@@ -2220,14 +2216,14 @@ ENBDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEDirectInformationTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ MMEDirectInformationTransferIEs}},
-	...
+S1ap-MMEDirectInformationTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{ S1ap-MMEDirectInformationTransferIEs}},
+    ...
 }
 
-MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Inter-SystemInformationTransferTypeMDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType			PRESENCE mandatory}  ,
-	...
+S1ap-MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Inter-SystemInformationTransferTypeMDT        CRITICALITY reject    TYPE S1ap-Inter-SystemInformationTransferType            PRESENCE mandatory}  ,
+    ...
 }
 -- **************************************************************
 --
@@ -2241,14 +2237,14 @@ MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-ENBConfigurationTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ ENBConfigurationTransferIEs}},
-	...
+S1ap-ENBConfigurationTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{ S1ap-ENBConfigurationTransferIEs}},
+    ...
 }
 
-ENBConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SONConfigurationTransferECT		CRITICALITY ignore	TYPE SONConfigurationTransfer				PRESENCE optional}  ,
-	...
+S1ap-ENBConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-SONConfigurationTransferECT        CRITICALITY ignore    TYPE S1ap-SONConfigurationTransfer                PRESENCE optional}  ,
+    ...
 }
 
 -- **************************************************************
@@ -2263,14 +2259,14 @@ ENBConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-MMEConfigurationTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ MMEConfigurationTransferIEs}},
-	...
+S1ap-MMEConfigurationTransfer ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{ S1ap-MMEConfigurationTransferIEs}},
+    ...
 }
 
-MMEConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SONConfigurationTransferMCT		CRITICALITY ignore	TYPE SONConfigurationTransfer				PRESENCE optional}  ,
-	...
+S1ap-MMEConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-SONConfigurationTransferMCT        CRITICALITY ignore    TYPE S1ap-SONConfigurationTransfer                PRESENCE optional}  ,
+    ...
 }
 
 -- **************************************************************
@@ -2285,13 +2281,13 @@ MMEConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-PrivateMessage ::= SEQUENCE {
-	privateIEs			PrivateIE-Container       {{PrivateMessageIEs}},
-	...
+S1ap-PrivateMessage ::= SEQUENCE {
+    privateIEs            PrivateIE-Container       {{S1ap-PrivateMessageIEs}},
+    ...
 }
 
-PrivateMessageIEs S1AP-PRIVATE-IES ::= {
-	...
+S1ap-PrivateMessageIEs S1AP-PRIVATE-IES ::= {
+    ...
 }
 
 -- **************************************************************
@@ -2301,16 +2297,16 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= {
 -- **************************************************************
 
 
-KillRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {KillRequestIEs} },
-	...
+S1ap-KillRequest ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       { {S1ap-KillRequestIEs} },
+    ...
 }
 
-KillRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory }|
-	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber			PRESENCE mandatory }|
-	{ ID id-WarningAreaList				CRITICALITY ignore	TYPE WarningAreaList		PRESENCE optional },
-	...
+S1ap-KillRequestIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MessageIdentifier            CRITICALITY reject    TYPE S1ap-MessageIdentifier        PRESENCE mandatory }|
+    { ID id-SerialNumber                CRITICALITY reject    TYPE S1ap-SerialNumber            PRESENCE mandatory }|
+    { ID id-WarningAreaList                CRITICALITY ignore    TYPE S1ap-WarningAreaList        PRESENCE optional },
+    ...
 }
 
 -- **************************************************************
@@ -2319,17 +2315,17 @@ KillRequestIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-KillResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container		{ {KillResponseIEs} },
-	...
+S1ap-KillResponse ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container        { {S1ap-KillResponseIEs} },
+    ...
 }
 
-KillResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier				PRESENCE mandatory }|
-	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber					PRESENCE mandatory }|
-	{ ID id-BroadcastCancelledAreaList	CRITICALITY ignore	TYPE BroadcastCancelledAreaList		PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
-	...
+S1ap-KillResponseIEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MessageIdentifier            CRITICALITY reject    TYPE S1ap-MessageIdentifier                PRESENCE mandatory }|
+    { ID id-SerialNumber                CRITICALITY reject    TYPE S1ap-SerialNumber                    PRESENCE mandatory }|
+    { ID id-BroadcastCancelledAreaList    CRITICALITY ignore    TYPE S1ap-BroadcastCancelledAreaList        PRESENCE optional }|
+    { ID id-CriticalityDiagnostics        CRITICALITY ignore    TYPE S1ap-CriticalityDiagnostics            PRESENCE optional },
+    ...
 }
 
 -- **************************************************************
@@ -2344,17 +2340,17 @@ KillResponseIEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-DownlinkUEAssociatedLPPaTransport ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{DownlinkUEAssociatedLPPaTransport-IEs}},
-	...
+S1ap-DownlinkUEAssociatedLPPaTransport ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{S1ap-DownlinkUEAssociatedLPPaTransport-IEs}},
+    ...
 }
 
-DownlinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory } |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory } |
-	{ ID id-Routing-ID				CRITICALITY reject	TYPE Routing-ID					PRESENCE mandatory } |
-	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory } ,
-	...
+S1ap-DownlinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory } |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory } |
+    { ID id-Routing-ID                CRITICALITY reject    TYPE S1ap-Routing-ID                    PRESENCE mandatory } |
+    { ID id-LPPa-PDU                CRITICALITY reject    TYPE S1ap-LPPa-PDU                   PRESENCE mandatory } ,
+    ...
 }
 
 -- **************************************************************
@@ -2363,17 +2359,17 @@ DownlinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UplinkUEAssociatedLPPaTransport ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{UplinkUEAssociatedLPPaTransport-IEs}},
-	...
+S1ap-UplinkUEAssociatedLPPaTransport ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{S1ap-UplinkUEAssociatedLPPaTransport-IEs}},
+    ...
 }
 
-UplinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-Routing-ID				CRITICALITY reject	TYPE Routing-ID					PRESENCE mandatory} |
-	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
-	...
+S1ap-UplinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+    { ID id-MME-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-MME-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-eNB-UE-S1AP-ID            CRITICALITY reject    TYPE S1ap-ENB-UE-S1AP-ID                PRESENCE mandatory} |
+    { ID id-Routing-ID                CRITICALITY reject    TYPE S1ap-Routing-ID                    PRESENCE mandatory} |
+    { ID id-LPPa-PDU                CRITICALITY reject    TYPE S1ap-LPPa-PDU                   PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -2382,15 +2378,15 @@ UplinkUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-DownlinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{DownlinkNonUEAssociatedLPPaTransport-IEs}},
-	...
+S1ap-DownlinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+    protocolIEs            ProtocolIE-Container       {{S1ap-DownlinkNonUEAssociatedLPPaTransport-IEs}},
+    ...
 }
 
-DownlinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Routing-ID			    CRITICALITY reject	TYPE Routing-ID				    PRESENCE mandatory} | 
-	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
-	...
+S1ap-DownlinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Routing-ID                CRITICALITY reject    TYPE S1ap-Routing-ID                    PRESENCE mandatory} |
+    { ID id-LPPa-PDU                CRITICALITY reject    TYPE S1ap-LPPa-PDU                   PRESENCE mandatory} ,
+    ...
 }
 
 -- **************************************************************
@@ -2399,15 +2395,15 @@ DownlinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
 --
 -- **************************************************************
 
-UplinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
-	protocolIEs		ProtocolIE-Container       {{UplinkNonUEAssociatedLPPaTransport-IEs}},
-	...
+S1ap-UplinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+    protocolIEs        ProtocolIE-Container       {{S1ap-UplinkNonUEAssociatedLPPaTransport-IEs}},
+    ...
 }
 
-UplinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Routing-ID			    CRITICALITY reject	TYPE Routing-ID					PRESENCE mandatory} | 
-	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU   				PRESENCE mandatory} ,
-	...
+S1ap-UplinkNonUEAssociatedLPPaTransport-IEs S1AP-PROTOCOL-IES ::= {
+    { ID id-Routing-ID                CRITICALITY reject    TYPE S1ap-Routing-ID                    PRESENCE mandatory} |
+    { ID id-LPPa-PDU                CRITICALITY reject    TYPE S1ap-LPPa-PDU                   PRESENCE mandatory} ,
+    ...
 }
 
 END
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
index 983a1950c1c8ed947711d6e499101e725fa98122..591410de06c96e228ba222bbfadafcaff57ee00b 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU-Descriptions.asn
@@ -19,134 +19,133 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	Criticality,
-	ProcedureCode
+    S1ap-Criticality,
+    S1ap-ProcedureCode
 FROM S1AP-CommonDataTypes
 
-	CellTrafficTrace,
-	DeactivateTrace,
-	DownlinkUEAssociatedLPPaTransport,
-	DownlinkNASTransport,
-	DownlinkNonUEAssociatedLPPaTransport,
-	DownlinkS1cdma2000tunneling,
-	ENBDirectInformationTransfer,
-	ENBStatusTransfer,
-	ENBConfigurationUpdate,
-	ENBConfigurationUpdateAcknowledge,
-	ENBConfigurationUpdateFailure,
-	ErrorIndication,
-	HandoverCancel,
-	HandoverCancelAcknowledge,
-	HandoverCommand,
-	HandoverFailure,
-	HandoverNotify,
-	HandoverPreparationFailure,
-	HandoverRequest,
-	HandoverRequestAcknowledge,
-	HandoverRequired,
-	InitialContextSetupFailure,
-	InitialContextSetupRequest,
-	InitialContextSetupResponse,
-	InitialUEMessage,
-	KillRequest,
-	KillResponse,
-	LocationReportingControl,
-	LocationReportingFailureIndication,
-	LocationReport,
-	MMEConfigurationUpdate,
-	MMEConfigurationUpdateAcknowledge,
-	MMEConfigurationUpdateFailure,
-	MMEDirectInformationTransfer,
-	MMEStatusTransfer,
-	NASNonDeliveryIndication,
-	OverloadStart,
-	OverloadStop,
-	Paging,
-	PathSwitchRequest,
-	PathSwitchRequestAcknowledge,
-	PathSwitchRequestFailure,	
-	PrivateMessage,
-	Reset,
-	ResetAcknowledge,
-	S1SetupFailure,
-	S1SetupRequest,
-	S1SetupResponse,
-	E-RABModifyRequest,
-	E-RABModifyResponse,
-	E-RABReleaseCommand,
-	E-RABReleaseResponse,
-	E-RABReleaseIndication,
-	E-RABSetupRequest,
-	E-RABSetupResponse,
-	TraceFailureIndication,
-	TraceStart,
-	UECapabilityInfoIndication,
-	UEContextModificationFailure,
-	UEContextModificationRequest,
-	UEContextModificationResponse,
-	UEContextReleaseCommand,
-	UEContextReleaseComplete,
-	UEContextReleaseRequest,
-	UplinkUEAssociatedLPPaTransport,
-	UplinkNASTransport,
-	UplinkNonUEAssociatedLPPaTransport,
-	UplinkS1cdma2000tunneling,
-	WriteReplaceWarningRequest,
-	WriteReplaceWarningResponse,
-	ENBConfigurationTransfer,
-	MMEConfigurationTransfer
-
+    S1ap-CellTrafficTrace,
+    S1ap-DeactivateTrace,
+    S1ap-DownlinkUEAssociatedLPPaTransport,
+    S1ap-DownlinkNASTransport,
+    S1ap-DownlinkNonUEAssociatedLPPaTransport,
+    S1ap-DownlinkS1cdma2000tunneling,
+    S1ap-ENBDirectInformationTransfer,
+    S1ap-ENBStatusTransfer,
+    S1ap-ENBConfigurationUpdate,
+    S1ap-ENBConfigurationUpdateAcknowledge,
+    S1ap-ENBConfigurationUpdateFailure,
+    S1ap-ErrorIndication,
+    S1ap-HandoverCancel,
+    S1ap-HandoverCancelAcknowledge,
+    S1ap-HandoverCommand,
+    S1ap-HandoverFailure,
+    S1ap-HandoverNotify,
+    S1ap-HandoverPreparationFailure,
+    S1ap-HandoverRequest,
+    S1ap-HandoverRequestAcknowledge,
+    S1ap-HandoverRequired,
+    S1ap-InitialContextSetupFailure,
+    S1ap-InitialContextSetupRequest,
+    S1ap-InitialContextSetupResponse,
+    S1ap-InitialUEMessage,
+    S1ap-KillRequest,
+    S1ap-KillResponse,
+    S1ap-LocationReportingControl,
+    S1ap-LocationReportingFailureIndication,
+    S1ap-LocationReport,
+    S1ap-MMEConfigurationUpdate,
+    S1ap-MMEConfigurationUpdateAcknowledge,
+    S1ap-MMEConfigurationUpdateFailure,
+    S1ap-MMEDirectInformationTransfer,
+    S1ap-MMEStatusTransfer,
+    S1ap-NASNonDeliveryIndication,
+    S1ap-OverloadStart,
+    S1ap-OverloadStop,
+    S1ap-Paging,
+    S1ap-PathSwitchRequest,
+    S1ap-PathSwitchRequestAcknowledge,
+    S1ap-PathSwitchRequestFailure,
+    S1ap-PrivateMessage,
+    S1ap-Reset,
+    S1ap-ResetAcknowledge,
+    S1ap-S1SetupFailure,
+    S1ap-S1SetupRequest,
+    S1ap-S1SetupResponse,
+    E-S1ap-RABModifyRequest,
+    E-S1ap-RABModifyResponse,
+    E-S1ap-RABReleaseCommand,
+    E-S1ap-RABReleaseResponse,
+    E-S1ap-RABReleaseIndication,
+    E-S1ap-RABSetupRequest,
+    E-S1ap-RABSetupResponse,
+    S1ap-TraceFailureIndication,
+    S1ap-TraceStart,
+    S1ap-UECapabilityInfoIndication,
+    S1ap-UEContextModificationFailure,
+    S1ap-UEContextModificationRequest,
+    S1ap-UEContextModificationResponse,
+    S1ap-UEContextReleaseCommand,
+    S1ap-UEContextReleaseComplete,
+    S1ap-UEContextReleaseRequest,
+    S1ap-UplinkUEAssociatedLPPaTransport,
+    S1ap-UplinkNASTransport,
+    S1ap-UplinkNonUEAssociatedLPPaTransport,
+    S1ap-UplinkS1cdma2000tunneling,
+    S1ap-WriteReplaceWarningRequest,
+    S1ap-WriteReplaceWarningResponse,
+    S1ap-ENBConfigurationTransfer,
+    S1ap-MMEConfigurationTransfer
 
 FROM S1AP-PDU-Contents
-	
-	id-CellTrafficTrace,
-	id-DeactivateTrace,
-	id-downlinkUEAssociatedLPPaTransport,
-	id-downlinkNASTransport,
-	id-downlinkNonUEAssociatedLPPaTransport,
-	id-DownlinkS1cdma2000tunneling,
-	id-eNBStatusTransfer,
-	id-ErrorIndication,
-	id-HandoverCancel,
-	id-HandoverNotification,
-	id-HandoverPreparation,
-	id-HandoverResourceAllocation,
-	id-InitialContextSetup,
-	id-initialUEMessage,
-	id-ENBConfigurationUpdate,
-	id-Kill,
-	id-LocationReportingControl,
-	id-LocationReportingFailureIndication,
-	id-LocationReport,
-	id-eNBDirectInformationTransfer,
-	id-MMEConfigurationUpdate,
-	id-MMEDirectInformationTransfer,
-	id-MMEStatusTransfer,
-	id-NASNonDeliveryIndication,
-	id-OverloadStart,
-	id-OverloadStop,
-	id-Paging,
-	id-PathSwitchRequest,
-	id-PrivateMessage,
-	id-Reset,
-	id-S1Setup,
-	id-E-RABModify,
-	id-E-RABRelease,
-	id-E-RABReleaseIndication,
-	id-E-RABSetup,
-	id-TraceFailureIndication,
-	id-TraceStart,
-	id-UECapabilityInfoIndication,
-	id-UEContextModification,
-	id-UEContextRelease,
-	id-UEContextReleaseRequest,
-	id-uplinkUEAssociatedLPPaTransport,
-	id-uplinkNASTransport,
-	id-uplinkNonUEAssociatedLPPaTransport,
-	id-UplinkS1cdma2000tunneling,
-	id-WriteReplaceWarning,
-	id-eNBConfigurationTransfer,
-	id-MMEConfigurationTransfer
+
+    id-CellTrafficTrace,
+    id-DeactivateTrace,
+    id-downlinkUEAssociatedLPPaTransport,
+    id-downlinkNASTransport,
+    id-downlinkNonUEAssociatedLPPaTransport,
+    id-DownlinkS1cdma2000tunneling,
+    id-eNBStatusTransfer,
+    id-ErrorIndication,
+    id-HandoverCancel,
+    id-HandoverNotification,
+    id-HandoverPreparation,
+    id-HandoverResourceAllocation,
+    id-InitialContextSetup,
+    id-initialUEMessage,
+    id-ENBConfigurationUpdate,
+    id-Kill,
+    id-LocationReportingControl,
+    id-LocationReportingFailureIndication,
+    id-LocationReport,
+    id-eNBDirectInformationTransfer,
+    id-MMEConfigurationUpdate,
+    id-MMEDirectInformationTransfer,
+    id-MMEStatusTransfer,
+    id-NASNonDeliveryIndication,
+    id-OverloadStart,
+    id-OverloadStop,
+    id-Paging,
+    id-PathSwitchRequest,
+    id-PrivateMessage,
+    id-Reset,
+    id-S1Setup,
+    id-E-RABModify,
+    id-E-RABRelease,
+    id-E-RABReleaseIndication,
+    id-E-RABSetup,
+    id-TraceFailureIndication,
+    id-TraceStart,
+    id-UECapabilityInfoIndication,
+    id-UEContextModification,
+    id-UEContextRelease,
+    id-UEContextReleaseRequest,
+    id-uplinkUEAssociatedLPPaTransport,
+    id-uplinkNASTransport,
+    id-uplinkNonUEAssociatedLPPaTransport,
+    id-UplinkS1cdma2000tunneling,
+    id-WriteReplaceWarning,
+    id-eNBConfigurationTransfer,
+    id-MMEConfigurationTransfer
 FROM S1AP-Constants;
 
 
@@ -157,18 +156,18 @@ FROM S1AP-Constants;
 -- **************************************************************
 
 S1AP-ELEMENTARY-PROCEDURE ::= CLASS {
-	&InitiatingMessage				,
-	&SuccessfulOutcome				OPTIONAL,
-	&UnsuccessfulOutcome				OPTIONAL,
-	&procedureCode			ProcedureCode 	UNIQUE,
-	&criticality			Criticality 	DEFAULT ignore
+    &InitiatingMessage                ,
+    &SuccessfulOutcome                OPTIONAL,
+    &UnsuccessfulOutcome                OPTIONAL,
+    &procedureCode            ProcedureCode     UNIQUE,
+    &criticality            Criticality     DEFAULT ignore
 }
 WITH SYNTAX {
-	INITIATING MESSAGE			&InitiatingMessage
-	[SUCCESSFUL OUTCOME			&SuccessfulOutcome]
-	[UNSUCCESSFUL OUTCOME		&UnsuccessfulOutcome]
-	PROCEDURE CODE				&procedureCode
-	[CRITICALITY				&criticality]
+    INITIATING MESSAGE            &InitiatingMessage
+    [SUCCESSFUL OUTCOME            &SuccessfulOutcome]
+    [UNSUCCESSFUL OUTCOME        &UnsuccessfulOutcome]
+    PROCEDURE CODE                &procedureCode
+    [CRITICALITY                &criticality]
 }
 
 -- **************************************************************
@@ -178,28 +177,28 @@ WITH SYNTAX {
 -- **************************************************************
 
 S1AP-PDU ::= CHOICE {
-	initiatingMessage	InitiatingMessage,
-	successfulOutcome	SuccessfulOutcome,
-	unsuccessfulOutcome	UnsuccessfulOutcome,
-	...
+    initiatingMessage    InitiatingMessage,
+    successfulOutcome    SuccessfulOutcome,
+    unsuccessfulOutcome    UnsuccessfulOutcome,
+    ...
 }
 
 InitiatingMessage ::= SEQUENCE {
-	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		S1AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+    procedureCode    S1AP-ELEMENTARY-PROCEDURE.&procedureCode    ({S1AP-ELEMENTARY-PROCEDURES}),
+    criticality    S1AP-ELEMENTARY-PROCEDURE.&criticality            ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+    value        S1AP-ELEMENTARY-PROCEDURE.&InitiatingMessage    ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 SuccessfulOutcome ::= SEQUENCE {
-	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		S1AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+    procedureCode    S1AP-ELEMENTARY-PROCEDURE.&procedureCode    ({S1AP-ELEMENTARY-PROCEDURES}),
+    criticality    S1AP-ELEMENTARY-PROCEDURE.&criticality            ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+    value        S1AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome    ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 UnsuccessfulOutcome ::= SEQUENCE {
-	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		S1AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+    procedureCode    S1AP-ELEMENTARY-PROCEDURE.&procedureCode    ({S1AP-ELEMENTARY-PROCEDURES}),
+    criticality    S1AP-ELEMENTARY-PROCEDURE.&criticality            ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+    value        S1AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome    ({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 -- **************************************************************
@@ -209,66 +208,66 @@ UnsuccessfulOutcome ::= SEQUENCE {
 -- **************************************************************
 
 S1AP-ELEMENTARY-PROCEDURES S1AP-ELEMENTARY-PROCEDURE ::= {
-	S1AP-ELEMENTARY-PROCEDURES-CLASS-1		|
-	S1AP-ELEMENTARY-PROCEDURES-CLASS-2,	
-	...
+    S1AP-ELEMENTARY-PROCEDURES-CLASS-1        |
+    S1AP-ELEMENTARY-PROCEDURES-CLASS-2,
+    ...
 }
 
 
 S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
-	handoverPreparation				|
-	handoverResourceAllocation		|
-	pathSwitchRequest 				|
-	e-RABSetup						|
-	e-RABModify						|
-	e-RABRelease					|
-	initialContextSetup				|
-	handoverCancel					|
-	kill							|
-	reset							|
-	s1Setup							|
-	uEContextModification			|
-	uEContextRelease				|
-	eNBConfigurationUpdate			|
-	mMEConfigurationUpdate			|
-	writeReplaceWarning				,
-	...
-}
-
-S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {	
-	handoverNotification			|
-	e-RABReleaseIndication			|
-	paging 							|
-	downlinkNASTransport			|
-	initialUEMessage				|
-	uplinkNASTransport				|
-	errorIndication					|
-	nASNonDeliveryIndication		|
-	uEContextReleaseRequest			|
-	downlinkS1cdma2000tunneling		|
-	uplinkS1cdma2000tunneling		|
-	uECapabilityInfoIndication		|
-	eNBStatusTransfer				|
-	mMEStatusTransfer				|
-	deactivateTrace					|
-	traceStart						|
-	traceFailureIndication			|
-	cellTrafficTrace				|
-	locationReportingControl		|
-	locationReportingFailureIndication	|
-	locationReport					|
-	overloadStart					|
-	overloadStop					|
-	eNBDirectInformationTransfer	|
-	mMEDirectInformationTransfer	|
-	eNBConfigurationTransfer		|
-	mMEConfigurationTransfer		|
-	privateMessage					,
-	...,
-	downlinkUEAssociatedLPPaTransport	|
-	uplinkUEAssociatedLPPaTransport	|
-	downlinkNonUEAssociatedLPPaTransport	|
-	uplinkNonUEAssociatedLPPaTransport
+    handoverPreparation                |
+    handoverResourceAllocation        |
+    pathSwitchRequest                 |
+    e-RABSetup                        |
+    e-RABModify                        |
+    e-RABRelease                    |
+    initialContextSetup                |
+    handoverCancel                    |
+    kill                            |
+    reset                            |
+    s1Setup                            |
+    uEContextModification            |
+    uEContextRelease                |
+    eNBConfigurationUpdate            |
+    mMEConfigurationUpdate            |
+    writeReplaceWarning                ,
+    ...
+}
+
+S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {    
+    handoverNotification            |
+    e-RABReleaseIndication            |
+    paging                             |
+    downlinkNASTransport            |
+    initialUEMessage                |
+    uplinkNASTransport                |
+    errorIndication                    |
+    nASNonDeliveryIndication        |
+    uEContextReleaseRequest            |
+    downlinkS1cdma2000tunneling        |
+    uplinkS1cdma2000tunneling        |
+    uECapabilityInfoIndication        |
+    eNBStatusTransfer                |
+    mMEStatusTransfer                |
+    deactivateTrace                    |
+    traceStart                        |
+    traceFailureIndication            |
+    cellTrafficTrace                |
+    locationReportingControl        |
+    locationReportingFailureIndication    |
+    locationReport                    |
+    overloadStart                    |
+    overloadStop                    |
+    eNBDirectInformationTransfer    |
+    mMEDirectInformationTransfer    |
+    eNBConfigurationTransfer        |
+    mMEConfigurationTransfer        |
+    privateMessage                    ,
+    ...,
+    downlinkUEAssociatedLPPaTransport    |
+    uplinkUEAssociatedLPPaTransport    |
+    downlinkNonUEAssociatedLPPaTransport    |
+    uplinkNonUEAssociatedLPPaTransport
 }
 
 -- **************************************************************
@@ -278,211 +277,211 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 -- **************************************************************
 
 handoverPreparation S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	HandoverRequired
-	SUCCESSFUL OUTCOME	HandoverCommand
-	UNSUCCESSFUL OUTCOME	HandoverPreparationFailure
-	PROCEDURE CODE			id-HandoverPreparation
-	CRITICALITY		reject
+    INITIATING MESSAGE    HandoverRequired
+    SUCCESSFUL OUTCOME    HandoverCommand
+    UNSUCCESSFUL OUTCOME    HandoverPreparationFailure
+    PROCEDURE CODE            id-HandoverPreparation
+    CRITICALITY        reject
 }
 
 handoverResourceAllocation S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	HandoverRequest
-	SUCCESSFUL OUTCOME	HandoverRequestAcknowledge
-	UNSUCCESSFUL OUTCOME	HandoverFailure
-	PROCEDURE CODE			id-HandoverResourceAllocation
-	CRITICALITY		reject
+    INITIATING MESSAGE    HandoverRequest
+    SUCCESSFUL OUTCOME    HandoverRequestAcknowledge
+    UNSUCCESSFUL OUTCOME    HandoverFailure
+    PROCEDURE CODE            id-HandoverResourceAllocation
+    CRITICALITY        reject
 }
 
 handoverNotification S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	HandoverNotify
-	PROCEDURE CODE			id-HandoverNotification
-	CRITICALITY		ignore
+    INITIATING MESSAGE    HandoverNotify
+    PROCEDURE CODE            id-HandoverNotification
+    CRITICALITY        ignore
 }
 
 pathSwitchRequest S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	PathSwitchRequest
-	SUCCESSFUL OUTCOME	PathSwitchRequestAcknowledge
-	UNSUCCESSFUL OUTCOME	PathSwitchRequestFailure
-	PROCEDURE CODE			id-PathSwitchRequest
-	CRITICALITY		reject
+    INITIATING MESSAGE    PathSwitchRequest
+    SUCCESSFUL OUTCOME    PathSwitchRequestAcknowledge
+    UNSUCCESSFUL OUTCOME    PathSwitchRequestFailure
+    PROCEDURE CODE            id-PathSwitchRequest
+    CRITICALITY        reject
 }
 
 e-RABSetup S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	E-RABSetupRequest
-	SUCCESSFUL OUTCOME	E-RABSetupResponse
-	PROCEDURE CODE		id-E-RABSetup
-	CRITICALITY		reject
+    INITIATING MESSAGE    E-RABSetupRequest
+    SUCCESSFUL OUTCOME    E-RABSetupResponse
+    PROCEDURE CODE        id-E-RABSetup
+    CRITICALITY        reject
 }
 
 e-RABModify S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	E-RABModifyRequest
-	SUCCESSFUL OUTCOME	E-RABModifyResponse
-	PROCEDURE CODE		id-E-RABModify
-	CRITICALITY		reject
+    INITIATING MESSAGE    E-RABModifyRequest
+    SUCCESSFUL OUTCOME    E-RABModifyResponse
+    PROCEDURE CODE        id-E-RABModify
+    CRITICALITY        reject
 }
 
 e-RABRelease S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	E-RABReleaseCommand
-	SUCCESSFUL OUTCOME	E-RABReleaseResponse
-	PROCEDURE CODE		id-E-RABRelease
-	CRITICALITY		reject
+    INITIATING MESSAGE    E-RABReleaseCommand
+    SUCCESSFUL OUTCOME    E-RABReleaseResponse
+    PROCEDURE CODE        id-E-RABRelease
+    CRITICALITY        reject
 }
 
 e-RABReleaseIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	E-RABReleaseIndication
-	PROCEDURE CODE		id-E-RABReleaseIndication
-	CRITICALITY		ignore
+    INITIATING MESSAGE    E-RABReleaseIndication
+    PROCEDURE CODE        id-E-RABReleaseIndication
+    CRITICALITY        ignore
 }
 
 initialContextSetup S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	InitialContextSetupRequest
-	SUCCESSFUL OUTCOME	InitialContextSetupResponse
-	UNSUCCESSFUL OUTCOME InitialContextSetupFailure
-	PROCEDURE CODE		id-InitialContextSetup
-	CRITICALITY		reject
+    INITIATING MESSAGE    InitialContextSetupRequest
+    SUCCESSFUL OUTCOME    InitialContextSetupResponse
+    UNSUCCESSFUL OUTCOME InitialContextSetupFailure
+    PROCEDURE CODE        id-InitialContextSetup
+    CRITICALITY        reject
 }
 
 uEContextReleaseRequest S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UEContextReleaseRequest
-	PROCEDURE CODE			id-UEContextReleaseRequest
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UEContextReleaseRequest
+    PROCEDURE CODE            id-UEContextReleaseRequest
+    CRITICALITY                ignore
 }
 
 paging S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	Paging
-	PROCEDURE CODE		id-Paging
-	CRITICALITY			ignore
+    INITIATING MESSAGE    Paging
+    PROCEDURE CODE        id-Paging
+    CRITICALITY            ignore
 }
 
 downlinkNASTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		DownlinkNASTransport
-	PROCEDURE CODE			id-downlinkNASTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        DownlinkNASTransport
+    PROCEDURE CODE            id-downlinkNASTransport
+    CRITICALITY                ignore
 }
 
 initialUEMessage S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		InitialUEMessage
-	PROCEDURE CODE			id-initialUEMessage
-	CRITICALITY				ignore
+    INITIATING MESSAGE        InitialUEMessage
+    PROCEDURE CODE            id-initialUEMessage
+    CRITICALITY                ignore
 }
 
 uplinkNASTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UplinkNASTransport
-	PROCEDURE CODE			id-uplinkNASTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UplinkNASTransport
+    PROCEDURE CODE            id-uplinkNASTransport
+    CRITICALITY                ignore
 }
 nASNonDeliveryIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		NASNonDeliveryIndication
-	PROCEDURE CODE			id-NASNonDeliveryIndication
-	CRITICALITY				ignore
+    INITIATING MESSAGE        NASNonDeliveryIndication
+    PROCEDURE CODE            id-NASNonDeliveryIndication
+    CRITICALITY                ignore
 }
 
 handoverCancel S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	HandoverCancel
-	SUCCESSFUL OUTCOME	HandoverCancelAcknowledge
-	PROCEDURE CODE			id-HandoverCancel
-	CRITICALITY		reject
+    INITIATING MESSAGE    HandoverCancel
+    SUCCESSFUL OUTCOME    HandoverCancelAcknowledge
+    PROCEDURE CODE            id-HandoverCancel
+    CRITICALITY        reject
 }
 
 reset S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	Reset
-	SUCCESSFUL OUTCOME	ResetAcknowledge
-	PROCEDURE CODE		id-Reset
-	CRITICALITY			reject
+    INITIATING MESSAGE    Reset
+    SUCCESSFUL OUTCOME    ResetAcknowledge
+    PROCEDURE CODE        id-Reset
+    CRITICALITY            reject
 }
 
 errorIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	ErrorIndication
-	PROCEDURE CODE		id-ErrorIndication
-	CRITICALITY		ignore
+    INITIATING MESSAGE    ErrorIndication
+    PROCEDURE CODE        id-ErrorIndication
+    CRITICALITY        ignore
 }
 
 s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		S1SetupRequest
-	SUCCESSFUL OUTCOME		S1SetupResponse
-	UNSUCCESSFUL OUTCOME 	S1SetupFailure
-	PROCEDURE CODE			id-S1Setup
-	CRITICALITY				reject
+    INITIATING MESSAGE        S1SetupRequest
+    SUCCESSFUL OUTCOME        S1SetupResponse
+    UNSUCCESSFUL OUTCOME     S1SetupFailure
+    PROCEDURE CODE            id-S1Setup
+    CRITICALITY                reject
 }
 
 eNBConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		ENBConfigurationUpdate
-	SUCCESSFUL OUTCOME		ENBConfigurationUpdateAcknowledge
-	UNSUCCESSFUL OUTCOME 	ENBConfigurationUpdateFailure
-	PROCEDURE CODE			id-ENBConfigurationUpdate
-	CRITICALITY				reject
+    INITIATING MESSAGE        ENBConfigurationUpdate
+    SUCCESSFUL OUTCOME        ENBConfigurationUpdateAcknowledge
+    UNSUCCESSFUL OUTCOME     ENBConfigurationUpdateFailure
+    PROCEDURE CODE            id-ENBConfigurationUpdate
+    CRITICALITY                reject
 }
 
 mMEConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		MMEConfigurationUpdate
-	SUCCESSFUL OUTCOME		MMEConfigurationUpdateAcknowledge
-	UNSUCCESSFUL OUTCOME 	MMEConfigurationUpdateFailure
-	PROCEDURE CODE			id-MMEConfigurationUpdate
-	CRITICALITY				reject
+    INITIATING MESSAGE        MMEConfigurationUpdate
+    SUCCESSFUL OUTCOME        MMEConfigurationUpdateAcknowledge
+    UNSUCCESSFUL OUTCOME     MMEConfigurationUpdateFailure
+    PROCEDURE CODE            id-MMEConfigurationUpdate
+    CRITICALITY                reject
 }
 
 downlinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		DownlinkS1cdma2000tunneling
-	PROCEDURE CODE			id-DownlinkS1cdma2000tunneling
-	CRITICALITY				ignore
+    INITIATING MESSAGE        DownlinkS1cdma2000tunneling
+    PROCEDURE CODE            id-DownlinkS1cdma2000tunneling
+    CRITICALITY                ignore
 }
 
 uplinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UplinkS1cdma2000tunneling
-	PROCEDURE CODE			id-UplinkS1cdma2000tunneling
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UplinkS1cdma2000tunneling
+    PROCEDURE CODE            id-UplinkS1cdma2000tunneling
+    CRITICALITY                ignore
 }
 
 uEContextModification S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UEContextModificationRequest
-	SUCCESSFUL OUTCOME		UEContextModificationResponse
-	UNSUCCESSFUL OUTCOME 	UEContextModificationFailure
+    INITIATING MESSAGE        UEContextModificationRequest
+    SUCCESSFUL OUTCOME        UEContextModificationResponse
+    UNSUCCESSFUL OUTCOME     UEContextModificationFailure
 
-	PROCEDURE CODE		id-UEContextModification
-	CRITICALITY		reject
+    PROCEDURE CODE        id-UEContextModification
+    CRITICALITY        reject
 }
 
 uECapabilityInfoIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UECapabilityInfoIndication
-	PROCEDURE CODE			id-UECapabilityInfoIndication
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UECapabilityInfoIndication
+    PROCEDURE CODE            id-UECapabilityInfoIndication
+    CRITICALITY                ignore
 }
 
 uEContextRelease S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UEContextReleaseCommand
-	SUCCESSFUL OUTCOME		UEContextReleaseComplete
-	PROCEDURE CODE			id-UEContextRelease
-	CRITICALITY				reject
+    INITIATING MESSAGE        UEContextReleaseCommand
+    SUCCESSFUL OUTCOME        UEContextReleaseComplete
+    PROCEDURE CODE            id-UEContextRelease
+    CRITICALITY                reject
 }
 
 eNBStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		ENBStatusTransfer
-	PROCEDURE CODE			id-eNBStatusTransfer
-	CRITICALITY				ignore
+    INITIATING MESSAGE        ENBStatusTransfer
+    PROCEDURE CODE            id-eNBStatusTransfer
+    CRITICALITY                ignore
 }
 
 mMEStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		MMEStatusTransfer
-	PROCEDURE CODE			id-MMEStatusTransfer
-	CRITICALITY				ignore
+    INITIATING MESSAGE        MMEStatusTransfer
+    PROCEDURE CODE            id-MMEStatusTransfer
+    CRITICALITY                ignore
 }
 
 deactivateTrace S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		DeactivateTrace
-	PROCEDURE CODE			id-DeactivateTrace
-	CRITICALITY				ignore
+    INITIATING MESSAGE        DeactivateTrace
+    PROCEDURE CODE            id-DeactivateTrace
+    CRITICALITY                ignore
 }
 
 traceStart S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	TraceStart
-	PROCEDURE CODE		id-TraceStart
-	CRITICALITY			ignore
+    INITIATING MESSAGE    TraceStart
+    PROCEDURE CODE        id-TraceStart
+    CRITICALITY            ignore
 }
 
 traceFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	TraceFailureIndication
-	PROCEDURE CODE		id-TraceFailureIndication
-	CRITICALITY			ignore
+    INITIATING MESSAGE    TraceFailureIndication
+    PROCEDURE CODE        id-TraceFailureIndication
+    CRITICALITY            ignore
 }
 cellTrafficTrace S1AP-ELEMENTARY-PROCEDURE ::={
 INITIATING MESSAGE CellTrafficTrace
@@ -491,101 +490,101 @@ CRITICALITY         ignore
 }
 
 locationReportingControl S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		LocationReportingControl
-	PROCEDURE CODE			id-LocationReportingControl
-	CRITICALITY				ignore
+    INITIATING MESSAGE        LocationReportingControl
+    PROCEDURE CODE            id-LocationReportingControl
+    CRITICALITY                ignore
 }
 
 locationReportingFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		LocationReportingFailureIndication
-	PROCEDURE CODE			id-LocationReportingFailureIndication
-	CRITICALITY				ignore
+    INITIATING MESSAGE        LocationReportingFailureIndication
+    PROCEDURE CODE            id-LocationReportingFailureIndication
+    CRITICALITY                ignore
 }
 
 locationReport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		LocationReport
-	PROCEDURE CODE			id-LocationReport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        LocationReport
+    PROCEDURE CODE            id-LocationReport
+    CRITICALITY                ignore
 }
 
 overloadStart S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	OverloadStart
-	PROCEDURE CODE		id-OverloadStart
-	CRITICALITY		ignore
+    INITIATING MESSAGE    OverloadStart
+    PROCEDURE CODE        id-OverloadStart
+    CRITICALITY        ignore
 }
 
 overloadStop S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	OverloadStop
-	PROCEDURE CODE		id-OverloadStop
-	CRITICALITY		reject
+    INITIATING MESSAGE    OverloadStop
+    PROCEDURE CODE        id-OverloadStop
+    CRITICALITY        reject
 }
 
 writeReplaceWarning S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	WriteReplaceWarningRequest
-	SUCCESSFUL OUTCOME	WriteReplaceWarningResponse
-	PROCEDURE CODE		id-WriteReplaceWarning
-	CRITICALITY			reject
+    INITIATING MESSAGE    WriteReplaceWarningRequest
+    SUCCESSFUL OUTCOME    WriteReplaceWarningResponse
+    PROCEDURE CODE        id-WriteReplaceWarning
+    CRITICALITY            reject
 }
 
 eNBDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	ENBDirectInformationTransfer
-	PROCEDURE CODE		id-eNBDirectInformationTransfer
-	CRITICALITY			ignore
+    INITIATING MESSAGE    ENBDirectInformationTransfer
+    PROCEDURE CODE        id-eNBDirectInformationTransfer
+    CRITICALITY            ignore
 }
 
 mMEDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	MMEDirectInformationTransfer
-	PROCEDURE CODE		id-MMEDirectInformationTransfer
-	CRITICALITY			ignore
+    INITIATING MESSAGE    MMEDirectInformationTransfer
+    PROCEDURE CODE        id-MMEDirectInformationTransfer
+    CRITICALITY            ignore
 }
 
 eNBConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		ENBConfigurationTransfer
-	PROCEDURE CODE			id-eNBConfigurationTransfer
-	CRITICALITY				ignore
+    INITIATING MESSAGE        ENBConfigurationTransfer
+    PROCEDURE CODE            id-eNBConfigurationTransfer
+    CRITICALITY                ignore
 }
 
 mMEConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		MMEConfigurationTransfer
-	PROCEDURE CODE			id-MMEConfigurationTransfer
-	CRITICALITY				ignore
+    INITIATING MESSAGE        MMEConfigurationTransfer
+    PROCEDURE CODE            id-MMEConfigurationTransfer
+    CRITICALITY                ignore
 }
 
 
 privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	PrivateMessage
-	PROCEDURE CODE		id-PrivateMessage
-	CRITICALITY			ignore
+    INITIATING MESSAGE    PrivateMessage
+    PROCEDURE CODE        id-PrivateMessage
+    CRITICALITY            ignore
 }
 
 kill S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	KillRequest
-	SUCCESSFUL OUTCOME	KillResponse
-	PROCEDURE CODE		id-Kill
-	CRITICALITY			reject
+    INITIATING MESSAGE    KillRequest
+    SUCCESSFUL OUTCOME    KillResponse
+    PROCEDURE CODE        id-Kill
+    CRITICALITY            reject
 }
 
 downlinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		DownlinkUEAssociatedLPPaTransport
-	PROCEDURE CODE			id-downlinkUEAssociatedLPPaTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        DownlinkUEAssociatedLPPaTransport
+    PROCEDURE CODE            id-downlinkUEAssociatedLPPaTransport
+    CRITICALITY                ignore
 }
 
 uplinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UplinkUEAssociatedLPPaTransport
-	PROCEDURE CODE			id-uplinkUEAssociatedLPPaTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UplinkUEAssociatedLPPaTransport
+    PROCEDURE CODE            id-uplinkUEAssociatedLPPaTransport
+    CRITICALITY                ignore
 }
 downlinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		DownlinkNonUEAssociatedLPPaTransport
-	PROCEDURE CODE			id-downlinkNonUEAssociatedLPPaTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        DownlinkNonUEAssociatedLPPaTransport
+    PROCEDURE CODE            id-downlinkNonUEAssociatedLPPaTransport
+    CRITICALITY                ignore
 }
 
 uplinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		UplinkNonUEAssociatedLPPaTransport
-	PROCEDURE CODE			id-uplinkNonUEAssociatedLPPaTransport
-	CRITICALITY				ignore
+    INITIATING MESSAGE        UplinkNonUEAssociatedLPPaTransport
+    PROCEDURE CODE            id-uplinkNonUEAssociatedLPPaTransport
+    CRITICALITY                ignore
 }
 
 END
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
index 1b20645bf6f4c3042f9fa66002352df57466c38e..f0042af1c1fb8650f08b58b7c33e23fb9dc251ab 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
+++ b/openair-cn/S1AP/MESSAGES/ASN1/R10.5/S1AP-PDU.asn
@@ -8,406 +8,405 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-Criticality,
-ProcedureCode,
-ProtocolIE-ID
+    S1ap-Criticality,
+    S1ap-ProcedureCode,
+    S1ap-ProtocolIE-ID
 
 FROM S1AP-CommonDataTypes
 
-maxProtocolIEs
+    s1ap-maxProtocolIEs
 
 FROM S1AP-Constants;
 
 S1AP-PDU ::= CHOICE {
-    initiatingMessage       InitiatingMessage,
-    successfulOutcome       SuccessfulOutcome,
-    unsuccessfulOutcome     UnsuccessfulOutcome,
+    initiatingMessage       S1ap-InitiatingMessage,
+    successfulOutcome       S1ap-SuccessfulOutcome,
+    unsuccessfulOutcome     S1ap-UnsuccessfulOutcome,
     ...
 }
 
-InitiatingMessage ::= SEQUENCE {
-    procedureCode   ProcedureCode,
-    criticality     Criticality,
+S1ap-InitiatingMessage ::= SEQUENCE {
+    procedureCode   S1ap-ProcedureCode,
+    criticality     S1ap-Criticality,
     value           ANY
 }
 
-SuccessfulOutcome ::= SEQUENCE {
-    procedureCode   ProcedureCode,
-    criticality     Criticality,
+S1ap-SuccessfulOutcome ::= SEQUENCE {
+    procedureCode   S1ap-ProcedureCode,
+    criticality     S1ap-Criticality,
     value           ANY
 }
 
-UnsuccessfulOutcome ::= SEQUENCE {
-    procedureCode   ProcedureCode,
-    criticality     Criticality,
+S1ap-UnsuccessfulOutcome ::= SEQUENCE {
+    procedureCode   S1ap-ProcedureCode,
+    criticality     S1ap-Criticality,
     value           ANY
 }
 
-HandoverRequired ::= SEQUENCE {
-    handoverRequired-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverRequired ::= SEQUENCE {
+    s1ap-HandoverRequired-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverCommand ::= SEQUENCE {
-    handoverCommand-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverCommand ::= SEQUENCE {
+    s1ap-HandoverCommand-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverPreparationFailure ::= SEQUENCE {
-    handoverPreparationFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverPreparationFailure ::= SEQUENCE {
+    s1ap-HandoverPreparationFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverRequest ::= SEQUENCE {
-    handoverRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverRequest ::= SEQUENCE {
+    s1ap-HandoverRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverRequestAcknowledge ::= SEQUENCE {
-    handoverRequestAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverRequestAcknowledge ::= SEQUENCE {
+    s1ap-HandoverRequestAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverFailure ::= SEQUENCE {
-    handoverFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverFailure ::= SEQUENCE {
+    s1ap-HandoverFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverNotify ::= SEQUENCE {
-    handoverNotify-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverNotify ::= SEQUENCE {
+    s1ap-HandoverNotify-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-PathSwitchRequest ::= SEQUENCE {
-    pathSwitchRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-PathSwitchRequest ::= SEQUENCE {
+    s1ap-PathSwitchRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-PathSwitchRequestAcknowledge ::= SEQUENCE {
-    pathSwitchRequestAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-PathSwitchRequestAcknowledge ::= SEQUENCE {
+    s1ap-PathSwitchRequestAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-PathSwitchRequestFailure ::= SEQUENCE {
-    pathSwitchRequestFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-PathSwitchRequestFailure ::= SEQUENCE {
+    s1ap-PathSwitchRequestFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABSetupRequest ::= SEQUENCE {
-    e-RABSetupRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABSetupRequest ::= SEQUENCE {
+    s1ap-E-RABSetupRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABSetupResponse ::= SEQUENCE {
-    e-RABSetupResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABSetupResponse ::= SEQUENCE {
+    s1ap-E-RABSetupResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABModifyRequest ::= SEQUENCE {
-    e-RABModifyRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABModifyRequest ::= SEQUENCE {
+    s1ap-E-RABModifyRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABModifyResponse ::= SEQUENCE {
-    e-RABModifyResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABModifyResponse ::= SEQUENCE {
+    s1ap-E-RABModifyResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABReleaseIndication ::= SEQUENCE {
-    e-RABReleaseIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABReleaseIndication ::= SEQUENCE {
+    s1ap-E-RABReleaseIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABReleaseCommand ::= SEQUENCE {
-    e-RABReleaseCommand-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABReleaseCommand ::= SEQUENCE {
+    s1ap-E-RABReleaseCommand-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-E-RABReleaseResponse ::= SEQUENCE {
-    e-RABReleaseResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-E-RABReleaseResponse ::= SEQUENCE {
+    s1ap-E-RABReleaseResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-InitialContextSetupRequest ::= SEQUENCE {
-    initialContextSetupRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-InitialContextSetupRequest ::= SEQUENCE {
+    s1ap-InitialContextSetupRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-InitialContextSetupResponse ::= SEQUENCE {
-    initialContextSetupResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-InitialContextSetupResponse ::= SEQUENCE {
+    s1ap-InitialContextSetupResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-InitialContextSetupFailure ::= SEQUENCE {
-    initialContextSetupFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-InitialContextSetupFailure ::= SEQUENCE {
+    s1ap-InitialContextSetupFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextReleaseRequest ::= SEQUENCE {
-    ueContextReleaseRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextReleaseRequest ::= SEQUENCE {
+    s1ap-UEContextReleaseRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-Paging ::= SEQUENCE {
-    paging-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-Paging ::= SEQUENCE {
+    s1ap-Paging-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-DownlinkNASTransport ::= SEQUENCE {
-    downlinkNASTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-DownlinkNASTransport ::= SEQUENCE {
+    s1ap-DownlinkNASTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-InitialUEMessage ::= SEQUENCE {
-    initialUEMessage-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-InitialUEMessage ::= SEQUENCE {
+    s1ap-InitialUEMessage-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UplinkNASTransport ::= SEQUENCE {
-    uplinkNASTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UplinkNASTransport ::= SEQUENCE {
+    s1ap-UplinkNASTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-NASNonDeliveryIndication ::= SEQUENCE {
-    nasNonDeliveryIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-NASNonDeliveryIndication ::= SEQUENCE {
+    s1ap-NASNonDeliveryIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverCancel ::= SEQUENCE {
-    handoverCancel-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverCancel ::= SEQUENCE {
+    s1ap-HandoverCancel-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-HandoverCancelAcknowledge ::= SEQUENCE {
-    handoverCancelAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-HandoverCancelAcknowledge ::= SEQUENCE {
+    s1ap-HandoverCancelAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-Reset ::= SEQUENCE {
-    reset-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-Reset ::= SEQUENCE {
+    s1ap-Reset-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ResetAcknowledge ::= SEQUENCE {
-    resetAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ResetAcknowledge ::= SEQUENCE {
+    s1ap-ResetAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-S1SetupResponse ::= SEQUENCE {
-    s1SetupResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-S1SetupResponse ::= SEQUENCE {
+    s1ap-S1SetupResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-S1SetupRequest ::= SEQUENCE {
-    s1SetupRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-S1SetupRequest ::= SEQUENCE {
+    s1ap-S1SetupRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-S1SetupFailure ::= SEQUENCE
-{
-    s1SetupFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-S1SetupFailure ::= SEQUENCE {
+    s1ap-S1SetupFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ErrorIndication ::= SEQUENCE {
-    errorIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ErrorIndication ::= SEQUENCE {
+    s1ap-ErrorIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBConfigurationUpdate ::= SEQUENCE {
-    eNBConfigurationUpdate-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBConfigurationUpdate ::= SEQUENCE {
+    s1ap-ENBConfigurationUpdate-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
-    eNBConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
+    s1ap-ENBConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBConfigurationUpdateFailure ::= SEQUENCE {
-    eNBConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBConfigurationUpdateFailure ::= SEQUENCE {
+    s1ap-ENBConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEConfigurationUpdate ::= SEQUENCE {
-    mmeConfigurationUpdate-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEConfigurationUpdate ::= SEQUENCE {
+    s1ap-MMEConfigurationUpdate-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
-    mmeConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
+    s1ap-MMEConfigurationUpdateAcknowledge-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEConfigurationUpdateFailure ::= SEQUENCE {
-    mmeConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEConfigurationUpdateFailure ::= SEQUENCE {
+    s1ap-MMEConfigurationUpdateFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-DownlinkS1cdma2000tunneling ::= SEQUENCE {
-    downlinkS1cdma2000tunneling-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-DownlinkS1cdma2000tunneling ::= SEQUENCE {
+    s1ap-DownlinkS1cdma2000tunneling-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UplinkS1cdma2000tunneling ::= SEQUENCE {
-    uplinkS1cdma2000tunneling-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UplinkS1cdma2000tunneling ::= SEQUENCE {
+    s1ap-UplinkS1cdma2000tunneling-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextModificationRequest ::= SEQUENCE {
-    ueContextModificationRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextModificationRequest ::= SEQUENCE {
+    s1ap-UEContextModificationRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextModificationResponse ::= SEQUENCE {
-    ueContextModificationResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextModificationResponse ::= SEQUENCE {
+    s1ap-UEContextModificationResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextModificationFailure ::= SEQUENCE {
-    ueContextModificationFailure-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextModificationFailure ::= SEQUENCE {
+    s1ap-UEContextModificationFailure-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UECapabilityInfoIndication ::= SEQUENCE {
-    ueCapabilityInfoIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UECapabilityInfoIndication ::= SEQUENCE {
+    s1ap-UECapabilityInfoIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextReleaseCommand ::= SEQUENCE {
-    ueContextReleaseCommand-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextReleaseCommand ::= SEQUENCE {
+    s1ap-UEContextReleaseCommand-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UEContextReleaseComplete ::= SEQUENCE {
-    ueContextReleaseComplete-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UEContextReleaseComplete ::= SEQUENCE {
+    s1ap-UEContextReleaseComplete-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBStatusTransfer ::= SEQUENCE {
-    eNBStatusTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBStatusTransfer ::= SEQUENCE {
+    s1ap-ENBStatusTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEStatusTransfer ::= SEQUENCE {
-    mmeStatusTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEStatusTransfer ::= SEQUENCE {
+    s1ap-MMEStatusTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-DeactivateTrace ::= SEQUENCE {
-    deactivateTrace-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-DeactivateTrace ::= SEQUENCE {
+    s1ap-DeactivateTrace-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-TraceStart ::= SEQUENCE {
-    traceStart-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-TraceStart ::= SEQUENCE {
+    s1ap-TraceStart-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-TraceFailureIndication ::= SEQUENCE {
-    traceFailureIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-TraceFailureIndication ::= SEQUENCE {
+    s1ap-TraceFailureIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-CellTrafficTrace ::= SEQUENCE {
-    cellTrafficTrace-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-CellTrafficTrace ::= SEQUENCE {
+    s1ap-CellTrafficTrace-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-LocationReportingControl ::= SEQUENCE {
-    locationReportingControl-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-LocationReportingControl ::= SEQUENCE {
+    s1ap-LocationReportingControl-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-LocationReportingFailureIndication ::= SEQUENCE {
-    locationReportingFailureIndication-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-LocationReportingFailureIndication ::= SEQUENCE {
+    s1ap-LocationReportingFailureIndication-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-LocationReport ::= SEQUENCE {
-    locationReport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-LocationReport ::= SEQUENCE {
+    s1ap-LocationReport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-OverloadStart ::= SEQUENCE {
-    overloadStart-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-OverloadStart ::= SEQUENCE {
+    s1ap-OverloadStart-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-OverloadStop ::= SEQUENCE {
-    overloadStop-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-OverloadStop ::= SEQUENCE {
+    s1ap-OverloadStop-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-WriteReplaceWarningRequest ::= SEQUENCE {
-    writeReplaceWarningRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-WriteReplaceWarningRequest ::= SEQUENCE {
+    s1ap-WriteReplaceWarningRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-WriteReplaceWarningResponse ::= SEQUENCE {
-    writeReplaceWarningResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-WriteReplaceWarningResponse ::= SEQUENCE {
+    s1ap-WriteReplaceWarningResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBDirectInformationTransfer ::= SEQUENCE {
-    eNBDirectInformationTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBDirectInformationTransfer ::= SEQUENCE {
+    s1ap-ENBDirectInformationTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEDirectInformationTransfer ::= SEQUENCE {
-    mmeDirectInformationTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEDirectInformationTransfer ::= SEQUENCE {
+    s1ap-MMEDirectInformationTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-ENBConfigurationTransfer ::= SEQUENCE {
-    eNBConfigurationTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-ENBConfigurationTransfer ::= SEQUENCE {
+    s1ap-ENBConfigurationTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-MMEConfigurationTransfer ::= SEQUENCE {
-    mmeConfigurationTransfer-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-MMEConfigurationTransfer ::= SEQUENCE {
+    s1ap-MMEConfigurationTransfer-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-PrivateMessage ::= SEQUENCE {
-    privateMessage-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-PrivateMessage ::= SEQUENCE {
+    s1ap-PrivateMessage-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-KillRequest ::= SEQUENCE {
-    killRequest-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-KillRequest ::= SEQUENCE {
+    s1ap-KillRequest-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-KillResponse ::= SEQUENCE {
-    killResponse-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-KillResponse ::= SEQUENCE {
+    s1ap-KillResponse-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-DownlinkUEAssociatedLPPaTransport ::= SEQUENCE {
-    downlinkUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-DownlinkUEAssociatedLPPaTransport ::= SEQUENCE {
+    s1ap-DownlinkUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UplinkUEAssociatedLPPaTransport ::= SEQUENCE {
-    uplinkUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UplinkUEAssociatedLPPaTransport ::= SEQUENCE {
+    s1ap-UplinkUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-DownlinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
-    downlinkNonUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-DownlinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+    s1ap-DownlinkNonUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-UplinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
-    uplinkNonUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..maxProtocolIEs)) OF IE,
+S1ap-UplinkNonUEAssociatedLPPaTransport ::= SEQUENCE {
+    s1ap-UplinkNonUEAssociatedLPPaTransport-ies SEQUENCE (SIZE (0..s1ap-maxProtocolIEs)) OF S1ap-IE,
     ...
 }
 
-IE ::= SEQUENCE {
-    id ProtocolIE-ID,
-    criticality Criticality,
-    value ANY
+S1ap-IE ::= SEQUENCE {
+    id          S1ap-ProtocolIE-ID,
+    criticality S1ap-Criticality,
+    value       ANY
 }
 
 END
\ No newline at end of file
diff --git a/openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py b/openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py
index 479f45e91ab314119c42cbca4ad4dabb51ce136c..8b5c66ad68febf795ae4ca109c3006c268848a46 100644
--- a/openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py
+++ b/openair-cn/S1AP/MESSAGES/ASN1/asn1tostruct.py
@@ -3,7 +3,7 @@ import datetime
 import getopt
 import getpass
 
-version = "1.0.0"
+version = "1.0.1"
 
 lines = ""
 iesDefs = {}
@@ -19,6 +19,7 @@ WARN = '\033[93m'
 ENDC = '\033[0m'
 
 fileprefix = ""
+fileprefix_first_upper = ""
 
 def printFail(string):
     sys.stderr.write(FAIL + string + ENDC + "\n")
@@ -87,7 +88,7 @@ def lowerFirstCamelWord(word):
     for c in swapped:
         if c in string.lowercase:
             newstr += c
-            idx += 1
+            idx    += 1
         else:
             break
     if idx < 2:
@@ -164,6 +165,8 @@ if len(iesDefs) == 0:
     printFail("No Information Element parsed, exiting")
     sys.exit(0)
 
+fileprefix_first_upper = fileprefix[0].upper() + fileprefix[1:]
+
 f = open(outdir + fileprefix + '_ies_defs.h', 'w')
 outputHeaderToFile(f, filename)
 f.write("#include \"%s_common.h\"\n\n" % (fileprefix))
@@ -223,9 +226,9 @@ for key in iesDefs:
     f.write("} %s_t;\n\n" % (re.sub('-', '_', key)))
 
 f.write("typedef struct %s_message_s {\n" % (fileprefix))
-f.write("    ProcedureCode_t procedureCode;\n")
-f.write("    Criticality_t   criticality;\n")
-f.write("    uint8_t         direction;\n")
+f.write("    %s_ProcedureCode_t procedureCode;\n" % (fileprefix_first_upper))
+f.write("    %s_Criticality_t   criticality;\n" % (fileprefix_first_upper))
+f.write("    uint8_t            direction;\n")
 f.write("    union {\n")
 
 messageList = iesDefs.keys()
@@ -353,7 +356,7 @@ for key in iesDefs:
     f.write("    %s_DEBUG(\"Decoding message %s (%%s:%%d)\\n\", __FILE__, __LINE__);\n\n" % (fileprefix.upper(), re.sub('-', '_', keyName)))
     f.write("    ANY_to_type_aper(any_p, &asn_DEF_%s, (void**)&%s_p);\n\n" % (asn1cStruct, asn1cStructfirstlower))
     f.write("    for (i = 0; i < %s_p->%slist.count; i++) {\n" % (asn1cStructfirstlower, iesaccess))
-    f.write("        IE_t *ie_p;\n")
+    f.write("        %s_IE_t *ie_p;\n" % (fileprefix[0].upper() + fileprefix[1:]))
     f.write("        ie_p = %s_p->%slist.array[i];\n" % (asn1cStructfirstlower, iesaccess))
     f.write("        switch(ie_p->id) {\n")
     for ie in iesDefs[key]["ies"]:
@@ -368,7 +371,7 @@ for key in iesDefs:
             f.write("            /* Optional field */\n")
         elif ie[3] == "conditional":
             f.write("            /* Conditional field */\n")
-        f.write("            case ProtocolIE_ID_%s:\n" % (re.sub('-', '_', ie[0])))
+        f.write("            case %s_ProtocolIE_ID_%s:\n" % (fileprefix_first_upper, re.sub('-', '_', ie[0])))
         f.write("            {\n")
         f.write("                %s_t *%s_p = NULL;\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
         if ie[3] != "mandatory":
@@ -416,12 +419,12 @@ for key in iesDefs:
     f.write("    assert(%sIEs != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))));
 
     f.write("    for (i = 0; i < %s->list.count; i++) {\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))))
-    f.write("        IE_t *ie_p = %s->list.array[i];\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))))
+    f.write("        %s_IE_t *ie_p = %s->list.array[i];\n" % (fileprefix[0].upper() + fileprefix[1:], lowerFirstCamelWord(re.sub('-', '_', keyname))))
     f.write("        switch (ie_p->id) {\n")
     for ie in iesDefs[key]["ies"]:
         iename = re.sub('id-', '', ie[0])
         ienameunderscore = lowerFirstCamelWord(re.sub('-', '_', iename))
-        f.write("            case ProtocolIE_ID_%s:\n" % (re.sub('-', '_', ie[0])))
+        f.write("            case %s_ProtocolIE_ID_%s:\n" % (fileprefix_first_upper, re.sub('-', '_', ie[0])))
         f.write("            {\n")
         f.write("                %s_t *%s_p = NULL;\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
         f.write("                tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
@@ -478,7 +481,7 @@ for key in iesDefs:
     f.write("    %s_t *%s,\n" % (asn1cStruct, firstwordlower))
     f.write("    %s_t *%s) {\n\n" % (re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key))))
 
-    f.write("    IE_t *ie;\n\n")
+    f.write("    %s_IE_t *ie;\n\n" % (fileprefix_first_upper))
 
     f.write("    assert(%s != NULL);\n" % (firstwordlower));
     f.write("    assert(%s != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', key))));
@@ -497,10 +500,10 @@ for key in iesDefs:
                 f.write("    /* Conditional field */\n")
             f.write("    if (%s->presenceMask & %s_%s_PRESENT) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), keyupperunderscore, ieupperunderscore))
             #f.write("        == %s_%s_PRESENT) {\n" % (keyupperunderscore, ieupperunderscore))
-            f.write("        if ((ie = %s_new_ie(ProtocolIE_ID_%s,\n" % (fileprefix, re.sub('-', '_', ie[0])))
-            f.write("                              Criticality_%s,\n" % (ie[1]))
-            f.write("                              &asn_DEF_%s,\n" % (ietypeunderscore))
-            f.write("                              &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
+            f.write("        if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
+            f.write("                            %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
+            f.write("                            &asn_DEF_%s,\n" % (ietypeunderscore))
+            f.write("                            &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
             f.write("            return -1;\n")
             f.write("        }\n")
             f.write("        ASN_SEQUENCE_ADD(&%s->%slist, ie);\n" % (firstwordlower, iesaccess))
@@ -511,9 +514,9 @@ for key in iesDefs:
                 f.write("    memset(&%s, 0, sizeof(%s_t));\n" % (ienamefirstwordlower, ietypeunderscore))
                 f.write("\n")
                 f.write("    if (%s_encode_%s(&%s, &%s->%s) < 0) return -1;\n" % (fileprefix, ietypeunderscore.lower(), ienamefirstwordlower, lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
-            f.write("    if ((ie = %s_new_ie(ProtocolIE_ID_%s,\n" % (fileprefix, re.sub('-', '_', ie[0])))
-            f.write("                          Criticality_%s,\n" % (ie[1]))
-            f.write("                          &asn_DEF_%s,\n" % (ietypeunderscore))
+            f.write("    if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
+            f.write("                        %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
+            f.write("                        &asn_DEF_%s,\n" % (ietypeunderscore))
             if ie[2] in ieofielist.keys():
                 f.write("                          &%s)) == NULL) {\n" % (ienamefirstwordlower))
             else:
@@ -546,14 +549,14 @@ for (key, value) in iesDefs.items():
     f.write("    %sIEs_t *%sIEs) {\n\n" % (re.sub('-', '_', i), lowerFirstCamelWord(re.sub('-', '_', i))))
     f.write("    int i;\n")
 
-    f.write("    IE_t *ie;\n\n")
+    f.write("    %s_IE_t *ie;\n\n" % (fileprefix_first_upper))
 
     f.write("    assert(%s != NULL);\n" % (firstwordlower));
     f.write("    assert(%sIEs != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', i))));
 
     f.write("    for (i = 0; i < %sIEs->%s.count; i++) {\n" % (firstwordlower, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-    f.write("        if ((ie = %s_new_ie(ProtocolIE_ID_%s,\n" % (fileprefix, re.sub('-', '_', ie[0])))
-    f.write("                            Criticality_%s,\n" % (ie[1]))
+    f.write("        if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
+    f.write("                            %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
     f.write("                            &asn_DEF_%s,\n" % (ietypeunderscore))
     f.write("                            %sIEs->%s.array[i])) == NULL) {\n" % (firstwordlower, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
     f.write("            return -1;\n")
@@ -644,8 +647,8 @@ for (key, value) in iesDefs.items():
         f.write("    }\n")
     else:
         f.write("    fprintf(file, \"<%s-PDU>\\n\");\n" % (fileprefix.upper()))
-        f.write("    xer_encode_local(&asn_DEF_Criticality, &message_p->criticality, cb, app_key, 1);\n")
-        f.write("    xer_encode_local(&asn_DEF_ProcedureCode, &message_p->procedureCode, cb, app_key, 1);\n")
+        f.write("    xer_encode_local(&asn_DEF_%s_Criticality, &message_p->criticality, cb, app_key, 1);\n" % fileprefix_first_upper)
+        f.write("    xer_encode_local(&asn_DEF_%s_ProcedureCode, &message_p->procedureCode, cb, app_key, 1);\n" % fileprefix_first_upper)
         f.write("    fprintf(file, \"    <%s>\\n\");\n" % (key))
 
         for ie in iesDefs[key]["ies"]:
diff --git a/openair-cn/S1AP/MESSAGES/Makefile.am b/openair-cn/S1AP/MESSAGES/Makefile.am
index ba7eecd1ae03dfaa132227f666277ae459f7b343..82b92776e5e008a69273a5de90d07326cbbe20e0 100644
--- a/openair-cn/S1AP/MESSAGES/Makefile.am
+++ b/openair-cn/S1AP/MESSAGES/Makefile.am
@@ -3,600 +3,600 @@ ASN_MODULEdir=.
 libs1apmessagesdir=.
 
 ASN_MODULE_SOURCES=	\
-	Criticality.c	\
-	Presence.c	\
-	PrivateIE-ID.c	\
-	ProcedureCode.c	\
-	ProtocolExtensionID.c	\
-	ProtocolIE-ID.c	\
-	TriggeringMessage.c	\
-	IE-Extensions.c	\
-	AllocationAndRetentionPriority.c	\
-	Bearers-SubjectToStatusTransfer-List.c	\
-	Bearers-SubjectToStatusTransfer-Item.c	\
-	BitRate.c	\
-	BPLMNs.c	\
-	BroadcastCompletedAreaList.c	\
-	Cause.c	\
-	CauseMisc.c	\
-	CauseProtocol.c	\
-	CauseRadioNetwork.c	\
-	CauseTransport.c	\
-	CauseNas.c	\
-	CellIdentity.c	\
-	CellID-Broadcast.c	\
-	CellID-Broadcast-Item.c	\
-	Cdma2000PDU.c	\
-	Cdma2000RATType.c	\
-	Cdma2000SectorID.c	\
-	Cdma2000HOStatus.c	\
-	Cdma2000HORequiredIndication.c	\
-	Cdma2000OneXSRVCCInfo.c	\
-	Cdma2000OneXMEID.c	\
-	Cdma2000OneXMSI.c	\
-	Cdma2000OneXPilot.c	\
-	Cdma2000OneXRAND.c	\
-	Cell-Size.c	\
-	CellType.c	\
-	CGI.c	\
-	CI.c	\
-	CNDomain.c	\
-	CSFallbackIndicator.c	\
-	CSG-Id.c	\
-	CSG-IdList.c	\
-	CSG-IdList-Item.c	\
-	COUNTvalue.c	\
-	CriticalityDiagnostics.c	\
-	CriticalityDiagnostics-IE-List.c	\
-	CriticalityDiagnostics-IE-Item.c	\
-	DataCodingScheme.c	\
-	DL-Forwarding.c	\
-	Direct-Forwarding-Path-Availability.c	\
-	E-RABToBeModifiedListBearerModReq.c	\
-	E-RABToBeModifiedItemBearerModReq.c	\
-	E-RABReleaseListBearerRelComp.c	\
-	E-RABReleaseItemBearerRelComp.c	\
-	E-RABDataForwardingList.c	\
-	E-RABDataForwardingItem.c	\
-	E-RABToBeSetupListCtxtSUReq.c	\
-	E-RABToBeSetupItemCtxtSUReq.c	\
-	E-RABSetupListBearerSURes.c	\
-	E-RABSetupItemBearerSURes.c	\
-	E-RABFailedToSetupListHOReqAck.c	\
-	E-RABFailedToSetupItemHOReqAck.c	\
-	E-RABToBeSetupListBearerSUReq.c	\
-	E-RABToBeSetupItemBearerSUReq.c	\
-	E-RABAdmittedList.c	\
-	E-RABAdmittedItem.c	\
-	E-RABToBeSwitchedDLList.c	\
-	E-RABToBeSwitchedDLItem.c	\
-	E-RABToBeSwitchedULList.c	\
-	E-RABToBeSwitchedULItem.c	\
-	E-RABModifyListBearerModRes.c	\
-	E-RABModifyItemBearerModRes.c	\
-	E-RABSetupListCtxtSURes.c	\
-	E-RABSetupItemCtxtSURes.c	\
-	E-RABToBeSetupListHOReq.c	\
-	E-RABToBeSetupItemHOReq.c	\
-	ECGIList.c	\
-	EmergencyAreaIDList.c	\
-	EmergencyAreaID.c	\
-	EmergencyAreaID-Broadcast.c	\
-	EmergencyAreaID-Broadcast-Item.c	\
-	CompletedCellinEAI.c	\
-	CompletedCellinEAI-Item.c	\
-	ENB-ID.c	\
-	GERAN-Cell-ID.c	\
-	Global-ENB-ID.c	\
-	ENB-StatusTransfer-TransparentContainer.c	\
-	ENB-UE-S1AP-ID.c	\
-	ENBname.c	\
-	ENBX2TLAs.c	\
-	EncryptionAlgorithms.c	\
-	EPLMNs.c	\
-	EventType.c	\
-	E-RAB-ID.c	\
-	E-RABInformationList.c	\
-	E-RABInformationListItem.c	\
-	E-RABList.c	\
-	E-RABItem.c	\
-	E-RABLevelQoSParameters.c	\
-	EUTRAN-CGI.c	\
-	ExtendedRNC-ID.c	\
-	ForbiddenInterRATs.c	\
-	ForbiddenTAs.c	\
-	ForbiddenTAs-Item.c	\
-	ForbiddenTACs.c	\
-	ForbiddenLAs.c	\
-	ForbiddenLAs-Item.c	\
-	ForbiddenLACs.c	\
-	GBR-QosInformation.c	\
-	GTP-TEID.c	\
-	GUMMEI.c	\
-	HandoverRestrictionList.c	\
-	HandoverType.c	\
-	HFN.c	\
-	HandoverNotify.c	\
-	Inter-SystemInformationTransferType.c	\
-	IMSI.c	\
-	IntegrityProtectionAlgorithms.c	\
-	InterfacesToTrace.c	\
-	LAC.c	\
-	LAI.c	\
-	LastVisitedCell-Item.c	\
-	LastVisitedEUTRANCellInformation.c	\
-	LastVisitedUTRANCellInformation.c	\
-	LastVisitedGERANCellInformation.c	\
-	L3-Information.c	\
-	MessageIdentifier.c	\
-	MMEname.c	\
-	MME-Group-ID.c	\
-	MME-Code.c	\
-	MME-UE-S1AP-ID.c	\
-	M-TMSI.c	\
-	MSClassmark2.c	\
-	MSClassmark3.c	\
-	NAS-PDU.c	\
-	NASSecurityParametersfromE-UTRAN.c	\
-	NASSecurityParameterstoE-UTRAN.c	\
-	NumberofBroadcastRequest.c	\
-	NumberOfBroadcasts.c	\
-	OldBSS-ToNewBSS-Information.c	\
-	OverloadAction.c	\
-	OverloadResponse.c	\
-	PagingDRX.c	\
-	PDCP-SN.c	\
-	PLMNidentity.c	\
-	Pre-emptionCapability.c	\
-	Pre-emptionVulnerability.c	\
-	PriorityLevel.c	\
-	QCI.c	\
-	ReceiveStatusofULPDCPSDUs.c	\
-	RelativeMMECapacity.c	\
-	RAC.c	\
-	RequestType.c	\
-	ResetType.c	\
-	ResetAll.c	\
-	RIMTransfer.c	\
-	RIMInformation.c	\
-	RIMRoutingAddress.c	\
-	ReportArea.c	\
-	RepetitionPeriod.c	\
-	RNC-ID.c	\
-	RRC-Container.c	\
-	RRC-Establishment-Cause.c	\
-	SecurityKey.c	\
-	SecurityContext.c	\
-	SerialNumber.c	\
-	SONInformation.c	\
-	SONInformationRequest.c	\
-	SONInformationReply.c	\
-	SONConfigurationTransfer.c	\
-	Source-ToTarget-TransparentContainer.c	\
-	SourceBSS-ToTargetBSS-TransparentContainer.c	\
-	SourceeNB-ID.c	\
-	SRVCCOperationPossible.c	\
-	SRVCCHOIndication.c	\
-	SourceeNB-ToTargeteNB-TransparentContainer.c	\
-	SourceRNC-ToTargetRNC-TransparentContainer.c	\
-	ServedGUMMEIs.c	\
-	ServedGUMMEIsItem.c	\
-	ServedGroupIDs.c	\
-	ServedMMECs.c	\
-	ServedPLMNs.c	\
-	SubscriberProfileIDforRFP.c	\
-	SupportedTAs.c	\
-	SupportedTAs-Item.c	\
-	S-TMSI.c	\
-	TAC.c	\
-	TAIListforWarning.c	\
-	TAIList.c	\
-	TAIItem.c	\
-	TAI.c	\
-	TAI-Broadcast.c	\
-	TAI-Broadcast-Item.c	\
-	CompletedCellinTAI.c	\
-	CompletedCellinTAI-Item.c	\
-	TBCD-STRING.c	\
-	TargetID.c	\
-	TargeteNB-ID.c	\
-	TargetRNC-ID.c	\
-	TargeteNB-ToSourceeNB-TransparentContainer.c	\
-	Target-ToSource-TransparentContainer.c	\
-	TargetRNC-ToSourceRNC-TransparentContainer.c	\
-	TargetBSS-ToSourceBSS-TransparentContainer.c	\
-	TimeToWait.c	\
-	Time-UE-StayedInCell.c	\
-	TransportLayerAddress.c	\
-	TraceActivation.c	\
-	TraceDepth.c	\
-	E-UTRAN-Trace-ID.c	\
-	TypeOfError.c	\
-	UEAggregateMaximumBitrate.c	\
-	UE-S1AP-IDs.c	\
-	UE-S1AP-ID-pair.c	\
-	UE-associatedLogicalS1-ConnectionListRes.c	\
-	UE-associatedLogicalS1-ConnectionListResAck.c	\
-	UE-associatedLogicalS1-ConnectionItem.c	\
-	UEIdentityIndexValue.c	\
-	UE-HistoryInformation.c	\
-	UEPagingID.c	\
-	UERadioCapability.c	\
-	UESecurityCapabilities.c	\
-	WarningAreaList.c	\
-	WarningType.c	\
-	WarningSecurityInfo.c	\
-	WarningMessageContents.c	\
-	X2TNLConfigurationInfo.c	\
+	S1ap-Criticality.c	\
+	S1ap-Presence.c	\
+	S1ap-PrivateIE-ID.c	\
+	S1ap-ProcedureCode.c	\
+	S1ap-ProtocolExtensionID.c	\
+	S1ap-ProtocolIE-ID.c	\
+	S1ap-TriggeringMessage.c	\
+	S1ap-IE-Extensions.c	\
+	S1ap-AllocationAndRetentionPriority.c	\
+	S1ap-Bearers-SubjectToStatusTransfer-List.c	\
+	S1ap-Bearers-SubjectToStatusTransfer-Item.c	\
+	S1ap-BitRate.c	\
+	S1ap-BPLMNs.c	\
+	S1ap-BroadcastCompletedAreaList.c	\
+	S1ap-Cause.c	\
+	S1ap-CauseMisc.c	\
+	S1ap-CauseProtocol.c	\
+	S1ap-CauseRadioNetwork.c	\
+	S1ap-CauseTransport.c	\
+	S1ap-CauseNas.c	\
+	S1ap-CellIdentity.c	\
+	S1ap-CellID-Broadcast.c	\
+	S1ap-CellID-Broadcast-Item.c	\
+	S1ap-Cdma2000PDU.c	\
+	S1ap-Cdma2000RATType.c	\
+	S1ap-Cdma2000SectorID.c	\
+	S1ap-Cdma2000HOStatus.c	\
+	S1ap-Cdma2000HORequiredIndication.c	\
+	S1ap-Cdma2000OneXSRVCCInfo.c	\
+	S1ap-Cdma2000OneXMEID.c	\
+	S1ap-Cdma2000OneXMSI.c	\
+	S1ap-Cdma2000OneXPilot.c	\
+	S1ap-Cdma2000OneXRAND.c	\
+	S1ap-Cell-Size.c	\
+	S1ap-CellType.c	\
+	S1ap-CGI.c	\
+	S1ap-CI.c	\
+	S1ap-CNDomain.c	\
+	S1ap-CSFallbackIndicator.c	\
+	S1ap-CSG-Id.c	\
+	S1ap-CSG-IdList.c	\
+	S1ap-CSG-IdList-Item.c	\
+	S1ap-COUNTvalue.c	\
+	S1ap-CriticalityDiagnostics.c	\
+	S1ap-CriticalityDiagnostics-IE-List.c	\
+	S1ap-CriticalityDiagnostics-IE-Item.c	\
+	S1ap-DataCodingScheme.c	\
+	S1ap-DL-Forwarding.c	\
+	S1ap-Direct-Forwarding-Path-Availability.c	\
+	S1ap-E-RABToBeModifiedListBearerModReq.c	\
+	S1ap-E-RABToBeModifiedItemBearerModReq.c	\
+	S1ap-E-RABReleaseListBearerRelComp.c	\
+	S1ap-E-RABReleaseItemBearerRelComp.c	\
+	S1ap-E-RABDataForwardingList.c	\
+	S1ap-E-RABDataForwardingItem.c	\
+	S1ap-E-RABToBeSetupListCtxtSUReq.c	\
+	S1ap-E-RABToBeSetupItemCtxtSUReq.c	\
+	S1ap-E-RABSetupListBearerSURes.c	\
+	S1ap-E-RABSetupItemBearerSURes.c	\
+	S1ap-E-RABFailedToSetupListHOReqAck.c	\
+	S1ap-E-RABFailedToSetupItemHOReqAck.c	\
+	S1ap-E-RABToBeSetupListBearerSUReq.c	\
+	S1ap-E-RABToBeSetupItemBearerSUReq.c	\
+	S1ap-E-RABAdmittedList.c	\
+	S1ap-E-RABAdmittedItem.c	\
+	S1ap-E-RABToBeSwitchedDLList.c	\
+	S1ap-E-RABToBeSwitchedDLItem.c	\
+	S1ap-E-RABToBeSwitchedULList.c	\
+	S1ap-E-RABToBeSwitchedULItem.c	\
+	S1ap-E-RABModifyListBearerModRes.c	\
+	S1ap-E-RABModifyItemBearerModRes.c	\
+	S1ap-E-RABSetupListCtxtSURes.c	\
+	S1ap-E-RABSetupItemCtxtSURes.c	\
+	S1ap-E-RABToBeSetupListHOReq.c	\
+	S1ap-E-RABToBeSetupItemHOReq.c	\
+	S1ap-ECGIList.c	\
+	S1ap-EmergencyAreaIDList.c	\
+	S1ap-EmergencyAreaID.c	\
+	S1ap-EmergencyAreaID-Broadcast.c	\
+	S1ap-EmergencyAreaID-Broadcast-Item.c	\
+	S1ap-CompletedCellinEAI.c	\
+	S1ap-CompletedCellinEAI-Item.c	\
+	S1ap-ENB-ID.c	\
+	S1ap-GERAN-Cell-ID.c	\
+	S1ap-Global-ENB-ID.c	\
+	S1ap-ENB-StatusTransfer-TransparentContainer.c	\
+	S1ap-ENB-UE-S1AP-ID.c	\
+	S1ap-ENBname.c	\
+	S1ap-ENBX2TLAs.c	\
+	S1ap-EncryptionAlgorithms.c	\
+	S1ap-EPLMNs.c	\
+	S1ap-EventType.c	\
+	S1ap-E-RAB-ID.c	\
+	S1ap-E-RABInformationList.c	\
+	S1ap-E-RABInformationListItem.c	\
+	S1ap-E-RABList.c	\
+	S1ap-E-RABItem.c	\
+	S1ap-E-RABLevelQoSParameters.c	\
+	S1ap-EUTRAN-CGI.c	\
+	S1ap-ExtendedRNC-ID.c	\
+	S1ap-ForbiddenInterRATs.c	\
+	S1ap-ForbiddenTAs.c	\
+	S1ap-ForbiddenTAs-Item.c	\
+	S1ap-ForbiddenTACs.c	\
+	S1ap-ForbiddenLAs.c	\
+	S1ap-ForbiddenLAs-Item.c	\
+	S1ap-ForbiddenLACs.c	\
+	S1ap-GBR-QosInformation.c	\
+	S1ap-GTP-TEID.c	\
+	S1ap-GUMMEI.c	\
+	S1ap-HandoverRestrictionList.c	\
+	S1ap-HandoverType.c	\
+	S1ap-HFN.c	\
+	S1ap-HandoverNotify.c	\
+	S1ap-Inter-SystemInformationTransferType.c	\
+	S1ap-IMSI.c	\
+	S1ap-IntegrityProtectionAlgorithms.c	\
+	S1ap-InterfacesToTrace.c	\
+	S1ap-LAC.c	\
+	S1ap-LAI.c	\
+	S1ap-LastVisitedCell-Item.c	\
+	S1ap-LastVisitedEUTRANCellInformation.c	\
+	S1ap-LastVisitedUTRANCellInformation.c	\
+	S1ap-LastVisitedGERANCellInformation.c	\
+	S1ap-L3-Information.c	\
+	S1ap-MessageIdentifier.c	\
+	S1ap-MMEname.c	\
+	S1ap-MME-Group-ID.c	\
+	S1ap-MME-Code.c	\
+	S1ap-MME-UE-S1AP-ID.c	\
+	S1ap-M-TMSI.c	\
+	S1ap-MSClassmark2.c	\
+	S1ap-MSClassmark3.c	\
+	S1ap-NAS-PDU.c	\
+	S1ap-NASSecurityParametersfromE-UTRAN.c	\
+	S1ap-NASSecurityParameterstoE-UTRAN.c	\
+	S1ap-NumberofBroadcastRequest.c	\
+	S1ap-NumberOfBroadcasts.c	\
+	S1ap-OldBSS-ToNewBSS-Information.c	\
+	S1ap-OverloadAction.c	\
+	S1ap-OverloadResponse.c	\
+	S1ap-PagingDRX.c	\
+	S1ap-PDCP-SN.c	\
+	S1ap-PLMNidentity.c	\
+	S1ap-Pre-emptionCapability.c	\
+	S1ap-Pre-emptionVulnerability.c	\
+	S1ap-PriorityLevel.c	\
+	S1ap-QCI.c	\
+	S1ap-ReceiveStatusofULPDCPSDUs.c	\
+	S1ap-RelativeMMECapacity.c	\
+	S1ap-RAC.c	\
+	S1ap-RequestType.c	\
+	S1ap-ResetType.c	\
+	S1ap-ResetAll.c	\
+	S1ap-RIMTransfer.c	\
+	S1ap-RIMInformation.c	\
+	S1ap-RIMRoutingAddress.c	\
+	S1ap-ReportArea.c	\
+	S1ap-RepetitionPeriod.c	\
+	S1ap-RNC-ID.c	\
+	S1ap-RRC-Container.c	\
+	S1ap-RRC-Establishment-Cause.c	\
+	S1ap-SecurityKey.c	\
+	S1ap-SecurityContext.c	\
+	S1ap-SerialNumber.c	\
+	S1ap-SONInformation.c	\
+	S1ap-SONInformationRequest.c	\
+	S1ap-SONInformationReply.c	\
+	S1ap-SONConfigurationTransfer.c	\
+	S1ap-Source-ToTarget-TransparentContainer.c	\
+	S1ap-SourceBSS-ToTargetBSS-TransparentContainer.c	\
+	S1ap-SourceeNB-ID.c	\
+	S1ap-SRVCCOperationPossible.c	\
+	S1ap-SRVCCHOIndication.c	\
+	S1ap-SourceeNB-ToTargeteNB-TransparentContainer.c	\
+	S1ap-SourceRNC-ToTargetRNC-TransparentContainer.c	\
+	S1ap-ServedGUMMEIs.c	\
+	S1ap-ServedGUMMEIsItem.c	\
+	S1ap-ServedGroupIDs.c	\
+	S1ap-ServedMMECs.c	\
+	S1ap-ServedPLMNs.c	\
+	S1ap-SubscriberProfileIDforRFP.c	\
+	S1ap-SupportedTAs.c	\
+	S1ap-SupportedTAs-Item.c	\
+	S1ap-S-TMSI.c	\
+	S1ap-TAC.c	\
+	S1ap-TAIListforWarning.c	\
+	S1ap-TAIList.c	\
+	S1ap-TAIItem.c	\
+	S1ap-TAI.c	\
+	S1ap-TAI-Broadcast.c	\
+	S1ap-TAI-Broadcast-Item.c	\
+	S1ap-CompletedCellinTAI.c	\
+	S1ap-CompletedCellinTAI-Item.c	\
+	S1ap-TBCD-STRING.c	\
+	S1ap-TargetID.c	\
+	S1ap-TargeteNB-ID.c	\
+	S1ap-TargetRNC-ID.c	\
+	S1ap-TargeteNB-ToSourceeNB-TransparentContainer.c	\
+	S1ap-Target-ToSource-TransparentContainer.c	\
+	S1ap-TargetRNC-ToSourceRNC-TransparentContainer.c	\
+	S1ap-TargetBSS-ToSourceBSS-TransparentContainer.c	\
+	S1ap-TimeToWait.c	\
+	S1ap-Time-UE-StayedInCell.c	\
+	S1ap-TransportLayerAddress.c	\
+	S1ap-TraceActivation.c	\
+	S1ap-TraceDepth.c	\
+	S1ap-E-UTRAN-Trace-ID.c	\
+	S1ap-TypeOfError.c	\
+	S1ap-UEAggregateMaximumBitrate.c	\
+	S1ap-UE-S1AP-IDs.c	\
+	S1ap-UE-S1AP-ID-pair.c	\
+	S1ap-UE-associatedLogicalS1-ConnectionListRes.c	\
+	S1ap-UE-associatedLogicalS1-ConnectionListResAck.c	\
+	S1ap-UE-associatedLogicalS1-ConnectionItem.c	\
+	S1ap-UEIdentityIndexValue.c	\
+	S1ap-UE-HistoryInformation.c	\
+	S1ap-UEPagingID.c	\
+	S1ap-UERadioCapability.c	\
+	S1ap-UESecurityCapabilities.c	\
+	S1ap-WarningAreaList.c	\
+	S1ap-WarningType.c	\
+	S1ap-WarningSecurityInfo.c	\
+	S1ap-WarningMessageContents.c	\
+	S1ap-X2TNLConfigurationInfo.c	\
 	S1AP-PDU.c	\
-	InitiatingMessage.c	\
-	SuccessfulOutcome.c	\
-	UnsuccessfulOutcome.c	\
-	HandoverRequired.c	\
-	HandoverCommand.c	\
-	HandoverPreparationFailure.c	\
-	HandoverRequest.c	\
-	HandoverRequestAcknowledge.c	\
-	HandoverFailure.c	\
-	HandoverNotify.c	\
-	PathSwitchRequest.c	\
-	PathSwitchRequestAcknowledge.c	\
-	PathSwitchRequestFailure.c	\
-	E-RABSetupRequest.c	\
-	E-RABSetupResponse.c	\
-	E-RABModifyRequest.c	\
-	E-RABModifyResponse.c	\
-	E-RABReleaseIndication.c	\
-	E-RABReleaseCommand.c	\
-	E-RABReleaseResponse.c	\
-	InitialContextSetupRequest.c	\
-	InitialContextSetupResponse.c	\
-	InitialContextSetupFailure.c	\
-	UEContextReleaseRequest.c	\
-	Paging.c	\
-	DownlinkNASTransport.c	\
-	InitialUEMessage.c	\
-	UplinkNASTransport.c	\
-	NASNonDeliveryIndication.c	\
-	HandoverCancel.c	\
-	HandoverCancelAcknowledge.c	\
-	Reset.c	\
-	ResetAcknowledge.c	\
-	S1SetupResponse.c	\
-	S1SetupRequest.c	\
-	S1SetupFailure.c	\
-	ErrorIndication.c	\
-	ENBConfigurationUpdate.c	\
-	ENBConfigurationUpdateAcknowledge.c	\
-	ENBConfigurationUpdateFailure.c	\
-	MMEConfigurationUpdate.c	\
-	MMEConfigurationUpdateAcknowledge.c	\
-	MMEConfigurationUpdateFailure.c	\
-	DownlinkS1cdma2000tunneling.c	\
-	UplinkS1cdma2000tunneling.c	\
-	UEContextModificationRequest.c	\
-	UEContextModificationResponse.c	\
-	UEContextModificationFailure.c	\
-	UECapabilityInfoIndication.c	\
-	UEContextReleaseCommand.c	\
-	UEContextReleaseComplete.c	\
-	ENBStatusTransfer.c	\
-	MMEStatusTransfer.c	\
-	DeactivateTrace.c	\
-	TraceStart.c	\
-	TraceFailureIndication.c	\
-	CellTrafficTrace.c	\
-	LocationReportingControl.c	\
-	LocationReportingFailureIndication.c	\
-	LocationReport.c	\
-	OverloadStart.c	\
-	OverloadStop.c	\
-	WriteReplaceWarningRequest.c	\
-	WriteReplaceWarningResponse.c	\
-	ENBDirectInformationTransfer.c	\
-	MMEDirectInformationTransfer.c	\
-	ENBConfigurationTransfer.c	\
-	MMEConfigurationTransfer.c	\
-	PrivateMessage.c	\
-	IE.c	\
-	IE-Extensions.c
+	S1ap-InitiatingMessage.c	\
+	S1ap-SuccessfulOutcome.c	\
+	S1ap-UnsuccessfulOutcome.c	\
+	S1ap-HandoverRequired.c	\
+	S1ap-HandoverCommand.c	\
+	S1ap-HandoverPreparationFailure.c	\
+	S1ap-HandoverRequest.c	\
+	S1ap-HandoverRequestAcknowledge.c	\
+	S1ap-HandoverFailure.c	\
+	S1ap-HandoverNotify.c	\
+	S1ap-PathSwitchRequest.c	\
+	S1ap-PathSwitchRequestAcknowledge.c	\
+	S1ap-PathSwitchRequestFailure.c	\
+	S1ap-E-RABSetupRequest.c	\
+	S1ap-E-RABSetupResponse.c	\
+	S1ap-E-RABModifyRequest.c	\
+	S1ap-E-RABModifyResponse.c	\
+	S1ap-E-RABReleaseIndication.c	\
+	S1ap-E-RABReleaseCommand.c	\
+	S1ap-E-RABReleaseResponse.c	\
+	S1ap-InitialContextSetupRequest.c	\
+	S1ap-InitialContextSetupResponse.c	\
+	S1ap-InitialContextSetupFailure.c	\
+	S1ap-UEContextReleaseRequest.c	\
+	S1ap-Paging.c	\
+	S1ap-DownlinkNASTransport.c	\
+	S1ap-InitialUEMessage.c	\
+	S1ap-UplinkNASTransport.c	\
+	S1ap-NASNonDeliveryIndication.c	\
+	S1ap-HandoverCancel.c	\
+	S1ap-HandoverCancelAcknowledge.c	\
+	S1ap-Reset.c	\
+	S1ap-ResetAcknowledge.c	\
+	S1ap-S1SetupResponse.c	\
+	S1ap-S1SetupRequest.c	\
+	S1ap-S1SetupFailure.c	\
+	S1ap-ErrorIndication.c	\
+	S1ap-ENBConfigurationUpdate.c	\
+	S1ap-ENBConfigurationUpdateAcknowledge.c	\
+	S1ap-ENBConfigurationUpdateFailure.c	\
+	S1ap-MMEConfigurationUpdate.c	\
+	S1ap-MMEConfigurationUpdateAcknowledge.c	\
+	S1ap-MMEConfigurationUpdateFailure.c	\
+	S1ap-DownlinkS1cdma2000tunneling.c	\
+	S1ap-UplinkS1cdma2000tunneling.c	\
+	S1ap-UEContextModificationRequest.c	\
+	S1ap-UEContextModificationResponse.c	\
+	S1ap-UEContextModificationFailure.c	\
+	S1ap-UECapabilityInfoIndication.c	\
+	S1ap-UEContextReleaseCommand.c	\
+	S1ap-UEContextReleaseComplete.c	\
+	S1ap-ENBStatusTransfer.c	\
+	S1ap-MMEStatusTransfer.c	\
+	S1ap-DeactivateTrace.c	\
+	S1ap-TraceStart.c	\
+	S1ap-TraceFailureIndication.c	\
+	S1ap-CellTrafficTrace.c	\
+	S1ap-LocationReportingControl.c	\
+	S1ap-LocationReportingFailureIndication.c	\
+	S1ap-LocationReport.c	\
+	S1ap-OverloadStart.c	\
+	S1ap-OverloadStop.c	\
+	S1ap-WriteReplaceWarningRequest.c	\
+	S1ap-WriteReplaceWarningResponse.c	\
+	S1ap-ENBDirectInformationTransfer.c	\
+	S1ap-MMEDirectInformationTransfer.c	\
+	S1ap-ENBConfigurationTransfer.c	\
+	S1ap-MMEConfigurationTransfer.c	\
+	S1ap-PrivateMessage.c	\
+	S1ap-IE.c	\
+	S1ap-IE-Extensions.c
 
 ASN_MODULE_HEADERS=	\
-	Criticality.h	\
-	Presence.h	\
-	PrivateIE-ID.h	\
-	ProcedureCode.h	\
-	ProtocolExtensionID.h	\
-	ProtocolIE-ID.h	\
-	TriggeringMessage.h	\
-	AllocationAndRetentionPriority.h	\
-	Bearers-SubjectToStatusTransfer-List.h	\
-	Bearers-SubjectToStatusTransfer-Item.h	\
-	BitRate.h	\
-	BPLMNs.h	\
-	BroadcastCompletedAreaList.h	\
-	Cause.h	\
-	CauseMisc.h	\
-	CauseProtocol.h	\
-	CauseRadioNetwork.h	\
-	CauseTransport.h	\
-	CauseNas.h	\
-	CellIdentity.h	\
-	CellID-Broadcast.h	\
-	CellID-Broadcast-Item.h	\
-	Cdma2000PDU.h	\
-	Cdma2000RATType.h	\
-	Cdma2000SectorID.h	\
-	Cdma2000HOStatus.h	\
-	Cdma2000HORequiredIndication.h	\
-	Cdma2000OneXSRVCCInfo.h	\
-	Cdma2000OneXMEID.h	\
-	Cdma2000OneXMSI.h	\
-	Cdma2000OneXPilot.h	\
-	Cdma2000OneXRAND.h	\
-	Cell-Size.h	\
-	CellType.h	\
-	CGI.h	\
-	CI.h	\
-	CNDomain.h	\
-	CSFallbackIndicator.h	\
-	CSG-Id.h	\
-	CSG-IdList.h	\
-	CSG-IdList-Item.h	\
-	COUNTvalue.h	\
-	CriticalityDiagnostics.h	\
-	CriticalityDiagnostics-IE-List.h	\
-	CriticalityDiagnostics-IE-Item.h	\
-	DataCodingScheme.h	\
-	DL-Forwarding.h	\
-	Direct-Forwarding-Path-Availability.h	\
-	E-RABToBeModifiedListBearerModReq.h	\
-	E-RABToBeModifiedItemBearerModReq.h	\
-	E-RABReleaseListBearerRelComp.h	\
-	E-RABReleaseItemBearerRelComp.h	\
-	E-RABDataForwardingList.h	\
-	E-RABDataForwardingItem.h	\
-	E-RABToBeSetupListCtxtSUReq.h	\
-	E-RABToBeSetupItemCtxtSUReq.h	\
-	E-RABSetupListBearerSURes.h	\
-	E-RABSetupItemBearerSURes.h	\
-	E-RABFailedToSetupListHOReqAck.h	\
-	E-RABFailedToSetupItemHOReqAck.h	\
-	E-RABToBeSetupListBearerSUReq.h	\
-	E-RABToBeSetupItemBearerSUReq.h	\
-	E-RABAdmittedList.h	\
-	E-RABAdmittedItem.h	\
-	E-RABToBeSwitchedDLList.h	\
-	E-RABToBeSwitchedDLItem.h	\
-	E-RABToBeSwitchedULList.h	\
-	E-RABToBeSwitchedULItem.h	\
-	E-RABModifyListBearerModRes.h	\
-	E-RABModifyItemBearerModRes.h	\
-	E-RABSetupListCtxtSURes.h	\
-	E-RABSetupItemCtxtSURes.h	\
-	E-RABToBeSetupListHOReq.h	\
-	E-RABToBeSetupItemHOReq.h	\
-	ECGIList.h	\
-	EmergencyAreaIDList.h	\
-	EmergencyAreaID.h	\
-	EmergencyAreaID-Broadcast.h	\
-	EmergencyAreaID-Broadcast-Item.h	\
-	CompletedCellinEAI.h	\
-	CompletedCellinEAI-Item.h	\
-	ENB-ID.h	\
-	GERAN-Cell-ID.h	\
-	Global-ENB-ID.h	\
-	ENB-StatusTransfer-TransparentContainer.h	\
-	ENB-UE-S1AP-ID.h	\
-	ENBname.h	\
-	ENBX2TLAs.h	\
-	EncryptionAlgorithms.h	\
-	EPLMNs.h	\
-	EventType.h	\
-	E-RAB-ID.h	\
-	E-RABInformationList.h	\
-	E-RABInformationListItem.h	\
-	E-RABList.h	\
-	E-RABItem.h	\
-	E-RABLevelQoSParameters.h	\
-	EUTRAN-CGI.h	\
-	ExtendedRNC-ID.h	\
-	ForbiddenInterRATs.h	\
-	ForbiddenTAs.h	\
-	ForbiddenTAs-Item.h	\
-	ForbiddenTACs.h	\
-	ForbiddenLAs.h	\
-	ForbiddenLAs-Item.h	\
-	ForbiddenLACs.h	\
-	GBR-QosInformation.h	\
-	GTP-TEID.h	\
-	GUMMEI.h	\
-	HandoverRestrictionList.h	\
-	HandoverType.h	\
-	HFN.h	\
-	HandoverNotify.h	\
-	Inter-SystemInformationTransferType.h	\
-	IMSI.h	\
-	IntegrityProtectionAlgorithms.h	\
-	InterfacesToTrace.h	\
-	LAC.h	\
-	LAI.h	\
-	LastVisitedCell-Item.h	\
-	LastVisitedEUTRANCellInformation.h	\
-	LastVisitedUTRANCellInformation.h	\
-	LastVisitedGERANCellInformation.h	\
-	L3-Information.h	\
-	MessageIdentifier.h	\
-	MMEname.h	\
-	MME-Group-ID.h	\
-	MME-Code.h	\
-	MME-UE-S1AP-ID.h	\
-	M-TMSI.h	\
-	MSClassmark2.h	\
-	MSClassmark3.h	\
-	NAS-PDU.h	\
-	NASSecurityParametersfromE-UTRAN.h	\
-	NASSecurityParameterstoE-UTRAN.h	\
-	NumberofBroadcastRequest.h	\
-	NumberOfBroadcasts.h	\
-	OldBSS-ToNewBSS-Information.h	\
-	OverloadAction.h	\
-	OverloadResponse.h	\
-	PagingDRX.h	\
-	PDCP-SN.h	\
-	PLMNidentity.h	\
-	Pre-emptionCapability.h	\
-	Pre-emptionVulnerability.h	\
-	PriorityLevel.h	\
-	QCI.h	\
-	ReceiveStatusofULPDCPSDUs.h	\
-	RelativeMMECapacity.h	\
-	RAC.h	\
-	RequestType.h	\
-	ResetType.h	\
-	ResetAll.h	\
-	RIMTransfer.h	\
-	RIMInformation.h	\
-	RIMRoutingAddress.h	\
-	ReportArea.h	\
-	RepetitionPeriod.h	\
-	RNC-ID.h	\
-	RRC-Container.h	\
-	RRC-Establishment-Cause.h	\
-	SecurityKey.h	\
-	SecurityContext.h	\
-	SerialNumber.h	\
-	SONInformation.h	\
-	SONInformationRequest.h	\
-	SONInformationReply.h	\
-	SONConfigurationTransfer.h	\
-	Source-ToTarget-TransparentContainer.h	\
-	SourceBSS-ToTargetBSS-TransparentContainer.h	\
-	SourceeNB-ID.h	\
-	SRVCCOperationPossible.h	\
-	SRVCCHOIndication.h	\
-	SourceeNB-ToTargeteNB-TransparentContainer.h	\
-	SourceRNC-ToTargetRNC-TransparentContainer.h	\
-	ServedGUMMEIs.h	\
-	ServedGUMMEIsItem.h	\
-	ServedGroupIDs.h	\
-	ServedMMECs.h	\
-	ServedPLMNs.h	\
-	SubscriberProfileIDforRFP.h	\
-	SupportedTAs.h	\
-	SupportedTAs-Item.h	\
-	S-TMSI.h	\
-	TAC.h	\
-	TAIListforWarning.h	\
-	TAIList.h	\
-	TAIItem.h	\
-	TAI.h	\
-	TAI-Broadcast.h	\
-	TAI-Broadcast-Item.h	\
-	CompletedCellinTAI.h	\
-	CompletedCellinTAI-Item.h	\
-	TBCD-STRING.h	\
-	TargetID.h	\
-	TargeteNB-ID.h	\
-	TargetRNC-ID.h	\
-	TargeteNB-ToSourceeNB-TransparentContainer.h	\
-	Target-ToSource-TransparentContainer.h	\
-	TargetRNC-ToSourceRNC-TransparentContainer.h	\
-	TargetBSS-ToSourceBSS-TransparentContainer.h	\
-	TimeToWait.h	\
-	Time-UE-StayedInCell.h	\
-	TransportLayerAddress.h	\
-	TraceActivation.h	\
-	TraceDepth.h	\
-	E-UTRAN-Trace-ID.h	\
-	TypeOfError.h	\
-	UEAggregateMaximumBitrate.h	\
-	UE-S1AP-IDs.h	\
-	UE-S1AP-ID-pair.h	\
-	UE-associatedLogicalS1-ConnectionListRes.h	\
-	UE-associatedLogicalS1-ConnectionListResAck.h	\
-	UE-associatedLogicalS1-ConnectionItem.h	\
-	UEIdentityIndexValue.h	\
-	UE-HistoryInformation.h	\
-	UEPagingID.h	\
-	UERadioCapability.h	\
-	UESecurityCapabilities.h	\
-	WarningAreaList.h	\
-	WarningType.h	\
-	WarningSecurityInfo.h	\
-	WarningMessageContents.h	\
-	X2TNLConfigurationInfo.h	\
+	S1ap-Criticality.h	\
+	S1ap-Presence.h	\
+	S1ap-PrivateIE-ID.h	\
+	S1ap-ProcedureCode.h	\
+	S1ap-ProtocolExtensionID.h	\
+	S1ap-ProtocolIE-ID.h	\
+	S1ap-TriggeringMessage.h	\
+	S1ap-AllocationAndRetentionPriority.h	\
+	S1ap-Bearers-SubjectToStatusTransfer-List.h	\
+	S1ap-Bearers-SubjectToStatusTransfer-Item.h	\
+	S1ap-BitRate.h	\
+	S1ap-BPLMNs.h	\
+	S1ap-BroadcastCompletedAreaList.h	\
+	S1ap-Cause.h	\
+	S1ap-CauseMisc.h	\
+	S1ap-CauseProtocol.h	\
+	S1ap-CauseRadioNetwork.h	\
+	S1ap-CauseTransport.h	\
+	S1ap-CauseNas.h	\
+	S1ap-CellIdentity.h	\
+	S1ap-CellID-Broadcast.h	\
+	S1ap-CellID-Broadcast-Item.h	\
+	S1ap-Cdma2000PDU.h	\
+	S1ap-Cdma2000RATType.h	\
+	S1ap-Cdma2000SectorID.h	\
+	S1ap-Cdma2000HOStatus.h	\
+	S1ap-Cdma2000HORequiredIndication.h	\
+	S1ap-Cdma2000OneXSRVCCInfo.h	\
+	S1ap-Cdma2000OneXMEID.h	\
+	S1ap-Cdma2000OneXMSI.h	\
+	S1ap-Cdma2000OneXPilot.h	\
+	S1ap-Cdma2000OneXRAND.h	\
+	S1ap-Cell-Size.h	\
+	S1ap-CellType.h	\
+	S1ap-CGI.h	\
+	S1ap-CI.h	\
+	S1ap-CNDomain.h	\
+	S1ap-CSFallbackIndicator.h	\
+	S1ap-CSG-Id.h	\
+	S1ap-CSG-IdList.h	\
+	S1ap-CSG-IdList-Item.h	\
+	S1ap-COUNTvalue.h	\
+	S1ap-CriticalityDiagnostics.h	\
+	S1ap-CriticalityDiagnostics-IE-List.h	\
+	S1ap-CriticalityDiagnostics-IE-Item.h	\
+	S1ap-DataCodingScheme.h	\
+	S1ap-DL-Forwarding.h	\
+	S1ap-Direct-Forwarding-Path-Availability.h	\
+	S1ap-E-RABToBeModifiedListBearerModReq.h	\
+	S1ap-E-RABToBeModifiedItemBearerModReq.h	\
+	S1ap-E-RABReleaseListBearerRelComp.h	\
+	S1ap-E-RABReleaseItemBearerRelComp.h	\
+	S1ap-E-RABDataForwardingList.h	\
+	S1ap-E-RABDataForwardingItem.h	\
+	S1ap-E-RABToBeSetupListCtxtSUReq.h	\
+	S1ap-E-RABToBeSetupItemCtxtSUReq.h	\
+	S1ap-E-RABSetupListBearerSURes.h	\
+	S1ap-E-RABSetupItemBearerSURes.h	\
+	S1ap-E-RABFailedToSetupListHOReqAck.h	\
+	S1ap-E-RABFailedToSetupItemHOReqAck.h	\
+	S1ap-E-RABToBeSetupListBearerSUReq.h	\
+	S1ap-E-RABToBeSetupItemBearerSUReq.h	\
+	S1ap-E-RABAdmittedList.h	\
+	S1ap-E-RABAdmittedItem.h	\
+	S1ap-E-RABToBeSwitchedDLList.h	\
+	S1ap-E-RABToBeSwitchedDLItem.h	\
+	S1ap-E-RABToBeSwitchedULList.h	\
+	S1ap-E-RABToBeSwitchedULItem.h	\
+	S1ap-E-RABModifyListBearerModRes.h	\
+	S1ap-E-RABModifyItemBearerModRes.h	\
+	S1ap-E-RABSetupListCtxtSURes.h	\
+	S1ap-E-RABSetupItemCtxtSURes.h	\
+	S1ap-E-RABToBeSetupListHOReq.h	\
+	S1ap-E-RABToBeSetupItemHOReq.h	\
+	S1ap-ECGIList.h	\
+	S1ap-EmergencyAreaIDList.h	\
+	S1ap-EmergencyAreaID.h	\
+	S1ap-EmergencyAreaID-Broadcast.h	\
+	S1ap-EmergencyAreaID-Broadcast-Item.h	\
+	S1ap-CompletedCellinEAI.h	\
+	S1ap-CompletedCellinEAI-Item.h	\
+	S1ap-ENB-ID.h	\
+	S1ap-GERAN-Cell-ID.h	\
+	S1ap-Global-ENB-ID.h	\
+	S1ap-ENB-StatusTransfer-TransparentContainer.h	\
+	S1ap-ENB-UE-S1AP-ID.h	\
+	S1ap-ENBname.h	\
+	S1ap-ENBX2TLAs.h	\
+	S1ap-EncryptionAlgorithms.h	\
+	S1ap-EPLMNs.h	\
+	S1ap-EventType.h	\
+	S1ap-E-RAB-ID.h	\
+	S1ap-E-RABInformationList.h	\
+	S1ap-E-RABInformationListItem.h	\
+	S1ap-E-RABList.h	\
+	S1ap-E-RABItem.h	\
+	S1ap-E-RABLevelQoSParameters.h	\
+	S1ap-EUTRAN-CGI.h	\
+	S1ap-ExtendedRNC-ID.h	\
+	S1ap-ForbiddenInterRATs.h	\
+	S1ap-ForbiddenTAs.h	\
+	S1ap-ForbiddenTAs-Item.h	\
+	S1ap-ForbiddenTACs.h	\
+	S1ap-ForbiddenLAs.h	\
+	S1ap-ForbiddenLAs-Item.h	\
+	S1ap-ForbiddenLACs.h	\
+	S1ap-GBR-QosInformation.h	\
+	S1ap-GTP-TEID.h	\
+	S1ap-GUMMEI.h	\
+	S1ap-HandoverRestrictionList.h	\
+	S1ap-HandoverType.h	\
+	S1ap-HFN.h	\
+	S1ap-HandoverNotify.h	\
+	S1ap-Inter-SystemInformationTransferType.h	\
+	S1ap-IMSI.h	\
+	S1ap-IntegrityProtectionAlgorithms.h	\
+	S1ap-InterfacesToTrace.h	\
+	S1ap-LAC.h	\
+	S1ap-LAI.h	\
+	S1ap-LastVisitedCell-Item.h	\
+	S1ap-LastVisitedEUTRANCellInformation.h	\
+	S1ap-LastVisitedUTRANCellInformation.h	\
+	S1ap-LastVisitedGERANCellInformation.h	\
+	S1ap-L3-Information.h	\
+	S1ap-MessageIdentifier.h	\
+	S1ap-MMEname.h	\
+	S1ap-MME-Group-ID.h	\
+	S1ap-MME-Code.h	\
+	S1ap-MME-UE-S1AP-ID.h	\
+	S1ap-M-TMSI.h	\
+	S1ap-MSClassmark2.h	\
+	S1ap-MSClassmark3.h	\
+	S1ap-NAS-PDU.h	\
+	S1ap-NASSecurityParametersfromE-UTRAN.h	\
+	S1ap-NASSecurityParameterstoE-UTRAN.h	\
+	S1ap-NumberofBroadcastRequest.h	\
+	S1ap-NumberOfBroadcasts.h	\
+	S1ap-OldBSS-ToNewBSS-Information.h	\
+	S1ap-OverloadAction.h	\
+	S1ap-OverloadResponse.h	\
+	S1ap-PagingDRX.h	\
+	S1ap-PDCP-SN.h	\
+	S1ap-PLMNidentity.h	\
+	S1ap-Pre-emptionCapability.h	\
+	S1ap-Pre-emptionVulnerability.h	\
+	S1ap-PriorityLevel.h	\
+	S1ap-QCI.h	\
+	S1ap-ReceiveStatusofULPDCPSDUs.h	\
+	S1ap-RelativeMMECapacity.h	\
+	S1ap-RAC.h	\
+	S1ap-RequestType.h	\
+	S1ap-ResetType.h	\
+	S1ap-ResetAll.h	\
+	S1ap-RIMTransfer.h	\
+	S1ap-RIMInformation.h	\
+	S1ap-RIMRoutingAddress.h	\
+	S1ap-ReportArea.h	\
+	S1ap-RepetitionPeriod.h	\
+	S1ap-RNC-ID.h	\
+	S1ap-RRC-Container.h	\
+	S1ap-RRC-Establishment-Cause.h	\
+	S1ap-SecurityKey.h	\
+	S1ap-SecurityContext.h	\
+	S1ap-SerialNumber.h	\
+	S1ap-SONInformation.h	\
+	S1ap-SONInformationRequest.h	\
+	S1ap-SONInformationReply.h	\
+	S1ap-SONConfigurationTransfer.h	\
+	S1ap-Source-ToTarget-TransparentContainer.h	\
+	S1ap-SourceBSS-ToTargetBSS-TransparentContainer.h	\
+	S1ap-SourceeNB-ID.h	\
+	S1ap-SRVCCOperationPossible.h	\
+	S1ap-SRVCCHOIndication.h	\
+	S1ap-SourceeNB-ToTargeteNB-TransparentContainer.h	\
+	S1ap-SourceRNC-ToTargetRNC-TransparentContainer.h	\
+	S1ap-ServedGUMMEIs.h	\
+	S1ap-ServedGUMMEIsItem.h	\
+	S1ap-ServedGroupIDs.h	\
+	S1ap-ServedMMECs.h	\
+	S1ap-ServedPLMNs.h	\
+	S1ap-SubscriberProfileIDforRFP.h	\
+	S1ap-SupportedTAs.h	\
+	S1ap-SupportedTAs-Item.h	\
+	S1ap-S-TMSI.h	\
+	S1ap-TAC.h	\
+	S1ap-TAIListforWarning.h	\
+	S1ap-TAIList.h	\
+	S1ap-TAIItem.h	\
+	S1ap-TAI.h	\
+	S1ap-TAI-Broadcast.h	\
+	S1ap-TAI-Broadcast-Item.h	\
+	S1ap-CompletedCellinTAI.h	\
+	S1ap-CompletedCellinTAI-Item.h	\
+	S1ap-TBCD-STRING.h	\
+	S1ap-TargetID.h	\
+	S1ap-TargeteNB-ID.h	\
+	S1ap-TargetRNC-ID.h	\
+	S1ap-TargeteNB-ToSourceeNB-TransparentContainer.h	\
+	S1ap-Target-ToSource-TransparentContainer.h	\
+	S1ap-TargetRNC-ToSourceRNC-TransparentContainer.h	\
+	S1ap-TargetBSS-ToSourceBSS-TransparentContainer.h	\
+	S1ap-TimeToWait.h	\
+	S1ap-Time-UE-StayedInCell.h	\
+	S1ap-TransportLayerAddress.h	\
+	S1ap-TraceActivation.h	\
+	S1ap-TraceDepth.h	\
+	S1ap-E-UTRAN-Trace-ID.h	\
+	S1ap-TypeOfError.h	\
+	S1ap-UEAggregateMaximumBitrate.h	\
+	S1ap-UE-S1AP-IDs.h	\
+	S1ap-UE-S1AP-ID-pair.h	\
+	S1ap-UE-associatedLogicalS1-ConnectionListRes.h	\
+	S1ap-UE-associatedLogicalS1-ConnectionListResAck.h	\
+	S1ap-UE-associatedLogicalS1-ConnectionItem.h	\
+	S1ap-UEIdentityIndexValue.h	\
+	S1ap-UE-HistoryInformation.h	\
+	S1ap-UEPagingID.h	\
+	S1ap-UERadioCapability.h	\
+	S1ap-UESecurityCapabilities.h	\
+	S1ap-WarningAreaList.h	\
+	S1ap-WarningType.h	\
+	S1ap-WarningSecurityInfo.h	\
+	S1ap-WarningMessageContents.h	\
+	S1ap-X2TNLConfigurationInfo.h	\
 	S1AP-PDU.h	\
-	InitiatingMessage.h	\
-	SuccessfulOutcome.h	\
-	UnsuccessfulOutcome.h	\
-	HandoverRequired.h	\
-	HandoverCommand.h	\
-	HandoverPreparationFailure.h	\
-	HandoverRequest.h	\
-	HandoverRequestAcknowledge.h	\
-	HandoverFailure.h	\
-	PathSwitchRequest.h	\
-	PathSwitchRequestAcknowledge.h	\
-	PathSwitchRequestFailure.h	\
-	E-RABSetupRequest.h	\
-	E-RABSetupResponse.h	\
-	E-RABModifyRequest.h	\
-	E-RABModifyResponse.h	\
-	E-RABReleaseIndication.h	\
-	E-RABReleaseCommand.h	\
-	E-RABReleaseResponse.h	\
-	InitialContextSetupRequest.h	\
-	InitialContextSetupResponse.h	\
-	InitialContextSetupFailure.h	\
-	UEContextReleaseRequest.h	\
-	Paging.h	\
-	DownlinkNASTransport.h	\
-	InitialUEMessage.h	\
-	UplinkNASTransport.h	\
-	NASNonDeliveryIndication.h	\
-	HandoverCancel.h	\
-	HandoverCancelAcknowledge.h	\
-	Reset.h	\
-	ResetAcknowledge.h	\
-	S1SetupResponse.h	\
-	S1SetupRequest.h	\
-	S1SetupFailure.h	\
-	ErrorIndication.h	\
-	ENBConfigurationUpdate.h	\
-	ENBConfigurationUpdateAcknowledge.h	\
-	ENBConfigurationUpdateFailure.h	\
-	MMEConfigurationUpdate.h	\
-	MMEConfigurationUpdateAcknowledge.h	\
-	MMEConfigurationUpdateFailure.h	\
-	DownlinkS1cdma2000tunneling.h	\
-	UplinkS1cdma2000tunneling.h	\
-	UEContextModificationRequest.h	\
-	UEContextModificationResponse.h	\
-	UEContextModificationFailure.h	\
-	UECapabilityInfoIndication.h	\
-	UEContextReleaseCommand.h	\
-	UEContextReleaseComplete.h	\
-	ENBStatusTransfer.h	\
-	MMEStatusTransfer.h	\
-	DeactivateTrace.h	\
-	TraceStart.h	\
-	TraceFailureIndication.h	\
-	CellTrafficTrace.h	\
-	LocationReportingControl.h	\
-	LocationReportingFailureIndication.h	\
-	LocationReport.h	\
-	OverloadStart.h	\
-	OverloadStop.h	\
-	WriteReplaceWarningRequest.h	\
-	WriteReplaceWarningResponse.h	\
-	ENBDirectInformationTransfer.h	\
-	MMEDirectInformationTransfer.h	\
-	ENBConfigurationTransfer.h	\
-	MMEConfigurationTransfer.h	\
-	PrivateMessage.h	\
-	IE.h	\
-	IE-Extensions.h
+	S1ap-InitiatingMessage.h	\
+	S1ap-SuccessfulOutcome.h	\
+	S1ap-UnsuccessfulOutcome.h	\
+	S1ap-HandoverRequired.h	\
+	S1ap-HandoverCommand.h	\
+	S1ap-HandoverPreparationFailure.h	\
+	S1ap-HandoverRequest.h	\
+	S1ap-HandoverRequestAcknowledge.h	\
+	S1ap-HandoverFailure.h	\
+	S1ap-PathSwitchRequest.h	\
+	S1ap-PathSwitchRequestAcknowledge.h	\
+	S1ap-PathSwitchRequestFailure.h	\
+	S1ap-E-RABSetupRequest.h	\
+	S1ap-E-RABSetupResponse.h	\
+	S1ap-E-RABModifyRequest.h	\
+	S1ap-E-RABModifyResponse.h	\
+	S1ap-E-RABReleaseIndication.h	\
+	S1ap-E-RABReleaseCommand.h	\
+	S1ap-E-RABReleaseResponse.h	\
+	S1ap-InitialContextSetupRequest.h	\
+	S1ap-InitialContextSetupResponse.h	\
+	S1ap-InitialContextSetupFailure.h	\
+	S1ap-UEContextReleaseRequest.h	\
+	S1ap-Paging.h	\
+	S1ap-DownlinkNASTransport.h	\
+	S1ap-InitialUEMessage.h	\
+	S1ap-UplinkNASTransport.h	\
+	S1ap-NASNonDeliveryIndication.h	\
+	S1ap-HandoverCancel.h	\
+	S1ap-HandoverCancelAcknowledge.h	\
+	S1ap-Reset.h	\
+	S1ap-ResetAcknowledge.h	\
+	S1ap-S1SetupResponse.h	\
+	S1ap-S1SetupRequest.h	\
+	S1ap-S1SetupFailure.h	\
+	S1ap-ErrorIndication.h	\
+	S1ap-ENBConfigurationUpdate.h	\
+	S1ap-ENBConfigurationUpdateAcknowledge.h	\
+	S1ap-ENBConfigurationUpdateFailure.h	\
+	S1ap-MMEConfigurationUpdate.h	\
+	S1ap-MMEConfigurationUpdateAcknowledge.h	\
+	S1ap-MMEConfigurationUpdateFailure.h	\
+	S1ap-DownlinkS1cdma2000tunneling.h	\
+	S1ap-UplinkS1cdma2000tunneling.h	\
+	S1ap-UEContextModificationRequest.h	\
+	S1ap-UEContextModificationResponse.h	\
+	S1ap-UEContextModificationFailure.h	\
+	S1ap-UECapabilityInfoIndication.h	\
+	S1ap-UEContextReleaseCommand.h	\
+	S1ap-UEContextReleaseComplete.h	\
+	S1ap-ENBStatusTransfer.h	\
+	S1ap-MMEStatusTransfer.h	\
+	S1ap-DeactivateTrace.h	\
+	S1ap-TraceStart.h	\
+	S1ap-TraceFailureIndication.h	\
+	S1ap-CellTrafficTrace.h	\
+	S1ap-LocationReportingControl.h	\
+	S1ap-LocationReportingFailureIndication.h	\
+	S1ap-LocationReport.h	\
+	S1ap-OverloadStart.h	\
+	S1ap-OverloadStop.h	\
+	S1ap-WriteReplaceWarningRequest.h	\
+	S1ap-WriteReplaceWarningResponse.h	\
+	S1ap-ENBDirectInformationTransfer.h	\
+	S1ap-MMEDirectInformationTransfer.h	\
+	S1ap-ENBConfigurationTransfer.h	\
+	S1ap-MMEConfigurationTransfer.h	\
+	S1ap-PrivateMessage.h	\
+	S1ap-IE.h	\
+	S1ap-IE-Extensions.h
 
 ASN_MODULE_HEADERS+=ANY.h
 ASN_MODULE_SOURCES+=ANY.c
@@ -665,89 +665,89 @@ ASN_MODULE_SOURCES+=per_opentype.c
 
 if UPDATE_RELEASE_9
 ASN_MODULE_SOURCES += \
-	KillResponse.c	\
-	KillRequest.c	\
-	Data-Forwarding-Not-Possible.c	\
-	DownlinkUEAssociatedLPPaTransport.c	\
-	UplinkUEAssociatedLPPaTransport.c	\
-	DownlinkNonUEAssociatedLPPaTransport.c	\
-	UplinkNonUEAssociatedLPPaTransport.c	\
-	TAI-Cancelled.c	\
-	TAI-Cancelled-Item.c	\
-	StratumLevel.c	\
-	SynchronizationStatus.c	\
-	TimeSynchronizationInfo.c	\
-	Routing-ID.c	\
-	PS-ServiceNotAvailable.c	\
-	LPPa-PDU.c	\
-	ExtendedRepetitionPeriod.c	\
-	EUTRANRoundTripDelayEstimationInfo.c	\
-	EmergencyAreaID-Cancelled.c	\
-	EmergencyAreaID-Cancelled-Item.c	\
-	CSGMembershipStatus.c	\
-	ConcurrentWarningMessageIndicator.c	\
-	CellID-Cancelled.c	\
-	CellID-Cancelled-Item.c	\
-	CellAccessMode.c	\
-	CancelledCellinEAI.c	\
-	CancelledCellinEAI-Item.c	\
-	CancelledCellinTAI.c	\
-	CancelledCellinTAI-Item.c	\
-	BroadcastCancelledAreaList.c
+	S1ap-KillResponse.c	\
+	S1ap-KillRequest.c	\
+	S1ap-Data-Forwarding-Not-Possible.c	\
+	S1ap-DownlinkUEAssociatedLPPaTransport.c	\
+	S1ap-UplinkUEAssociatedLPPaTransport.c	\
+	S1ap-DownlinkNonUEAssociatedLPPaTransport.c	\
+	S1ap-UplinkNonUEAssociatedLPPaTransport.c	\
+	S1ap-TAI-Cancelled.c	\
+	S1ap-TAI-Cancelled-Item.c	\
+	S1ap-StratumLevel.c	\
+	S1ap-SynchronizationStatus.c	\
+	S1ap-TimeSynchronizationInfo.c	\
+	S1ap-Routing-ID.c	\
+	S1ap-PS-ServiceNotAvailable.c	\
+	S1ap-LPPa-PDU.c	\
+	S1ap-ExtendedRepetitionPeriod.c	\
+	S1ap-EUTRANRoundTripDelayEstimationInfo.c	\
+	S1ap-EmergencyAreaID-Cancelled.c	\
+	S1ap-EmergencyAreaID-Cancelled-Item.c	\
+	S1ap-CSGMembershipStatus.c	\
+	S1ap-ConcurrentWarningMessageIndicator.c	\
+	S1ap-CellID-Cancelled.c	\
+	S1ap-CellID-Cancelled-Item.c	\
+	S1ap-CellAccessMode.c	\
+	S1ap-CancelledCellinEAI.c	\
+	S1ap-CancelledCellinEAI-Item.c	\
+	S1ap-CancelledCellinTAI.c	\
+	S1ap-CancelledCellinTAI-Item.c	\
+	S1ap-BroadcastCancelledAreaList.c
 
 ASN_MODULE_HEADERS += \
-	BroadcastCancelledAreaList.h	\
-	CancelledCellinEAI.h	\
-	CancelledCellinEAI-Item.h	\
-	CancelledCellinTAI.h	\
-	CancelledCellinTAI-Item.h	\
-	CellAccessMode.h	\
-	CellID-Cancelled.h	\
-	CellID-Cancelled-Item.h	\
-	ConcurrentWarningMessageIndicator.h	\
-	CSGMembershipStatus.h	\
-	Data-Forwarding-Not-Possible.h	\
-	EmergencyAreaID-Cancelled.h	\
-	EmergencyAreaID-Cancelled-Item.h	\
-	E-RABList.h	\
-	EUTRANRoundTripDelayEstimationInfo.h	\
-	ExtendedRepetitionPeriod.h	\
-	LPPa-PDU.h	\
-	PS-ServiceNotAvailable.h	\
-	Routing-ID.h	\
-	StratumLevel.h	\
-	SynchronizationStatus.h	\
-	TimeSynchronizationInfo.h	\
-	TAI-Cancelled.h	\
-	TAI-Cancelled-Item.h	\
-	KillResponse.h	\
-	KillRequest.h	\
-	DownlinkUEAssociatedLPPaTransport.h	\
-	UplinkUEAssociatedLPPaTransport.h	\
-	DownlinkNonUEAssociatedLPPaTransport.h	\
-	UplinkNonUEAssociatedLPPaTransport.h
+	S1ap-BroadcastCancelledAreaList.h	\
+	S1ap-CancelledCellinEAI.h	\
+	S1ap-CancelledCellinEAI-Item.h	\
+	S1ap-CancelledCellinTAI.h	\
+	S1ap-CancelledCellinTAI-Item.h	\
+	S1ap-CellAccessMode.h	\
+	S1ap-CellID-Cancelled.h	\
+	S1ap-CellID-Cancelled-Item.h	\
+	S1ap-ConcurrentWarningMessageIndicator.h	\
+	S1ap-CSGMembershipStatus.h	\
+	S1ap-Data-Forwarding-Not-Possible.h	\
+	S1ap-EmergencyAreaID-Cancelled.h	\
+	S1ap-EmergencyAreaID-Cancelled-Item.h	\
+	S1ap-E-RABList.h	\
+	S1ap-EUTRANRoundTripDelayEstimationInfo.h	\
+	S1ap-ExtendedRepetitionPeriod.h	\
+	S1ap-LPPa-PDU.h	\
+	S1ap-PS-ServiceNotAvailable.h	\
+	S1ap-Routing-ID.h	\
+	S1ap-StratumLevel.h	\
+	S1ap-SynchronizationStatus.h	\
+	S1ap-TimeSynchronizationInfo.h	\
+	S1ap-TAI-Cancelled.h	\
+	S1ap-TAI-Cancelled-Item.h	\
+	S1ap-KillResponse.h	\
+	S1ap-KillRequest.h	\
+	S1ap-DownlinkUEAssociatedLPPaTransport.h	\
+	S1ap-UplinkUEAssociatedLPPaTransport.h	\
+	S1ap-DownlinkNonUEAssociatedLPPaTransport.h	\
+	S1ap-UplinkNonUEAssociatedLPPaTransport.h
 endif
 
 if UPDATE_RELEASE_10
 ASN_MODULE_SOURCES += \
-	PagingPriority.c	\
-	RelayNode-Indicator.c	\
-	GWContextReleaseIndication.c	\
-	MMERelaySupportIndicator.c	\
-	ManagementBasedMDTAllowed.c	\
-	PrivacyIndicator.c	\
-	TrafficLoadReductionIndication.c	\
-	GUMMEIList.c
+	S1ap-PagingPriority.c	\
+	S1ap-RelayNode-Indicator.c	\
+	S1ap-GWContextReleaseIndication.c	\
+	S1ap-MMERelaySupportIndicator.c	\
+	S1ap-ManagementBasedMDTAllowed.c	\
+	S1ap-PrivacyIndicator.c	\
+	S1ap-TrafficLoadReductionIndication.c	\
+	S1ap-GUMMEIList.c
 	
 ASN_MODULE_HEADERS += \
-	PagingPriority.h	\
-	RelayNode-Indicator.h	\
-	GWContextReleaseIndication.h	\
-	MMERelaySupportIndicator.h	\
-	ManagementBasedMDTAllowed.h	\
-	PrivacyIndicator.h	\
-	TrafficLoadReductionIndication.h	\
-	GUMMEIList.h
+	S1ap-PagingPriority.h	\
+	S1ap-RelayNode-Indicator.h	\
+	S1ap-GWContextReleaseIndication.h	\
+	S1ap-MMERelaySupportIndicator.h	\
+	S1ap-ManagementBasedMDTAllowed.h	\
+	S1ap-PrivacyIndicator.h	\
+	S1ap-TrafficLoadReductionIndication.h	\
+	S1ap-GUMMEIList.h
 endif
 
 noinst_LTLIBRARIES = libs1apmessages.la
diff --git a/openair-cn/S1AP/MESSAGES/Makefile.inc b/openair-cn/S1AP/MESSAGES/Makefile.inc
index 626660d63488978773906e26ac7eb4cd14a489f0..460401cfc27546a9af895666b70cd2e038821459 100644
--- a/openair-cn/S1AP/MESSAGES/Makefile.inc
+++ b/openair-cn/S1AP/MESSAGES/Makefile.inc
@@ -1,697 +1,697 @@
 S1AP_ASN_MODULE_SOURCES= \
-    Criticality.o   \
-    Presence.o  \
-    PrivateIE-ID.o  \
-    ProcedureCode.o \
-    ProtocolExtensionID.o   \
-    ProtocolIE-ID.o \
-    TriggeringMessage.o \
-    IE-Extensions.o \
-    AllocationAndRetentionPriority.o    \
-    Bearers-SubjectToStatusTransfer-List.o   \
-    Bearers-SubjectToStatusTransfer-Item.o  \
-    BitRate.o   \
-    BPLMNs.o    \
-    BroadcastCompletedAreaList.o    \
-    Cause.o \
-    CauseMisc.o \
-    CauseProtocol.o \
-    CauseRadioNetwork.o \
-    CauseTransport.o    \
-    CauseNas.o  \
-    CellIdentity.o  \
-    CellID-Broadcast.o  \
-    CellID-Broadcast-Item.o \
-    Cdma2000PDU.o   \
-    Cdma2000RATType.o   \
-    Cdma2000SectorID.o  \
-    Cdma2000HOStatus.o  \
-    Cdma2000HORequiredIndication.o  \
-    Cdma2000OneXSRVCCInfo.o \
-    Cdma2000OneXMEID.o  \
-    Cdma2000OneXMSI.o   \
-    Cdma2000OneXPilot.o \
-    Cdma2000OneXRAND.o  \
-    Cell-Size.o \
-    CellType.o  \
-    CGI.o   \
-    CI.o    \
-    CNDomain.o  \
-    CSFallbackIndicator.o   \
-    CSG-Id.o    \
-    CSG-IdList.o    \
-    CSG-IdList-Item.o   \
-    COUNTvalue.o    \
-    CriticalityDiagnostics.o    \
-    CriticalityDiagnostics-IE-List.o    \
-    CriticalityDiagnostics-IE-Item.o    \
-    DataCodingScheme.o  \
-    DL-Forwarding.o \
-    Direct-Forwarding-Path-Availability.o   \
-    E-RABToBeModifiedListBearerModReq.o \
-    E-RABToBeModifiedItemBearerModReq.o \
-    E-RABReleaseListBearerRelComp.o \
-    E-RABReleaseItemBearerRelComp.o \
-    E-RABDataForwardingList.o   \
-    E-RABDataForwardingItem.o   \
-    E-RABToBeSetupListCtxtSUReq.o   \
-    E-RABToBeSetupItemCtxtSUReq.o   \
-    E-RABSetupListBearerSURes.o \
-    E-RABSetupItemBearerSURes.o \
-    E-RABFailedToSetupListHOReqAck.o    \
-    E-RABFailedToSetupItemHOReqAck.o    \
-    E-RABToBeSetupListBearerSUReq.o \
-    E-RABToBeSetupItemBearerSUReq.o \
-    E-RABAdmittedList.o \
-    E-RABAdmittedItem.o \
-    E-RABToBeSwitchedDLList.o   \
-    E-RABToBeSwitchedDLItem.o   \
-    E-RABToBeSwitchedULList.o   \
-    E-RABToBeSwitchedULItem.o   \
-    E-RABModifyListBearerModRes.o   \
-    E-RABModifyItemBearerModRes.o   \
-    E-RABSetupListCtxtSURes.o   \
-    E-RABSetupItemCtxtSURes.o   \
-    E-RABToBeSetupListHOReq.o   \
-    E-RABToBeSetupItemHOReq.o   \
-    ECGIList.o  \
-    EmergencyAreaIDList.o   \
-    EmergencyAreaID.o   \
-    EmergencyAreaID-Broadcast.o \
-    EmergencyAreaID-Broadcast-Item.o    \
-    CompletedCellinEAI.o    \
-    CompletedCellinEAI-Item.o   \
-    ENB-ID.o    \
-    GERAN-Cell-ID.o \
-    Global-ENB-ID.o \
-    ENB-StatusTransfer-TransparentContainer.o   \
-    ENB-UE-S1AP-ID.o    \
-    ENBname.o   \
-    ENBX2TLAs.o \
-    EncryptionAlgorithms.o  \
-    EPLMNs.o    \
-    EventType.o \
-    E-RAB-ID.o  \
-    E-RABInformationList.o  \
-    E-RABInformationListItem.o  \
-    E-RABList.o \
-    E-RABItem.o \
-    E-RABLevelQoSParameters.o   \
-    EUTRAN-CGI.o    \
-    ExtendedRNC-ID.o    \
-    ForbiddenInterRATs.o    \
-    ForbiddenTAs.o  \
-    ForbiddenTAs-Item.o \
-    ForbiddenTACs.o \
-    ForbiddenLAs.o  \
-    ForbiddenLAs-Item.o \
-    ForbiddenLACs.o \
-    GBR-QosInformation.o    \
-    GTP-TEID.o  \
-    GUMMEI.o    \
-    HandoverRestrictionList.o   \
-    HandoverType.o  \
-    HFN.o   \
-    Inter-SystemInformationTransferType.o   \
-    IMSI.o  \
-    IntegrityProtectionAlgorithms.o \
-    InterfacesToTrace.o \
-    LAC.o   \
-    LAI.o   \
-    LastVisitedCell-Item.o  \
-    LastVisitedEUTRANCellInformation.o  \
-    LastVisitedUTRANCellInformation.o   \
-    LastVisitedGERANCellInformation.o   \
-    L3-Information.o    \
-    MessageIdentifier.o \
-    MMEname.o   \
-    MME-Group-ID.o  \
-    MME-Code.o  \
-    MME-UE-S1AP-ID.o    \
-    M-TMSI.o    \
-    MSClassmark2.o  \
-    MSClassmark3.o  \
-    NAS-PDU.o   \
-    NASSecurityParametersfromE-UTRAN.o  \
-    NASSecurityParameterstoE-UTRAN.o    \
-    NumberofBroadcastRequest.o  \
-    NumberOfBroadcasts.o \
-    OldBSS-ToNewBSS-Information.o   \
-    OverloadAction.o    \
-    OverloadResponse.o  \
-    PagingDRX.o \
-    PDCP-SN.o   \
-    PLMNidentity.o  \
-    Pre-emptionCapability.o \
-    Pre-emptionVulnerability.o  \
-    PriorityLevel.o \
-    QCI.o   \
-    ReceiveStatusofULPDCPSDUs.o \
-    RelativeMMECapacity.o   \
-    RAC.o   \
-    RequestType.o   \
-    ResetType.o \
-    ResetAll.o  \
-    RIMTransfer.o   \
-    RIMInformation.o    \
-    RIMRoutingAddress.o \
-    ReportArea.o    \
-    RepetitionPeriod.o  \
-    RNC-ID.o    \
-    RRC-Container.o \
-    RRC-Establishment-Cause.o   \
-    SecurityKey.o   \
-    SecurityContext.o   \
-    SerialNumber.o  \
-    SONInformation.o    \
-    SONInformationRequest.o \
-    SONInformationReply.o   \
-    SONConfigurationTransfer.o  \
-    Source-ToTarget-TransparentContainer.o  \
-    SourceBSS-ToTargetBSS-TransparentContainer.o    \
-    SourceeNB-ID.o  \
-    SRVCCOperationPossible.o    \
-    SRVCCHOIndication.o \
-    SourceeNB-ToTargeteNB-TransparentContainer.o    \
-    SourceRNC-ToTargetRNC-TransparentContainer.o    \
-    ServedGUMMEIs.o \
-    ServedGUMMEIsItem.o \
-    ServedGroupIDs.o    \
-    ServedMMECs.o   \
-    ServedPLMNs.o   \
-    SubscriberProfileIDforRFP.o \
-    SupportedTAs.o  \
-    SupportedTAs-Item.o \
-    S-TMSI.o    \
-    TAC.o   \
-    TAIListforWarning.o \
-    TAIList.o   \
-    TAIItem.o   \
-    TAI.o   \
-    TAI-Broadcast.o \
-    TAI-Broadcast-Item.o    \
-    CompletedCellinTAI.o    \
-    CompletedCellinTAI-Item.o   \
-    TBCD-STRING.o   \
-    TargetID.o  \
-    TargeteNB-ID.o  \
-    TargetRNC-ID.o  \
-    TargeteNB-ToSourceeNB-TransparentContainer.o    \
-    Target-ToSource-TransparentContainer.o  \
-    TargetRNC-ToSourceRNC-TransparentContainer.o    \
-    TargetBSS-ToSourceBSS-TransparentContainer.o    \
-    TimeToWait.o    \
-    Time-UE-StayedInCell.o  \
-    TransportLayerAddress.o \
-    TraceActivation.o   \
-    TraceDepth.o    \
-    E-UTRAN-Trace-ID.o  \
-    TypeOfError.o   \
-    UEAggregateMaximumBitrate.o \
-    UE-S1AP-IDs.o   \
-    UE-S1AP-ID-pair.o   \
-    UE-associatedLogicalS1-ConnectionListRes.o  \
-    UE-associatedLogicalS1-ConnectionListResAck.o   \
-    UE-associatedLogicalS1-ConnectionItem.o \
-    UEIdentityIndexValue.o  \
-    UE-HistoryInformation.o \
-    UEPagingID.o    \
-    UERadioCapability.o \
-    UESecurityCapabilities.o    \
-    WarningAreaList.o   \
-    WarningType.o   \
-    WarningSecurityInfo.o   \
-    WarningMessageContents.o    \
-    X2TNLConfigurationInfo.o    \
+    S1ap-Criticality.o   \
+    S1ap-Presence.o  \
+    S1ap-PrivateIE-ID.o  \
+    S1ap-ProcedureCode.o \
+    S1ap-ProtocolExtensionID.o   \
+    S1ap-ProtocolIE-ID.o \
+    S1ap-TriggeringMessage.o \
+    S1ap-IE-Extensions.o \
+    S1ap-AllocationAndRetentionPriority.o    \
+    S1ap-Bearers-SubjectToStatusTransfer-List.o   \
+    S1ap-Bearers-SubjectToStatusTransfer-Item.o  \
+    S1ap-BitRate.o   \
+    S1ap-BPLMNs.o    \
+    S1ap-BroadcastCompletedAreaList.o    \
+    S1ap-Cause.o \
+    S1ap-CauseMisc.o \
+    S1ap-CauseProtocol.o \
+    S1ap-CauseRadioNetwork.o \
+    S1ap-CauseTransport.o    \
+    S1ap-CauseNas.o  \
+    S1ap-CellIdentity.o  \
+    S1ap-CellID-Broadcast.o  \
+    S1ap-CellID-Broadcast-Item.o \
+    S1ap-Cdma2000PDU.o   \
+    S1ap-Cdma2000RATType.o   \
+    S1ap-Cdma2000SectorID.o  \
+    S1ap-Cdma2000HOStatus.o  \
+    S1ap-Cdma2000HORequiredIndication.o  \
+    S1ap-Cdma2000OneXSRVCCInfo.o \
+    S1ap-Cdma2000OneXMEID.o  \
+    S1ap-Cdma2000OneXMSI.o   \
+    S1ap-Cdma2000OneXPilot.o \
+    S1ap-Cdma2000OneXRAND.o  \
+    S1ap-Cell-Size.o \
+    S1ap-CellType.o  \
+    S1ap-CGI.o   \
+    S1ap-CI.o    \
+    S1ap-CNDomain.o  \
+    S1ap-CSFallbackIndicator.o   \
+    S1ap-CSG-Id.o    \
+    S1ap-CSG-IdList.o    \
+    S1ap-CSG-IdList-Item.o   \
+    S1ap-COUNTvalue.o    \
+    S1ap-CriticalityDiagnostics.o    \
+    S1ap-CriticalityDiagnostics-IE-List.o    \
+    S1ap-CriticalityDiagnostics-IE-Item.o    \
+    S1ap-DataCodingScheme.o  \
+    S1ap-DL-Forwarding.o \
+    S1ap-Direct-Forwarding-Path-Availability.o   \
+    S1ap-E-RABToBeModifiedListBearerModReq.o \
+    S1ap-E-RABToBeModifiedItemBearerModReq.o \
+    S1ap-E-RABReleaseListBearerRelComp.o \
+    S1ap-E-RABReleaseItemBearerRelComp.o \
+    S1ap-E-RABDataForwardingList.o   \
+    S1ap-E-RABDataForwardingItem.o   \
+    S1ap-E-RABToBeSetupListCtxtSUReq.o   \
+    S1ap-E-RABToBeSetupItemCtxtSUReq.o   \
+    S1ap-E-RABSetupListBearerSURes.o \
+    S1ap-E-RABSetupItemBearerSURes.o \
+    S1ap-E-RABFailedToSetupListHOReqAck.o    \
+    S1ap-E-RABFailedToSetupItemHOReqAck.o    \
+    S1ap-E-RABToBeSetupListBearerSUReq.o \
+    S1ap-E-RABToBeSetupItemBearerSUReq.o \
+    S1ap-E-RABAdmittedList.o \
+    S1ap-E-RABAdmittedItem.o \
+    S1ap-E-RABToBeSwitchedDLList.o   \
+    S1ap-E-RABToBeSwitchedDLItem.o   \
+    S1ap-E-RABToBeSwitchedULList.o   \
+    S1ap-E-RABToBeSwitchedULItem.o   \
+    S1ap-E-RABModifyListBearerModRes.o   \
+    S1ap-E-RABModifyItemBearerModRes.o   \
+    S1ap-E-RABSetupListCtxtSURes.o   \
+    S1ap-E-RABSetupItemCtxtSURes.o   \
+    S1ap-E-RABToBeSetupListHOReq.o   \
+    S1ap-E-RABToBeSetupItemHOReq.o   \
+    S1ap-ECGIList.o  \
+    S1ap-EmergencyAreaIDList.o   \
+    S1ap-EmergencyAreaID.o   \
+    S1ap-EmergencyAreaID-Broadcast.o \
+    S1ap-EmergencyAreaID-Broadcast-Item.o    \
+    S1ap-CompletedCellinEAI.o    \
+    S1ap-CompletedCellinEAI-Item.o   \
+    S1ap-ENB-ID.o    \
+    S1ap-GERAN-Cell-ID.o \
+    S1ap-Global-ENB-ID.o \
+    S1ap-ENB-StatusTransfer-TransparentContainer.o   \
+    S1ap-ENB-UE-S1AP-ID.o    \
+    S1ap-ENBname.o   \
+    S1ap-ENBX2TLAs.o \
+    S1ap-EncryptionAlgorithms.o  \
+    S1ap-EPLMNs.o    \
+    S1ap-EventType.o \
+    S1ap-E-RAB-ID.o  \
+    S1ap-E-RABInformationList.o  \
+    S1ap-E-RABInformationListItem.o  \
+    S1ap-E-RABList.o \
+    S1ap-E-RABItem.o \
+    S1ap-E-RABLevelQoSParameters.o   \
+    S1ap-EUTRAN-CGI.o    \
+    S1ap-ExtendedRNC-ID.o    \
+    S1ap-ForbiddenInterRATs.o    \
+    S1ap-ForbiddenTAs.o  \
+    S1ap-ForbiddenTAs-Item.o \
+    S1ap-ForbiddenTACs.o \
+    S1ap-ForbiddenLAs.o  \
+    S1ap-ForbiddenLAs-Item.o \
+    S1ap-ForbiddenLACs.o \
+    S1ap-GBR-QosInformation.o    \
+    S1ap-GTP-TEID.o  \
+    S1ap-GUMMEI.o    \
+    S1ap-HandoverRestrictionList.o   \
+    S1ap-HandoverType.o  \
+    S1ap-HFN.o   \
+    S1ap-Inter-SystemInformationTransferType.o   \
+    S1ap-IMSI.o  \
+    S1ap-IntegrityProtectionAlgorithms.o \
+    S1ap-InterfacesToTrace.o \
+    S1ap-LAC.o   \
+    S1ap-LAI.o   \
+    S1ap-LastVisitedCell-Item.o  \
+    S1ap-LastVisitedEUTRANCellInformation.o  \
+    S1ap-LastVisitedUTRANCellInformation.o   \
+    S1ap-LastVisitedGERANCellInformation.o   \
+    S1ap-L3-Information.o    \
+    S1ap-MessageIdentifier.o \
+    S1ap-MMEname.o   \
+    S1ap-MME-Group-ID.o  \
+    S1ap-MME-Code.o  \
+    S1ap-MME-UE-S1AP-ID.o    \
+    S1ap-M-TMSI.o    \
+    S1ap-MSClassmark2.o  \
+    S1ap-MSClassmark3.o  \
+    S1ap-NAS-PDU.o   \
+    S1ap-NASSecurityParametersfromE-UTRAN.o  \
+    S1ap-NASSecurityParameterstoE-UTRAN.o    \
+    S1ap-NumberofBroadcastRequest.o  \
+    S1ap-NumberOfBroadcasts.o \
+    S1ap-OldBSS-ToNewBSS-Information.o   \
+    S1ap-OverloadAction.o    \
+    S1ap-OverloadResponse.o  \
+    S1ap-PagingDRX.o \
+    S1ap-PDCP-SN.o   \
+    S1ap-PLMNidentity.o  \
+    S1ap-Pre-emptionCapability.o \
+    S1ap-Pre-emptionVulnerability.o  \
+    S1ap-PriorityLevel.o \
+    S1ap-QCI.o   \
+    S1ap-ReceiveStatusofULPDCPSDUs.o \
+    S1ap-RelativeMMECapacity.o   \
+    S1ap-RAC.o   \
+    S1ap-RequestType.o   \
+    S1ap-ResetType.o \
+    S1ap-ResetAll.o  \
+    S1ap-RIMTransfer.o   \
+    S1ap-RIMInformation.o    \
+    S1ap-RIMRoutingAddress.o \
+    S1ap-ReportArea.o    \
+    S1ap-RepetitionPeriod.o  \
+    S1ap-RNC-ID.o    \
+    S1ap-RRC-Container.o \
+    S1ap-RRC-Establishment-Cause.o   \
+    S1ap-SecurityKey.o   \
+    S1ap-SecurityContext.o   \
+    S1ap-SerialNumber.o  \
+    S1ap-SONInformation.o    \
+    S1ap-SONInformationRequest.o \
+    S1ap-SONInformationReply.o   \
+    S1ap-SONConfigurationTransfer.o  \
+    S1ap-Source-ToTarget-TransparentContainer.o  \
+    S1ap-SourceBSS-ToTargetBSS-TransparentContainer.o    \
+    S1ap-SourceeNB-ID.o  \
+    S1ap-SRVCCOperationPossible.o    \
+    S1ap-SRVCCHOIndication.o \
+    S1ap-SourceeNB-ToTargeteNB-TransparentContainer.o    \
+    S1ap-SourceRNC-ToTargetRNC-TransparentContainer.o    \
+    S1ap-ServedGUMMEIs.o \
+    S1ap-ServedGUMMEIsItem.o \
+    S1ap-ServedGroupIDs.o    \
+    S1ap-ServedMMECs.o   \
+    S1ap-ServedPLMNs.o   \
+    S1ap-SubscriberProfileIDforRFP.o \
+    S1ap-SupportedTAs.o  \
+    S1ap-SupportedTAs-Item.o \
+    S1ap-S-TMSI.o    \
+    S1ap-TAC.o   \
+    S1ap-TAIListforWarning.o \
+    S1ap-TAIList.o   \
+    S1ap-TAIItem.o   \
+    S1ap-TAI.o   \
+    S1ap-TAI-Broadcast.o \
+    S1ap-TAI-Broadcast-Item.o    \
+    S1ap-CompletedCellinTAI.o    \
+    S1ap-CompletedCellinTAI-Item.o   \
+    S1ap-TBCD-STRING.o   \
+    S1ap-TargetID.o  \
+    S1ap-TargeteNB-ID.o  \
+    S1ap-TargetRNC-ID.o  \
+    S1ap-TargeteNB-ToSourceeNB-TransparentContainer.o    \
+    S1ap-Target-ToSource-TransparentContainer.o  \
+    S1ap-TargetRNC-ToSourceRNC-TransparentContainer.o    \
+    S1ap-TargetBSS-ToSourceBSS-TransparentContainer.o    \
+    S1ap-TimeToWait.o    \
+    S1ap-Time-UE-StayedInCell.o  \
+    S1ap-TransportLayerAddress.o \
+    S1ap-TraceActivation.o   \
+    S1ap-TraceDepth.o    \
+    S1ap-E-UTRAN-Trace-ID.o  \
+    S1ap-TypeOfError.o   \
+    S1ap-UEAggregateMaximumBitrate.o \
+    S1ap-UE-S1AP-IDs.o   \
+    S1ap-UE-S1AP-ID-pair.o   \
+    S1ap-UE-associatedLogicalS1-ConnectionListRes.o  \
+    S1ap-UE-associatedLogicalS1-ConnectionListResAck.o   \
+    S1ap-UE-associatedLogicalS1-ConnectionItem.o \
+    S1ap-UEIdentityIndexValue.o  \
+    S1ap-UE-HistoryInformation.o \
+    S1ap-UEPagingID.o    \
+    S1ap-UERadioCapability.o \
+    S1ap-UESecurityCapabilities.o    \
+    S1ap-WarningAreaList.o   \
+    S1ap-WarningType.o   \
+    S1ap-WarningSecurityInfo.o   \
+    S1ap-WarningMessageContents.o    \
+    S1ap-X2TNLConfigurationInfo.o    \
     S1AP-PDU.o  \
-    InitiatingMessage.o \
-    SuccessfulOutcome.o \
-    UnsuccessfulOutcome.o   \
-    HandoverRequired.o  \
-    HandoverCommand.o   \
-    HandoverPreparationFailure.o    \
-    HandoverRequest.o   \
-    HandoverRequestAcknowledge.o    \
-    HandoverFailure.o   \
-    HandoverNotify.o \
-    PathSwitchRequest.o \
-    PathSwitchRequestAcknowledge.o  \
-    PathSwitchRequestFailure.o  \
-    E-RABSetupRequest.o \
-    E-RABSetupResponse.o    \
-    E-RABModifyRequest.o    \
-    E-RABModifyResponse.o   \
-    E-RABReleaseIndication.o    \
-    E-RABReleaseCommand.o   \
-    E-RABReleaseResponse.o  \
-    InitialContextSetupRequest.o    \
-    InitialContextSetupResponse.o   \
-    InitialContextSetupFailure.o    \
-    UEContextReleaseRequest.o   \
-    Paging.o    \
-    DownlinkNASTransport.o  \
-    InitialUEMessage.o  \
-    UplinkNASTransport.o    \
-    NASNonDeliveryIndication.o  \
-    HandoverCancel.o    \
-    HandoverCancelAcknowledge.o \
-    Reset.o \
-    ResetAcknowledge.o  \
-    S1SetupResponse.o   \
-    S1SetupRequest.o    \
-    S1SetupFailure.o    \
-    ErrorIndication.o   \
-    ENBConfigurationUpdate.o    \
-    ENBConfigurationUpdateAcknowledge.o \
-    ENBConfigurationUpdateFailure.o \
-    MMEConfigurationUpdate.o    \
-    MMEConfigurationUpdateAcknowledge.o \
-    MMEConfigurationUpdateFailure.o \
-    DownlinkS1cdma2000tunneling.o   \
-    UplinkS1cdma2000tunneling.o \
-    UEContextModificationRequest.o  \
-    UEContextModificationResponse.o \
-    UEContextModificationFailure.o  \
-    UECapabilityInfoIndication.o    \
-    UEContextReleaseCommand.o   \
-    UEContextReleaseComplete.o  \
-    ENBStatusTransfer.o \
-    MMEStatusTransfer.o \
-    DeactivateTrace.o   \
-    TraceStart.o    \
-    TraceFailureIndication.o    \
-    CellTrafficTrace.o  \
-    LocationReportingControl.o  \
-    LocationReportingFailureIndication.o    \
-    LocationReport.o    \
-    OverloadStart.o \
-    OverloadStop.o  \
-    WriteReplaceWarningRequest.o    \
-    WriteReplaceWarningResponse.o   \
-    ENBDirectInformationTransfer.o  \
-    MMEDirectInformationTransfer.o  \
-    ENBConfigurationTransfer.o  \
-    MMEConfigurationTransfer.o  \
-    PrivateMessage.o    \
-    IE.o
+    S1ap-InitiatingMessage.o \
+    S1ap-SuccessfulOutcome.o \
+    S1ap-UnsuccessfulOutcome.o   \
+    S1ap-HandoverRequired.o  \
+    S1ap-HandoverCommand.o   \
+    S1ap-HandoverPreparationFailure.o    \
+    S1ap-HandoverRequest.o   \
+    S1ap-HandoverRequestAcknowledge.o    \
+    S1ap-HandoverFailure.o   \
+    S1ap-HandoverNotify.o \
+    S1ap-PathSwitchRequest.o \
+    S1ap-PathSwitchRequestAcknowledge.o  \
+    S1ap-PathSwitchRequestFailure.o  \
+    S1ap-E-RABSetupRequest.o \
+    S1ap-E-RABSetupResponse.o    \
+    S1ap-E-RABModifyRequest.o    \
+    S1ap-E-RABModifyResponse.o   \
+    S1ap-E-RABReleaseIndication.o    \
+    S1ap-E-RABReleaseCommand.o   \
+    S1ap-E-RABReleaseResponse.o  \
+    S1ap-InitialContextSetupRequest.o    \
+    S1ap-InitialContextSetupResponse.o   \
+    S1ap-InitialContextSetupFailure.o    \
+    S1ap-UEContextReleaseRequest.o   \
+    S1ap-Paging.o    \
+    S1ap-DownlinkNASTransport.o  \
+    S1ap-InitialUEMessage.o  \
+    S1ap-UplinkNASTransport.o    \
+    S1ap-NASNonDeliveryIndication.o  \
+    S1ap-HandoverCancel.o    \
+    S1ap-HandoverCancelAcknowledge.o \
+    S1ap-Reset.o \
+    S1ap-ResetAcknowledge.o  \
+    S1ap-S1SetupResponse.o   \
+    S1ap-S1SetupRequest.o    \
+    S1ap-S1SetupFailure.o    \
+    S1ap-ErrorIndication.o   \
+    S1ap-ENBConfigurationUpdate.o    \
+    S1ap-ENBConfigurationUpdateAcknowledge.o \
+    S1ap-ENBConfigurationUpdateFailure.o \
+    S1ap-MMEConfigurationUpdate.o    \
+    S1ap-MMEConfigurationUpdateAcknowledge.o \
+    S1ap-MMEConfigurationUpdateFailure.o \
+    S1ap-DownlinkS1cdma2000tunneling.o   \
+    S1ap-UplinkS1cdma2000tunneling.o \
+    S1ap-UEContextModificationRequest.o  \
+    S1ap-UEContextModificationResponse.o \
+    S1ap-UEContextModificationFailure.o  \
+    S1ap-UECapabilityInfoIndication.o    \
+    S1ap-UEContextReleaseCommand.o   \
+    S1ap-UEContextReleaseComplete.o  \
+    S1ap-ENBStatusTransfer.o \
+    S1ap-MMEStatusTransfer.o \
+    S1ap-DeactivateTrace.o   \
+    S1ap-TraceStart.o    \
+    S1ap-TraceFailureIndication.o    \
+    S1ap-CellTrafficTrace.o  \
+    S1ap-LocationReportingControl.o  \
+    S1ap-LocationReportingFailureIndication.o    \
+    S1ap-LocationReport.o    \
+    S1ap-OverloadStart.o \
+    S1ap-OverloadStop.o  \
+    S1ap-WriteReplaceWarningRequest.o    \
+    S1ap-WriteReplaceWarningResponse.o   \
+    S1ap-ENBDirectInformationTransfer.o  \
+    S1ap-MMEDirectInformationTransfer.o  \
+    S1ap-ENBConfigurationTransfer.o  \
+    S1ap-MMEConfigurationTransfer.o  \
+    S1ap-PrivateMessage.o    \
+    S1ap-IE.o
 
 S1AP_ASN_MODULE_HEADERS= \
-    Criticality.h   \
-    Presence.h  \
-    PrivateIE-ID.h  \
-    ProcedureCode.h \
-    ProtocolExtensionID.h   \
-    ProtocolIE-ID.h \
-    TriggeringMessage.h \
-    IE-Extensions.h \
-    AllocationAndRetentionPriority.h    \
-    Bearers-SubjectToStatusTransfer-List.h   \
-    Bearers-SubjectToStatusTransfer-Item.h  \
-    BitRate.h   \
-    BPLMNs.h    \
-    BroadcastCompletedAreaList.h    \
-    Cause.h \
-    CauseMisc.h \
-    CauseProtocol.h \
-    CauseRadioNetwork.h \
-    CauseTransport.h    \
-    CauseNas.h  \
-    CellIdentity.h  \
-    CellID-Broadcast.h  \
-    CellID-Broadcast-Item.h \
-    Cdma2000PDU.h   \
-    Cdma2000RATType.h   \
-    Cdma2000SectorID.h  \
-    Cdma2000HOStatus.h  \
-    Cdma2000HORequiredIndication.h  \
-    Cdma2000OneXSRVCCInfo.h \
-    Cdma2000OneXMEID.h  \
-    Cdma2000OneXMSI.h   \
-    Cdma2000OneXPilot.h \
-    Cdma2000OneXRAND.h  \
-    Cell-Size.h \
-    CellType.h  \
-    CGI.h   \
-    CI.h    \
-    CNDomain.h  \
-    CSFallbackIndicator.h   \
-    CSG-Id.h    \
-    CSG-IdList.h    \
-    CSG-IdList-Item.h   \
-    COUNTvalue.h    \
-    CriticalityDiagnostics.h    \
-    CriticalityDiagnostics-IE-List.h    \
-    CriticalityDiagnostics-IE-Item.h    \
-    DataCodingScheme.h  \
-    DL-Forwarding.h \
-    Direct-Forwarding-Path-Availability.h   \
-    E-RABToBeModifiedListBearerModReq.h \
-    E-RABToBeModifiedItemBearerModReqIEs.h  \
-    E-RABToBeModifiedItemBearerModReq.h \
-    E-RABReleaseListBearerRelComp.h \
-    E-RABReleaseItemBearerRelCompIEs.h  \
-    E-RABReleaseItemBearerRelComp.h \
-    E-RABSubjecttoDataForwardingList.h  \
-    E-RABDataForwardingList.h   \
-    E-RABDataForwardingItemIEs.h    \
-    E-RABDataForwardingItem.h   \
-    E-RABToBeSetupListCtxtSUReq.h   \
-    E-RABToBeSetupItemCtxtSUReqIEs.h    \
-    E-RABToBeSetupItemCtxtSUReq.h   \
-    E-RABSetupListBearerSURes.h \
-    E-RABSetupItemBearerSUResIEs.h  \
-    E-RABSetupItemBearerSURes.h \
-    E-RABFailedToSetupListHOReqAck.h    \
-    E-RABFailedToSetupItemHOReqAckIEs.h \
-    E-RABFailedToSetupItemHOReqAck.h    \
-    E-RABToBeSetupListBearerSUReq.h \
-    E-RABToBeSetupItemBearerSUReqIEs.h  \
-    E-RABToBeSetupItemBearerSUReq.h \
-    E-RABAdmittedList.h \
-    E-RABAdmittedItemIEs.h  \
-    E-RABAdmittedItem.h \
-    E-RABToBeSwitchedDLList.h   \
-    E-RABToBeSwitchedDLListIEs.h    \
-    E-RABToBeSwitchedDLItem.h   \
-    E-RABToBeSwitchedULList.h   \
-    E-RABToBeSwitchedULItemIEs.h    \
-    E-RABToBeSwitchedULItem.h   \
-    E-RABModifyListBearerModRes.h   \
-    E-RABModifyItemBearerModResIEs.h    \
-    E-RABModifyItemBearerModRes.h   \
-    E-RABSetupListCtxtSURes.h   \
-    E-RABSetupListCtxtSUResIEs.h    \
-    E-RABSetupItemCtxtSURes.h   \
-    E-RABToBeSetupListHOReq.h   \
-    E-RABToBeSetupListHOReqIEs.h    \
-    E-RABToBeSetupItemHOReq.h   \
-    ECGIList.h  \
-    EmergencyAreaIDList.h   \
-    EmergencyAreaID.h   \
-    EmergencyAreaID-Broadcast.h \
-    EmergencyAreaID-Broadcast-Item.h    \
-    CompletedCellinEAI.h    \
-    CompletedCellinEAI-Item.h   \
-    ENB-ID.h    \
-    GERAN-Cell-ID.h \
-    Global-ENB-ID.h \
-    ENB-StatusTransfer-TransparentContainer.h   \
-    ENB-UE-S1AP-ID.h    \
-    ENBname.h   \
-    ENBX2TLAs.h \
-    EncryptionAlgorithms.h  \
-    EPLMNs.h    \
-    EventType.h \
-    E-RAB-ID.h  \
-    E-RABInformationList.h  \
-    E-RABInformationListItem.h  \
-    E-RABList.h \
-    E-RABItem.h \
-    E-RABLevelQoSParameters.h   \
-    EUTRAN-CGI.h    \
-    ExtendedRNC-ID.h    \
-    ForbiddenInterRATs.h    \
-    ForbiddenTAs.h  \
-    ForbiddenTAs-Item.h \
-    ForbiddenTACs.h \
-    ForbiddenLAs.h  \
-    ForbiddenLAs-Item.h \
-    ForbiddenLACs.h \
-    GBR-QosInformation.h    \
-    GTP-TEID.h  \
-    GUMMEI.h    \
-    HandoverRestrictionList.h   \
-    HandoverType.h  \
-    HFN.h   \
-    HandoverNotify.h    \
-    Inter-SystemInformationTransferType.h   \
-    IMSI.h  \
-    IntegrityProtectionAlgorithms.h \
-    InterfacesToTrace.h \
-    LAC.h   \
-    LAI.h   \
-    LastVisitedCell-Item.h  \
-    LastVisitedEUTRANCellInformation.h  \
-    LastVisitedUTRANCellInformation.h   \
-    LastVisitedGERANCellInformation.h   \
-    L3-Information.h    \
-    MessageIdentifier.h \
-    MMEname.h   \
-    MME-Group-ID.h  \
-    MME-Code.h  \
-    MME-UE-S1AP-ID.h    \
-    M-TMSI.h    \
-    MSClassmark2.h  \
-    MSClassmark3.h  \
-    NAS-PDU.h   \
-    NASSecurityParametersfromE-UTRAN.h  \
-    NASSecurityParameterstoE-UTRAN.h    \
-    NumberofBroadcastRequest.h  \
-    NumberOfBroadcasts.h \
-    OldBSS-ToNewBSS-Information.h   \
-    OverloadAction.h    \
-    OverloadResponse.h  \
-    PagingDRX.h \
-    PDCP-SN.h   \
-    PLMNidentity.h  \
-    Pre-emptionCapability.h \
-    Pre-emptionVulnerability.h  \
-    PriorityLevel.h \
-    QCI.h   \
-    ReceiveStatusofULPDCPSDUs.h \
-    RelativeMMECapacity.h   \
-    RAC.h   \
-    RequestType.h   \
-    ResetType.h \
-    ResetAll.h  \
-    RIMTransfer.h   \
-    RIMInformation.h    \
-    RIMRoutingAddress.h \
-    ReportArea.h    \
-    RepetitionPeriod.h  \
-    RNC-ID.h    \
-    RRC-Container.h \
-    RRC-Establishment-Cause.h   \
-    SecurityKey.h   \
-    SecurityContext.h   \
-    SerialNumber.h  \
-    SONInformation.h    \
-    SONInformationRequest.h \
-    SONInformationReply.h   \
-    SONConfigurationTransfer.h  \
-    Source-ToTarget-TransparentContainer.h  \
-    SourceBSS-ToTargetBSS-TransparentContainer.h    \
-    SourceeNB-ID.h  \
-    SRVCCOperationPossible.h    \
-    SRVCCHOIndication.h \
-    SourceeNB-ToTargeteNB-TransparentContainer.h    \
-    SourceRNC-ToTargetRNC-TransparentContainer.h    \
-    ServedGUMMEIs.h \
-    ServedGUMMEIsItem.h \
-    ServedGroupIDs.h    \
-    ServedMMECs.h   \
-    ServedPLMNs.h   \
-    SubscriberProfileIDforRFP.h \
-    SupportedTAs.h  \
-    SupportedTAs-Item.h \
-    S-TMSI.h    \
-    TAC.h   \
-    TAIListforWarning.h \
-    TAIList.h   \
-    TAIItem.h   \
-    TAI.h   \
-    TAI-Broadcast.h \
-    TAI-Broadcast-Item.h    \
-    CompletedCellinTAI.h    \
-    CompletedCellinTAI-Item.h   \
-    TBCD-STRING.h   \
-    TargetID.h  \
-    TargeteNB-ID.h  \
-    TargetRNC-ID.h  \
-    TargeteNB-ToSourceeNB-TransparentContainer.h    \
-    Target-ToSource-TransparentContainer.h  \
-    TargetRNC-ToSourceRNC-TransparentContainer.h    \
-    TargetBSS-ToSourceBSS-TransparentContainer.h    \
-    TimeToWait.h    \
-    Time-UE-StayedInCell.h  \
-    TransportLayerAddress.h \
-    TraceActivation.h   \
-    TraceDepth.h    \
-    E-UTRAN-Trace-ID.h  \
-    TypeOfError.h   \
-    UEAggregateMaximumBitrate.h \
-    UE-S1AP-IDs.h   \
-    UE-S1AP-ID-pair.h   \
-    UE-associatedLogicalS1-ConnectionListRes.h  \
-    UE-associatedLogicalS1-ConnectionListResAck.h   \
-    UE-associatedLogicalS1-ConnectionItem.h \
-    UEIdentityIndexValue.h  \
-    UE-HistoryInformation.h \
-    UEPagingID.h    \
-    UERadioCapability.h \
-    UESecurityCapabilities.h    \
-    WarningAreaList.h   \
-    WarningType.h   \
-    WarningSecurityInfo.h   \
-    WarningMessageContents.h    \
-    X2TNLConfigurationInfo.h    \
+    S1ap-Criticality.h   \
+    S1ap-Presence.h  \
+    S1ap-PrivateIE-ID.h  \
+    S1ap-ProcedureCode.h \
+    S1ap-ProtocolExtensionID.h   \
+    S1ap-ProtocolIE-ID.h \
+    S1ap-TriggeringMessage.h \
+    S1ap-IE-Extensions.h \
+    S1ap-AllocationAndRetentionPriority.h    \
+    S1ap-Bearers-SubjectToStatusTransfer-List.h   \
+    S1ap-Bearers-SubjectToStatusTransfer-Item.h  \
+    S1ap-BitRate.h   \
+    S1ap-BPLMNs.h    \
+    S1ap-BroadcastCompletedAreaList.h    \
+    S1ap-Cause.h \
+    S1ap-CauseMisc.h \
+    S1ap-CauseProtocol.h \
+    S1ap-CauseRadioNetwork.h \
+    S1ap-CauseTransport.h    \
+    S1ap-CauseNas.h  \
+    S1ap-CellIdentity.h  \
+    S1ap-CellID-Broadcast.h  \
+    S1ap-CellID-Broadcast-Item.h \
+    S1ap-Cdma2000PDU.h   \
+    S1ap-Cdma2000RATType.h   \
+    S1ap-Cdma2000SectorID.h  \
+    S1ap-Cdma2000HOStatus.h  \
+    S1ap-Cdma2000HORequiredIndication.h  \
+    S1ap-Cdma2000OneXSRVCCInfo.h \
+    S1ap-Cdma2000OneXMEID.h  \
+    S1ap-Cdma2000OneXMSI.h   \
+    S1ap-Cdma2000OneXPilot.h \
+    S1ap-Cdma2000OneXRAND.h  \
+    S1ap-Cell-Size.h \
+    S1ap-CellType.h  \
+    S1ap-CGI.h   \
+    S1ap-CI.h    \
+    S1ap-CNDomain.h  \
+    S1ap-CSFallbackIndicator.h   \
+    S1ap-CSG-Id.h    \
+    S1ap-CSG-IdList.h    \
+    S1ap-CSG-IdList-Item.h   \
+    S1ap-COUNTvalue.h    \
+    S1ap-CriticalityDiagnostics.h    \
+    S1ap-CriticalityDiagnostics-IE-List.h    \
+    S1ap-CriticalityDiagnostics-IE-Item.h    \
+    S1ap-DataCodingScheme.h  \
+    S1ap-DL-Forwarding.h \
+    S1ap-Direct-Forwarding-Path-Availability.h   \
+    S1ap-E-RABToBeModifiedListBearerModReq.h \
+    S1ap-E-RABToBeModifiedItemBearerModReqIEs.h  \
+    S1ap-E-RABToBeModifiedItemBearerModReq.h \
+    S1ap-E-RABReleaseListBearerRelComp.h \
+    S1ap-E-RABReleaseItemBearerRelCompIEs.h  \
+    S1ap-E-RABReleaseItemBearerRelComp.h \
+    S1ap-E-RABSubjecttoDataForwardingList.h  \
+    S1ap-E-RABDataForwardingList.h   \
+    S1ap-E-RABDataForwardingItemIEs.h    \
+    S1ap-E-RABDataForwardingItem.h   \
+    S1ap-E-RABToBeSetupListCtxtSUReq.h   \
+    S1ap-E-RABToBeSetupItemCtxtSUReqIEs.h    \
+    S1ap-E-RABToBeSetupItemCtxtSUReq.h   \
+    S1ap-E-RABSetupListBearerSURes.h \
+    S1ap-E-RABSetupItemBearerSUResIEs.h  \
+    S1ap-E-RABSetupItemBearerSURes.h \
+    S1ap-E-RABFailedToSetupListHOReqAck.h    \
+    S1ap-E-RABFailedToSetupItemHOReqAckIEs.h \
+    S1ap-E-RABFailedToSetupItemHOReqAck.h    \
+    S1ap-E-RABToBeSetupListBearerSUReq.h \
+    S1ap-E-RABToBeSetupItemBearerSUReqIEs.h  \
+    S1ap-E-RABToBeSetupItemBearerSUReq.h \
+    S1ap-E-RABAdmittedList.h \
+    S1ap-E-RABAdmittedItemIEs.h  \
+    S1ap-E-RABAdmittedItem.h \
+    S1ap-E-RABToBeSwitchedDLList.h   \
+    S1ap-E-RABToBeSwitchedDLListIEs.h    \
+    S1ap-E-RABToBeSwitchedDLItem.h   \
+    S1ap-E-RABToBeSwitchedULList.h   \
+    S1ap-E-RABToBeSwitchedULItemIEs.h    \
+    S1ap-E-RABToBeSwitchedULItem.h   \
+    S1ap-E-RABModifyListBearerModRes.h   \
+    S1ap-E-RABModifyItemBearerModResIEs.h    \
+    S1ap-E-RABModifyItemBearerModRes.h   \
+    S1ap-E-RABSetupListCtxtSURes.h   \
+    S1ap-E-RABSetupListCtxtSUResIEs.h    \
+    S1ap-E-RABSetupItemCtxtSURes.h   \
+    S1ap-E-RABToBeSetupListHOReq.h   \
+    S1ap-E-RABToBeSetupListHOReqIEs.h    \
+    S1ap-E-RABToBeSetupItemHOReq.h   \
+    S1ap-ECGIList.h  \
+    S1ap-EmergencyAreaIDList.h   \
+    S1ap-EmergencyAreaID.h   \
+    S1ap-EmergencyAreaID-Broadcast.h \
+    S1ap-EmergencyAreaID-Broadcast-Item.h    \
+    S1ap-CompletedCellinEAI.h    \
+    S1ap-CompletedCellinEAI-Item.h   \
+    S1ap-ENB-ID.h    \
+    S1ap-GERAN-Cell-ID.h \
+    S1ap-Global-ENB-ID.h \
+    S1ap-ENB-StatusTransfer-TransparentContainer.h   \
+    S1ap-ENB-UE-S1AP-ID.h    \
+    S1ap-ENBname.h   \
+    S1ap-ENBX2TLAs.h \
+    S1ap-EncryptionAlgorithms.h  \
+    S1ap-EPLMNs.h    \
+    S1ap-EventType.h \
+    S1ap-E-RAB-ID.h  \
+    S1ap-E-RABInformationList.h  \
+    S1ap-E-RABInformationListItem.h  \
+    S1ap-E-RABList.h \
+    S1ap-E-RABItem.h \
+    S1ap-E-RABLevelQoSParameters.h   \
+    S1ap-EUTRAN-CGI.h    \
+    S1ap-ExtendedRNC-ID.h    \
+    S1ap-ForbiddenInterRATs.h    \
+    S1ap-ForbiddenTAs.h  \
+    S1ap-ForbiddenTAs-Item.h \
+    S1ap-ForbiddenTACs.h \
+    S1ap-ForbiddenLAs.h  \
+    S1ap-ForbiddenLAs-Item.h \
+    S1ap-ForbiddenLACs.h \
+    S1ap-GBR-QosInformation.h    \
+    S1ap-GTP-TEID.h  \
+    S1ap-GUMMEI.h    \
+    S1ap-HandoverRestrictionList.h   \
+    S1ap-HandoverType.h  \
+    S1ap-HFN.h   \
+    S1ap-HandoverNotify.h    \
+    S1ap-Inter-SystemInformationTransferType.h   \
+    S1ap-IMSI.h  \
+    S1ap-IntegrityProtectionAlgorithms.h \
+    S1ap-InterfacesToTrace.h \
+    S1ap-LAC.h   \
+    S1ap-LAI.h   \
+    S1ap-LastVisitedCell-Item.h  \
+    S1ap-LastVisitedEUTRANCellInformation.h  \
+    S1ap-LastVisitedUTRANCellInformation.h   \
+    S1ap-LastVisitedGERANCellInformation.h   \
+    S1ap-L3-Information.h    \
+    S1ap-MessageIdentifier.h \
+    S1ap-MMEname.h   \
+    S1ap-MME-Group-ID.h  \
+    S1ap-MME-Code.h  \
+    S1ap-MME-UE-S1AP-ID.h    \
+    S1ap-M-TMSI.h    \
+    S1ap-MSClassmark2.h  \
+    S1ap-MSClassmark3.h  \
+    S1ap-NAS-PDU.h   \
+    S1ap-NASSecurityParametersfromE-UTRAN.h  \
+    S1ap-NASSecurityParameterstoE-UTRAN.h    \
+    S1ap-NumberofBroadcastRequest.h  \
+    S1ap-NumberOfBroadcasts.h \
+    S1ap-OldBSS-ToNewBSS-Information.h   \
+    S1ap-OverloadAction.h    \
+    S1ap-OverloadResponse.h  \
+    S1ap-PagingDRX.h \
+    S1ap-PDCP-SN.h   \
+    S1ap-PLMNidentity.h  \
+    S1ap-Pre-emptionCapability.h \
+    S1ap-Pre-emptionVulnerability.h  \
+    S1ap-PriorityLevel.h \
+    S1ap-QCI.h   \
+    S1ap-ReceiveStatusofULPDCPSDUs.h \
+    S1ap-RelativeMMECapacity.h   \
+    S1ap-RAC.h   \
+    S1ap-RequestType.h   \
+    S1ap-ResetType.h \
+    S1ap-ResetAll.h  \
+    S1ap-RIMTransfer.h   \
+    S1ap-RIMInformation.h    \
+    S1ap-RIMRoutingAddress.h \
+    S1ap-ReportArea.h    \
+    S1ap-RepetitionPeriod.h  \
+    S1ap-RNC-ID.h    \
+    S1ap-RRC-Container.h \
+    S1ap-RRC-Establishment-Cause.h   \
+    S1ap-SecurityKey.h   \
+    S1ap-SecurityContext.h   \
+    S1ap-SerialNumber.h  \
+    S1ap-SONInformation.h    \
+    S1ap-SONInformationRequest.h \
+    S1ap-SONInformationReply.h   \
+    S1ap-SONConfigurationTransfer.h  \
+    S1ap-Source-ToTarget-TransparentContainer.h  \
+    S1ap-SourceBSS-ToTargetBSS-TransparentContainer.h    \
+    S1ap-SourceeNB-ID.h  \
+    S1ap-SRVCCOperationPossible.h    \
+    S1ap-SRVCCHOIndication.h \
+    S1ap-SourceeNB-ToTargeteNB-TransparentContainer.h    \
+    S1ap-SourceRNC-ToTargetRNC-TransparentContainer.h    \
+    S1ap-ServedGUMMEIs.h \
+    S1ap-ServedGUMMEIsItem.h \
+    S1ap-ServedGroupIDs.h    \
+    S1ap-ServedMMECs.h   \
+    S1ap-ServedPLMNs.h   \
+    S1ap-SubscriberProfileIDforRFP.h \
+    S1ap-SupportedTAs.h  \
+    S1ap-SupportedTAs-Item.h \
+    S1ap-S-TMSI.h    \
+    S1ap-TAC.h   \
+    S1ap-TAIListforWarning.h \
+    S1ap-TAIList.h   \
+    S1ap-TAIItem.h   \
+    S1ap-TAI.h   \
+    S1ap-TAI-Broadcast.h \
+    S1ap-TAI-Broadcast-Item.h    \
+    S1ap-CompletedCellinTAI.h    \
+    S1ap-CompletedCellinTAI-Item.h   \
+    S1ap-TBCD-STRING.h   \
+    S1ap-TargetID.h  \
+    S1ap-TargeteNB-ID.h  \
+    S1ap-TargetRNC-ID.h  \
+    S1ap-TargeteNB-ToSourceeNB-TransparentContainer.h    \
+    S1ap-Target-ToSource-TransparentContainer.h  \
+    S1ap-TargetRNC-ToSourceRNC-TransparentContainer.h    \
+    S1ap-TargetBSS-ToSourceBSS-TransparentContainer.h    \
+    S1ap-TimeToWait.h    \
+    S1ap-Time-UE-StayedInCell.h  \
+    S1ap-TransportLayerAddress.h \
+    S1ap-TraceActivation.h   \
+    S1ap-TraceDepth.h    \
+    S1ap-E-UTRAN-Trace-ID.h  \
+    S1ap-TypeOfError.h   \
+    S1ap-UEAggregateMaximumBitrate.h \
+    S1ap-UE-S1AP-IDs.h   \
+    S1ap-UE-S1AP-ID-pair.h   \
+    S1ap-UE-associatedLogicalS1-ConnectionListRes.h  \
+    S1ap-UE-associatedLogicalS1-ConnectionListResAck.h   \
+    S1ap-UE-associatedLogicalS1-ConnectionItem.h \
+    S1ap-UEIdentityIndexValue.h  \
+    S1ap-UE-HistoryInformation.h \
+    S1ap-UEPagingID.h    \
+    S1ap-UERadioCapability.h \
+    S1ap-UESecurityCapabilities.h    \
+    S1ap-WarningAreaList.h   \
+    S1ap-WarningType.h   \
+    S1ap-WarningSecurityInfo.h   \
+    S1ap-WarningMessageContents.h    \
+    S1ap-X2TNLConfigurationInfo.h    \
     S1AP-PDU.h  \
-    InitiatingMessage.h \
-    SuccessfulOutcome.h \
-    UnsuccessfulOutcome.h   \
-    HandoverRequired.h  \
-    HandoverCommand.h   \
-    HandoverPreparationFailure.h    \
-    HandoverRequest.h   \
-    HandoverRequestAcknowledge.h    \
-    HandoverFailure.h   \
-    HandoverNotify.h \
-    PathSwitchRequest.h \
-    PathSwitchRequestAcknowledge.h  \
-    PathSwitchRequestFailure.h  \
-    E-RABSetupRequest.h \
-    E-RABSetupResponse.h    \
-    E-RABModifyRequest.h    \
-    E-RABModifyResponse.h   \
-    E-RABReleaseIndication.h    \
-    E-RABReleaseCommand.h   \
-    E-RABReleaseResponse.h  \
-    InitialContextSetupRequest.h    \
-    InitialContextSetupResponse.h   \
-    InitialContextSetupFailure.h    \
-    UEContextReleaseRequest.h   \
-    Paging.h    \
-    DownlinkNASTransport.h  \
-    InitialUEMessage.h  \
-    UplinkNASTransport.h    \
-    NASNonDeliveryIndication.h  \
-    HandoverCancel.h    \
-    HandoverCancelAcknowledge.h \
-    Reset.h \
-    ResetAcknowledge.h  \
-    S1SetupResponse.h   \
-    S1SetupRequest.h    \
-    S1SetupFailure.h    \
-    ErrorIndication.h   \
-    ENBConfigurationUpdate.h    \
-    ENBConfigurationUpdateAcknowledge.h \
-    ENBConfigurationUpdateFailure.h \
-    MMEConfigurationUpdate.h    \
-    MMEConfigurationUpdateAcknowledge.h \
-    MMEConfigurationUpdateFailure.h \
-    DownlinkS1cdma2000tunneling.h   \
-    UplinkS1cdma2000tunneling.h \
-    UEContextModificationRequest.h  \
-    UEContextModificationResponse.h \
-    UEContextModificationFailure.h  \
-    UECapabilityInfoIndication.h    \
-    UEContextReleaseCommand.h   \
-    UEContextReleaseComplete.h  \
-    ENBStatusTransfer.h \
-    MMEStatusTransfer.h \
-    DeactivateTrace.h   \
-    TraceStart.h    \
-    TraceFailureIndication.h    \
-    CellTrafficTrace.h  \
-    LocationReportingControl.h  \
-    LocationReportingFailureIndication.h    \
-    LocationReport.h    \
-    OverloadStart.h \
-    OverloadStop.h  \
-    WriteReplaceWarningRequest.h    \
-    WriteReplaceWarningResponse.h   \
-    ENBDirectInformationTransfer.h  \
-    MMEDirectInformationTransfer.h  \
-    ENBConfigurationTransfer.h  \
-    MMEConfigurationTransfer.h  \
-    PrivateMessage.h    \
-    IE.h
+    S1ap-InitiatingMessage.h \
+    S1ap-SuccessfulOutcome.h \
+    S1ap-UnsuccessfulOutcome.h   \
+    S1ap-HandoverRequired.h  \
+    S1ap-HandoverCommand.h   \
+    S1ap-HandoverPreparationFailure.h    \
+    S1ap-HandoverRequest.h   \
+    S1ap-HandoverRequestAcknowledge.h    \
+    S1ap-HandoverFailure.h   \
+    S1ap-HandoverNotify.h \
+    S1ap-PathSwitchRequest.h \
+    S1ap-PathSwitchRequestAcknowledge.h  \
+    S1ap-PathSwitchRequestFailure.h  \
+    S1ap-E-RABSetupRequest.h \
+    S1ap-E-RABSetupResponse.h    \
+    S1ap-E-RABModifyRequest.h    \
+    S1ap-E-RABModifyResponse.h   \
+    S1ap-E-RABReleaseIndication.h    \
+    S1ap-E-RABReleaseCommand.h   \
+    S1ap-E-RABReleaseResponse.h  \
+    S1ap-InitialContextSetupRequest.h    \
+    S1ap-InitialContextSetupResponse.h   \
+    S1ap-InitialContextSetupFailure.h    \
+    S1ap-UEContextReleaseRequest.h   \
+    S1ap-Paging.h    \
+    S1ap-DownlinkNASTransport.h  \
+    S1ap-InitialUEMessage.h  \
+    S1ap-UplinkNASTransport.h    \
+    S1ap-NASNonDeliveryIndication.h  \
+    S1ap-HandoverCancel.h    \
+    S1ap-HandoverCancelAcknowledge.h \
+    S1ap-Reset.h \
+    S1ap-ResetAcknowledge.h  \
+    S1ap-S1SetupResponse.h   \
+    S1ap-S1SetupRequest.h    \
+    S1ap-S1SetupFailure.h    \
+    S1ap-ErrorIndication.h   \
+    S1ap-ENBConfigurationUpdate.h    \
+    S1ap-ENBConfigurationUpdateAcknowledge.h \
+    S1ap-ENBConfigurationUpdateFailure.h \
+    S1ap-MMEConfigurationUpdate.h    \
+    S1ap-MMEConfigurationUpdateAcknowledge.h \
+    S1ap-MMEConfigurationUpdateFailure.h \
+    S1ap-DownlinkS1cdma2000tunneling.h   \
+    S1ap-UplinkS1cdma2000tunneling.h \
+    S1ap-UEContextModificationRequest.h  \
+    S1ap-UEContextModificationResponse.h \
+    S1ap-UEContextModificationFailure.h  \
+    S1ap-UECapabilityInfoIndication.h    \
+    S1ap-UEContextReleaseCommand.h   \
+    S1ap-UEContextReleaseComplete.h  \
+    S1ap-ENBStatusTransfer.h \
+    S1ap-MMEStatusTransfer.h \
+    S1ap-DeactivateTrace.h   \
+    S1ap-TraceStart.h    \
+    S1ap-TraceFailureIndication.h    \
+    S1ap-CellTrafficTrace.h  \
+    S1ap-LocationReportingControl.h  \
+    S1ap-LocationReportingFailureIndication.h    \
+    S1ap-LocationReport.h    \
+    S1ap-OverloadStart.h \
+    S1ap-OverloadStop.h  \
+    S1ap-WriteReplaceWarningRequest.h    \
+    S1ap-WriteReplaceWarningResponse.h   \
+    S1ap-ENBDirectInformationTransfer.h  \
+    S1ap-MMEDirectInformationTransfer.h  \
+    S1ap-ENBConfigurationTransfer.h  \
+    S1ap-MMEConfigurationTransfer.h  \
+    S1ap-PrivateMessage.h    \
+    S1ap-IE.h
 
 ifdef UPDATE_RELEASE_9
 S1AP_ASN_MODULE_SOURCES += \
-    KillResponse.o  \
-    KillRequest.o   \
-    Data-Forwarding-Not-Possible.o  \
-    DownlinkUEAssociatedLPPaTransport.o \
-    UplinkUEAssociatedLPPaTransport.o   \
-    DownlinkNonUEAssociatedLPPaTransport.o  \
-    UplinkNonUEAssociatedLPPaTransport.o    \
-    TAI-Cancelled.o \
-    TAI-Cancelled-Item.o    \
-    StratumLevel.o  \
-    SynchronizationStatus.o \
-    TimeSynchronizationInfo.o   \
-    Routing-ID.o    \
-    PS-ServiceNotAvailable.o    \
-    LPPa-PDU.o  \
-    ExtendedRepetitionPeriod.o  \
-    EUTRANRoundTripDelayEstimationInfo.o    \
-    EmergencyAreaID-Cancelled.o \
-    EmergencyAreaID-Cancelled-Item.o    \
-    CSGMembershipStatus.o   \
-    ConcurrentWarningMessageIndicator.o \
-    CellID-Cancelled.o  \
-    CellID-Cancelled-Item.o \
-    CellAccessMode.o    \
-    CancelledCellinEAI.o    \
-    CancelledCellinEAI-Item.o   \
-    CancelledCellinTAI.o    \
-    CancelledCellinTAI-Item.o   \
-    BroadcastCancelledAreaList.o
+    S1ap-KillResponse.o  \
+    S1ap-KillRequest.o   \
+    S1ap-Data-Forwarding-Not-Possible.o  \
+    S1ap-DownlinkUEAssociatedLPPaTransport.o \
+    S1ap-UplinkUEAssociatedLPPaTransport.o   \
+    S1ap-DownlinkNonUEAssociatedLPPaTransport.o  \
+    S1ap-UplinkNonUEAssociatedLPPaTransport.o    \
+    S1ap-TAI-Cancelled.o \
+    S1ap-TAI-Cancelled-Item.o    \
+    S1ap-StratumLevel.o  \
+    S1ap-SynchronizationStatus.o \
+    S1ap-TimeSynchronizationInfo.o   \
+    S1ap-Routing-ID.o    \
+    S1ap-PS-ServiceNotAvailable.o    \
+    S1ap-LPPa-PDU.o  \
+    S1ap-ExtendedRepetitionPeriod.o  \
+    S1ap-EUTRANRoundTripDelayEstimationInfo.o    \
+    S1ap-EmergencyAreaID-Cancelled.o \
+    S1ap-EmergencyAreaID-Cancelled-Item.o    \
+    S1ap-CSGMembershipStatus.o   \
+    S1ap-ConcurrentWarningMessageIndicator.o \
+    S1ap-CellID-Cancelled.o  \
+    S1ap-CellID-Cancelled-Item.o \
+    S1ap-CellAccessMode.o    \
+    S1ap-CancelledCellinEAI.o    \
+    S1ap-CancelledCellinEAI-Item.o   \
+    S1ap-CancelledCellinTAI.o    \
+    S1ap-CancelledCellinTAI-Item.o   \
+    S1ap-BroadcastCancelledAreaList.o
 
 S1AP_ASN_MODULE_HEADERS += \
-    BroadcastCancelledAreaList.h    \
-    CancelledCellinEAI.h    \
-    CancelledCellinEAI-Item.h   \
-    CancelledCellinTAI.h    \
-    CancelledCellinTAI-Item.h   \
-    CellAccessMode.h    \
-    CellID-Cancelled.h  \
-    CellID-Cancelled-Item.h \
-    ConcurrentWarningMessageIndicator.h \
-    CSGMembershipStatus.h   \
-    Data-Forwarding-Not-Possible.h  \
-    EmergencyAreaID-Cancelled.h \
-    EmergencyAreaID-Cancelled-Item.h    \
-    E-RABList.h \
-    EUTRANRoundTripDelayEstimationInfo.h    \
-    ExtendedRepetitionPeriod.h  \
-    LPPa-PDU.h  \
-    PS-ServiceNotAvailable.h    \
-    Routing-ID.h    \
-    StratumLevel.h  \
-    SynchronizationStatus.h \
-    TimeSynchronizationInfo.h   \
-    TAI-Cancelled.h \
-    TAI-Cancelled-Item.h    \
-    KillResponse.h  \
-    KillRequest.h   \
-    DownlinkUEAssociatedLPPaTransport.h \
-    UplinkUEAssociatedLPPaTransport.h   \
-    DownlinkNonUEAssociatedLPPaTransport.h  \
-    UplinkNonUEAssociatedLPPaTransport.h
+    S1ap-BroadcastCancelledAreaList.h    \
+    S1ap-CancelledCellinEAI.h    \
+    S1ap-CancelledCellinEAI-Item.h   \
+    S1ap-CancelledCellinTAI.h    \
+    S1ap-CancelledCellinTAI-Item.h   \
+    S1ap-CellAccessMode.h    \
+    S1ap-CellID-Cancelled.h  \
+    S1ap-CellID-Cancelled-Item.h \
+    S1ap-ConcurrentWarningMessageIndicator.h \
+    S1ap-CSGMembershipStatus.h   \
+    S1ap-Data-Forwarding-Not-Possible.h  \
+    S1ap-EmergencyAreaID-Cancelled.h \
+    S1ap-EmergencyAreaID-Cancelled-Item.h    \
+    S1ap-E-RABList.h \
+    S1ap-EUTRANRoundTripDelayEstimationInfo.h    \
+    S1ap-ExtendedRepetitionPeriod.h  \
+    S1ap-LPPa-PDU.h  \
+    S1ap-PS-ServiceNotAvailable.h    \
+    S1ap-Routing-ID.h    \
+    S1ap-StratumLevel.h  \
+    S1ap-SynchronizationStatus.h \
+    S1ap-TimeSynchronizationInfo.h   \
+    S1ap-TAI-Cancelled.h \
+    S1ap-TAI-Cancelled-Item.h    \
+    S1ap-KillResponse.h  \
+    S1ap-KillRequest.h   \
+    S1ap-DownlinkUEAssociatedLPPaTransport.h \
+    S1ap-UplinkUEAssociatedLPPaTransport.h   \
+    S1ap-DownlinkNonUEAssociatedLPPaTransport.h  \
+    S1ap-UplinkNonUEAssociatedLPPaTransport.h
 endif
 
 ifdef UPDATE_RELEASE_10
 S1AP_ASN_MODULE_SOURCES += \
-    PagingPriority.o    \
-    RelayNode-Indicator.o   \
-    GWContextReleaseIndication.o    \
-    MMERelaySupportIndicator.o  \
-    ManagementBasedMDTAllowed.o \
-    PrivacyIndicator.o  \
-    TrafficLoadReductionIndication.o    \
-    GUMMEIList.o
+    S1ap-PagingPriority.o    \
+    S1ap-RelayNode-Indicator.o   \
+    S1ap-GWContextReleaseIndication.o    \
+    S1ap-MMERelaySupportIndicator.o  \
+    S1ap-ManagementBasedMDTAllowed.o \
+    S1ap-PrivacyIndicator.o  \
+    S1ap-TrafficLoadReductionIndication.o    \
+    S1ap-GUMMEIList.o
 
 S1AP_ASN_MODULE_HEADERS += \
-    PagingPriority.h    \
-    RelayNode-Indicator.h   \
-    GWContextReleaseIndication.h    \
-    MMERelaySupportIndicator.h  \
-    ManagementBasedMDTAllowed.h \
-    PrivacyIndicator.h  \
-    TrafficLoadReductionIndication.h    \
-    GUMMEIList.h
+    S1ap-PagingPriority.h    \
+    S1ap-RelayNode-Indicator.h   \
+    S1ap-GWContextReleaseIndication.h    \
+    S1ap-MMERelaySupportIndicator.h  \
+    S1ap-ManagementBasedMDTAllowed.h \
+    S1ap-PrivacyIndicator.h  \
+    S1ap-TrafficLoadReductionIndication.h    \
+    S1ap-GUMMEIList.h
 endif
 
 S1AP_ASN_MODULE_HEADERS+=ANY.h
diff --git a/openair-cn/S1AP/Makefile.eNB b/openair-cn/S1AP/Makefile.eNB
index e3b8daffabaa6c627ac29a62f3cd51c6e0f5e513..897d1cf045d67489cea298c25b31e7a9237c69ca 100644
--- a/openair-cn/S1AP/Makefile.eNB
+++ b/openair-cn/S1AP/Makefile.eNB
@@ -73,6 +73,8 @@ $(S1AP_OBJDIR)/s1ap_asn1regen.stamp: $(ASN1DIR)/$(ASN1RELDIR)/S1AP-CommonDataTyp
 	(cd $(ASN1MESSAGESDIR) && asn1c -fhave_native64 -gen-PER $^)
 	echo Timestamp > $@
 
+.INTERMEDIATE = $(S1AP_OBJDIR)/s1ap_ieregen.stamp $(S1AP_OBJDIR)/s1ap_asn1regen.stamp
+
 libs1ap.a: $(S1AP_OBJDIR)/s1ap_ieregen.stamp $(S1AP_OBJDIR)/s1ap_asn1regen.stamp $(libs1ap_OBJECTS)
 	@echo Creating S1AP archive
 	@$(AR) rcs $@ $(libs1ap_OBJECTS)
diff --git a/openair-cn/S1AP/s1ap_common.c b/openair-cn/S1AP/s1ap_common.c
index 4364ef1b9f8f73294f0d9dc9692e119ab70d0071..017589487e26fb4edcb415f7f9128aeb76c92f9b 100644
--- a/openair-cn/S1AP/s1ap_common.c
+++ b/openair-cn/S1AP/s1ap_common.c
@@ -62,8 +62,8 @@ inline void ASN_DEBUG(const char *fmt, ...)
 ssize_t s1ap_generate_initiating_message(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode    procedureCode,
+    S1ap_Criticality_t      criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr)
 {
@@ -96,8 +96,8 @@ ssize_t s1ap_generate_initiating_message(
 ssize_t s1ap_generate_successfull_outcome(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode         procedureCode,
+    S1ap_Criticality_t           criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr)
 {
@@ -131,8 +131,8 @@ ssize_t s1ap_generate_successfull_outcome(
 ssize_t s1ap_generate_unsuccessfull_outcome(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode         procedureCode,
+    S1ap_Criticality_t           criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr)
 {
@@ -163,19 +163,19 @@ ssize_t s1ap_generate_unsuccessfull_outcome(
     return encoded;
 }
 
-IE_t *s1ap_new_ie(
-    ProtocolIE_ID_t        id,
-    Criticality_t          criticality,
+S1ap_IE_t *s1ap_new_ie(
+    S1ap_ProtocolIE_ID_t   id,
+    S1ap_Criticality_t     criticality,
     asn_TYPE_descriptor_t *type,
     void                  *sptr)
 {
-    IE_t *buff;
+    S1ap_IE_t *buff;
 
-    if ((buff = malloc(sizeof(IE_t))) == NULL) {
+    if ((buff = malloc(sizeof(S1ap_IE_t))) == NULL) {
         // Possible error on malloc
         return NULL;
     }
-    memset((void *)buff, 0, sizeof(IE_t));
+    memset((void *)buff, 0, sizeof(S1ap_IE_t));
 
     buff->id = id;
     buff->criticality = criticality;
@@ -187,7 +187,7 @@ IE_t *s1ap_new_ie(
     }
 
     if (asn1_xer_print)
-        if (xer_fprint(stdout, &asn_DEF_IE, buff) < 0) {
+        if (xer_fprint(stdout, &asn_DEF_S1ap_IE, buff) < 0) {
             free(buff);
             return NULL;
         }
@@ -195,7 +195,7 @@ IE_t *s1ap_new_ie(
     return buff;
 }
 
-void s1ap_handle_criticality(e_Criticality criticality)
+void s1ap_handle_criticality(S1ap_Criticality_t criticality)
 {
 
 }
diff --git a/openair-cn/S1AP/s1ap_common.h b/openair-cn/S1AP/s1ap_common.h
index a8ef931417e64eaddde4dd0c5239a733af4a1d3b..12060deacd7d5e364a6a6fbd9ed9a260c7907c92 100644
--- a/openair-cn/S1AP/s1ap_common.h
+++ b/openair-cn/S1AP/s1ap_common.h
@@ -48,342 +48,342 @@ extern int asn_debug;
 inline void ASN_DEBUG(const char *fmt, ...);
 #endif
 
-#include "Criticality.h"
-#include "Presence.h"
-#include "PrivateIE-ID.h"
-#include "ProcedureCode.h"
-#include "ProtocolExtensionID.h"
-#include "ProtocolIE-ID.h"
-#include "TriggeringMessage.h"
-#include "AllocationAndRetentionPriority.h"
-#include "Bearers-SubjectToStatusTransfer-List.h"
-#include "Bearers-SubjectToStatusTransfer-Item.h"
-#include "BitRate.h"
-#include "BPLMNs.h"
-#include "BroadcastCompletedAreaList.h"
-#include "Cause.h"
-#include "CauseMisc.h"
-#include "CauseProtocol.h"
-#include "CauseRadioNetwork.h"
-#include "CauseTransport.h"
-#include "CauseNas.h"
-#include "CellIdentity.h"
-#include "CellID-Broadcast.h"
-#include "CellID-Broadcast-Item.h"
-#include "Cdma2000PDU.h"
-#include "Cdma2000RATType.h"
-#include "Cdma2000SectorID.h"
-#include "Cdma2000HOStatus.h"
-#include "Cdma2000HORequiredIndication.h"
-#include "Cdma2000OneXSRVCCInfo.h"
-#include "Cdma2000OneXMEID.h"
-#include "Cdma2000OneXMSI.h"
-#include "Cdma2000OneXPilot.h"
-#include "Cdma2000OneXRAND.h"
-#include "Cell-Size.h"
-#include "CellType.h"
-#include "CGI.h"
-#include "CI.h"
-#include "CNDomain.h"
-#include "CSFallbackIndicator.h"
-#include "CSG-Id.h"
-#include "CSG-IdList.h"
-#include "CSG-IdList-Item.h"
-#include "COUNTvalue.h"
-#include "CriticalityDiagnostics.h"
-#include "CriticalityDiagnostics-IE-List.h"
-#include "CriticalityDiagnostics-IE-Item.h"
-#include "DataCodingScheme.h"
-#include "DL-Forwarding.h"
-#include "Direct-Forwarding-Path-Availability.h"
-#include "ECGIList.h"
-#include "EmergencyAreaIDList.h"
-#include "EmergencyAreaID.h"
-#include "EmergencyAreaID-Broadcast.h"
-#include "EmergencyAreaID-Broadcast-Item.h"
-#include "CompletedCellinEAI.h"
-#include "CompletedCellinEAI-Item.h"
-#include "ENB-ID.h"
-#include "GERAN-Cell-ID.h"
-#include "Global-ENB-ID.h"
-#include "ENB-StatusTransfer-TransparentContainer.h"
-#include "ENB-UE-S1AP-ID.h"
-#include "ENBname.h"
-#include "ENBX2TLAs.h"
-#include "EncryptionAlgorithms.h"
-#include "EPLMNs.h"
-#include "EventType.h"
-#include "E-RAB-ID.h"
-#include "E-RABInformationList.h"
-#include "E-RABInformationListItem.h"
-#include "E-RABList.h"
-#include "E-RABItem.h"
-#include "E-RABLevelQoSParameters.h"
-#include "EUTRAN-CGI.h"
-#include "ExtendedRNC-ID.h"
-#include "ForbiddenInterRATs.h"
-#include "ForbiddenTAs.h"
-#include "ForbiddenTAs-Item.h"
-#include "ForbiddenTACs.h"
-#include "ForbiddenLAs.h"
-#include "ForbiddenLAs-Item.h"
-#include "ForbiddenLACs.h"
-#include "GBR-QosInformation.h"
-#include "GTP-TEID.h"
-#include "GUMMEI.h"
-#include "HandoverRestrictionList.h"
-#include "HandoverType.h"
-#include "HFN.h"
-#include "IMSI.h"
-#include "IntegrityProtectionAlgorithms.h"
-#include "InterfacesToTrace.h"
-#include "LAC.h"
-#include "LAI.h"
-#include "LastVisitedCell-Item.h"
-#include "LastVisitedEUTRANCellInformation.h"
-#include "LastVisitedUTRANCellInformation.h"
-#include "LastVisitedGERANCellInformation.h"
-#include "L3-Information.h"
-#include "MessageIdentifier.h"
-#include "MMEname.h"
-#include "MME-Group-ID.h"
-#include "MME-Code.h"
-#include "MME-UE-S1AP-ID.h"
-#include "M-TMSI.h"
-#include "MSClassmark2.h"
-#include "MSClassmark3.h"
-#include "NAS-PDU.h"
-#include "NASSecurityParametersfromE-UTRAN.h"
-#include "NASSecurityParameterstoE-UTRAN.h"
-#include "NumberofBroadcastRequest.h"
-#include "NumberOfBroadcasts.h"
-#include "OldBSS-ToNewBSS-Information.h"
-#include "OverloadAction.h"
-#include "OverloadResponse.h"
-#include "PagingDRX.h"
-#include "PDCP-SN.h"
-#include "PLMNidentity.h"
-#include "Pre-emptionCapability.h"
-#include "Pre-emptionVulnerability.h"
-#include "PriorityLevel.h"
-#include "QCI.h"
-#include "ReceiveStatusofULPDCPSDUs.h"
-#include "RelativeMMECapacity.h"
-#include "RAC.h"
-#include "RequestType.h"
-#include "RIMTransfer.h"
-#include "RIMInformation.h"
-#include "RIMRoutingAddress.h"
-#include "ReportArea.h"
-#include "RepetitionPeriod.h"
-#include "RNC-ID.h"
-#include "RRC-Container.h"
-#include "RRC-Establishment-Cause.h"
-#include "SecurityKey.h"
-#include "SecurityContext.h"
-#include "SerialNumber.h"
-#include "SONInformation.h"
-#include "SONInformationRequest.h"
-#include "SONInformationReply.h"
-#include "SONConfigurationTransfer.h"
-#include "Source-ToTarget-TransparentContainer.h"
-#include "SourceBSS-ToTargetBSS-TransparentContainer.h"
-#include "SourceeNB-ID.h"
-#include "SRVCCOperationPossible.h"
-#include "SRVCCHOIndication.h"
-#include "SourceeNB-ToTargeteNB-TransparentContainer.h"
-#include "SourceRNC-ToTargetRNC-TransparentContainer.h"
-#include "ServedGUMMEIs.h"
-#include "ServedGUMMEIsItem.h"
-#include "ServedGroupIDs.h"
-#include "ServedMMECs.h"
-#include "ServedPLMNs.h"
-#include "SubscriberProfileIDforRFP.h"
-#include "SupportedTAs.h"
-#include "SupportedTAs-Item.h"
-#include "S-TMSI.h"
-#include "TAC.h"
-#include "TAIItem.h"
-#include "TAIList.h"
-#include "TAIListforWarning.h"
-#include "TAI.h"
-#include "TAI-Broadcast.h"
-#include "TAI-Broadcast-Item.h"
-#include "CompletedCellinTAI.h"
-#include "CompletedCellinTAI-Item.h"
-#include "TBCD-STRING.h"
-#include "TargetID.h"
-#include "TargeteNB-ID.h"
-#include "TargetRNC-ID.h"
-#include "TargeteNB-ToSourceeNB-TransparentContainer.h"
-#include "Target-ToSource-TransparentContainer.h"
-#include "TargetRNC-ToSourceRNC-TransparentContainer.h"
-#include "TargetBSS-ToSourceBSS-TransparentContainer.h"
-#include "TimeToWait.h"
-#include "Time-UE-StayedInCell.h"
-#include "TransportLayerAddress.h"
-#include "TraceActivation.h"
-#include "TraceDepth.h"
-#include "E-UTRAN-Trace-ID.h"
-#include "TypeOfError.h"
-#include "UEAggregateMaximumBitrate.h"
-#include "UE-S1AP-IDs.h"
-#include "UE-S1AP-ID-pair.h"
-#include "UE-associatedLogicalS1-ConnectionItem.h"
-#include "UEIdentityIndexValue.h"
-#include "UE-HistoryInformation.h"
-#include "UEPagingID.h"
-#include "UERadioCapability.h"
-#include "UESecurityCapabilities.h"
-#include "WarningAreaList.h"
-#include "WarningType.h"
-#include "WarningSecurityInfo.h"
-#include "WarningMessageContents.h"
-#include "X2TNLConfigurationInfo.h"
+#include "S1ap-Criticality.h"
+#include "S1ap-Presence.h"
+#include "S1ap-PrivateIE-ID.h"
+#include "S1ap-ProcedureCode.h"
+#include "S1ap-ProtocolExtensionID.h"
+#include "S1ap-ProtocolIE-ID.h"
+#include "S1ap-TriggeringMessage.h"
+#include "S1ap-AllocationAndRetentionPriority.h"
+#include "S1ap-Bearers-SubjectToStatusTransfer-List.h"
+#include "S1ap-Bearers-SubjectToStatusTransfer-Item.h"
+#include "S1ap-BitRate.h"
+#include "S1ap-BPLMNs.h"
+#include "S1ap-BroadcastCompletedAreaList.h"
+#include "S1ap-Cause.h"
+#include "S1ap-CauseMisc.h"
+#include "S1ap-CauseProtocol.h"
+#include "S1ap-CauseRadioNetwork.h"
+#include "S1ap-CauseTransport.h"
+#include "S1ap-CauseNas.h"
+#include "S1ap-CellIdentity.h"
+#include "S1ap-CellID-Broadcast.h"
+#include "S1ap-CellID-Broadcast-Item.h"
+#include "S1ap-Cdma2000PDU.h"
+#include "S1ap-Cdma2000RATType.h"
+#include "S1ap-Cdma2000SectorID.h"
+#include "S1ap-Cdma2000HOStatus.h"
+#include "S1ap-Cdma2000HORequiredIndication.h"
+#include "S1ap-Cdma2000OneXSRVCCInfo.h"
+#include "S1ap-Cdma2000OneXMEID.h"
+#include "S1ap-Cdma2000OneXMSI.h"
+#include "S1ap-Cdma2000OneXPilot.h"
+#include "S1ap-Cdma2000OneXRAND.h"
+#include "S1ap-Cell-Size.h"
+#include "S1ap-CellType.h"
+#include "S1ap-CGI.h"
+#include "S1ap-CI.h"
+#include "S1ap-CNDomain.h"
+#include "S1ap-CSFallbackIndicator.h"
+#include "S1ap-CSG-Id.h"
+#include "S1ap-CSG-IdList.h"
+#include "S1ap-CSG-IdList-Item.h"
+#include "S1ap-COUNTvalue.h"
+#include "S1ap-DataCodingScheme.h"
+#include "S1ap-DL-Forwarding.h"
+#include "S1ap-Direct-Forwarding-Path-Availability.h"
+#include "S1ap-ECGIList.h"
+#include "S1ap-EmergencyAreaIDList.h"
+#include "S1ap-EmergencyAreaID.h"
+#include "S1ap-EmergencyAreaID-Broadcast.h"
+#include "S1ap-EmergencyAreaID-Broadcast-Item.h"
+#include "S1ap-CompletedCellinEAI.h"
+#include "S1ap-CompletedCellinEAI-Item.h"
+#include "S1ap-ENB-ID.h"
+#include "S1ap-GERAN-Cell-ID.h"
+#include "S1ap-Global-ENB-ID.h"
+#include "S1ap-ENB-StatusTransfer-TransparentContainer.h"
+#include "S1ap-ENBname.h"
+#include "S1ap-ENBX2TLAs.h"
+#include "S1ap-EncryptionAlgorithms.h"
+#include "S1ap-EPLMNs.h"
+#include "S1ap-EventType.h"
+#include "S1ap-E-RAB-ID.h"
+#include "S1ap-E-RABInformationList.h"
+#include "S1ap-E-RABInformationListItem.h"
+#include "S1ap-E-RABList.h"
+#include "S1ap-E-RABItem.h"
+#include "S1ap-E-RABLevelQoSParameters.h"
+#include "S1ap-EUTRAN-CGI.h"
+#include "S1ap-ExtendedRNC-ID.h"
+#include "S1ap-ForbiddenInterRATs.h"
+#include "S1ap-ForbiddenTAs.h"
+#include "S1ap-ForbiddenTAs-Item.h"
+#include "S1ap-ForbiddenTACs.h"
+#include "S1ap-ForbiddenLAs.h"
+#include "S1ap-ForbiddenLAs-Item.h"
+#include "S1ap-ForbiddenLACs.h"
+#include "S1ap-GBR-QosInformation.h"
+#include "S1ap-GTP-TEID.h"
+#include "S1ap-GUMMEI.h"
+#include "S1ap-HandoverRestrictionList.h"
+#include "S1ap-HandoverType.h"
+#include "S1ap-HFN.h"
+#include "S1ap-IMSI.h"
+#include "S1ap-IntegrityProtectionAlgorithms.h"
+#include "S1ap-InterfacesToTrace.h"
+#include "S1ap-LAC.h"
+#include "S1ap-LAI.h"
+#include "S1ap-LastVisitedCell-Item.h"
+#include "S1ap-LastVisitedEUTRANCellInformation.h"
+#include "S1ap-LastVisitedUTRANCellInformation.h"
+#include "S1ap-LastVisitedGERANCellInformation.h"
+#include "S1ap-L3-Information.h"
+#include "S1ap-MessageIdentifier.h"
+#include "S1ap-MMEname.h"
+#include "S1ap-MME-Group-ID.h"
+#include "S1ap-MME-Code.h"
+#include "S1ap-M-TMSI.h"
+#include "S1ap-MSClassmark2.h"
+#include "S1ap-MSClassmark3.h"
+#include "S1ap-NAS-PDU.h"
+#include "S1ap-NASSecurityParametersfromE-UTRAN.h"
+#include "S1ap-NASSecurityParameterstoE-UTRAN.h"
+#include "S1ap-NumberofBroadcastRequest.h"
+#include "S1ap-NumberOfBroadcasts.h"
+#include "S1ap-OldBSS-ToNewBSS-Information.h"
+#include "S1ap-OverloadAction.h"
+#include "S1ap-OverloadResponse.h"
+#include "S1ap-PagingDRX.h"
+#include "S1ap-PDCP-SN.h"
+#include "S1ap-PLMNidentity.h"
+#include "S1ap-Pre-emptionCapability.h"
+#include "S1ap-Pre-emptionVulnerability.h"
+#include "S1ap-PriorityLevel.h"
+#include "S1ap-QCI.h"
+#include "S1ap-ReceiveStatusofULPDCPSDUs.h"
+#include "S1ap-RelativeMMECapacity.h"
+#include "S1ap-RAC.h"
+#include "S1ap-RequestType.h"
+#include "S1ap-RIMTransfer.h"
+#include "S1ap-RIMInformation.h"
+#include "S1ap-RIMRoutingAddress.h"
+#include "S1ap-ReportArea.h"
+#include "S1ap-RepetitionPeriod.h"
+#include "S1ap-RNC-ID.h"
+#include "S1ap-RRC-Container.h"
+#include "S1ap-RRC-Establishment-Cause.h"
+#include "S1ap-SecurityKey.h"
+#include "S1ap-SecurityContext.h"
+#include "S1ap-SerialNumber.h"
+#include "S1ap-SONInformation.h"
+#include "S1ap-SONInformationRequest.h"
+#include "S1ap-SONInformationReply.h"
+#include "S1ap-SONConfigurationTransfer.h"
+#include "S1ap-Source-ToTarget-TransparentContainer.h"
+#include "S1ap-SourceBSS-ToTargetBSS-TransparentContainer.h"
+#include "S1ap-SourceeNB-ID.h"
+#include "S1ap-SRVCCOperationPossible.h"
+#include "S1ap-SRVCCHOIndication.h"
+#include "S1ap-SourceeNB-ToTargeteNB-TransparentContainer.h"
+#include "S1ap-SourceRNC-ToTargetRNC-TransparentContainer.h"
+#include "S1ap-ServedGUMMEIs.h"
+#include "S1ap-ServedGUMMEIsItem.h"
+#include "S1ap-ServedGroupIDs.h"
+#include "S1ap-ServedMMECs.h"
+#include "S1ap-ServedPLMNs.h"
+#include "S1ap-SubscriberProfileIDforRFP.h"
+#include "S1ap-SupportedTAs.h"
+#include "S1ap-SupportedTAs-Item.h"
+#include "S1ap-S-TMSI.h"
+#include "S1ap-TAC.h"
+#include "S1ap-TAIItem.h"
+#include "S1ap-TAIList.h"
+#include "S1ap-TAIListforWarning.h"
+#include "S1ap-TAI.h"
+#include "S1ap-TAI-Broadcast.h"
+#include "S1ap-TAI-Broadcast-Item.h"
+#include "S1ap-CompletedCellinTAI.h"
+#include "S1ap-CompletedCellinTAI-Item.h"
+#include "S1ap-TargetID.h"
+#include "S1ap-TargeteNB-ID.h"
+#include "S1ap-TargetRNC-ID.h"
+#include "S1ap-TargeteNB-ToSourceeNB-TransparentContainer.h"
+#include "S1ap-Target-ToSource-TransparentContainer.h"
+#include "S1ap-TargetRNC-ToSourceRNC-TransparentContainer.h"
+#include "S1ap-TargetBSS-ToSourceBSS-TransparentContainer.h"
+#include "S1ap-TimeToWait.h"
+#include "S1ap-Time-UE-StayedInCell.h"
+#include "S1ap-TransportLayerAddress.h"
+#include "S1ap-TraceActivation.h"
+#include "S1ap-TraceDepth.h"
+#include "S1ap-E-UTRAN-Trace-ID.h"
+#include "S1ap-TypeOfError.h"
+#include "S1ap-UEAggregateMaximumBitrate.h"
+#include "S1ap-UE-associatedLogicalS1-ConnectionItem.h"
+#include "S1ap-UEIdentityIndexValue.h"
+#include "S1ap-UE-HistoryInformation.h"
+#include "S1ap-UEPagingID.h"
+#include "S1ap-UERadioCapability.h"
+#include "S1ap-UESecurityCapabilities.h"
+#include "S1ap-WarningAreaList.h"
+#include "S1ap-WarningType.h"
+#include "S1ap-WarningSecurityInfo.h"
+#include "S1ap-WarningMessageContents.h"
+#include "S1ap-X2TNLConfigurationInfo.h"
+#include "S1ap-CriticalityDiagnostics.h"
+#include "S1ap-CriticalityDiagnostics-IE-List.h"
+#include "S1ap-CriticalityDiagnostics-IE-Item.h"
+#include "S1ap-ResetType.h"
+#include "S1ap-Inter-SystemInformationTransferType.h"
+#include "S1ap-UE-S1AP-IDs.h"
+#include "S1ap-UE-S1AP-ID-pair.h"
+#include "S1ap-MME-UE-S1AP-ID.h"
+#include "S1ap-ENB-UE-S1AP-ID.h"
+#include "S1ap-TBCD-STRING.h"
+#include "S1ap-InitiatingMessage.h"
+#include "S1ap-SuccessfulOutcome.h"
+#include "S1ap-UnsuccessfulOutcome.h"
+#include "S1ap-HandoverRequired.h"
+#include "S1ap-HandoverCommand.h"
+#include "S1ap-HandoverNotify.h"
+#include "S1ap-HandoverPreparationFailure.h"
+#include "S1ap-HandoverRequest.h"
+#include "S1ap-HandoverRequestAcknowledge.h"
+#include "S1ap-HandoverFailure.h"
+#include "S1ap-PathSwitchRequest.h"
+#include "S1ap-PathSwitchRequestAcknowledge.h"
+#include "S1ap-PathSwitchRequestFailure.h"
+#include "S1ap-E-RABSetupRequest.h"
+#include "S1ap-E-RABSetupResponse.h"
+#include "S1ap-E-RABModifyRequest.h"
+#include "S1ap-E-RABModifyResponse.h"
+#include "S1ap-E-RABReleaseIndication.h"
+#include "S1ap-E-RABReleaseCommand.h"
+#include "S1ap-E-RABReleaseResponse.h"
+#include "S1ap-InitialContextSetupRequest.h"
+#include "S1ap-InitialContextSetupResponse.h"
+#include "S1ap-InitialContextSetupFailure.h"
+#include "S1ap-UEContextReleaseRequest.h"
+#include "S1ap-Paging.h"
+#include "S1ap-DownlinkNASTransport.h"
+#include "S1ap-InitialUEMessage.h"
+#include "S1ap-UplinkNASTransport.h"
+#include "S1ap-NASNonDeliveryIndication.h"
+#include "S1ap-HandoverCancel.h"
+#include "S1ap-HandoverCancelAcknowledge.h"
+#include "S1ap-Reset.h"
+#include "S1ap-ResetAcknowledge.h"
+#include "S1ap-S1SetupResponse.h"
+#include "S1ap-S1SetupRequest.h"
+#include "S1ap-S1SetupFailure.h"
+#include "S1ap-ErrorIndication.h"
+#include "S1ap-ENBConfigurationUpdate.h"
+#include "S1ap-ENBConfigurationUpdateAcknowledge.h"
+#include "S1ap-ENBConfigurationUpdateFailure.h"
+#include "S1ap-MMEConfigurationUpdate.h"
+#include "S1ap-MMEConfigurationUpdateAcknowledge.h"
+#include "S1ap-MMEConfigurationUpdateFailure.h"
+#include "S1ap-DownlinkS1cdma2000tunneling.h"
+#include "S1ap-UplinkS1cdma2000tunneling.h"
+#include "S1ap-UEContextModificationRequest.h"
+#include "S1ap-UEContextModificationResponse.h"
+#include "S1ap-UEContextModificationFailure.h"
+#include "S1ap-UECapabilityInfoIndication.h"
+#include "S1ap-UEContextReleaseCommand.h"
+#include "S1ap-UEContextReleaseComplete.h"
+#include "S1ap-ENBStatusTransfer.h"
+#include "S1ap-MMEStatusTransfer.h"
+#include "S1ap-DeactivateTrace.h"
+#include "S1ap-TraceStart.h"
+#include "S1ap-TraceFailureIndication.h"
+#include "S1ap-CellTrafficTrace.h"
+#include "S1ap-LocationReportingControl.h"
+#include "S1ap-LocationReportingFailureIndication.h"
+#include "S1ap-LocationReport.h"
+#include "S1ap-OverloadStart.h"
+#include "S1ap-OverloadStop.h"
+#include "S1ap-WriteReplaceWarningRequest.h"
+#include "S1ap-WriteReplaceWarningResponse.h"
+#include "S1ap-ENBDirectInformationTransfer.h"
+#include "S1ap-MMEDirectInformationTransfer.h"
+#include "S1ap-ENBConfigurationTransfer.h"
+#include "S1ap-MMEConfigurationTransfer.h"
+#include "S1ap-PrivateMessage.h"
+#include "S1ap-E-RABReleaseItemBearerRelComp.h"
+#include "S1ap-E-RABToBeSwitchedDLList.h"
+#include "S1ap-E-RABToBeSwitchedDLItem.h"
+#include "S1ap-E-RABToBeSwitchedULList.h"
+#include "S1ap-E-RABToBeSwitchedULItem.h"
+#include "S1ap-E-RABToBeSetupListBearerSUReq.h"
+#include "S1ap-E-RABToBeSetupItemBearerSUReq.h"
+#include "S1ap-E-RABDataForwardingList.h"
+#include "S1ap-E-RABDataForwardingItem.h"
+#include "S1ap-E-RABToBeSetupListHOReq.h"
+#include "S1ap-E-RABToBeSetupItemHOReq.h"
+#include "S1ap-E-RABAdmittedList.h"
+#include "S1ap-E-RABAdmittedItem.h"
+#include "S1ap-E-RABFailedToSetupListHOReqAck.h"
+#include "S1ap-E-RABToBeSetupItemCtxtSUReq.h"
+#include "S1ap-E-RABToBeSetupListCtxtSUReq.h"
+#include "S1ap-E-RABSetupItemBearerSURes.h"
+#include "S1ap-E-RABSetupListBearerSURes.h"
+#include "S1ap-E-RABSetupItemCtxtSURes.h"
+#include "S1ap-E-RABSetupListCtxtSURes.h"
+#include "S1ap-E-RABReleaseListBearerRelComp.h"
+#include "S1ap-E-RABModifyItemBearerModRes.h"
+#include "S1ap-E-RABModifyListBearerModRes.h"
+#include "S1ap-E-RABFailedToSetupItemHOReqAck.h"
+#include "S1ap-E-RABFailedToSetupListHOReqAck.h"
+#include "S1ap-E-RABToBeModifiedItemBearerModReq.h"
+#include "S1ap-E-RABToBeModifiedListBearerModReq.h"
+#include "S1ap-UE-associatedLogicalS1-ConnectionListResAck.h"
+#include "S1ap-IE.h"
 #include "S1AP-PDU.h"
-#include "InitiatingMessage.h"
-#include "SuccessfulOutcome.h"
-#include "UnsuccessfulOutcome.h"
-#include "HandoverRequired.h"
-#include "HandoverCommand.h"
-#include "HandoverNotify.h"
-#include "HandoverPreparationFailure.h"
-#include "HandoverRequest.h"
-#include "HandoverRequestAcknowledge.h"
-#include "HandoverFailure.h"
-#include "PathSwitchRequest.h"
-#include "PathSwitchRequestAcknowledge.h"
-#include "PathSwitchRequestFailure.h"
-#include "E-RABSetupRequest.h"
-#include "E-RABSetupResponse.h"
-#include "E-RABModifyRequest.h"
-#include "E-RABModifyResponse.h"
-#include "E-RABReleaseIndication.h"
-#include "E-RABReleaseCommand.h"
-#include "E-RABReleaseResponse.h"
-#include "InitialContextSetupRequest.h"
-#include "InitialContextSetupResponse.h"
-#include "InitialContextSetupFailure.h"
-#include "UEContextReleaseRequest.h"
-#include "Paging.h"
-#include "DownlinkNASTransport.h"
-#include "InitialUEMessage.h"
-#include "UplinkNASTransport.h"
-#include "NASNonDeliveryIndication.h"
-#include "HandoverCancel.h"
-#include "HandoverCancelAcknowledge.h"
-#include "Reset.h"
-#include "ResetType.h"
-#include "ResetAcknowledge.h"
-#include "S1SetupResponse.h"
-#include "S1SetupRequest.h"
-#include "S1SetupFailure.h"
-#include "ErrorIndication.h"
-#include "ENBConfigurationUpdate.h"
-#include "ENBConfigurationUpdateAcknowledge.h"
-#include "ENBConfigurationUpdateFailure.h"
-#include "MMEConfigurationUpdate.h"
-#include "MMEConfigurationUpdateAcknowledge.h"
-#include "MMEConfigurationUpdateFailure.h"
-#include "DownlinkS1cdma2000tunneling.h"
-#include "UplinkS1cdma2000tunneling.h"
-#include "UEContextModificationRequest.h"
-#include "UEContextModificationResponse.h"
-#include "UEContextModificationFailure.h"
-#include "UECapabilityInfoIndication.h"
-#include "UEContextReleaseCommand.h"
-#include "UEContextReleaseComplete.h"
-#include "ENBStatusTransfer.h"
-#include "MMEStatusTransfer.h"
-#include "DeactivateTrace.h"
-#include "TraceStart.h"
-#include "TraceFailureIndication.h"
-#include "CellTrafficTrace.h"
-#include "LocationReportingControl.h"
-#include "LocationReportingFailureIndication.h"
-#include "LocationReport.h"
-#include "OverloadStart.h"
-#include "OverloadStop.h"
-#include "WriteReplaceWarningRequest.h"
-#include "WriteReplaceWarningResponse.h"
-#include "ENBDirectInformationTransfer.h"
-#include "MMEDirectInformationTransfer.h"
-#include "ENBConfigurationTransfer.h"
-#include "MMEConfigurationTransfer.h"
-#include "PrivateMessage.h"
-#include "Inter-SystemInformationTransferType.h"
-#include "E-RABReleaseItemBearerRelComp.h"
-#include "E-RABToBeSwitchedDLList.h"
-#include "E-RABToBeSwitchedDLItem.h"
-#include "E-RABToBeSwitchedULList.h"
-#include "E-RABToBeSwitchedULItem.h"
-#include "E-RABToBeSetupListBearerSUReq.h"
-#include "E-RABToBeSetupItemBearerSUReq.h"
-#include "E-RABDataForwardingList.h"
-#include "E-RABDataForwardingItem.h"
-#include "E-RABToBeSetupListHOReq.h"
-#include "E-RABToBeSetupItemHOReq.h"
-#include "E-RABAdmittedList.h"
-#include "E-RABAdmittedItem.h"
-#include "E-RABFailedToSetupListHOReqAck.h"
-#include "E-RABToBeSetupItemCtxtSUReq.h"
-#include "E-RABToBeSetupListCtxtSUReq.h"
-#include "E-RABSetupItemBearerSURes.h"
-#include "E-RABSetupListBearerSURes.h"
-#include "E-RABSetupItemCtxtSURes.h"
-#include "E-RABSetupListCtxtSURes.h"
-#include "E-RABReleaseListBearerRelComp.h"
-#include "E-RABModifyItemBearerModRes.h"
-#include "E-RABModifyListBearerModRes.h"
-#include "E-RABFailedToSetupItemHOReqAck.h"
-#include "E-RABFailedToSetupListHOReqAck.h"
-#include "E-RABToBeModifiedItemBearerModReq.h"
-#include "E-RABToBeModifiedListBearerModReq.h"
-#include "UE-associatedLogicalS1-ConnectionListResAck.h"
-#include "IE.h"
 
 #if defined (UPDATE_RELEASE_9)
-# include "BroadcastCancelledAreaList.h"
-# include "CancelledCellinEAI.h"
-# include "CancelledCellinEAI-Item.h"
-# include "CancelledCellinTAI.h"
-# include "CancelledCellinTAI-Item.h"
-# include "CellAccessMode.h"
-# include "CellID-Cancelled.h"
-# include "CellID-Cancelled-Item.h"
-# include "ConcurrentWarningMessageIndicator.h"
-# include "CSGMembershipStatus.h"
-# include "Data-Forwarding-Not-Possible.h"
-# include "EmergencyAreaID-Cancelled.h"
-# include "EmergencyAreaID-Cancelled-Item.h"
-# include "E-RABList.h"
-# include "EUTRANRoundTripDelayEstimationInfo.h"
-# include "ExtendedRepetitionPeriod.h"
-# include "LPPa-PDU.h"
-# include "PS-ServiceNotAvailable.h"
-# include "Routing-ID.h"
-# include "StratumLevel.h"
-# include "SynchronizationStatus.h"
-# include "TimeSynchronizationInfo.h"
-# include "TAI-Cancelled.h"
-# include "TAI-Cancelled-Item.h"
-# include "KillRequest.h"
-# include "KillResponse.h"
-# include "DownlinkUEAssociatedLPPaTransport.h"
-# include "UplinkUEAssociatedLPPaTransport.h"
-# include "DownlinkNonUEAssociatedLPPaTransport.h"
-# include "UplinkNonUEAssociatedLPPaTransport.h"
+# include "S1ap-BroadcastCancelledAreaList.h"
+# include "S1ap-CancelledCellinEAI.h"
+# include "S1ap-CancelledCellinEAI-Item.h"
+# include "S1ap-CancelledCellinTAI.h"
+# include "S1ap-CancelledCellinTAI-Item.h"
+# include "S1ap-CellAccessMode.h"
+# include "S1ap-CellID-Cancelled.h"
+# include "S1ap-CellID-Cancelled-Item.h"
+# include "S1ap-ConcurrentWarningMessageIndicator.h"
+# include "S1ap-CSGMembershipStatus.h"
+# include "S1ap-Data-Forwarding-Not-Possible.h"
+# include "S1ap-EmergencyAreaID-Cancelled.h"
+# include "S1ap-EmergencyAreaID-Cancelled-Item.h"
+# include "S1ap-E-RABList.h"
+# include "S1ap-EUTRANRoundTripDelayEstimationInfo.h"
+# include "S1ap-ExtendedRepetitionPeriod.h"
+# include "S1ap-LPPa-PDU.h"
+# include "S1ap-PS-ServiceNotAvailable.h"
+# include "S1ap-Routing-ID.h"
+# include "S1ap-StratumLevel.h"
+# include "S1ap-SynchronizationStatus.h"
+# include "S1ap-TimeSynchronizationInfo.h"
+# include "S1ap-TAI-Cancelled.h"
+# include "S1ap-TAI-Cancelled-Item.h"
+# include "S1ap-KillRequest.h"
+# include "S1ap-KillResponse.h"
+# include "S1ap-DownlinkUEAssociatedLPPaTransport.h"
+# include "S1ap-UplinkUEAssociatedLPPaTransport.h"
+# include "S1ap-DownlinkNonUEAssociatedLPPaTransport.h"
+# include "S1ap-UplinkNonUEAssociatedLPPaTransport.h"
 #endif /* (UPDATE_RELEASE_9) */
 
 #if defined(UPDATE_RELEASE_10)
-# include "PagingPriority.h"
-# include "RelayNode-Indicator.h"
-# include "GWContextReleaseIndication.h"
-# include "MMERelaySupportIndicator.h"
-# include "ManagementBasedMDTAllowed.h"
-# include "PrivacyIndicator.h"
-# include "TrafficLoadReductionIndication.h"
-# include "GUMMEIList.h"
+# include "S1ap-PagingPriority.h"
+# include "S1ap-RelayNode-Indicator.h"
+# include "S1ap-GWContextReleaseIndication.h"
+# include "S1ap-MMERelaySupportIndicator.h"
+# include "S1ap-ManagementBasedMDTAllowed.h"
+# include "S1ap-PrivacyIndicator.h"
+# include "S1ap-TrafficLoadReductionIndication.h"
+# include "S1ap-GUMMEIList.h"
 #endif /* (UPDATE_RELEASE_10) */
 
 /* Checking version of ASN1C compiler */
@@ -439,8 +439,8 @@ typedef int (*s1ap_message_decoded_callback)(
 ssize_t s1ap_generate_successfull_outcome(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode    procedureCode,
+    S1ap_Criticality_t      criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr);
 
@@ -456,8 +456,8 @@ ssize_t s1ap_generate_successfull_outcome(
 ssize_t s1ap_generate_initiating_message(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode    procedureCode,
+    S1ap_Criticality_t      criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr);
 
@@ -473,8 +473,8 @@ ssize_t s1ap_generate_initiating_message(
 ssize_t s1ap_generate_unsuccessfull_outcome(
     uint8_t               **buffer,
     uint32_t               *length,
-    e_ProcedureCode         procedureCode,
-    Criticality_t           criticality,
+    e_S1ap_ProcedureCode    procedureCode,
+    S1ap_Criticality_t      criticality,
     asn_TYPE_descriptor_t  *td,
     void                   *sptr);
 
@@ -485,15 +485,15 @@ ssize_t s1ap_generate_unsuccessfull_outcome(
  \param sptr Structure to be encoded in the value field
  @returns a pointer to the newly created IE structure or NULL in case of failure
  **/
-IE_t *s1ap_new_ie(ProtocolIE_ID_t        id,
-                  Criticality_t          criticality,
-                  asn_TYPE_descriptor_t *type,
-                  void                  *sptr);
+S1ap_IE_t *s1ap_new_ie(S1ap_ProtocolIE_ID_t   id,
+                       S1ap_Criticality_t     criticality,
+                       asn_TYPE_descriptor_t *type,
+                       void                  *sptr);
 
 /** \brief Handle criticality
  \param criticality Criticality of the IE
  @returns void
  **/
-void s1ap_handle_criticality(e_Criticality criticality);
+void s1ap_handle_criticality(S1ap_Criticality_t criticality);
 
 #endif /* S1AP_COMMON_H_ */
diff --git a/openair-cn/S1AP/s1ap_eNB.c b/openair-cn/S1AP/s1ap_eNB.c
index d0d5c90735da12ab2fdfbdfd716150ee23f88dea..255f52195483822ec10574240b1d198cd82fa08f 100644
--- a/openair-cn/S1AP/s1ap_eNB.c
+++ b/openair-cn/S1AP/s1ap_eNB.c
@@ -259,13 +259,15 @@ void *s1ap_eNB_task(void *arg)
 static int s1ap_eNB_generate_s1_setup_request(
     s1ap_eNB_instance_t *instance_p, s1ap_eNB_mme_data_t *s1ap_mme_data_p)
 {
-    s1ap_message         message;
-    S1SetupRequestIEs_t *s1SetupRequest_p;
-    PLMNidentity_t       plmnIdentity;
-    SupportedTAs_Item_t  ta;
-    uint8_t             *buffer;
-    uint32_t             len;
-    int                  ret = 0;
+    s1ap_message message;
+
+    S1ap_S1SetupRequestIEs_t *s1SetupRequest_p;
+    S1ap_PLMNidentity_t       plmnIdentity;
+    S1ap_SupportedTAs_Item_t  ta;
+
+    uint8_t  *buffer;
+    uint32_t len;
+    int      ret = 0;
 
     DevAssert(instance_p != NULL);
     DevAssert(s1ap_mme_data_p != NULL);
@@ -273,17 +275,17 @@ static int s1ap_eNB_generate_s1_setup_request(
     memset(&message, 0, sizeof(s1ap_message));
 
     message.direction     = S1AP_PDU_PR_initiatingMessage;
-    message.procedureCode = ProcedureCode_id_S1Setup;
-    message.criticality   = Criticality_reject;
+    message.procedureCode = S1ap_ProcedureCode_id_S1Setup;
+    message.criticality   = S1ap_Criticality_reject;
 
-    s1SetupRequest_p = &message.msg.s1SetupRequestIEs;
-    memset((void *)&plmnIdentity, 0, sizeof(PLMNidentity_t));
+    s1SetupRequest_p = &message.msg.s1ap_S1SetupRequestIEs;
+    memset((void *)&plmnIdentity, 0, sizeof(S1ap_PLMNidentity_t));
 
-    memset((void *)&ta, 0, sizeof(SupportedTAs_Item_t));
+    memset((void *)&ta, 0, sizeof(S1ap_SupportedTAs_Item_t));
 
     s1ap_mme_data_p->state = S1AP_ENB_STATE_WAITING;
 
-    s1SetupRequest_p->global_ENB_ID.eNB_ID.present = ENB_ID_PR_macroENB_ID;
+    s1SetupRequest_p->global_ENB_ID.eNB_ID.present = S1ap_ENB_ID_PR_macroENB_ID;
     MACRO_ENB_ID_TO_BIT_STRING(instance_p->eNB_id,
                                &s1SetupRequest_p->global_ENB_ID.eNB_ID.choice.macroENB_ID);
     MCC_MNC_TO_PLMNID(instance_p->mcc, instance_p->mnc,
@@ -298,7 +300,7 @@ static int s1ap_eNB_generate_s1_setup_request(
     s1SetupRequest_p->defaultPagingDRX = instance_p->default_drx;
 
     if (instance_p->eNB_name != NULL) {
-        s1SetupRequest_p->presenceMask |= S1SETUPREQUESTIES_ENBNAME_PRESENT;
+        s1SetupRequest_p->presenceMask |= S1AP_S1SETUPREQUESTIES_ENBNAME_PRESENT;
         OCTET_STRING_fromBuf(&s1SetupRequest_p->eNBname, instance_p->eNB_name,
                              strlen(instance_p->eNB_name));
     }
diff --git a/openair-cn/S1AP/s1ap_eNB_decoder.c b/openair-cn/S1AP/s1ap_eNB_decoder.c
index 4509839d6af07b515e329e9f32d30689ddfd7011..80b59fc8ccd20ebbfe839dd77d15a0cdbbfc02be 100644
--- a/openair-cn/S1AP/s1ap_eNB_decoder.c
+++ b/openair-cn/S1AP/s1ap_eNB_decoder.c
@@ -44,7 +44,7 @@
 #include "s1ap_eNB_decoder.h"
 
 static int s1ap_eNB_decode_initiating_message(s1ap_message *message,
-        InitiatingMessage_t *initiating_p)
+    S1ap_InitiatingMessage_t *initiating_p)
 {
     DevAssert(initiating_p != NULL);
 
@@ -52,12 +52,14 @@ static int s1ap_eNB_decode_initiating_message(s1ap_message *message,
     message->criticality   = initiating_p->criticality;
 
     switch(initiating_p->procedureCode) {
-        case ProcedureCode_id_downlinkNASTransport:
-            return s1ap_decode_downlinknastransporties(&message->msg.downlinkNASTransportIEs,
-                    &initiating_p->value);
-        case ProcedureCode_id_InitialContextSetup:
-            return s1ap_decode_initialcontextsetuprequesties(
-                       &message->msg.initialContextSetupRequestIEs, &initiating_p->value);
+        case S1ap_ProcedureCode_id_downlinkNASTransport:
+            return s1ap_decode_s1ap_downlinknastransporties(
+                &message->msg.s1ap_DownlinkNASTransportIEs, &initiating_p->value);
+
+        case S1ap_ProcedureCode_id_InitialContextSetup:
+            return s1ap_decode_s1ap_initialcontextsetuprequesties(
+                &message->msg.s1ap_InitialContextSetupRequestIEs, &initiating_p->value);
+
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for initiating message\n",
                        (int)initiating_p->procedureCode);
@@ -67,7 +69,7 @@ static int s1ap_eNB_decode_initiating_message(s1ap_message *message,
 }
 
 static int s1ap_eNB_decode_successful_outcome(s1ap_message *message,
-        SuccessfulOutcome_t *successfullOutcome_p)
+    S1ap_SuccessfulOutcome_t *successfullOutcome_p)
 {
     DevAssert(successfullOutcome_p != NULL);
 
@@ -75,9 +77,10 @@ static int s1ap_eNB_decode_successful_outcome(s1ap_message *message,
     message->criticality   = successfullOutcome_p->criticality;
 
     switch(successfullOutcome_p->procedureCode) {
-        case ProcedureCode_id_S1Setup:
-            return s1ap_decode_s1setupresponseies(&message->msg.s1SetupResponseIEs,
-                                                  &successfullOutcome_p->value);
+        case S1ap_ProcedureCode_id_S1Setup:
+            return s1ap_decode_s1ap_s1setupresponseies(
+                &message->msg.s1ap_S1SetupResponseIEs, &successfullOutcome_p->value);
+
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for successfull outcome message\n",
                        (int)successfullOutcome_p->procedureCode);
@@ -87,7 +90,7 @@ static int s1ap_eNB_decode_successful_outcome(s1ap_message *message,
 }
 
 static int s1ap_eNB_decode_unsuccessful_outcome(s1ap_message *message,
-        UnsuccessfulOutcome_t *unSuccessfullOutcome_p)
+    S1ap_UnsuccessfulOutcome_t *unSuccessfullOutcome_p)
 {
     DevAssert(unSuccessfullOutcome_p != NULL);
 
@@ -95,9 +98,10 @@ static int s1ap_eNB_decode_unsuccessful_outcome(s1ap_message *message,
     message->criticality   = unSuccessfullOutcome_p->criticality;
 
     switch(unSuccessfullOutcome_p->procedureCode) {
-        case ProcedureCode_id_S1Setup:
-            return s1ap_decode_s1setupfailureies(&message->msg.s1SetupFailureIEs,
-                                                 &unSuccessfullOutcome_p->value);
+        case S1ap_ProcedureCode_id_S1Setup:
+            return s1ap_decode_s1ap_s1setupfailureies(
+                &message->msg.s1ap_S1SetupFailureIEs, &unSuccessfullOutcome_p->value);
+
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message\n",
                        (int)unSuccessfullOutcome_p->procedureCode);
diff --git a/openair-cn/S1AP/s1ap_eNB_defs.h b/openair-cn/S1AP/s1ap_eNB_defs.h
index 7945e7c47c3055f07e1960333668f95cbe4ecd69..fdcaf72aba636235b1255155bf4537da38101168 100644
--- a/openair-cn/S1AP/s1ap_eNB_defs.h
+++ b/openair-cn/S1AP/s1ap_eNB_defs.h
@@ -200,7 +200,7 @@ typedef struct s1ap_eNB_mme_data_s {
     uint16_t in_streams;
     uint16_t out_streams;
 
-    /* Connexion id used when SCTP association is not established yet */
+    /* Connexion id used between SCTP/S1AP */
     uint16_t cnx_id;
 
     /* SCTP association id */
@@ -270,10 +270,6 @@ inline int s1ap_eNB_compare_assoc_id(
 RB_PROTOTYPE(s1ap_mme_map, s1ap_eNB_mme_data_s, entry,
              s1ap_eNB_compare_assoc_id);
 
-inline struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME(
-    s1ap_eNB_instance_t *instance_p,
-    int32_t assoc_id, uint16_t cnx_id);
-
 int s1ap_eNB_init(s1ap_eNB_instance_t *eNB_desc_p,
                   char *local_ip_addr[],  int nb_local_ip,
                   char *remote_ip_addr[], int nb_remote_ip);
diff --git a/openair-cn/S1AP/s1ap_eNB_encoder.c b/openair-cn/S1AP/s1ap_eNB_encoder.c
index 48cadebda2d882461dd78094b113a438df607e89..7d7b811daa68d498cc671fcfe8689e531d7a8db1 100644
--- a/openair-cn/S1AP/s1ap_eNB_encoder.c
+++ b/openair-cn/S1AP/s1ap_eNB_encoder.c
@@ -48,28 +48,36 @@
 static inline int s1ap_eNB_encode_initiating(s1ap_message *message,
         uint8_t **buffer,
         uint32_t *len);
+
 static inline int s1ap_eNB_encode_successfull_outcome(s1ap_message *message,
         uint8_t **buffer, uint32_t *len);
+
 static inline int s1ap_eNB_encode_unsuccessfull_outcome(s1ap_message *message,
         uint8_t **buffer, uint32_t *len);
-static inline int s1ap_eNB_encode_s1_setup_request(S1SetupRequestIEs_t
-        *s1SetupRequestIEs, uint8_t **buffer, uint32_t *length);
-static inline int s1ap_eNB_encode_trace_failure(TraceFailureIndicationIEs_t
+
+static inline int s1ap_eNB_encode_s1_setup_request(
+    S1ap_S1SetupRequestIEs_t *s1SetupRequestIEs, uint8_t **buffer, uint32_t *length);
+
+static inline int s1ap_eNB_encode_trace_failure(S1ap_TraceFailureIndicationIEs_t
         *trace_failure_ies_p, uint8_t **buffer,
         uint32_t *length);
-static inline int s1ap_eNB_encode_initial_ue_message(InitialUEMessageIEs_t
+
+static inline int s1ap_eNB_encode_initial_ue_message(S1ap_InitialUEMessageIEs_t
         *initialUEmessageIEs_p, uint8_t **buffer,
         uint32_t *length);
-static inline int s1ap_eNB_encode_uplink_nas_transport(UplinkNASTransportIEs_t
+
+static inline int s1ap_eNB_encode_uplink_nas_transport(S1ap_UplinkNASTransportIEs_t
         *uplinkNASTransportIEs,
         uint8_t **buffer,
         uint32_t *length);
+
 static inline int s1ap_eNB_encode_ue_capability_info_indication(
-    UECapabilityInfoIndicationIEs_t *ueCapabilityInfoIndicationIEs,
+    S1ap_UECapabilityInfoIndicationIEs_t *ueCapabilityInfoIndicationIEs,
     uint8_t **buffer,
     uint32_t *length);
+
 static inline int s1ap_eNB_encode_initial_context_setup_response(
-    InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs,
+    S1ap_InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs,
     uint8_t **buffer,
     uint32_t *length);
 
@@ -96,24 +104,25 @@ int s1ap_eNB_encode_pdu(s1ap_message *message, uint8_t **buffer, uint32_t *len)
 
 static inline
 int s1ap_eNB_encode_initiating(s1ap_message *message,
-        uint8_t **buffer,
-        uint32_t *len)
+    uint8_t **buffer, uint32_t *len)
 {
     switch(message->procedureCode) {
-        case ProcedureCode_id_S1Setup:
-            return s1ap_eNB_encode_s1_setup_request(&message->msg.s1SetupRequestIEs,
-                                                    buffer, len);
-        case ProcedureCode_id_uplinkNASTransport:
-            return s1ap_eNB_encode_uplink_nas_transport(&message->msg.uplinkNASTransportIEs,
-                    buffer, len);
-        case ProcedureCode_id_UECapabilityInfoIndication:
+        case S1ap_ProcedureCode_id_S1Setup:
+            return s1ap_eNB_encode_s1_setup_request(
+                &message->msg.s1ap_S1SetupRequestIEs, buffer, len);
+
+        case S1ap_ProcedureCode_id_uplinkNASTransport:
+            return s1ap_eNB_encode_uplink_nas_transport(
+                &message->msg.s1ap_UplinkNASTransportIEs, buffer, len);
+
+        case S1ap_ProcedureCode_id_UECapabilityInfoIndication:
             return s1ap_eNB_encode_ue_capability_info_indication(
-                       &message->msg.ueCapabilityInfoIndicationIEs,
-                       buffer, len);
-        case ProcedureCode_id_initialUEMessage:
+                &message->msg.s1ap_UECapabilityInfoIndicationIEs, buffer, len);
+
+        case S1ap_ProcedureCode_id_initialUEMessage:
             return s1ap_eNB_encode_initial_ue_message(
-                &message->msg.initialUEMessageIEs,
-                buffer, len);
+                &message->msg.s1ap_InitialUEMessageIEs, buffer, len);
+
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for initiating message\n",
                        (int)message->procedureCode);
@@ -127,10 +136,9 @@ int s1ap_eNB_encode_successfull_outcome(s1ap_message *message,
     uint8_t **buffer, uint32_t *len)
 {
     switch(message->procedureCode) {
-        case ProcedureCode_id_InitialContextSetup:
+        case S1ap_ProcedureCode_id_InitialContextSetup:
             return s1ap_eNB_encode_initial_context_setup_response(
-                       &message->msg.initialContextSetupResponseIEs,
-                       buffer, len);
+                &message->msg.s1ap_InitialContextSetupResponseIEs, buffer, len);
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for successfull outcome message\n",
                        (int)message->procedureCode);
@@ -154,147 +162,151 @@ int s1ap_eNB_encode_unsuccessfull_outcome(s1ap_message *message,
 
 static inline
 int s1ap_eNB_encode_ue_capability_info_indication(
-    UECapabilityInfoIndicationIEs_t *ueCapabilityInfoIndicationIEs,
-    uint8_t             **buffer,
-    uint32_t             *length)
+    S1ap_UECapabilityInfoIndicationIEs_t *ueCapabilityInfoIndicationIEs,
+    uint8_t                             **buffer,
+    uint32_t                             *length)
 {
-    UECapabilityInfoIndication_t  ueCapabilityInfoIndication;
-    UECapabilityInfoIndication_t *ueCapabilityInfoIndication_p =
+    S1ap_UECapabilityInfoIndication_t  ueCapabilityInfoIndication;
+    S1ap_UECapabilityInfoIndication_t *ueCapabilityInfoIndication_p =
         &ueCapabilityInfoIndication;
 
-    memset((void *)ueCapabilityInfoIndication_p, 0,
-           sizeof(UECapabilityInfoIndication_t));
+    memset((void *)ueCapabilityInfoIndication_p, 0,  sizeof(ueCapabilityInfoIndication));
 
-    if (s1ap_encode_uecapabilityinfoindicationies(ueCapabilityInfoIndication_p,
-            ueCapabilityInfoIndicationIEs) < 0) {
+    if (s1ap_encode_s1ap_uecapabilityinfoindicationies(
+        ueCapabilityInfoIndication_p, ueCapabilityInfoIndicationIEs) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_UECapabilityInfoIndication,
-                                            Criticality_ignore,
-                                            &asn_DEF_UECapabilityInfoIndication,
+                                            S1ap_ProcedureCode_id_UECapabilityInfoIndication,
+                                            S1ap_Criticality_ignore,
+                                            &asn_DEF_S1ap_UECapabilityInfoIndication,
                                             ueCapabilityInfoIndication_p);
 }
 
 static inline
-int s1ap_eNB_encode_uplink_nas_transport(UplinkNASTransportIEs_t
-        *uplinkNASTransportIEs,
-        uint8_t             **buffer,
-        uint32_t             *length)
+int s1ap_eNB_encode_uplink_nas_transport(
+    S1ap_UplinkNASTransportIEs_t *uplinkNASTransportIEs,
+    uint8_t                     **buffer,
+    uint32_t                     *length)
 {
-    UplinkNASTransport_t  uplinkNASTransport;
-    UplinkNASTransport_t *uplinkNASTransport_p = &uplinkNASTransport;
+    S1ap_UplinkNASTransport_t  uplinkNASTransport;
+    S1ap_UplinkNASTransport_t *uplinkNASTransport_p = &uplinkNASTransport;
 
-    memset((void *)uplinkNASTransport_p, 0, sizeof(UplinkNASTransport_t));
+    memset((void *)uplinkNASTransport_p, 0, sizeof(uplinkNASTransport));
 
-    if (s1ap_encode_uplinknastransporties(uplinkNASTransport_p,
-                                          uplinkNASTransportIEs) < 0) {
+    if (s1ap_encode_s1ap_uplinknastransporties(
+        uplinkNASTransport_p, uplinkNASTransportIEs) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_uplinkNASTransport,
-                                            Criticality_ignore,
-                                            &asn_DEF_UplinkNASTransport,
+                                            S1ap_ProcedureCode_id_uplinkNASTransport,
+                                            S1ap_Criticality_ignore,
+                                            &asn_DEF_S1ap_UplinkNASTransport,
                                             uplinkNASTransport_p);
 }
 
 static inline
-int s1ap_eNB_encode_s1_setup_request(S1SetupRequestIEs_t
-        *s1SetupRequestIEs,
-        uint8_t             **buffer,
-        uint32_t             *length)
+int s1ap_eNB_encode_s1_setup_request(
+    S1ap_S1SetupRequestIEs_t *s1SetupRequestIEs,
+    uint8_t                 **buffer,
+    uint32_t                 *length)
 {
-    S1SetupRequest_t  s1SetupRequest;
-    S1SetupRequest_t *s1SetupRequest_p = &s1SetupRequest;
+    S1ap_S1SetupRequest_t  s1SetupRequest;
+    S1ap_S1SetupRequest_t *s1SetupRequest_p = &s1SetupRequest;
 
-    memset((void *)s1SetupRequest_p, 0, sizeof(S1SetupRequest_t));
+    memset((void *)s1SetupRequest_p, 0, sizeof(s1SetupRequest));
 
-    if (s1ap_encode_s1setuprequesties(s1SetupRequest_p, s1SetupRequestIEs) < 0) {
+    if (s1ap_encode_s1ap_s1setuprequesties(s1SetupRequest_p, s1SetupRequestIEs) < 0) {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_S1Setup,
-                                            Criticality_reject,
-                                            &asn_DEF_S1SetupRequest,
+                                            S1ap_ProcedureCode_id_S1Setup,
+                                            S1ap_Criticality_reject,
+                                            &asn_DEF_S1ap_S1SetupRequest,
                                             s1SetupRequest_p);
 }
 
 static inline
-int s1ap_eNB_encode_initial_ue_message(InitialUEMessageIEs_t
-        *initialUEmessageIEs_p,
-        uint8_t             **buffer,
-        uint32_t             *length)
+int s1ap_eNB_encode_initial_ue_message(
+    S1ap_InitialUEMessageIEs_t *initialUEmessageIEs_p,
+    uint8_t                   **buffer,
+    uint32_t                   *length)
 {
-    InitialUEMessage_t  initialUEMessage;
-    InitialUEMessage_t *initialUEMessage_p = &initialUEMessage;
+    S1ap_InitialUEMessage_t  initialUEMessage;
+    S1ap_InitialUEMessage_t *initialUEMessage_p = &initialUEMessage;
 
-    memset((void *)initialUEMessage_p, 0, sizeof(InitialUEMessage_t));
+    memset((void *)initialUEMessage_p, 0, sizeof(initialUEMessage));
 
-    if (s1ap_encode_initialuemessageies(initialUEMessage_p,
-                                        initialUEmessageIEs_p) < 0) {
+    if (s1ap_encode_s1ap_initialuemessageies(
+        initialUEMessage_p, initialUEmessageIEs_p) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_initialUEMessage,
-                                            Criticality_reject,
-                                            &asn_DEF_InitialUEMessage,
+                                            S1ap_ProcedureCode_id_initialUEMessage,
+                                            S1ap_Criticality_reject,
+                                            &asn_DEF_S1ap_InitialUEMessage,
                                             initialUEMessage_p);
 }
 
 static inline
-int s1ap_eNB_encode_trace_failure(TraceFailureIndicationIEs_t
-        *trace_failure_ies_p,
-        uint8_t                    **buffer,
-        uint32_t                    *length)
+int s1ap_eNB_encode_trace_failure(
+    S1ap_TraceFailureIndicationIEs_t *trace_failure_ies_p,
+    uint8_t                         **buffer,
+    uint32_t                         *length)
 {
-    TraceFailureIndication_t  trace_failure;
-    TraceFailureIndication_t *trace_failure_p = &trace_failure;
+    S1ap_TraceFailureIndication_t  trace_failure;
+    S1ap_TraceFailureIndication_t *trace_failure_p = &trace_failure;
 
-    memset((void *)trace_failure_p, 0, sizeof(TraceFailureIndication_t));
+    memset((void *)trace_failure_p, 0, sizeof(trace_failure));
 
-    if (s1ap_encode_tracefailureindicationies(trace_failure_p,
-            trace_failure_ies_p) < 0) {
+    if (s1ap_encode_s1ap_tracefailureindicationies(
+        trace_failure_p, trace_failure_ies_p) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_TraceFailureIndication,
-                                            Criticality_reject,
-                                            &asn_DEF_TraceFailureIndication,
+                                            S1ap_ProcedureCode_id_TraceFailureIndication,
+                                            S1ap_Criticality_reject,
+                                            &asn_DEF_S1ap_TraceFailureIndication,
                                             trace_failure_p);
 }
 
 static inline
 int s1ap_eNB_encode_initial_context_setup_response(
-    InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs,
-    uint8_t             **buffer,
-    uint32_t             *length)
+    S1ap_InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs,
+    uint8_t                              **buffer,
+    uint32_t                              *length)
 {
-    InitialContextSetupResponse_t  initial_context_setup_response;
-    InitialContextSetupResponse_t *initial_context_setup_response_p =
+    S1ap_InitialContextSetupResponse_t  initial_context_setup_response;
+    S1ap_InitialContextSetupResponse_t *initial_context_setup_response_p =
         &initial_context_setup_response;
 
     memset((void *)initial_context_setup_response_p, 0,
-           sizeof(InitialContextSetupResponse_t));
+           sizeof(initial_context_setup_response));
 
-    if (s1ap_encode_initialcontextsetupresponseies(initial_context_setup_response_p,
-            initialContextSetupResponseIEs) < 0) {
+    if (s1ap_encode_s1ap_initialcontextsetupresponseies(
+        initial_context_setup_response_p, initialContextSetupResponseIEs) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_successfull_outcome(buffer,
             length,
-            ProcedureCode_id_InitialContextSetup,
-            Criticality_reject,
-            &asn_DEF_InitialContextSetupResponse,
+            S1ap_ProcedureCode_id_InitialContextSetup,
+            S1ap_Criticality_reject,
+            &asn_DEF_S1ap_InitialContextSetupResponse,
             initial_context_setup_response_p);
 }
diff --git a/openair-cn/S1AP/s1ap_eNB_handlers.c b/openair-cn/S1AP/s1ap_eNB_handlers.c
index 8ef65b6247202567648ac230204d6ff20702da5d..c0908d4cb7e44509ba4e2cd2c4c795de46163191 100644
--- a/openair-cn/S1AP/s1ap_eNB_handlers.c
+++ b/openair-cn/S1AP/s1ap_eNB_handlers.c
@@ -49,6 +49,7 @@
 #include "s1ap_eNB_ue_context.h"
 #include "s1ap_eNB_trace.h"
 #include "s1ap_eNB_nas_procedures.h"
+#include "s1ap_eNB_management_procedures.h"
 
 #include "s1ap_eNB_default_values.h"
 
@@ -185,13 +186,13 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
                                       uint32_t               stream,
                                       struct s1ap_message_s *message_p)
 {
-    S1SetupResponseIEs_t *s1SetupResponse_p;
-    s1ap_eNB_mme_data_t  *mme_desc_p;
+    S1ap_S1SetupResponseIEs_t *s1SetupResponse_p;
+    s1ap_eNB_mme_data_t       *mme_desc_p;
     int i;
 
     DevAssert(message_p != NULL);
 
-    s1SetupResponse_p = &message_p->msg.s1SetupResponseIEs;
+    s1SetupResponse_p = &message_p->msg.s1ap_S1SetupResponseIEs;
 
     /* S1 Setup Response == Non UE-related procedure -> stream 0 */
     if (stream != 0) {
@@ -212,11 +213,11 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
     DevAssert(s1SetupResponse_p->servedGUMMEIs.list.count == 1);
 
     for (i = 0; i < s1SetupResponse_p->servedGUMMEIs.list.count; i++) {
-        struct ServedGUMMEIsItem *gummei_item_p;
-        struct served_gummei_s   *new_gummei_p;
+        struct S1ap_ServedGUMMEIsItem *gummei_item_p;
+        struct served_gummei_s        *new_gummei_p;
         int j;
 
-        gummei_item_p = (struct ServedGUMMEIsItem *)
+        gummei_item_p = (struct S1ap_ServedGUMMEIsItem *)
                         s1SetupResponse_p->servedGUMMEIs.list.array[i];
         new_gummei_p = calloc(1, sizeof(struct served_gummei_s));
 
@@ -225,7 +226,7 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
         STAILQ_INIT(&new_gummei_p->mme_codes);
 
         for (j = 0; j < gummei_item_p->servedPLMNs.list.count; j++) {
-            PLMNidentity_t *plmn_identity_p;
+            S1ap_PLMNidentity_t *plmn_identity_p;
             struct plmn_identity_s *new_plmn_identity_p;
 
             plmn_identity_p = gummei_item_p->servedPLMNs.list.array[i];
@@ -236,7 +237,7 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
             new_gummei_p->nb_served_plmns++;
         }
         for (j = 0; j < gummei_item_p->servedGroupIDs.list.count; j++) {
-            MME_Group_ID_t           *mme_group_id_p;
+            S1ap_MME_Group_ID_t           *mme_group_id_p;
             struct served_group_id_s *new_group_id_p;
 
             mme_group_id_p = gummei_item_p->servedGroupIDs.list.array[i];
@@ -246,7 +247,7 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
             new_gummei_p->nb_group_id++;
         }
         for (j = 0; j < gummei_item_p->servedMMECs.list.count; j++) {
-            MME_Code_t        *mme_code_p;
+            S1ap_MME_Code_t        *mme_code_p;
             struct mme_code_s *new_mme_code_p;
 
             mme_code_p = gummei_item_p->servedMMECs.list.array[i];
@@ -259,12 +260,12 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t               assoc_id,
         STAILQ_INSERT_TAIL(&mme_desc_p->served_gummei, new_gummei_p, next);
     }
     /* Free contents of the list */
-    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_ServedGUMMEIs,
+    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_ServedGUMMEIs,
                                   (void *)&s1SetupResponse_p->servedGUMMEIs);
     /* Set the capacity of this MME */
     mme_desc_p->relative_mme_capacity = s1SetupResponse_p->relativeMMECapacity;
     /* Optionaly set the mme name */
-    if (s1SetupResponse_p->presenceMask & S1SETUPRESPONSEIES_MMENAME_PRESENT) {
+    if (s1SetupResponse_p->presenceMask & S1AP_S1SETUPRESPONSEIES_MMENAME_PRESENT) {
         mme_desc_p->mme_name = calloc(s1SetupResponse_p->mmEname.size + 1, sizeof(char));
         memcpy(mme_desc_p->mme_name, s1SetupResponse_p->mmEname.buf,
                s1SetupResponse_p->mmEname.size);
@@ -340,10 +341,10 @@ int s1ap_eNB_handle_initial_context_request(uint32_t               assoc_id,
     s1ap_eNB_mme_data_t   *mme_desc_p;
     s1ap_eNB_ue_context_t *ue_desc_p;
 
-    InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
+    S1ap_InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
     DevAssert(message_p != NULL);
 
-    initialContextSetupRequest_p = &message_p->msg.initialContextSetupRequestIEs;
+    initialContextSetupRequest_p = &message_p->msg.s1ap_InitialContextSetupRequestIEs;
 
     if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
         S1AP_ERROR("[SCTP %d] Received initial context setup request for non "
diff --git a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
index 9b10dc85c75e5d12d62493ecf4a53d0ec1f24bab..934a4b97652f92abb4d354b8c0551f5851ff857c 100644
--- a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
+++ b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
@@ -55,8 +55,9 @@ int s1ap_eNB_handle_nas_first_req(s1ap_nas_first_req_t *s1ap_nas_first_req_p)
     struct s1ap_eNB_mme_data_s   *mme_desc_p;
     struct s1ap_eNB_ue_context_s *ue_desc_p;
 
-    s1ap_message           message;
-    InitialUEMessageIEs_t *initial_ue_message_p;
+    s1ap_message message;
+
+    S1ap_InitialUEMessageIEs_t *initial_ue_message_p;
 
     uint8_t  *buffer;
     uint32_t  length;
@@ -69,10 +70,10 @@ int s1ap_eNB_handle_nas_first_req(s1ap_nas_first_req_t *s1ap_nas_first_req_p)
 
     memset(&message, 0, sizeof(s1ap_message));
 
-    message.direction = S1AP_PDU_PR_initiatingMessage;
-    message.procedureCode = ProcedureCode_id_initialUEMessage;
+    message.direction     = S1AP_PDU_PR_initiatingMessage;
+    message.procedureCode = S1ap_ProcedureCode_id_initialUEMessage;
 
-    initial_ue_message_p = &message.msg.initialUEMessageIEs;
+    initial_ue_message_p = &message.msg.s1ap_InitialUEMessageIEs;
 
     /* Select the MME corresponding to the provided GUMMEI.
      * If no MME corresponds to the GUMMEI, the function selects the MME with the
@@ -132,14 +133,14 @@ int s1ap_eNB_handle_nas_first_req(s1ap_nas_first_req_t *s1ap_nas_first_req_p)
     initial_ue_message_p->rrC_Establishment_Cause = s1ap_nas_first_req_p->establishment_cause;
 
     if (s1ap_nas_first_req_p->ue_identity.present == S_TMSI_PROVIDED) {
-        initial_ue_message_p->presenceMask |= INITIALUEMESSAGEIES_S_TMSI_PRESENT;
+        initial_ue_message_p->presenceMask |= S1AP_INITIALUEMESSAGEIES_S_TMSI_PRESENT;
 
         MME_CODE_TO_OCTET_STRING(s1ap_nas_first_req_p->ue_identity.identity.s_tmsi.mme_code,
                                  &initial_ue_message_p->s_tmsi.mMEC);
         M_TMSI_TO_OCTET_STRING(s1ap_nas_first_req_p->ue_identity.identity.s_tmsi.m_tmsi,
                                &initial_ue_message_p->s_tmsi.m_TMSI);
     } else {
-        initial_ue_message_p->presenceMask |= INITIALUEMESSAGEIES_GUMMEI_ID_PRESENT;
+        initial_ue_message_p->presenceMask |= S1AP_INITIALUEMESSAGEIES_GUMMEI_ID_PRESENT;
 
         MCC_MNC_TO_PLMNID(s1ap_nas_first_req_p->ue_identity.identity.gummei.mcc,
                           s1ap_nas_first_req_p->ue_identity.identity.gummei.mnc,
@@ -186,14 +187,15 @@ int s1ap_eNB_handle_nas_downlink(uint32_t               assoc_id,
                                  uint32_t               stream,
                                  struct s1ap_message_s *message_p)
 {
-    DownlinkNASTransportIEs_t *downlink_NAS_transport_p;
-    s1ap_eNB_mme_data_t       *mme_desc_p;
-    s1ap_eNB_ue_context_t     *ue_desc_p;
-    s1ap_eNB_instance_t       *s1ap_eNB_instance;
+    S1ap_DownlinkNASTransportIEs_t *downlink_NAS_transport_p;
+
+    s1ap_eNB_mme_data_t   *mme_desc_p;
+    s1ap_eNB_ue_context_t *ue_desc_p;
+    s1ap_eNB_instance_t   *s1ap_eNB_instance;
 
     DevAssert(message_p != NULL);
 
-    downlink_NAS_transport_p = &message_p->msg.downlinkNASTransportIEs;
+    downlink_NAS_transport_p = &message_p->msg.s1ap_DownlinkNASTransportIEs;
 
     /* UE-related procedure -> stream != 0 */
     if (stream == 0) {
@@ -244,8 +246,8 @@ int s1ap_eNB_handle_nas_downlink(uint32_t               assoc_id,
 int s1ap_eNB_nas_uplink(s1ap_uplink_nas_t *s1ap_uplink_nas_p)
 {
     struct s1ap_eNB_ue_context_s *ue_context_p;
-    UplinkNASTransportIEs_t      *uplink_NAS_transport_p;
     s1ap_eNB_instance_t          *s1ap_eNB_instance_p;
+    S1ap_UplinkNASTransportIEs_t *uplink_NAS_transport_p;
 
     s1ap_message  message;
 
@@ -281,10 +283,10 @@ int s1ap_eNB_nas_uplink(s1ap_uplink_nas_t *s1ap_uplink_nas_p)
     /* Prepare the S1AP message to encode */
     memset(&message, 0, sizeof(s1ap_message));
 
-    message.direction = S1AP_PDU_PR_initiatingMessage;
-    message.procedureCode = ProcedureCode_id_uplinkNASTransport;
+    message.direction     = S1AP_PDU_PR_initiatingMessage;
+    message.procedureCode = S1ap_ProcedureCode_id_uplinkNASTransport;
 
-    uplink_NAS_transport_p = &message.msg.uplinkNASTransportIEs;
+    uplink_NAS_transport_p = &message.msg.s1ap_UplinkNASTransportIEs;
 
     uplink_NAS_transport_p->mme_ue_s1ap_id = ue_context_p->mme_ue_s1ap_id;
     uplink_NAS_transport_p->eNB_UE_S1AP_ID = ue_context_p->eNB_ue_s1ap_id;
diff --git a/openair-cn/S1AP/s1ap_eNB_overload.c b/openair-cn/S1AP/s1ap_eNB_overload.c
index 0f9ed2406cdcc06f6ae1ab2b9c22cff780eee0cb..ed8a8246c67d364624401ce6306140aa87e74d90 100644
--- a/openair-cn/S1AP/s1ap_eNB_overload.c
+++ b/openair-cn/S1AP/s1ap_eNB_overload.c
@@ -49,8 +49,7 @@
 #include "s1ap_eNB_ue_context.h"
 #include "s1ap_eNB_encoder.h"
 #include "s1ap_eNB_overload.h"
-
-#include "sctp_primitives_client.h"
+#include "s1ap_eNB_management_procedures.h"
 
 #include "assertions.h"
 
@@ -58,16 +57,16 @@ int s1ap_eNB_handle_overload_start(uint32_t               assoc_id,
                                    uint32_t               stream,
                                    struct s1ap_message_s *message_p)
 {
-    OverloadStartIEs_t  *overload_start_p;
-    s1ap_eNB_mme_data_t *mme_desc_p;
+    S1ap_OverloadStartIEs_t *overload_start_p;
+    s1ap_eNB_mme_data_t     *mme_desc_p;
 
     DevAssert(message_p != NULL);
 
-    overload_start_p = &message_p->msg.overloadStartIEs;
+    overload_start_p = &message_p->msg.s1ap_OverloadStartIEs;
 
     DevCheck(overload_start_p->overloadResponse.present ==
-             OverloadResponse_PR_overloadAction,
-             OverloadResponse_PR_overloadAction, 0, 0);
+        S1ap_OverloadResponse_PR_overloadAction,
+        S1ap_OverloadResponse_PR_overloadAction, 0, 0);
 
     /* Non UE-associated signalling -> stream 0 */
     DevCheck(stream == 0, stream, 0, 0);
diff --git a/openair-cn/S1AP/s1ap_eNB_trace.c b/openair-cn/S1AP/s1ap_eNB_trace.c
index bd0636ef6a8afa7e7f5d7902c081655d90647246..754f266d4fc6f62b928feb8d8f491a6ece7c096f 100644
--- a/openair-cn/S1AP/s1ap_eNB_trace.c
+++ b/openair-cn/S1AP/s1ap_eNB_trace.c
@@ -45,14 +45,15 @@
 #include "s1ap_eNB_encoder.h"
 #include "s1ap_eNB_trace.h"
 #include "s1ap_eNB_itti_messaging.h"
+#include "s1ap_eNB_management_procedures.h"
 
 static
 void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p,
-                                     E_UTRAN_Trace_ID_t           *trace_id,
-                                     Cause_t                      *cause_p)
+                                     S1ap_E_UTRAN_Trace_ID_t      *trace_id,
+                                     S1ap_Cause_t                 *cause_p)
 {
     s1ap_message message;
-    TraceFailureIndicationIEs_t *trace_failure_p;
+    S1ap_TraceFailureIndicationIEs_t *trace_failure_p;
     uint8_t  *buffer;
     uint32_t  length;
 
@@ -62,13 +63,13 @@ void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p,
 
     memset(&message, 0, sizeof(s1ap_message));
 
-    trace_failure_p = &message.msg.traceFailureIndicationIEs;
+    trace_failure_p = &message.msg.s1ap_TraceFailureIndicationIEs;
 
     trace_failure_p->mme_ue_s1ap_id = ue_desc_p->mme_ue_s1ap_id;
     trace_failure_p->eNB_UE_S1AP_ID = ue_desc_p->eNB_ue_s1ap_id;
 
-    memcpy(&trace_failure_p->e_UTRAN_Trace_ID, trace_id, sizeof(E_UTRAN_Trace_ID_t));
-    memcpy(&trace_failure_p->cause, cause_p, sizeof(Cause_t));
+    memcpy(&trace_failure_p->e_UTRAN_Trace_ID, trace_id, sizeof(S1ap_E_UTRAN_Trace_ID_t));
+    memcpy(&trace_failure_p->cause, cause_p, sizeof(S1ap_Cause_t));
 
     if (s1ap_eNB_encode_pdu(&message, &buffer, &length) < 0) {
         return;
@@ -82,30 +83,31 @@ int s1ap_eNB_handle_trace_start(uint32_t               assoc_id,
                                 uint32_t               stream,
                                 struct s1ap_message_s *message_p)
 {
-    TraceStartIEs_t              *trace_start_p;
+    S1ap_TraceStartIEs_t         *trace_start_p;
     struct s1ap_eNB_ue_context_s *ue_desc_p;
     struct s1ap_eNB_mme_data_s   *mme_ref_p;
 
     DevAssert(message_p != NULL);
 
-    trace_start_p = &message_p->msg.traceStartIEs;
+    trace_start_p = &message_p->msg.s1ap_TraceStartIEs;
 
     mme_ref_p = s1ap_eNB_get_MME(NULL, assoc_id, 0);
     DevAssert(mme_ref_p != NULL);
 
     if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_ref_p->s1ap_eNB_instance,
-                     trace_start_p->eNB_UE_S1AP_ID)) == NULL) {
+                     trace_start_p->eNB_UE_S1AP_ID)) == NULL)
+    {
         /* Could not find context associated with this eNB_ue_s1ap_id -> generate
          * trace failure indication.
          */
-        E_UTRAN_Trace_ID_t trace_id;
-        Cause_t cause;
+        S1ap_E_UTRAN_Trace_ID_t trace_id;
+        S1ap_Cause_t cause;
 
-        memset(&trace_id, 0, sizeof(E_UTRAN_Trace_ID_t));
-        memset(&cause, 0, sizeof(Cause_t));
+        memset(&trace_id, 0, sizeof(S1ap_E_UTRAN_Trace_ID_t));
+        memset(&cause, 0, sizeof(S1ap_Cause_t));
 
-        cause.present = Cause_PR_radioNetwork;
-        cause.choice.radioNetwork = CauseRadioNetwork_unknown_pair_ue_s1ap_id;
+        cause.present = S1ap_Cause_PR_radioNetwork;
+        cause.choice.radioNetwork = S1ap_CauseRadioNetwork_unknown_pair_ue_s1ap_id;
 
         s1ap_eNB_generate_trace_failure(ue_desc_p, &trace_id, &cause);
     }
@@ -116,7 +118,7 @@ int s1ap_eNB_handle_deactivate_trace(uint32_t               assoc_id,
                                      uint32_t               stream,
                                      struct s1ap_message_s *message_p)
 {
-//     DeactivateTraceIEs_t *deactivate_trace_p;
+//     S1ap_DeactivateTraceIEs_t *deactivate_trace_p;
 // 
 //     deactivate_trace_p = &message_p->msg.deactivateTraceIEs;
 
diff --git a/openair-cn/S1AP/s1ap_mme_decoder.c b/openair-cn/S1AP/s1ap_mme_decoder.c
index a304acb1156d74fd4fac5b9f6c0ee9ef34264ea1..840dac76464f4e47e5b9c132704b064e3bc67e1c 100644
--- a/openair-cn/S1AP/s1ap_mme_decoder.c
+++ b/openair-cn/S1AP/s1ap_mme_decoder.c
@@ -50,8 +50,8 @@
 
 #include "assertions.h"
 
-static int s1ap_mme_decode_initiating(s1ap_message *message,
-                                      InitiatingMessage_t *initiating_p)
+static int s1ap_mme_decode_initiating(
+    s1ap_message *message, S1ap_InitiatingMessage_t *initiating_p)
 {
     int ret = -1;
 
@@ -61,32 +61,33 @@ static int s1ap_mme_decode_initiating(s1ap_message *message,
     message->criticality   = initiating_p->criticality;
 
     switch(initiating_p->procedureCode) {
-//         case ProcedureCode_id_downlinkNASTransport:
+//         case S1ap_ProcedureCode_id_downlinkNASTransport:
 //             return s1ap_decode_downlinknastransporties(&message->msg.downlinkNASTransportIEs, &initiating_p->value);
-        case ProcedureCode_id_uplinkNASTransport:
-            ret = s1ap_decode_uplinknastransporties(&message->msg.uplinkNASTransportIEs,
-                                                    &initiating_p->value);
-        case ProcedureCode_id_S1Setup: {
-            ret = s1ap_decode_s1setuprequesties(&message->msg.s1SetupRequestIEs,
+        case S1ap_ProcedureCode_id_uplinkNASTransport: {
+            ret = s1ap_decode_s1ap_uplinknastransporties(
+                &message->msg.s1ap_UplinkNASTransportIEs, &initiating_p->value);
+        } break;
+        case S1ap_ProcedureCode_id_S1Setup: {
+            ret = s1ap_decode_s1ap_s1setuprequesties(&message->msg.s1ap_S1SetupRequestIEs,
                                                 &initiating_p->value);
-            s1ap_xer_print_s1setuprequest(stdout, message);
+            s1ap_xer_print_s1ap_s1setuprequest(stdout, message);
         } break;
-        case ProcedureCode_id_initialUEMessage: {
-            ret = s1ap_decode_initialuemessageies(&message->msg.initialUEMessageIEs,
+        case S1ap_ProcedureCode_id_initialUEMessage: {
+            ret = s1ap_decode_s1ap_initialuemessageies(&message->msg.s1ap_InitialUEMessageIEs,
                                                   &initiating_p->value);
-            s1ap_xer_print_initialuemessage(stdout, message);
+            s1ap_xer_print_s1ap_initialuemessage(stdout, message);
         } break;
-        case ProcedureCode_id_UEContextReleaseRequest: {
-            ret = s1ap_decode_uecontextreleaserequesties(
-                &message->msg.ueContextReleaseRequestIEs, &initiating_p->value);
-            s1ap_xer_print_uecontextreleaserequest(stdout, message);
+        case S1ap_ProcedureCode_id_UEContextReleaseRequest: {
+            ret = s1ap_decode_s1ap_uecontextreleaserequesties(
+                &message->msg.s1ap_UEContextReleaseRequestIEs, &initiating_p->value);
+            s1ap_xer_print_s1ap_uecontextreleaserequest(stdout, message);
         } break;
-        case ProcedureCode_id_UECapabilityInfoIndication: {
-            ret = s1ap_decode_uecapabilityinfoindicationies(
-                &message->msg.ueCapabilityInfoIndicationIEs, &initiating_p->value);
-            s1ap_xer_print_uecapabilityinfoindication(stdout, message);
+        case S1ap_ProcedureCode_id_UECapabilityInfoIndication: {
+            ret = s1ap_decode_s1ap_uecapabilityinfoindicationies(
+                &message->msg.s1ap_UECapabilityInfoIndicationIEs, &initiating_p->value);
+            s1ap_xer_print_s1ap_uecapabilityinfoindication(stdout, message);
         } break;
-//         case ProcedureCode_id_InitialContextSetup:
+//         case S1ap_ProcedureCode_id_InitialContextSetup:
 //             return s1ap_decode_initialcontextsetuprequesties(&message->msg.initialContextSetupRequestIEs, &initiating_p->value);
         default:
             S1AP_ERROR("Unknown procedure ID (%d) for initiating message\n",
@@ -96,8 +97,8 @@ static int s1ap_mme_decode_initiating(s1ap_message *message,
     return ret;
 }
 
-static int s1ap_mme_decode_successfull_outcome(s1ap_message *message,
-        SuccessfulOutcome_t *successfullOutcome_p)
+static int s1ap_mme_decode_successfull_outcome(
+    s1ap_message *message, S1ap_SuccessfulOutcome_t *successfullOutcome_p)
 {
     DevAssert(successfullOutcome_p != NULL);
 
@@ -105,12 +106,12 @@ static int s1ap_mme_decode_successfull_outcome(s1ap_message *message,
     message->criticality   = successfullOutcome_p->criticality;
 
     switch(successfullOutcome_p->procedureCode) {
-        case ProcedureCode_id_InitialContextSetup:
-            return s1ap_decode_initialcontextsetupresponseies(
-                       &message->msg.initialContextSetupResponseIEs, &successfullOutcome_p->value);
-        case ProcedureCode_id_UEContextRelease:
-            return s1ap_decode_uecontextreleasecompleteies(
-                       &message->msg.ueContextReleaseCompleteIEs, &successfullOutcome_p->value);
+        case S1ap_ProcedureCode_id_InitialContextSetup:
+            return s1ap_decode_s1ap_initialcontextsetupresponseies(
+                       &message->msg.s1ap_InitialContextSetupResponseIEs, &successfullOutcome_p->value);
+        case S1ap_ProcedureCode_id_UEContextRelease:
+            return s1ap_decode_s1ap_uecontextreleasecompleteies(
+                       &message->msg.s1ap_UEContextReleaseCompleteIEs, &successfullOutcome_p->value);
         default:
             S1AP_ERROR("Unknown procedure ID (%d) for successfull outcome message\n",
                        (int)successfullOutcome_p->procedureCode);
@@ -119,8 +120,8 @@ static int s1ap_mme_decode_successfull_outcome(s1ap_message *message,
     return -1;
 }
 
-static int s1ap_mme_decode_unsuccessfull_outcome(s1ap_message *message,
-        UnsuccessfulOutcome_t *unSuccessfulOutcome_p)
+static int s1ap_mme_decode_unsuccessfull_outcome(
+    s1ap_message *message, S1ap_UnsuccessfulOutcome_t *unSuccessfulOutcome_p)
 {
     DevAssert(unSuccessfulOutcome_p != NULL);
 
@@ -128,9 +129,9 @@ static int s1ap_mme_decode_unsuccessfull_outcome(s1ap_message *message,
     message->criticality   = unSuccessfulOutcome_p->criticality;
 
     switch(unSuccessfulOutcome_p->procedureCode) {
-        case ProcedureCode_id_InitialContextSetup:
-            return s1ap_decode_initialcontextsetupfailureies(
-                       &message->msg.initialContextSetupFailureIEs, &unSuccessfulOutcome_p->value);
+        case S1ap_ProcedureCode_id_InitialContextSetup:
+            return s1ap_decode_s1ap_initialcontextsetupfailureies(
+                       &message->msg.s1ap_InitialContextSetupFailureIEs, &unSuccessfulOutcome_p->value);
         default:
             S1AP_ERROR("Unknown procedure ID (%d) for unsuccessfull outcome message\n",
                        (int)unSuccessfulOutcome_p->procedureCode);
diff --git a/openair-cn/S1AP/s1ap_mme_encoder.c b/openair-cn/S1AP/s1ap_mme_encoder.c
index 13f93fabc3b470920c7eafddaaabb97bba1ad249..f5ea93f66849ca2dae3e2bbbf14e681d3b4f27c2 100644
--- a/openair-cn/S1AP/s1ap_mme_encoder.c
+++ b/openair-cn/S1AP/s1ap_mme_encoder.c
@@ -75,22 +75,22 @@ static inline
 int s1ap_mme_encode_initial_context_setup_request(s1ap_message *message_p,
     uint8_t **buffer, uint32_t *length)
 {
-    InitialContextSetupRequest_t  initialContextSetupRequest;
-    InitialContextSetupRequest_t *initialContextSetupRequest_p =
+    S1ap_InitialContextSetupRequest_t  initialContextSetupRequest;
+    S1ap_InitialContextSetupRequest_t *initialContextSetupRequest_p =
         &initialContextSetupRequest;
 
-    memset(initialContextSetupRequest_p, 0, sizeof(InitialContextSetupRequest_t));
+    memset(initialContextSetupRequest_p, 0, sizeof(S1ap_InitialContextSetupRequest_t));
 
-    if (s1ap_encode_initialcontextsetuprequesties(initialContextSetupRequest_p,
-        &message_p->msg.initialContextSetupRequestIEs) < 0) {
+    if (s1ap_encode_s1ap_initialcontextsetuprequesties(initialContextSetupRequest_p,
+        &message_p->msg.s1ap_InitialContextSetupRequestIEs) < 0) {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_InitialContextSetup,
-                                            Criticality_reject,
-                                            &asn_DEF_InitialContextSetupRequest,
+                                            S1ap_ProcedureCode_id_InitialContextSetup,
+                                            S1ap_Criticality_reject,
+                                            &asn_DEF_S1ap_InitialContextSetupRequest,
                                             initialContextSetupRequest_p);
 }
 
@@ -121,11 +121,11 @@ int s1ap_mme_encode_initiating(s1ap_message *message_p,
                                uint32_t *length)
 {
     switch(message_p->procedureCode) {
-        case ProcedureCode_id_downlinkNASTransport:
+        case S1ap_ProcedureCode_id_downlinkNASTransport:
             return s1ap_mme_encode_downlink_nas_transport(message_p, buffer, length);
-        case ProcedureCode_id_InitialContextSetup:
+        case S1ap_ProcedureCode_id_InitialContextSetup:
             return s1ap_mme_encode_initial_context_setup_request(message_p, buffer, length);
-        case ProcedureCode_id_UEContextRelease:
+        case S1ap_ProcedureCode_id_UEContextRelease:
             return s1ap_mme_encode_ue_context_release_command(message_p, buffer, length);
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for initiating message_p\n",
@@ -140,7 +140,7 @@ int s1ap_mme_encode_successfull_outcome(s1ap_message *message_p,
                                         uint8_t **buffer, uint32_t *length)
 {
     switch(message_p->procedureCode) {
-        case ProcedureCode_id_S1Setup:
+        case S1ap_ProcedureCode_id_S1Setup:
             return s1ap_mme_encode_s1setupresponse(message_p, buffer, length);
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for successfull outcome message_p\n",
@@ -155,7 +155,7 @@ int s1ap_mme_encode_unsuccessfull_outcome(s1ap_message *message_p,
                                           uint8_t **buffer, uint32_t *length)
 {
     switch(message_p->procedureCode) {
-        case ProcedureCode_id_S1Setup:
+        case S1ap_ProcedureCode_id_S1Setup:
             return s1ap_mme_encode_s1setupfailure(message_p, buffer, length);
         default:
             S1AP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message_p\n",
@@ -169,20 +169,21 @@ static inline
 int s1ap_mme_encode_s1setupresponse(s1ap_message *message_p,
                                     uint8_t **buffer, uint32_t *length)
 {
-    S1SetupResponse_t  s1SetupResponse;
-    S1SetupResponse_t *s1SetupResponse_p = &s1SetupResponse;
+    S1ap_S1SetupResponse_t  s1SetupResponse;
+    S1ap_S1SetupResponse_t *s1SetupResponse_p = &s1SetupResponse;
 
-    memset(s1SetupResponse_p, 0, sizeof(S1SetupResponse_t));
+    memset(s1SetupResponse_p, 0, sizeof(S1ap_S1SetupResponse_t));
 
-    if (s1ap_encode_s1setupresponseies(s1SetupResponse_p, &message_p->msg.s1SetupResponseIEs) < 0) {
+    if (s1ap_encode_s1ap_s1setupresponseies(s1SetupResponse_p, &message_p->msg.s1ap_S1SetupResponseIEs) < 0)
+    {
         return -1;
     }
 
     return s1ap_generate_successfull_outcome(buffer,
                                              length,
-                                             ProcedureCode_id_S1Setup,
+                                             S1ap_ProcedureCode_id_S1Setup,
                                              message_p->criticality,
-                                             &asn_DEF_S1SetupResponse,
+                                             &asn_DEF_S1ap_S1SetupResponse,
                                              s1SetupResponse_p);
 }
 
@@ -190,20 +191,20 @@ static inline
 int s1ap_mme_encode_s1setupfailure(s1ap_message *message_p,
                                    uint8_t **buffer, uint32_t *length)
 {
-    S1SetupFailure_t  s1SetupFailure;
-    S1SetupFailure_t *s1SetupFailure_p = &s1SetupFailure;
+    S1ap_S1SetupFailure_t  s1SetupFailure;
+    S1ap_S1SetupFailure_t *s1SetupFailure_p = &s1SetupFailure;
 
-    memset(s1SetupFailure_p, 0, sizeof(S1SetupFailure_t));
+    memset(s1SetupFailure_p, 0, sizeof(S1ap_S1SetupFailure_t));
 
-    if (s1ap_encode_s1setupfailureies(s1SetupFailure_p, &message_p->msg.s1SetupFailureIEs) < 0) {
+    if (s1ap_encode_s1ap_s1setupfailureies(s1SetupFailure_p, &message_p->msg.s1ap_S1SetupFailureIEs) < 0) {
         return -1;
     }
 
     return s1ap_generate_unsuccessfull_outcome(buffer,
                                                length,
-                                               ProcedureCode_id_S1Setup,
+                                               S1ap_ProcedureCode_id_S1Setup,
                                                message_p->criticality,
-                                               &asn_DEF_S1SetupFailure,
+                                               &asn_DEF_S1ap_S1SetupFailure,
                                                s1SetupFailure_p);
 }
 
@@ -211,23 +212,23 @@ static inline
 int s1ap_mme_encode_downlink_nas_transport(
     s1ap_message *message_p, uint8_t **buffer, uint32_t *length)
 {
-    DownlinkNASTransport_t  downlinkNasTransport;
-    DownlinkNASTransport_t *downlinkNasTransport_p = &downlinkNasTransport;
+    S1ap_DownlinkNASTransport_t  downlinkNasTransport;
+    S1ap_DownlinkNASTransport_t *downlinkNasTransport_p = &downlinkNasTransport;
 
-    memset(downlinkNasTransport_p, 0, sizeof(DownlinkNASTransport_t));
+    memset(downlinkNasTransport_p, 0, sizeof(S1ap_DownlinkNASTransport_t));
 
     /* Convert IE structure into asn1 message_p */
-    if (s1ap_encode_downlinknastransporties(downlinkNasTransport_p,
-        &message_p->msg.downlinkNASTransportIEs) < 0) {
+    if (s1ap_encode_s1ap_downlinknastransporties(downlinkNasTransport_p,
+        &message_p->msg.s1ap_DownlinkNASTransportIEs) < 0) {
         return -1;
     }
 
     /* Generate Initiating message_p for the list of IEs */
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_downlinkNASTransport,
+                                            S1ap_ProcedureCode_id_downlinkNASTransport,
                                             message_p->criticality,
-                                            &asn_DEF_DownlinkNASTransport,
+                                            &asn_DEF_S1ap_DownlinkNASTransport,
                                             downlinkNasTransport_p);
 }
 
@@ -235,21 +236,21 @@ static inline
 int s1ap_mme_encode_ue_context_release_command(s1ap_message *message_p,
                                                uint8_t **buffer, uint32_t *length)
 {
-    UEContextReleaseCommand_t  ueContextReleaseCommand;
-    UEContextReleaseCommand_t *ueContextReleaseCommand_p = &ueContextReleaseCommand;
+    S1ap_UEContextReleaseCommand_t  ueContextReleaseCommand;
+    S1ap_UEContextReleaseCommand_t *ueContextReleaseCommand_p = &ueContextReleaseCommand;
 
-    memset(ueContextReleaseCommand_p, 0, sizeof(UEContextReleaseCommand_t));
+    memset(ueContextReleaseCommand_p, 0, sizeof(S1ap_UEContextReleaseCommand_t));
 
     /* Convert IE structure into asn1 message_p */
-    if (s1ap_encode_uecontextreleasecommandies(ueContextReleaseCommand_p,
-        &message_p->msg.ueContextReleaseCommandIEs) < 0) {
+    if (s1ap_encode_s1ap_uecontextreleasecommandies(ueContextReleaseCommand_p,
+        &message_p->msg.s1ap_UEContextReleaseCommandIEs) < 0) {
         return -1;
     }
 
     return s1ap_generate_initiating_message(buffer,
                                             length,
-                                            ProcedureCode_id_UEContextRelease,
+                                            S1ap_ProcedureCode_id_UEContextRelease,
                                             message_p->criticality,
-                                            &asn_DEF_UEContextReleaseCommand,
+                                            &asn_DEF_S1ap_UEContextReleaseCommand,
                                             ueContextReleaseCommand_p);
 }
diff --git a/openair-cn/S1AP/s1ap_mme_handlers.c b/openair-cn/S1AP/s1ap_mme_handlers.c
index 8dd87d0920c2668ff8826a3d73447bcf1e5461e1..e932114b7fbe36f9241724673c6f6c686f348f2f 100644
--- a/openair-cn/S1AP/s1ap_mme_handlers.c
+++ b/openair-cn/S1AP/s1ap_mme_handlers.c
@@ -149,7 +149,7 @@ int s1ap_mme_handle_message(uint32_t assoc_id, uint32_t stream,
                assoc_id, stream, message);
 }
 
-int s1ap_mme_set_cause(Cause_t *cause_p, Cause_PR cause_type, long cause_value)
+int s1ap_mme_set_cause(S1ap_Cause_t *cause_p, S1ap_Cause_PR cause_type, long cause_value)
 {
     DevAssert(cause_p != NULL);
 
@@ -157,19 +157,19 @@ int s1ap_mme_set_cause(Cause_t *cause_p, Cause_PR cause_type, long cause_value)
 
     switch(cause_type)
     {
-        case Cause_PR_radioNetwork:
+        case S1ap_Cause_PR_radioNetwork:
             cause_p->choice.misc = cause_value;
             break;
-        case Cause_PR_transport:
+        case S1ap_Cause_PR_transport:
             cause_p->choice.transport = cause_value;
             break;
-        case Cause_PR_nas:
+        case S1ap_Cause_PR_nas:
             cause_p->choice.nas = cause_value;
             break;
-        case Cause_PR_protocol:
+        case S1ap_Cause_PR_protocol:
             cause_p->choice.protocol = cause_value;
             break;
-        case Cause_PR_misc:
+        case S1ap_Cause_PR_misc:
             cause_p->choice.misc = cause_value;
             break;
         default:
@@ -179,26 +179,26 @@ int s1ap_mme_set_cause(Cause_t *cause_p, Cause_PR cause_type, long cause_value)
 }
 
 int s1ap_mme_generate_s1_setup_failure(
-    uint32_t assoc_id, Cause_PR cause_type, long cause_value,
+    uint32_t assoc_id, S1ap_Cause_PR cause_type, long cause_value,
     long time_to_wait)
 {
     uint8_t *buffer_p;
     uint32_t length;
     s1ap_message message;
-    S1SetupFailureIEs_t *s1_setup_failure_p;
+    S1ap_S1SetupFailureIEs_t *s1_setup_failure_p;
 
     memset(&message, 0, sizeof(s1ap_message));
 
-    s1_setup_failure_p = &message.msg.s1SetupFailureIEs;
+    s1_setup_failure_p = &message.msg.s1ap_S1SetupFailureIEs;
 
-    message.procedureCode = ProcedureCode_id_S1Setup;
+    message.procedureCode = S1ap_ProcedureCode_id_S1Setup;
     message.direction     = S1AP_PDU_PR_unsuccessfulOutcome;
 
     s1ap_mme_set_cause(&s1_setup_failure_p->cause, cause_type, cause_value);
 
     /* Include the optional field time to wait only if the value is > -1 */
     if (time_to_wait > -1) {
-        s1_setup_failure_p->presenceMask |= S1SETUPFAILUREIES_TIMETOWAIT_PRESENT;
+        s1_setup_failure_p->presenceMask |= S1AP_S1SETUPFAILUREIES_TIMETOWAIT_PRESENT;
         s1_setup_failure_p->timeToWait = time_to_wait;
     }
 
@@ -217,7 +217,7 @@ int s1ap_mme_generate_s1_setup_failure(
 int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
                                      struct s1ap_message_s *message)
 {
-    S1SetupRequestIEs_t *s1SetupRequest_p;
+    S1ap_S1SetupRequestIEs_t *s1SetupRequest_p;
     eNB_description_t *eNB_association;
     uint32_t eNB_id = 0;
     char *eNB_name = NULL;
@@ -226,7 +226,7 @@ int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
 
     DevAssert(message != NULL);
 
-    s1SetupRequest_p = &message->msg.s1SetupRequestIEs;
+    s1SetupRequest_p = &message->msg.s1ap_S1SetupRequestIEs;
 
     /* We received a new valid S1 Setup Request on a stream != 0.
      * This should not happen -> reject eNB s1 setup request.
@@ -234,17 +234,17 @@ int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
     if (stream != 0) {
         S1AP_DEBUG("Received new s1 setup request on stream != 0\n");
         /* Send a s1 setup failure with protocol cause unspecified */
-        return s1ap_mme_generate_s1_setup_failure(assoc_id, Cause_PR_protocol,
-                                                  CauseProtocol_unspecified, -1);
+        return s1ap_mme_generate_s1_setup_failure(assoc_id, S1ap_Cause_PR_protocol,
+                                                  S1ap_CauseProtocol_unspecified, -1);
     }
 
     S1AP_DEBUG("New s1 setup request incoming from ");
-    if ((s1SetupRequest_p->presenceMask & S1SETUPREQUESTIES_ENBNAME_PRESENT) ==
-            S1SETUPREQUESTIES_ENBNAME_PRESENT) {
+    if (s1SetupRequest_p->presenceMask & S1AP_S1SETUPREQUESTIES_ENBNAME_PRESENT)
+    {
         S1AP_DEBUG("%*s ", s1SetupRequest_p->eNBname.size, s1SetupRequest_p->eNBname.buf);
         eNB_name = (char *)s1SetupRequest_p->eNBname.buf;
     }
-    if (s1SetupRequest_p->global_ENB_ID.eNB_ID.present == ENB_ID_PR_homeENB_ID) {
+    if (s1SetupRequest_p->global_ENB_ID.eNB_ID.present == S1ap_ENB_ID_PR_homeENB_ID) {
         // Home eNB ID = 28 bits
         uint8_t *eNB_id_buf =
             s1SetupRequest_p->global_ENB_ID.eNB_ID.choice.homeENB_ID.buf;
@@ -276,9 +276,9 @@ int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
                    max_enb_connected);
 
         /* Send an overload cause... */
-        return s1ap_mme_generate_s1_setup_failure(assoc_id, Cause_PR_misc,
-                                                  CauseMisc_control_processing_overload,
-                                                  TimeToWait_v20s);
+        return s1ap_mme_generate_s1_setup_failure(assoc_id, S1ap_Cause_PR_misc,
+                                                  S1ap_CauseMisc_control_processing_overload,
+                                                  S1ap_TimeToWait_v20s);
     }
 
     /* If none of the provided PLMNs/TAC match the one configured in MME,
@@ -288,9 +288,9 @@ int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
 
     /* eNB and MME have no common PLMN */
     if (ta_ret != TA_LIST_RET_OK) {
-        return s1ap_mme_generate_s1_setup_failure(assoc_id, Cause_PR_misc,
-                                                  CauseMisc_unknown_PLMN,
-                                                  TimeToWait_v20s);
+        return s1ap_mme_generate_s1_setup_failure(assoc_id, S1ap_Cause_PR_misc,
+                                                  S1ap_CauseMisc_unknown_PLMN,
+                                                  S1ap_TimeToWait_v20s);
     }
 
     S1AP_DEBUG("Adding eNB to the list of served eNBs\n");
@@ -317,12 +317,13 @@ int s1ap_mme_handle_s1_setup_request(uint32_t assoc_id, uint32_t stream,
         /* eNB has been fount in list, consider the s1 setup request as a reset connection,
          * reseting any previous UE state if sctp association is != than the previous one */
         if (eNB_association->sctp_assoc_id != assoc_id) {
-            S1SetupFailureIEs_t s1SetupFailure;
-            memset(&s1SetupFailure, 0, sizeof(S1SetupFailureIEs_t));
+            S1ap_S1SetupFailureIEs_t s1SetupFailure;
+
+            memset(&s1SetupFailure, 0, sizeof(s1SetupFailure));
 
             /* Send an overload cause... */
-            s1SetupFailure.cause.present = Cause_PR_misc; //TODO: send the right cause
-            s1SetupFailure.cause.choice.misc = CauseMisc_control_processing_overload;
+            s1SetupFailure.cause.present = S1ap_Cause_PR_misc; //TODO: send the right cause
+            s1SetupFailure.cause.choice.misc = S1ap_CauseMisc_control_processing_overload;
             S1AP_DEBUG("Rejeting s1 setup request as eNB id %d is already associated to an active sctp association"
                        "Previous known: %d, new one: %d\n",
                        eNB_id, eNB_association->sctp_assoc_id, assoc_id);
@@ -341,8 +342,8 @@ int s1ap_generate_s1_setup_response(eNB_description_t *eNB_association)
 {
     int i;
     int enc_rval = 0;
-    S1SetupResponseIEs_t *s1_setup_response_p;
-    ServedGUMMEIsItem_t   servedGUMMEI;
+    S1ap_S1SetupResponseIEs_t *s1_setup_response_p;
+    S1ap_ServedGUMMEIsItem_t   servedGUMMEI;
     s1ap_message message;
     uint8_t *buffer;
     uint32_t length;
@@ -351,9 +352,9 @@ int s1ap_generate_s1_setup_response(eNB_description_t *eNB_association)
 
     // Generating response
     memset(&message, 0, sizeof(s1ap_message));
-    memset(&servedGUMMEI, 0, sizeof(ServedGUMMEIsItem_t));
+    memset(&servedGUMMEI, 0, sizeof(servedGUMMEI));
 
-    s1_setup_response_p = &message.msg.s1SetupResponseIEs;
+    s1_setup_response_p = &message.msg.s1ap_S1SetupResponseIEs;
 
     config_read_lock(&mme_config);
 
@@ -361,28 +362,28 @@ int s1ap_generate_s1_setup_response(eNB_description_t *eNB_association)
 
     /* Use the gummei parameters provided by configuration */
     for (i = 0; i < mme_config.gummei.nb_plmns; i++) {
-        PLMNidentity_t *plmn;
+        S1ap_PLMNidentity_t *plmn;
 
         /* FIXME: free object from list once encoded */
-        plmn = calloc(1, sizeof(PLMNidentity_t));
+        plmn = calloc(1, sizeof(*plmn));
         MCC_MNC_TO_PLMNID(mme_config.gummei.plmn_mcc[i],
                           mme_config.gummei.plmn_mnc[i],
                           plmn);
         ASN_SEQUENCE_ADD(&servedGUMMEI.servedPLMNs.list, plmn);
     }
     for (i = 0; i < mme_config.gummei.nb_mme_gid; i++) {
-        MME_Group_ID_t *mme_gid;
+        S1ap_MME_Group_ID_t *mme_gid;
 
         /* FIXME: free object from list once encoded */
-        mme_gid = calloc(1, sizeof(MME_Group_ID_t));
+        mme_gid = calloc(1, sizeof(*mme_gid));
         INT16_TO_OCTET_STRING(mme_config.gummei.mme_gid[i], mme_gid);
         ASN_SEQUENCE_ADD(&servedGUMMEI.servedGroupIDs.list, mme_gid);
     }
     for (i = 0; i < mme_config.gummei.nb_mmec; i++) {
-        MME_Code_t *mmec;
+        S1ap_MME_Code_t *mmec;
 
         /* FIXME: free object from list once encoded */
-        mmec = calloc(1, sizeof(MME_Code_t));
+        mmec = calloc(1, sizeof(*mmec));
         INT8_TO_OCTET_STRING(mme_config.gummei.mmec[i], mmec);
         ASN_SEQUENCE_ADD(&servedGUMMEI.servedMMECs.list, mmec);
     }
@@ -392,7 +393,7 @@ int s1ap_generate_s1_setup_response(eNB_description_t *eNB_association)
     /* The MME is only serving E-UTRAN RAT, so the list contains only one element */
     ASN_SEQUENCE_ADD(&s1_setup_response_p->servedGUMMEIs, &servedGUMMEI);
 
-    message.procedureCode = ProcedureCode_id_S1Setup;
+    message.procedureCode = S1ap_ProcedureCode_id_S1Setup;
     message.direction     = S1AP_PDU_PR_successfulOutcome;
 
     enc_rval = s1ap_mme_encode_pdu(&message, &buffer, &length);
@@ -414,11 +415,11 @@ int s1ap_mme_handle_ue_cap_indication(uint32_t assoc_id, uint32_t stream,
                                       struct s1ap_message_s *message)
 {
     ue_description_t *ue_ref;
-    UECapabilityInfoIndicationIEs_t *ue_cap_p;
+    S1ap_UECapabilityInfoIndicationIEs_t *ue_cap_p;
 
     DevAssert(message != NULL);
 
-    ue_cap_p = &message->msg.ueCapabilityInfoIndicationIEs;
+    ue_cap_p = &message->msg.s1ap_UECapabilityInfoIndicationIEs;
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(ue_cap_p->mme_ue_s1ap_id)) == NULL) {
         S1AP_DEBUG("No UE is attached to this mme UE s1ap id: 0x%08x\n",
@@ -476,13 +477,14 @@ int s1ap_mme_handle_initial_context_setup_response(
     struct s1ap_message_s *message)
 {
 
-    InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs_p;
-    ue_description_t                 *ue_ref;
-    SgwModifyBearerRequest           *modify_request_p;
-    MessageDef                       *message_p;
-    E_RABSetupItemCtxtSURes_t        *eRABSetupItemCtxtSURes_p;
+    S1ap_InitialContextSetupResponseIEs_t *initialContextSetupResponseIEs_p;
+    S1ap_E_RABSetupItemCtxtSURes_t        *eRABSetupItemCtxtSURes_p;
+
+    ue_description_t       *ue_ref;
+    SgwModifyBearerRequest *modify_request_p;
+    MessageDef             *message_p;
 
-    initialContextSetupResponseIEs_p = &message->msg.initialContextSetupResponseIEs;
+    initialContextSetupResponseIEs_p = &message->msg.s1ap_InitialContextSetupResponseIEs;
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(
         (uint32_t)initialContextSetupResponseIEs_p->mme_ue_s1ap_id)) == NULL) {
@@ -498,7 +500,7 @@ int s1ap_mme_handle_initial_context_setup_response(
         return -1;
     }
 
-    if (initialContextSetupResponseIEs_p->e_RABSetupListCtxtSURes.e_RABSetupItemCtxtSURes.count
+    if (initialContextSetupResponseIEs_p->e_RABSetupListCtxtSURes.s1ap_E_RABSetupItemCtxtSURes.count
             != 1) {
         S1AP_DEBUG("E-RAB creation has failed\n");
         return -1;
@@ -512,12 +514,13 @@ int s1ap_mme_handle_initial_context_setup_response(
         return -1;
     }
 
-    eRABSetupItemCtxtSURes_p = (E_RABSetupItemCtxtSURes_t *)
-                               initialContextSetupResponseIEs_p->e_RABSetupListCtxtSURes.e_RABSetupItemCtxtSURes.array[0];
+    /* Bad, very bad cast... */
+    eRABSetupItemCtxtSURes_p = (S1ap_E_RABSetupItemCtxtSURes_t *)
+    initialContextSetupResponseIEs_p->e_RABSetupListCtxtSURes.s1ap_E_RABSetupItemCtxtSURes.array[0];
 
     modify_request_p = &message_p->msg.sgwModifyBearerRequest;
 //     modify_request_p->teid = ue_ref->teid;
-    modify_request_p->bearer_context_to_modify.eps_bearer_id     =
+    modify_request_p->bearer_context_to_modify.eps_bearer_id =
         eRABSetupItemCtxtSURes_p->e_RAB_ID;
     modify_request_p->bearer_context_to_modify.s1_eNB_fteid.teid = *((
                 uint32_t *)eRABSetupItemCtxtSURes_p->gTP_TEID.buf);
@@ -531,17 +534,17 @@ int s1ap_mme_handle_initial_context_setup_response(
 int s1ap_mme_handle_ue_context_release_request(uint32_t assoc_id,
         uint32_t stream, struct s1ap_message_s *message)
 {
-    UEContextReleaseRequestIEs_t *ueContextReleaseRequest_p;
+    S1ap_UEContextReleaseRequestIEs_t *ueContextReleaseRequest_p;
     ue_description_t *ue_ref = NULL;
 
-    ueContextReleaseRequest_p = &message->msg.ueContextReleaseRequestIEs;
+    ueContextReleaseRequest_p = &message->msg.s1ap_UEContextReleaseRequestIEs;
 
     /* The UE context release procedure is initiated if the cause is != than user inactivity.
      * TS36.413 #8.3.2.2.
      */
-    if (ueContextReleaseRequest_p->cause.present == Cause_PR_radioNetwork) {
+    if (ueContextReleaseRequest_p->cause.present == S1ap_Cause_PR_radioNetwork) {
         if (ueContextReleaseRequest_p->cause.choice.radioNetwork ==
-                CauseRadioNetwork_user_inactivity) {
+            S1ap_CauseRadioNetwork_user_inactivity) {
             return -1;
         }
     }
@@ -573,20 +576,20 @@ static int s1ap_mme_generate_ue_context_release_command(
     uint32_t length;
 
     s1ap_message message;
-    UEContextReleaseCommandIEs_t *ueContextReleaseCommandIEs_p;
+    S1ap_UEContextReleaseCommandIEs_t *ueContextReleaseCommandIEs_p;
 
     if (ue_ref == NULL) {
         return -1;
     }
     memset(&message, 0, sizeof(s1ap_message));
 
-    message.procedureCode = ProcedureCode_id_UEContextRelease;
+    message.procedureCode = S1ap_ProcedureCode_id_UEContextRelease;
     message.direction     = S1AP_PDU_PR_successfulOutcome;
 
-    ueContextReleaseCommandIEs_p = &message.msg.ueContextReleaseCommandIEs;
+    ueContextReleaseCommandIEs_p = &message.msg.s1ap_UEContextReleaseCommandIEs;
 
     /* Fill in ID pair */
-    ueContextReleaseCommandIEs_p->uE_S1AP_IDs.present = UE_S1AP_IDs_PR_uE_S1AP_ID_pair;
+    ueContextReleaseCommandIEs_p->uE_S1AP_IDs.present = S1ap_UE_S1AP_IDs_PR_uE_S1AP_ID_pair;
     ueContextReleaseCommandIEs_p->uE_S1AP_IDs.choice.uE_S1AP_ID_pair.mME_UE_S1AP_ID =
         ue_ref->mme_ue_s1ap_id;
     ueContextReleaseCommandIEs_p->uE_S1AP_IDs.choice.uE_S1AP_ID_pair.eNB_UE_S1AP_ID =
@@ -594,9 +597,9 @@ static int s1ap_mme_generate_ue_context_release_command(
     ueContextReleaseCommandIEs_p->uE_S1AP_IDs.choice.uE_S1AP_ID_pair.iE_Extensions =
         NULL;
 
-    ueContextReleaseCommandIEs_p->cause.present = Cause_PR_radioNetwork;
+    ueContextReleaseCommandIEs_p->cause.present = S1ap_Cause_PR_radioNetwork;
     ueContextReleaseCommandIEs_p->cause.choice.radioNetwork =
-        CauseRadioNetwork_release_due_to_eutran_generated_reason;
+    S1ap_CauseRadioNetwork_release_due_to_eutran_generated_reason;
 
     if (s1ap_mme_encode_pdu(&message, &buffer, &length) < 0) {
         return -1;
@@ -608,10 +611,10 @@ static int s1ap_mme_generate_ue_context_release_command(
 int s1ap_mme_handle_ue_context_release_complete(uint32_t assoc_id,
         uint32_t stream, struct s1ap_message_s *message)
 {
-    UEContextReleaseCompleteIEs_t *ueContextReleaseComplete_p;
+    S1ap_UEContextReleaseCompleteIEs_t *ueContextReleaseComplete_p;
     ue_description_t *ue_ref = NULL;
 
-    ueContextReleaseComplete_p = &message->msg.ueContextReleaseCompleteIEs;
+    ueContextReleaseComplete_p = &message->msg.s1ap_UEContextReleaseCompleteIEs;
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(
                       ueContextReleaseComplete_p->mme_ue_s1ap_id)) == NULL) {
@@ -632,13 +635,15 @@ int s1ap_mme_handle_ue_context_release_complete(uint32_t assoc_id,
 int s1ap_mme_handle_initial_context_setup_failure(uint32_t assoc_id,
         uint32_t stream, struct s1ap_message_s *message)
 {
-    InitialContextSetupFailureIEs_t *initialContextSetupFailureIEs_p;
-    ue_description_t              *ue_ref = NULL;
+    S1ap_InitialContextSetupFailureIEs_t *initialContextSetupFailureIEs_p;
+
+    ue_description_t *ue_ref = NULL;
 
-    initialContextSetupFailureIEs_p = &message->msg.initialContextSetupFailureIEs;
+    initialContextSetupFailureIEs_p = &message->msg.s1ap_InitialContextSetupFailureIEs;
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(
-                      initialContextSetupFailureIEs_p->mme_ue_s1ap_id)) == NULL) {
+        initialContextSetupFailureIEs_p->mme_ue_s1ap_id)) == NULL)
+    {
         /* MME doesn't know the MME UE S1AP ID provided. */
         return -1;
     }
@@ -659,11 +664,11 @@ int s1ap_mme_handle_initial_context_setup_failure(uint32_t assoc_id,
 int s1ap_mme_handle_path_switch_request(uint32_t assoc_id, uint32_t stream,
                                         struct s1ap_message_s *message)
 {
-    PathSwitchRequestIEs_t *pathSwitchRequest_p;
-    ue_description_t     *ue_ref;
-    uint32_t              eNB_ue_s1ap_id;
+    S1ap_PathSwitchRequestIEs_t *pathSwitchRequest_p;
+    ue_description_t *ue_ref;
+    uint32_t          eNB_ue_s1ap_id;
 
-    pathSwitchRequest_p = &message->msg.pathSwitchRequestIEs;
+    pathSwitchRequest_p = &message->msg.s1ap_PathSwitchRequestIEs;
 
     // eNB UE S1AP ID is limited to 24 bits
     eNB_ue_s1ap_id = (uint32_t)(pathSwitchRequest_p->eNB_UE_S1AP_ID & 0x00ffffff);
@@ -672,7 +677,8 @@ int s1ap_mme_handle_path_switch_request(uint32_t assoc_id, uint32_t stream,
                (int)eNB_ue_s1ap_id);
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(
-                      pathSwitchRequest_p->sourceMME_UE_S1AP_ID)) == NULL) {
+        pathSwitchRequest_p->sourceMME_UE_S1AP_ID)) == NULL)
+    {
         /* The MME UE S1AP ID provided by eNB doesn't point to any valid UE.
          * MME replies with a PATH SWITCH REQUEST FAILURE message and start operation
          * as described in TS 36.413 [11].
@@ -766,11 +772,12 @@ int s1ap_handle_create_session_response(SgwCreateSessionResponse
 
     ue_description_t *ue_ref = NULL;
     s1ap_message message;
-    InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
-    E_RABToBeSetupItemCtxtSUReq_t    e_RABToBeSetup;
     uint8_t *buffer_p;
     uint32_t length;
 
+    S1ap_InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
+    S1ap_E_RABToBeSetupItemCtxtSUReq_t    e_RABToBeSetup;
+
     DevAssert(session_response_p != NULL);
 
     DevCheck(session_response_p->bearer_context_created.cause == REQUEST_ACCEPTED,
@@ -792,12 +799,12 @@ int s1ap_handle_create_session_response(SgwCreateSessionResponse
     }
 
     memset(&message, 0, sizeof(s1ap_message));
-    memset(&e_RABToBeSetup, 0, sizeof(E_RABToBeSetupItemCtxtSUReq_t));
+    memset(&e_RABToBeSetup, 0, sizeof(S1ap_E_RABToBeSetupItemCtxtSUReq_t));
 
-    message.procedureCode = ProcedureCode_id_InitialContextSetup;
+    message.procedureCode = S1ap_ProcedureCode_id_InitialContextSetup;
     message.direction     = S1AP_PDU_PR_initiatingMessage;
 
-    initialContextSetupRequest_p = &message.msg.initialContextSetupRequestIEs;
+    initialContextSetupRequest_p = &message.msg.s1ap_InitialContextSetupRequestIEs;
 
     initialContextSetupRequest_p->mme_ue_s1ap_id = ue_ref->mme_ue_s1ap_id;
     initialContextSetupRequest_p->eNB_UE_S1AP_ID = ue_ref->eNB_ue_s1ap_id;
@@ -819,9 +826,9 @@ int s1ap_handle_create_session_response(SgwCreateSessionResponse
     e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.priorityLevel
         = 15; //No priority
     e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionCapability
-        = Pre_emptionCapability_shall_not_trigger_pre_emption;
+    = S1ap_Pre_emptionCapability_shall_not_trigger_pre_emption;
     e_RABToBeSetup.e_RABlevelQoSParameters.allocationRetentionPriority.pre_emptionVulnerability
-        = Pre_emptionVulnerability_not_pre_emptable;
+    = S1ap_Pre_emptionVulnerability_not_pre_emptable;
 
 //     e_RABToBeSetup.gTP_TEID.buf  = calloc(4, sizeof(uint8_t));
 //     INT32_TO_BUFFER(session_response_p->bearer_context_created.s1u_sgw_fteid.teid,
diff --git a/openair-cn/S1AP/s1ap_mme_handlers.h b/openair-cn/S1AP/s1ap_mme_handlers.h
index a6113a08c55bd3005f3dc4c9c67347661fee7248..71e93429a3fb8cc168f7d8947835d714f11d9717 100644
--- a/openair-cn/S1AP/s1ap_mme_handlers.h
+++ b/openair-cn/S1AP/s1ap_mme_handlers.h
@@ -82,10 +82,10 @@ int s1ap_handle_new_association(sctp_new_peer_t *sctp_new_peer_p);
 int s1ap_handle_create_session_response(SgwCreateSessionResponse
                                         *session_response_p);
 
-int s1ap_mme_set_cause(Cause_t *cause_p, Cause_PR cause_type, long cause_value);
+int s1ap_mme_set_cause(S1ap_Cause_t *cause_p, S1ap_Cause_PR cause_type, long cause_value);
 
 int s1ap_mme_generate_s1_setup_failure(
-    uint32_t assoc_id, Cause_PR cause_type, long cause_value,
+    uint32_t assoc_id, S1ap_Cause_PR cause_type, long cause_value,
     long time_to_wait);
 
 #endif /* S1AP_MME_HANDLERS_H_ */
diff --git a/openair-cn/S1AP/s1ap_mme_nas_procedures.c b/openair-cn/S1AP/s1ap_mme_nas_procedures.c
index 54c3f5070a2ce08eedd59f3e9884b06b01af1193..a259f653196bd9795c076eee8bbaff2d38ec1692 100644
--- a/openair-cn/S1AP/s1ap_mme_nas_procedures.c
+++ b/openair-cn/S1AP/s1ap_mme_nas_procedures.c
@@ -57,12 +57,12 @@ static uint8_t  mme_ue_s1ap_id_has_wrapped = 0;
 int s1ap_mme_handle_initial_ue_message(uint32_t assoc_id, uint32_t stream,
                                        struct s1ap_message_s *message)
 {
-    InitialUEMessageIEs_t *initialUEMessage_p;
+    S1ap_InitialUEMessageIEs_t *initialUEMessage_p;
     ue_description_t      *ue_ref;
     eNB_description_t     *eNB_ref;
     uint32_t               eNB_ue_s1ap_id;
 
-    initialUEMessage_p = &message->msg.initialUEMessageIEs;
+    initialUEMessage_p = &message->msg.s1ap_InitialUEMessageIEs;
 
     if ((eNB_ref = s1ap_is_eNB_assoc_id_in_list(assoc_id)) == NULL) {
         S1AP_DEBUG("Unkwnon eNB on assoc_id %d\n", assoc_id);
@@ -173,10 +173,10 @@ int s1ap_mme_handle_initial_ue_message(uint32_t assoc_id, uint32_t stream,
 int s1ap_mme_handle_uplink_nas_transport(uint32_t assoc_id, uint32_t stream,
         struct s1ap_message_s *message)
 {
-    UplinkNASTransportIEs_t *uplinkNASTransport_p;
+    S1ap_UplinkNASTransportIEs_t *uplinkNASTransport_p;
     ue_description_t *ue_ref;
 
-    uplinkNASTransport_p = &message->msg.uplinkNASTransportIEs;
+    uplinkNASTransport_p = &message->msg.s1ap_UplinkNASTransportIEs;
 
     if ((ue_ref = s1ap_is_ue_mme_id_in_list(uplinkNASTransport_p->mme_ue_s1ap_id))
             == NULL) {
@@ -224,15 +224,16 @@ int s1ap_generate_downlink_nas_transport(nas_dl_data_ind_t *nas_dl_data_ind)
         /* We have fount the UE in the list.
          * Create new IE list message and encode it.
          */
-        DownlinkNASTransportIEs_t *downlinkNasTransport;
-        s1ap_message               message;
+        S1ap_DownlinkNASTransportIEs_t *downlinkNasTransport;
+
+        s1ap_message message;
 
         memset(&message, 0, sizeof(s1ap_message));
 
-        message.procedureCode = ProcedureCode_id_downlinkNASTransport;
+        message.procedureCode = S1ap_ProcedureCode_id_downlinkNASTransport;
         message.direction     = S1AP_PDU_PR_initiatingMessage;
 
-        downlinkNasTransport = &message.msg.downlinkNASTransportIEs;
+        downlinkNasTransport = &message.msg.s1ap_DownlinkNASTransportIEs;
 
         /* Setting UE informations with the ones fount in ue_ref */
         downlinkNasTransport->mme_ue_s1ap_id = ue_ref->mme_ue_s1ap_id;
@@ -264,11 +265,12 @@ int s1ap_handle_attach_accepted(nas_attach_accept_t *attach_accept_p)
     uint32_t length;
 
     ue_description_t *ue_ref = NULL;
-    InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
     s1ap_message message;
-    E_RABToBeSetupItemCtxtSUReq_t   e_RABToBeSetup;
     s1ap_initial_ctxt_setup_req_t *initial_p;
 
+    S1ap_InitialContextSetupRequestIEs_t *initialContextSetupRequest_p;
+    S1ap_E_RABToBeSetupItemCtxtSUReq_t    e_RABToBeSetup;
+
     DevAssert(attach_accept_p != NULL);
 
     initial_p = &attach_accept_p->transparent;
@@ -290,12 +292,12 @@ int s1ap_handle_attach_accepted(nas_attach_accept_t *attach_accept_p)
 //     s1ap_timer_insert(ue_ref->mme_ue_s1ap_id, ue_ref->outcome_response_timer_id);
 
     memset(&message, 0, sizeof(s1ap_message));
-    memset(&e_RABToBeSetup, 0, sizeof(E_RABToBeSetupItemCtxtSUReq_t));
+    memset(&e_RABToBeSetup, 0, sizeof(S1ap_E_RABToBeSetupItemCtxtSUReq_t));
 
-    message.procedureCode = ProcedureCode_id_InitialContextSetup;
+    message.procedureCode = S1ap_ProcedureCode_id_InitialContextSetup;
     message.direction     = S1AP_PDU_PR_initiatingMessage;
 
-    initialContextSetupRequest_p = &message.msg.initialContextSetupRequestIEs;
+    initialContextSetupRequest_p = &message.msg.s1ap_InitialContextSetupRequestIEs;
 
     initialContextSetupRequest_p->mme_ue_s1ap_id = (unsigned long)ue_ref->mme_ue_s1ap_id;
     initialContextSetupRequest_p->eNB_UE_S1AP_ID = (unsigned long)ue_ref->eNB_ue_s1ap_id;
diff --git a/openair-cn/S1AP/s1ap_mme_ta.c b/openair-cn/S1AP/s1ap_mme_ta.c
index 97191978f86a0269023d0b4863b249abc71fdda8..02ccc35a3952e473bff0de1f8c48748a8053f7f2 100644
--- a/openair-cn/S1AP/s1ap_mme_ta.c
+++ b/openair-cn/S1AP/s1ap_mme_ta.c
@@ -42,7 +42,7 @@
 #include "s1ap_mme_ta.h"
 
 static
-int s1ap_mme_compare_plmn(PLMNidentity_t *plmn)
+int s1ap_mme_compare_plmn(S1ap_PLMNidentity_t *plmn)
 {
     int i;
     uint16_t mcc;
@@ -69,7 +69,7 @@ int s1ap_mme_compare_plmn(PLMNidentity_t *plmn)
 /* @brief compare a list of broadcasted plmns against the MME configured.
  */
 static
-int s1ap_mme_compare_plmns(BPLMNs_t *b_plmns)
+int s1ap_mme_compare_plmns(S1ap_BPLMNs_t *b_plmns)
 {
     int i;
     int matching_occurence = 0;
@@ -93,7 +93,7 @@ int s1ap_mme_compare_plmns(BPLMNs_t *b_plmns)
 /* @brief compare a TAC
  */
 static
-int s1ap_mme_compare_tac(TAC_t *tac)
+int s1ap_mme_compare_tac(S1ap_TAC_t *tac)
 {
     int i;
     uint16_t tac_value;
@@ -120,7 +120,7 @@ int s1ap_mme_compare_tac(TAC_t *tac)
  *         - TA_LIST_UNKNOWN_TAC if at least one PLMN match and no TAC match
  *         - TA_LIST_RET_OK if both tac and plmn match at least one element
  */
-int s1ap_mme_compare_ta_lists(SupportedTAs_t *ta_list)
+int s1ap_mme_compare_ta_lists(S1ap_SupportedTAs_t *ta_list)
 {
     int i;
     int tac_ret, bplmn_ret;
@@ -129,7 +129,7 @@ int s1ap_mme_compare_ta_lists(SupportedTAs_t *ta_list)
 
     /* Parse every item in the list and try to find matching parameters */
     for (i = 0; i < ta_list->list.count; i++) {
-        SupportedTAs_Item_t *ta;
+        S1ap_SupportedTAs_Item_t *ta;
 
         ta = ta_list->list.array[i];
         DevAssert(ta != NULL);
diff --git a/openair-cn/S1AP/s1ap_mme_ta.h b/openair-cn/S1AP/s1ap_mme_ta.h
index 6b5cbd789696d8374c5dedab4191f52a884b772b..cfcb593df95699785f258f5a6ad911f6c569711f 100644
--- a/openair-cn/S1AP/s1ap_mme_ta.h
+++ b/openair-cn/S1AP/s1ap_mme_ta.h
@@ -40,6 +40,6 @@ enum {
     TA_LIST_COMPLETE_MATCH = 0x3,
 };
 
-int s1ap_mme_compare_ta_lists(SupportedTAs_t *ta_list);
+int s1ap_mme_compare_ta_lists(S1ap_SupportedTAs_t *ta_list);
 
 #endif /* S1AP_MME_TA_H_ */