Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Wed Oct 27 15:22:56 UTC 2021


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 )


Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs
......................................................................

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

Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696
---
M include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h
M include/osmocom/hnbap/HNBAP_AccessResult.h
M include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h
M include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h
M include/osmocom/hnbap/HNBAP_BackoffTimer.h
M include/osmocom/hnbap/HNBAP_BindingID.h
M include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h
M include/osmocom/hnbap/HNBAP_CGI.h
M include/osmocom/hnbap/HNBAP_CI.h
M include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h
M include/osmocom/hnbap/HNBAP_CSG-Capability.h
M include/osmocom/hnbap/HNBAP_CSG-ID.h
M include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h
M include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h
M include/osmocom/hnbap/HNBAP_Cause.h
M include/osmocom/hnbap/HNBAP_CauseMisc.h
M include/osmocom/hnbap/HNBAP_CauseProtocol.h
M include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h
M include/osmocom/hnbap/HNBAP_CauseTransport.h
M include/osmocom/hnbap/HNBAP_CellIdentity.h
M include/osmocom/hnbap/HNBAP_ConfigurationInformation.h
M include/osmocom/hnbap/HNBAP_Context-ID.h
M include/osmocom/hnbap/HNBAP_Criticality.h
M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h
M include/osmocom/hnbap/HNBAP_ESN.h
M include/osmocom/hnbap/HNBAP_ErrorIndication.h
M include/osmocom/hnbap/HNBAP_GTP-TEI.h
M include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h
M include/osmocom/hnbap/HNBAP_GeographicalLocation.h
M include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h
M include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h
M include/osmocom/hnbap/HNBAP_HNB-GWResponse.h
M include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h
M include/osmocom/hnbap/HNBAP_HNB-Identity.h
M include/osmocom/hnbap/HNBAP_HNB-Location-Information.h
M include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h
M include/osmocom/hnbap/HNBAP_HNBAP-PDU.h
M include/osmocom/hnbap/HNBAP_HNBCapacity.h
M include/osmocom/hnbap/HNBAP_HNBConfigInfo.h
M include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h
M include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h
M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h
M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h
M include/osmocom/hnbap/HNBAP_HNBDe-Register.h
M include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h
M include/osmocom/hnbap/HNBAP_HNBRegisterReject.h
M include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h
M include/osmocom/hnbap/HNBAP_IE-Extensions.h
M include/osmocom/hnbap/HNBAP_IE.h
M include/osmocom/hnbap/HNBAP_IMEI.h
M include/osmocom/hnbap/HNBAP_IMSI.h
M include/osmocom/hnbap/HNBAP_IMSIDS41.h
M include/osmocom/hnbap/HNBAP_IMSIESN.h
M include/osmocom/hnbap/HNBAP_IP-Address.h
M include/osmocom/hnbap/HNBAP_InitiatingMessage.h
M include/osmocom/hnbap/HNBAP_Ipv4Address.h
M include/osmocom/hnbap/HNBAP_Ipv6Address.h
M include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h
M include/osmocom/hnbap/HNBAP_LAC.h
M include/osmocom/hnbap/HNBAP_LAI.h
M include/osmocom/hnbap/HNBAP_MacroCellID.h
M include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h
M include/osmocom/hnbap/HNBAP_MuxPortNumber.h
M include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h
M include/osmocom/hnbap/HNBAP_NeighbourIdentity.h
M include/osmocom/hnbap/HNBAP_NeighbourInfoList.h
M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h
M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h
M include/osmocom/hnbap/HNBAP_PLMNidentity.h
M include/osmocom/hnbap/HNBAP_PSC.h
M include/osmocom/hnbap/HNBAP_PTMSI.h
M include/osmocom/hnbap/HNBAP_PTMSIRAI.h
M include/osmocom/hnbap/HNBAP_Presence.h
M include/osmocom/hnbap/HNBAP_PrivateIE-ID.h
M include/osmocom/hnbap/HNBAP_PrivateMessage.h
M include/osmocom/hnbap/HNBAP_ProcedureCode.h
M include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h
M include/osmocom/hnbap/HNBAP_RAB-ID.h
M include/osmocom/hnbap/HNBAP_RABList.h
M include/osmocom/hnbap/HNBAP_RABListItem.h
M include/osmocom/hnbap/HNBAP_RAC.h
M include/osmocom/hnbap/HNBAP_RAI.h
M include/osmocom/hnbap/HNBAP_RNC-ID.h
M include/osmocom/hnbap/HNBAP_Registration-Cause.h
M include/osmocom/hnbap/HNBAP_RelocationComplete.h
M include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h
M include/osmocom/hnbap/HNBAP_SAC.h
M include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h
M include/osmocom/hnbap/HNBAP_TMSIDS41.h
M include/osmocom/hnbap/HNBAP_TMSILAI.h
M include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h
M include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h
M include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h
M include/osmocom/hnbap/HNBAP_TransportInfo.h
M include/osmocom/hnbap/HNBAP_TransportLayerAddress.h
M include/osmocom/hnbap/HNBAP_TriggeringMessage.h
M include/osmocom/hnbap/HNBAP_Tunnel-Information.h
M include/osmocom/hnbap/HNBAP_TypeOfError.h
M include/osmocom/hnbap/HNBAP_U-RNTI.h
M include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h
M include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h
M include/osmocom/hnbap/HNBAP_UDP-Port-Number.h
M include/osmocom/hnbap/HNBAP_UE-Capabilities.h
M include/osmocom/hnbap/HNBAP_UE-Identity.h
M include/osmocom/hnbap/HNBAP_UEDe-Register.h
M include/osmocom/hnbap/HNBAP_UERegisterAccept.h
M include/osmocom/hnbap/HNBAP_UERegisterReject.h
M include/osmocom/hnbap/HNBAP_UERegisterRequest.h
M include/osmocom/hnbap/HNBAP_URAIdentity.h
M include/osmocom/hnbap/HNBAP_URAIdentityList.h
M include/osmocom/hnbap/HNBAP_UTRANCellID.h
M include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h
M include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h
M include/osmocom/hnbap/HNBAP_Update-cause.h
M src/hnbap/HNBAP_Access-stratum-release-indicator.c
M src/hnbap/HNBAP_AccessResult.c
M src/hnbap/HNBAP_AdditionalNeighbourInfoList.c
M src/hnbap/HNBAP_AltitudeAndDirection.c
M src/hnbap/HNBAP_BackoffTimer.c
M src/hnbap/HNBAP_BindingID.c
M src/hnbap/HNBAP_CELL-FACHMobilitySupport.c
M src/hnbap/HNBAP_CGI.c
M src/hnbap/HNBAP_CI.c
M src/hnbap/HNBAP_CN-DomainIndicator.c
M src/hnbap/HNBAP_CSG-Capability.c
M src/hnbap/HNBAP_CSG-ID.c
M src/hnbap/HNBAP_CSGMembershipStatus.c
M src/hnbap/HNBAP_CSGMembershipUpdate.c
M src/hnbap/HNBAP_Cause.c
M src/hnbap/HNBAP_CauseMisc.c
M src/hnbap/HNBAP_CauseProtocol.c
M src/hnbap/HNBAP_CauseRadioNetwork.c
M src/hnbap/HNBAP_CauseTransport.c
M src/hnbap/HNBAP_CellIdentity.c
M src/hnbap/HNBAP_ConfigurationInformation.c
M src/hnbap/HNBAP_Context-ID.c
M src/hnbap/HNBAP_Criticality.c
M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
M src/hnbap/HNBAP_CriticalityDiagnostics.c
M src/hnbap/HNBAP_ESN.c
M src/hnbap/HNBAP_ErrorIndication.c
M src/hnbap/HNBAP_GTP-TEI.c
M src/hnbap/HNBAP_GeographicalCoordinates.c
M src/hnbap/HNBAP_GeographicalLocation.c
M src/hnbap/HNBAP_HNB-Cell-Access-Mode.c
M src/hnbap/HNBAP_HNB-Cell-Identifier.c
M src/hnbap/HNBAP_HNB-GWResponse.c
M src/hnbap/HNBAP_HNB-Identity-Info.c
M src/hnbap/HNBAP_HNB-Identity.c
M src/hnbap/HNBAP_HNB-Location-Information.c
M src/hnbap/HNBAP_HNB-RNL-Identity.c
M src/hnbap/HNBAP_HNBAP-PDU.c
M src/hnbap/HNBAP_HNBCapacity.c
M src/hnbap/HNBAP_HNBConfigInfo.c
M src/hnbap/HNBAP_HNBConfigTransferRequest.c
M src/hnbap/HNBAP_HNBConfigTransferResponse.c
M src/hnbap/HNBAP_HNBConfigurationInformationMissing.c
M src/hnbap/HNBAP_HNBConfigurationInformationProvided.c
M src/hnbap/HNBAP_HNBDe-Register.c
M src/hnbap/HNBAP_HNBRegisterAccept.c
M src/hnbap/HNBAP_HNBRegisterReject.c
M src/hnbap/HNBAP_HNBRegisterRequest.c
M src/hnbap/HNBAP_IE-Extensions.c
M src/hnbap/HNBAP_IE.c
M src/hnbap/HNBAP_IMEI.c
M src/hnbap/HNBAP_IMSI.c
M src/hnbap/HNBAP_IMSIDS41.c
M src/hnbap/HNBAP_IMSIESN.c
M src/hnbap/HNBAP_IP-Address.c
M src/hnbap/HNBAP_InitiatingMessage.c
M src/hnbap/HNBAP_Ipv4Address.c
M src/hnbap/HNBAP_Ipv6Address.c
M src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c
M src/hnbap/HNBAP_LAC.c
M src/hnbap/HNBAP_LAI.c
M src/hnbap/HNBAP_MacroCellID.c
M src/hnbap/HNBAP_MacroCoverageInformation.c
M src/hnbap/HNBAP_MuxPortNumber.c
M src/hnbap/HNBAP_NeighbourCellIdentityList.c
M src/hnbap/HNBAP_NeighbourIdentity.c
M src/hnbap/HNBAP_NeighbourInfoList.c
M src/hnbap/HNBAP_NeighbourInfoRequestItem.c
M src/hnbap/HNBAP_NeighbourInfoRequestList.c
M src/hnbap/HNBAP_PLMNidentity.c
M src/hnbap/HNBAP_PSC.c
M src/hnbap/HNBAP_PTMSI.c
M src/hnbap/HNBAP_PTMSIRAI.c
M src/hnbap/HNBAP_Presence.c
M src/hnbap/HNBAP_PrivateIE-ID.c
M src/hnbap/HNBAP_PrivateMessage.c
M src/hnbap/HNBAP_ProcedureCode.c
M src/hnbap/HNBAP_ProtocolIE-ID.c
M src/hnbap/HNBAP_RAB-ID.c
M src/hnbap/HNBAP_RABList.c
M src/hnbap/HNBAP_RABListItem.c
M src/hnbap/HNBAP_RAC.c
M src/hnbap/HNBAP_RAI.c
M src/hnbap/HNBAP_RNC-ID.c
M src/hnbap/HNBAP_Registration-Cause.c
M src/hnbap/HNBAP_RelocationComplete.c
M src/hnbap/HNBAP_S-RNTIPrefix.c
M src/hnbap/HNBAP_SAC.c
M src/hnbap/HNBAP_SuccessfulOutcome.c
M src/hnbap/HNBAP_TMSIDS41.c
M src/hnbap/HNBAP_TMSILAI.c
M src/hnbap/HNBAP_TNLUpdateFailure.c
M src/hnbap/HNBAP_TNLUpdateRequest.c
M src/hnbap/HNBAP_TNLUpdateResponse.c
M src/hnbap/HNBAP_TransportInfo.c
M src/hnbap/HNBAP_TransportLayerAddress.c
M src/hnbap/HNBAP_TriggeringMessage.c
M src/hnbap/HNBAP_Tunnel-Information.c
M src/hnbap/HNBAP_TypeOfError.c
M src/hnbap/HNBAP_U-RNTI.c
M src/hnbap/HNBAP_U-RNTIQueryRequest.c
M src/hnbap/HNBAP_U-RNTIQueryResponse.c
M src/hnbap/HNBAP_UDP-Port-Number.c
M src/hnbap/HNBAP_UE-Capabilities.c
M src/hnbap/HNBAP_UE-Identity.c
M src/hnbap/HNBAP_UEDe-Register.c
M src/hnbap/HNBAP_UERegisterAccept.c
M src/hnbap/HNBAP_UERegisterReject.c
M src/hnbap/HNBAP_UERegisterRequest.c
M src/hnbap/HNBAP_URAIdentity.c
M src/hnbap/HNBAP_URAIdentityList.c
M src/hnbap/HNBAP_UTRANCellID.c
M src/hnbap/HNBAP_UnknownU-RNTIIndication.c
M src/hnbap/HNBAP_UnsuccessfulOutcome.c
M src/hnbap/HNBAP_Update-cause.c
M src/hnbap/Makefile.am
231 files changed, 329 insertions(+), 329 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/91/25991/1

diff --git a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h
index 1aba84e..c52065c 100644
--- a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h
+++ b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Access_stratum_release_indicator_H_
diff --git a/include/osmocom/hnbap/HNBAP_AccessResult.h b/include/osmocom/hnbap/HNBAP_AccessResult.h
index 3d71d2d..06c37fd 100644
--- a/include/osmocom/hnbap/HNBAP_AccessResult.h
+++ b/include/osmocom/hnbap/HNBAP_AccessResult.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_AccessResult_H_
diff --git a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h
index be2dd1f..5b46e95 100644
--- a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h
+++ b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_AdditionalNeighbourInfoList_H_
diff --git a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h
index 5b406d8..3bf4401 100644
--- a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h
+++ b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_AltitudeAndDirection_H_
@@ -21,10 +21,10 @@
 #endif
 
 /* Dependencies */
-typedef enum directionOfAltitude {
-	directionOfAltitude_height	= 0,
-	directionOfAltitude_depth	= 1
-} e_directionOfAltitude;
+typedef enum HNBAP_AltitudeAndDirection__directionOfAltitude {
+	HNBAP_AltitudeAndDirection__directionOfAltitude_height	= 0,
+	HNBAP_AltitudeAndDirection__directionOfAltitude_depth	= 1
+} e_HNBAP_AltitudeAndDirection__directionOfAltitude;
 
 /* HNBAP_AltitudeAndDirection */
 typedef struct HNBAP_AltitudeAndDirection {
diff --git a/include/osmocom/hnbap/HNBAP_BackoffTimer.h b/include/osmocom/hnbap/HNBAP_BackoffTimer.h
index 03f64c9..5ee18a0 100644
--- a/include/osmocom/hnbap/HNBAP_BackoffTimer.h
+++ b/include/osmocom/hnbap/HNBAP_BackoffTimer.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_BackoffTimer_H_
diff --git a/include/osmocom/hnbap/HNBAP_BindingID.h b/include/osmocom/hnbap/HNBAP_BindingID.h
index b5cdebc..c26159d 100644
--- a/include/osmocom/hnbap/HNBAP_BindingID.h
+++ b/include/osmocom/hnbap/HNBAP_BindingID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_BindingID_H_
diff --git a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h
index 864f6ce..dc91cb6 100644
--- a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h
+++ b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CELL_FACHMobilitySupport_H_
diff --git a/include/osmocom/hnbap/HNBAP_CGI.h b/include/osmocom/hnbap/HNBAP_CGI.h
index 657aff8..927257d 100644
--- a/include/osmocom/hnbap/HNBAP_CGI.h
+++ b/include/osmocom/hnbap/HNBAP_CGI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CGI_H_
diff --git a/include/osmocom/hnbap/HNBAP_CI.h b/include/osmocom/hnbap/HNBAP_CI.h
index 637c9bd..89916cc 100644
--- a/include/osmocom/hnbap/HNBAP_CI.h
+++ b/include/osmocom/hnbap/HNBAP_CI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CI_H_
diff --git a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h
index 5128d5b..765ba2b 100644
--- a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h
+++ b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CN_DomainIndicator_H_
diff --git a/include/osmocom/hnbap/HNBAP_CSG-Capability.h b/include/osmocom/hnbap/HNBAP_CSG-Capability.h
index 57d6ee2..ff10c3d 100644
--- a/include/osmocom/hnbap/HNBAP_CSG-Capability.h
+++ b/include/osmocom/hnbap/HNBAP_CSG-Capability.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CSG_Capability_H_
diff --git a/include/osmocom/hnbap/HNBAP_CSG-ID.h b/include/osmocom/hnbap/HNBAP_CSG-ID.h
index d76f078..87e476a 100644
--- a/include/osmocom/hnbap/HNBAP_CSG-ID.h
+++ b/include/osmocom/hnbap/HNBAP_CSG-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CSG_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h
index d83bd14..25ecacf 100644
--- a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h
+++ b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CSGMembershipStatus_H_
diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h
index 035b331..b6324cf 100644
--- a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h
+++ b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CSGMembershipUpdate_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_CSGMembershipUpdate */
 typedef struct HNBAP_CSGMembershipUpdate {
-	struct csgMembershipUpdate_ies {
+	struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_Cause.h b/include/osmocom/hnbap/HNBAP_Cause.h
index e385b5f..eba2cc1 100644
--- a/include/osmocom/hnbap/HNBAP_Cause.h
+++ b/include/osmocom/hnbap/HNBAP_Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Cause_H_
diff --git a/include/osmocom/hnbap/HNBAP_CauseMisc.h b/include/osmocom/hnbap/HNBAP_CauseMisc.h
index c53cafe..2534318 100644
--- a/include/osmocom/hnbap/HNBAP_CauseMisc.h
+++ b/include/osmocom/hnbap/HNBAP_CauseMisc.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CauseMisc_H_
diff --git a/include/osmocom/hnbap/HNBAP_CauseProtocol.h b/include/osmocom/hnbap/HNBAP_CauseProtocol.h
index 3416b47..0ca1254 100644
--- a/include/osmocom/hnbap/HNBAP_CauseProtocol.h
+++ b/include/osmocom/hnbap/HNBAP_CauseProtocol.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CauseProtocol_H_
diff --git a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h
index 895ac69..5c998ca 100644
--- a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h
+++ b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CauseRadioNetwork_H_
diff --git a/include/osmocom/hnbap/HNBAP_CauseTransport.h b/include/osmocom/hnbap/HNBAP_CauseTransport.h
index d2e486e..8dff6b8 100644
--- a/include/osmocom/hnbap/HNBAP_CauseTransport.h
+++ b/include/osmocom/hnbap/HNBAP_CauseTransport.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CauseTransport_H_
diff --git a/include/osmocom/hnbap/HNBAP_CellIdentity.h b/include/osmocom/hnbap/HNBAP_CellIdentity.h
index 1b76f6b..1a47122 100644
--- a/include/osmocom/hnbap/HNBAP_CellIdentity.h
+++ b/include/osmocom/hnbap/HNBAP_CellIdentity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CellIdentity_H_
diff --git a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h
index 7720b23..d5e2128 100644
--- a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h
+++ b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_ConfigurationInformation_H_
diff --git a/include/osmocom/hnbap/HNBAP_Context-ID.h b/include/osmocom/hnbap/HNBAP_Context-ID.h
index 570e8cb..fce0508 100644
--- a/include/osmocom/hnbap/HNBAP_Context-ID.h
+++ b/include/osmocom/hnbap/HNBAP_Context-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Context_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_Criticality.h b/include/osmocom/hnbap/HNBAP_Criticality.h
index cbc4c01..45c20a3 100644
--- a/include/osmocom/hnbap/HNBAP_Criticality.h
+++ b/include/osmocom/hnbap/HNBAP_Criticality.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Criticality_H_
diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
index db82056..7759078 100644
--- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CriticalityDiagnostics_IE_List_H_
@@ -26,7 +26,7 @@
 
 /* HNBAP_CriticalityDiagnostics-IE-List */
 typedef struct HNBAP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct Member {
+	A_SEQUENCE_OF(struct HNBAP_CriticalityDiagnostics_IE_List__Member {
 		HNBAP_Criticality_t	 iECriticality;
 		HNBAP_ProtocolIE_ID_t	 iE_ID;
 		HNBAP_TypeOfError_t	 typeOfError;
diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h
index 34d798d..f4b7b2a 100644
--- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h
+++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_CriticalityDiagnostics_H_
diff --git a/include/osmocom/hnbap/HNBAP_ESN.h b/include/osmocom/hnbap/HNBAP_ESN.h
index b1353ea..e3e5e5f 100644
--- a/include/osmocom/hnbap/HNBAP_ESN.h
+++ b/include/osmocom/hnbap/HNBAP_ESN.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_ESN_H_
diff --git a/include/osmocom/hnbap/HNBAP_ErrorIndication.h b/include/osmocom/hnbap/HNBAP_ErrorIndication.h
index 889cf08..b640aa8 100644
--- a/include/osmocom/hnbap/HNBAP_ErrorIndication.h
+++ b/include/osmocom/hnbap/HNBAP_ErrorIndication.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_ErrorIndication_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_ErrorIndication */
 typedef struct HNBAP_ErrorIndication {
-	struct errorIndication_ies {
+	struct HNBAP_ErrorIndication__errorIndication_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_GTP-TEI.h b/include/osmocom/hnbap/HNBAP_GTP-TEI.h
index 214964d..c3b8917 100644
--- a/include/osmocom/hnbap/HNBAP_GTP-TEI.h
+++ b/include/osmocom/hnbap/HNBAP_GTP-TEI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_GTP_TEI_H_
diff --git a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h
index 6cdfdec..3033b7a 100644
--- a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h
+++ b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_GeographicalCoordinates_H_
@@ -22,10 +22,10 @@
 #endif
 
 /* Dependencies */
-typedef enum latitudeSign {
-	latitudeSign_north	= 0,
-	latitudeSign_south	= 1
-} e_latitudeSign;
+typedef enum HNBAP_GeographicalCoordinates__latitudeSign {
+	HNBAP_GeographicalCoordinates__latitudeSign_north	= 0,
+	HNBAP_GeographicalCoordinates__latitudeSign_south	= 1
+} e_HNBAP_GeographicalCoordinates__latitudeSign;
 
 /* HNBAP_GeographicalCoordinates */
 typedef struct HNBAP_GeographicalCoordinates {
diff --git a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h
index 6311d85..9a2a071 100644
--- a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h
+++ b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_GeographicalLocation_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h
index 2a6e05a..9a2529a 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_Cell_Access_Mode_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h
index 14d2850..27c0fd9 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_Cell_Identifier_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h
index cadd7e3..8afd5e3 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_GWResponse_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h
index 25606bd..bb85a86 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_Identity_Info_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-Identity.h
index ca28950..d6038cc 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-Identity.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-Identity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_Identity_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h
index f8a3769..c944e42 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_Location_Information_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h
index 642e8e6..591b12d 100644
--- a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h
+++ b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNB_RNL_Identity_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h
index 48dac94..cbfd50f 100644
--- a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h
+++ b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBAP_PDU_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBCapacity.h b/include/osmocom/hnbap/HNBAP_HNBCapacity.h
index 39e4f29..b2e70b1 100644
--- a/include/osmocom/hnbap/HNBAP_HNBCapacity.h
+++ b/include/osmocom/hnbap/HNBAP_HNBCapacity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBCapacity_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h
index f0b6dc2..606d113 100644
--- a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h
+++ b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBConfigInfo_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h
index 8ce6ca7..23d5413 100644
--- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h
+++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBConfigTransferRequest_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBConfigTransferRequest */
 typedef struct HNBAP_HNBConfigTransferRequest {
-	struct hnbConfigTransferRequest_ies {
+	struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h
index 81ec650..80dcd1b 100644
--- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h
+++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBConfigTransferResponse_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBConfigTransferResponse */
 typedef struct HNBAP_HNBConfigTransferResponse {
-	struct hnbConfigTransferResponse_ies {
+	struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h
index 42bafdb..f1b28ef 100644
--- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h
+++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBConfigurationInformationMissing_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h
index 2750038..8c20b74 100644
--- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h
+++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBConfigurationInformationProvided_H_
diff --git a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h
index 79d7bbe..eb69bc5 100644
--- a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h
+++ b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBDe_Register_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBDe-Register */
 typedef struct HNBAP_HNBDe_Register {
-	struct hnbDe_Register_ies {
+	struct HNBAP_HNBDe_Register__hnbDe_Register_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h
index 83a48f8..ddacd50 100644
--- a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h
+++ b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBRegisterAccept_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBRegisterAccept */
 typedef struct HNBAP_HNBRegisterAccept {
-	struct hnbRegisterAccept_ies {
+	struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h
index 2b203db..38bea56 100644
--- a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h
+++ b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBRegisterReject_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBRegisterReject */
 typedef struct HNBAP_HNBRegisterReject {
-	struct hnbRegisterReject_ies {
+	struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h
index 1431432..724afb1 100644
--- a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h
+++ b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_HNBRegisterRequest_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_HNBRegisterRequest */
 typedef struct HNBAP_HNBRegisterRequest {
-	struct hnbRegisterRequest_ies {
+	struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_IE-Extensions.h b/include/osmocom/hnbap/HNBAP_IE-Extensions.h
index 81ffb00..0578aca 100644
--- a/include/osmocom/hnbap/HNBAP_IE-Extensions.h
+++ b/include/osmocom/hnbap/HNBAP_IE-Extensions.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IE_Extensions_H_
diff --git a/include/osmocom/hnbap/HNBAP_IE.h b/include/osmocom/hnbap/HNBAP_IE.h
index 1abae50..7abd85b 100644
--- a/include/osmocom/hnbap/HNBAP_IE.h
+++ b/include/osmocom/hnbap/HNBAP_IE.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IE_H_
diff --git a/include/osmocom/hnbap/HNBAP_IMEI.h b/include/osmocom/hnbap/HNBAP_IMEI.h
index ff082a8..b507526 100644
--- a/include/osmocom/hnbap/HNBAP_IMEI.h
+++ b/include/osmocom/hnbap/HNBAP_IMEI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IMEI_H_
diff --git a/include/osmocom/hnbap/HNBAP_IMSI.h b/include/osmocom/hnbap/HNBAP_IMSI.h
index 98970ed..ae439fb 100644
--- a/include/osmocom/hnbap/HNBAP_IMSI.h
+++ b/include/osmocom/hnbap/HNBAP_IMSI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IMSI_H_
diff --git a/include/osmocom/hnbap/HNBAP_IMSIDS41.h b/include/osmocom/hnbap/HNBAP_IMSIDS41.h
index 94f35b9..08fcf7a 100644
--- a/include/osmocom/hnbap/HNBAP_IMSIDS41.h
+++ b/include/osmocom/hnbap/HNBAP_IMSIDS41.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IMSIDS41_H_
diff --git a/include/osmocom/hnbap/HNBAP_IMSIESN.h b/include/osmocom/hnbap/HNBAP_IMSIESN.h
index 2178336..48edbee 100644
--- a/include/osmocom/hnbap/HNBAP_IMSIESN.h
+++ b/include/osmocom/hnbap/HNBAP_IMSIESN.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IMSIESN_H_
diff --git a/include/osmocom/hnbap/HNBAP_IP-Address.h b/include/osmocom/hnbap/HNBAP_IP-Address.h
index 8e6d119..6639f4c 100644
--- a/include/osmocom/hnbap/HNBAP_IP-Address.h
+++ b/include/osmocom/hnbap/HNBAP_IP-Address.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_IP_Address_H_
@@ -23,18 +23,18 @@
 #endif
 
 /* Dependencies */
-typedef enum ipaddress_PR {
-	ipaddress_PR_NOTHING,	/* No components present */
-	ipaddress_PR_ipv4info,
-	ipaddress_PR_ipv6info,
+typedef enum HNBAP_IP_Address__ipaddress_PR {
+	HNBAP_IP_Address__ipaddress_PR_NOTHING,	/* No components present */
+	HNBAP_IP_Address__ipaddress_PR_ipv4info,
+	HNBAP_IP_Address__ipaddress_PR_ipv6info,
 	/* Extensions may appear below */
 	
-} ipaddress_PR;
+} HNBAP_IP_Address__ipaddress_PR;
 
 /* HNBAP_IP-Address */
 typedef struct HNBAP_IP_Address {
-	struct ipaddress {
-		ipaddress_PR present;
+	struct HNBAP_IP_Address__ipaddress {
+		HNBAP_IP_Address__ipaddress_PR present;
 		union HNBAP_IP_Address__ipaddress_u {
 			HNBAP_Ipv4Address_t	 ipv4info;
 			HNBAP_Ipv6Address_t	 ipv6info;
diff --git a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h
index 1a7e6e3..4264666 100644
--- a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h
+++ b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_InitiatingMessage_H_
diff --git a/include/osmocom/hnbap/HNBAP_Ipv4Address.h b/include/osmocom/hnbap/HNBAP_Ipv4Address.h
index eecb57a..9fa5f44 100644
--- a/include/osmocom/hnbap/HNBAP_Ipv4Address.h
+++ b/include/osmocom/hnbap/HNBAP_Ipv4Address.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Ipv4Address_H_
diff --git a/include/osmocom/hnbap/HNBAP_Ipv6Address.h b/include/osmocom/hnbap/HNBAP_Ipv6Address.h
index 319ee82..e7e32c4 100644
--- a/include/osmocom/hnbap/HNBAP_Ipv6Address.h
+++ b/include/osmocom/hnbap/HNBAP_Ipv6Address.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Ipv6Address_H_
diff --git a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h
index f3e5f24..4f96bfa 100644
--- a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h
+++ b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Iurh_Signalling_TNL_AddressList_H_
diff --git a/include/osmocom/hnbap/HNBAP_LAC.h b/include/osmocom/hnbap/HNBAP_LAC.h
index 66369cf..13eecd7 100644
--- a/include/osmocom/hnbap/HNBAP_LAC.h
+++ b/include/osmocom/hnbap/HNBAP_LAC.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_LAC_H_
diff --git a/include/osmocom/hnbap/HNBAP_LAI.h b/include/osmocom/hnbap/HNBAP_LAI.h
index bc44334..e22d54e 100644
--- a/include/osmocom/hnbap/HNBAP_LAI.h
+++ b/include/osmocom/hnbap/HNBAP_LAI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_LAI_H_
diff --git a/include/osmocom/hnbap/HNBAP_MacroCellID.h b/include/osmocom/hnbap/HNBAP_MacroCellID.h
index 808e4cc..b291c9e 100644
--- a/include/osmocom/hnbap/HNBAP_MacroCellID.h
+++ b/include/osmocom/hnbap/HNBAP_MacroCellID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_MacroCellID_H_
diff --git a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h
index 8c58db7..5f223ab 100644
--- a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h
+++ b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_MacroCoverageInformation_H_
diff --git a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h
index 126423b..d703a87 100644
--- a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h
+++ b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_MuxPortNumber_H_
diff --git a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h
index 7b045bd..1c60b03 100644
--- a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h
+++ b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_NeighbourCellIdentityList_H_
diff --git a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h
index a05d5c6..7047e9f 100644
--- a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h
+++ b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_NeighbourIdentity_H_
diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h
index c3ac952..9f86d1d 100644
--- a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h
+++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_NeighbourInfoList_H_
diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h
index babc581..263b781 100644
--- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h
+++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_NeighbourInfoRequestItem_H_
diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h
index 8ce71b4..274a1cf 100644
--- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h
+++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_NeighbourInfoRequestList_H_
diff --git a/include/osmocom/hnbap/HNBAP_PLMNidentity.h b/include/osmocom/hnbap/HNBAP_PLMNidentity.h
index eaae7fd..de48ddd 100644
--- a/include/osmocom/hnbap/HNBAP_PLMNidentity.h
+++ b/include/osmocom/hnbap/HNBAP_PLMNidentity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PLMNidentity_H_
diff --git a/include/osmocom/hnbap/HNBAP_PSC.h b/include/osmocom/hnbap/HNBAP_PSC.h
index a399947..d2bcff7 100644
--- a/include/osmocom/hnbap/HNBAP_PSC.h
+++ b/include/osmocom/hnbap/HNBAP_PSC.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PSC_H_
diff --git a/include/osmocom/hnbap/HNBAP_PTMSI.h b/include/osmocom/hnbap/HNBAP_PTMSI.h
index 70a9d21..04e4c4f 100644
--- a/include/osmocom/hnbap/HNBAP_PTMSI.h
+++ b/include/osmocom/hnbap/HNBAP_PTMSI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PTMSI_H_
diff --git a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h
index 45396e0..5487dde 100644
--- a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h
+++ b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PTMSIRAI_H_
diff --git a/include/osmocom/hnbap/HNBAP_Presence.h b/include/osmocom/hnbap/HNBAP_Presence.h
index 60ec1f9..512674f 100644
--- a/include/osmocom/hnbap/HNBAP_Presence.h
+++ b/include/osmocom/hnbap/HNBAP_Presence.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Presence_H_
diff --git a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h
index 78857d0..24a241f 100644
--- a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h
+++ b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PrivateIE_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_PrivateMessage.h b/include/osmocom/hnbap/HNBAP_PrivateMessage.h
index ee7faa4..4cb81cb 100644
--- a/include/osmocom/hnbap/HNBAP_PrivateMessage.h
+++ b/include/osmocom/hnbap/HNBAP_PrivateMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_PrivateMessage_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_PrivateMessage */
 typedef struct HNBAP_PrivateMessage {
-	struct privateMessage_ies {
+	struct HNBAP_PrivateMessage__privateMessage_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_ProcedureCode.h b/include/osmocom/hnbap/HNBAP_ProcedureCode.h
index 84e1d41..d55bd08 100644
--- a/include/osmocom/hnbap/HNBAP_ProcedureCode.h
+++ b/include/osmocom/hnbap/HNBAP_ProcedureCode.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_ProcedureCode_H_
diff --git a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h
index 4ca0627..4f1e9c4 100644
--- a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h
+++ b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_ProtocolIE_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_RAB-ID.h b/include/osmocom/hnbap/HNBAP_RAB-ID.h
index 45422f4..8fe284a 100644
--- a/include/osmocom/hnbap/HNBAP_RAB-ID.h
+++ b/include/osmocom/hnbap/HNBAP_RAB-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RAB_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_RABList.h b/include/osmocom/hnbap/HNBAP_RABList.h
index 50741e0..ae6c86b 100644
--- a/include/osmocom/hnbap/HNBAP_RABList.h
+++ b/include/osmocom/hnbap/HNBAP_RABList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RABList_H_
diff --git a/include/osmocom/hnbap/HNBAP_RABListItem.h b/include/osmocom/hnbap/HNBAP_RABListItem.h
index a041d25..97bdcce 100644
--- a/include/osmocom/hnbap/HNBAP_RABListItem.h
+++ b/include/osmocom/hnbap/HNBAP_RABListItem.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RABListItem_H_
diff --git a/include/osmocom/hnbap/HNBAP_RAC.h b/include/osmocom/hnbap/HNBAP_RAC.h
index 20534f8..700fe12 100644
--- a/include/osmocom/hnbap/HNBAP_RAC.h
+++ b/include/osmocom/hnbap/HNBAP_RAC.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RAC_H_
diff --git a/include/osmocom/hnbap/HNBAP_RAI.h b/include/osmocom/hnbap/HNBAP_RAI.h
index 0cc6985..9f0bb07 100644
--- a/include/osmocom/hnbap/HNBAP_RAI.h
+++ b/include/osmocom/hnbap/HNBAP_RAI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RAI_H_
diff --git a/include/osmocom/hnbap/HNBAP_RNC-ID.h b/include/osmocom/hnbap/HNBAP_RNC-ID.h
index 36c6644..35b58aa 100644
--- a/include/osmocom/hnbap/HNBAP_RNC-ID.h
+++ b/include/osmocom/hnbap/HNBAP_RNC-ID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RNC_ID_H_
diff --git a/include/osmocom/hnbap/HNBAP_Registration-Cause.h b/include/osmocom/hnbap/HNBAP_Registration-Cause.h
index 8fc58bd..3de4fde 100644
--- a/include/osmocom/hnbap/HNBAP_Registration-Cause.h
+++ b/include/osmocom/hnbap/HNBAP_Registration-Cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Registration_Cause_H_
diff --git a/include/osmocom/hnbap/HNBAP_RelocationComplete.h b/include/osmocom/hnbap/HNBAP_RelocationComplete.h
index 8ab1e5a..6c89364 100644
--- a/include/osmocom/hnbap/HNBAP_RelocationComplete.h
+++ b/include/osmocom/hnbap/HNBAP_RelocationComplete.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * >From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_RelocationComplete_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_RelocationComplete */
 typedef struct HNBAP_RelocationComplete {
-	struct relocationComplete_ies {
+	struct HNBAP_RelocationComplete__relocationComplete_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h
index a315b9a..47bd663 100644
--- a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h
+++ b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_S_RNTIPrefix_H_
diff --git a/include/osmocom/hnbap/HNBAP_SAC.h b/include/osmocom/hnbap/HNBAP_SAC.h
index 6b4bf11..15549a3 100644
--- a/include/osmocom/hnbap/HNBAP_SAC.h
+++ b/include/osmocom/hnbap/HNBAP_SAC.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_SAC_H_
diff --git a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h
index 97ddd2e..aa7a937 100644
--- a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h
+++ b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_SuccessfulOutcome_H_
diff --git a/include/osmocom/hnbap/HNBAP_TMSIDS41.h b/include/osmocom/hnbap/HNBAP_TMSIDS41.h
index ec40e84..0f45fce 100644
--- a/include/osmocom/hnbap/HNBAP_TMSIDS41.h
+++ b/include/osmocom/hnbap/HNBAP_TMSIDS41.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TMSIDS41_H_
diff --git a/include/osmocom/hnbap/HNBAP_TMSILAI.h b/include/osmocom/hnbap/HNBAP_TMSILAI.h
index de4101a..0df3774 100644
--- a/include/osmocom/hnbap/HNBAP_TMSILAI.h
+++ b/include/osmocom/hnbap/HNBAP_TMSILAI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TMSILAI_H_
diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h
index 73313fb..b662d0c 100644
--- a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h
+++ b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TNLUpdateFailure_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_TNLUpdateFailure */
 typedef struct HNBAP_TNLUpdateFailure {
-	struct tnlUpdateFailure_ies {
+	struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h
index 11b1a36..8f43046 100644
--- a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h
+++ b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TNLUpdateRequest_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_TNLUpdateRequest */
 typedef struct HNBAP_TNLUpdateRequest {
-	struct tnlUpdateRequest_ies {
+	struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h
index 8aac76b..921ecc4 100644
--- a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h
+++ b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TNLUpdateResponse_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_TNLUpdateResponse */
 typedef struct HNBAP_TNLUpdateResponse {
-	struct tnlUpdateResponse_ies {
+	struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_TransportInfo.h b/include/osmocom/hnbap/HNBAP_TransportInfo.h
index 8f0a5eb..2b7bf2b 100644
--- a/include/osmocom/hnbap/HNBAP_TransportInfo.h
+++ b/include/osmocom/hnbap/HNBAP_TransportInfo.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TransportInfo_H_
@@ -24,19 +24,19 @@
 #endif
 
 /* Dependencies */
-typedef enum transportAssociation_PR {
-	transportAssociation_PR_NOTHING,	/* No components present */
-	transportAssociation_PR_gtp_TEI,
-	transportAssociation_PR_bindingID,
+typedef enum HNBAP_TransportInfo__transportAssociation_PR {
+	HNBAP_TransportInfo__transportAssociation_PR_NOTHING,	/* No components present */
+	HNBAP_TransportInfo__transportAssociation_PR_gtp_TEI,
+	HNBAP_TransportInfo__transportAssociation_PR_bindingID,
 	/* Extensions may appear below */
 	
-} transportAssociation_PR;
+} HNBAP_TransportInfo__transportAssociation_PR;
 
 /* HNBAP_TransportInfo */
 typedef struct HNBAP_TransportInfo {
 	HNBAP_TransportLayerAddress_t	 transportLayerAddress;
-	struct transportAssociation {
-		transportAssociation_PR present;
+	struct HNBAP_TransportInfo__transportAssociation {
+		HNBAP_TransportInfo__transportAssociation_PR present;
 		union HNBAP_TransportInfo__transportAssociation_u {
 			HNBAP_GTP_TEI_t	 gtp_TEI;
 			HNBAP_BindingID_t	 bindingID;
diff --git a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h
index 4edd7b8..9b2a81a 100644
--- a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h
+++ b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TransportLayerAddress_H_
diff --git a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h
index 859dc12..24dcaec 100644
--- a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h
+++ b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TriggeringMessage_H_
diff --git a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h
index 470420d..63eaa37 100644
--- a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h
+++ b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Tunnel_Information_H_
diff --git a/include/osmocom/hnbap/HNBAP_TypeOfError.h b/include/osmocom/hnbap/HNBAP_TypeOfError.h
index 04771a3..eba4911 100644
--- a/include/osmocom/hnbap/HNBAP_TypeOfError.h
+++ b/include/osmocom/hnbap/HNBAP_TypeOfError.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_TypeOfError_H_
diff --git a/include/osmocom/hnbap/HNBAP_U-RNTI.h b/include/osmocom/hnbap/HNBAP_U-RNTI.h
index cf506b0..f942e35 100644
--- a/include/osmocom/hnbap/HNBAP_U-RNTI.h
+++ b/include/osmocom/hnbap/HNBAP_U-RNTI.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_U_RNTI_H_
diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h
index 8714c55..c0cbbe8 100644
--- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h
+++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_U_RNTIQueryRequest_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_U-RNTIQueryRequest */
 typedef struct HNBAP_U_RNTIQueryRequest {
-	struct u_RNTIQueryRequest_ies {
+	struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h
index 2696f9b..8c4a2d0 100644
--- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h
+++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_U_RNTIQueryResponse_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_U-RNTIQueryResponse */
 typedef struct HNBAP_U_RNTIQueryResponse {
-	struct u_RNTIQueryResponse_ies {
+	struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h
index 9a8b675..988cedb 100644
--- a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h
+++ b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UDP_Port_Number_H_
diff --git a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h
index 38551d6..5f275a3 100644
--- a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h
+++ b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UE_Capabilities_H_
diff --git a/include/osmocom/hnbap/HNBAP_UE-Identity.h b/include/osmocom/hnbap/HNBAP_UE-Identity.h
index 8e63603..3c11a84 100644
--- a/include/osmocom/hnbap/HNBAP_UE-Identity.h
+++ b/include/osmocom/hnbap/HNBAP_UE-Identity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UE_Identity_H_
diff --git a/include/osmocom/hnbap/HNBAP_UEDe-Register.h b/include/osmocom/hnbap/HNBAP_UEDe-Register.h
index 5a0e298..58009c5 100644
--- a/include/osmocom/hnbap/HNBAP_UEDe-Register.h
+++ b/include/osmocom/hnbap/HNBAP_UEDe-Register.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UEDe_Register_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_UEDe-Register */
 typedef struct HNBAP_UEDe_Register {
-	struct ueDe_Register_ies {
+	struct HNBAP_UEDe_Register__ueDe_Register_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h
index 8d2bec1..9e5c206 100644
--- a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h
+++ b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UERegisterAccept_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_UERegisterAccept */
 typedef struct HNBAP_UERegisterAccept {
-	struct ueRegisterAccept_ies {
+	struct HNBAP_UERegisterAccept__ueRegisterAccept_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_UERegisterReject.h b/include/osmocom/hnbap/HNBAP_UERegisterReject.h
index c30ffbe..44ed158 100644
--- a/include/osmocom/hnbap/HNBAP_UERegisterReject.h
+++ b/include/osmocom/hnbap/HNBAP_UERegisterReject.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UERegisterReject_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_UERegisterReject */
 typedef struct HNBAP_UERegisterReject {
-	struct ueRegisterReject_ies {
+	struct HNBAP_UERegisterReject__ueRegisterReject_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h
index 46778c8..ae82132 100644
--- a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h
+++ b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UERegisterRequest_H_
@@ -23,7 +23,7 @@
 
 /* HNBAP_UERegisterRequest */
 typedef struct HNBAP_UERegisterRequest {
-	struct ueRegisterRequest_ies {
+	struct HNBAP_UERegisterRequest__ueRegisterRequest_ies {
 		A_SEQUENCE_OF(HNBAP_IE_t) list;
 		
 		/* Context for parsing across buffer boundaries */
diff --git a/include/osmocom/hnbap/HNBAP_URAIdentity.h b/include/osmocom/hnbap/HNBAP_URAIdentity.h
index 6d4d582..97a1e12 100644
--- a/include/osmocom/hnbap/HNBAP_URAIdentity.h
+++ b/include/osmocom/hnbap/HNBAP_URAIdentity.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_URAIdentity_H_
diff --git a/include/osmocom/hnbap/HNBAP_URAIdentityList.h b/include/osmocom/hnbap/HNBAP_URAIdentityList.h
index b676efa..0b22d29 100644
--- a/include/osmocom/hnbap/HNBAP_URAIdentityList.h
+++ b/include/osmocom/hnbap/HNBAP_URAIdentityList.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_URAIdentityList_H_
diff --git a/include/osmocom/hnbap/HNBAP_UTRANCellID.h b/include/osmocom/hnbap/HNBAP_UTRANCellID.h
index d5105b3..0659034 100644
--- a/include/osmocom/hnbap/HNBAP_UTRANCellID.h
+++ b/include/osmocom/hnbap/HNBAP_UTRANCellID.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UTRANCellID_H_
diff --git a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h
index 9f285f9..3951209 100644
--- a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h
+++ b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UnknownU_RNTIIndication_H_
diff --git a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h
index b3d2a7e..032936f 100644
--- a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h
+++ b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_UnsuccessfulOutcome_H_
diff --git a/include/osmocom/hnbap/HNBAP_Update-cause.h b/include/osmocom/hnbap/HNBAP_Update-cause.h
index 601a34e..ebede3d 100644
--- a/include/osmocom/hnbap/HNBAP_Update-cause.h
+++ b/include/osmocom/hnbap/HNBAP_Update-cause.h
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #ifndef	_HNBAP_Update_cause_H_
diff --git a/src/hnbap/HNBAP_Access-stratum-release-indicator.c b/src/hnbap/HNBAP_Access-stratum-release-indicator.c
index fec27b8..747b8d5 100644
--- a/src/hnbap/HNBAP_Access-stratum-release-indicator.c
+++ b/src/hnbap/HNBAP_Access-stratum-release-indicator.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h>
diff --git a/src/hnbap/HNBAP_AccessResult.c b/src/hnbap/HNBAP_AccessResult.c
index ef2d6db..d473c46 100644
--- a/src/hnbap/HNBAP_AccessResult.c
+++ b/src/hnbap/HNBAP_AccessResult.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_AccessResult.h>
diff --git a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c
index d19a303..337fbdb 100644
--- a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c
+++ b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h>
diff --git a/src/hnbap/HNBAP_AltitudeAndDirection.c b/src/hnbap/HNBAP_AltitudeAndDirection.c
index 9995f74..893838b 100644
--- a/src/hnbap/HNBAP_AltitudeAndDirection.c
+++ b/src/hnbap/HNBAP_AltitudeAndDirection.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_AltitudeAndDirection.h>
diff --git a/src/hnbap/HNBAP_BackoffTimer.c b/src/hnbap/HNBAP_BackoffTimer.c
index 097ce18..2e72a5e 100644
--- a/src/hnbap/HNBAP_BackoffTimer.c
+++ b/src/hnbap/HNBAP_BackoffTimer.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_BackoffTimer.h>
diff --git a/src/hnbap/HNBAP_BindingID.c b/src/hnbap/HNBAP_BindingID.c
index 105a6f8..39137d1 100644
--- a/src/hnbap/HNBAP_BindingID.c
+++ b/src/hnbap/HNBAP_BindingID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_BindingID.h>
diff --git a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c
index a25797b..7707cd1 100644
--- a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c
+++ b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h>
diff --git a/src/hnbap/HNBAP_CGI.c b/src/hnbap/HNBAP_CGI.c
index fbf96b6..17507cf 100644
--- a/src/hnbap/HNBAP_CGI.c
+++ b/src/hnbap/HNBAP_CGI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CGI.h>
diff --git a/src/hnbap/HNBAP_CI.c b/src/hnbap/HNBAP_CI.c
index c4d20ea..a3d4531 100644
--- a/src/hnbap/HNBAP_CI.c
+++ b/src/hnbap/HNBAP_CI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CI.h>
diff --git a/src/hnbap/HNBAP_CN-DomainIndicator.c b/src/hnbap/HNBAP_CN-DomainIndicator.c
index 158957d..1374aca 100644
--- a/src/hnbap/HNBAP_CN-DomainIndicator.c
+++ b/src/hnbap/HNBAP_CN-DomainIndicator.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CN-DomainIndicator.h>
diff --git a/src/hnbap/HNBAP_CSG-Capability.c b/src/hnbap/HNBAP_CSG-Capability.c
index 5bf3426..b98a8e8 100644
--- a/src/hnbap/HNBAP_CSG-Capability.c
+++ b/src/hnbap/HNBAP_CSG-Capability.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CSG-Capability.h>
diff --git a/src/hnbap/HNBAP_CSG-ID.c b/src/hnbap/HNBAP_CSG-ID.c
index 2000f51..402f9e3 100644
--- a/src/hnbap/HNBAP_CSG-ID.c
+++ b/src/hnbap/HNBAP_CSG-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CSG-ID.h>
diff --git a/src/hnbap/HNBAP_CSGMembershipStatus.c b/src/hnbap/HNBAP_CSGMembershipStatus.c
index b49e7a8..7496570 100644
--- a/src/hnbap/HNBAP_CSGMembershipStatus.c
+++ b/src/hnbap/HNBAP_CSGMembershipStatus.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CSGMembershipStatus.h>
diff --git a/src/hnbap/HNBAP_CSGMembershipUpdate.c b/src/hnbap/HNBAP_CSGMembershipUpdate.c
index 1febe4f..82a961d 100644
--- a/src/hnbap/HNBAP_CSGMembershipUpdate.c
+++ b/src/hnbap/HNBAP_CSGMembershipUpdate.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CSGMembershipUpdate.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_csgMembershipUpdate_ies_specs_2 = {
-	sizeof(struct csgMembershipUpdate_ies),
-	offsetof(struct csgMembershipUpdate_ies, _asn_ctx),
+	sizeof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies),
+	offsetof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_Cause.c b/src/hnbap/HNBAP_Cause.c
index e0db859..7dfb5d6 100644
--- a/src/hnbap/HNBAP_Cause.c
+++ b/src/hnbap/HNBAP_Cause.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Cause.h>
diff --git a/src/hnbap/HNBAP_CauseMisc.c b/src/hnbap/HNBAP_CauseMisc.c
index a3c5752..2c0aeed 100644
--- a/src/hnbap/HNBAP_CauseMisc.c
+++ b/src/hnbap/HNBAP_CauseMisc.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CauseMisc.h>
diff --git a/src/hnbap/HNBAP_CauseProtocol.c b/src/hnbap/HNBAP_CauseProtocol.c
index 8893481..d3a8943 100644
--- a/src/hnbap/HNBAP_CauseProtocol.c
+++ b/src/hnbap/HNBAP_CauseProtocol.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CauseProtocol.h>
diff --git a/src/hnbap/HNBAP_CauseRadioNetwork.c b/src/hnbap/HNBAP_CauseRadioNetwork.c
index 2418a72..f1beead 100644
--- a/src/hnbap/HNBAP_CauseRadioNetwork.c
+++ b/src/hnbap/HNBAP_CauseRadioNetwork.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CauseRadioNetwork.h>
diff --git a/src/hnbap/HNBAP_CauseTransport.c b/src/hnbap/HNBAP_CauseTransport.c
index 6c37c66..e3b6755 100644
--- a/src/hnbap/HNBAP_CauseTransport.c
+++ b/src/hnbap/HNBAP_CauseTransport.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CauseTransport.h>
diff --git a/src/hnbap/HNBAP_CellIdentity.c b/src/hnbap/HNBAP_CellIdentity.c
index 3465697..daf8e5e 100644
--- a/src/hnbap/HNBAP_CellIdentity.c
+++ b/src/hnbap/HNBAP_CellIdentity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CellIdentity.h>
diff --git a/src/hnbap/HNBAP_ConfigurationInformation.c b/src/hnbap/HNBAP_ConfigurationInformation.c
index 6cf24b1..13bfe4a 100644
--- a/src/hnbap/HNBAP_ConfigurationInformation.c
+++ b/src/hnbap/HNBAP_ConfigurationInformation.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_ConfigurationInformation.h>
diff --git a/src/hnbap/HNBAP_Context-ID.c b/src/hnbap/HNBAP_Context-ID.c
index 4d2a2b9..c8606d8 100644
--- a/src/hnbap/HNBAP_Context-ID.c
+++ b/src/hnbap/HNBAP_Context-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Context-ID.h>
diff --git a/src/hnbap/HNBAP_Criticality.c b/src/hnbap/HNBAP_Criticality.c
index de6fe43..2ff443f 100644
--- a/src/hnbap/HNBAP_Criticality.c
+++ b/src/hnbap/HNBAP_Criticality.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Criticality.h>
diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
index f5aff57..df98d95 100644
--- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h>
@@ -13,7 +13,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iECriticality),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_Criticality,
@@ -22,7 +22,7 @@
 		0,
 		"iECriticality"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_ID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_ProtocolIE_ID,
@@ -31,7 +31,7 @@
 		0,
 		"iE-ID"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, typeOfError),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_TypeOfError,
@@ -40,7 +40,7 @@
 		0,
 		"typeOfError"
 		},
-	{ ATF_POINTER, 1, offsetof(struct Member, iE_Extensions),
+	{ ATF_POINTER, 1, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_IE_Extensions,
@@ -61,8 +61,8 @@
     { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct Member),
-	offsetof(struct Member, _asn_ctx),
+	sizeof(struct HNBAP_CriticalityDiagnostics_IE_List__Member),
+	offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
 	asn_MAP_Member_tag2el_2,
 	4,	/* Count of tags in the map */
 	asn_MAP_Member_oms_2,	/* Optional members */
diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics.c b/src/hnbap/HNBAP_CriticalityDiagnostics.c
index 5760e92..e80b352 100644
--- a/src/hnbap/HNBAP_CriticalityDiagnostics.c
+++ b/src/hnbap/HNBAP_CriticalityDiagnostics.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_CriticalityDiagnostics.h>
diff --git a/src/hnbap/HNBAP_ESN.c b/src/hnbap/HNBAP_ESN.c
index d17f2ca..14107f7 100644
--- a/src/hnbap/HNBAP_ESN.c
+++ b/src/hnbap/HNBAP_ESN.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_ESN.h>
diff --git a/src/hnbap/HNBAP_ErrorIndication.c b/src/hnbap/HNBAP_ErrorIndication.c
index 4babda2..7077ab5 100644
--- a/src/hnbap/HNBAP_ErrorIndication.c
+++ b/src/hnbap/HNBAP_ErrorIndication.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_ErrorIndication.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = {
-	sizeof(struct errorIndication_ies),
-	offsetof(struct errorIndication_ies, _asn_ctx),
+	sizeof(struct HNBAP_ErrorIndication__errorIndication_ies),
+	offsetof(struct HNBAP_ErrorIndication__errorIndication_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_GTP-TEI.c b/src/hnbap/HNBAP_GTP-TEI.c
index 7d4b292..448d611 100644
--- a/src/hnbap/HNBAP_GTP-TEI.c
+++ b/src/hnbap/HNBAP_GTP-TEI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_GTP-TEI.h>
diff --git a/src/hnbap/HNBAP_GeographicalCoordinates.c b/src/hnbap/HNBAP_GeographicalCoordinates.c
index 9607ebf..286a1f3 100644
--- a/src/hnbap/HNBAP_GeographicalCoordinates.c
+++ b/src/hnbap/HNBAP_GeographicalCoordinates.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_GeographicalCoordinates.h>
diff --git a/src/hnbap/HNBAP_GeographicalLocation.c b/src/hnbap/HNBAP_GeographicalLocation.c
index 6daa15a..1d7c895 100644
--- a/src/hnbap/HNBAP_GeographicalLocation.c
+++ b/src/hnbap/HNBAP_GeographicalLocation.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_GeographicalLocation.h>
diff --git a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c
index 5154bdf..4eac481 100644
--- a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c
+++ b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h>
diff --git a/src/hnbap/HNBAP_HNB-Cell-Identifier.c b/src/hnbap/HNBAP_HNB-Cell-Identifier.c
index cf2b620..43d7165 100644
--- a/src/hnbap/HNBAP_HNB-Cell-Identifier.c
+++ b/src/hnbap/HNBAP_HNB-Cell-Identifier.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h>
diff --git a/src/hnbap/HNBAP_HNB-GWResponse.c b/src/hnbap/HNBAP_HNB-GWResponse.c
index e48cada..9df03b5 100644
--- a/src/hnbap/HNBAP_HNB-GWResponse.c
+++ b/src/hnbap/HNBAP_HNB-GWResponse.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-GWResponse.h>
diff --git a/src/hnbap/HNBAP_HNB-Identity-Info.c b/src/hnbap/HNBAP_HNB-Identity-Info.c
index 1ac5789..a28b2af 100644
--- a/src/hnbap/HNBAP_HNB-Identity-Info.c
+++ b/src/hnbap/HNBAP_HNB-Identity-Info.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-Identity-Info.h>
diff --git a/src/hnbap/HNBAP_HNB-Identity.c b/src/hnbap/HNBAP_HNB-Identity.c
index 217b714..f4eb992 100644
--- a/src/hnbap/HNBAP_HNB-Identity.c
+++ b/src/hnbap/HNBAP_HNB-Identity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-Identity.h>
diff --git a/src/hnbap/HNBAP_HNB-Location-Information.c b/src/hnbap/HNBAP_HNB-Location-Information.c
index 178ac0f..d8ffefb 100644
--- a/src/hnbap/HNBAP_HNB-Location-Information.c
+++ b/src/hnbap/HNBAP_HNB-Location-Information.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-Location-Information.h>
diff --git a/src/hnbap/HNBAP_HNB-RNL-Identity.c b/src/hnbap/HNBAP_HNB-RNL-Identity.c
index 09d3c52..2e9e705 100644
--- a/src/hnbap/HNBAP_HNB-RNL-Identity.c
+++ b/src/hnbap/HNBAP_HNB-RNL-Identity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNB-RNL-Identity.h>
diff --git a/src/hnbap/HNBAP_HNBAP-PDU.c b/src/hnbap/HNBAP_HNBAP-PDU.c
index 2adb422..d982b93 100644
--- a/src/hnbap/HNBAP_HNBAP-PDU.c
+++ b/src/hnbap/HNBAP_HNBAP-PDU.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBAP-PDU.h>
diff --git a/src/hnbap/HNBAP_HNBCapacity.c b/src/hnbap/HNBAP_HNBCapacity.c
index 3f9da47..e34caf7 100644
--- a/src/hnbap/HNBAP_HNBCapacity.c
+++ b/src/hnbap/HNBAP_HNBCapacity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBCapacity.h>
diff --git a/src/hnbap/HNBAP_HNBConfigInfo.c b/src/hnbap/HNBAP_HNBConfigInfo.c
index 402363d..ba41f60 100644
--- a/src/hnbap/HNBAP_HNBConfigInfo.c
+++ b/src/hnbap/HNBAP_HNBConfigInfo.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBConfigInfo.h>
diff --git a/src/hnbap/HNBAP_HNBConfigTransferRequest.c b/src/hnbap/HNBAP_HNBConfigTransferRequest.c
index ff2b20f..e5db652 100644
--- a/src/hnbap/HNBAP_HNBConfigTransferRequest.c
+++ b/src/hnbap/HNBAP_HNBConfigTransferRequest.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferRequest_ies_specs_2 = {
-	sizeof(struct hnbConfigTransferRequest_ies),
-	offsetof(struct hnbConfigTransferRequest_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies),
+	offsetof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_HNBConfigTransferResponse.c b/src/hnbap/HNBAP_HNBConfigTransferResponse.c
index 00e2d1f..5b73f16 100644
--- a/src/hnbap/HNBAP_HNBConfigTransferResponse.c
+++ b/src/hnbap/HNBAP_HNBConfigTransferResponse.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferResponse_ies_specs_2 = {
-	sizeof(struct hnbConfigTransferResponse_ies),
-	offsetof(struct hnbConfigTransferResponse_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies),
+	offsetof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c
index 27e12fa..4a8e3e9 100644
--- a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c
+++ b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h>
diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c
index db68725..f0988fe 100644
--- a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c
+++ b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h>
diff --git a/src/hnbap/HNBAP_HNBDe-Register.c b/src/hnbap/HNBAP_HNBDe-Register.c
index d2ef818..313dcd1 100644
--- a/src/hnbap/HNBAP_HNBDe-Register.c
+++ b/src/hnbap/HNBAP_HNBDe-Register.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBDe-Register.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbDe_Register_ies_specs_2 = {
-	sizeof(struct hnbDe_Register_ies),
-	offsetof(struct hnbDe_Register_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies),
+	offsetof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_HNBRegisterAccept.c b/src/hnbap/HNBAP_HNBRegisterAccept.c
index 4b1afa0..dafb29a 100644
--- a/src/hnbap/HNBAP_HNBRegisterAccept.c
+++ b/src/hnbap/HNBAP_HNBRegisterAccept.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBRegisterAccept.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbRegisterAccept_ies_specs_2 = {
-	sizeof(struct hnbRegisterAccept_ies),
-	offsetof(struct hnbRegisterAccept_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies),
+	offsetof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_HNBRegisterReject.c b/src/hnbap/HNBAP_HNBRegisterReject.c
index ecab1d1..e13289f 100644
--- a/src/hnbap/HNBAP_HNBRegisterReject.c
+++ b/src/hnbap/HNBAP_HNBRegisterReject.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBRegisterReject.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbRegisterReject_ies_specs_2 = {
-	sizeof(struct hnbRegisterReject_ies),
-	offsetof(struct hnbRegisterReject_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies),
+	offsetof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_HNBRegisterRequest.c b/src/hnbap/HNBAP_HNBRegisterRequest.c
index 3bf2278..443024f 100644
--- a/src/hnbap/HNBAP_HNBRegisterRequest.c
+++ b/src/hnbap/HNBAP_HNBRegisterRequest.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_HNBRegisterRequest.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_hnbRegisterRequest_ies_specs_2 = {
-	sizeof(struct hnbRegisterRequest_ies),
-	offsetof(struct hnbRegisterRequest_ies, _asn_ctx),
+	sizeof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies),
+	offsetof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_IE-Extensions.c b/src/hnbap/HNBAP_IE-Extensions.c
index 603b933..2cc141b 100644
--- a/src/hnbap/HNBAP_IE-Extensions.c
+++ b/src/hnbap/HNBAP_IE-Extensions.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IE-Extensions.h>
diff --git a/src/hnbap/HNBAP_IE.c b/src/hnbap/HNBAP_IE.c
index c57f924..2c9c779 100644
--- a/src/hnbap/HNBAP_IE.c
+++ b/src/hnbap/HNBAP_IE.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IE.h>
diff --git a/src/hnbap/HNBAP_IMEI.c b/src/hnbap/HNBAP_IMEI.c
index b3c4406..cf13c7b 100644
--- a/src/hnbap/HNBAP_IMEI.c
+++ b/src/hnbap/HNBAP_IMEI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IMEI.h>
diff --git a/src/hnbap/HNBAP_IMSI.c b/src/hnbap/HNBAP_IMSI.c
index 9a3c757..bb0c58e 100644
--- a/src/hnbap/HNBAP_IMSI.c
+++ b/src/hnbap/HNBAP_IMSI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IMSI.h>
diff --git a/src/hnbap/HNBAP_IMSIDS41.c b/src/hnbap/HNBAP_IMSIDS41.c
index 10a7807..0d82417 100644
--- a/src/hnbap/HNBAP_IMSIDS41.c
+++ b/src/hnbap/HNBAP_IMSIDS41.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IMSIDS41.h>
diff --git a/src/hnbap/HNBAP_IMSIESN.c b/src/hnbap/HNBAP_IMSIESN.c
index 1b9d9a6..d0c3e9a 100644
--- a/src/hnbap/HNBAP_IMSIESN.c
+++ b/src/hnbap/HNBAP_IMSIESN.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IMSIESN.h>
diff --git a/src/hnbap/HNBAP_IP-Address.c b/src/hnbap/HNBAP_IP-Address.c
index 6bc9d7f..06bc182 100644
--- a/src/hnbap/HNBAP_IP-Address.c
+++ b/src/hnbap/HNBAP_IP-Address.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_IP-Address.h>
@@ -13,7 +13,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_ipaddress_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv4info),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv4info),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_Ipv4Address,
@@ -22,7 +22,7 @@
 		0,
 		"ipv4info"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv6info),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv6info),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_Ipv6Address,
@@ -37,10 +37,10 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ipv6info */
 };
 static asn_CHOICE_specifics_t asn_SPC_ipaddress_specs_2 = {
-	sizeof(struct ipaddress),
-	offsetof(struct ipaddress, _asn_ctx),
-	offsetof(struct ipaddress, present),
-	sizeof(((struct ipaddress *)0)->present),
+	sizeof(struct HNBAP_IP_Address__ipaddress),
+	offsetof(struct HNBAP_IP_Address__ipaddress, _asn_ctx),
+	offsetof(struct HNBAP_IP_Address__ipaddress, present),
+	sizeof(((struct HNBAP_IP_Address__ipaddress *)0)->present),
 	asn_MAP_ipaddress_tag2el_2,
 	2,	/* Count of tags in the map */
 	0,
diff --git a/src/hnbap/HNBAP_InitiatingMessage.c b/src/hnbap/HNBAP_InitiatingMessage.c
index 1b87f7d..155eff9 100644
--- a/src/hnbap/HNBAP_InitiatingMessage.c
+++ b/src/hnbap/HNBAP_InitiatingMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_InitiatingMessage.h>
diff --git a/src/hnbap/HNBAP_Ipv4Address.c b/src/hnbap/HNBAP_Ipv4Address.c
index f325ead..4481e57 100644
--- a/src/hnbap/HNBAP_Ipv4Address.c
+++ b/src/hnbap/HNBAP_Ipv4Address.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Ipv4Address.h>
diff --git a/src/hnbap/HNBAP_Ipv6Address.c b/src/hnbap/HNBAP_Ipv6Address.c
index b0c9176..2fad0a5 100644
--- a/src/hnbap/HNBAP_Ipv6Address.c
+++ b/src/hnbap/HNBAP_Ipv6Address.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Ipv6Address.h>
diff --git a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c
index 79b4dad..3b70b99 100644
--- a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c
+++ b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h>
diff --git a/src/hnbap/HNBAP_LAC.c b/src/hnbap/HNBAP_LAC.c
index 8f3d9f5..81bc84a 100644
--- a/src/hnbap/HNBAP_LAC.c
+++ b/src/hnbap/HNBAP_LAC.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_LAC.h>
diff --git a/src/hnbap/HNBAP_LAI.c b/src/hnbap/HNBAP_LAI.c
index bcfddde..4b0a560 100644
--- a/src/hnbap/HNBAP_LAI.c
+++ b/src/hnbap/HNBAP_LAI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_LAI.h>
diff --git a/src/hnbap/HNBAP_MacroCellID.c b/src/hnbap/HNBAP_MacroCellID.c
index 568e56a..04cc2ea 100644
--- a/src/hnbap/HNBAP_MacroCellID.c
+++ b/src/hnbap/HNBAP_MacroCellID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_MacroCellID.h>
diff --git a/src/hnbap/HNBAP_MacroCoverageInformation.c b/src/hnbap/HNBAP_MacroCoverageInformation.c
index 83ae67b..6284030 100644
--- a/src/hnbap/HNBAP_MacroCoverageInformation.c
+++ b/src/hnbap/HNBAP_MacroCoverageInformation.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_MacroCoverageInformation.h>
diff --git a/src/hnbap/HNBAP_MuxPortNumber.c b/src/hnbap/HNBAP_MuxPortNumber.c
index 4c7ca42..4619dff 100644
--- a/src/hnbap/HNBAP_MuxPortNumber.c
+++ b/src/hnbap/HNBAP_MuxPortNumber.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_MuxPortNumber.h>
diff --git a/src/hnbap/HNBAP_NeighbourCellIdentityList.c b/src/hnbap/HNBAP_NeighbourCellIdentityList.c
index e0f912c..47165dc 100644
--- a/src/hnbap/HNBAP_NeighbourCellIdentityList.c
+++ b/src/hnbap/HNBAP_NeighbourCellIdentityList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h>
diff --git a/src/hnbap/HNBAP_NeighbourIdentity.c b/src/hnbap/HNBAP_NeighbourIdentity.c
index 2e69f01..8386ee1 100644
--- a/src/hnbap/HNBAP_NeighbourIdentity.c
+++ b/src/hnbap/HNBAP_NeighbourIdentity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_NeighbourIdentity.h>
diff --git a/src/hnbap/HNBAP_NeighbourInfoList.c b/src/hnbap/HNBAP_NeighbourInfoList.c
index 458a142..61a4efb 100644
--- a/src/hnbap/HNBAP_NeighbourInfoList.c
+++ b/src/hnbap/HNBAP_NeighbourInfoList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_NeighbourInfoList.h>
diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c
index 42cd579..e556fca 100644
--- a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c
+++ b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h>
diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestList.c b/src/hnbap/HNBAP_NeighbourInfoRequestList.c
index 738d5c2..cc700cc 100644
--- a/src/hnbap/HNBAP_NeighbourInfoRequestList.c
+++ b/src/hnbap/HNBAP_NeighbourInfoRequestList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h>
diff --git a/src/hnbap/HNBAP_PLMNidentity.c b/src/hnbap/HNBAP_PLMNidentity.c
index cb6879b..9ea2254 100644
--- a/src/hnbap/HNBAP_PLMNidentity.c
+++ b/src/hnbap/HNBAP_PLMNidentity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PLMNidentity.h>
diff --git a/src/hnbap/HNBAP_PSC.c b/src/hnbap/HNBAP_PSC.c
index b696fc0..d8049db 100644
--- a/src/hnbap/HNBAP_PSC.c
+++ b/src/hnbap/HNBAP_PSC.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PSC.h>
diff --git a/src/hnbap/HNBAP_PTMSI.c b/src/hnbap/HNBAP_PTMSI.c
index 23976ef..52c380b 100644
--- a/src/hnbap/HNBAP_PTMSI.c
+++ b/src/hnbap/HNBAP_PTMSI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PTMSI.h>
diff --git a/src/hnbap/HNBAP_PTMSIRAI.c b/src/hnbap/HNBAP_PTMSIRAI.c
index dc17dd3..b18bd34 100644
--- a/src/hnbap/HNBAP_PTMSIRAI.c
+++ b/src/hnbap/HNBAP_PTMSIRAI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PTMSIRAI.h>
diff --git a/src/hnbap/HNBAP_Presence.c b/src/hnbap/HNBAP_Presence.c
index a6e7286..3988022 100644
--- a/src/hnbap/HNBAP_Presence.c
+++ b/src/hnbap/HNBAP_Presence.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Presence.h>
diff --git a/src/hnbap/HNBAP_PrivateIE-ID.c b/src/hnbap/HNBAP_PrivateIE-ID.c
index 3bf3000..a514507 100644
--- a/src/hnbap/HNBAP_PrivateIE-ID.c
+++ b/src/hnbap/HNBAP_PrivateIE-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PrivateIE-ID.h>
diff --git a/src/hnbap/HNBAP_PrivateMessage.c b/src/hnbap/HNBAP_PrivateMessage.c
index ebac795..2e703e3 100644
--- a/src/hnbap/HNBAP_PrivateMessage.c
+++ b/src/hnbap/HNBAP_PrivateMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_PrivateMessage.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = {
-	sizeof(struct privateMessage_ies),
-	offsetof(struct privateMessage_ies, _asn_ctx),
+	sizeof(struct HNBAP_PrivateMessage__privateMessage_ies),
+	offsetof(struct HNBAP_PrivateMessage__privateMessage_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_ProcedureCode.c b/src/hnbap/HNBAP_ProcedureCode.c
index c32e9fb..e2b909d 100644
--- a/src/hnbap/HNBAP_ProcedureCode.c
+++ b/src/hnbap/HNBAP_ProcedureCode.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_ProcedureCode.h>
diff --git a/src/hnbap/HNBAP_ProtocolIE-ID.c b/src/hnbap/HNBAP_ProtocolIE-ID.c
index f4fc953..e685cb1 100644
--- a/src/hnbap/HNBAP_ProtocolIE-ID.c
+++ b/src/hnbap/HNBAP_ProtocolIE-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_ProtocolIE-ID.h>
diff --git a/src/hnbap/HNBAP_RAB-ID.c b/src/hnbap/HNBAP_RAB-ID.c
index 4dea280..b66cd9c 100644
--- a/src/hnbap/HNBAP_RAB-ID.c
+++ b/src/hnbap/HNBAP_RAB-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RAB-ID.h>
diff --git a/src/hnbap/HNBAP_RABList.c b/src/hnbap/HNBAP_RABList.c
index fe478e2..e56bdc2 100644
--- a/src/hnbap/HNBAP_RABList.c
+++ b/src/hnbap/HNBAP_RABList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RABList.h>
diff --git a/src/hnbap/HNBAP_RABListItem.c b/src/hnbap/HNBAP_RABListItem.c
index 4fcf4aa..c147214 100644
--- a/src/hnbap/HNBAP_RABListItem.c
+++ b/src/hnbap/HNBAP_RABListItem.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RABListItem.h>
diff --git a/src/hnbap/HNBAP_RAC.c b/src/hnbap/HNBAP_RAC.c
index 6a6235c..9b210ad 100644
--- a/src/hnbap/HNBAP_RAC.c
+++ b/src/hnbap/HNBAP_RAC.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RAC.h>
diff --git a/src/hnbap/HNBAP_RAI.c b/src/hnbap/HNBAP_RAI.c
index c6bca5b..c958051 100644
--- a/src/hnbap/HNBAP_RAI.c
+++ b/src/hnbap/HNBAP_RAI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RAI.h>
diff --git a/src/hnbap/HNBAP_RNC-ID.c b/src/hnbap/HNBAP_RNC-ID.c
index 57da025..73a3921 100644
--- a/src/hnbap/HNBAP_RNC-ID.c
+++ b/src/hnbap/HNBAP_RNC-ID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RNC-ID.h>
diff --git a/src/hnbap/HNBAP_Registration-Cause.c b/src/hnbap/HNBAP_Registration-Cause.c
index 8047241..703d5af 100644
--- a/src/hnbap/HNBAP_Registration-Cause.c
+++ b/src/hnbap/HNBAP_Registration-Cause.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Registration-Cause.h>
diff --git a/src/hnbap/HNBAP_RelocationComplete.c b/src/hnbap/HNBAP_RelocationComplete.c
index b939e69..d0655f0 100644
--- a/src/hnbap/HNBAP_RelocationComplete.c
+++ b/src/hnbap/HNBAP_RelocationComplete.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_RelocationComplete.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_relocationComplete_ies_specs_2 = {
-	sizeof(struct relocationComplete_ies),
-	offsetof(struct relocationComplete_ies, _asn_ctx),
+	sizeof(struct HNBAP_RelocationComplete__relocationComplete_ies),
+	offsetof(struct HNBAP_RelocationComplete__relocationComplete_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_S-RNTIPrefix.c b/src/hnbap/HNBAP_S-RNTIPrefix.c
index 3d5394c..c236fc7 100644
--- a/src/hnbap/HNBAP_S-RNTIPrefix.c
+++ b/src/hnbap/HNBAP_S-RNTIPrefix.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_S-RNTIPrefix.h>
diff --git a/src/hnbap/HNBAP_SAC.c b/src/hnbap/HNBAP_SAC.c
index 6c2a1e2..0c6fc35 100644
--- a/src/hnbap/HNBAP_SAC.c
+++ b/src/hnbap/HNBAP_SAC.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_SAC.h>
diff --git a/src/hnbap/HNBAP_SuccessfulOutcome.c b/src/hnbap/HNBAP_SuccessfulOutcome.c
index 5adb2ab..bd3152a 100644
--- a/src/hnbap/HNBAP_SuccessfulOutcome.c
+++ b/src/hnbap/HNBAP_SuccessfulOutcome.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_SuccessfulOutcome.h>
diff --git a/src/hnbap/HNBAP_TMSIDS41.c b/src/hnbap/HNBAP_TMSIDS41.c
index 0f2e295..7f62cb6 100644
--- a/src/hnbap/HNBAP_TMSIDS41.c
+++ b/src/hnbap/HNBAP_TMSIDS41.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TMSIDS41.h>
diff --git a/src/hnbap/HNBAP_TMSILAI.c b/src/hnbap/HNBAP_TMSILAI.c
index 2fe80eb..05ea97b 100644
--- a/src/hnbap/HNBAP_TMSILAI.c
+++ b/src/hnbap/HNBAP_TMSILAI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TMSILAI.h>
diff --git a/src/hnbap/HNBAP_TNLUpdateFailure.c b/src/hnbap/HNBAP_TNLUpdateFailure.c
index 0f01084..86b371f 100644
--- a/src/hnbap/HNBAP_TNLUpdateFailure.c
+++ b/src/hnbap/HNBAP_TNLUpdateFailure.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TNLUpdateFailure.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_tnlUpdateFailure_ies_specs_2 = {
-	sizeof(struct tnlUpdateFailure_ies),
-	offsetof(struct tnlUpdateFailure_ies, _asn_ctx),
+	sizeof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies),
+	offsetof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_TNLUpdateRequest.c b/src/hnbap/HNBAP_TNLUpdateRequest.c
index bdf5c00..b0650dd 100644
--- a/src/hnbap/HNBAP_TNLUpdateRequest.c
+++ b/src/hnbap/HNBAP_TNLUpdateRequest.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TNLUpdateRequest.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_tnlUpdateRequest_ies_specs_2 = {
-	sizeof(struct tnlUpdateRequest_ies),
-	offsetof(struct tnlUpdateRequest_ies, _asn_ctx),
+	sizeof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies),
+	offsetof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_TNLUpdateResponse.c b/src/hnbap/HNBAP_TNLUpdateResponse.c
index 8876313..db9affb 100644
--- a/src/hnbap/HNBAP_TNLUpdateResponse.c
+++ b/src/hnbap/HNBAP_TNLUpdateResponse.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TNLUpdateResponse.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_tnlUpdateResponse_ies_specs_2 = {
-	sizeof(struct tnlUpdateResponse_ies),
-	offsetof(struct tnlUpdateResponse_ies, _asn_ctx),
+	sizeof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies),
+	offsetof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_TransportInfo.c b/src/hnbap/HNBAP_TransportInfo.c
index 9e0f7a3..2162f9b 100644
--- a/src/hnbap/HNBAP_TransportInfo.c
+++ b/src/hnbap/HNBAP_TransportInfo.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TransportInfo.h>
@@ -13,7 +13,7 @@
 	0, 0	/* No PER value map */
 };
 static asn_TYPE_member_t asn_MBR_transportAssociation_3[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.gtp_TEI),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.gtp_TEI),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_GTP_TEI,
@@ -22,7 +22,7 @@
 		0,
 		"gtp-TEI"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.bindingID),
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.bindingID),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_HNBAP_BindingID,
@@ -37,10 +37,10 @@
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* bindingID */
 };
 static asn_CHOICE_specifics_t asn_SPC_transportAssociation_specs_3 = {
-	sizeof(struct transportAssociation),
-	offsetof(struct transportAssociation, _asn_ctx),
-	offsetof(struct transportAssociation, present),
-	sizeof(((struct transportAssociation *)0)->present),
+	sizeof(struct HNBAP_TransportInfo__transportAssociation),
+	offsetof(struct HNBAP_TransportInfo__transportAssociation, _asn_ctx),
+	offsetof(struct HNBAP_TransportInfo__transportAssociation, present),
+	sizeof(((struct HNBAP_TransportInfo__transportAssociation *)0)->present),
 	asn_MAP_transportAssociation_tag2el_3,
 	2,	/* Count of tags in the map */
 	0,
diff --git a/src/hnbap/HNBAP_TransportLayerAddress.c b/src/hnbap/HNBAP_TransportLayerAddress.c
index 9cc085f..f324e55 100644
--- a/src/hnbap/HNBAP_TransportLayerAddress.c
+++ b/src/hnbap/HNBAP_TransportLayerAddress.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TransportLayerAddress.h>
diff --git a/src/hnbap/HNBAP_TriggeringMessage.c b/src/hnbap/HNBAP_TriggeringMessage.c
index 4485222..d851a6c 100644
--- a/src/hnbap/HNBAP_TriggeringMessage.c
+++ b/src/hnbap/HNBAP_TriggeringMessage.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-CommonDataTypes"
  * 	found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TriggeringMessage.h>
diff --git a/src/hnbap/HNBAP_Tunnel-Information.c b/src/hnbap/HNBAP_Tunnel-Information.c
index db3387e..5429d9e 100644
--- a/src/hnbap/HNBAP_Tunnel-Information.c
+++ b/src/hnbap/HNBAP_Tunnel-Information.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Tunnel-Information.h>
diff --git a/src/hnbap/HNBAP_TypeOfError.c b/src/hnbap/HNBAP_TypeOfError.c
index 2d894f6..53dccc3 100644
--- a/src/hnbap/HNBAP_TypeOfError.c
+++ b/src/hnbap/HNBAP_TypeOfError.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_TypeOfError.h>
diff --git a/src/hnbap/HNBAP_U-RNTI.c b/src/hnbap/HNBAP_U-RNTI.c
index 438c32a..bb10ac7 100644
--- a/src/hnbap/HNBAP_U-RNTI.c
+++ b/src/hnbap/HNBAP_U-RNTI.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_U-RNTI.h>
diff --git a/src/hnbap/HNBAP_U-RNTIQueryRequest.c b/src/hnbap/HNBAP_U-RNTIQueryRequest.c
index f10d278..cea48cb 100644
--- a/src/hnbap/HNBAP_U-RNTIQueryRequest.c
+++ b/src/hnbap/HNBAP_U-RNTIQueryRequest.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryRequest_ies_specs_2 = {
-	sizeof(struct u_RNTIQueryRequest_ies),
-	offsetof(struct u_RNTIQueryRequest_ies, _asn_ctx),
+	sizeof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies),
+	offsetof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_U-RNTIQueryResponse.c b/src/hnbap/HNBAP_U-RNTIQueryResponse.c
index eda66b0..98b9bef 100644
--- a/src/hnbap/HNBAP_U-RNTIQueryResponse.c
+++ b/src/hnbap/HNBAP_U-RNTIQueryResponse.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryResponse_ies_specs_2 = {
-	sizeof(struct u_RNTIQueryResponse_ies),
-	offsetof(struct u_RNTIQueryResponse_ies, _asn_ctx),
+	sizeof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies),
+	offsetof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_UDP-Port-Number.c b/src/hnbap/HNBAP_UDP-Port-Number.c
index 6a5ddb7..ccfea53 100644
--- a/src/hnbap/HNBAP_UDP-Port-Number.c
+++ b/src/hnbap/HNBAP_UDP-Port-Number.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UDP-Port-Number.h>
diff --git a/src/hnbap/HNBAP_UE-Capabilities.c b/src/hnbap/HNBAP_UE-Capabilities.c
index 903df3e..1343a9c 100644
--- a/src/hnbap/HNBAP_UE-Capabilities.c
+++ b/src/hnbap/HNBAP_UE-Capabilities.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UE-Capabilities.h>
diff --git a/src/hnbap/HNBAP_UE-Identity.c b/src/hnbap/HNBAP_UE-Identity.c
index 8a820cc..8160d4e 100644
--- a/src/hnbap/HNBAP_UE-Identity.c
+++ b/src/hnbap/HNBAP_UE-Identity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UE-Identity.h>
diff --git a/src/hnbap/HNBAP_UEDe-Register.c b/src/hnbap/HNBAP_UEDe-Register.c
index 2e5d3ed..5d466f4 100644
--- a/src/hnbap/HNBAP_UEDe-Register.c
+++ b/src/hnbap/HNBAP_UEDe-Register.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UEDe-Register.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_ueDe_Register_ies_specs_2 = {
-	sizeof(struct ueDe_Register_ies),
-	offsetof(struct ueDe_Register_ies, _asn_ctx),
+	sizeof(struct HNBAP_UEDe_Register__ueDe_Register_ies),
+	offsetof(struct HNBAP_UEDe_Register__ueDe_Register_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_UERegisterAccept.c b/src/hnbap/HNBAP_UERegisterAccept.c
index 02f5d5b..d7f2fd8 100644
--- a/src/hnbap/HNBAP_UERegisterAccept.c
+++ b/src/hnbap/HNBAP_UERegisterAccept.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UERegisterAccept.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_ueRegisterAccept_ies_specs_2 = {
-	sizeof(struct ueRegisterAccept_ies),
-	offsetof(struct ueRegisterAccept_ies, _asn_ctx),
+	sizeof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies),
+	offsetof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_UERegisterReject.c b/src/hnbap/HNBAP_UERegisterReject.c
index aab3e7f..4969dc9 100644
--- a/src/hnbap/HNBAP_UERegisterReject.c
+++ b/src/hnbap/HNBAP_UERegisterReject.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UERegisterReject.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_ueRegisterReject_ies_specs_2 = {
-	sizeof(struct ueRegisterReject_ies),
-	offsetof(struct ueRegisterReject_ies, _asn_ctx),
+	sizeof(struct HNBAP_UERegisterReject__ueRegisterReject_ies),
+	offsetof(struct HNBAP_UERegisterReject__ueRegisterReject_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_UERegisterRequest.c b/src/hnbap/HNBAP_UERegisterRequest.c
index af2c267..95a97f7 100644
--- a/src/hnbap/HNBAP_UERegisterRequest.c
+++ b/src/hnbap/HNBAP_UERegisterRequest.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UERegisterRequest.h>
@@ -59,8 +59,8 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_ueRegisterRequest_ies_specs_2 = {
-	sizeof(struct ueRegisterRequest_ies),
-	offsetof(struct ueRegisterRequest_ies, _asn_ctx),
+	sizeof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies),
+	offsetof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies, _asn_ctx),
 	0,	/* XER encoding is XMLDelimitedItemList */
 };
 static /* Use -fall-defs-global to expose */
diff --git a/src/hnbap/HNBAP_URAIdentity.c b/src/hnbap/HNBAP_URAIdentity.c
index 4f9bff7..3bd347e 100644
--- a/src/hnbap/HNBAP_URAIdentity.c
+++ b/src/hnbap/HNBAP_URAIdentity.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_URAIdentity.h>
diff --git a/src/hnbap/HNBAP_URAIdentityList.c b/src/hnbap/HNBAP_URAIdentityList.c
index 4530743..eaff2e9 100644
--- a/src/hnbap/HNBAP_URAIdentityList.c
+++ b/src/hnbap/HNBAP_URAIdentityList.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_URAIdentityList.h>
diff --git a/src/hnbap/HNBAP_UTRANCellID.c b/src/hnbap/HNBAP_UTRANCellID.c
index 28d69fe..f0a7f6a 100644
--- a/src/hnbap/HNBAP_UTRANCellID.c
+++ b/src/hnbap/HNBAP_UTRANCellID.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UTRANCellID.h>
diff --git a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c
index 188dcbf..f6c3011 100644
--- a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c
+++ b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h>
diff --git a/src/hnbap/HNBAP_UnsuccessfulOutcome.c b/src/hnbap/HNBAP_UnsuccessfulOutcome.c
index 4b83dda..30734ca 100644
--- a/src/hnbap/HNBAP_UnsuccessfulOutcome.c
+++ b/src/hnbap/HNBAP_UnsuccessfulOutcome.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-PDU"
  * 	found in "../../asn1/hnbap/HNBAP-PDU.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h>
diff --git a/src/hnbap/HNBAP_Update-cause.c b/src/hnbap/HNBAP_Update-cause.c
index 105e3b6..d7acd6c 100644
--- a/src/hnbap/HNBAP_Update-cause.c
+++ b/src/hnbap/HNBAP_Update-cause.c
@@ -2,7 +2,7 @@
  * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
  * From ASN.1 module "HNBAP-IEs"
  * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
- * 	`asn1c -R`
+ * 	`asn1c -R -fcompound-names`
  */
 
 #include <osmocom/hnbap/HNBAP_Update-cause.h>
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index 53dd609..15bee55 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -243,7 +243,7 @@
 regen: regenerate-from-asn1-source
 
 regenerate-from-asn1-source:
-	ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn
+	ASN1C_PREFIX="HNBAP_" asn1c -R -fcompound-names -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn
 #	change include style to `#include <dir/foo.h>'
 	$(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC)
 #	Finally copy *.c from buildir to srcdir:

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696
Gerrit-Change-Number: 25991
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211027/d1121ed0/attachment.htm>


More information about the gerrit-log mailing list