rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs

Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c

35 files changed, 79 insertions, 79 deletions

diff --git a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
index 26e5d62..9c78efd 100644
--- a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
+++ b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Ansi_41_IDNNS_H_
diff --git a/include/osmocom/rua/RUA_CN-DomainIndicator.h b/include/osmocom/rua/RUA_CN-DomainIndicator.h
index 507558b..60eadb9 100644
--- a/include/osmocom/rua/RUA_CN-DomainIndicator.h
+++ b/include/osmocom/rua/RUA_CN-DomainIndicator.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CN_DomainIndicator_H_
diff --git a/include/osmocom/rua/RUA_CSGMembershipStatus.h b/include/osmocom/rua/RUA_CSGMembershipStatus.h
index a4889ca..cc5cbb6 100644
--- a/include/osmocom/rua/RUA_CSGMembershipStatus.h
+++ b/include/osmocom/rua/RUA_CSGMembershipStatus.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CSGMembershipStatus_H_
diff --git a/include/osmocom/rua/RUA_Cause.h b/include/osmocom/rua/RUA_Cause.h
index 8269f9f..860b7e1 100644
--- a/include/osmocom/rua/RUA_Cause.h
+++ b/include/osmocom/rua/RUA_Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Cause_H_
diff --git a/include/osmocom/rua/RUA_CauseMisc.h b/include/osmocom/rua/RUA_CauseMisc.h
index 45ca8db..ffb4fe7 100644
--- a/include/osmocom/rua/RUA_CauseMisc.h
+++ b/include/osmocom/rua/RUA_CauseMisc.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseMisc_H_
diff --git a/include/osmocom/rua/RUA_CauseProtocol.h b/include/osmocom/rua/RUA_CauseProtocol.h
index b857ce5..661105c 100644
--- a/include/osmocom/rua/RUA_CauseProtocol.h
+++ b/include/osmocom/rua/RUA_CauseProtocol.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseProtocol_H_
diff --git a/include/osmocom/rua/RUA_CauseRadioNetwork.h b/include/osmocom/rua/RUA_CauseRadioNetwork.h
index 6a28791..47a6ebd 100644
--- a/include/osmocom/rua/RUA_CauseRadioNetwork.h
+++ b/include/osmocom/rua/RUA_CauseRadioNetwork.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseRadioNetwork_H_
diff --git a/include/osmocom/rua/RUA_CauseTransport.h b/include/osmocom/rua/RUA_CauseTransport.h
index d46e434..a18cca5 100644
--- a/include/osmocom/rua/RUA_CauseTransport.h
+++ b/include/osmocom/rua/RUA_CauseTransport.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CauseTransport_H_
diff --git a/include/osmocom/rua/RUA_Connect.h b/include/osmocom/rua/RUA_Connect.h
index 7ea12e3..b006269 100644
--- a/include/osmocom/rua/RUA_Connect.h
+++ b/include/osmocom/rua/RUA_Connect.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Connect_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_Connect */
 typedef struct RUA_Connect {
-	struct connect_ies {
+	struct RUA_Connect__connect_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ConnectionlessTransfer.h b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
index 65e2078..c14ee5a 100644
--- a/include/osmocom/rua/RUA_ConnectionlessTransfer.h
+++ b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ConnectionlessTransfer_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_ConnectionlessTransfer */
 typedef struct RUA_ConnectionlessTransfer {
-	struct connectionlessTransfer_ies {
+	struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Context-ID.h b/include/osmocom/rua/RUA_Context-ID.h
index 45c9489..b96a7bb 100644
--- a/include/osmocom/rua/RUA_Context-ID.h
+++ b/include/osmocom/rua/RUA_Context-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Context_ID_H_
diff --git a/include/osmocom/rua/RUA_Criticality.h b/include/osmocom/rua/RUA_Criticality.h
index 781dd0c..26a330c 100644
--- a/include/osmocom/rua/RUA_Criticality.h
+++ b/include/osmocom/rua/RUA_Criticality.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Criticality_H_
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
index ae84738..0f948d3 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CriticalityDiagnostics_IE_List_H_
@@ -26,7 +26,7 @@ extern "C" {
 
 /* RUA_CriticalityDiagnostics-IE-List */
 typedef struct RUA_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct RUA_CriticalityDiagnostics_IE_List__Member {
 		RUA_Criticality_t	 iECriticality;
 		RUA_ProtocolIE_ID_t	 iE_ID;
 		RUA_TypeOfError_t	 typeOfError;
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics.h b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
index 98d2aa4..b4d6d96 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_CriticalityDiagnostics_H_
diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h
index dd72260..8de1593 100644
--- a/include/osmocom/rua/RUA_DirectTransfer.h
+++ b/include/osmocom/rua/RUA_DirectTransfer.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_DirectTransfer_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_DirectTransfer */
 typedef struct RUA_DirectTransfer {
-	struct directTransfer_ies {
+	struct RUA_DirectTransfer__directTransfer_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Disconnect.h b/include/osmocom/rua/RUA_Disconnect.h
index 2e23cd9..ff24255 100644
--- a/include/osmocom/rua/RUA_Disconnect.h
+++ b/include/osmocom/rua/RUA_Disconnect.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Disconnect_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_Disconnect */
 typedef struct RUA_Disconnect {
-	struct disconnect_ies {
+	struct RUA_Disconnect__disconnect_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h
index a8e2124..28785f1 100644
--- a/include/osmocom/rua/RUA_ErrorIndication.h
+++ b/include/osmocom/rua/RUA_ErrorIndication.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ErrorIndication_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_ErrorIndication */
 typedef struct RUA_ErrorIndication {
-	struct errorIndication_ies {
+	struct RUA_ErrorIndication__errorIndication_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Establishment-Cause.h b/include/osmocom/rua/RUA_Establishment-Cause.h
index 0c855b4..ccc7521 100644
--- a/include/osmocom/rua/RUA_Establishment-Cause.h
+++ b/include/osmocom/rua/RUA_Establishment-Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Establishment_Cause_H_
diff --git a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
index f2939fe..634103c 100644
--- a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
+++ b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Gsm_map_IDNNS_H_
@@ -22,66 +22,66 @@ extern "C" {
 #endif
 
 /* Dependencies */
-typedef enum routingbasis_PR {
-	routingbasis_PR_NOTHING,	/* No components present */
-	routingbasis_PR_localPTMSI,
-	routingbasis_PR_tMSIofsamePLMN,
-	routingbasis_PR_tMSIofdifferentPLMN,
-	routingbasis_PR_iMSIresponsetopaging,
-	routingbasis_PR_iMSIcauseUEinitiatedEvent,
-	routingbasis_PR_iMEI,
-	routingbasis_PR_spare2,
-	routingbasis_PR_spare1
-} routingbasis_PR;
+typedef enum RUA_Gsm_map_IDNNS__routingbasis_PR {
+	RUA_Gsm_map_IDNNS__routingbasis_PR_NOTHING,	/* No components present */
+	RUA_Gsm_map_IDNNS__routingbasis_PR_localPTMSI,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofsamePLMN,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofdifferentPLMN,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIresponsetopaging,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIcauseUEinitiatedEvent,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_iMEI,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_spare2,
+	RUA_Gsm_map_IDNNS__routingbasis_PR_spare1
+} RUA_Gsm_map_IDNNS__routingbasis_PR;
 
 /* RUA_Gsm-map-IDNNS */
 typedef struct RUA_Gsm_map_IDNNS {
-	struct routingbasis {
-		routingbasis_PR present;
+	struct RUA_Gsm_map_IDNNS__routingbasis {
+		RUA_Gsm_map_IDNNS__routingbasis_PR present;
 		union RUA_Gsm_map_IDNNS__routingbasis_u {
-			struct localPTMSI {
+			struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} localPTMSI;
-			struct tMSIofsamePLMN {
+			struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} tMSIofsamePLMN;
-			struct tMSIofdifferentPLMN {
+			struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} tMSIofdifferentPLMN;
-			struct iMSIresponsetopaging {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMSIresponsetopaging;
-			struct iMSIcauseUEinitiatedEvent {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMSIcauseUEinitiatedEvent;
-			struct iMEI {
+			struct RUA_Gsm_map_IDNNS__routingbasis__iMEI {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} iMEI;
-			struct spare2 {
+			struct RUA_Gsm_map_IDNNS__routingbasis__spare2 {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} spare2;
-			struct spare1 {
+			struct RUA_Gsm_map_IDNNS__routingbasis__spare1 {
 				RUA_RoutingParameter_t	 routingparameter;
 				
 				/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_IE-Extensions.h b/include/osmocom/rua/RUA_IE-Extensions.h
index c92210f..364cbd5 100644
--- a/include/osmocom/rua/RUA_IE-Extensions.h
+++ b/include/osmocom/rua/RUA_IE-Extensions.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IE_Extensions_H_
diff --git a/include/osmocom/rua/RUA_IE.h b/include/osmocom/rua/RUA_IE.h
index 509b140..2881366 100644
--- a/include/osmocom/rua/RUA_IE.h
+++ b/include/osmocom/rua/RUA_IE.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IE_H_
diff --git a/include/osmocom/rua/RUA_InitiatingMessage.h b/include/osmocom/rua/RUA_InitiatingMessage.h
index d372834..61dd089 100644
--- a/include/osmocom/rua/RUA_InitiatingMessage.h
+++ b/include/osmocom/rua/RUA_InitiatingMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_InitiatingMessage_H_
diff --git a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
index 186bd8c..78c88e7 100644
--- a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
+++ b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_IntraDomainNasNodeSelector_H_
@@ -23,25 +23,25 @@ extern "C" {
 #endif
 
 /* Dependencies */
-typedef enum version_PR {
-	version_PR_NOTHING,	/* No components present */
-	version_PR_release99,
-	version_PR_later
-} version_PR;
-typedef enum cn_Type_PR {
-	cn_Type_PR_NOTHING,	/* No components present */
-	cn_Type_PR_gsm_Map_IDNNS,
-	cn_Type_PR_ansi_41_IDNNS
-} cn_Type_PR;
+typedef enum RUA_IntraDomainNasNodeSelector__version_PR {
+	RUA_IntraDomainNasNodeSelector__version_PR_NOTHING,	/* No components present */
+	RUA_IntraDomainNasNodeSelector__version_PR_release99,
+	RUA_IntraDomainNasNodeSelector__version_PR_later
+} RUA_IntraDomainNasNodeSelector__version_PR;
+typedef enum RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR {
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_NOTHING,	/* No components present */
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_gsm_Map_IDNNS,
+	RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_ansi_41_IDNNS
+} RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR;
 
 /* RUA_IntraDomainNasNodeSelector */
 typedef struct RUA_IntraDomainNasNodeSelector {
-	struct version {
-		version_PR present;
+	struct RUA_IntraDomainNasNodeSelector__version {
+		RUA_IntraDomainNasNodeSelector__version_PR present;
 		union RUA_IntraDomainNasNodeSelector__version_u {
-			struct release99 {
-				struct cn_Type {
-					cn_Type_PR present;
+			struct RUA_IntraDomainNasNodeSelector__version__release99 {
+				struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type {
+					RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR present;
 					union RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_u {
 						RUA_Gsm_map_IDNNS_t	 gsm_Map_IDNNS;
 						RUA_Ansi_41_IDNNS_t	 ansi_41_IDNNS;
@@ -54,7 +54,7 @@ typedef struct RUA_IntraDomainNasNodeSelector {
 				/* Context for parsing across buffer boundaries */
 				asn_struct_ctx_t _asn_ctx;
 			} release99;
-			struct later {
+			struct RUA_IntraDomainNasNodeSelector__version__later {
 				BIT_STRING_t	 futurecoding;
 				
 				/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_Presence.h b/include/osmocom/rua/RUA_Presence.h
index d583d7d..b241dae 100644
--- a/include/osmocom/rua/RUA_Presence.h
+++ b/include/osmocom/rua/RUA_Presence.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_Presence_H_
diff --git a/include/osmocom/rua/RUA_PrivateIE-ID.h b/include/osmocom/rua/RUA_PrivateIE-ID.h
index 1aa7d07..602439d 100644
--- a/include/osmocom/rua/RUA_PrivateIE-ID.h
+++ b/include/osmocom/rua/RUA_PrivateIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_PrivateIE_ID_H_
diff --git a/include/osmocom/rua/RUA_PrivateMessage.h b/include/osmocom/rua/RUA_PrivateMessage.h
index fcea8fa..d385bf0 100644
--- a/include/osmocom/rua/RUA_PrivateMessage.h
+++ b/include/osmocom/rua/RUA_PrivateMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_PrivateMessage_H_
@@ -23,7 +23,7 @@ extern "C" {
 
 /* RUA_PrivateMessage */
 typedef struct RUA_PrivateMessage {
-	struct privateMessage_ies {
+	struct RUA_PrivateMessage__privateMessage_ies {
 		A_SEQUENCE_OF(RUA_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/rua/RUA_ProcedureCode.h b/include/osmocom/rua/RUA_ProcedureCode.h
index 63c5974..616a6df 100644
--- a/include/osmocom/rua/RUA_ProcedureCode.h
+++ b/include/osmocom/rua/RUA_ProcedureCode.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ProcedureCode_H_
diff --git a/include/osmocom/rua/RUA_ProtocolIE-ID.h b/include/osmocom/rua/RUA_ProtocolIE-ID.h
index 8fc5915..db53b3c 100644
--- a/include/osmocom/rua/RUA_ProtocolIE-ID.h
+++ b/include/osmocom/rua/RUA_ProtocolIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_ProtocolIE_ID_H_
diff --git a/include/osmocom/rua/RUA_RANAP-Message.h b/include/osmocom/rua/RUA_RANAP-Message.h
index b32c301..b5d2ffc 100644
--- a/include/osmocom/rua/RUA_RANAP-Message.h
+++ b/include/osmocom/rua/RUA_RANAP-Message.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RANAP_Message_H_
diff --git a/include/osmocom/rua/RUA_RUA-PDU.h b/include/osmocom/rua/RUA_RUA-PDU.h
index 334da5b..77fb655 100644
--- a/include/osmocom/rua/RUA_RUA-PDU.h
+++ b/include/osmocom/rua/RUA_RUA-PDU.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RUA_PDU_H_
diff --git a/include/osmocom/rua/RUA_RoutingParameter.h b/include/osmocom/rua/RUA_RoutingParameter.h
index b917f46..9766176 100644
--- a/include/osmocom/rua/RUA_RoutingParameter.h
+++ b/include/osmocom/rua/RUA_RoutingParameter.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_RoutingParameter_H_
diff --git a/include/osmocom/rua/RUA_SuccessfulOutcome.h b/include/osmocom/rua/RUA_SuccessfulOutcome.h
index fb8924e..b7208f5 100644
--- a/include/osmocom/rua/RUA_SuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_SuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_SuccessfulOutcome_H_
diff --git a/include/osmocom/rua/RUA_TriggeringMessage.h b/include/osmocom/rua/RUA_TriggeringMessage.h
index b6dfb8b..c1e017b 100644
--- a/include/osmocom/rua/RUA_TriggeringMessage.h
+++ b/include/osmocom/rua/RUA_TriggeringMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-CommonDataTypes"
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_TriggeringMessage_H_
diff --git a/include/osmocom/rua/RUA_TypeOfError.h b/include/osmocom/rua/RUA_TypeOfError.h
index 51bdab7..7d6cf41 100644
--- a/include/osmocom/rua/RUA_TypeOfError.h
+++ b/include/osmocom/rua/RUA_TypeOfError.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-IEs"
  * 	found in "../../asn1/rua/RUA-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_TypeOfError_H_
diff --git a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
index b7058f9..09e1a13 100644
--- a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "RUA-PDU"
  * 	found in "../../asn1/rua/RUA-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_RUA_UnsuccessfulOutcome_H_