diff --git a/lib/asn/src/s1ap_decoder.c b/lib/asn/src/s1ap_decoder.c
index 87faa5b05..56a687ea2 100644
--- a/lib/asn/src/s1ap_decoder.c
+++ b/lib/asn/src/s1ap_decoder.c
@@ -30,7 +30,7 @@
 /*******************************************************************************
  * This file had been created by asn1tostruct.py script v1.0.2
  * Please do not modify this file but regenerate it via script.
- * Created on: 2017-02-03 16:04:58.969044 by acetcom
+ * Created on: 2017-02-03 21:15:13.370695 by acetcom
  * from ['S1AP-PDU.asn']
  ******************************************************************************/
 #define TRACE_MODULE s1ap_decoder
@@ -7220,7 +7220,7 @@ int s1ap_decode_s1ap_uplinkueassociatedlppatransport_ies(
 }
 
 int s1ap_decode_s1ap_e_rabfailedtosetuplisthoreqack(
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs,
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs,
     S1ap_E_RABFailedtoSetupListHOReqAck_t *s1ap_E_RABFailedtoSetupListHOReqAck) {
 
     int i, decoded = 0;
@@ -7256,7 +7256,7 @@ int s1ap_decode_s1ap_e_rabfailedtosetuplisthoreqack(
 }
 
 int s1ap_decode_s1ap_e_rabreleaselistbearerrelcomp(
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs,
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs,
     S1ap_E_RABReleaseListBearerRelComp_t *s1ap_E_RABReleaseListBearerRelComp) {
 
     int i, decoded = 0;
@@ -7292,7 +7292,7 @@ int s1ap_decode_s1ap_e_rabreleaselistbearerrelcomp(
 }
 
 int s1ap_decode_s1ap_e_rabtobesetuplisthoreq(
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs,
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs,
     S1ap_E_RABToBeSetupListHOReq_t *s1ap_E_RABToBeSetupListHOReq) {
 
     int i, decoded = 0;
@@ -7328,7 +7328,7 @@ int s1ap_decode_s1ap_e_rabtobesetuplisthoreq(
 }
 
 int s1ap_decode_s1ap_e_rabtobemodifiedlistbearermodreq(
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs,
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs,
     S1ap_E_RABToBeModifiedListBearerModReq_t *s1ap_E_RABToBeModifiedListBearerModReq) {
 
     int i, decoded = 0;
@@ -7364,7 +7364,7 @@ int s1ap_decode_s1ap_e_rabtobemodifiedlistbearermodreq(
 }
 
 int s1ap_decode_s1ap_e_rabadmittedlist(
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs,
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs,
     S1ap_E_RABAdmittedList_t *s1ap_E_RABAdmittedList) {
 
     int i, decoded = 0;
@@ -7400,7 +7400,7 @@ int s1ap_decode_s1ap_e_rabadmittedlist(
 }
 
 int s1ap_decode_s1ap_e_rabtobesetuplistbearersureq(
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs,
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs,
     S1ap_E_RABToBeSetupListBearerSUReq_t *s1ap_E_RABToBeSetupListBearerSUReq) {
 
     int i, decoded = 0;
@@ -7436,7 +7436,7 @@ int s1ap_decode_s1ap_e_rabtobesetuplistbearersureq(
 }
 
 int s1ap_decode_s1ap_e_rabdataforwardinglist(
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs,
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs,
     S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList) {
 
     int i, decoded = 0;
@@ -7472,7 +7472,7 @@ int s1ap_decode_s1ap_e_rabdataforwardinglist(
 }
 
 int s1ap_decode_s1ap_e_rabtobeswitcheddllist(
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs,
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs,
     S1ap_E_RABToBeSwitchedDLList_t *s1ap_E_RABToBeSwitchedDLList) {
 
     int i, decoded = 0;
@@ -7508,7 +7508,7 @@ int s1ap_decode_s1ap_e_rabtobeswitcheddllist(
 }
 
 int s1ap_decode_s1ap_e_rabsetuplistctxtsures(
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs,
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs,
     S1ap_E_RABSetupListCtxtSURes_t *s1ap_E_RABSetupListCtxtSURes) {
 
     int i, decoded = 0;
@@ -7544,7 +7544,7 @@ int s1ap_decode_s1ap_e_rabsetuplistctxtsures(
 }
 
 int s1ap_decode_s1ap_e_rabtobeswitchedullist(
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs,
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs,
     S1ap_E_RABToBeSwitchedULList_t *s1ap_E_RABToBeSwitchedULList) {
 
     int i, decoded = 0;
@@ -7580,7 +7580,7 @@ int s1ap_decode_s1ap_e_rabtobeswitchedullist(
 }
 
 int s1ap_decode_s1ap_bearers_subjecttostatustransfer_list(
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs,
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs,
     S1ap_Bearers_SubjectToStatusTransfer_List_t *s1ap_Bearers_SubjectToStatusTransfer_List) {
 
     int i, decoded = 0;
@@ -7616,7 +7616,7 @@ int s1ap_decode_s1ap_bearers_subjecttostatustransfer_list(
 }
 
 int s1ap_decode_s1ap_e_rablist(
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs,
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs,
     S1ap_E_RABList_t *s1ap_E_RABList) {
 
     int i, decoded = 0;
@@ -7652,7 +7652,7 @@ int s1ap_decode_s1ap_e_rablist(
 }
 
 int s1ap_decode_s1ap_tailist(
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs,
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs,
     S1ap_TAIList_t *s1ap_TAIList) {
 
     int i, decoded = 0;
@@ -7688,7 +7688,7 @@ int s1ap_decode_s1ap_tailist(
 }
 
 int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistres(
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs,
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs,
     S1ap_UE_associatedLogicalS1_ConnectionListRes_t *s1ap_UE_associatedLogicalS1_ConnectionListRes) {
 
     int i, decoded = 0;
@@ -7724,7 +7724,7 @@ int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistres(
 }
 
 int s1ap_decode_s1ap_e_rabsetuplistbearersures(
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs,
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs,
     S1ap_E_RABSetupListBearerSURes_t *s1ap_E_RABSetupListBearerSURes) {
 
     int i, decoded = 0;
@@ -7760,7 +7760,7 @@ int s1ap_decode_s1ap_e_rabsetuplistbearersures(
 }
 
 int s1ap_decode_s1ap_e_rabmodifylistbearermodres(
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs,
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs,
     S1ap_E_RABModifyListBearerModRes_t *s1ap_E_RABModifyListBearerModRes) {
 
     int i, decoded = 0;
@@ -7796,7 +7796,7 @@ int s1ap_decode_s1ap_e_rabmodifylistbearermodres(
 }
 
 int s1ap_decode_s1ap_e_rabtobesetuplistctxtsureq(
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs,
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs,
     S1ap_E_RABToBeSetupListCtxtSUReq_t *s1ap_E_RABToBeSetupListCtxtSUReq) {
 
     int i, decoded = 0;
@@ -7832,7 +7832,7 @@ int s1ap_decode_s1ap_e_rabtobesetuplistctxtsureq(
 }
 
 int s1ap_decode_s1ap_e_rabinformationlist(
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs,
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs,
     S1ap_E_RABInformationList_t *s1ap_E_RABInformationList) {
 
     int i, decoded = 0;
@@ -7868,7 +7868,7 @@ int s1ap_decode_s1ap_e_rabinformationlist(
 }
 
 int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistresack(
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs,
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs,
     S1ap_UE_associatedLogicalS1_ConnectionListResAck_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck) {
 
     int i, decoded = 0;
diff --git a/lib/asn/src/s1ap_encoder.c b/lib/asn/src/s1ap_encoder.c
index 6a07030b7..ba9856dd8 100644
--- a/lib/asn/src/s1ap_encoder.c
+++ b/lib/asn/src/s1ap_encoder.c
@@ -30,7 +30,7 @@
 /*******************************************************************************
  * This file had been created by asn1tostruct.py script v1.0.2
  * Please do not modify this file but regenerate it via script.
- * Created on: 2017-02-03 16:04:58.994273 by acetcom
+ * Created on: 2017-02-03 21:15:13.396112 by acetcom
  * from ['S1AP-PDU.asn']
  ******************************************************************************/
 #include "s1ap_common.h"
@@ -4002,7 +4002,7 @@ int s1ap_encode_s1ap_uplinkueassociatedlppatransport_ies(
 
 int s1ap_encode_s1ap_e_rabfailedtosetuplisthoreqack(
     S1ap_E_RABFailedtoSetupListHOReqAck_t *s1ap_E_RABFailedtoSetupListHOReqAck,
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs) {
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4024,7 +4024,7 @@ int s1ap_encode_s1ap_e_rabfailedtosetuplisthoreqack(
 
 int s1ap_encode_s1ap_e_rabreleaselistbearerrelcomp(
     S1ap_E_RABReleaseListBearerRelComp_t *s1ap_E_RABReleaseListBearerRelComp,
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs) {
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4046,7 +4046,7 @@ int s1ap_encode_s1ap_e_rabreleaselistbearerrelcomp(
 
 int s1ap_encode_s1ap_e_rabtobesetuplisthoreq(
     S1ap_E_RABToBeSetupListHOReq_t *s1ap_E_RABToBeSetupListHOReq,
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs) {
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4068,7 +4068,7 @@ int s1ap_encode_s1ap_e_rabtobesetuplisthoreq(
 
 int s1ap_encode_s1ap_e_rabtobemodifiedlistbearermodreq(
     S1ap_E_RABToBeModifiedListBearerModReq_t *s1ap_E_RABToBeModifiedListBearerModReq,
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs) {
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4090,7 +4090,7 @@ int s1ap_encode_s1ap_e_rabtobemodifiedlistbearermodreq(
 
 int s1ap_encode_s1ap_e_rabadmittedlist(
     S1ap_E_RABAdmittedList_t *s1ap_E_RABAdmittedList,
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs) {
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4112,7 +4112,7 @@ int s1ap_encode_s1ap_e_rabadmittedlist(
 
 int s1ap_encode_s1ap_e_rabtobesetuplistbearersureq(
     S1ap_E_RABToBeSetupListBearerSUReq_t *s1ap_E_RABToBeSetupListBearerSUReq,
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs) {
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4134,7 +4134,7 @@ int s1ap_encode_s1ap_e_rabtobesetuplistbearersureq(
 
 int s1ap_encode_s1ap_e_rabdataforwardinglist(
     S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList,
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs) {
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4156,7 +4156,7 @@ int s1ap_encode_s1ap_e_rabdataforwardinglist(
 
 int s1ap_encode_s1ap_e_rabtobeswitcheddllist(
     S1ap_E_RABToBeSwitchedDLList_t *s1ap_E_RABToBeSwitchedDLList,
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs) {
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4178,7 +4178,7 @@ int s1ap_encode_s1ap_e_rabtobeswitcheddllist(
 
 int s1ap_encode_s1ap_e_rabsetuplistctxtsures(
     S1ap_E_RABSetupListCtxtSURes_t *s1ap_E_RABSetupListCtxtSURes,
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs) {
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4200,7 +4200,7 @@ int s1ap_encode_s1ap_e_rabsetuplistctxtsures(
 
 int s1ap_encode_s1ap_e_rabtobeswitchedullist(
     S1ap_E_RABToBeSwitchedULList_t *s1ap_E_RABToBeSwitchedULList,
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs) {
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4222,7 +4222,7 @@ int s1ap_encode_s1ap_e_rabtobeswitchedullist(
 
 int s1ap_encode_s1ap_bearers_subjecttostatustransfer_list(
     S1ap_Bearers_SubjectToStatusTransfer_List_t *s1ap_Bearers_SubjectToStatusTransfer_List,
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs) {
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4244,7 +4244,7 @@ int s1ap_encode_s1ap_bearers_subjecttostatustransfer_list(
 
 int s1ap_encode_s1ap_e_rablist(
     S1ap_E_RABList_t *s1ap_E_RABList,
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs) {
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4266,7 +4266,7 @@ int s1ap_encode_s1ap_e_rablist(
 
 int s1ap_encode_s1ap_tailist(
     S1ap_TAIList_t *s1ap_TAIList,
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs) {
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4288,7 +4288,7 @@ int s1ap_encode_s1ap_tailist(
 
 int s1ap_encode_s1ap_ue_associatedlogicals1_connectionlistres(
     S1ap_UE_associatedLogicalS1_ConnectionListRes_t *s1ap_UE_associatedLogicalS1_ConnectionListRes,
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs) {
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4310,7 +4310,7 @@ int s1ap_encode_s1ap_ue_associatedlogicals1_connectionlistres(
 
 int s1ap_encode_s1ap_e_rabsetuplistbearersures(
     S1ap_E_RABSetupListBearerSURes_t *s1ap_E_RABSetupListBearerSURes,
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs) {
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4332,7 +4332,7 @@ int s1ap_encode_s1ap_e_rabsetuplistbearersures(
 
 int s1ap_encode_s1ap_e_rabmodifylistbearermodres(
     S1ap_E_RABModifyListBearerModRes_t *s1ap_E_RABModifyListBearerModRes,
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs) {
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4354,7 +4354,7 @@ int s1ap_encode_s1ap_e_rabmodifylistbearermodres(
 
 int s1ap_encode_s1ap_e_rabtobesetuplistctxtsureq(
     S1ap_E_RABToBeSetupListCtxtSUReq_t *s1ap_E_RABToBeSetupListCtxtSUReq,
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs) {
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4376,7 +4376,7 @@ int s1ap_encode_s1ap_e_rabtobesetuplistctxtsureq(
 
 int s1ap_encode_s1ap_e_rabinformationlist(
     S1ap_E_RABInformationList_t *s1ap_E_RABInformationList,
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs) {
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs) {
 
     int i;
     S1ap_IE_t *ie;
@@ -4398,7 +4398,7 @@ int s1ap_encode_s1ap_e_rabinformationlist(
 
 int s1ap_encode_s1ap_ue_associatedlogicals1_connectionlistresack(
     S1ap_UE_associatedLogicalS1_ConnectionListResAck_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck,
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs) {
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs) {
 
     int i;
     S1ap_IE_t *ie;
diff --git a/lib/asn/src/s1ap_ies_defs.h b/lib/asn/src/s1ap_ies_defs.h
index 7df686e75..d6864be7b 100644
--- a/lib/asn/src/s1ap_ies_defs.h
+++ b/lib/asn/src/s1ap_ies_defs.h
@@ -30,7 +30,7 @@
 /*******************************************************************************
  * This file had been created by asn1tostruct.py script v1.0.2
  * Please do not modify this file but regenerate it via script.
- * Created on: 2017-02-03 16:04:58.954200 by acetcom
+ * Created on: 2017-02-03 21:15:13.355159 by acetcom
  * from ['S1AP-PDU.asn']
  ******************************************************************************/
 #include "s1ap_common.h"
@@ -41,81 +41,81 @@
 /* Define the version of script used to generate this file */
 #define S1AP_SCRIPT_VERSION (102)
 
-typedef struct S1ap_E_RABFailedtoSetupListHOReqAckIEs_s {
+typedef struct S1ap_E_RABFailedtoSetupListHOReqAck_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABFailedtoSetupItemHOReqAck_s) s1ap_E_RABFailedtoSetupItemHOReqAck;
-} S1ap_E_RABFailedtoSetupListHOReqAckIEs_t;
+} S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t;
 
-typedef struct S1ap_E_RABReleaseListBearerRelCompIEs_s {
+typedef struct S1ap_E_RABReleaseListBearerRelComp_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABReleaseItemBearerRelComp_s) s1ap_E_RABReleaseItemBearerRelComp;
-} S1ap_E_RABReleaseListBearerRelCompIEs_t;
+} S1ap_E_RABReleaseListBearerRelComp_IEs_t;
 
-typedef struct S1ap_E_RABToBeSetupListHOReqIEs_s {
+typedef struct S1ap_E_RABToBeSetupListHOReq_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeSetupItemHOReq_s) s1ap_E_RABToBeSetupItemHOReq;
-} S1ap_E_RABToBeSetupListHOReqIEs_t;
+} S1ap_E_RABToBeSetupListHOReq_IEs_t;
 
-typedef struct S1ap_E_RABToBeModifiedListBearerModReqIEs_s {
+typedef struct S1ap_E_RABToBeModifiedListBearerModReq_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeModifiedItemBearerModReq_s) s1ap_E_RABToBeModifiedItemBearerModReq;
-} S1ap_E_RABToBeModifiedListBearerModReqIEs_t;
+} S1ap_E_RABToBeModifiedListBearerModReq_IEs_t;
 
-typedef struct S1ap_E_RABAdmittedListIEs_s {
+typedef struct S1ap_E_RABAdmittedList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABAdmittedItem_s) s1ap_E_RABAdmittedItem;
-} S1ap_E_RABAdmittedListIEs_t;
+} S1ap_E_RABAdmittedList_IEs_t;
 
-typedef struct S1ap_E_RABToBeSetupListBearerSUReqIEs_s {
+typedef struct S1ap_E_RABToBeSetupListBearerSUReq_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeSetupItemBearerSUReq_s) s1ap_E_RABToBeSetupItemBearerSUReq;
-} S1ap_E_RABToBeSetupListBearerSUReqIEs_t;
+} S1ap_E_RABToBeSetupListBearerSUReq_IEs_t;
 
-typedef struct S1ap_E_RABDataForwardingListIEs_s {
+typedef struct S1ap_E_RABDataForwardingList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABDataForwardingItem_s) s1ap_E_RABDataForwardingItem;
-} S1ap_E_RABDataForwardingListIEs_t;
+} S1ap_E_RABDataForwardingList_IEs_t;
 
-typedef struct S1ap_E_RABToBeSwitchedDLListIEs_s {
+typedef struct S1ap_E_RABToBeSwitchedDLList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeSwitchedDLItem_s) s1ap_E_RABToBeSwitchedDLItem;
-} S1ap_E_RABToBeSwitchedDLListIEs_t;
+} S1ap_E_RABToBeSwitchedDLList_IEs_t;
 
-typedef struct S1ap_E_RABSetupListCtxtSUResIEs_s {
+typedef struct S1ap_E_RABSetupListCtxtSURes_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABSetupItemCtxtSURes_s) s1ap_E_RABSetupItemCtxtSURes;
-} S1ap_E_RABSetupListCtxtSUResIEs_t;
+} S1ap_E_RABSetupListCtxtSURes_IEs_t;
 
-typedef struct S1ap_E_RABToBeSwitchedULListIEs_s {
+typedef struct S1ap_E_RABToBeSwitchedULList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeSwitchedULItem_s) s1ap_E_RABToBeSwitchedULItem;
-} S1ap_E_RABToBeSwitchedULListIEs_t;
+} S1ap_E_RABToBeSwitchedULList_IEs_t;
 
-typedef struct S1ap_Bearers_SubjectToStatusTransfer_ListIEs_s {
+typedef struct S1ap_Bearers_SubjectToStatusTransfer_List_IEs_s {
     A_SEQUENCE_OF(struct S1ap_Bearers_SubjectToStatusTransfer_Item_s) s1ap_Bearers_SubjectToStatusTransfer_Item;
-} S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t;
+} S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t;
 
-typedef struct S1ap_E_RABListIEs_s {
+typedef struct S1ap_E_RABList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABItem_s) s1ap_E_RABItem;
-} S1ap_E_RABListIEs_t;
+} S1ap_E_RABList_IEs_t;
 
-typedef struct S1ap_TAIListIEs_s {
+typedef struct S1ap_TAIList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_TAIItem_s) s1ap_TAIItem;
-} S1ap_TAIListIEs_t;
+} S1ap_TAIList_IEs_t;
 
-typedef struct S1ap_UE_associatedLogicalS1_ConnectionListResIEs_s {
+typedef struct S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_s {
     A_SEQUENCE_OF(struct S1ap_UE_associatedLogicalS1_ConnectionItemRes_s) s1ap_UE_associatedLogicalS1_ConnectionItemRes;
-} S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t;
+} S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t;
 
-typedef struct S1ap_E_RABSetupListBearerSUResIEs_s {
+typedef struct S1ap_E_RABSetupListBearerSURes_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABSetupItemBearerSURes_s) s1ap_E_RABSetupItemBearerSURes;
-} S1ap_E_RABSetupListBearerSUResIEs_t;
+} S1ap_E_RABSetupListBearerSURes_IEs_t;
 
-typedef struct S1ap_E_RABModifyListBearerModResIEs_s {
+typedef struct S1ap_E_RABModifyListBearerModRes_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABModifyItemBearerModRes_s) s1ap_E_RABModifyItemBearerModRes;
-} S1ap_E_RABModifyListBearerModResIEs_t;
+} S1ap_E_RABModifyListBearerModRes_IEs_t;
 
-typedef struct S1ap_E_RABToBeSetupListCtxtSUReqIEs_s {
+typedef struct S1ap_E_RABToBeSetupListCtxtSUReq_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABToBeSetupItemCtxtSUReq_s) s1ap_E_RABToBeSetupItemCtxtSUReq;
-} S1ap_E_RABToBeSetupListCtxtSUReqIEs_t;
+} S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t;
 
-typedef struct S1ap_E_RABInformationListIEs_s {
+typedef struct S1ap_E_RABInformationList_IEs_s {
     A_SEQUENCE_OF(struct S1ap_E_RABInformationList_s) s1ap_E_RABInformationList;
-} S1ap_E_RABInformationListIEs_t;
+} S1ap_E_RABInformationList_IEs_t;
 
-typedef struct S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_s {
+typedef struct S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_s {
     A_SEQUENCE_OF(struct S1ap_UE_associatedLogicalS1_ConnectionItemResAck_s) s1ap_UE_associatedLogicalS1_ConnectionItemResAck;
-} S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t;
+} S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t;
 
 typedef struct S1ap_E_RABFailedtoSetupItemHOReqAckIEs_s {
     S1ap_E_RABFailedToSetupItemHOReqAck_t e_RABFailedtoSetupItemHOReqAck;
@@ -143,8 +143,8 @@ typedef struct S1ap_E_RABReleaseResponseIEs_s {
     uint16_t                             presenceMask;
     S1ap_MME_UE_S1AP_ID_t                mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t                eNB_UE_S1AP_ID;
-    S1ap_E_RABReleaseListBearerRelCompIEs_t e_RABReleaseListBearerRelComp; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABFailedToReleaseList; ///< Optional field
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t e_RABReleaseListBearerRelComp; ///< Optional field
+    S1ap_E_RABList_IEs_t e_RABFailedToReleaseList; ///< Optional field
     S1ap_CriticalityDiagnostics_t        criticalityDiagnostics; ///< Optional field
 } S1ap_E_RABReleaseResponseIEs_t;
 
@@ -299,7 +299,7 @@ typedef struct S1ap_InitialContextSetupRequestIEs_s {
     S1ap_MME_UE_S1AP_ID_t              mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t              eNB_UE_S1AP_ID;
     S1ap_UEAggregateMaximumBitrate_t   uEaggregateMaximumBitrate;
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t e_RABToBeSetupListCtxtSUReq;
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t e_RABToBeSetupListCtxtSUReq;
     S1ap_UESecurityCapabilities_t      ueSecurityCapabilities;
     S1ap_SecurityKey_t                 securityKey;
     S1ap_TraceActivation_t             traceActivation; ///< Optional field
@@ -405,7 +405,7 @@ typedef struct S1ap_HandoverRequestIEs_s {
     S1ap_HandoverType_t                         handoverType;
     S1ap_Cause_t                                cause;
     S1ap_UEAggregateMaximumBitrate_t            uEaggregateMaximumBitrate;
-    S1ap_E_RABToBeSetupListHOReqIEs_t e_RABToBeSetupListHOReq;
+    S1ap_E_RABToBeSetupListHOReq_IEs_t e_RABToBeSetupListHOReq;
     S1ap_Source_ToTarget_TransparentContainer_t source_ToTarget_TransparentContainer;
     S1ap_UESecurityCapabilities_t               ueSecurityCapabilities;
     S1ap_HandoverRestrictionList_t              handoverRestrictionList; ///< Optional field
@@ -493,7 +493,7 @@ typedef struct S1ap_E_RABModifyRequestIEs_s {
     S1ap_MME_UE_S1AP_ID_t                    mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t                    eNB_UE_S1AP_ID;
     S1ap_UEAggregateMaximumBitrate_t         uEaggregateMaximumBitrate; ///< Optional field
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t e_RABToBeModifiedListBearerModReq;
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t e_RABToBeModifiedListBearerModReq;
 } S1ap_E_RABModifyRequestIEs_t;
 
 typedef struct S1ap_E_RABSetupItemCtxtSUResIEs_s {
@@ -550,7 +550,7 @@ typedef struct S1ap_PagingIEs_s {
     S1ap_UEPagingID_t           uePagingID;
     S1ap_PagingDRX_t            pagingDRX; ///< Optional field
     S1ap_CNDomain_t             cnDomain;
-    S1ap_TAIListIEs_t taiList;
+    S1ap_TAIList_IEs_t taiList;
     S1ap_CSG_IdList_t           csG_IdList; ///< Optional field
     S1ap_PagingPriority_t       pagingPriority; ///< Optional field
 } S1ap_PagingIEs_t;
@@ -570,7 +570,7 @@ typedef struct S1ap_E_RABReleaseCommandIEs_s {
     S1ap_MME_UE_S1AP_ID_t            mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t            eNB_UE_S1AP_ID;
     S1ap_UEAggregateMaximumBitrate_t uEaggregateMaximumBitrate; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABToBeReleasedList;
+    S1ap_E_RABList_IEs_t e_RABToBeReleasedList;
     S1ap_NAS_PDU_t                   nas_pdu; ///< Optional field
 } S1ap_E_RABReleaseCommandIEs_t;
 
@@ -592,8 +592,8 @@ typedef struct S1ap_E_RABModifyResponseIEs_s {
     uint16_t                           presenceMask;
     S1ap_MME_UE_S1AP_ID_t              mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t              eNB_UE_S1AP_ID;
-    S1ap_E_RABModifyListBearerModResIEs_t e_RABModifyListBearerModRes; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABFailedToModifyList; ///< Optional field
+    S1ap_E_RABModifyListBearerModRes_IEs_t e_RABModifyListBearerModRes; ///< Optional field
+    S1ap_E_RABList_IEs_t e_RABFailedToModifyList; ///< Optional field
     S1ap_CriticalityDiagnostics_t      criticalityDiagnostics; ///< Optional field
 } S1ap_E_RABModifyResponseIEs_t;
 
@@ -633,8 +633,8 @@ typedef struct S1ap_HandoverCommandIEs_s {
     S1ap_MME_UE_S1AP_ID_t                       mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t                       eNB_UE_S1AP_ID;
     S1ap_HandoverType_t                         handoverType;
-    S1ap_E_RABDataForwardingListIEs_t e_RABDataForwardingList; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABtoReleaseListHOCmd; ///< Optional field
+    S1ap_E_RABDataForwardingList_IEs_t e_RABDataForwardingList; ///< Optional field
+    S1ap_E_RABList_IEs_t e_RABtoReleaseListHOCmd; ///< Optional field
     S1ap_Target_ToSource_TransparentContainer_t target_ToSource_TransparentContainer;
     S1ap_Target_ToSource_TransparentContainer_t target_ToSource_TransparentContainer_Secondary; ///< Optional field
     S1ap_CriticalityDiagnostics_t               criticalityDiagnostics; ///< Optional field
@@ -684,8 +684,8 @@ typedef struct S1ap_HandoverRequestAcknowledgeIEs_s {
     uint16_t                                    presenceMask;
     S1ap_MME_UE_S1AP_ID_t                       mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t                       eNB_UE_S1AP_ID;
-    S1ap_E_RABAdmittedListIEs_t e_RABAdmittedList;
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t e_RABFailedToSetupListHOReqAck; ///< Optional field
+    S1ap_E_RABAdmittedList_IEs_t e_RABAdmittedList;
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t e_RABFailedToSetupListHOReqAck; ///< Optional field
     S1ap_Target_ToSource_TransparentContainer_t target_ToSource_TransparentContainer;
     S1ap_CSG_Id_t                               csG_Id; ///< Optional field
     S1ap_CriticalityDiagnostics_t               criticalityDiagnostics; ///< Optional field
@@ -726,8 +726,8 @@ typedef struct S1ap_PathSwitchRequestAcknowledgeIEs_s {
     S1ap_MME_UE_S1AP_ID_t            mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t            eNB_UE_S1AP_ID;
     S1ap_UEAggregateMaximumBitrate_t uEaggregateMaximumBitrate; ///< Optional field
-    S1ap_E_RABToBeSwitchedULListIEs_t e_RABToBeSwitchedULList; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABToBeReleasedList; ///< Optional field
+    S1ap_E_RABToBeSwitchedULList_IEs_t e_RABToBeSwitchedULList; ///< Optional field
+    S1ap_E_RABList_IEs_t e_RABToBeReleasedList; ///< Optional field
     S1ap_SecurityContext_t           securityContext;
     S1ap_CriticalityDiagnostics_t    criticalityDiagnostics; ///< Optional field
     S1ap_MME_UE_S1AP_ID_t            mme_ue_s1ap_id_2; ///< Optional field
@@ -764,8 +764,8 @@ typedef struct S1ap_InitialContextSetupResponseIEs_s {
     uint16_t                       presenceMask;
     S1ap_MME_UE_S1AP_ID_t          mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t          eNB_UE_S1AP_ID;
-    S1ap_E_RABSetupListCtxtSUResIEs_t e_RABSetupListCtxtSURes;
-    S1ap_E_RABListIEs_t e_RABFailedToSetupListCtxtSURes; ///< Optional field
+    S1ap_E_RABSetupListCtxtSURes_IEs_t e_RABSetupListCtxtSURes;
+    S1ap_E_RABList_IEs_t e_RABFailedToSetupListCtxtSURes; ///< Optional field
     S1ap_CriticalityDiagnostics_t  criticalityDiagnostics; ///< Optional field
 } S1ap_InitialContextSetupResponseIEs_t;
 
@@ -776,7 +776,7 @@ typedef struct S1ap_DownlinkS1cdma2000tunnelingIEs_s {
     uint16_t                       presenceMask;
     S1ap_MME_UE_S1AP_ID_t          mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t          eNB_UE_S1AP_ID;
-    S1ap_E_RABDataForwardingListIEs_t e_RABDataForwardingList; ///< Optional field
+    S1ap_E_RABDataForwardingList_IEs_t e_RABDataForwardingList; ///< Optional field
     S1ap_Cdma2000HOStatus_t        cdma2000HOStatus; ///< Optional field
     S1ap_Cdma2000RATType_t         cdma2000RATType;
     S1ap_Cdma2000PDU_t             cdma2000PDU;
@@ -821,11 +821,9 @@ typedef struct S1ap_TraceFailureIndicationIEs_s {
     S1ap_Cause_t            cause;
 } S1ap_TraceFailureIndicationIEs_t;
 
-#if 0 /* modified by acetcom */
 typedef struct S1ap_E_RABInformationListIEs_s {
     S1ap_E_RABInformationListItem_t e_RABInformationListItem;
 } S1ap_E_RABInformationListIEs_t;
-#endif
 
 #define S1AP_ENBCONFIGURATIONTRANSFERIES_SONCONFIGURATIONTRANSFERECT_PRESENT   (1 << 0)
 
@@ -855,8 +853,8 @@ typedef struct S1ap_E_RABSetupResponseIEs_s {
     uint16_t                         presenceMask;
     S1ap_MME_UE_S1AP_ID_t            mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t            eNB_UE_S1AP_ID;
-    S1ap_E_RABSetupListBearerSUResIEs_t e_RABSetupListBearerSURes; ///< Optional field
-    S1ap_E_RABListIEs_t e_RABFailedToSetupListBearerSURes; ///< Optional field
+    S1ap_E_RABSetupListBearerSURes_IEs_t e_RABSetupListBearerSURes; ///< Optional field
+    S1ap_E_RABList_IEs_t e_RABFailedToSetupListBearerSURes; ///< Optional field
     S1ap_CriticalityDiagnostics_t    criticalityDiagnostics; ///< Optional field
 } S1ap_E_RABSetupResponseIEs_t;
 
@@ -872,7 +870,7 @@ typedef struct S1ap_UEContextReleaseCommand_IEs_s {
 typedef struct S1ap_PathSwitchRequestIEs_s {
     uint16_t                       presenceMask;
     S1ap_ENB_UE_S1AP_ID_t          eNB_UE_S1AP_ID;
-    S1ap_E_RABToBeSwitchedDLListIEs_t e_RABToBeSwitchedDLList;
+    S1ap_E_RABToBeSwitchedDLList_IEs_t e_RABToBeSwitchedDLList;
     S1ap_MME_UE_S1AP_ID_t          sourceMME_UE_S1AP_ID;
     S1ap_EUTRAN_CGI_t              eutran_cgi;
     S1ap_TAI_t                     tai;
@@ -897,7 +895,7 @@ typedef struct S1ap_DownlinkNASTransport_IEs_s {
 typedef struct S1ap_E_RABReleaseIndicationIEs_s {
     S1ap_MME_UE_S1AP_ID_t mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t eNB_UE_S1AP_ID;
-    S1ap_E_RABListIEs_t e_RABReleasedList;
+    S1ap_E_RABList_IEs_t e_RABReleasedList;
 } S1ap_E_RABReleaseIndicationIEs_t;
 
 #define S1AP_S1SETUPREQUESTIES_ENBNAME_PRESENT            (1 << 0)
@@ -938,7 +936,7 @@ typedef struct S1ap_E_RABSetupRequestIEs_s {
     S1ap_MME_UE_S1AP_ID_t                mme_ue_s1ap_id;
     S1ap_ENB_UE_S1AP_ID_t                eNB_UE_S1AP_ID;
     S1ap_UEAggregateMaximumBitrate_t     uEaggregateMaximumBitrate; ///< Optional field
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t e_RABToBeSetupListBearerSUReq;
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t e_RABToBeSetupListBearerSUReq;
 } S1ap_E_RABSetupRequestIEs_t;
 
 typedef struct S1ap_ENBStatusTransferIEs_s {
@@ -952,7 +950,7 @@ typedef struct S1ap_ENBStatusTransferIEs_s {
 
 typedef struct S1ap_ResetAcknowledgeIEs_s {
     uint16_t                                           presenceMask;
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t uE_associatedLogicalS1_ConnectionListResAck; ///< Optional field
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t uE_associatedLogicalS1_ConnectionListResAck; ///< Optional field
     S1ap_CriticalityDiagnostics_t                      criticalityDiagnostics; ///< Optional field
 } S1ap_ResetAcknowledgeIEs_t;
 
@@ -2193,14 +2191,14 @@ int s1ap_encode_s1ap_uplinkueassociatedlppatransport_ies(
  **/
 int s1ap_encode_s1ap_e_rabfailedtosetuplisthoreqack(
     S1ap_E_RABFailedtoSetupListHOReqAck_t *s1ap_E_RABFailedtoSetupListHOReqAck,
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs);
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs);
 
 /** \brief Decode function for S1ap-E-RABFailedtoSetupItemHOReqAckIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabfailedtosetuplisthoreqack(
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs,
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs,
     S1ap_E_RABFailedtoSetupListHOReqAck_t *s1ap_E_RABFailedtoSetupListHOReqAck);
 
 /** \brief Encode function for S1ap-E-RABReleaseItemBearerRelCompIEs ies.
@@ -2209,14 +2207,14 @@ int s1ap_decode_s1ap_e_rabfailedtosetuplisthoreqack(
  **/
 int s1ap_encode_s1ap_e_rabreleaselistbearerrelcomp(
     S1ap_E_RABReleaseListBearerRelComp_t *s1ap_E_RABReleaseListBearerRelComp,
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs);
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs);
 
 /** \brief Decode function for S1ap-E-RABReleaseItemBearerRelCompIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabreleaselistbearerrelcomp(
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs,
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs,
     S1ap_E_RABReleaseListBearerRelComp_t *s1ap_E_RABReleaseListBearerRelComp);
 
 /** \brief Encode function for S1ap-E-RABToBeSetupItemHOReqIEs ies.
@@ -2225,14 +2223,14 @@ int s1ap_decode_s1ap_e_rabreleaselistbearerrelcomp(
  **/
 int s1ap_encode_s1ap_e_rabtobesetuplisthoreq(
     S1ap_E_RABToBeSetupListHOReq_t *s1ap_E_RABToBeSetupListHOReq,
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs);
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeSetupItemHOReqIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobesetuplisthoreq(
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs,
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs,
     S1ap_E_RABToBeSetupListHOReq_t *s1ap_E_RABToBeSetupListHOReq);
 
 /** \brief Encode function for S1ap-E-RABToBeModifiedItemBearerModReqIEs ies.
@@ -2241,14 +2239,14 @@ int s1ap_decode_s1ap_e_rabtobesetuplisthoreq(
  **/
 int s1ap_encode_s1ap_e_rabtobemodifiedlistbearermodreq(
     S1ap_E_RABToBeModifiedListBearerModReq_t *s1ap_E_RABToBeModifiedListBearerModReq,
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs);
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeModifiedItemBearerModReqIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobemodifiedlistbearermodreq(
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs,
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs,
     S1ap_E_RABToBeModifiedListBearerModReq_t *s1ap_E_RABToBeModifiedListBearerModReq);
 
 /** \brief Encode function for S1ap-E-RABAdmittedItemIEs ies.
@@ -2257,14 +2255,14 @@ int s1ap_decode_s1ap_e_rabtobemodifiedlistbearermodreq(
  **/
 int s1ap_encode_s1ap_e_rabadmittedlist(
     S1ap_E_RABAdmittedList_t *s1ap_E_RABAdmittedList,
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs);
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs);
 
 /** \brief Decode function for S1ap-E-RABAdmittedItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabadmittedlist(
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs,
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs,
     S1ap_E_RABAdmittedList_t *s1ap_E_RABAdmittedList);
 
 /** \brief Encode function for S1ap-E-RABToBeSetupItemBearerSUReqIEs ies.
@@ -2273,14 +2271,14 @@ int s1ap_decode_s1ap_e_rabadmittedlist(
  **/
 int s1ap_encode_s1ap_e_rabtobesetuplistbearersureq(
     S1ap_E_RABToBeSetupListBearerSUReq_t *s1ap_E_RABToBeSetupListBearerSUReq,
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs);
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeSetupItemBearerSUReqIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobesetuplistbearersureq(
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs,
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs,
     S1ap_E_RABToBeSetupListBearerSUReq_t *s1ap_E_RABToBeSetupListBearerSUReq);
 
 /** \brief Encode function for S1ap-E-RABDataForwardingItemIEs ies.
@@ -2289,14 +2287,14 @@ int s1ap_decode_s1ap_e_rabtobesetuplistbearersureq(
  **/
 int s1ap_encode_s1ap_e_rabdataforwardinglist(
     S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList,
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs);
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs);
 
 /** \brief Decode function for S1ap-E-RABDataForwardingItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabdataforwardinglist(
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs,
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs,
     S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList);
 
 /** \brief Encode function for S1ap-E-RABToBeSwitchedDLItemIEs ies.
@@ -2305,14 +2303,14 @@ int s1ap_decode_s1ap_e_rabdataforwardinglist(
  **/
 int s1ap_encode_s1ap_e_rabtobeswitcheddllist(
     S1ap_E_RABToBeSwitchedDLList_t *s1ap_E_RABToBeSwitchedDLList,
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs);
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeSwitchedDLItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobeswitcheddllist(
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs,
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs,
     S1ap_E_RABToBeSwitchedDLList_t *s1ap_E_RABToBeSwitchedDLList);
 
 /** \brief Encode function for S1ap-E-RABSetupItemCtxtSUResIEs ies.
@@ -2321,14 +2319,14 @@ int s1ap_decode_s1ap_e_rabtobeswitcheddllist(
  **/
 int s1ap_encode_s1ap_e_rabsetuplistctxtsures(
     S1ap_E_RABSetupListCtxtSURes_t *s1ap_E_RABSetupListCtxtSURes,
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs);
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs);
 
 /** \brief Decode function for S1ap-E-RABSetupItemCtxtSUResIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabsetuplistctxtsures(
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs,
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs,
     S1ap_E_RABSetupListCtxtSURes_t *s1ap_E_RABSetupListCtxtSURes);
 
 /** \brief Encode function for S1ap-E-RABToBeSwitchedULItemIEs ies.
@@ -2337,14 +2335,14 @@ int s1ap_decode_s1ap_e_rabsetuplistctxtsures(
  **/
 int s1ap_encode_s1ap_e_rabtobeswitchedullist(
     S1ap_E_RABToBeSwitchedULList_t *s1ap_E_RABToBeSwitchedULList,
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs);
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeSwitchedULItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobeswitchedullist(
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs,
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs,
     S1ap_E_RABToBeSwitchedULList_t *s1ap_E_RABToBeSwitchedULList);
 
 /** \brief Encode function for S1ap-Bearers-SubjectToStatusTransfer-ItemIEs ies.
@@ -2353,14 +2351,14 @@ int s1ap_decode_s1ap_e_rabtobeswitchedullist(
  **/
 int s1ap_encode_s1ap_bearers_subjecttostatustransfer_list(
     S1ap_Bearers_SubjectToStatusTransfer_List_t *s1ap_Bearers_SubjectToStatusTransfer_List,
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs);
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs);
 
 /** \brief Decode function for S1ap-Bearers-SubjectToStatusTransfer-ItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_bearers_subjecttostatustransfer_list(
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs,
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs,
     S1ap_Bearers_SubjectToStatusTransfer_List_t *s1ap_Bearers_SubjectToStatusTransfer_List);
 
 /** \brief Encode function for S1ap-E-RABItemIEs ies.
@@ -2369,14 +2367,14 @@ int s1ap_decode_s1ap_bearers_subjecttostatustransfer_list(
  **/
 int s1ap_encode_s1ap_e_rablist(
     S1ap_E_RABList_t *s1ap_E_RABList,
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs);
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs);
 
 /** \brief Decode function for S1ap-E-RABItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rablist(
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs,
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs,
     S1ap_E_RABList_t *s1ap_E_RABList);
 
 /** \brief Encode function for S1ap-TAIItemIEs ies.
@@ -2385,14 +2383,14 @@ int s1ap_decode_s1ap_e_rablist(
  **/
 int s1ap_encode_s1ap_tailist(
     S1ap_TAIList_t *s1ap_TAIList,
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs);
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs);
 
 /** \brief Decode function for S1ap-TAIItemIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_tailist(
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs,
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs,
     S1ap_TAIList_t *s1ap_TAIList);
 
 /** \brief Encode function for S1ap-UE-associatedLogicalS1-ConnectionItemRes ies.
@@ -2401,14 +2399,14 @@ int s1ap_decode_s1ap_tailist(
  **/
 int s1ap_encode_s1ap_ue_associatedlogicals1_connectionlistres(
     S1ap_UE_associatedLogicalS1_ConnectionListRes_t *s1ap_UE_associatedLogicalS1_ConnectionListRes,
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs);
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs);
 
 /** \brief Decode function for S1ap-UE-associatedLogicalS1-ConnectionItemRes ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistres(
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs,
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs,
     S1ap_UE_associatedLogicalS1_ConnectionListRes_t *s1ap_UE_associatedLogicalS1_ConnectionListRes);
 
 /** \brief Encode function for S1ap-E-RABSetupItemBearerSUResIEs ies.
@@ -2417,14 +2415,14 @@ int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistres(
  **/
 int s1ap_encode_s1ap_e_rabsetuplistbearersures(
     S1ap_E_RABSetupListBearerSURes_t *s1ap_E_RABSetupListBearerSURes,
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs);
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs);
 
 /** \brief Decode function for S1ap-E-RABSetupItemBearerSUResIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabsetuplistbearersures(
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs,
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs,
     S1ap_E_RABSetupListBearerSURes_t *s1ap_E_RABSetupListBearerSURes);
 
 /** \brief Encode function for S1ap-E-RABModifyItemBearerModResIEs ies.
@@ -2433,14 +2431,14 @@ int s1ap_decode_s1ap_e_rabsetuplistbearersures(
  **/
 int s1ap_encode_s1ap_e_rabmodifylistbearermodres(
     S1ap_E_RABModifyListBearerModRes_t *s1ap_E_RABModifyListBearerModRes,
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs);
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs);
 
 /** \brief Decode function for S1ap-E-RABModifyItemBearerModResIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabmodifylistbearermodres(
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs,
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs,
     S1ap_E_RABModifyListBearerModRes_t *s1ap_E_RABModifyListBearerModRes);
 
 /** \brief Encode function for S1ap-E-RABToBeSetupItemCtxtSUReqIEs ies.
@@ -2449,14 +2447,14 @@ int s1ap_decode_s1ap_e_rabmodifylistbearermodres(
  **/
 int s1ap_encode_s1ap_e_rabtobesetuplistctxtsureq(
     S1ap_E_RABToBeSetupListCtxtSUReq_t *s1ap_E_RABToBeSetupListCtxtSUReq,
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs);
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs);
 
 /** \brief Decode function for S1ap-E-RABToBeSetupItemCtxtSUReqIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabtobesetuplistctxtsureq(
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs,
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs,
     S1ap_E_RABToBeSetupListCtxtSUReq_t *s1ap_E_RABToBeSetupListCtxtSUReq);
 
 /** \brief Encode function for S1ap-E-RABInformationListIEs ies.
@@ -2465,14 +2463,14 @@ int s1ap_decode_s1ap_e_rabtobesetuplistctxtsureq(
  **/
 int s1ap_encode_s1ap_e_rabinformationlist(
     S1ap_E_RABInformationList_t *s1ap_E_RABInformationList,
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs);
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs);
 
 /** \brief Decode function for S1ap-E-RABInformationListIEs ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_e_rabinformationlist(
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs,
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs,
     S1ap_E_RABInformationList_t *s1ap_E_RABInformationList);
 
 /** \brief Encode function for S1ap-UE-associatedLogicalS1-ConnectionItemResAck ies.
@@ -2481,14 +2479,14 @@ int s1ap_decode_s1ap_e_rabinformationlist(
  **/
 int s1ap_encode_s1ap_ue_associatedlogicals1_connectionlistresack(
     S1ap_UE_associatedLogicalS1_ConnectionListResAck_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck,
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs);
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs);
 
 /** \brief Decode function for S1ap-UE-associatedLogicalS1-ConnectionItemResAck ies.
  *  \param any_p Pointer to the ANY value to decode.
  *  \param callback Callback function called when any_p is successfully decoded.
  **/
 int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistresack(
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs,
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs,
     S1ap_UE_associatedLogicalS1_ConnectionListResAck_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck);
 
 /** \brief Display S1ap_E_RABFailedtoSetupListHOReqAck encapsulated IE using XER encoding.
@@ -2498,7 +2496,7 @@ int s1ap_decode_s1ap_ue_associatedlogicals1_connectionlistresack(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabfailedtosetuplisthoreqack(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs);
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs);
 
 /** \brief Display S1ap_DeactivateTrace message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2516,7 +2514,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_deactivatetrace(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabreleaselistbearerrelcomp(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs);
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs);
 
 /** \brief Display S1ap_ENBDirectInformationTransfer message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2552,7 +2550,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport_(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplisthoreq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs);
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs);
 
 /** \brief Display S1ap_TraceStart message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2597,7 +2595,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverpreparationfailure(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobemodifiedlistbearermodreq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs);
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs);
 
 /** \brief Display S1ap_UEContextReleaseRequest_ message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2615,7 +2613,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest_(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabadmittedlist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs);
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs);
 
 /** \brief Display S1ap_InitialUEMessage_ message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2660,7 +2658,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uecapabilityinfoindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistbearersureq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs);
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs);
 
 /** \brief Display S1ap_E_RABDataForwardingList encapsulated IE using XER encoding.
  *  \param s1ap_E_RABDataForwardingItemIEs Pointer to the IES structure.
@@ -2669,7 +2667,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistbearersureq(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabdataforwardinglist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs);
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs);
 
 /** \brief Display S1ap_LocationReportingFailureIndication message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2768,7 +2766,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverrequired(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobeswitcheddllist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs);
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs);
 
 /** \brief Display S1ap_MMEConfigurationUpdateAcknowledge message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2822,7 +2820,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifyrequest(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistctxtsures(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs);
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs);
 
 /** \brief Display S1ap_E_RABToBeSwitchedULList encapsulated IE using XER encoding.
  *  \param s1ap_E_RABToBeSwitchedULItemIEs Pointer to the IES structure.
@@ -2831,7 +2829,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistctxtsures(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobeswitchedullist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs);
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs);
 
 /** \brief Display S1ap_ENBConfigurationUpdateFailure message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2858,7 +2856,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_reset(
 asn_enc_rval_t s1ap_xer_print_s1ap_bearers_subjecttostatustransfer_list(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs);
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs);
 
 /** \brief Display S1ap_E_RABList encapsulated IE using XER encoding.
  *  \param s1ap_E_RABItemIEs Pointer to the IES structure.
@@ -2867,7 +2865,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_bearers_subjecttostatustransfer_list(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rablist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs);
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs);
 
 /** \brief Display S1ap_S1SetupResponse message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -2984,7 +2982,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_errorindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_tailist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs);
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs);
 
 /** \brief Display S1ap_OverloadStart message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -3056,7 +3054,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_pathswitchrequestacknowledge(
 asn_enc_rval_t s1ap_xer_print_s1ap_ue_associatedlogicals1_connectionlistres(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs);
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResIEs);
 
 /** \brief Display S1ap_S1SetupFailure message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -3110,7 +3108,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_overloadstop(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistbearersures(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs);
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs);
 
 /** \brief Display S1ap_E_RABModifyListBearerModRes encapsulated IE using XER encoding.
  *  \param s1ap_E_RABModifyItemBearerModResIEs Pointer to the IES structure.
@@ -3119,7 +3117,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistbearersures(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifylistbearermodres(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs);
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs);
 
 /** \brief Display S1ap_E_RABToBeSetupListCtxtSUReq encapsulated IE using XER encoding.
  *  \param s1ap_E_RABToBeSetupItemCtxtSUReqIEs Pointer to the IES structure.
@@ -3128,7 +3126,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifylistbearermodres(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistctxtsureq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs);
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs);
 
 /** \brief Display S1ap_ENBConfigurationUpdate message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -3155,7 +3153,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_tracefailureindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabinformationlist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs);
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs);
 
 /** \brief Display S1ap_ENBConfigurationTransfer message using XER encoding.
  *  \param message_p Pointer to root message.
@@ -3182,7 +3180,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverfailure(
 asn_enc_rval_t s1ap_xer_print_s1ap_ue_associatedlogicals1_connectionlistresack(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs);
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAckIEs);
 
 /** \brief Display S1ap_E_RABSetupResponse message using XER encoding.
  *  \param message_p Pointer to root message.
diff --git a/lib/asn/src/s1ap_xer_print.c b/lib/asn/src/s1ap_xer_print.c
index f17fb6c9b..e8e510c39 100644
--- a/lib/asn/src/s1ap_xer_print.c
+++ b/lib/asn/src/s1ap_xer_print.c
@@ -30,7 +30,7 @@
 /*******************************************************************************
  * This file had been created by asn1tostruct.py script v1.0.2
  * Please do not modify this file but regenerate it via script.
- * Created on: 2017-02-03 16:04:59.016341 by acetcom
+ * Created on: 2017-02-03 21:15:13.410191 by acetcom
  * from ['S1AP-PDU.asn']
  ******************************************************************************/
 #include <stdlib.h>
@@ -95,7 +95,7 @@ cb_failed:
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabfailedtosetuplisthoreqack(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABFailedtoSetupListHOReqAckIEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs) {
+    S1ap_E_RABFailedtoSetupListHOReqAck_IEs_t *s1ap_E_RABFailedtoSetupListHOReqAckIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -129,7 +129,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_deactivatetrace(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabreleaselistbearerrelcomp(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABReleaseListBearerRelCompIEs_t *s1ap_E_RABReleaseListBearerRelCompIEs) {
+    S1ap_E_RABReleaseListBearerRelComp_IEs_t *s1ap_E_RABReleaseListBearerRelCompIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -210,7 +210,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport_(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplisthoreq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListHOReqIEs_t *s1ap_E_RABToBeSetupListHOReqIEs) {
+    S1ap_E_RABToBeSetupListHOReq_IEs_t *s1ap_E_RABToBeSetupListHOReqIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -315,7 +315,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverpreparationfailure(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobemodifiedlistbearermodreq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeModifiedListBearerModReqIEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs) {
+    S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -352,7 +352,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest_(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabadmittedlist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABAdmittedListIEs_t *s1ap_E_RABAdmittedListIEs) {
+    S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -493,7 +493,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uecapabilityinfoindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistbearersureq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListBearerSUReqIEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs) {
+    S1ap_E_RABToBeSetupListBearerSUReq_IEs_t *s1ap_E_RABToBeSetupListBearerSUReqIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -506,7 +506,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistbearersureq(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabdataforwardinglist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs) {
+    S1ap_E_RABDataForwardingList_IEs_t *s1ap_E_RABDataForwardingListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -867,7 +867,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverrequired(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobeswitcheddllist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSwitchedDLListIEs_t *s1ap_E_RABToBeSwitchedDLListIEs) {
+    S1ap_E_RABToBeSwitchedDLList_IEs_t *s1ap_E_RABToBeSwitchedDLListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -999,7 +999,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifyrequest(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistctxtsures(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABSetupListCtxtSUResIEs_t *s1ap_E_RABSetupListCtxtSUResIEs) {
+    S1ap_E_RABSetupListCtxtSURes_IEs_t *s1ap_E_RABSetupListCtxtSUResIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1012,7 +1012,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistctxtsures(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobeswitchedullist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSwitchedULListIEs_t *s1ap_E_RABToBeSwitchedULListIEs) {
+    S1ap_E_RABToBeSwitchedULList_IEs_t *s1ap_E_RABToBeSwitchedULListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1070,7 +1070,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_reset(
 asn_enc_rval_t s1ap_xer_print_s1ap_bearers_subjecttostatustransfer_list(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_Bearers_SubjectToStatusTransfer_ListIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs) {
+    S1ap_Bearers_SubjectToStatusTransfer_List_IEs_t *s1ap_Bearers_SubjectToStatusTransfer_ListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1083,7 +1083,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_bearers_subjecttostatustransfer_list(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rablist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABListIEs_t *s1ap_E_RABListIEs) {
+    S1ap_E_RABList_IEs_t *s1ap_E_RABListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1409,7 +1409,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_errorindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_tailist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_TAIListIEs_t *s1ap_TAIListIEs) {
+    S1ap_TAIList_IEs_t *s1ap_TAIListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1601,7 +1601,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_pathswitchrequestacknowledge(
 asn_enc_rval_t s1ap_xer_print_s1ap_ue_associatedlogicals1_connectionlistres(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_UE_associatedLogicalS1_ConnectionListResIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListRes) {
+    S1ap_UE_associatedLogicalS1_ConnectionListRes_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListRes) {
 
     int i;
     asn_enc_rval_t er;
@@ -1740,7 +1740,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_overloadstop(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistbearersures(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABSetupListBearerSUResIEs_t *s1ap_E_RABSetupListBearerSUResIEs) {
+    S1ap_E_RABSetupListBearerSURes_IEs_t *s1ap_E_RABSetupListBearerSUResIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1753,7 +1753,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetuplistbearersures(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifylistbearermodres(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABModifyListBearerModResIEs_t *s1ap_E_RABModifyListBearerModResIEs) {
+    S1ap_E_RABModifyListBearerModRes_IEs_t *s1ap_E_RABModifyListBearerModResIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1766,7 +1766,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabmodifylistbearermodres(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistctxtsureq(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABToBeSetupListCtxtSUReqIEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs) {
+    S1ap_E_RABToBeSetupListCtxtSUReq_IEs_t *s1ap_E_RABToBeSetupListCtxtSUReqIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1831,7 +1831,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_tracefailureindication(
 asn_enc_rval_t s1ap_xer_print_s1ap_e_rabinformationlist(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_E_RABInformationListIEs_t *s1ap_E_RABInformationListIEs) {
+    S1ap_E_RABInformationList_IEs_t *s1ap_E_RABInformationListIEs) {
 
     int i;
     asn_enc_rval_t er;
@@ -1888,7 +1888,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverfailure(
 asn_enc_rval_t s1ap_xer_print_s1ap_ue_associatedlogicals1_connectionlistresack(
     asn_app_consume_bytes_f *cb,
     void *app_key,
-    S1ap_UE_associatedLogicalS1_ConnectionListResAckIEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck) {
+    S1ap_UE_associatedLogicalS1_ConnectionListResAck_IEs_t *s1ap_UE_associatedLogicalS1_ConnectionListResAck) {
 
     int i;
     asn_enc_rval_t er;
diff --git a/lib/asn/support/asn1prefix.py b/lib/asn/support/asn1prefix.py
index 9a1cc1367..bb47bdb2b 100644
--- a/lib/asn/support/asn1prefix.py
+++ b/lib/asn/support/asn1prefix.py
@@ -35,7 +35,7 @@ def usage():
     print "Python adding prefix for asn1 v%s" % (version)
     print "Usage: python asn1prefix.py [options]"
     print "Available options:"
-    print "-f [file] Input file to parse"
+    print "-i [file] Input file to parse"
     print "-o [file] Output file for result"
     print "-h        Print this help and return"
 
diff --git a/lib/asn/support/asn1tostruct.py b/lib/asn/support/asn1tostruct.py
index 95397713b..4f0707a44 100644
--- a/lib/asn/support/asn1tostruct.py
+++ b/lib/asn/support/asn1tostruct.py
@@ -168,7 +168,7 @@ for filename in filenames:
     for m in re.findall(r'([a-zA-Z0-9-]+)\s*::=\s+E-RAB-IE-ContainerList\s*\{\s*\{\s*([a-zA-Z0-9-]+)\s*\}\s*\}', lines, re.MULTILINE):
         ieofielist[m[0]] = m[1]
 
-    for i in re.findall(r'([a-zA-Z0-9-]+)\s+([A-Z0-9-]+)\s*::=\s*\{\s+([\,\|\{\}\t\n\.{3}\ \-a-zA-Z0-9]+)\s+}\n', lines, re.MULTILINE):
+    for i in re.findall(r'([a-zA-Z0-9-]+)\s+(S1AP-PROTOCOL-IES)\s*::=\s*\{\s+([\,\|\{\}\t\n\.{3}\ \-a-zA-Z0-9]+)\s+}\n', lines, re.MULTILINE):
         ies = []
         maxLength = 0
         # TODO: handle extensions
@@ -210,9 +210,9 @@ for key in iesDefs:
         if j == key:
             break
 
-    f.write("typedef struct %sIEs_s {\n" % (re.sub('-', '_', i)))
+    f.write("typedef struct %s_IEs_s {\n" % (re.sub('-', '_', i)))
     f.write("    A_SEQUENCE_OF(struct %s_s) %s;\n" % (re.sub('IEs', '', re.sub('-', '_', ieofielist[i])), lowerFirstCamelWord(re.sub('IEs', '', re.sub('-', '_', ieofielist[i])))))
-    f.write("} %sIEs_t;\n\n" % (re.sub('-', '_', i)))
+    f.write("} %s_IEs_t;\n\n" % (re.sub('-', '_', i)))
 
 for key in iesDefs:
     keyupperunderscore = re.sub('-', '_', key.upper())
@@ -241,7 +241,7 @@ for key in iesDefs:
         iename = re.sub('id-', '', ie[0])
         ienameunderscore = lowerFirstCamelWord(re.sub('-', '_', iename))
         if ie[2] in ieofielist:
-            f.write("    %sIEs_t %s;" % (re.sub('-', '_', ie[2]), ienameunderscore))
+            f.write("    %s_IEs_t %s;" % (re.sub('-', '_', ie[2]), ienameunderscore))
         else:
             f.write("    {0:<{pad}} {1};".format("%s_t" % ieunderscore, ienameunderscore, pad=iesDefs[key]["length"] + 2))
         if ie[3] == "optional":
@@ -311,13 +311,13 @@ for key in iesDefs:
     f.write(" **/\n")
     f.write("int %s_encode_%s(\n" % (fileprefix, firstlower.lower()))
     f.write("    %s_t *%s,\n" % (asn1cStruct, firstlower))
-    f.write("    %sIEs_t *%sIEs);\n\n" % (asn1cStruct, firstlower))
+    f.write("    %s_IEs_t *%sIEs);\n\n" % (asn1cStruct, firstlower))
     f.write("/** \\brief Decode function for %s ies.\n" % (key))
     f.write(" *  \\param any_p Pointer to the ANY value to decode.\n")
     f.write(" *  \\param callback Callback function called when any_p is successfully decoded.\n")
     f.write(" **/\n")
     f.write("int %s_decode_%s(\n" % (fileprefix, firstlower.lower()))
-    f.write("    %sIEs_t *%sIEs,\n" % (asn1cStruct, firstlower))
+    f.write("    %s_IEs_t *%sIEs,\n" % (asn1cStruct, firstlower))
     f.write("    %s_t *%s);\n\n" % (asn1cStruct, lowerFirstCamelWord(asn1cStruct)))
 
 for key in iesDefs:
@@ -333,7 +333,7 @@ for key in iesDefs:
         f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('item', 'list', firstlower.lower())))
         f.write("    asn_app_consume_bytes_f *cb,\n")
         f.write("    void *app_key,\n")
-        f.write("    %sIEs_t *%sIEs);\n\n" % (re.sub('item', 'list', asn1cStruct), firstlower))
+        f.write("    %s_IEs_t *%sIEs);\n\n" % (re.sub('item', 'list', asn1cStruct), firstlower))
     else:
         f.write("/** \\brief Display %s message using XER encoding.\n" % (asn1cStruct))
         f.write(" *  \\param message_p Pointer to root message.\n")
@@ -443,7 +443,7 @@ for key in iesDefs:
     keyname = re.sub('IEs', '', re.sub('Item', 'List', key))
 
     f.write("int %s_decode_%s(\n" % (fileprefix, re.sub('-', '_', keyname).lower()))
-    f.write("    %sIEs_t *%sIEs,\n" % (re.sub('-', '_', keyname), lowerFirstCamelWord(re.sub('-', '_', keyname))))
+    f.write("    %s_IEs_t *%sIEs,\n" % (re.sub('-', '_', keyname), lowerFirstCamelWord(re.sub('-', '_', keyname))))
     f.write("    %s_t *%s) {\n\n" % (re.sub('-', '_', keyname), lowerFirstCamelWord(re.sub('-', '_', keyname))))
     f.write("    int i, decoded = 0;\n")
     f.write("    int tempDecoded = 0;\n\n")
@@ -579,7 +579,7 @@ for (key, value) in iesDefs.items():
             break
     f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', i).lower()))
     f.write("    %s_t *%s,\n" % (asn1cStruct, firstwordlower))
-    f.write("    %sIEs_t *%sIEs) {\n\n" % (re.sub('-', '_', i), lowerFirstCamelWord(re.sub('-', '_', i))))
+    f.write("    %s_IEs_t *%sIEs) {\n\n" % (re.sub('-', '_', i), lowerFirstCamelWord(re.sub('-', '_', i))))
     f.write("    int i;\n")
 
     f.write("    %s_IE_t *ie;\n\n" % (fileprefix_first_upper))
@@ -679,7 +679,7 @@ for (key, value) in iesDefs.items():
     f.write("    void *app_key,\n")
     if key in ieofielist.values():
         iesStructName = lowerFirstCamelWord(re.sub('Item', 'List', re.sub('-', '_', key)))
-        f.write("    %sIEs_t *%s) {\n\n" % (re.sub('IEs', '', re.sub('Item', 'List', re.sub('-', '_', key))), iesStructName))
+        f.write("    %s_IEs_t *%s) {\n\n" % (re.sub('IEs', '', re.sub('Item', 'List', re.sub('-', '_', key))), iesStructName))
         f.write("    int i;\n")
         f.write("    asn_enc_rval_t er;\n")
     else:
diff --git a/lib/asn/test/s1ap_test.c b/lib/asn/test/s1ap_test.c
index 99ace2210..fdf8700ca 100644
--- a/lib/asn/test/s1ap_test.c
+++ b/lib/asn/test/s1ap_test.c
@@ -17,11 +17,9 @@ static void s1ap_test1(abts_case *tc, void *data)
     };
     s1ap_message message;
     int result;
-    char *message_string = calloc (10000, sizeof (char));
 
     result = s1ap_mme_decode_pdu(&message, (unsigned char*)s1setup_msg[0], 49);
-
-    free(message_string);
+    ABTS_INT_EQUAL(tc, 0, result);
 }
 
 abts_suite *test_s1ap(abts_suite *suite)