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

Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172
1 year ago · 1ddedcfa46
parent 52eabf3a55
commit 1ddedcfa46
1159 changed files with 1798 additions and 1811 deletions
--- a/include/osmocom/ranap/RANAP_APN.h
+++ b/include/osmocom/ranap/RANAP_APN.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_APN_H_
--- a/include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h
+++ b/include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AccuracyFulfilmentIndicator_H_
--- a/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
+++ b/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AllocationOrRetentionPriority_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_GuaranteedBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_GuaranteedBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_GuaranteedBitrateType_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_GuaranteedBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_MaxBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_MaxBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_MaxBitrateType_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_MaxBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_SupportedGuaranteedBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_SupportedMaxBitrateInf_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameter_SupportedMaxBitrates_H_
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Alt_RAB_Parameters_H_
--- a/include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h
+++ b/include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AlternativeRABConfigurationRequest_H_
--- a/include/osmocom/ranap/RANAP_AreaIdentity.h
+++ b/include/osmocom/ranap/RANAP_AreaIdentity.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AreaIdentity_H_
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Ass_RAB_Parameter_ExtendedMaxBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Ass_RAB_Parameter_GuaranteedBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Ass_RAB_Parameter_MaxBitrateList_H_
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Ass_RAB_Parameters_H_
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AuthorisedPLMNs_H_
@ -25,7 +25,7 @@ extern "C" {

 /* RANAP_AuthorisedPLMNs */
 typedef struct RANAP_AuthorisedPLMNs {
-	A_SEQUENCE_OF(struct MemberC {
+	A_SEQUENCE_OF(struct RANAP_AuthorisedPLMNs__Member {
 		RANAP_PLMNidentity_t	 pLMNidentity;
 		RANAP_AuthorisedSNAs_t	*authorisedSNAsList	/* OPTIONAL */;
 		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
--- a/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_AuthorisedSNAs_H_
--- a/include/osmocom/ranap/RANAP_BindingID.h
+++ b/include/osmocom/ranap/RANAP_BindingID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_BindingID_H_
--- a/include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h
+++ b/include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_BroadcastAssistanceDataDecipheringKeys_H_
--- a/include/osmocom/ranap/RANAP_CGI.h
+++ b/include/osmocom/ranap/RANAP_CGI.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CGI_H_
--- a/include/osmocom/ranap/RANAP_CI.h
+++ b/include/osmocom/ranap/RANAP_CI.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CI_H_
--- a/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CN_DeactivateTrace_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_CN-DeactivateTrace */
 typedef struct RANAP_CN_DeactivateTrace {
-	struct cN_DeactivateTrace_ies {
+	struct RANAP_CN_DeactivateTrace__cN_DeactivateTrace_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
--- a/include/osmocom/ranap/RANAP_CN-DomainIndicator.h
+++ b/include/osmocom/ranap/RANAP_CN-DomainIndicator.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CN_DomainIndicator_H_
--- a/include/osmocom/ranap/RANAP_CN-ID.h
+++ b/include/osmocom/ranap/RANAP_CN-ID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CN_ID_H_
--- a/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CN_InvokeTrace_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_CN-InvokeTrace */
 typedef struct RANAP_CN_InvokeTrace {
-	struct cN_InvokeTrace_ies {
+	struct RANAP_CN_InvokeTrace__cN_InvokeTrace_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
--- a/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
+++ b/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CNMBMSLinkingInformation_H_
--- a/include/osmocom/ranap/RANAP_CSFB-Information.h
+++ b/include/osmocom/ranap/RANAP_CSFB-Information.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CSFB_Information_H_
--- a/include/osmocom/ranap/RANAP_CSG-Id-List.h
+++ b/include/osmocom/ranap/RANAP_CSG-Id-List.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CSG_Id_List_H_
--- a/include/osmocom/ranap/RANAP_CSG-Id.h
+++ b/include/osmocom/ranap/RANAP_CSG-Id.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CSG_Id_H_
--- a/include/osmocom/ranap/RANAP_CSG-Membership-Status.h
+++ b/include/osmocom/ranap/RANAP_CSG-Membership-Status.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CSG_Membership_Status_H_
--- a/include/osmocom/ranap/RANAP_Cause.h
+++ b/include/osmocom/ranap/RANAP_Cause.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Cause_H_
--- a/include/osmocom/ranap/RANAP_CauseMisc.h
+++ b/include/osmocom/ranap/RANAP_CauseMisc.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseMisc_H_
--- a/include/osmocom/ranap/RANAP_CauseNAS.h
+++ b/include/osmocom/ranap/RANAP_CauseNAS.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseNAS_H_
--- a/include/osmocom/ranap/RANAP_CauseNon-Standard.h
+++ b/include/osmocom/ranap/RANAP_CauseNon-Standard.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseNon_Standard_H_
--- a/include/osmocom/ranap/RANAP_CauseProtocol.h
+++ b/include/osmocom/ranap/RANAP_CauseProtocol.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseProtocol_H_
--- a/include/osmocom/ranap/RANAP_CauseRadioNetwork.h
+++ b/include/osmocom/ranap/RANAP_CauseRadioNetwork.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseRadioNetwork_H_
--- a/include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h
+++ b/include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseRadioNetworkExtension_H_
--- a/include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h
+++ b/include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CauseTransmissionNetwork_H_
--- a/include/osmocom/ranap/RANAP_Cell-Access-Mode.h
+++ b/include/osmocom/ranap/RANAP_Cell-Access-Mode.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Cell_Access_Mode_H_
--- a/include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h
+++ b/include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Cell_Capacity_Class_Value_H_
--- a/include/osmocom/ranap/RANAP_Cell-Id.h
+++ b/include/osmocom/ranap/RANAP_Cell-Id.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Cell_Id_H_
--- a/include/osmocom/ranap/RANAP_CellBased.h
+++ b/include/osmocom/ranap/RANAP_CellBased.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CellBased_H_
--- a/include/osmocom/ranap/RANAP_CellIdList.h
+++ b/include/osmocom/ranap/RANAP_CellIdList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CellIdList_H_
--- a/include/osmocom/ranap/RANAP_CellLoadInformation.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformation.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CellLoadInformation_H_
--- a/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CellLoadInformationGroup_H_
--- a/include/osmocom/ranap/RANAP_CellType.h
+++ b/include/osmocom/ranap/RANAP_CellType.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CellType_H_
--- a/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */
 #include <constr_CHOICE.h>

--- a/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */
 #include <constr_CHOICE.h>

--- a/include/osmocom/ranap/RANAP_ClassmarkInformation2.h
+++ b/include/osmocom/ranap/RANAP_ClassmarkInformation2.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_ClassmarkInformation2_H_
--- a/include/osmocom/ranap/RANAP_ClassmarkInformation3.h
+++ b/include/osmocom/ranap/RANAP_ClassmarkInformation3.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_ClassmarkInformation3_H_
--- a/include/osmocom/ranap/RANAP_ClientType.h
+++ b/include/osmocom/ranap/RANAP_ClientType.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_ClientType_H_
--- a/include/osmocom/ranap/RANAP_CommonID.h
+++ b/include/osmocom/ranap/RANAP_CommonID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CommonID_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_CommonID */
 typedef struct RANAP_CommonID {
-	struct commonID_ies {
+	struct RANAP_CommonID__commonID_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
--- a/include/osmocom/ranap/RANAP_Correlation-ID.h
+++ b/include/osmocom/ranap/RANAP_Correlation-ID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Correlation_ID_H_
--- a/include/osmocom/ranap/RANAP_Criticality.h
+++ b/include/osmocom/ranap/RANAP_Criticality.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-CommonDataTypes"
 * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_Criticality_H_
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CriticalityDiagnostics_IE_List_H_
@ -26,7 +26,7 @@ extern "C" {

 /* RANAP_CriticalityDiagnostics-IE-List */
 typedef struct RANAP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct MemberG {
+	A_SEQUENCE_OF(struct RANAP_CriticalityDiagnostics_IE_List__Member {
 		RANAP_Criticality_t	 iECriticality;
 		RANAP_ProtocolIE_ID_t	 iE_ID;
 		RANAP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_CriticalityDiagnostics_H_
--- a/include/osmocom/ranap/RANAP_D-RNTI.h
+++ b/include/osmocom/ranap/RANAP_D-RNTI.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_D_RNTI_H_
--- a/include/osmocom/ranap/RANAP_DCH-ID.h
+++ b/include/osmocom/ranap/RANAP_DCH-ID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DCH_ID_H_
--- a/include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h
+++ b/include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DL_GTP_PDU_SequenceNumber_H_
--- a/include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h
+++ b/include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DL_N_PDU_SequenceNumber_H_
--- a/include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h
+++ b/include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DRX_CycleLengthCoefficient_H_
--- a/include/osmocom/ranap/RANAP_DSCH-ID.h
+++ b/include/osmocom/ranap/RANAP_DSCH-ID.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DSCH_ID_H_
--- a/include/osmocom/ranap/RANAP_DataPDUType.h
+++ b/include/osmocom/ranap/RANAP_DataPDUType.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataPDUType_H_
--- a/include/osmocom/ranap/RANAP_DataVolumeList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataVolumeList_H_
@ -25,7 +25,7 @@ extern "C" {

 /* RANAP_DataVolumeList */
 typedef struct RANAP_DataVolumeList {
-	A_SEQUENCE_OF(struct MemberH {
+	A_SEQUENCE_OF(struct RANAP_DataVolumeList__Member {
 		RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
 		RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
 		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
--- a/include/osmocom/ranap/RANAP_DataVolumeReference.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReference.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-IEs"
 * 	found in "../../asn1/ranap/RANAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataVolumeReference_H_
--- a/include/osmocom/ranap/RANAP_DataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReport.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataVolumeReport_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_DataVolumeReport */
 typedef struct RANAP_DataVolumeReport {
-	struct dataVolumeReport_ies {
+	struct RANAP_DataVolumeReport__dataVolumeReport_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
--- a/include/osmocom/ranap/RANAP_DataVolumeReportList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportList.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataVolumeReportList_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_DataVolumeReportList */
 typedef struct RANAP_DataVolumeReportList {
-	struct dataVolumeReportListe_ies {
+	struct RANAP_DataVolumeReportList__dataVolumeReportListe_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
--- a/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
@ -2,7 +2,7 @@
 * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
 * From ASN.1 module "RANAP-PDU"
 * 	found in "../../asn1/ranap/RANAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -fcompound-names -R`
 */

 #ifndef	_RANAP_DataVolumeReportRequest_H_
@ -23,7 +23,7 @@ extern "C" {

 /* RANAP_DataVolumeReportRequest */
 typedef struct RANAP_DataVolumeReportRequest {
-	struct dataVolumeReportRequest_ies {
+	struct RANAP_DataVolumeReportRequest__dataVolumeReportRequest_ies {
 		A_SEQUENCE_OF(RANAP_IE_t) list;
 <