Prepare for the use of the new -X parameter for BER encoded protocols.

svn path=/trunk/; revision=21889

57 files changed, 10702 insertions, 9666 deletions

diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index de92ff9314..0fcb27a303 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -108,7 +108,7 @@ static int dissect_extensionContainer(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t MAP_OpenInfo_sequence[] = {
+static const ber_old_sequence_t MAP_OpenInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -117,8 +117,8 @@ static const ber_sequence_t MAP_OpenInfo_sequence[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
 
   return offset;
 }
@@ -127,15 +127,15 @@ static int dissect_map_open_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t MAP_AcceptInfo_sequence[] = {
+static const ber_old_sequence_t MAP_AcceptInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
 
   return offset;
 }
@@ -144,15 +144,15 @@ static int dissect_map_accept_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MAP_CloseInfo_sequence[] = {
+static const ber_old_sequence_t MAP_CloseInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
 
   return offset;
 }
@@ -193,7 +193,7 @@ static int dissect_alternativeApplicationContext(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
+static const ber_old_sequence_t MAP_RefuseInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alternativeApplicationContext },
@@ -202,8 +202,8 @@ static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
 
   return offset;
 }
@@ -278,7 +278,7 @@ static const value_string MAP_DialoguePDU_MAP_UserAbortChoice_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MAP_UserAbortChoice_choice[] = {
+static const ber_old_choice_t MAP_UserAbortChoice_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_userSpecificReason_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_userResourceLimitation_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_resourceUnavailable_impl },
@@ -288,9 +288,9 @@ static const ber_choice_t MAP_UserAbortChoice_choice[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice,
+                                     NULL);
 
   return offset;
 }
@@ -299,7 +299,7 @@ static int dissect_map_UserAbortChoice(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
+static const ber_old_sequence_t MAP_UserAbortInfo_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -307,8 +307,8 @@ static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_UserAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
 
   return offset;
 }
@@ -336,7 +336,7 @@ static int dissect_map_ProviderAbortReason(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
+static const ber_old_sequence_t MAP_ProviderAbortInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -344,8 +344,8 @@ static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
 
   return offset;
 }
@@ -364,7 +364,7 @@ static const value_string MAP_DialoguePDU_MAP_DialoguePDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MAP_DialoguePDU_choice[] = {
+static const ber_old_choice_t MAP_DialoguePDU_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_map_open_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_map_accept_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_map_close_impl },
@@ -376,9 +376,9 @@ static const ber_choice_t MAP_DialoguePDU_choice[] = {
 
 static int
 dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 30b8b38fc7..1b34e99ccf 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -337,14 +337,14 @@ static int dissect_Addressees_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Addressees_sequence_of[1] = {
+static const ber_old_sequence_t Addressees_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_Addressees_item },
 };
 
 static int
 dissect_acp133_Addressees(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Addressees_sequence_of, hf_index, ett_acp133_Addressees);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Addressees_sequence_of, hf_index, ett_acp133_Addressees);
 
   return offset;
 }
@@ -434,7 +434,7 @@ static int dissect_date(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t PairwiseTag_sequence[] = {
+static const ber_old_sequence_t PairwiseTag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kmid },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_edition },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
@@ -443,8 +443,8 @@ static const ber_sequence_t PairwiseTag_sequence[] = {
 
 static int
 dissect_acp133_PairwiseTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PairwiseTag_sequence, hf_index, ett_acp133_PairwiseTag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PairwiseTag_sequence, hf_index, ett_acp133_PairwiseTag);
 
   return offset;
 }
@@ -466,7 +466,7 @@ static int dissect_ukm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t UKMEntry_sequence[] = {
+static const ber_old_sequence_t UKMEntry_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tag },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ukm },
   { 0, 0, 0, NULL }
@@ -474,8 +474,8 @@ static const ber_sequence_t UKMEntry_sequence[] = {
 
 static int
 dissect_acp133_UKMEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UKMEntry_sequence, hf_index, ett_acp133_UKMEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UKMEntry_sequence, hf_index, ett_acp133_UKMEntry);
 
   return offset;
 }
@@ -484,14 +484,14 @@ static int dissect_ukm_entries_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_UKMEntry_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_UKMEntry_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ukm_entries_item },
 };
 
 static int
 dissect_acp133_SEQUENCE_OF_UKMEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_UKMEntry_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_UKMEntry);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_UKMEntry_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_UKMEntry);
 
   return offset;
 }
@@ -514,7 +514,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t MonthlyUKMs_sequence[] = {
+static const ber_old_sequence_t MonthlyUKMs_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ukm_entries },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -523,8 +523,8 @@ static const ber_sequence_t MonthlyUKMs_sequence[] = {
 
 static int
 dissect_acp133_MonthlyUKMs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MonthlyUKMs_sequence, hf_index, ett_acp133_MonthlyUKMs);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MonthlyUKMs_sequence, hf_index, ett_acp133_MonthlyUKMs);
 
   return offset;
 }
@@ -550,14 +550,14 @@ static int dissect_sHD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t Remarks_sequence_of[1] = {
+static const ber_old_sequence_t Remarks_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_Remarks_item },
 };
 
 static int
 dissect_acp133_Remarks(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Remarks_sequence_of, hf_index, ett_acp133_Remarks);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Remarks_sequence_of, hf_index, ett_acp133_Remarks);
 
   return offset;
 }
@@ -601,7 +601,7 @@ static int dissect_originator_requested_alternate_recipient_removed(proto_tree *
 }
 
 
-static const ber_sequence_t RIParameters_set[] = {
+static const ber_old_sequence_t RIParameters_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_rI },
   { BER_CLASS_CON, 1, 0, dissect_rIType },
   { BER_CLASS_CON, 2, 0, dissect_minimize },
@@ -612,8 +612,8 @@ static const ber_sequence_t RIParameters_set[] = {
 
 static int
 dissect_acp133_RIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RIParameters_set, hf_index, ett_acp133_RIParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RIParameters_set, hf_index, ett_acp133_RIParameters);
 
   return offset;
 }
@@ -637,14 +637,14 @@ static int dissect_removed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_insteadOf_item },
 };
 
 static int
 dissect_acp133_SEQUENCE_OF_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_GeneralNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_GeneralNames);
 
   return offset;
 }
@@ -663,7 +663,7 @@ static const value_string acp133_MLReceiptPolicy_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MLReceiptPolicy_choice[] = {
+static const ber_old_choice_t MLReceiptPolicy_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_none },
   {   1, BER_CLASS_CON, 1, 0, dissect_insteadOf },
   {   2, BER_CLASS_CON, 2, 0, dissect_inAdditionTo },
@@ -672,9 +672,9 @@ static const ber_choice_t MLReceiptPolicy_choice[] = {
 
 static int
 dissect_acp133_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MLReceiptPolicy_choice, hf_index, ett_acp133_MLReceiptPolicy,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MLReceiptPolicy_choice, hf_index, ett_acp133_MLReceiptPolicy,
+                                     NULL);
 
   return offset;
 }
@@ -700,7 +700,7 @@ static const value_string acp133_DLSubmitPermission_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DLSubmitPermission_choice[] = {
+static const ber_old_choice_t DLSubmitPermission_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_individual },
   {   1, BER_CLASS_CON, 1, 0, dissect_member_of_dl },
   {   2, BER_CLASS_CON, 2, 0, dissect_pattern_match },
@@ -710,9 +710,9 @@ static const ber_choice_t DLSubmitPermission_choice[] = {
 
 static int
 dissect_acp133_DLSubmitPermission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DLSubmitPermission_choice, hf_index, ett_acp133_DLSubmitPermission,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DLSubmitPermission_choice, hf_index, ett_acp133_DLSubmitPermission,
+                                     NULL);
 
   return offset;
 }
@@ -928,7 +928,7 @@ static const value_string acp133_T_requested_delivery_method_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_requested_delivery_method_choice[] = {
+static const ber_old_choice_t T_requested_delivery_method_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_unchanged },
   {   1, BER_CLASS_CON, 1, 0, dissect_removed },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_replaced },
@@ -937,9 +937,9 @@ static const ber_choice_t T_requested_delivery_method_choice[] = {
 
 static int
 dissect_acp133_T_requested_delivery_method(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_requested_delivery_method_choice, hf_index, ett_acp133_T_requested_delivery_method,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_requested_delivery_method_choice, hf_index, ett_acp133_T_requested_delivery_method,
+                                     NULL);
 
   return offset;
 }
@@ -948,7 +948,7 @@ static int dissect_requested_delivery_method(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AlgorithmInformation_sequence[] = {
+static const ber_old_sequence_t AlgorithmInformation_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_algorithm_identifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_originator_certificate_selector },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_recipient_certificate_selector },
@@ -957,8 +957,8 @@ static const ber_sequence_t AlgorithmInformation_sequence[] = {
 
 static int
 dissect_acp133_AlgorithmInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlgorithmInformation_sequence, hf_index, ett_acp133_AlgorithmInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlgorithmInformation_sequence, hf_index, ett_acp133_AlgorithmInformation);
 
   return offset;
 }
@@ -970,14 +970,14 @@ static int dissect_token_signature_algorithm_preference_item(proto_tree *tree _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AlgorithmInformation_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AlgorithmInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_token_encryption_algorithm_preference_item },
 };
 
 static int
 dissect_acp133_SEQUENCE_OF_AlgorithmInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AlgorithmInformation_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_AlgorithmInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AlgorithmInformation_sequence_of, hf_index, ett_acp133_SEQUENCE_OF_AlgorithmInformation);
 
   return offset;
 }
@@ -989,7 +989,7 @@ static int dissect_token_signature_algorithm_preference(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t DLPolicy_set[] = {
+static const ber_old_sequence_t DLPolicy_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_report_propagation },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_report_from_dl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_originating_MTA_report },
@@ -1010,8 +1010,8 @@ static const ber_sequence_t DLPolicy_set[] = {
 
 static int
 dissect_acp133_DLPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DLPolicy_set, hf_index, ett_acp133_DLPolicy);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DLPolicy_set, hf_index, ett_acp133_DLPolicy);
 
   return offset;
 }
@@ -1031,14 +1031,14 @@ static int dissect_description(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SET_OF_ExtendedContentType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ExtendedContentType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_content_types_item },
 };
 
 static int
 dissect_acp133_SET_OF_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ExtendedContentType_set_of, hf_index, ett_acp133_SET_OF_ExtendedContentType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ExtendedContentType_set_of, hf_index, ett_acp133_SET_OF_ExtendedContentType);
 
   return offset;
 }
@@ -1047,7 +1047,7 @@ static int dissect_content_types(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Capability_set[] = {
+static const ber_old_sequence_t Capability_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_content_types },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_maximum_content_length },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_encoded_information_types_constraints },
@@ -1057,8 +1057,8 @@ static const ber_sequence_t Capability_set[] = {
 
 static int
 dissect_acp133_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Capability_set, hf_index, ett_acp133_Capability);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Capability_set, hf_index, ett_acp133_Capability);
 
   return offset;
 }
@@ -1067,14 +1067,14 @@ static int dissect_capabilities_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_Capability_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Capability_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_capabilities_item },
 };
 
 static int
 dissect_acp133_SET_OF_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Capability_set_of, hf_index, ett_acp133_SET_OF_Capability);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Capability_set_of, hf_index, ett_acp133_SET_OF_Capability);
 
   return offset;
 }
@@ -1083,7 +1083,7 @@ static int dissect_capabilities(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AddressCapabilities_sequence[] = {
+static const ber_old_sequence_t AddressCapabilities_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_description },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_address },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_capabilities },
@@ -1092,8 +1092,8 @@ static const ber_sequence_t AddressCapabilities_sequence[] = {
 
 static int
 dissect_acp133_AddressCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddressCapabilities_sequence, hf_index, ett_acp133_AddressCapabilities);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddressCapabilities_sequence, hf_index, ett_acp133_AddressCapabilities);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 6e7fa0dbaf..31598500c3 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -413,7 +413,7 @@ static const value_string acse_T_encoding_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_encoding_choice[] = {
+static const ber_old_choice_t T_encoding_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@@ -422,9 +422,9 @@ static const ber_choice_t T_encoding_choice[] = {
 
 static int
 dissect_acse_T_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_encoding_choice, hf_index, ett_acse_T_encoding,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_encoding_choice, hf_index, ett_acse_T_encoding,
+                                     NULL);
 
   return offset;
 }
@@ -433,7 +433,7 @@ static int dissect_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t EXTERNALt_sequence[] = {
+static const ber_old_sequence_t EXTERNALt_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
@@ -457,7 +457,7 @@ dissect_acse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 	offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
 	offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len1, &ind_field);
    }
-   offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+   offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt);
 
 
@@ -564,7 +564,7 @@ const value_string acse_AP_title_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AP_title_choice[] = {
+static const ber_old_choice_t AP_title_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
@@ -575,9 +575,9 @@ static const ber_choice_t AP_title_choice[] = {
 
 int
 dissect_acse_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AP_title_choice, hf_index, ett_acse_AP_title,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AP_title_choice, hf_index, ett_acse_AP_title,
+                                     NULL);
 
   return offset;
 }
@@ -654,7 +654,7 @@ const value_string acse_ASO_qualifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ASO_qualifier_choice[] = {
+static const ber_old_choice_t ASO_qualifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form2 },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
@@ -668,9 +668,9 @@ static const ber_choice_t ASO_qualifier_choice[] = {
 
 int
 dissect_acse_ASO_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier,
+                                     NULL);
 
   return offset;
 }
@@ -815,7 +815,7 @@ static int dissect_other_mechanism_value(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Authentication_value_other_sequence[] = {
+static const ber_old_sequence_t Authentication_value_other_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_name },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_value },
   { 0, 0, 0, NULL }
@@ -823,8 +823,8 @@ static const ber_sequence_t Authentication_value_other_sequence[] = {
 
 static int
 dissect_acse_Authentication_value_other(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Authentication_value_other_sequence, hf_index, ett_acse_Authentication_value_other);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Authentication_value_other_sequence, hf_index, ett_acse_Authentication_value_other);
 
   return offset;
 }
@@ -841,7 +841,7 @@ static const value_string acse_Authentication_value_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Authentication_value_choice[] = {
+static const ber_old_choice_t Authentication_value_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_charstring_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bitstring_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_external_impl },
@@ -851,9 +851,9 @@ static const ber_choice_t Authentication_value_choice[] = {
 
 static int
 dissect_acse_Authentication_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Authentication_value_choice, hf_index, ett_acse_Authentication_value,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Authentication_value_choice, hf_index, ett_acse_Authentication_value,
+                                     NULL);
 
   return offset;
 }
@@ -865,14 +865,14 @@ static int dissect_responding_authentication_value(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ASO_context_name_list_sequence_of[1] = {
+static const ber_old_sequence_t ASO_context_name_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ASO_context_name_list_item },
 };
 
 static int
 dissect_acse_ASO_context_name_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list);
 
   return offset;
 }
@@ -944,14 +944,14 @@ static int dissect_transfer_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes_item },
 };
 
 static int
 dissect_acse_SEQUENCE_OF_TransferSyntaxName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName);
 
   return offset;
 }
@@ -960,7 +960,7 @@ static int dissect_transfer_syntaxes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Context_list_item_sequence[] = {
+static const ber_old_sequence_t Context_list_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pci },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes },
@@ -969,8 +969,8 @@ static const ber_sequence_t Context_list_item_sequence[] = {
 
 static int
 dissect_acse_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Context_list_item_sequence, hf_index, ett_acse_Context_list_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Context_list_item_sequence, hf_index, ett_acse_Context_list_item);
 
   return offset;
 }
@@ -979,14 +979,14 @@ static int dissect_Context_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Context_list_sequence_of[1] = {
+static const ber_old_sequence_t Context_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item },
 };
 
 static int
 dissect_acse_Context_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Context_list_sequence_of, hf_index, ett_acse_Context_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Context_list_sequence_of, hf_index, ett_acse_Context_list);
 
   return offset;
 }
@@ -995,7 +995,7 @@ static int dissect_context_list(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t Default_Context_List_item_sequence[] = {
+static const ber_old_sequence_t Default_Context_List_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abstract_syntax_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
   { 0, 0, 0, NULL }
@@ -1003,8 +1003,8 @@ static const ber_sequence_t Default_Context_List_item_sequence[] = {
 
 static int
 dissect_acse_Default_Context_List_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Default_Context_List_item_sequence, hf_index, ett_acse_Default_Context_List_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Default_Context_List_item_sequence, hf_index, ett_acse_Default_Context_List_item);
 
   return offset;
 }
@@ -1013,14 +1013,14 @@ static int dissect_Default_Context_List_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Default_Context_List_sequence_of[1] = {
+static const ber_old_sequence_t Default_Context_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Default_Context_List_item },
 };
 
 static int
 dissect_acse_Default_Context_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List);
 
   return offset;
 }
@@ -1035,7 +1035,7 @@ static const value_string acse_Syntactic_context_list_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Syntactic_context_list_choice[] = {
+static const ber_old_choice_t Syntactic_context_list_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_context_list },
   {   1, BER_CLASS_CON, 1, 0, dissect_default_contact_list },
   { 0, 0, 0, 0, NULL }
@@ -1043,9 +1043,9 @@ static const ber_choice_t Syntactic_context_list_choice[] = {
 
 static int
 dissect_acse_Syntactic_context_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list,
+                                     NULL);
 
   return offset;
 }
@@ -1070,7 +1070,7 @@ static int dissect_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ASOI_tag_item_sequence[] = {
+static const ber_old_sequence_t ASOI_tag_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_qualifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_identifier },
   { 0, 0, 0, NULL }
@@ -1078,8 +1078,8 @@ static const ber_sequence_t ASOI_tag_item_sequence[] = {
 
 static int
 dissect_acse_ASOI_tag_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ASOI_tag_item_sequence, hf_index, ett_acse_ASOI_tag_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ASOI_tag_item_sequence, hf_index, ett_acse_ASOI_tag_item);
 
   return offset;
 }
@@ -1088,14 +1088,14 @@ static int dissect_ASOI_tag_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t ASOI_tag_sequence_of[1] = {
+static const ber_old_sequence_t ASOI_tag_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ASOI_tag_item },
 };
 
 static int
 dissect_acse_ASOI_tag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag);
 
   return offset;
 }
@@ -1107,14 +1107,14 @@ static int dissect_calling_asoi_tag_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Association_data_sequence_of[1] = {
+static const ber_old_sequence_t Association_data_sequence_of[1] = {
   { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_Association_data_item },
 };
 
 static int
 dissect_acse_Association_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Association_data_sequence_of, hf_index, ett_acse_Association_data);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Association_data_sequence_of, hf_index, ett_acse_Association_data);
 
   return offset;
 }
@@ -1135,7 +1135,7 @@ static int dissect_aBRT_user_information_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AARQ_apdu_sequence[] = {
+static const ber_old_sequence_t AARQ_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aARQ_protocol_version_impl },
   { BER_CLASS_CON, 1, 0, dissect_aARQ_aSO_context_name },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_called_AP_title },
@@ -1160,8 +1160,8 @@ static const ber_sequence_t AARQ_apdu_sequence[] = {
 
 static int
 dissect_acse_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AARQ_apdu_sequence, hf_index, ett_acse_AARQ_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AARQ_apdu_sequence, hf_index, ett_acse_AARQ_apdu);
 
   return offset;
 }
@@ -1282,7 +1282,7 @@ static const value_string acse_Associate_source_diagnostic_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Associate_source_diagnostic_choice[] = {
+static const ber_old_choice_t Associate_source_diagnostic_choice[] = {
   {   1, BER_CLASS_CON, 1, 0, dissect_acse_service_user },
   {   2, BER_CLASS_CON, 2, 0, dissect_acse_service_provider },
   { 0, 0, 0, 0, NULL }
@@ -1290,9 +1290,9 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = {
 
 static int
 dissect_acse_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic,
+                                     NULL);
 
   return offset;
 }
@@ -1354,7 +1354,7 @@ static int dissect_provider_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t P_context_result_list_item_sequence[] = {
+static const ber_old_sequence_t P_context_result_list_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pcontext_result_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concrete_syntax_name_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_provider_reason_impl },
@@ -1363,8 +1363,8 @@ static const ber_sequence_t P_context_result_list_item_sequence[] = {
 
 static int
 dissect_acse_P_context_result_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   P_context_result_list_item_sequence, hf_index, ett_acse_P_context_result_list_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       P_context_result_list_item_sequence, hf_index, ett_acse_P_context_result_list_item);
 
   return offset;
 }
@@ -1373,14 +1373,14 @@ static int dissect_P_context_result_list_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t P_context_result_list_sequence_of[1] = {
+static const ber_old_sequence_t P_context_result_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_P_context_result_list_item },
 };
 
 static int
 dissect_acse_P_context_result_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list);
 
   return offset;
 }
@@ -1389,7 +1389,7 @@ static int dissect_p_context_result_list_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AARE_apdu_sequence[] = {
+static const ber_old_sequence_t AARE_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aARE_protocol_version_impl },
   { BER_CLASS_CON, 1, 0, dissect_aARE_aSO_context_name },
   { BER_CLASS_CON, 2, 0, dissect_aARE_result },
@@ -1412,8 +1412,8 @@ static const ber_sequence_t AARE_apdu_sequence[] = {
 
 static int
 dissect_acse_AARE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AARE_apdu_sequence, hf_index, ett_acse_AARE_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AARE_apdu_sequence, hf_index, ett_acse_AARE_apdu);
 
   return offset;
 }
@@ -1452,7 +1452,7 @@ static int dissect_rLRQ_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RLRQ_apdu_sequence[] = {
+static const ber_old_sequence_t RLRQ_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rLRQ_reason_impl },
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
   { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
@@ -1462,8 +1462,8 @@ static const ber_sequence_t RLRQ_apdu_sequence[] = {
 
 static int
 dissect_acse_RLRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RLRQ_apdu_sequence, hf_index, ett_acse_RLRQ_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RLRQ_apdu_sequence, hf_index, ett_acse_RLRQ_apdu);
 
   return offset;
 }
@@ -1502,7 +1502,7 @@ static int dissect_rLRE_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RLRE_apdu_sequence[] = {
+static const ber_old_sequence_t RLRE_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rLRE_reason_impl },
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
   { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
@@ -1512,8 +1512,8 @@ static const ber_sequence_t RLRE_apdu_sequence[] = {
 
 static int
 dissect_acse_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RLRE_apdu_sequence, hf_index, ett_acse_RLRE_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RLRE_apdu_sequence, hf_index, ett_acse_RLRE_apdu);
 
   return offset;
 }
@@ -1564,7 +1564,7 @@ static int dissect_abort_diagnostic_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ABRT_apdu_sequence[] = {
+static const ber_old_sequence_t ABRT_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abort_source_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abort_diagnostic_impl },
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
@@ -1575,8 +1575,8 @@ static const ber_sequence_t ABRT_apdu_sequence[] = {
 
 static int
 dissect_acse_ABRT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ABRT_apdu_sequence, hf_index, ett_acse_ABRT_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ABRT_apdu_sequence, hf_index, ett_acse_ABRT_apdu);
 
   return offset;
 }
@@ -1635,7 +1635,7 @@ static const value_string acse_T_presentation_data_values_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_presentation_data_values_choice[] = {
+static const ber_old_choice_t T_presentation_data_values_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_simple_ASN1_type },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@@ -1644,9 +1644,9 @@ static const ber_choice_t T_presentation_data_values_choice[] = {
 
 static int
 dissect_acse_T_presentation_data_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values,
+                                     NULL);
 
   return offset;
 }
@@ -1655,7 +1655,7 @@ static int dissect_presentation_data_values(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PDV_list_sequence[] = {
+static const ber_old_sequence_t PDV_list_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_presentation_data_values },
@@ -1664,8 +1664,8 @@ static const ber_sequence_t PDV_list_sequence[] = {
 
 static int
 dissect_acse_PDV_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDV_list_sequence, hf_index, ett_acse_PDV_list);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDV_list_sequence, hf_index, ett_acse_PDV_list);
 
   return offset;
 }
@@ -1681,7 +1681,7 @@ static const value_string acse_User_Data_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t User_Data_choice[] = {
+static const ber_old_choice_t User_Data_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_user_information },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_simply_encoded_data },
   {   2, BER_CLASS_CON, 0, 0, dissect_fully_encoded_data },
@@ -1690,9 +1690,9 @@ static const ber_choice_t User_Data_choice[] = {
 
 static int
 dissect_acse_User_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 User_Data_choice, hf_index, ett_acse_User_Data,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     User_Data_choice, hf_index, ett_acse_User_Data,
+                                     NULL);
 
   return offset;
 }
@@ -1701,7 +1701,7 @@ static int dissect_a_user_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t A_DT_apdu_sequence[] = {
+static const ber_old_sequence_t A_DT_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
   { BER_CLASS_CON, 30, BER_FLAGS_NOTCHKTAG, dissect_a_user_data },
@@ -1710,8 +1710,8 @@ static const ber_sequence_t A_DT_apdu_sequence[] = {
 
 static int
 dissect_acse_A_DT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   A_DT_apdu_sequence, hf_index, ett_acse_A_DT_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       A_DT_apdu_sequence, hf_index, ett_acse_A_DT_apdu);
 
   return offset;
 }
@@ -1736,7 +1736,7 @@ static int dissect_aCRQ_aSO_context_name_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ACRQ_apdu_sequence[] = {
+static const ber_old_sequence_t ACRQ_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aCRQ_aSO_context_name_impl },
@@ -1748,8 +1748,8 @@ static const ber_sequence_t ACRQ_apdu_sequence[] = {
 
 static int
 dissect_acse_ACRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ACRQ_apdu_sequence, hf_index, ett_acse_ACRQ_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ACRQ_apdu_sequence, hf_index, ett_acse_ACRQ_apdu);
 
   return offset;
 }
@@ -1774,7 +1774,7 @@ static int dissect_aSO_context_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ACRP_apdu_sequence[] = {
+static const ber_old_sequence_t ACRP_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_impl },
@@ -1785,8 +1785,8 @@ static const ber_sequence_t ACRP_apdu_sequence[] = {
 
 static int
 dissect_acse_ACRP_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ACRP_apdu_sequence, hf_index, ett_acse_ACRP_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ACRP_apdu_sequence, hf_index, ett_acse_ACRP_apdu);
 
   return offset;
 }
@@ -1810,7 +1810,7 @@ static const value_string acse_ACSE_apdu_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ACSE_apdu_choice[] = {
+static const ber_old_choice_t ACSE_apdu_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_IMPLTAG, dissect_aarq_impl },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_aare_impl },
   {   2, BER_CLASS_APP, 2, BER_FLAGS_IMPLTAG, dissect_rlrq_impl },
@@ -1830,9 +1830,9 @@ static const ber_choice_t ACSE_apdu_choice[] = {
 
 static int
 dissect_acse_ACSE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu,
+                                     NULL);
 
   return offset;
 }
@@ -1877,7 +1877,7 @@ static const value_string acse_AE_title_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AE_title_choice[] = {
+static const ber_old_choice_t AE_title_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 },
   { 0, 0, 0, 0, NULL }
@@ -1885,9 +1885,9 @@ static const ber_choice_t AE_title_choice[] = {
 
 static int
 dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AE_title_choice, hf_index, ett_acse_AE_title,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AE_title_choice, hf_index, ett_acse_AE_title,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index fd2ffead5e..02ec09250f 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -4318,7 +4318,7 @@ static const value_string ansi_map_OperationCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OperationCode_choice[] = {
+static const ber_old_choice_t OperationCode_choice[] = {
   {  16, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_national_impl },
   {  17, BER_CLASS_PRI, 17, BER_FLAGS_IMPLTAG, dissect_private_impl },
   { 0, 0, 0, 0, NULL }
@@ -4326,9 +4326,9 @@ static const ber_choice_t OperationCode_choice[] = {
 
 static int
 dissect_ansi_map_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OperationCode_choice, hf_index, ett_ansi_map_OperationCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OperationCode_choice, hf_index, ett_ansi_map_OperationCode,
+                                     NULL);
 
   return offset;
 }
@@ -4368,7 +4368,7 @@ static int dissect_invokeParameters_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t InvokePDU_sequence[] = {
+static const ber_old_sequence_t InvokePDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentIDs_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_operationCode },
   { BER_CLASS_PRI, 18, BER_FLAGS_IMPLTAG, dissect_invokeParameters_impl },
@@ -4377,8 +4377,8 @@ static const ber_sequence_t InvokePDU_sequence[] = {
 
 static int
 dissect_ansi_map_InvokePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InvokePDU_sequence, hf_index, ett_ansi_map_InvokePDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InvokePDU_sequence, hf_index, ett_ansi_map_InvokePDU);
 
   return offset;
 }
@@ -4465,7 +4465,7 @@ static int dissect_returnResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ReturnResultPDU_sequence[] = {
+static const ber_old_sequence_t ReturnResultPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_PRI, 18, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
   { 0, 0, 0, NULL }
@@ -4473,8 +4473,8 @@ static const ber_sequence_t ReturnResultPDU_sequence[] = {
 
 static int
 dissect_ansi_map_ReturnResultPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResultPDU_sequence, hf_index, ett_ansi_map_ReturnResultPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResultPDU_sequence, hf_index, ett_ansi_map_ReturnResultPDU);
 
   return offset;
 }
@@ -4505,7 +4505,7 @@ static const value_string ansi_map_ErrorCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ErrorCode_choice[] = {
+static const ber_old_choice_t ErrorCode_choice[] = {
   {  19, BER_CLASS_PRI, 19, BER_FLAGS_IMPLTAG, dissect_nationaler_impl },
   {  20, BER_CLASS_PRI, 20, BER_FLAGS_IMPLTAG, dissect_privateer_impl },
   { 0, 0, 0, 0, NULL }
@@ -4513,9 +4513,9 @@ static const ber_choice_t ErrorCode_choice[] = {
 
 static int
 dissect_ansi_map_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ErrorCode_choice, hf_index, ett_ansi_map_ErrorCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ErrorCode_choice, hf_index, ett_ansi_map_ErrorCode,
+                                     NULL);
 
   return offset;
 }
@@ -4541,7 +4541,7 @@ static int dissect_parameterrj(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ReturnErrorPDU_sequence[] = {
+static const ber_old_sequence_t ReturnErrorPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_parameterre },
@@ -4550,8 +4550,8 @@ static const ber_sequence_t ReturnErrorPDU_sequence[] = {
 
 static int
 dissect_ansi_map_ReturnErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnErrorPDU_sequence, hf_index, ett_ansi_map_ReturnErrorPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnErrorPDU_sequence, hf_index, ett_ansi_map_ReturnErrorPDU);
 
   return offset;
 }
@@ -4580,7 +4580,7 @@ static int dissect_rejectProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RejectPDU_sequence[] = {
+static const ber_old_sequence_t RejectPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_PRI, 21, BER_FLAGS_IMPLTAG, dissect_rejectProblem_impl },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_parameterrj },
@@ -4589,8 +4589,8 @@ static const ber_sequence_t RejectPDU_sequence[] = {
 
 static int
 dissect_ansi_map_RejectPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RejectPDU_sequence, hf_index, ett_ansi_map_RejectPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RejectPDU_sequence, hf_index, ett_ansi_map_RejectPDU);
 
   return offset;
 }
@@ -4609,7 +4609,7 @@ static const value_string ansi_map_ComponentPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ComponentPDU_choice[] = {
+static const ber_old_choice_t ComponentPDU_choice[] = {
   {   9, BER_CLASS_PRI, 9, BER_FLAGS_IMPLTAG, dissect_invokeLast_impl },
   {  10, BER_CLASS_PRI, 10, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {  11, BER_CLASS_PRI, 11, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -4621,9 +4621,9 @@ static const ber_choice_t ComponentPDU_choice[] = {
 
 static int
 dissect_ansi_map_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ComponentPDU_choice, hf_index, ett_ansi_map_ComponentPDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ComponentPDU_choice, hf_index, ett_ansi_map_ComponentPDU,
+                                     NULL);
 
   return offset;
 }
@@ -4692,7 +4692,7 @@ static const value_string ansi_map_MSID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MSID_choice[] = {
+static const ber_old_choice_t MSID_choice[] = {
   {   8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { 242, BER_CLASS_CON, 242, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { 0, 0, 0, 0, NULL }
@@ -4700,9 +4700,9 @@ static const ber_choice_t MSID_choice[] = {
 
 static int
 dissect_ansi_map_MSID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MSID_choice, hf_index, ett_ansi_map_MSID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MSID_choice, hf_index, ett_ansi_map_MSID,
+                                     NULL);
 
   return offset;
 }
@@ -5022,7 +5022,7 @@ static int dissect_updateCount_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AuthenticationDirective_set[] = {
+static const ber_old_sequence_t AuthenticationDirective_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 77, BER_FLAGS_IMPLTAG, dissect_authenticationAlgorithmVersion_impl },
@@ -5050,8 +5050,8 @@ static const ber_sequence_t AuthenticationDirective_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationDirective_set, hf_index, ett_ansi_map_AuthenticationDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationDirective_set, hf_index, ett_ansi_map_AuthenticationDirective);
 
   return offset;
 }
@@ -5060,15 +5060,15 @@ static int dissect_authenticationDirective(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AuthenticationDirectiveRes_set[] = {
+static const ber_old_sequence_t AuthenticationDirectiveRes_set[] = {
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_AuthenticationDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationDirectiveRes_set, hf_index, ett_ansi_map_AuthenticationDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationDirectiveRes_set, hf_index, ett_ansi_map_AuthenticationDirectiveRes);
 
   return offset;
 }
@@ -5098,7 +5098,7 @@ static int dissect_interMSCCircuitID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AuthenticationDirectiveForward_set[] = {
+static const ber_old_sequence_t AuthenticationDirectiveForward_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationResponseUniqueChallenge_impl },
@@ -5109,8 +5109,8 @@ static const ber_sequence_t AuthenticationDirectiveForward_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationDirectiveForward(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationDirectiveForward_set, hf_index, ett_ansi_map_AuthenticationDirectiveForward);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationDirectiveForward_set, hf_index, ett_ansi_map_AuthenticationDirectiveForward);
 
   return offset;
 }
@@ -5145,7 +5145,7 @@ static int dissect_uniqueChallengeReport_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AuthenticationDirectiveForwardRes_set[] = {
+static const ber_old_sequence_t AuthenticationDirectiveForwardRes_set[] = {
   { BER_CLASS_CON, 138, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_countUpdateReport_impl },
   { BER_CLASS_CON, 124, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uniqueChallengeReport_impl },
   { 0, 0, 0, NULL }
@@ -5153,8 +5153,8 @@ static const ber_sequence_t AuthenticationDirectiveForwardRes_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationDirectiveForwardRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationDirectiveForwardRes_set, hf_index, ett_ansi_map_AuthenticationDirectiveForwardRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationDirectiveForwardRes_set, hf_index, ett_ansi_map_AuthenticationDirectiveForwardRes);
 
   return offset;
 }
@@ -5298,7 +5298,7 @@ static int dissect_terminalType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AuthenticationFailureReport_set[] = {
+static const ber_old_sequence_t AuthenticationFailureReport_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 44, BER_FLAGS_IMPLTAG, dissect_reportType_impl },
@@ -5315,8 +5315,8 @@ static const ber_sequence_t AuthenticationFailureReport_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationFailureReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationFailureReport_set, hf_index, ett_ansi_map_AuthenticationFailureReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationFailureReport_set, hf_index, ett_ansi_map_AuthenticationFailureReport);
 
   return offset;
 }
@@ -5325,7 +5325,7 @@ static int dissect_authenticationFailureReport(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t AuthenticationFailureReportRes_set[] = {
+static const ber_old_sequence_t AuthenticationFailureReportRes_set[] = {
   { BER_CLASS_CON, 77, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationAlgorithmVersion_impl },
   { BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationResponseUniqueChallenge_impl },
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
@@ -5344,8 +5344,8 @@ static const ber_sequence_t AuthenticationFailureReportRes_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationFailureReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationFailureReportRes_set, hf_index, ett_ansi_map_AuthenticationFailureReportRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationFailureReportRes_set, hf_index, ett_ansi_map_AuthenticationFailureReportRes);
 
   return offset;
 }
@@ -5541,7 +5541,7 @@ static int dissect_transactionCapability_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AuthenticationRequest_set[] = {
+static const ber_old_sequence_t AuthenticationRequest_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -5566,8 +5566,8 @@ static const ber_sequence_t AuthenticationRequest_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationRequest_set, hf_index, ett_ansi_map_AuthenticationRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationRequest_set, hf_index, ett_ansi_map_AuthenticationRequest);
 
   return offset;
 }
@@ -5589,7 +5589,7 @@ static int dissect_analogRedirectInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AnalogRedirectRecord_sequence[] = {
+static const ber_old_sequence_t AnalogRedirectRecord_sequence[] = {
   { BER_CLASS_CON, 224, BER_FLAGS_IMPLTAG, dissect_analogRedirectInfo_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { 0, 0, 0, NULL }
@@ -5597,8 +5597,8 @@ static const ber_sequence_t AnalogRedirectRecord_sequence[] = {
 
 static int
 dissect_ansi_map_AnalogRedirectRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnalogRedirectRecord_sequence, hf_index, ett_ansi_map_AnalogRedirectRecord);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnalogRedirectRecord_sequence, hf_index, ett_ansi_map_AnalogRedirectRecord);
 
   return offset;
 }
@@ -5636,7 +5636,7 @@ static int dissect_cdmaChannelNumber2_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t CDMAChannelNumberList_item_sequence[] = {
+static const ber_old_sequence_t CDMAChannelNumberList_item_sequence[] = {
   { BER_CLASS_CON, 226, BER_FLAGS_IMPLTAG, dissect_cdmaChannelNumber_impl },
   { BER_CLASS_CON, 226, BER_FLAGS_IMPLTAG, dissect_cdmaChannelNumber2_impl },
   { 0, 0, 0, NULL }
@@ -5644,8 +5644,8 @@ static const ber_sequence_t CDMAChannelNumberList_item_sequence[] = {
 
 static int
 dissect_ansi_map_CDMAChannelNumberList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMAChannelNumberList_item_sequence, hf_index, ett_ansi_map_CDMAChannelNumberList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMAChannelNumberList_item_sequence, hf_index, ett_ansi_map_CDMAChannelNumberList_item);
 
   return offset;
 }
@@ -5654,14 +5654,14 @@ static int dissect_CDMAChannelNumberList_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t CDMAChannelNumberList_sequence_of[1] = {
+static const ber_old_sequence_t CDMAChannelNumberList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CDMAChannelNumberList_item },
 };
 
 static int
 dissect_ansi_map_CDMAChannelNumberList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMAChannelNumberList_sequence_of, hf_index, ett_ansi_map_CDMAChannelNumberList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMAChannelNumberList_sequence_of, hf_index, ett_ansi_map_CDMAChannelNumberList);
 
   return offset;
 }
@@ -5670,7 +5670,7 @@ static int dissect_cdmaChannelNumberList_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t CDMARedirectRecord_sequence[] = {
+static const ber_old_sequence_t CDMARedirectRecord_sequence[] = {
   { BER_CLASS_CON, 170, BER_FLAGS_IMPLTAG, dissect_cdmaBandClass_impl },
   { BER_CLASS_CON, 227, BER_FLAGS_IMPLTAG, dissect_cdmaChannelNumberList_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -5680,8 +5680,8 @@ static const ber_sequence_t CDMARedirectRecord_sequence[] = {
 
 static int
 dissect_ansi_map_CDMARedirectRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMARedirectRecord_sequence, hf_index, ett_ansi_map_CDMARedirectRecord);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMARedirectRecord_sequence, hf_index, ett_ansi_map_CDMARedirectRecord);
 
   return offset;
 }
@@ -5742,7 +5742,7 @@ static int dissect_voicePrivacyMask_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AuthenticationRequestRes_set[] = {
+static const ber_old_sequence_t AuthenticationRequestRes_set[] = {
   { BER_CLASS_CON, 225, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_analogRedirectRecord_impl },
   { BER_CLASS_CON, 77, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationAlgorithmVersion_impl },
   { BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationResponseUniqueChallenge_impl },
@@ -5769,8 +5769,8 @@ static const ber_sequence_t AuthenticationRequestRes_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationRequestRes_set, hf_index, ett_ansi_map_AuthenticationRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationRequestRes_set, hf_index, ett_ansi_map_AuthenticationRequestRes);
 
   return offset;
 }
@@ -5866,7 +5866,7 @@ static int dissect_voicePrivacyReport_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AuthenticationStatusReport_set[] = {
+static const ber_old_sequence_t AuthenticationStatusReport_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 49, BER_FLAGS_IMPLTAG, dissect_systemCapabilities_impl },
@@ -5884,8 +5884,8 @@ static const ber_sequence_t AuthenticationStatusReport_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationStatusReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationStatusReport_set, hf_index, ett_ansi_map_AuthenticationStatusReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationStatusReport_set, hf_index, ett_ansi_map_AuthenticationStatusReport);
 
   return offset;
 }
@@ -5894,7 +5894,7 @@ static int dissect_authenticationStatusReport(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AuthenticationStatusReportRes_set[] = {
+static const ber_old_sequence_t AuthenticationStatusReportRes_set[] = {
   { BER_CLASS_CON, 77, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationAlgorithmVersion_impl },
   { BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationResponseUniqueChallenge_impl },
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
@@ -5912,8 +5912,8 @@ static const ber_sequence_t AuthenticationStatusReportRes_set[] = {
 
 static int
 dissect_ansi_map_AuthenticationStatusReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticationStatusReportRes_set, hf_index, ett_ansi_map_AuthenticationStatusReportRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticationStatusReportRes_set, hf_index, ett_ansi_map_AuthenticationStatusReportRes);
 
   return offset;
 }
@@ -5935,7 +5935,7 @@ static int dissect_randomVariableBaseStation_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t BaseStationChallenge_set[] = {
+static const ber_old_sequence_t BaseStationChallenge_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_randomVariableBaseStation_impl },
@@ -5946,8 +5946,8 @@ static const ber_sequence_t BaseStationChallenge_set[] = {
 
 static int
 dissect_ansi_map_BaseStationChallenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BaseStationChallenge_set, hf_index, ett_ansi_map_BaseStationChallenge);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BaseStationChallenge_set, hf_index, ett_ansi_map_BaseStationChallenge);
 
   return offset;
 }
@@ -5969,29 +5969,29 @@ static int dissect_authenticationResponseBaseStation_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t BaseStationChallengeRes_set[] = {
+static const ber_old_sequence_t BaseStationChallengeRes_set[] = {
   { BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_authenticationResponseBaseStation_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_BaseStationChallengeRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BaseStationChallengeRes_set, hf_index, ett_ansi_map_BaseStationChallengeRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BaseStationChallengeRes_set, hf_index, ett_ansi_map_BaseStationChallengeRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t Blocking_set[] = {
+static const ber_old_sequence_t Blocking_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_Blocking(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Blocking_set, hf_index, ett_ansi_map_Blocking);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Blocking_set, hf_index, ett_ansi_map_Blocking);
 
   return offset;
 }
@@ -6000,15 +6000,15 @@ static int dissect_blocking(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t BulkDeregistration_set[] = {
+static const ber_old_sequence_t BulkDeregistration_set[] = {
   { BER_CLASS_CON, 103, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_senderIdentificationNumber_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_BulkDeregistration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BulkDeregistration_set, hf_index, ett_ansi_map_BulkDeregistration);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BulkDeregistration_set, hf_index, ett_ansi_map_BulkDeregistration);
 
   return offset;
 }
@@ -6017,7 +6017,7 @@ static int dissect_bulkDeregistration(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t CountRequest_set[] = {
+static const ber_old_sequence_t CountRequest_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 103, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_senderIdentificationNumber_impl },
@@ -6026,8 +6026,8 @@ static const ber_sequence_t CountRequest_set[] = {
 
 static int
 dissect_ansi_map_CountRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CountRequest_set, hf_index, ett_ansi_map_CountRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CountRequest_set, hf_index, ett_ansi_map_CountRequest);
 
   return offset;
 }
@@ -6036,15 +6036,15 @@ static int dissect_countRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t CountRequestRes_set[] = {
+static const ber_old_sequence_t CountRequestRes_set[] = {
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_CountRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CountRequestRes_set, hf_index, ett_ansi_map_CountRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CountRequestRes_set, hf_index, ett_ansi_map_CountRequestRes);
 
   return offset;
 }
@@ -6232,7 +6232,7 @@ static int dissect_tdmaChannelData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FacilitiesDirective_set[] = {
+static const ber_old_sequence_t FacilitiesDirective_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -6255,8 +6255,8 @@ static const ber_sequence_t FacilitiesDirective_set[] = {
 
 static int
 dissect_ansi_map_FacilitiesDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesDirective_set, hf_index, ett_ansi_map_FacilitiesDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesDirective_set, hf_index, ett_ansi_map_FacilitiesDirective);
 
   return offset;
 }
@@ -6265,7 +6265,7 @@ static int dissect_facilitiesDirective(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FacilitiesDirectiveRes_set[] = {
+static const ber_old_sequence_t FacilitiesDirectiveRes_set[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_confidentialityModes_impl },
   { BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tdmaBurstIndicator_impl },
@@ -6275,8 +6275,8 @@ static const ber_sequence_t FacilitiesDirectiveRes_set[] = {
 
 static int
 dissect_ansi_map_FacilitiesDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesDirectiveRes_set, hf_index, ett_ansi_map_FacilitiesDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesDirectiveRes_set, hf_index, ett_ansi_map_FacilitiesDirectiveRes);
 
   return offset;
 }
@@ -6463,7 +6463,7 @@ static int dissect_cdmaServiceOptionConnectionIdentifier_impl(proto_tree *tree _
 }
 
 
-static const ber_sequence_t CDMAConnectionReferenceInformation_sequence[] = {
+static const ber_old_sequence_t CDMAConnectionReferenceInformation_sequence[] = {
   { BER_CLASS_CON, 208, BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReference_impl },
   { BER_CLASS_CON, 175, BER_FLAGS_IMPLTAG, dissect_cdmaServiceOption_impl },
   { BER_CLASS_CON, 213, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaState_impl },
@@ -6474,8 +6474,8 @@ static const ber_sequence_t CDMAConnectionReferenceInformation_sequence[] = {
 
 static int
 dissect_ansi_map_CDMAConnectionReferenceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMAConnectionReferenceInformation_sequence, hf_index, ett_ansi_map_CDMAConnectionReferenceInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMAConnectionReferenceInformation_sequence, hf_index, ett_ansi_map_CDMAConnectionReferenceInformation);
 
   return offset;
 }
@@ -6487,7 +6487,7 @@ static int dissect_cdmaConnectionReferenceInformation2_impl(proto_tree *tree _U_
 }
 
 
-static const ber_sequence_t CDMAConnectionReferenceList_item_sequence[] = {
+static const ber_old_sequence_t CDMAConnectionReferenceList_item_sequence[] = {
   { BER_CLASS_CON, 211, BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceInformation_impl },
   { BER_CLASS_CON, 211, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceInformation2_impl },
   { 0, 0, 0, NULL }
@@ -6495,8 +6495,8 @@ static const ber_sequence_t CDMAConnectionReferenceList_item_sequence[] = {
 
 static int
 dissect_ansi_map_CDMAConnectionReferenceList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMAConnectionReferenceList_item_sequence, hf_index, ett_ansi_map_CDMAConnectionReferenceList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMAConnectionReferenceList_item_sequence, hf_index, ett_ansi_map_CDMAConnectionReferenceList_item);
 
   return offset;
 }
@@ -6505,14 +6505,14 @@ static int dissect_CDMAConnectionReferenceList_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t CDMAConnectionReferenceList_sequence_of[1] = {
+static const ber_old_sequence_t CDMAConnectionReferenceList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CDMAConnectionReferenceList_item },
 };
 
 static int
 dissect_ansi_map_CDMAConnectionReferenceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMAConnectionReferenceList_sequence_of, hf_index, ett_ansi_map_CDMAConnectionReferenceList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMAConnectionReferenceList_sequence_of, hf_index, ett_ansi_map_CDMAConnectionReferenceList);
 
   return offset;
 }
@@ -6560,14 +6560,14 @@ static int dissect_cdmaServiceConfigurationRecord_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t CDMAServiceOptionList_sequence_of[1] = {
+static const ber_old_sequence_t CDMAServiceOptionList_sequence_of[1] = {
   { BER_CLASS_CON, 175, BER_FLAGS_IMPLTAG, dissect_CDMAServiceOptionList_item_impl },
 };
 
 static int
 dissect_ansi_map_CDMAServiceOptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMAServiceOptionList_sequence_of, hf_index, ett_ansi_map_CDMAServiceOptionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMAServiceOptionList_sequence_of, hf_index, ett_ansi_map_CDMAServiceOptionList);
 
   return offset;
 }
@@ -6649,7 +6649,7 @@ static int dissect_cdmaTargetOneWayDelay_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t CDMATargetMAHOInformation_sequence[] = {
+static const ber_old_sequence_t CDMATargetMAHOInformation_sequence[] = {
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { BER_CLASS_CON, 65, BER_FLAGS_IMPLTAG, dissect_cdmaPilotStrength_impl },
   { BER_CLASS_CON, 61, BER_FLAGS_IMPLTAG, dissect_cdmaTargetOneWayDelay_impl },
@@ -6658,8 +6658,8 @@ static const ber_sequence_t CDMATargetMAHOInformation_sequence[] = {
 
 static int
 dissect_ansi_map_CDMATargetMAHOInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMATargetMAHOInformation_sequence, hf_index, ett_ansi_map_CDMATargetMAHOInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMATargetMAHOInformation_sequence, hf_index, ett_ansi_map_CDMATargetMAHOInformation);
 
   return offset;
 }
@@ -6668,14 +6668,14 @@ static int dissect_CDMATargetMAHOList_item_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t CDMATargetMAHOList_sequence_of[1] = {
+static const ber_old_sequence_t CDMATargetMAHOList_sequence_of[1] = {
   { BER_CLASS_CON, 135, BER_FLAGS_IMPLTAG, dissect_CDMATargetMAHOList_item_impl },
 };
 
 static int
 dissect_ansi_map_CDMATargetMAHOList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMATargetMAHOList_sequence_of, hf_index, ett_ansi_map_CDMATargetMAHOList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMATargetMAHOList_sequence_of, hf_index, ett_ansi_map_CDMATargetMAHOList);
 
   return offset;
 }
@@ -6697,7 +6697,7 @@ static int dissect_cdmaSignalQuality_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t CDMATargetMeasurementInformation_sequence[] = {
+static const ber_old_sequence_t CDMATargetMeasurementInformation_sequence[] = {
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { BER_CLASS_CON, 64, BER_FLAGS_IMPLTAG, dissect_cdmaSignalQuality_impl },
   { BER_CLASS_CON, 61, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaTargetOneWayDelay_impl },
@@ -6706,8 +6706,8 @@ static const ber_sequence_t CDMATargetMeasurementInformation_sequence[] = {
 
 static int
 dissect_ansi_map_CDMATargetMeasurementInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMATargetMeasurementInformation_sequence, hf_index, ett_ansi_map_CDMATargetMeasurementInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMATargetMeasurementInformation_sequence, hf_index, ett_ansi_map_CDMATargetMeasurementInformation);
 
   return offset;
 }
@@ -6716,14 +6716,14 @@ static int dissect_CDMATargetMeasurementList_item_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t CDMATargetMeasurementList_sequence_of[1] = {
+static const ber_old_sequence_t CDMATargetMeasurementList_sequence_of[1] = {
   { BER_CLASS_CON, 133, BER_FLAGS_IMPLTAG, dissect_CDMATargetMeasurementList_item_impl },
 };
 
 static int
 dissect_ansi_map_CDMATargetMeasurementList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMATargetMeasurementList_sequence_of, hf_index, ett_ansi_map_CDMATargetMeasurementList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMATargetMeasurementList_sequence_of, hf_index, ett_ansi_map_CDMATargetMeasurementList);
 
   return offset;
 }
@@ -6941,7 +6941,7 @@ static int dissect_userZoneData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t FacilitiesDirective2_set[] = {
+static const ber_old_sequence_t FacilitiesDirective2_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
@@ -6998,8 +6998,8 @@ static const ber_sequence_t FacilitiesDirective2_set[] = {
 
 static int
 dissect_ansi_map_FacilitiesDirective2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesDirective2_set, hf_index, ett_ansi_map_FacilitiesDirective2);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesDirective2_set, hf_index, ett_ansi_map_FacilitiesDirective2);
 
   return offset;
 }
@@ -7086,7 +7086,7 @@ static int dissect_cdmaPowerCombinedIndicator_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t CDMACodeChannelInformation_sequence[] = {
+static const ber_old_sequence_t CDMACodeChannelInformation_sequence[] = {
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { BER_CLASS_CON, 68, BER_FLAGS_IMPLTAG, dissect_cdmaCodeChannel_impl },
   { BER_CLASS_CON, 173, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaPilotPN_impl },
@@ -7096,8 +7096,8 @@ static const ber_sequence_t CDMACodeChannelInformation_sequence[] = {
 
 static int
 dissect_ansi_map_CDMACodeChannelInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CDMACodeChannelInformation_sequence, hf_index, ett_ansi_map_CDMACodeChannelInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CDMACodeChannelInformation_sequence, hf_index, ett_ansi_map_CDMACodeChannelInformation);
 
   return offset;
 }
@@ -7106,14 +7106,14 @@ static int dissect_CDMACodeChannelList_item_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t CDMACodeChannelList_sequence_of[1] = {
+static const ber_old_sequence_t CDMACodeChannelList_sequence_of[1] = {
   { BER_CLASS_CON, 131, BER_FLAGS_IMPLTAG, dissect_CDMACodeChannelList_item_impl },
 };
 
 static int
 dissect_ansi_map_CDMACodeChannelList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CDMACodeChannelList_sequence_of, hf_index, ett_ansi_map_CDMACodeChannelList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CDMACodeChannelList_sequence_of, hf_index, ett_ansi_map_CDMACodeChannelList);
 
   return offset;
 }
@@ -7161,7 +7161,7 @@ static int dissect_sOCStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t FacilitiesDirective2Res_set[] = {
+static const ber_old_sequence_t FacilitiesDirective2Res_set[] = {
   { BER_CLASS_CON, 198, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bsmcstatus_impl },
   { BER_CLASS_CON, 357, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdma2000HandoffResponseIOSData_impl },
   { BER_CLASS_CON, 63, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaChannelData_impl },
@@ -7184,8 +7184,8 @@ static const ber_sequence_t FacilitiesDirective2Res_set[] = {
 
 static int
 dissect_ansi_map_FacilitiesDirective2Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesDirective2Res_set, hf_index, ett_ansi_map_FacilitiesDirective2Res);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesDirective2Res_set, hf_index, ett_ansi_map_FacilitiesDirective2Res);
 
   return offset;
 }
@@ -7226,7 +7226,7 @@ static int dissect_releaseReason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t FacilitiesRelease_set[] = {
+static const ber_old_sequence_t FacilitiesRelease_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_releaseReason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
@@ -7236,8 +7236,8 @@ static const ber_sequence_t FacilitiesRelease_set[] = {
 
 static int
 dissect_ansi_map_FacilitiesRelease(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesRelease_set, hf_index, ett_ansi_map_FacilitiesRelease);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesRelease_set, hf_index, ett_ansi_map_FacilitiesRelease);
 
   return offset;
 }
@@ -7246,15 +7246,15 @@ static int dissect_facilitiesRelease(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t FacilitiesReleaseRes_set[] = {
+static const ber_old_sequence_t FacilitiesReleaseRes_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_FacilitiesReleaseRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitiesReleaseRes_set, hf_index, ett_ansi_map_FacilitiesReleaseRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitiesReleaseRes_set, hf_index, ett_ansi_map_FacilitiesReleaseRes);
 
   return offset;
 }
@@ -7409,7 +7409,7 @@ static int dissect_oneTimeFeatureIndicator_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t FeatureRequest_set[] = {
+static const ber_old_sequence_t FeatureRequest_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -7457,8 +7457,8 @@ static const ber_sequence_t FeatureRequest_set[] = {
 
 static int
 dissect_ansi_map_FeatureRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FeatureRequest_set, hf_index, ett_ansi_map_FeatureRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FeatureRequest_set, hf_index, ett_ansi_map_FeatureRequest);
 
   return offset;
 }
@@ -7555,7 +7555,7 @@ static int dissect_announcementCode2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AnnouncementList_sequence[] = {
+static const ber_old_sequence_t AnnouncementList_sequence[] = {
   { BER_CLASS_CON, 76, BER_FLAGS_IMPLTAG, dissect_announcementCode1_impl },
   { BER_CLASS_CON, 76, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementCode2_impl },
   { 0, 0, 0, NULL }
@@ -7563,8 +7563,8 @@ static const ber_sequence_t AnnouncementList_sequence[] = {
 
 static int
 dissect_ansi_map_AnnouncementList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnnouncementList_sequence, hf_index, ett_ansi_map_AnnouncementList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnnouncementList_sequence, hf_index, ett_ansi_map_AnnouncementList);
 
   return offset;
 }
@@ -7884,7 +7884,7 @@ static int dissect_terminationTriggers_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t IntersystemTermination_sequence[] = {
+static const ber_old_sequence_t IntersystemTermination_sequence[] = {
   { BER_CLASS_CON, 87, BER_FLAGS_IMPLTAG, dissect_destinationDigits_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
@@ -7903,8 +7903,8 @@ static const ber_sequence_t IntersystemTermination_sequence[] = {
 
 static int
 dissect_ansi_map_IntersystemTermination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IntersystemTermination_sequence, hf_index, ett_ansi_map_IntersystemTermination);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IntersystemTermination_sequence, hf_index, ett_ansi_map_IntersystemTermination);
 
   return offset;
 }
@@ -7950,7 +7950,7 @@ static int dissect_voiceMailboxNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t LocalTermination_sequence[] = {
+static const ber_old_sequence_t LocalTermination_sequence[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 121, BER_FLAGS_IMPLTAG, dissect_terminationTreatment_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -7970,8 +7970,8 @@ static const ber_sequence_t LocalTermination_sequence[] = {
 
 static int
 dissect_ansi_map_LocalTermination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocalTermination_sequence, hf_index, ett_ansi_map_LocalTermination);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocalTermination_sequence, hf_index, ett_ansi_map_LocalTermination);
 
   return offset;
 }
@@ -7980,7 +7980,7 @@ static int dissect_localTermination_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t PSTNTermination_sequence[] = {
+static const ber_old_sequence_t PSTNTermination_sequence[] = {
   { BER_CLASS_CON, 87, BER_FLAGS_IMPLTAG, dissect_destinationDigits_impl },
   { BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrierDigits_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -7994,8 +7994,8 @@ static const ber_sequence_t PSTNTermination_sequence[] = {
 
 static int
 dissect_ansi_map_PSTNTermination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PSTNTermination_sequence, hf_index, ett_ansi_map_PSTNTermination);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PSTNTermination_sequence, hf_index, ett_ansi_map_PSTNTermination);
 
   return offset;
 }
@@ -8011,7 +8011,7 @@ static const value_string ansi_map_TerminationList_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TerminationList_item_choice[] = {
+static const ber_old_choice_t TerminationList_item_choice[] = {
   {  89, BER_CLASS_CON, 89, BER_FLAGS_IMPLTAG, dissect_intersystemTermination_impl },
   {  91, BER_CLASS_CON, 91, BER_FLAGS_IMPLTAG, dissect_localTermination_impl },
   {  71, BER_CLASS_CON, 71, BER_FLAGS_IMPLTAG, dissect_pstnTermination_impl },
@@ -8020,9 +8020,9 @@ static const ber_choice_t TerminationList_item_choice[] = {
 
 static int
 dissect_ansi_map_TerminationList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TerminationList_item_choice, hf_index, ett_ansi_map_TerminationList_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TerminationList_item_choice, hf_index, ett_ansi_map_TerminationList_item,
+                                     NULL);
 
   return offset;
 }
@@ -8031,14 +8031,14 @@ static int dissect_TerminationList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t TerminationList_set_of[1] = {
+static const ber_old_sequence_t TerminationList_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationList_item },
 };
 
 static int
 dissect_ansi_map_TerminationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 TerminationList_set_of, hf_index, ett_ansi_map_TerminationList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     TerminationList_set_of, hf_index, ett_ansi_map_TerminationList);
 
   return offset;
 }
@@ -8066,7 +8066,7 @@ static const value_string ansi_map_DestinationAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DestinationAddress_choice[] = {
+static const ber_old_choice_t DestinationAddress_choice[] = {
   { 389, BER_CLASS_CON, 389, BER_FLAGS_IMPLTAG, dissect_globalTitle_impl },
   {  32, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_pC_SSN_impl },
   { 0, 0, 0, 0, NULL }
@@ -8074,9 +8074,9 @@ static const ber_choice_t DestinationAddress_choice[] = {
 
 static int
 dissect_ansi_map_DestinationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DestinationAddress_choice, hf_index, ett_ansi_map_DestinationAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DestinationAddress_choice, hf_index, ett_ansi_map_DestinationAddress,
+                                     NULL);
 
   return offset;
 }
@@ -8177,7 +8177,7 @@ static int dissect_detectionPointType(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t WIN_Trigger_sequence[] = {
+static const ber_old_sequence_t WIN_Trigger_sequence[] = {
   { BER_CLASS_CON, 279, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerType_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_detectionPointType },
   { 0, 0, 0, NULL }
@@ -8185,8 +8185,8 @@ static const ber_sequence_t WIN_Trigger_sequence[] = {
 
 static int
 dissect_ansi_map_WIN_Trigger(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   WIN_Trigger_sequence, hf_index, ett_ansi_map_WIN_Trigger);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       WIN_Trigger_sequence, hf_index, ett_ansi_map_WIN_Trigger);
 
   return offset;
 }
@@ -8195,14 +8195,14 @@ static int dissect_WIN_TriggerList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t WIN_TriggerList_set_of[1] = {
+static const ber_old_sequence_t WIN_TriggerList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_WIN_TriggerList_item },
 };
 
 static int
 dissect_ansi_map_WIN_TriggerList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 WIN_TriggerList_set_of, hf_index, ett_ansi_map_WIN_TriggerList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     WIN_TriggerList_set_of, hf_index, ett_ansi_map_WIN_TriggerList);
 
   return offset;
 }
@@ -8211,7 +8211,7 @@ static int dissect_wIN_TriggerList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t TriggerList_set[] = {
+static const ber_old_sequence_t TriggerList_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destinationAddress },
   { BER_CLASS_CON, 283, BER_FLAGS_IMPLTAG, dissect_wIN_TriggerList_impl },
   { 0, 0, 0, NULL }
@@ -8219,8 +8219,8 @@ static const ber_sequence_t TriggerList_set[] = {
 
 static int
 dissect_ansi_map_TriggerList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TriggerList_set, hf_index, ett_ansi_map_TriggerList);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TriggerList_set, hf_index, ett_ansi_map_TriggerList);
 
   return offset;
 }
@@ -8232,7 +8232,7 @@ static int dissect_triggerListOpt_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t TriggerAddressList_item_set[] = {
+static const ber_old_sequence_t TriggerAddressList_item_set[] = {
   { BER_CLASS_CON, 278, BER_FLAGS_IMPLTAG, dissect_triggerList_impl },
   { BER_CLASS_CON, 278, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerListOpt_impl },
   { 0, 0, 0, NULL }
@@ -8240,8 +8240,8 @@ static const ber_sequence_t TriggerAddressList_item_set[] = {
 
 static int
 dissect_ansi_map_TriggerAddressList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TriggerAddressList_item_set, hf_index, ett_ansi_map_TriggerAddressList_item);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TriggerAddressList_item_set, hf_index, ett_ansi_map_TriggerAddressList_item);
 
   return offset;
 }
@@ -8250,14 +8250,14 @@ static int dissect_TriggerAddressList_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t TriggerAddressList_set_of[1] = {
+static const ber_old_sequence_t TriggerAddressList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_TriggerAddressList_item },
 };
 
 static int
 dissect_ansi_map_TriggerAddressList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 TriggerAddressList_set_of, hf_index, ett_ansi_map_TriggerAddressList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     TriggerAddressList_set_of, hf_index, ett_ansi_map_TriggerAddressList);
 
   return offset;
 }
@@ -8266,7 +8266,7 @@ static int dissect_triggerAddressList_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t FeatureRequestRes_set[] = {
+static const ber_old_sequence_t FeatureRequestRes_set[] = {
   { BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_featureResult_impl },
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
@@ -8304,8 +8304,8 @@ static const ber_sequence_t FeatureRequestRes_set[] = {
 
 static int
 dissect_ansi_map_FeatureRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FeatureRequestRes_set, hf_index, ett_ansi_map_FeatureRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FeatureRequestRes_set, hf_index, ett_ansi_map_FeatureRequestRes);
 
   return offset;
 }
@@ -8314,7 +8314,7 @@ static int dissect_featureRequestRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t FlashRequest_set[] = {
+static const ber_old_sequence_t FlashRequest_set[] = {
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
@@ -8325,8 +8325,8 @@ static const ber_sequence_t FlashRequest_set[] = {
 
 static int
 dissect_ansi_map_FlashRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FlashRequest_set, hf_index, ett_ansi_map_FlashRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FlashRequest_set, hf_index, ett_ansi_map_FlashRequest);
 
   return offset;
 }
@@ -8335,7 +8335,7 @@ static int dissect_flashRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t HandoffBack_set[] = {
+static const ber_old_sequence_t HandoffBack_set[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
@@ -8355,8 +8355,8 @@ static const ber_sequence_t HandoffBack_set[] = {
 
 static int
 dissect_ansi_map_HandoffBack(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffBack_set, hf_index, ett_ansi_map_HandoffBack);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffBack_set, hf_index, ett_ansi_map_HandoffBack);
 
   return offset;
 }
@@ -8365,7 +8365,7 @@ static int dissect_handoffBack(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t HandoffBackRes_set[] = {
+static const ber_old_sequence_t HandoffBackRes_set[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_confidentialityModes_impl },
   { BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tdmaBurstIndicator_impl },
@@ -8375,8 +8375,8 @@ static const ber_sequence_t HandoffBackRes_set[] = {
 
 static int
 dissect_ansi_map_HandoffBackRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffBackRes_set, hf_index, ett_ansi_map_HandoffBackRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffBackRes_set, hf_index, ett_ansi_map_HandoffBackRes);
 
   return offset;
 }
@@ -8385,7 +8385,7 @@ static int dissect_handoffBackRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t HandoffBack2_set[] = {
+static const ber_old_sequence_t HandoffBack2_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
@@ -8438,8 +8438,8 @@ static const ber_sequence_t HandoffBack2_set[] = {
 
 static int
 dissect_ansi_map_HandoffBack2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffBack2_set, hf_index, ett_ansi_map_HandoffBack2);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffBack2_set, hf_index, ett_ansi_map_HandoffBack2);
 
   return offset;
 }
@@ -8448,7 +8448,7 @@ static int dissect_handoffBack2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t HandoffBack2Res_set[] = {
+static const ber_old_sequence_t HandoffBack2Res_set[] = {
   { BER_CLASS_CON, 198, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bsmcstatus_impl },
   { BER_CLASS_CON, 357, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdma2000HandoffResponseIOSData_impl },
   { BER_CLASS_CON, 63, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaChannelData_impl },
@@ -8470,8 +8470,8 @@ static const ber_sequence_t HandoffBack2Res_set[] = {
 
 static int
 dissect_ansi_map_HandoffBack2Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffBack2Res_set, hf_index, ett_ansi_map_HandoffBack2Res);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffBack2Res_set, hf_index, ett_ansi_map_HandoffBack2Res);
 
   return offset;
 }
@@ -8480,7 +8480,7 @@ static int dissect_handoffBack2Res(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TargetCellIDList_sequence[] = {
+static const ber_old_sequence_t TargetCellIDList_sequence[] = {
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetCellID1_impl },
   { 0, 0, 0, NULL }
@@ -8488,8 +8488,8 @@ static const ber_sequence_t TargetCellIDList_sequence[] = {
 
 static int
 dissect_ansi_map_TargetCellIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TargetCellIDList_sequence, hf_index, ett_ansi_map_TargetCellIDList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TargetCellIDList_sequence, hf_index, ett_ansi_map_TargetCellIDList);
 
   return offset;
 }
@@ -8498,7 +8498,7 @@ static int dissect_targetCellIDList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t HandoffMeasurementRequest_set[] = {
+static const ber_old_sequence_t HandoffMeasurementRequest_set[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servingCellID_impl },
   { BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_stationClassMark_impl },
@@ -8511,8 +8511,8 @@ static const ber_sequence_t HandoffMeasurementRequest_set[] = {
 
 static int
 dissect_ansi_map_HandoffMeasurementRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffMeasurementRequest_set, hf_index, ett_ansi_map_HandoffMeasurementRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffMeasurementRequest_set, hf_index, ett_ansi_map_HandoffMeasurementRequest);
 
   return offset;
 }
@@ -8559,7 +8559,7 @@ static int dissect_signalQuality_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t HandoffMeasurementRequestRes_set[] = {
+static const ber_old_sequence_t HandoffMeasurementRequestRes_set[] = {
   { BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_signalQuality_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { 0, 0, 0, NULL }
@@ -8567,8 +8567,8 @@ static const ber_sequence_t HandoffMeasurementRequestRes_set[] = {
 
 static int
 dissect_ansi_map_HandoffMeasurementRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffMeasurementRequestRes_set, hf_index, ett_ansi_map_HandoffMeasurementRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffMeasurementRequestRes_set, hf_index, ett_ansi_map_HandoffMeasurementRequestRes);
 
   return offset;
 }
@@ -8577,7 +8577,7 @@ static int dissect_handoffMeasurementRequestRes(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t HandoffMeasurementRequest2_set[] = {
+static const ber_old_sequence_t HandoffMeasurementRequest2_set[] = {
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servingCellID_impl },
   { BER_CLASS_CON, 62, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaCallMode_impl },
   { BER_CLASS_CON, 63, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaChannelData_impl },
@@ -8600,8 +8600,8 @@ static const ber_sequence_t HandoffMeasurementRequest2_set[] = {
 
 static int
 dissect_ansi_map_HandoffMeasurementRequest2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffMeasurementRequest2_set, hf_index, ett_ansi_map_HandoffMeasurementRequest2);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffMeasurementRequest2_set, hf_index, ett_ansi_map_HandoffMeasurementRequest2);
 
   return offset;
 }
@@ -8610,7 +8610,7 @@ static int dissect_handoffMeasurementRequest2(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t TargetMeasurementInformation_sequence[] = {
+static const ber_old_sequence_t TargetMeasurementInformation_sequence[] = {
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_targetCellID_impl },
   { BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_signalQuality_impl },
   { 0, 0, 0, NULL }
@@ -8618,8 +8618,8 @@ static const ber_sequence_t TargetMeasurementInformation_sequence[] = {
 
 static int
 dissect_ansi_map_TargetMeasurementInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TargetMeasurementInformation_sequence, hf_index, ett_ansi_map_TargetMeasurementInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TargetMeasurementInformation_sequence, hf_index, ett_ansi_map_TargetMeasurementInformation);
 
   return offset;
 }
@@ -8628,14 +8628,14 @@ static int dissect_TargetMeasurementList_item_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t TargetMeasurementList_sequence_of[1] = {
+static const ber_old_sequence_t TargetMeasurementList_sequence_of[1] = {
   { BER_CLASS_CON, 157, BER_FLAGS_IMPLTAG, dissect_TargetMeasurementList_item_impl },
 };
 
 static int
 dissect_ansi_map_TargetMeasurementList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TargetMeasurementList_sequence_of, hf_index, ett_ansi_map_TargetMeasurementList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TargetMeasurementList_sequence_of, hf_index, ett_ansi_map_TargetMeasurementList);
 
   return offset;
 }
@@ -8644,7 +8644,7 @@ static int dissect_targetMeasurementList_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t HandoffMeasurementRequest2Res_set[] = {
+static const ber_old_sequence_t HandoffMeasurementRequest2Res_set[] = {
   { BER_CLASS_CON, 134, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaTargetMeasurementList_impl },
   { BER_CLASS_CON, 157, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetMeasurementList_impl },
   { 0, 0, 0, NULL }
@@ -8652,8 +8652,8 @@ static const ber_sequence_t HandoffMeasurementRequest2Res_set[] = {
 
 static int
 dissect_ansi_map_HandoffMeasurementRequest2Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffMeasurementRequest2Res_set, hf_index, ett_ansi_map_HandoffMeasurementRequest2Res);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffMeasurementRequest2Res_set, hf_index, ett_ansi_map_HandoffMeasurementRequest2Res);
 
   return offset;
 }
@@ -8662,7 +8662,7 @@ static int dissect_handoffMeasurementRequest2Res(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t HandoffToThird_set[] = {
+static const ber_old_sequence_t HandoffToThird_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_interSwitchCount_impl },
@@ -8691,8 +8691,8 @@ static const ber_sequence_t HandoffToThird_set[] = {
 
 static int
 dissect_ansi_map_HandoffToThird(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffToThird_set, hf_index, ett_ansi_map_HandoffToThird);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffToThird_set, hf_index, ett_ansi_map_HandoffToThird);
 
   return offset;
 }
@@ -8701,7 +8701,7 @@ static int dissect_handoffToThird(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t HandoffToThirdRes_set[] = {
+static const ber_old_sequence_t HandoffToThirdRes_set[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_channelData_impl },
   { BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_confidentialityModes_impl },
   { BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tdmaBurstIndicator_impl },
@@ -8711,8 +8711,8 @@ static const ber_sequence_t HandoffToThirdRes_set[] = {
 
 static int
 dissect_ansi_map_HandoffToThirdRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffToThirdRes_set, hf_index, ett_ansi_map_HandoffToThirdRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffToThirdRes_set, hf_index, ett_ansi_map_HandoffToThirdRes);
 
   return offset;
 }
@@ -8721,7 +8721,7 @@ static int dissect_handoffToThirdRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t HandoffToThird2_set[] = {
+static const ber_old_sequence_t HandoffToThird2_set[] = {
   { BER_CLASS_CON, 198, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bsmcstatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -8775,8 +8775,8 @@ static const ber_sequence_t HandoffToThird2_set[] = {
 
 static int
 dissect_ansi_map_HandoffToThird2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffToThird2_set, hf_index, ett_ansi_map_HandoffToThird2);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffToThird2_set, hf_index, ett_ansi_map_HandoffToThird2);
 
   return offset;
 }
@@ -8785,7 +8785,7 @@ static int dissect_handoffToThird2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t HandoffToThird2Res_set[] = {
+static const ber_old_sequence_t HandoffToThird2Res_set[] = {
   { BER_CLASS_CON, 357, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdma2000HandoffResponseIOSData_impl },
   { BER_CLASS_CON, 63, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaChannelData_impl },
   { BER_CLASS_CON, 132, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaCodeChannelList_impl },
@@ -8805,8 +8805,8 @@ static const ber_sequence_t HandoffToThird2Res_set[] = {
 
 static int
 dissect_ansi_map_HandoffToThird2Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              HandoffToThird2Res_set, hf_index, ett_ansi_map_HandoffToThird2Res);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  HandoffToThird2Res_set, hf_index, ett_ansi_map_HandoffToThird2Res);
 
   return offset;
 }
@@ -8815,7 +8815,7 @@ static int dissect_handoffToThird2Res(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t InformationDirective_set[] = {
+static const ber_old_sequence_t InformationDirective_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -8833,8 +8833,8 @@ static const ber_sequence_t InformationDirective_set[] = {
 
 static int
 dissect_ansi_map_InformationDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InformationDirective_set, hf_index, ett_ansi_map_InformationDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InformationDirective_set, hf_index, ett_ansi_map_InformationDirective);
 
   return offset;
 }
@@ -8856,15 +8856,15 @@ static int dissect_alertResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t InformationDirectiveRes_set[] = {
+static const ber_old_sequence_t InformationDirectiveRes_set[] = {
   { BER_CLASS_CON, 129, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertResult_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_InformationDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InformationDirectiveRes_set, hf_index, ett_ansi_map_InformationDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InformationDirectiveRes_set, hf_index, ett_ansi_map_InformationDirectiveRes);
 
   return offset;
 }
@@ -8913,7 +8913,7 @@ static int dissect_messageWaitingNotificationType_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t InformationForward_set[] = {
+static const ber_old_sequence_t InformationForward_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -8933,8 +8933,8 @@ static const ber_sequence_t InformationForward_set[] = {
 
 static int
 dissect_ansi_map_InformationForward(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InformationForward_set, hf_index, ett_ansi_map_InformationForward);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InformationForward_set, hf_index, ett_ansi_map_InformationForward);
 
   return offset;
 }
@@ -8943,15 +8943,15 @@ static int dissect_informationForward(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t InformationForwardRes_set[] = {
+static const ber_old_sequence_t InformationForwardRes_set[] = {
   { BER_CLASS_CON, 129, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertResult_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_InformationForwardRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InformationForwardRes_set, hf_index, ett_ansi_map_InformationForwardRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InformationForwardRes_set, hf_index, ett_ansi_map_InformationForwardRes);
 
   return offset;
 }
@@ -8960,7 +8960,7 @@ static int dissect_informationForwardRes(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t InterSystemAnswer_set[] = {
+static const ber_old_sequence_t InterSystemAnswer_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -8969,8 +8969,8 @@ static const ber_sequence_t InterSystemAnswer_set[] = {
 
 static int
 dissect_ansi_map_InterSystemAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemAnswer_set, hf_index, ett_ansi_map_InterSystemAnswer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemAnswer_set, hf_index, ett_ansi_map_InterSystemAnswer);
 
   return offset;
 }
@@ -9197,7 +9197,7 @@ static int dissect_tdmaDataFeaturesIndicator_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t InterSystemPage_set[] = {
+static const ber_old_sequence_t InterSystemPage_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -9256,8 +9256,8 @@ static const ber_sequence_t InterSystemPage_set[] = {
 
 static int
 dissect_ansi_map_InterSystemPage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemPage_set, hf_index, ett_ansi_map_InterSystemPage);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemPage_set, hf_index, ett_ansi_map_InterSystemPage);
 
   return offset;
 }
@@ -9285,7 +9285,7 @@ static int dissect_conditionallyDeniedReason_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t InterSystemPageRes_set[] = {
+static const ber_old_sequence_t InterSystemPageRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 175, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOption_impl },
@@ -9301,8 +9301,8 @@ static const ber_sequence_t InterSystemPageRes_set[] = {
 
 static int
 dissect_ansi_map_InterSystemPageRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemPageRes_set, hf_index, ett_ansi_map_InterSystemPageRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemPageRes_set, hf_index, ett_ansi_map_InterSystemPageRes);
 
   return offset;
 }
@@ -9340,7 +9340,7 @@ static int dissect_pSID_RSIDInformation1_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t PSID_RSIDList_sequence[] = {
+static const ber_old_sequence_t PSID_RSIDList_sequence[] = {
   { BER_CLASS_CON, 202, BER_FLAGS_IMPLTAG, dissect_pSID_RSIDInformation_impl },
   { BER_CLASS_CON, 202, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pSID_RSIDInformation1_impl },
   { 0, 0, 0, NULL }
@@ -9348,8 +9348,8 @@ static const ber_sequence_t PSID_RSIDList_sequence[] = {
 
 static int
 dissect_ansi_map_PSID_RSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PSID_RSIDList_sequence, hf_index, ett_ansi_map_PSID_RSIDList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PSID_RSIDList_sequence, hf_index, ett_ansi_map_PSID_RSIDList);
 
   return offset;
 }
@@ -9358,7 +9358,7 @@ static int dissect_pSID_RSIDList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t InterSystemPage2_set[] = {
+static const ber_old_sequence_t InterSystemPage2_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -9398,8 +9398,8 @@ static const ber_sequence_t InterSystemPage2_set[] = {
 
 static int
 dissect_ansi_map_InterSystemPage2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemPage2_set, hf_index, ett_ansi_map_InterSystemPage2);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemPage2_set, hf_index, ett_ansi_map_InterSystemPage2);
 
   return offset;
 }
@@ -9434,7 +9434,7 @@ static int dissect_tdmaDataMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t InterSystemPage2Res_set[] = {
+static const ber_old_sequence_t InterSystemPage2Res_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_authenticationResponseBaseStation_impl },
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
@@ -9451,8 +9451,8 @@ static const ber_sequence_t InterSystemPage2Res_set[] = {
 
 static int
 dissect_ansi_map_InterSystemPage2Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemPage2Res_set, hf_index, ett_ansi_map_InterSystemPage2Res);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemPage2Res_set, hf_index, ett_ansi_map_InterSystemPage2Res);
 
   return offset;
 }
@@ -9474,7 +9474,7 @@ static int dissect_changeServiceAttributes_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t InterSystemSetup_set[] = {
+static const ber_old_sequence_t InterSystemSetup_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
@@ -9501,8 +9501,8 @@ static const ber_sequence_t InterSystemSetup_set[] = {
 
 static int
 dissect_ansi_map_InterSystemSetup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemSetup_set, hf_index, ett_ansi_map_InterSystemSetup);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemSetup_set, hf_index, ett_ansi_map_InterSystemSetup);
 
   return offset;
 }
@@ -9524,7 +9524,7 @@ static int dissect_setupResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t InterSystemSetupRes_set[] = {
+static const ber_old_sequence_t InterSystemSetupRes_set[] = {
   { BER_CLASS_CON, 212, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceList_impl },
   { BER_CLASS_CON, 175, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOption_impl },
   { BER_CLASS_CON, 217, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ilspInformation_impl },
@@ -9534,8 +9534,8 @@ static const ber_sequence_t InterSystemSetupRes_set[] = {
 
 static int
 dissect_ansi_map_InterSystemSetupRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              InterSystemSetupRes_set, hf_index, ett_ansi_map_InterSystemSetupRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  InterSystemSetupRes_set, hf_index, ett_ansi_map_InterSystemSetupRes);
 
   return offset;
 }
@@ -9599,7 +9599,7 @@ static int dissect_wINOperationsCapability_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t WINCapability_set[] = {
+static const ber_old_sequence_t WINCapability_set[] = {
   { BER_CLASS_CON, 277, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerCapability_impl },
   { BER_CLASS_CON, 281, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_wINOperationsCapability_impl },
   { 0, 0, 0, NULL }
@@ -9607,8 +9607,8 @@ static const ber_sequence_t WINCapability_set[] = {
 
 static int
 dissect_ansi_map_WINCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              WINCapability_set, hf_index, ett_ansi_map_WINCapability);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  WINCapability_set, hf_index, ett_ansi_map_WINCapability);
 
   return offset;
 }
@@ -9630,7 +9630,7 @@ static int dissect_callingPartyCategory_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LocationRequest_set[] = {
+static const ber_old_sequence_t LocationRequest_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -9657,8 +9657,8 @@ static const ber_sequence_t LocationRequest_set[] = {
 
 static int
 dissect_ansi_map_LocationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              LocationRequest_set, hf_index, ett_ansi_map_LocationRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  LocationRequest_set, hf_index, ett_ansi_map_LocationRequest);
 
   return offset;
 }
@@ -9701,7 +9701,7 @@ static int dissect_dmh_ServiceID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t LocationRequestRes_set[] = {
+static const ber_old_sequence_t LocationRequestRes_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -9739,8 +9739,8 @@ static const ber_sequence_t LocationRequestRes_set[] = {
 
 static int
 dissect_ansi_map_LocationRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              LocationRequestRes_set, hf_index, ett_ansi_map_LocationRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  LocationRequestRes_set, hf_index, ett_ansi_map_LocationRequestRes);
 
   return offset;
 }
@@ -9795,7 +9795,7 @@ static int dissect_sms_MessageWaitingIndicator_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t MSInactive_set[] = {
+static const ber_old_sequence_t MSInactive_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_lectronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
@@ -9810,8 +9810,8 @@ static const ber_sequence_t MSInactive_set[] = {
 
 static int
 dissect_ansi_map_MSInactive(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MSInactive_set, hf_index, ett_ansi_map_MSInactive);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MSInactive_set, hf_index, ett_ansi_map_MSInactive);
 
   return offset;
 }
@@ -9860,7 +9860,7 @@ static int dissect_featureIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t OriginationRequest_set[] = {
+static const ber_old_sequence_t OriginationRequest_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -9893,8 +9893,8 @@ static const ber_sequence_t OriginationRequest_set[] = {
 
 static int
 dissect_ansi_map_OriginationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OriginationRequest_set, hf_index, ett_ansi_map_OriginationRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OriginationRequest_set, hf_index, ett_ansi_map_OriginationRequest);
 
   return offset;
 }
@@ -9916,7 +9916,7 @@ static int dissect_dmh_ChargeInformation_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t OriginationRequestRes_set[] = {
+static const ber_old_sequence_t OriginationRequestRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
@@ -9952,8 +9952,8 @@ static const ber_sequence_t OriginationRequestRes_set[] = {
 
 static int
 dissect_ansi_map_OriginationRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OriginationRequestRes_set, hf_index, ett_ansi_map_OriginationRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OriginationRequestRes_set, hf_index, ett_ansi_map_OriginationRequestRes);
 
   return offset;
 }
@@ -10056,7 +10056,7 @@ static int dissect_deniedAuthorizationPeriod_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t QualificationDirective_set[] = {
+static const ber_old_sequence_t QualificationDirective_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_qualificationInformationCode_impl },
@@ -10078,8 +10078,8 @@ static const ber_sequence_t QualificationDirective_set[] = {
 
 static int
 dissect_ansi_map_QualificationDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              QualificationDirective_set, hf_index, ett_ansi_map_QualificationDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  QualificationDirective_set, hf_index, ett_ansi_map_QualificationDirective);
 
   return offset;
 }
@@ -10088,7 +10088,7 @@ static int dissect_qualificationDirective(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t QualificationRequest_set[] = {
+static const ber_old_sequence_t QualificationRequest_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_qualificationInformationCode_impl },
@@ -10109,8 +10109,8 @@ static const ber_sequence_t QualificationRequest_set[] = {
 
 static int
 dissect_ansi_map_QualificationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              QualificationRequest_set, hf_index, ett_ansi_map_QualificationRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  QualificationRequest_set, hf_index, ett_ansi_map_QualificationRequest);
 
   return offset;
 }
@@ -10119,7 +10119,7 @@ static int dissect_qualificationRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t QualificationRequestRes_set[] = {
+static const ber_old_sequence_t QualificationRequestRes_set[] = {
   { BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_systemMyTypeCode_impl },
   { BER_CLASS_CON, 225, BER_FLAGS_IMPLTAG, dissect_analogRedirectRecord_impl },
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorizationDenied_impl },
@@ -10137,8 +10137,8 @@ static const ber_sequence_t QualificationRequestRes_set[] = {
 
 static int
 dissect_ansi_map_QualificationRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              QualificationRequestRes_set, hf_index, ett_ansi_map_QualificationRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  QualificationRequestRes_set, hf_index, ett_ansi_map_QualificationRequestRes);
 
   return offset;
 }
@@ -10147,7 +10147,7 @@ static int dissect_qualificationRequestRes(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t RandomVariableRequest_set[] = {
+static const ber_old_sequence_t RandomVariableRequest_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 67, BER_FLAGS_IMPLTAG, dissect_randc_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servingCellID_impl },
@@ -10156,8 +10156,8 @@ static const ber_sequence_t RandomVariableRequest_set[] = {
 
 static int
 dissect_ansi_map_RandomVariableRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RandomVariableRequest_set, hf_index, ett_ansi_map_RandomVariableRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RandomVariableRequest_set, hf_index, ett_ansi_map_RandomVariableRequest);
 
   return offset;
 }
@@ -10179,7 +10179,7 @@ static int dissect_randValidTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RandomVariableRequestRes_set[] = {
+static const ber_old_sequence_t RandomVariableRequestRes_set[] = {
   { BER_CLASS_CON, 40, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_randomVariable_impl },
   { BER_CLASS_CON, 148, BER_FLAGS_IMPLTAG, dissect_randValidTime_impl },
   { 0, 0, 0, NULL }
@@ -10187,8 +10187,8 @@ static const ber_sequence_t RandomVariableRequestRes_set[] = {
 
 static int
 dissect_ansi_map_RandomVariableRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RandomVariableRequestRes_set, hf_index, ett_ansi_map_RandomVariableRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RandomVariableRequestRes_set, hf_index, ett_ansi_map_RandomVariableRequestRes);
 
   return offset;
 }
@@ -10197,7 +10197,7 @@ static int dissect_randomVariableRequestRes(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t RedirectionDirective_set[] = {
+static const ber_old_sequence_t RedirectionDirective_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_dest_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -10216,8 +10216,8 @@ static const ber_sequence_t RedirectionDirective_set[] = {
 
 static int
 dissect_ansi_map_RedirectionDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RedirectionDirective_set, hf_index, ett_ansi_map_RedirectionDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RedirectionDirective_set, hf_index, ett_ansi_map_RedirectionDirective);
 
   return offset;
 }
@@ -10255,7 +10255,7 @@ static int dissect_redirectionReason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t RedirectionRequest_set[] = {
+static const ber_old_sequence_t RedirectionRequest_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
@@ -10269,8 +10269,8 @@ static const ber_sequence_t RedirectionRequest_set[] = {
 
 static int
 dissect_ansi_map_RedirectionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RedirectionRequest_set, hf_index, ett_ansi_map_RedirectionRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RedirectionRequest_set, hf_index, ett_ansi_map_RedirectionRequest);
 
   return offset;
 }
@@ -10339,7 +10339,7 @@ static int dissect_systemAccessData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t RegistrationCancellation_set[] = {
+static const ber_old_sequence_t RegistrationCancellation_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 85, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cancellationType_impl },
@@ -10352,8 +10352,8 @@ static const ber_sequence_t RegistrationCancellation_set[] = {
 
 static int
 dissect_ansi_map_RegistrationCancellation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RegistrationCancellation_set, hf_index, ett_ansi_map_RegistrationCancellation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RegistrationCancellation_set, hf_index, ett_ansi_map_RegistrationCancellation);
 
   return offset;
 }
@@ -10382,7 +10382,7 @@ static int dissect_cancellationDenied_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t RegistrationCancellationRes_set[] = {
+static const ber_old_sequence_t RegistrationCancellationRes_set[] = {
   { BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callHistoryCount_impl },
   { BER_CLASS_CON, 57, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cancellationDenied_impl },
   { BER_CLASS_CON, 55, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlChannelData_impl },
@@ -10394,8 +10394,8 @@ static const ber_sequence_t RegistrationCancellationRes_set[] = {
 
 static int
 dissect_ansi_map_RegistrationCancellationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RegistrationCancellationRes_set, hf_index, ett_ansi_map_RegistrationCancellationRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RegistrationCancellationRes_set, hf_index, ett_ansi_map_RegistrationCancellationRes);
 
   return offset;
 }
@@ -10460,7 +10460,7 @@ static int dissect_sms_Address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RegistrationNotification_set[] = {
+static const ber_old_sequence_t RegistrationNotification_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -10492,8 +10492,8 @@ static const ber_sequence_t RegistrationNotification_set[] = {
 
 static int
 dissect_ansi_map_RegistrationNotification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RegistrationNotification_set, hf_index, ett_ansi_map_RegistrationNotification);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RegistrationNotification_set, hf_index, ett_ansi_map_RegistrationNotification);
 
   return offset;
 }
@@ -10666,7 +10666,7 @@ static int dissect_terminationRestrictionCode_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t RegistrationNotificationRes_set[] = {
+static const ber_old_sequence_t RegistrationNotificationRes_set[] = {
   { BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_systemMyTypeCode_impl },
   { BER_CLASS_CON, 225, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_analogRedirectRecord_impl },
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorizationDenied_impl },
@@ -10714,8 +10714,8 @@ static const ber_sequence_t RegistrationNotificationRes_set[] = {
 
 static int
 dissect_ansi_map_RegistrationNotificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RegistrationNotificationRes_set, hf_index, ett_ansi_map_RegistrationNotificationRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RegistrationNotificationRes_set, hf_index, ett_ansi_map_RegistrationNotificationRes);
 
   return offset;
 }
@@ -10737,7 +10737,7 @@ static int dissect_digitCollectionControl_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t RemoteUserInteractionDirective_set[] = {
+static const ber_old_sequence_t RemoteUserInteractionDirective_set[] = {
   { BER_CLASS_CON, 130, BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
   { BER_CLASS_CON, 139, BER_FLAGS_IMPLTAG, dissect_digitCollectionControl_impl },
   { 0, 0, 0, NULL }
@@ -10745,8 +10745,8 @@ static const ber_sequence_t RemoteUserInteractionDirective_set[] = {
 
 static int
 dissect_ansi_map_RemoteUserInteractionDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RemoteUserInteractionDirective_set, hf_index, ett_ansi_map_RemoteUserInteractionDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RemoteUserInteractionDirective_set, hf_index, ett_ansi_map_RemoteUserInteractionDirective);
 
   return offset;
 }
@@ -10755,15 +10755,15 @@ static int dissect_remoteUserInteractionDirective(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RemoteUserInteractionDirectiveRes_set[] = {
+static const ber_old_sequence_t RemoteUserInteractionDirectiveRes_set[] = {
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_RemoteUserInteractionDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RemoteUserInteractionDirectiveRes_set, hf_index, ett_ansi_map_RemoteUserInteractionDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RemoteUserInteractionDirectiveRes_set, hf_index, ett_ansi_map_RemoteUserInteractionDirectiveRes);
 
   return offset;
 }
@@ -10772,15 +10772,15 @@ static int dissect_remoteUserInteractionDirectiveRes(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t ResetCircuit_set[] = {
+static const ber_old_sequence_t ResetCircuit_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_ResetCircuit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ResetCircuit_set, hf_index, ett_ansi_map_ResetCircuit);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ResetCircuit_set, hf_index, ett_ansi_map_ResetCircuit);
 
   return offset;
 }
@@ -10808,15 +10808,15 @@ static int dissect_trunkStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ResetCircuitRes_set[] = {
+static const ber_old_sequence_t ResetCircuitRes_set[] = {
   { BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_trunkStatus_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_ResetCircuitRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ResetCircuitRes_set, hf_index, ett_ansi_map_ResetCircuitRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ResetCircuitRes_set, hf_index, ett_ansi_map_ResetCircuitRes);
 
   return offset;
 }
@@ -10838,7 +10838,7 @@ static int dissect_userGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t RoutingRequest_set[] = {
+static const ber_old_sequence_t RoutingRequest_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -10886,8 +10886,8 @@ static const ber_sequence_t RoutingRequest_set[] = {
 
 static int
 dissect_ansi_map_RoutingRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RoutingRequest_set, hf_index, ett_ansi_map_RoutingRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RoutingRequest_set, hf_index, ett_ansi_map_RoutingRequest);
 
   return offset;
 }
@@ -10896,7 +10896,7 @@ static int dissect_routingRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t RoutingRequestRes_set[] = {
+static const ber_old_sequence_t RoutingRequestRes_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
@@ -10911,8 +10911,8 @@ static const ber_sequence_t RoutingRequestRes_set[] = {
 
 static int
 dissect_ansi_map_RoutingRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RoutingRequestRes_set, hf_index, ett_ansi_map_RoutingRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RoutingRequestRes_set, hf_index, ett_ansi_map_RoutingRequestRes);
 
   return offset;
 }
@@ -11091,7 +11091,7 @@ static int dissect_sms_OriginatingAddress_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SMSDeliveryBackward_set[] = {
+static const ber_old_sequence_t SMSDeliveryBackward_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 105, BER_FLAGS_IMPLTAG, dissect_sms_BearerData_impl },
@@ -11109,8 +11109,8 @@ static const ber_sequence_t SMSDeliveryBackward_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryBackward(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryBackward_set, hf_index, ett_ansi_map_SMSDeliveryBackward);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryBackward_set, hf_index, ett_ansi_map_SMSDeliveryBackward);
 
   return offset;
 }
@@ -11132,7 +11132,7 @@ static int dissect_sms_CauseCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SMSDeliveryBackwardRes_set[] = {
+static const ber_old_sequence_t SMSDeliveryBackwardRes_set[] = {
   { BER_CLASS_CON, 105, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_BearerData_impl },
   { BER_CLASS_CON, 153, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_CauseCode_impl },
   { 0, 0, 0, NULL }
@@ -11140,8 +11140,8 @@ static const ber_sequence_t SMSDeliveryBackwardRes_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryBackwardRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryBackwardRes_set, hf_index, ett_ansi_map_SMSDeliveryBackwardRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryBackwardRes_set, hf_index, ett_ansi_map_SMSDeliveryBackwardRes);
 
   return offset;
 }
@@ -11150,7 +11150,7 @@ static int dissect_sMSDeliveryBackwardRes(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SMSDeliveryForward_set[] = {
+static const ber_old_sequence_t SMSDeliveryForward_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
   { BER_CLASS_CON, 105, BER_FLAGS_IMPLTAG, dissect_sms_BearerData_impl },
@@ -11168,8 +11168,8 @@ static const ber_sequence_t SMSDeliveryForward_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryForward(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryForward_set, hf_index, ett_ansi_map_SMSDeliveryForward);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryForward_set, hf_index, ett_ansi_map_SMSDeliveryForward);
 
   return offset;
 }
@@ -11178,7 +11178,7 @@ static int dissect_sMSDeliveryForward(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SMSDeliveryForwardRes_set[] = {
+static const ber_old_sequence_t SMSDeliveryForwardRes_set[] = {
   { BER_CLASS_CON, 105, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_BearerData_impl },
   { BER_CLASS_CON, 153, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_CauseCode_impl },
   { 0, 0, 0, NULL }
@@ -11186,8 +11186,8 @@ static const ber_sequence_t SMSDeliveryForwardRes_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryForwardRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryForwardRes_set, hf_index, ett_ansi_map_SMSDeliveryForwardRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryForwardRes_set, hf_index, ett_ansi_map_SMSDeliveryForwardRes);
 
   return offset;
 }
@@ -11294,7 +11294,7 @@ static int dissect_temporaryReferenceNumber_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SMSDeliveryPointToPoint_set[] = {
+static const ber_old_sequence_t SMSDeliveryPointToPoint_set[] = {
   { BER_CLASS_CON, 105, BER_FLAGS_IMPLTAG, dissect_sms_BearerData_impl },
   { BER_CLASS_CON, 116, BER_FLAGS_IMPLTAG, dissect_sms_TeleserviceIdentifier_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
@@ -11321,8 +11321,8 @@ static const ber_sequence_t SMSDeliveryPointToPoint_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryPointToPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryPointToPoint_set, hf_index, ett_ansi_map_SMSDeliveryPointToPoint);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryPointToPoint_set, hf_index, ett_ansi_map_SMSDeliveryPointToPoint);
 
   return offset;
 }
@@ -11349,7 +11349,7 @@ static const value_string ansi_map_MobileStationMSID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MobileStationMSID_choice[] = {
+static const ber_old_choice_t MobileStationMSID_choice[] = {
   { 184, BER_CLASS_CON, 184, BER_FLAGS_IMPLTAG, dissect_mobileStationMIN_impl },
   { 286, BER_CLASS_CON, 286, BER_FLAGS_IMPLTAG, dissect_mobileStationIMSI_impl },
   { 0, 0, 0, 0, NULL }
@@ -11357,9 +11357,9 @@ static const ber_choice_t MobileStationMSID_choice[] = {
 
 static int
 dissect_ansi_map_MobileStationMSID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MobileStationMSID_choice, hf_index, ett_ansi_map_MobileStationMSID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MobileStationMSID_choice, hf_index, ett_ansi_map_MobileStationMSID,
+                                     NULL);
 
   return offset;
 }
@@ -11368,7 +11368,7 @@ static int dissect_mobileStationMSID(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SMSDeliveryPointToPointRes_set[] = {
+static const ber_old_sequence_t SMSDeliveryPointToPointRes_set[] = {
   { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorizationDenied_impl },
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_denyAccess_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -11383,8 +11383,8 @@ static const ber_sequence_t SMSDeliveryPointToPointRes_set[] = {
 
 static int
 dissect_ansi_map_SMSDeliveryPointToPointRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSDeliveryPointToPointRes_set, hf_index, ett_ansi_map_SMSDeliveryPointToPointRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSDeliveryPointToPointRes_set, hf_index, ett_ansi_map_SMSDeliveryPointToPointRes);
 
   return offset;
 }
@@ -11406,7 +11406,7 @@ static int dissect_sms_AccessDeniedReason_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SMSNotification_set[] = {
+static const ber_old_sequence_t SMSNotification_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileDirectoryNumber_impl },
@@ -11418,8 +11418,8 @@ static const ber_sequence_t SMSNotification_set[] = {
 
 static int
 dissect_ansi_map_SMSNotification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSNotification_set, hf_index, ett_ansi_map_SMSNotification);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSNotification_set, hf_index, ett_ansi_map_SMSNotification);
 
   return offset;
 }
@@ -11428,15 +11428,15 @@ static int dissect_sMSNotification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SMSNotificationRes_set[] = {
+static const ber_old_sequence_t SMSNotificationRes_set[] = {
   { BER_CLASS_CON, 108, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_MessageCount_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_SMSNotificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSNotificationRes_set, hf_index, ett_ansi_map_SMSNotificationRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSNotificationRes_set, hf_index, ett_ansi_map_SMSNotificationRes);
 
   return offset;
 }
@@ -11445,7 +11445,7 @@ static int dissect_sMSNotificationRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SMSRequest_set[] = {
+static const ber_old_sequence_t SMSRequest_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileDirectoryNumber_impl },
@@ -11457,8 +11457,8 @@ static const ber_sequence_t SMSRequest_set[] = {
 
 static int
 dissect_ansi_map_SMSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSRequest_set, hf_index, ett_ansi_map_SMSRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSRequest_set, hf_index, ett_ansi_map_SMSRequest);
 
   return offset;
 }
@@ -11467,7 +11467,7 @@ static int dissect_sMSRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SMSRequestRes_set[] = {
+static const ber_old_sequence_t SMSRequestRes_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 152, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_AccessDeniedReason_impl },
@@ -11478,8 +11478,8 @@ static const ber_sequence_t SMSRequestRes_set[] = {
 
 static int
 dissect_ansi_map_SMSRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SMSRequestRes_set, hf_index, ett_ansi_map_SMSRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SMSRequestRes_set, hf_index, ett_ansi_map_SMSRequestRes);
 
   return offset;
 }
@@ -11488,7 +11488,7 @@ static int dissect_sMSRequestRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t TransferToNumberRequest_set[] = {
+static const ber_old_sequence_t TransferToNumberRequest_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
@@ -11516,8 +11516,8 @@ static const ber_sequence_t TransferToNumberRequest_set[] = {
 
 static int
 dissect_ansi_map_TransferToNumberRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TransferToNumberRequest_set, hf_index, ett_ansi_map_TransferToNumberRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TransferToNumberRequest_set, hf_index, ett_ansi_map_TransferToNumberRequest);
 
   return offset;
 }
@@ -11526,7 +11526,7 @@ static int dissect_transferToNumberRequest(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t TransferToNumberRequestRes_set[] = {
+static const ber_old_sequence_t TransferToNumberRequestRes_set[] = {
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_Destination_impl },
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
@@ -11557,8 +11557,8 @@ static const ber_sequence_t TransferToNumberRequestRes_set[] = {
 
 static int
 dissect_ansi_map_TransferToNumberRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TransferToNumberRequestRes_set, hf_index, ett_ansi_map_TransferToNumberRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TransferToNumberRequestRes_set, hf_index, ett_ansi_map_TransferToNumberRequestRes);
 
   return offset;
 }
@@ -11586,7 +11586,7 @@ static int dissect_seizureType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TrunkTest_set[] = {
+static const ber_old_sequence_t TrunkTest_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_seizureType_impl },
   { 0, 0, 0, NULL }
@@ -11594,8 +11594,8 @@ static const ber_sequence_t TrunkTest_set[] = {
 
 static int
 dissect_ansi_map_TrunkTest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TrunkTest_set, hf_index, ett_ansi_map_TrunkTest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TrunkTest_set, hf_index, ett_ansi_map_TrunkTest);
 
   return offset;
 }
@@ -11604,15 +11604,15 @@ static int dissect_trunkTest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TrunkTestDisconnect_set[] = {
+static const ber_old_sequence_t TrunkTestDisconnect_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_TrunkTestDisconnect(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TrunkTestDisconnect_set, hf_index, ett_ansi_map_TrunkTestDisconnect);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TrunkTestDisconnect_set, hf_index, ett_ansi_map_TrunkTestDisconnect);
 
   return offset;
 }
@@ -11621,15 +11621,15 @@ static int dissect_trunkTestDisconnect(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Unblocking_set[] = {
+static const ber_old_sequence_t Unblocking_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_Unblocking(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Unblocking_set, hf_index, ett_ansi_map_Unblocking);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Unblocking_set, hf_index, ett_ansi_map_Unblocking);
 
   return offset;
 }
@@ -11638,7 +11638,7 @@ static int dissect_unblocking(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t UnreliableRoamerDataDirective_set[] = {
+static const ber_old_sequence_t UnreliableRoamerDataDirective_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 103, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_senderIdentificationNumber_impl },
   { 0, 0, 0, NULL }
@@ -11646,8 +11646,8 @@ static const ber_sequence_t UnreliableRoamerDataDirective_set[] = {
 
 static int
 dissect_ansi_map_UnreliableRoamerDataDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UnreliableRoamerDataDirective_set, hf_index, ett_ansi_map_UnreliableRoamerDataDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UnreliableRoamerDataDirective_set, hf_index, ett_ansi_map_UnreliableRoamerDataDirective);
 
   return offset;
 }
@@ -11656,7 +11656,7 @@ static int dissect_unreliableRoamerDataDirective(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t UnsolicitedResponse_set[] = {
+static const ber_old_sequence_t UnsolicitedResponse_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mobileIdentificationNumber_impl },
@@ -11672,8 +11672,8 @@ static const ber_sequence_t UnsolicitedResponse_set[] = {
 
 static int
 dissect_ansi_map_UnsolicitedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UnsolicitedResponse_set, hf_index, ett_ansi_map_UnsolicitedResponse);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UnsolicitedResponse_set, hf_index, ett_ansi_map_UnsolicitedResponse);
 
   return offset;
 }
@@ -11682,7 +11682,7 @@ static int dissect_unsolicitedResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UnsolicitedResponseRes_set[] = {
+static const ber_old_sequence_t UnsolicitedResponseRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
@@ -11719,8 +11719,8 @@ static const ber_sequence_t UnsolicitedResponseRes_set[] = {
 
 static int
 dissect_ansi_map_UnsolicitedResponseRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UnsolicitedResponseRes_set, hf_index, ett_ansi_map_UnsolicitedResponseRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UnsolicitedResponseRes_set, hf_index, ett_ansi_map_UnsolicitedResponseRes);
 
   return offset;
 }
@@ -11742,7 +11742,7 @@ static int dissect_requiredParametersMask_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t ParameterRequest_set[] = {
+static const ber_old_sequence_t ParameterRequest_set[] = {
   { BER_CLASS_CON, 236, BER_FLAGS_IMPLTAG, dissect_requiredParametersMask_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
@@ -11756,8 +11756,8 @@ static const ber_sequence_t ParameterRequest_set[] = {
 
 static int
 dissect_ansi_map_ParameterRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ParameterRequest_set, hf_index, ett_ansi_map_ParameterRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ParameterRequest_set, hf_index, ett_ansi_map_ParameterRequest);
 
   return offset;
 }
@@ -11790,7 +11790,7 @@ static int dissect_reasonList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ParameterRequestRes_set[] = {
+static const ber_old_sequence_t ParameterRequestRes_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 242, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationAreaID_impl },
@@ -11802,8 +11802,8 @@ static const ber_sequence_t ParameterRequestRes_set[] = {
 
 static int
 dissect_ansi_map_ParameterRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ParameterRequestRes_set, hf_index, ett_ansi_map_ParameterRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ParameterRequestRes_set, hf_index, ett_ansi_map_ParameterRequestRes);
 
   return offset;
 }
@@ -11837,7 +11837,7 @@ static int dissect_newNetworkTMSI_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t TMSIDirective_set[] = {
+static const ber_old_sequence_t TMSIDirective_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 234, BER_FLAGS_IMPLTAG, dissect_networkTMSIExpirationTime_impl },
@@ -11849,8 +11849,8 @@ static const ber_sequence_t TMSIDirective_set[] = {
 
 static int
 dissect_ansi_map_TMSIDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TMSIDirective_set, hf_index, ett_ansi_map_TMSIDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TMSIDirective_set, hf_index, ett_ansi_map_TMSIDirective);
 
   return offset;
 }
@@ -11859,7 +11859,7 @@ static int dissect_tMSIDirective(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t TMSIDirectiveRes_set[] = {
+static const ber_old_sequence_t TMSIDirectiveRes_set[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_denyAccess_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -11869,8 +11869,8 @@ static const ber_sequence_t TMSIDirectiveRes_set[] = {
 
 static int
 dissect_ansi_map_TMSIDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TMSIDirectiveRes_set, hf_index, ett_ansi_map_TMSIDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TMSIDirectiveRes_set, hf_index, ett_ansi_map_TMSIDirectiveRes);
 
   return offset;
 }
@@ -11879,7 +11879,7 @@ static int dissect_tMSIDirectiveRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t NumberPortabilityRequest_set[] = {
+static const ber_old_sequence_t NumberPortabilityRequest_set[] = {
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 340, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acgencountered_impl },
   { BER_CLASS_CON, 80, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumberDigits1_impl },
@@ -11890,8 +11890,8 @@ static const ber_sequence_t NumberPortabilityRequest_set[] = {
 
 static int
 dissect_ansi_map_NumberPortabilityRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              NumberPortabilityRequest_set, hf_index, ett_ansi_map_NumberPortabilityRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  NumberPortabilityRequest_set, hf_index, ett_ansi_map_NumberPortabilityRequest);
 
   return offset;
 }
@@ -11957,7 +11957,7 @@ static int dissect_dataValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t DataAccessElement_sequence[] = {
+static const ber_old_sequence_t DataAccessElement_sequence[] = {
   { BER_CLASS_CON, 251, BER_FLAGS_IMPLTAG, dissect_dataID_impl },
   { BER_CLASS_CON, 248, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_change_impl },
   { BER_CLASS_CON, 256, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dataValue_impl },
@@ -11966,8 +11966,8 @@ static const ber_sequence_t DataAccessElement_sequence[] = {
 
 static int
 dissect_ansi_map_DataAccessElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DataAccessElement_sequence, hf_index, ett_ansi_map_DataAccessElement);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DataAccessElement_sequence, hf_index, ett_ansi_map_DataAccessElement);
 
   return offset;
 }
@@ -11979,7 +11979,7 @@ static int dissect_dataAccessElement2_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t DataAccessElementList_item_sequence[] = {
+static const ber_old_sequence_t DataAccessElementList_item_sequence[] = {
   { BER_CLASS_CON, 249, BER_FLAGS_IMPLTAG, dissect_dataAccessElement1_impl },
   { BER_CLASS_CON, 249, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dataAccessElement2_impl },
   { 0, 0, 0, NULL }
@@ -11987,8 +11987,8 @@ static const ber_sequence_t DataAccessElementList_item_sequence[] = {
 
 static int
 dissect_ansi_map_DataAccessElementList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DataAccessElementList_item_sequence, hf_index, ett_ansi_map_DataAccessElementList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DataAccessElementList_item_sequence, hf_index, ett_ansi_map_DataAccessElementList_item);
 
   return offset;
 }
@@ -11997,14 +11997,14 @@ static int dissect_DataAccessElementList_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t DataAccessElementList_sequence_of[1] = {
+static const ber_old_sequence_t DataAccessElementList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DataAccessElementList_item },
 };
 
 static int
 dissect_ansi_map_DataAccessElementList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DataAccessElementList_sequence_of, hf_index, ett_ansi_map_DataAccessElementList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DataAccessElementList_sequence_of, hf_index, ett_ansi_map_DataAccessElementList);
 
   return offset;
 }
@@ -12039,7 +12039,7 @@ static int dissect_timeOfDay_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ServiceRequest_set[] = {
+static const ber_old_sequence_t ServiceRequest_set[] = {
   { BER_CLASS_CON, 245, BER_FLAGS_IMPLTAG, dissect_serviceID_impl },
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 340, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acgencountered_impl },
@@ -12089,8 +12089,8 @@ static const ber_sequence_t ServiceRequest_set[] = {
 
 static int
 dissect_ansi_map_ServiceRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ServiceRequest_set, hf_index, ett_ansi_map_ServiceRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ServiceRequest_set, hf_index, ett_ansi_map_ServiceRequest);
 
   return offset;
 }
@@ -12099,7 +12099,7 @@ static int dissect_serviceRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ServiceRequestRes_set[] = {
+static const ber_old_sequence_t ServiceRequestRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -12133,8 +12133,8 @@ static const ber_sequence_t ServiceRequestRes_set[] = {
 
 static int
 dissect_ansi_map_ServiceRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ServiceRequestRes_set, hf_index, ett_ansi_map_ServiceRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ServiceRequestRes_set, hf_index, ett_ansi_map_ServiceRequestRes);
 
   return offset;
 }
@@ -12161,7 +12161,7 @@ static int dissect_dmd_BillingIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AnalyzedInformation_set[] = {
+static const ber_old_sequence_t AnalyzedInformation_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -12202,8 +12202,8 @@ static const ber_sequence_t AnalyzedInformation_set[] = {
 
 static int
 dissect_ansi_map_AnalyzedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AnalyzedInformation_set, hf_index, ett_ansi_map_AnalyzedInformation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AnalyzedInformation_set, hf_index, ett_ansi_map_AnalyzedInformation);
 
   return offset;
 }
@@ -12212,7 +12212,7 @@ static int dissect_analyzedInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AnalyzedInformationRes_set[] = {
+static const ber_old_sequence_t AnalyzedInformationRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
@@ -12238,8 +12238,8 @@ static const ber_sequence_t AnalyzedInformationRes_set[] = {
 
 static int
 dissect_ansi_map_AnalyzedInformationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AnalyzedInformationRes_set, hf_index, ett_ansi_map_AnalyzedInformationRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AnalyzedInformationRes_set, hf_index, ett_ansi_map_AnalyzedInformationRes);
 
   return offset;
 }
@@ -12282,7 +12282,7 @@ static int dissect_failureCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ConnectionFailureReport_set[] = {
+static const ber_old_sequence_t ConnectionFailureReport_set[] = {
   { BER_CLASS_CON, 260, BER_FLAGS_IMPLTAG, dissect_failureType_impl },
   { BER_CLASS_CON, 387, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureCause_impl },
   { 0, 0, 0, NULL }
@@ -12290,8 +12290,8 @@ static const ber_sequence_t ConnectionFailureReport_set[] = {
 
 static int
 dissect_ansi_map_ConnectionFailureReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ConnectionFailureReport_set, hf_index, ett_ansi_map_ConnectionFailureReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ConnectionFailureReport_set, hf_index, ett_ansi_map_ConnectionFailureReport);
 
   return offset;
 }
@@ -12300,7 +12300,7 @@ static int dissect_connectionFailureReport(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ConnectResource_set[] = {
+static const ber_old_sequence_t ConnectResource_set[] = {
   { BER_CLASS_CON, 87, BER_FLAGS_IMPLTAG, dissect_destinationDigits_impl },
   { BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrierDigits_impl },
   { BER_CLASS_CON, 150, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_outingDigits_impl },
@@ -12309,8 +12309,8 @@ static const ber_sequence_t ConnectResource_set[] = {
 
 static int
 dissect_ansi_map_ConnectResource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ConnectResource_set, hf_index, ett_ansi_map_ConnectResource);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ConnectResource_set, hf_index, ett_ansi_map_ConnectResource);
 
   return offset;
 }
@@ -12319,7 +12319,7 @@ static int dissect_connectResource(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t FacilitySelectedAndAvailable_set[] = {
+static const ber_old_sequence_t FacilitySelectedAndAvailable_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 123, BER_FLAGS_IMPLTAG, dissect_transactionCapability_impl },
@@ -12352,8 +12352,8 @@ static const ber_sequence_t FacilitySelectedAndAvailable_set[] = {
 
 static int
 dissect_ansi_map_FacilitySelectedAndAvailable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitySelectedAndAvailable_set, hf_index, ett_ansi_map_FacilitySelectedAndAvailable);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitySelectedAndAvailable_set, hf_index, ett_ansi_map_FacilitySelectedAndAvailable);
 
   return offset;
 }
@@ -12362,7 +12362,7 @@ static int dissect_facilitySelectedAndAvailable(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t FacilitySelectedAndAvailableRes_set[] = {
+static const ber_old_sequence_t FacilitySelectedAndAvailableRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 75, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertCode_impl },
@@ -12383,8 +12383,8 @@ static const ber_sequence_t FacilitySelectedAndAvailableRes_set[] = {
 
 static int
 dissect_ansi_map_FacilitySelectedAndAvailableRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              FacilitySelectedAndAvailableRes_set, hf_index, ett_ansi_map_FacilitySelectedAndAvailableRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  FacilitySelectedAndAvailableRes_set, hf_index, ett_ansi_map_FacilitySelectedAndAvailableRes);
 
   return offset;
 }
@@ -12406,7 +12406,7 @@ static int dissect_databaseKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ServiceDataAccessElement_sequence[] = {
+static const ber_old_sequence_t ServiceDataAccessElement_sequence[] = {
   { BER_CLASS_CON, 250, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dataAccessElementList_impl },
   { BER_CLASS_CON, 246, BER_FLAGS_IMPLTAG, dissect_serviceID_impl },
   { 0, 0, 0, NULL }
@@ -12414,8 +12414,8 @@ static const ber_sequence_t ServiceDataAccessElement_sequence[] = {
 
 static int
 dissect_ansi_map_ServiceDataAccessElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceDataAccessElement_sequence, hf_index, ett_ansi_map_ServiceDataAccessElement);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceDataAccessElement_sequence, hf_index, ett_ansi_map_ServiceDataAccessElement);
 
   return offset;
 }
@@ -12424,14 +12424,14 @@ static int dissect_ServiceDataAccessElementList_item_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t ServiceDataAccessElementList_sequence_of[1] = {
+static const ber_old_sequence_t ServiceDataAccessElementList_sequence_of[1] = {
   { BER_CLASS_CON, 398, BER_FLAGS_IMPLTAG, dissect_ServiceDataAccessElementList_item_impl },
 };
 
 static int
 dissect_ansi_map_ServiceDataAccessElementList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ServiceDataAccessElementList_sequence_of, hf_index, ett_ansi_map_ServiceDataAccessElementList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ServiceDataAccessElementList_sequence_of, hf_index, ett_ansi_map_ServiceDataAccessElementList);
 
   return offset;
 }
@@ -12460,7 +12460,7 @@ static int dissect_allOrNone_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ModificationRequest_sequence[] = {
+static const ber_old_sequence_t ModificationRequest_sequence[] = {
   { BER_CLASS_CON, 399, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceDataAccessElementList_impl },
   { BER_CLASS_CON, 247, BER_FLAGS_IMPLTAG, dissect_allOrNone_impl },
   { 0, 0, 0, NULL }
@@ -12468,8 +12468,8 @@ static const ber_sequence_t ModificationRequest_sequence[] = {
 
 static int
 dissect_ansi_map_ModificationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationRequest_sequence, hf_index, ett_ansi_map_ModificationRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationRequest_sequence, hf_index, ett_ansi_map_ModificationRequest);
 
   return offset;
 }
@@ -12478,14 +12478,14 @@ static int dissect_ModificationRequestList_item_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t ModificationRequestList_sequence_of[1] = {
+static const ber_old_sequence_t ModificationRequestList_sequence_of[1] = {
   { BER_CLASS_CON, 390, BER_FLAGS_IMPLTAG, dissect_ModificationRequestList_item_impl },
 };
 
 static int
 dissect_ansi_map_ModificationRequestList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ModificationRequestList_sequence_of, hf_index, ett_ansi_map_ModificationRequestList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ModificationRequestList_sequence_of, hf_index, ett_ansi_map_ModificationRequestList);
 
   return offset;
 }
@@ -12494,7 +12494,7 @@ static int dissect_modificationRequestList_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t Modify_set[] = {
+static const ber_old_sequence_t Modify_set[] = {
   { BER_CLASS_CON, 252, BER_FLAGS_IMPLTAG, dissect_databaseKey_impl },
   { BER_CLASS_CON, 391, BER_FLAGS_IMPLTAG, dissect_modificationRequestList_impl },
   { 0, 0, 0, NULL }
@@ -12502,8 +12502,8 @@ static const ber_sequence_t Modify_set[] = {
 
 static int
 dissect_ansi_map_Modify(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Modify_set, hf_index, ett_ansi_map_Modify);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Modify_set, hf_index, ett_ansi_map_Modify);
 
   return offset;
 }
@@ -12534,7 +12534,7 @@ static int dissect_dataResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DataUpdateResult_sequence[] = {
+static const ber_old_sequence_t DataUpdateResult_sequence[] = {
   { BER_CLASS_CON, 251, BER_FLAGS_IMPLTAG, dissect_dataID_impl },
   { BER_CLASS_CON, 253, BER_FLAGS_IMPLTAG, dissect_dataResult_impl },
   { 0, 0, 0, NULL }
@@ -12542,8 +12542,8 @@ static const ber_sequence_t DataUpdateResult_sequence[] = {
 
 static int
 dissect_ansi_map_DataUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DataUpdateResult_sequence, hf_index, ett_ansi_map_DataUpdateResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DataUpdateResult_sequence, hf_index, ett_ansi_map_DataUpdateResult);
 
   return offset;
 }
@@ -12552,14 +12552,14 @@ static int dissect_DataUpdateResultList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t DataUpdateResultList_sequence_of[1] = {
+static const ber_old_sequence_t DataUpdateResultList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DataUpdateResultList_item },
 };
 
 static int
 dissect_ansi_map_DataUpdateResultList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DataUpdateResultList_sequence_of, hf_index, ett_ansi_map_DataUpdateResultList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DataUpdateResultList_sequence_of, hf_index, ett_ansi_map_DataUpdateResultList);
 
   return offset;
 }
@@ -12568,7 +12568,7 @@ static int dissect_dataUpdateResultList_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ServiceDataResult_sequence[] = {
+static const ber_old_sequence_t ServiceDataResult_sequence[] = {
   { BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dataUpdateResultList_impl },
   { BER_CLASS_CON, 246, BER_FLAGS_IMPLTAG, dissect_serviceID_impl },
   { 0, 0, 0, NULL }
@@ -12576,8 +12576,8 @@ static const ber_sequence_t ServiceDataResult_sequence[] = {
 
 static int
 dissect_ansi_map_ServiceDataResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceDataResult_sequence, hf_index, ett_ansi_map_ServiceDataResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceDataResult_sequence, hf_index, ett_ansi_map_ServiceDataResult);
 
   return offset;
 }
@@ -12586,14 +12586,14 @@ static int dissect_ServiceDataResultList_item_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ServiceDataResultList_sequence_of[1] = {
+static const ber_old_sequence_t ServiceDataResultList_sequence_of[1] = {
   { BER_CLASS_CON, 272, BER_FLAGS_IMPLTAG, dissect_ServiceDataResultList_item_impl },
 };
 
 static int
 dissect_ansi_map_ServiceDataResultList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ServiceDataResultList_sequence_of, hf_index, ett_ansi_map_ServiceDataResultList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ServiceDataResultList_sequence_of, hf_index, ett_ansi_map_ServiceDataResultList);
 
   return offset;
 }
@@ -12608,7 +12608,7 @@ static const value_string ansi_map_ModificationResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModificationResult_choice[] = {
+static const ber_old_choice_t ModificationResult_choice[] = {
   { 253, BER_CLASS_CON, 253, BER_FLAGS_IMPLTAG, dissect_dataResult_impl },
   { 273, BER_CLASS_CON, 273, BER_FLAGS_IMPLTAG, dissect_serviceDataResultList_impl },
   { 0, 0, 0, 0, NULL }
@@ -12616,9 +12616,9 @@ static const ber_choice_t ModificationResult_choice[] = {
 
 static int
 dissect_ansi_map_ModificationResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModificationResult_choice, hf_index, ett_ansi_map_ModificationResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModificationResult_choice, hf_index, ett_ansi_map_ModificationResult,
+                                     NULL);
 
   return offset;
 }
@@ -12627,14 +12627,14 @@ static int dissect_ModificationResultList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t ModificationResultList_sequence_of[1] = {
+static const ber_old_sequence_t ModificationResultList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ModificationResultList_item },
 };
 
 static int
 dissect_ansi_map_ModificationResultList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ModificationResultList_sequence_of, hf_index, ett_ansi_map_ModificationResultList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ModificationResultList_sequence_of, hf_index, ett_ansi_map_ModificationResultList);
 
   return offset;
 }
@@ -12643,15 +12643,15 @@ static int dissect_modificationResultList_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t ModifyRes_set[] = {
+static const ber_old_sequence_t ModifyRes_set[] = {
   { BER_CLASS_CON, 392, BER_FLAGS_IMPLTAG, dissect_modificationResultList_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_ModifyRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ModifyRes_set, hf_index, ett_ansi_map_ModifyRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ModifyRes_set, hf_index, ett_ansi_map_ModifyRes);
 
   return offset;
 }
@@ -12660,7 +12660,7 @@ static int dissect_modifyRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Search_set[] = {
+static const ber_old_sequence_t Search_set[] = {
   { BER_CLASS_CON, 252, BER_FLAGS_IMPLTAG, dissect_databaseKey_impl },
   { BER_CLASS_CON, 399, BER_FLAGS_IMPLTAG, dissect_serviceDataAccessElementList_impl },
   { 0, 0, 0, NULL }
@@ -12668,8 +12668,8 @@ static const ber_sequence_t Search_set[] = {
 
 static int
 dissect_ansi_map_Search(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Search_set, hf_index, ett_ansi_map_Search);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Search_set, hf_index, ett_ansi_map_Search);
 
   return offset;
 }
@@ -12678,15 +12678,15 @@ static int dissect_search(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t SearchRes_set[] = {
+static const ber_old_sequence_t SearchRes_set[] = {
   { BER_CLASS_CON, 399, BER_FLAGS_IMPLTAG, dissect_serviceDataAccessElementList_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_SearchRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SearchRes_set, hf_index, ett_ansi_map_SearchRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SearchRes_set, hf_index, ett_ansi_map_SearchRes);
 
   return offset;
 }
@@ -12721,7 +12721,7 @@ static int dissect_specializedResource_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SeizeResource_set[] = {
+static const ber_old_sequence_t SeizeResource_set[] = {
   { BER_CLASS_CON, 147, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_preferredLanguageIndicator_impl },
   { BER_CLASS_CON, 383, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateSpecializedResource_impl },
   { BER_CLASS_CON, 274, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_specializedResource_impl },
@@ -12730,8 +12730,8 @@ static const ber_sequence_t SeizeResource_set[] = {
 
 static int
 dissect_ansi_map_SeizeResource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SeizeResource_set, hf_index, ett_ansi_map_SeizeResource);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SeizeResource_set, hf_index, ett_ansi_map_SeizeResource);
 
   return offset;
 }
@@ -12740,15 +12740,15 @@ static int dissect_seizeResource(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SeizeResourceRes_set[] = {
+static const ber_old_sequence_t SeizeResourceRes_set[] = {
   { BER_CLASS_CON, 87, BER_FLAGS_IMPLTAG, dissect_destinationDigits_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_SeizeResourceRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SeizeResourceRes_set, hf_index, ett_ansi_map_SeizeResourceRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SeizeResourceRes_set, hf_index, ett_ansi_map_SeizeResourceRes);
 
   return offset;
 }
@@ -12783,7 +12783,7 @@ static int dissect_scriptArgument_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ExecuteScript_sequence[] = {
+static const ber_old_sequence_t ExecuteScript_sequence[] = {
   { BER_CLASS_CON, 396, BER_FLAGS_IMPLTAG, dissect_scriptName_impl },
   { BER_CLASS_CON, 395, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scriptArgument_impl },
   { 0, 0, 0, NULL }
@@ -12791,8 +12791,8 @@ static const ber_sequence_t ExecuteScript_sequence[] = {
 
 static int
 dissect_ansi_map_ExecuteScript(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExecuteScript_sequence, hf_index, ett_ansi_map_ExecuteScript);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExecuteScript_sequence, hf_index, ett_ansi_map_ExecuteScript);
 
   return offset;
 }
@@ -12801,7 +12801,7 @@ static int dissect_executeScript_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SRFDirective_set[] = {
+static const ber_old_sequence_t SRFDirective_set[] = {
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
   { BER_CLASS_CON, 139, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitCollectionControl_impl },
   { BER_CLASS_CON, 386, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_executeScript_impl },
@@ -12811,8 +12811,8 @@ static const ber_sequence_t SRFDirective_set[] = {
 
 static int
 dissect_ansi_map_SRFDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SRFDirective_set, hf_index, ett_ansi_map_SRFDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SRFDirective_set, hf_index, ett_ansi_map_SRFDirective);
 
   return offset;
 }
@@ -12834,7 +12834,7 @@ static int dissect_scriptResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SRFDirectiveRes_set[] = {
+static const ber_old_sequence_t SRFDirectiveRes_set[] = {
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_impl },
   { BER_CLASS_CON, 397, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scriptResult_impl },
   { 0, 0, 0, NULL }
@@ -12842,8 +12842,8 @@ static const ber_sequence_t SRFDirectiveRes_set[] = {
 
 static int
 dissect_ansi_map_SRFDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SRFDirectiveRes_set, hf_index, ett_ansi_map_SRFDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SRFDirectiveRes_set, hf_index, ett_ansi_map_SRFDirectiveRes);
 
   return offset;
 }
@@ -12852,7 +12852,7 @@ static int dissect_sRFDirectiveRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TBusy_set[] = {
+static const ber_old_sequence_t TBusy_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 123, BER_FLAGS_IMPLTAG, dissect_transactionCapability_impl },
@@ -12884,8 +12884,8 @@ static const ber_sequence_t TBusy_set[] = {
 
 static int
 dissect_ansi_map_TBusy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TBusy_set, hf_index, ett_ansi_map_TBusy);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TBusy_set, hf_index, ett_ansi_map_TBusy);
 
   return offset;
 }
@@ -12894,7 +12894,7 @@ static int dissect_tBusy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t TBusyRes_set[] = {
+static const ber_old_sequence_t TBusyRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
@@ -12921,8 +12921,8 @@ static const ber_sequence_t TBusyRes_set[] = {
 
 static int
 dissect_ansi_map_TBusyRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TBusyRes_set, hf_index, ett_ansi_map_TBusyRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TBusyRes_set, hf_index, ett_ansi_map_TBusyRes);
 
   return offset;
 }
@@ -12931,7 +12931,7 @@ static int dissect_tBusyRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TNoAnswer_set[] = {
+static const ber_old_sequence_t TNoAnswer_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 123, BER_FLAGS_IMPLTAG, dissect_transactionCapability_impl },
@@ -12963,8 +12963,8 @@ static const ber_sequence_t TNoAnswer_set[] = {
 
 static int
 dissect_ansi_map_TNoAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TNoAnswer_set, hf_index, ett_ansi_map_TNoAnswer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TNoAnswer_set, hf_index, ett_ansi_map_TNoAnswer);
 
   return offset;
 }
@@ -12973,7 +12973,7 @@ static int dissect_tNoAnswer(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TNoAnswerRes_set[] = {
+static const ber_old_sequence_t TNoAnswerRes_set[] = {
   { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessDeniedReason_impl },
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
@@ -13001,8 +13001,8 @@ static const ber_sequence_t TNoAnswerRes_set[] = {
 
 static int
 dissect_ansi_map_TNoAnswerRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TNoAnswerRes_set, hf_index, ett_ansi_map_TNoAnswerRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TNoAnswerRes_set, hf_index, ett_ansi_map_TNoAnswerRes);
 
   return offset;
 }
@@ -13011,7 +13011,7 @@ static int dissect_tNoAnswerRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ChangeFacilities_set[] = {
+static const ber_old_sequence_t ChangeFacilities_set[] = {
   { BER_CLASS_CON, 67, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaPrivateLongCodeMask_impl },
   { BER_CLASS_CON, 174, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceConfigurationRecord_impl },
   { BER_CLASS_CON, 215, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dataKey_impl },
@@ -13029,8 +13029,8 @@ static const ber_sequence_t ChangeFacilities_set[] = {
 
 static int
 dissect_ansi_map_ChangeFacilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChangeFacilities_set, hf_index, ett_ansi_map_ChangeFacilities);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChangeFacilities_set, hf_index, ett_ansi_map_ChangeFacilities);
 
   return offset;
 }
@@ -13039,15 +13039,15 @@ static int dissect_changeFacilities(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ChangeFacilitiesRes_set[] = {
+static const ber_old_sequence_t ChangeFacilitiesRes_set[] = {
   { BER_CLASS_CON, 218, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasonList_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_ChangeFacilitiesRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChangeFacilitiesRes_set, hf_index, ett_ansi_map_ChangeFacilitiesRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChangeFacilitiesRes_set, hf_index, ett_ansi_map_ChangeFacilitiesRes);
 
   return offset;
 }
@@ -13069,7 +13069,7 @@ static int dissect_tdmaVoiceMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ChangeService_set[] = {
+static const ber_old_sequence_t ChangeService_set[] = {
   { BER_CLASS_CON, 174, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceConfigurationRecord_impl },
   { BER_CLASS_CON, 176, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOptionList_impl },
   { BER_CLASS_CON, 214, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_changeServiceAttributes_impl },
@@ -13085,8 +13085,8 @@ static const ber_sequence_t ChangeService_set[] = {
 
 static int
 dissect_ansi_map_ChangeService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChangeService_set, hf_index, ett_ansi_map_ChangeService);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChangeService_set, hf_index, ett_ansi_map_ChangeService);
 
   return offset;
 }
@@ -13095,7 +13095,7 @@ static int dissect_changeService(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t ChangeServiceRes_set[] = {
+static const ber_old_sequence_t ChangeServiceRes_set[] = {
   { BER_CLASS_CON, 67, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaPrivateLongCodeMask_impl },
   { BER_CLASS_CON, 174, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceConfigurationRecord_impl },
   { BER_CLASS_CON, 176, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOptionList_impl },
@@ -13111,8 +13111,8 @@ static const ber_sequence_t ChangeServiceRes_set[] = {
 
 static int
 dissect_ansi_map_ChangeServiceRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChangeServiceRes_set, hf_index, ett_ansi_map_ChangeServiceRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChangeServiceRes_set, hf_index, ett_ansi_map_ChangeServiceRes);
 
   return offset;
 }
@@ -13121,7 +13121,7 @@ static int dissect_changeServiceRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MessageDirective_set[] = {
+static const ber_old_sequence_t MessageDirective_set[] = {
   { BER_CLASS_CON, 92, BER_FLAGS_IMPLTAG, dissect_messageWaitingNotificationCount_impl },
   { BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileDirectoryNumber_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
@@ -13130,8 +13130,8 @@ static const ber_sequence_t MessageDirective_set[] = {
 
 static int
 dissect_ansi_map_MessageDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageDirective_set, hf_index, ett_ansi_map_MessageDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageDirective_set, hf_index, ett_ansi_map_MessageDirective);
 
   return offset;
 }
@@ -13140,7 +13140,7 @@ static int dissect_messageDirective(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t BulkDisconnection_set[] = {
+static const ber_old_sequence_t BulkDisconnection_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 275, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timeDateOffset_impl },
   { BER_CLASS_CON, 309, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timeOfDay_impl },
@@ -13151,8 +13151,8 @@ static const ber_sequence_t BulkDisconnection_set[] = {
 
 static int
 dissect_ansi_map_BulkDisconnection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BulkDisconnection_set, hf_index, ett_ansi_map_BulkDisconnection);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BulkDisconnection_set, hf_index, ett_ansi_map_BulkDisconnection);
 
   return offset;
 }
@@ -13161,7 +13161,7 @@ static int dissect_bulkDisconnection(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CallControlDirective_set[] = {
+static const ber_old_sequence_t CallControlDirective_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_msid },
@@ -13183,8 +13183,8 @@ static const ber_sequence_t CallControlDirective_set[] = {
 
 static int
 dissect_ansi_map_CallControlDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CallControlDirective_set, hf_index, ett_ansi_map_CallControlDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CallControlDirective_set, hf_index, ett_ansi_map_CallControlDirective);
 
   return offset;
 }
@@ -13214,15 +13214,15 @@ static int dissect_callStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CallControlDirectiveRes_set[] = {
+static const ber_old_sequence_t CallControlDirectiveRes_set[] = {
   { BER_CLASS_CON, 310, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callStatus_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_CallControlDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CallControlDirectiveRes_set, hf_index, ett_ansi_map_CallControlDirectiveRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CallControlDirectiveRes_set, hf_index, ett_ansi_map_CallControlDirectiveRes);
 
   return offset;
 }
@@ -13231,7 +13231,7 @@ static int dissect_callControlDirectiveRes(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t OAnswer_set[] = {
+static const ber_old_sequence_t OAnswer_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13250,8 +13250,8 @@ static const ber_sequence_t OAnswer_set[] = {
 
 static int
 dissect_ansi_map_OAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OAnswer_set, hf_index, ett_ansi_map_OAnswer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OAnswer_set, hf_index, ett_ansi_map_OAnswer);
 
   return offset;
 }
@@ -13281,7 +13281,7 @@ static int dissect_releaseCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ODisconnect_set[] = {
+static const ber_old_sequence_t ODisconnect_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13302,8 +13302,8 @@ static const ber_sequence_t ODisconnect_set[] = {
 
 static int
 dissect_ansi_map_ODisconnect(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ODisconnect_set, hf_index, ett_ansi_map_ODisconnect);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ODisconnect_set, hf_index, ett_ansi_map_ODisconnect);
 
   return offset;
 }
@@ -13312,7 +13312,7 @@ static int dissect_oDisconnect(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ODisconnectRes_set[] = {
+static const ber_old_sequence_t ODisconnectRes_set[] = {
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
   { BER_CLASS_CON, 305, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dmh_ServiceID_impl },
   { 0, 0, 0, NULL }
@@ -13320,8 +13320,8 @@ static const ber_sequence_t ODisconnectRes_set[] = {
 
 static int
 dissect_ansi_map_ODisconnectRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ODisconnectRes_set, hf_index, ett_ansi_map_ODisconnectRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ODisconnectRes_set, hf_index, ett_ansi_map_ODisconnectRes);
 
   return offset;
 }
@@ -13330,7 +13330,7 @@ static int dissect_oDisconnectRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CallRecoveryID_set[] = {
+static const ber_old_sequence_t CallRecoveryID_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 275, BER_FLAGS_IMPLTAG, dissect_timeDateOffset_impl },
   { BER_CLASS_CON, 309, BER_FLAGS_IMPLTAG, dissect_timeOfDay_impl },
@@ -13339,8 +13339,8 @@ static const ber_sequence_t CallRecoveryID_set[] = {
 
 static int
 dissect_ansi_map_CallRecoveryID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CallRecoveryID_set, hf_index, ett_ansi_map_CallRecoveryID);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CallRecoveryID_set, hf_index, ett_ansi_map_CallRecoveryID);
 
   return offset;
 }
@@ -13349,14 +13349,14 @@ static int dissect_CallRecoveryIDList_item_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t CallRecoveryIDList_set_of[1] = {
+static const ber_old_sequence_t CallRecoveryIDList_set_of[1] = {
   { BER_CLASS_CON, 303, BER_FLAGS_IMPLTAG, dissect_CallRecoveryIDList_item_impl },
 };
 
 static int
 dissect_ansi_map_CallRecoveryIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 CallRecoveryIDList_set_of, hf_index, ett_ansi_map_CallRecoveryIDList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     CallRecoveryIDList_set_of, hf_index, ett_ansi_map_CallRecoveryIDList);
 
   return offset;
 }
@@ -13365,15 +13365,15 @@ static int dissect_callRecoveryIDList_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t CallRecoveryReport_set[] = {
+static const ber_old_sequence_t CallRecoveryReport_set[] = {
   { BER_CLASS_CON, 304, BER_FLAGS_IMPLTAG, dissect_callRecoveryIDList_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_CallRecoveryReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CallRecoveryReport_set, hf_index, ett_ansi_map_CallRecoveryReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CallRecoveryReport_set, hf_index, ett_ansi_map_CallRecoveryReport);
 
   return offset;
 }
@@ -13382,7 +13382,7 @@ static int dissect_callRecoveryReport(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t TAnswer_set[] = {
+static const ber_old_sequence_t TAnswer_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13404,8 +13404,8 @@ static const ber_sequence_t TAnswer_set[] = {
 
 static int
 dissect_ansi_map_TAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TAnswer_set, hf_index, ett_ansi_map_TAnswer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TAnswer_set, hf_index, ett_ansi_map_TAnswer);
 
   return offset;
 }
@@ -13414,7 +13414,7 @@ static int dissect_tAnswer(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t TDisconnect_set[] = {
+static const ber_old_sequence_t TDisconnect_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13435,8 +13435,8 @@ static const ber_sequence_t TDisconnect_set[] = {
 
 static int
 dissect_ansi_map_TDisconnect(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TDisconnect_set, hf_index, ett_ansi_map_TDisconnect);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TDisconnect_set, hf_index, ett_ansi_map_TDisconnect);
 
   return offset;
 }
@@ -13445,15 +13445,15 @@ static int dissect_tDisconnect(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t TDisconnectRes_set[] = {
+static const ber_old_sequence_t TDisconnectRes_set[] = {
   { BER_CLASS_CON, 305, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dmh_ServiceID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_TDisconnectRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TDisconnectRes_set, hf_index, ett_ansi_map_TDisconnectRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TDisconnectRes_set, hf_index, ett_ansi_map_TDisconnectRes);
 
   return offset;
 }
@@ -13462,7 +13462,7 @@ static int dissect_tDisconnectRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t UnreliableCallData_set[] = {
+static const ber_old_sequence_t UnreliableCallData_set[] = {
   { BER_CLASS_CON, 307, BER_FLAGS_IMPLTAG, dissect_controlNetworkID_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { 0, 0, 0, NULL }
@@ -13470,8 +13470,8 @@ static const ber_sequence_t UnreliableCallData_set[] = {
 
 static int
 dissect_ansi_map_UnreliableCallData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UnreliableCallData_set, hf_index, ett_ansi_map_UnreliableCallData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UnreliableCallData_set, hf_index, ett_ansi_map_UnreliableCallData);
 
   return offset;
 }
@@ -13480,7 +13480,7 @@ static int dissect_unreliableCallData(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t OCalledPartyBusy_set[] = {
+static const ber_old_sequence_t OCalledPartyBusy_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13509,8 +13509,8 @@ static const ber_sequence_t OCalledPartyBusy_set[] = {
 
 static int
 dissect_ansi_map_OCalledPartyBusy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OCalledPartyBusy_set, hf_index, ett_ansi_map_OCalledPartyBusy);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OCalledPartyBusy_set, hf_index, ett_ansi_map_OCalledPartyBusy);
 
   return offset;
 }
@@ -13519,7 +13519,7 @@ static int dissect_oCalledPartyBusy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t OCalledPartyBusyRes_set[] = {
+static const ber_old_sequence_t OCalledPartyBusyRes_set[] = {
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
   { BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrierDigits_impl },
@@ -13541,8 +13541,8 @@ static const ber_sequence_t OCalledPartyBusyRes_set[] = {
 
 static int
 dissect_ansi_map_OCalledPartyBusyRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OCalledPartyBusyRes_set, hf_index, ett_ansi_map_OCalledPartyBusyRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OCalledPartyBusyRes_set, hf_index, ett_ansi_map_OCalledPartyBusyRes);
 
   return offset;
 }
@@ -13551,7 +13551,7 @@ static int dissect_oCalledPartyBusyRes(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ONoAnswer_set[] = {
+static const ber_old_sequence_t ONoAnswer_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13579,8 +13579,8 @@ static const ber_sequence_t ONoAnswer_set[] = {
 
 static int
 dissect_ansi_map_ONoAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ONoAnswer_set, hf_index, ett_ansi_map_ONoAnswer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ONoAnswer_set, hf_index, ett_ansi_map_ONoAnswer);
 
   return offset;
 }
@@ -13589,7 +13589,7 @@ static int dissect_oNoAnswer(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ONoAnswerRes_set[] = {
+static const ber_old_sequence_t ONoAnswerRes_set[] = {
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionCode_impl },
   { BER_CLASS_CON, 130, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_announcementList_impl },
   { BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrierDigits_impl },
@@ -13611,8 +13611,8 @@ static const ber_sequence_t ONoAnswerRes_set[] = {
 
 static int
 dissect_ansi_map_ONoAnswerRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ONoAnswerRes_set, hf_index, ett_ansi_map_ONoAnswerRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ONoAnswerRes_set, hf_index, ett_ansi_map_ONoAnswerRes);
 
   return offset;
 }
@@ -13634,7 +13634,7 @@ static int dissect_positionInformationCode_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t PositionRequest_set[] = {
+static const ber_old_sequence_t PositionRequest_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 315, BER_FLAGS_IMPLTAG, dissect_positionInformationCode_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -13646,8 +13646,8 @@ static const ber_sequence_t PositionRequest_set[] = {
 
 static int
 dissect_ansi_map_PositionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PositionRequest_set, hf_index, ett_ansi_map_PositionRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PositionRequest_set, hf_index, ett_ansi_map_PositionRequest);
 
   return offset;
 }
@@ -13669,7 +13669,7 @@ static int dissect_mSStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t PositionRequestRes_set[] = {
+static const ber_old_sequence_t PositionRequestRes_set[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
   { BER_CLASS_CON, 53, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extendedMSCID_impl },
   { BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mSCIdentificationNumber_impl },
@@ -13685,8 +13685,8 @@ static const ber_sequence_t PositionRequestRes_set[] = {
 
 static int
 dissect_ansi_map_PositionRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PositionRequestRes_set, hf_index, ett_ansi_map_PositionRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PositionRequestRes_set, hf_index, ett_ansi_map_PositionRequestRes);
 
   return offset;
 }
@@ -13695,7 +13695,7 @@ static int dissect_positionRequestRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t PositionRequestForward_set[] = {
+static const ber_old_sequence_t PositionRequestForward_set[] = {
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
   { BER_CLASS_CON, 315, BER_FLAGS_IMPLTAG, dissect_positionInformationCode_impl },
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_electronicSerialNumber_impl },
@@ -13706,8 +13706,8 @@ static const ber_sequence_t PositionRequestForward_set[] = {
 
 static int
 dissect_ansi_map_PositionRequestForward(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PositionRequestForward_set, hf_index, ett_ansi_map_PositionRequestForward);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PositionRequestForward_set, hf_index, ett_ansi_map_PositionRequestForward);
 
   return offset;
 }
@@ -13716,7 +13716,7 @@ static int dissect_positionRequestForward(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t PositionRequestForwardRes_set[] = {
+static const ber_old_sequence_t PositionRequestForwardRes_set[] = {
   { BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mscid_impl },
   { BER_CLASS_CON, 313, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mSStatus_impl },
   { BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationAreaID_impl },
@@ -13726,8 +13726,8 @@ static const ber_sequence_t PositionRequestForwardRes_set[] = {
 
 static int
 dissect_ansi_map_PositionRequestForwardRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PositionRequestForwardRes_set, hf_index, ett_ansi_map_PositionRequestForwardRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PositionRequestForwardRes_set, hf_index, ett_ansi_map_PositionRequestForwardRes);
 
   return offset;
 }
@@ -13809,7 +13809,7 @@ static const value_string ansi_map_GapInterval_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GapInterval_choice[] = {
+static const ber_old_choice_t GapInterval_choice[] = {
   { 343, BER_CLASS_CON, 343, BER_FLAGS_IMPLTAG, dissect_sCFOverloadGapInterval_impl },
   { 344, BER_CLASS_CON, 344, BER_FLAGS_IMPLTAG, dissect_serviceManagementSystemGapInterval_impl },
   { 0, 0, 0, 0, NULL }
@@ -13817,9 +13817,9 @@ static const ber_choice_t GapInterval_choice[] = {
 
 static int
 dissect_ansi_map_GapInterval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GapInterval_choice, hf_index, ett_ansi_map_GapInterval,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GapInterval_choice, hf_index, ett_ansi_map_GapInterval,
+                                     NULL);
 
   return offset;
 }
@@ -13828,7 +13828,7 @@ static int dissect_gapInterval(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ACGDirective_set[] = {
+static const ber_old_sequence_t ACGDirective_set[] = {
   { BER_CLASS_CON, 341, BER_FLAGS_IMPLTAG, dissect_controlType_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destinationAddress },
   { BER_CLASS_CON, 342, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gapDuration_impl },
@@ -13838,8 +13838,8 @@ static const ber_sequence_t ACGDirective_set[] = {
 
 static int
 dissect_ansi_map_ACGDirective(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ACGDirective_set, hf_index, ett_ansi_map_ACGDirective);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ACGDirective_set, hf_index, ett_ansi_map_ACGDirective);
 
   return offset;
 }
@@ -13874,7 +13874,7 @@ static int dissect_range_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t RoamerDatabaseVerificationRequest_set[] = {
+static const ber_old_sequence_t RoamerDatabaseVerificationRequest_set[] = {
   { BER_CLASS_CON, 353, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_invokingNEType_impl },
   { BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileDirectoryNumber_impl },
   { BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mscid_impl },
@@ -13885,8 +13885,8 @@ static const ber_sequence_t RoamerDatabaseVerificationRequest_set[] = {
 
 static int
 dissect_ansi_map_RoamerDatabaseVerificationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RoamerDatabaseVerificationRequest_set, hf_index, ett_ansi_map_RoamerDatabaseVerificationRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RoamerDatabaseVerificationRequest_set, hf_index, ett_ansi_map_RoamerDatabaseVerificationRequest);
 
   return offset;
 }
@@ -13895,15 +13895,15 @@ static int dissect_roamerDatabaseVerificationRequest(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t RoamerDatabaseVerificationRequestRes_set[] = {
+static const ber_old_sequence_t RoamerDatabaseVerificationRequestRes_set[] = {
   { BER_CLASS_CON, 123, BER_FLAGS_IMPLTAG, dissect_transactionCapability_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_RoamerDatabaseVerificationRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RoamerDatabaseVerificationRequestRes_set, hf_index, ett_ansi_map_RoamerDatabaseVerificationRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RoamerDatabaseVerificationRequestRes_set, hf_index, ett_ansi_map_RoamerDatabaseVerificationRequestRes);
 
   return offset;
 }
@@ -13912,7 +13912,7 @@ static int dissect_roamerDatabaseVerificationRequestRes(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t AddService_set[] = {
+static const ber_old_sequence_t AddService_set[] = {
   { BER_CLASS_CON, 212, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceList_impl },
   { BER_CLASS_CON, 176, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOptionList_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digits_impl },
@@ -13924,8 +13924,8 @@ static const ber_sequence_t AddService_set[] = {
 
 static int
 dissect_ansi_map_AddService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AddService_set, hf_index, ett_ansi_map_AddService);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AddService_set, hf_index, ett_ansi_map_AddService);
 
   return offset;
 }
@@ -13934,7 +13934,7 @@ static int dissect_addService(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t AddServiceRes_set[] = {
+static const ber_old_sequence_t AddServiceRes_set[] = {
   { BER_CLASS_CON, 212, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceList_impl },
   { BER_CLASS_CON, 176, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaServiceOptionList_impl },
   { BER_CLASS_CON, 348, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_qosPriority_impl },
@@ -13944,8 +13944,8 @@ static const ber_sequence_t AddServiceRes_set[] = {
 
 static int
 dissect_ansi_map_AddServiceRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AddServiceRes_set, hf_index, ett_ansi_map_AddServiceRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AddServiceRes_set, hf_index, ett_ansi_map_AddServiceRes);
 
   return offset;
 }
@@ -13954,7 +13954,7 @@ static int dissect_addServiceRes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t DropService_set[] = {
+static const ber_old_sequence_t DropService_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { BER_CLASS_CON, 212, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cdmaConnectionReferenceList_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_interMSCCircuitID_impl },
@@ -13966,8 +13966,8 @@ static const ber_sequence_t DropService_set[] = {
 
 static int
 dissect_ansi_map_DropService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DropService_set, hf_index, ett_ansi_map_DropService);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DropService_set, hf_index, ett_ansi_map_DropService);
 
   return offset;
 }
@@ -13976,15 +13976,15 @@ static int dissect_dropService(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t DropServiceRes_set[] = {
+static const ber_old_sequence_t DropServiceRes_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_billingID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ansi_map_DropServiceRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DropServiceRes_set, hf_index, ett_ansi_map_DropServiceRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DropServiceRes_set, hf_index, ett_ansi_map_DropServiceRes);
 
   return offset;
 }
@@ -14025,7 +14025,7 @@ static const value_string ansi_map_NewlyAssignedMSID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NewlyAssignedMSID_choice[] = {
+static const ber_old_choice_t NewlyAssignedMSID_choice[] = {
   { 187, BER_CLASS_CON, 187, BER_FLAGS_IMPLTAG, dissect_newlyAssignedMIN_impl },
   { 287, BER_CLASS_CON, 287, BER_FLAGS_IMPLTAG, dissect_newlyAssignedIMSI_impl },
   { 0, 0, 0, 0, NULL }
@@ -14033,9 +14033,9 @@ static const ber_choice_t NewlyAssignedMSID_choice[] = {
 
 static int
 dissect_ansi_map_NewlyAssignedMSID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NewlyAssignedMSID_choice, hf_index, ett_ansi_map_NewlyAssignedMSID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NewlyAssignedMSID_choice, hf_index, ett_ansi_map_NewlyAssignedMSID,
+                                     NULL);
 
   return offset;
 }
@@ -14044,7 +14044,7 @@ static int dissect_newlyAssignedMSID(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t OTASPRequest_set[] = {
+static const ber_old_sequence_t OTASPRequest_set[] = {
   { BER_CLASS_CON, 128, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ctionCode_impl },
   { BER_CLASS_CON, 181, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aKeyProtocolVersion_impl },
   { BER_CLASS_CON, 161, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationData_impl },
@@ -14066,8 +14066,8 @@ static const ber_sequence_t OTASPRequest_set[] = {
 
 static int
 dissect_ansi_map_OTASPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OTASPRequest_set, hf_index, ett_ansi_map_OTASPRequest);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OTASPRequest_set, hf_index, ett_ansi_map_OTASPRequest);
 
   return offset;
 }
@@ -14128,7 +14128,7 @@ static int dissect_primitiveValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t OTASPRequestRes_set[] = {
+static const ber_old_sequence_t OTASPRequestRes_set[] = {
   { BER_CLASS_CON, 181, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aKeyProtocolVersion_impl },
   { BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationResponseBaseStation_impl },
   { BER_CLASS_CON, 183, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_baseStationPartialKey_impl },
@@ -14145,8 +14145,8 @@ static const ber_sequence_t OTASPRequestRes_set[] = {
 
 static int
 dissect_ansi_map_OTASPRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OTASPRequestRes_set, hf_index, ett_ansi_map_OTASPRequestRes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OTASPRequestRes_set, hf_index, ett_ansi_map_OTASPRequestRes);
 
   return offset;
 }
@@ -14165,7 +14165,7 @@ dissect_ansi_map_FaultyParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t Profile_set[] = {
+static const ber_old_sequence_t Profile_set[] = {
   { BER_CLASS_CON, 78, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authenticationCapability_impl },
   { BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFeaturesIndicator_impl },
   { BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrierDigits_impl },
@@ -14203,8 +14203,8 @@ static const ber_sequence_t Profile_set[] = {
 
 static int
 dissect_ansi_map_Profile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Profile_set, hf_index, ett_ansi_map_Profile);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Profile_set, hf_index, ett_ansi_map_Profile);
 
   return offset;
 }
@@ -14230,7 +14230,7 @@ dissect_ansi_map_CDMABandClassList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SRFCapability_set[] = {
+static const ber_old_sequence_t SRFCapability_set[] = {
   { BER_CLASS_CON, 274, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_specializedResource_impl },
   { BER_CLASS_CON, 383, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateSpecializedResource_impl },
   { 0, 0, 0, NULL }
@@ -14238,14 +14238,14 @@ static const ber_sequence_t SRFCapability_set[] = {
 
 static int
 dissect_ansi_map_SRFCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SRFCapability_set, hf_index, ett_ansi_map_SRFCapability);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SRFCapability_set, hf_index, ett_ansi_map_SRFCapability);
 
   return offset;
 }
 
 
-static const ber_sequence_t InvokeData_sequence[] = {
+static const ber_old_sequence_t InvokeData_sequence[] = {
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_handoffMeasurementRequest },
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_facilitiesDirective },
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_handoffBack },
@@ -14334,14 +14334,14 @@ static const ber_sequence_t InvokeData_sequence[] = {
 
 static int
 dissect_ansi_map_InvokeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InvokeData_sequence, hf_index, ett_ansi_map_InvokeData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InvokeData_sequence, hf_index, ett_ansi_map_InvokeData);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReturnData_sequence[] = {
+static const ber_old_sequence_t ReturnData_sequence[] = {
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_handoffMeasurementRequestRes },
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_facilitiesDirectiveRes },
   { BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_handoffBackRes },
@@ -14407,8 +14407,8 @@ static const ber_sequence_t ReturnData_sequence[] = {
 
 static int
 dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnData_sequence, hf_index, ett_ansi_map_ReturnData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnData_sequence, hf_index, ett_ansi_map_ReturnData);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index c943d5c1fb..be1e3bcf23 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -615,6 +615,7 @@ call_ber_syntax_callback(const char *syntax, tvbuff_t *tvb, int offset, packet_i
 }
 
 static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
+static int dissect_ber_old_sq_of(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
 
 /* 8.1 General rules for encoding */
 
@@ -987,11 +988,25 @@ int dissect_ber_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_
 	if (func && out_tvb && (tvb_length(out_tvb)>0)) {
 		if (hf_id >= 0)
 			tree = proto_item_add_subtree(ber_last_created_item, ett_ber_octet_string);
-		func(tree, out_tvb, 0, actx);
+		/* TODO Should hf_id2 be pased as last parameter???*/
+		func(FALSE, out_tvb, 0, actx, tree, -1);
 	}
 	return offset;
 }
 
+int dissect_ber_old_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_old_callback func)
+{
+	tvbuff_t *out_tvb = NULL;
+
+	offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_id, (func)?&out_tvb:NULL);
+	if (func && out_tvb && (tvb_length(out_tvb)>0)) {
+		if (hf_id >= 0)
+			tree = proto_item_add_subtree(ber_last_created_item, ett_ber_octet_string);
+		/* TODO Should hf_id2 be pased as last parameter???*/
+		func(tree, out_tvb, 0, actx);
+	}
+	return offset;
+}
 /* 8.8 Encoding of a null value */
 int
 dissect_ber_null(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) {
@@ -1203,7 +1218,7 @@ dissect_ber_boolean(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, t
  */
 int dissect_ber_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
 	gint8 class;
-	gboolean pc, ind = 0, ind_field;
+	gboolean pc, ind = 0, ind_field, imp_tag=FALSE;
 	gint32 tag;
 	guint32 len;
 	proto_tree *tree = parent_tree;
@@ -1446,7 +1461,12 @@ printf("SEQUENCE dissect_ber_sequence(%s) calling subdissector\n",name);
 			/* Assume that we have a malformed packet. */
 			THROW(ReportedBoundsError);
 		}
-		count=seq->func(tree, next_tvb, 0, actx);
+		imp_tag=FALSE;
+		if (seq->flags & BER_FLAGS_IMPLTAG){
+			imp_tag = TRUE;
+		}
+
+		count=seq->func(imp_tag, next_tvb, 0, actx, tree, *seq->p_id);
 
 #ifdef DEBUG_BER
 {
@@ -1502,11 +1522,312 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n",name,coun
 	return end_offset;
 }
 
+int dissect_ber_old_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id) {
+	gint8 class;
+	gboolean pc, ind = 0, ind_field;
+	gint32 tag;
+	guint32 len;
+	proto_tree *tree = parent_tree;
+	proto_item *item = NULL;
+	proto_item *cause;
+	int end_offset, s_offset;
+	gint length_remaining;
+	tvbuff_t *next_tvb;
+
+	s_offset = offset;
+#ifdef DEBUG_BER
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(tvb,offset)>3){
+printf("SEQUENCE dissect_ber_old_sequence(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
+}else{
+printf("SEQUENCE dissect_ber_old_sequence(%s) entered\n",name);
+}
+}
+#endif
+	if(!implicit_tag){
+		/* first we must read the sequence header */
+		offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+		offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+		if(ind){
+		/*  Fixed the length is correctly returned from dissect ber_length
+		  end_offset = tvb_length(tvb);*/
+		  end_offset = offset + len -2;
+		} else {
+		  end_offset = offset + len;
+		}
+
+		/* sanity check: we only handle Constructed Universal Sequences */
+		if((class!=BER_CLASS_APP)&&(class!=BER_CLASS_PRI))
+		if((!pc)
+		||(!implicit_tag&&((class!=BER_CLASS_UNI)
+					||(tag!=BER_UNI_TAG_SEQUENCE)))) {
+			tvb_ensure_bytes_exist(tvb, offset-2, 2);
+			cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: Sequence expected but Class:%d(%s) PC:%d Tag:%d was unexpected", class,val_to_str(class,ber_class_codes,"Unknown"), pc, tag);
+			proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+			expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Sequence expected");
+			return end_offset;
+		}
+	} else {
+		/* was implicit tag so just use the length of the tvb */
+		len=tvb_length_remaining(tvb,offset);
+		end_offset=offset+len;
+	}
+
+	/* create subtree */
+	if(hf_id >= 0) {
+		if(parent_tree){
+			item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, FALSE);
+			tree = proto_item_add_subtree(item, ett_id);
+		}
+	}
+	/* loop over all entries until we reach the end of the sequence */
+	while (offset < end_offset){
+		gint8 class;
+		gboolean pc;
+		gint32 tag;
+		guint32 len;
+		int hoffset, eoffset, count;
+
+		/*if(ind){  this sequence was of indefinite length, if this is implicit indefinite impossible maybe
+					but tcap dissector uses this to eat the tag length then pass into here... EOC still on there...*/
+			if((tvb_get_guint8(tvb, offset)==0)&&(tvb_get_guint8(tvb, offset+1)==0)){
+				/* If the first bytes is 00 00 of a indefenert length field it's a zero length field*/
+				offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+				offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+				proto_item_append_text(item," 0 items");
+				return end_offset;
+				/*
+				if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, s_offset, offset+2, "ERROR WRONG SEQ EOC");
+				}
+				return end_offset;
+				*/
+			}
+		/*}*/
+		hoffset = offset;
+		/* read header and len for next field */
+		offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
+		offset = get_ber_length(tree, tvb, offset, &len, &ind_field);
+		eoffset = offset + len;
+                /* Make sure we move forward */
+		if (eoffset <= hoffset)
+			THROW(ReportedBoundsError);
+
+		/*if(ind_field && (len == 2)){
+    			/ disgusting indefinite length zero length field, what are these people doing /
+			offset = eoffset;
+			continue;
+		}
+		*/
+
+ber_old_sequence_try_again:
+		/* have we run out of known entries in the sequence ?*/
+		if(!seq->func) {
+			/* it was not,  move to the next one and try again */
+			offset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, NULL, NULL);
+			cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: This field lies beyond the end of the known sequence definition.");
+			proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+			expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Unknown field in Sequence");
+			offset = eoffset;
+			continue;
+		}
+
+		/* Verify that this one is the one we want.
+		 * Skip check completely if class==ANY
+		 * of if NOCHKTAG is set
+		 */
+/* XXX Bug in asn2eth,
+ * for   scope            [7]  Scope OPTIONAL,
+ * it generates
+ *   { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_scope },
+ * and there should not be a NOTCHKTAG here
+ */
+		if( ((seq->class==BER_CLASS_CON)||(seq->class==BER_CLASS_APP)||(seq->class==BER_CLASS_PRI)) && (!(seq->flags&BER_FLAGS_NOOWNTAG)) ){
+		  if( (seq->class!=BER_CLASS_ANY)
+		  &&  (seq->tag!=-1)
+		  &&( (seq->class!=class)
+		    ||(seq->tag!=tag) ) ){
+			/* it was not,  move to the next one and try again */
+			if(seq->flags&BER_FLAGS_OPTIONAL){
+				/* well this one was optional so just skip to the next one and try again. */
+				seq++;
+				goto ber_old_sequence_try_again;
+			}
+			offset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, NULL, NULL);
+			if( seq->class == BER_CLASS_UNI){ 
+			  cause = proto_tree_add_text(tree, tvb, offset, len,
+				    "BER Error: Wrong field in SEQUENCE  expected class:%d (%s) tag:%d (%s) but found class:%d tag:%d",
+				    seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),
+				    seq->tag,val_to_str(seq->tag,ber_uni_tag_codes,"Unknown"),
+				    class,tag);
+				proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+				expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Wrong field in SEQUENCE");
+			}else{
+			  cause = proto_tree_add_text(tree, tvb, offset, len,
+				    "BER Error: Wrong field in SEQUENCE  expected class:%d (%s) tag:%d but found class:%d tag:%d",
+				    seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),
+				    seq->tag,class,tag);
+				proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+				expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Wrong field in SEQUENCE");
+			}
+			seq++;
+			offset=eoffset;
+			continue;
+		  }
+	        } else if(!(seq->flags & BER_FLAGS_NOTCHKTAG)) {
+		  if( (seq->class!=BER_CLASS_ANY)
+		  &&  (seq->tag!=-1)
+		  &&( (seq->class!=class)
+		    ||(seq->tag!=tag) ) ){
+			/* it was not,  move to the next one and try again */
+			if(seq->flags&BER_FLAGS_OPTIONAL){
+				/* well this one was optional so just skip to the next one and try again. */
+				seq++;
+				goto ber_old_sequence_try_again;
+			}
+
+			offset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, NULL, NULL);
+			if( seq->class == BER_CLASS_UNI){
+			  cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in sequence  expected class:%d (%s) tag:%d(%s) but found class:%d(%s) tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,val_to_str(seq->tag,ber_uni_tag_codes,"Unknown"),class,val_to_str(class,ber_class_codes,"Unknown"),tag);
+				proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+				expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Wrong field in sequence");
+			}else{
+			  cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in sequence  expected class:%d (%s) tag:%d but found class:%d(%s) tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,class,val_to_str(class,ber_class_codes,"Unknown"),tag);
+				proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+				expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Wrong field in sequence");
+			}
+			seq++;
+			offset=eoffset;
+			continue;
+		  }
+		}
+
+		if(!(seq->flags & BER_FLAGS_NOOWNTAG) ) {
+			/* dissect header and len for field */
+			if(ind_field && (len == 2)){
+				/* This is a Zero length field */
+				next_tvb = tvb_new_subset(tvb, offset, len, len);
+				hoffset = eoffset;
+			}else{
+				hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+				hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+				length_remaining=tvb_length_remaining(tvb, hoffset);
+				if (length_remaining>eoffset-hoffset-(2*ind_field))
+					length_remaining=eoffset-hoffset-(2*ind_field);
+				next_tvb = tvb_new_subset(tvb, hoffset, length_remaining, eoffset-hoffset-(2*ind_field));
+			}
+		}
+		else {
+			length_remaining=tvb_length_remaining(tvb, hoffset);
+			if (length_remaining>eoffset-hoffset)
+				length_remaining=eoffset-hoffset;
+			next_tvb = tvb_new_subset(tvb, hoffset, length_remaining, eoffset-hoffset);
+		}
+
+		/* call the dissector for this field */
+		/*if 	((eoffset-hoffset)>length_remaining) {*/
+			/* If the field is indefinite (i.e. we dont know the
+			 * length) of if the tvb is short, then just
+			 * give it all of the tvb and hope for the best.
+			 */
+			/*next_tvb = tvb_new_subset(tvb, hoffset, -1, -1);*/
+		/*} else {*/
+
+		/*}*/
+
+#ifdef DEBUG_BER
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(next_tvb,0)>3){
+printf("SEQUENCE dissect_ber_old_sequence(%s) calling subdissector offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2));
+}else{
+printf("SEQUENCE dissect_ber_old_sequence(%s) calling subdissector\n",name);
+}
+}
+#endif
+		if (next_tvb == NULL) {
+			/* Assume that we have a malformed packet. */
+			THROW(ReportedBoundsError);
+		}
+		count=seq->func(tree, next_tvb, 0, actx);
+
+#ifdef DEBUG_BER
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+printf("SEQUENCE dissect_ber_old_sequence(%s) subdissector ate %d bytes\n",name,count);
+}
+#endif
+		/* if it was optional and no bytes were eaten and it was */
+		/* supposed to (len<>0), just try again. */
+		if((len!=0)&&(count==0)&&(seq->flags&BER_FLAGS_OPTIONAL)){
+			seq++;
+			goto ber_old_sequence_try_again;
+		/* move the offset to the beginning of the next sequenced item */
+		}
+		offset = eoffset;
+		seq++;
+		if(!(seq->flags & BER_FLAGS_NOOWNTAG) ) {
+			/* if we stripped the tag and length we should also strip the EOC is ind_len 
+			 * Unless its a zero length field (len = 2)
+			 */
+			if((ind_field == 1)&&(len>2))
+			{
+				/* skip over EOC */
+				if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, offset, count, "SEQ FIELD EOC");
+				}
+			}
+		}
+	}
+
+	/* if we didnt end up at exactly offset, then we ate too many bytes */
+	if(offset != end_offset) {
+		tvb_ensure_bytes_exist(tvb, offset-2, 2);
+		cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: Sequence ate %d too many bytes", offset-end_offset);
+		proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+		expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: too many bytes in Sequence");
+	}
+	if(ind){
+		/*  need to eat this EOC
+		end_offset = tvb_length(tvb);*/
+		end_offset += 2;
+		if(show_internal_ber_fields){
+			proto_tree_add_text(tree, tvb, end_offset-2,2 , "SEQ EOC");
+		}
+	}
+	return end_offset;
+}
+
 /* This function dissects a BER set
  */
 int dissect_ber_set(gboolean implicit_tag,asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *set, gint hf_id, gint ett_id) {
 	gint8 class;
-	gboolean pc, ind = 0, ind_field;
+	gboolean pc, ind = 0, ind_field, imp_tag = FALSE;
 	gint32 tag;
 	guint32 len;
 	proto_tree *tree = parent_tree;
@@ -1679,7 +2000,10 @@ printf("SET dissect_ber_set(%s) calling subdissector\n",name);
 				/* Assume that we have a malformed packet. */
 				THROW(ReportedBoundsError);
 			}
-			count=cset->func(tree, next_tvb, 0, actx);
+			imp_tag = TRUE;
+			if ((cset->flags & BER_FLAGS_IMPLTAG))
+				imp_tag = TRUE;
+			count=cset->func(imp_tag, next_tvb, 0, actx, tree, *cset->p_id);
 
 			/* if we consumed some bytes, 
 			   or we knew the length was zero (during the first pass only) */
@@ -1755,7 +2079,256 @@ printf("SET dissect_ber_set(%s) calling subdissector\n",name);
 
 }
 
+int dissect_ber_old_set(gboolean implicit_tag,asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *set, gint hf_id, gint ett_id) {
+	gint8 class;
+	gboolean pc, ind = 0, ind_field;
+	gint32 tag;
+	guint32 len;
+	proto_tree *tree = parent_tree;
+	proto_item *item = NULL;
+	proto_item *cause;
+	int end_offset, s_offset;
+	gint length_remaining;
+	tvbuff_t *next_tvb;
+	const ber_old_sequence_t *cset = NULL;
+# define MAX_SET_ELEMENTS 32
+	guint32   mandatory_fields = 0;
+	guint8   set_idx;
+	gboolean first_pass;
+	s_offset = offset;
+#ifdef DEBUG_BER
+	{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(tvb,offset)>3){
+printf("SET dissect_old_ber_set(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
+}else{
+printf("SET dissect_old_ber_set(%s) entered\n",name);
+}
+}
+#endif
+
+	if(!implicit_tag){
+		/* first we must read the sequence header */
+		offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+		offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+		if(ind){
+		/*  Fixed the length is correctly returned from dissect ber_length
+		  end_offset = tvb_length(tvb);*/
+		  end_offset = offset + len -2;
+		} else {
+		  end_offset = offset + len;
+		}
+
+		/* sanity check: we only handle Constructed Universal Sets */
+		if ((class!=BER_CLASS_APP)&&(class!=BER_CLASS_PRI))
+		if ((!pc)
+		||(!implicit_tag&&((class!=BER_CLASS_UNI)
+							||(tag!=BER_UNI_TAG_SET)))) {
+		  tvb_ensure_bytes_exist(tvb, offset-2, 2);
+		  cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: SET expected but Class:%d(%s) PC:%d Tag:%d was found", class,val_to_str(class,ber_class_codes,"Unknown"), pc, tag);
+		  proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+		  expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: SET expected");
+		  return end_offset;
+		}
+	} else {
+		/* was implicit tag so just use the length of the tvb */
+		len=tvb_length_remaining(tvb,offset);
+		end_offset=offset+len;
+	}
+
+	/* create subtree */
+	if (hf_id >= 0) {
+		if(parent_tree){
+			item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, FALSE);
+			tree = proto_item_add_subtree(item, ett_id);
+		}
+	}
+
+	/* record the mandatory elements of the set so we can check we found everything at the end
+	   we can only record 32 elements for now ... */
+	for(set_idx = 0; (cset=&set[set_idx])->func && (set_idx < MAX_SET_ELEMENTS); set_idx++) {
+
+	  if(!(cset->flags & BER_FLAGS_OPTIONAL))
+	      mandatory_fields |= 1 << set_idx;
+
+	}
+
+	/* loop over all entries until we reach the end of the set */
+	while (offset < end_offset){
+		gint8 class;
+		gboolean pc;
+		gint32 tag;
+		guint32 len;
+		int hoffset, eoffset, count;
+
+		/*if(ind){  this sequence was of indefinite length, if this is implicit indefinite impossible maybe
+		  but tcap dissector uses this to eat the tag length then pass into here... EOC still on there...*/
+
+			if((tvb_get_guint8(tvb, offset)==0)&&(tvb_get_guint8(tvb, offset+1)==0)){
+				if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, s_offset, offset+2, "SEQ EOC");
+				}
+				return end_offset;
+			}
+			/* } */
+		hoffset = offset;
+		/* read header and len for next field */
+		offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
+		offset = get_ber_length(tree, tvb, offset, &len, &ind_field);
+		eoffset = offset + len;
+
+		/* Look through the Set to see if this class/id exists and
+		 * hasn't been seen before
+		 * Skip check completely if class==ANY
+		 * of if NOCHKTAG is set
+		 */
+
+
+		for(first_pass=TRUE, cset = set, set_idx = 0; cset->func || first_pass; cset++, set_idx++) {
+
+		  /* we reset for a second pass when we will look for choices */
+		  if(!cset->func) {
+		    first_pass = FALSE;
+
+		    cset=set; /* reset to the beginning */
+		    set_idx = 0;
+		  }
+
+		  if((first_pass && ((cset->class==class) && (cset->tag==tag))) ||
+		     (!first_pass && ((cset->class== BER_CLASS_ANY) && (cset->tag == -1))) ) /* choices */
+		  {
+
+			if (!(cset->flags & BER_FLAGS_NOOWNTAG) ) {
+		      /* dissect header and len for field */
+				hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+				hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+				length_remaining=tvb_length_remaining(tvb, hoffset);
+				if (length_remaining>eoffset-hoffset-(2*ind_field))
+					length_remaining=eoffset-hoffset-(2*ind_field);
+				next_tvb = tvb_new_subset(tvb, hoffset, length_remaining, eoffset-hoffset-(2*ind_field));
+		    }
+			else {
+				length_remaining=tvb_length_remaining(tvb, hoffset);
+				if (length_remaining>eoffset-hoffset)
+					length_remaining=eoffset-hoffset;
+				next_tvb = tvb_new_subset(tvb, hoffset, length_remaining, eoffset-hoffset);
+			}
+
+
+			/* call the dissector for this field */
+			/*if 	((eoffset-hoffset)>length_remaining) {*/
+				/* If the field is indefinite (i.e. we dont know the
+				 * length) of if the tvb is short, then just
+				 * give it all of the tvb and hope for the best.
+				 */
+				/*next_tvb = tvb_new_subset(tvb, hoffset, -1, -1);*/
+			/*} else {*/
+
+			/*}*/
+
+#ifdef DEBUG_BER
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(next_tvb,0)>3){
+printf("SET dissect_old_ber_set(%s) calling subdissector offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2));
+}else{
+printf("SET dissect_old_ber_set(%s) calling subdissector\n",name);
+}
+}
+#endif
+			if (next_tvb == NULL) {
+				/* Assume that we have a malformed packet. */
+				THROW(ReportedBoundsError);
+			}
+			count=cset->func(tree, next_tvb, 0, actx);
+
+			/* if we consumed some bytes, 
+			   or we knew the length was zero (during the first pass only) */
+			if(count || (first_pass && (len == 0))) {
+			    /* we found it! */
+			    if(set_idx < MAX_SET_ELEMENTS)
+				  mandatory_fields &= ~(1 << set_idx);
+
+				offset = eoffset;
+
+				if(!(cset->flags & BER_FLAGS_NOOWNTAG) ) {
+				  /* if we stripped the tag and length we should also strip the EOC is ind_len */
+				  if(ind_field == 1){
+					  /* skip over EOC */
+					  if(show_internal_ber_fields){
+						  proto_tree_add_text(tree, tvb, offset, count, "SET FIELD EOC");
+					  }
+				  }
+				}
+				break;
+			}
+		  }
+		}
+
+		if(!cset->func) {
+		  /* we didn't find a match */
+		  cause = proto_tree_add_text(tree, tvb, hoffset, len, "BER Error: Unknown field in SET class:%d(%s) tag:%d",class,val_to_str(class,ber_class_codes,"Unknown"),tag);
+		  proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+		  expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Unknown field in SET");
+		  offset = eoffset;
+		}
+	}
+
+	if(mandatory_fields) {
+
+	  /* OK - we didn't find some of the elements we expected */
 
+	  for(set_idx = 0;  (cset = &set[set_idx])->func && (set_idx < MAX_SET_ELEMENTS); set_idx++) {
+
+	    if(mandatory_fields & (1 << set_idx)) {
+
+	      /* here is something we should have seen - but didn't! */
+	      cause = proto_tree_add_text(tree, tvb, offset, len,
+				  "BER Error: Missing field in SET class:%d (%s) tag:%d expected",
+				  cset->class,val_to_str(cset->class,ber_class_codes,"Unknown"),
+				  cset->tag);
+	      proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+	      expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Missing field in SET");
+
+	    }
+
+	  }
+	}
+
+	/* if we didnt end up at exactly offset, then we ate too many bytes */
+	if (offset != end_offset) {
+		tvb_ensure_bytes_exist(tvb, offset-2, 2);
+		cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: SET ate %d too many bytes", offset-end_offset);
+		proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+		expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: too many bytes in SET");
+	}
+
+	if(ind){
+		/*  need to eat this EOC
+		  end_offset = tvb_length(tvb);*/
+		  end_offset += 2;
+		  if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, end_offset-2,2 , "SET EOC");
+		  }
+	}
+
+	return end_offset;
+
+}
 /* this function dissects a BER choice
  * If we did not find a matching choice,  just return offset unchanged
  * in case it was a CHOICE { } OPTIONAL
@@ -1768,7 +2341,7 @@ int
 dissect_ber_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id, gint *branch_taken)
 {
 	gint8 class;
-	gboolean pc, ind;
+	gboolean pc, ind, imp_tag = FALSE;
 	gint32 tag;
 	guint32 len;
 	const ber_choice_t *ch;
@@ -1918,7 +2491,10 @@ printf("CHOICE dissect_ber_choice(%s) calling subdissector len:%d\n",name,tvb_le
 				/* Assume that we have a malformed packet. */
 				THROW(ReportedBoundsError);
 			}
-			count=ch->func(tree, next_tvb, 0, actx);
+			imp_tag = FALSE;
+			if ((ch->flags & BER_FLAGS_IMPLTAG))
+				imp_tag = TRUE;
+			count=ch->func(imp_tag, next_tvb, 0, actx, tree, *ch->p_id);
 #ifdef DEBUG_BER_CHOICE
 {
 const char *name;
@@ -1987,6 +2563,229 @@ printf("CHOICE dissect_ber_choice(%s) trying again\n",name);
 	return start_offset;
 }
 
+int
+dissect_ber_old_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_choice_t *choice, gint hf_id, gint ett_id, gint *branch_taken)
+{
+	gint8 class;
+	gboolean pc, ind;
+	gint32 tag;
+	guint32 len;
+	const ber_old_choice_t *ch;
+	proto_tree *tree=parent_tree;
+	proto_item *item=NULL;
+	int end_offset, start_offset, count;
+	int hoffset = offset;
+	header_field_info	*hfinfo;
+	gint length, length_remaining;
+	tvbuff_t *next_tvb;
+	gboolean first_pass;
+
+#ifdef DEBUG_BER_CHOICE
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(tvb,offset)>3){
+printf("CHOICE dissect_ber_old_choice(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
+}else{
+printf("CHOICE dissect_ber_old_choice(%s) entered len:%d\n",name,tvb_length_remaining(tvb,offset));
+}
+}
+#endif
+	start_offset=offset;
+
+	/* read header and len for choice field */
+	offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
+	offset=get_ber_length(parent_tree, tvb, offset, &len, &ind);
+	  end_offset = offset + len ;
+
+	/* Some sanity checks.
+	 * The hf field passed to us MUST be an integer type
+	 */
+	if(hf_id >= 0){
+		hfinfo=proto_registrar_get_nth(hf_id);
+		switch(hfinfo->type) {
+			case FT_UINT8:
+			case FT_UINT16:
+			case FT_UINT24:
+			case FT_UINT32:
+				break;
+		default:
+			proto_tree_add_text(tree, tvb, offset, len,"dissect_ber_old_choice(): Was passed a HF field that was not integer type : %s",hfinfo->abbrev);
+			fprintf(stderr,"dissect_ber_old_choice(): frame:%u offset:%d Was passed a HF field that was not integer type : %s\n",actx->pinfo->fd->num,offset,hfinfo->abbrev);
+			return end_offset;
+		}
+	}
+
+
+
+	/* loop over all entries until we find the right choice or
+	   run out of entries */
+	ch = choice;
+	if(branch_taken){
+		*branch_taken=-1;
+	}
+	first_pass = TRUE;
+	while(ch->func || first_pass){
+		if(branch_taken){
+			(*branch_taken)++;
+		}
+	  /* we reset for a second pass when we will look for choices */
+	  if(!ch->func) {
+	    first_pass = FALSE;
+	    ch = choice; /* reset to the beginning */
+		if(branch_taken){
+			*branch_taken=-1;
+		}
+	  }
+
+choice_try_again:
+#ifdef DEBUG_BER_CHOICE
+printf("CHOICE testing potential subdissector class[%p]:%d:(expected)%d  tag:%d:(expected)%d flags:%d\n",ch,class,ch->class,tag,ch->tag,ch->flags);
+#endif
+		if( (first_pass && (((ch->class==class)&&(ch->tag==tag))
+		     ||  ((ch->class==class)&&(ch->tag==-1)&&(ch->flags&BER_FLAGS_NOOWNTAG)))) ||
+		    (!first_pass && (((ch->class == BER_CLASS_ANY) && (ch->tag == -1)))) /* we failed on the first pass so now try any choices */
+		){
+			if(!(ch->flags & BER_FLAGS_NOOWNTAG)){
+				/* dissect header and len for field */
+				hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, start_offset, NULL, NULL, NULL);
+				hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+				start_offset=hoffset;
+				if (ind)
+					{
+					length = len-2;
+					}
+				else
+					{
+					length = len;
+					}
+			}
+			else
+				length = end_offset- hoffset;
+			/* create subtree */
+			if(hf_id >= 0){
+				if(parent_tree){
+					item = proto_tree_add_uint(parent_tree, hf_id, tvb, hoffset, end_offset - hoffset, ch->value);
+					tree = proto_item_add_subtree(item, ett_id);
+				}
+			}
+			length_remaining=tvb_length_remaining(tvb, hoffset);
+			if(length_remaining>length)
+				length_remaining=length;
+
+#ifdef REMOVED
+			/* This is bogus and makes the OID_1.0.9506.1.1.cap file
+			 * in Steven J Schaeffer's email of 2005-09-12 fail to dissect
+			 * properly.  Maybe we should get rid of 'first_pass'
+			 * completely.
+			 * It was added as a qad workaround for some problem CMIP
+			 * traces anyway.
+			 * God, this file is a mess and it is my fault. /ronnie
+			 */
+			if(first_pass)
+			next_tvb=tvb_new_subset(tvb, hoffset, length_remaining, length);
+			else
+			  next_tvb = tvb; /* we didn't make selection on this class/tag so pass it on */
+#endif
+			next_tvb=tvb_new_subset(tvb, hoffset, length_remaining, length);
+
+
+#ifdef DEBUG_BER_CHOICE
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(next_tvb,0)>3){
+printf("CHOICE dissect_ber_old_choice(%s) calling subdissector start_offset:%d offset:%d len:%d %02x:%02x:%02x\n",name,start_offset,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2));
+}else{
+printf("CHOICE dissect_ber_old_choice(%s) calling subdissector len:%d\n",name,tvb_length(next_tvb));
+}
+}
+#endif
+			if (next_tvb == NULL) {
+				/* Assume that we have a malformed packet. */
+				THROW(ReportedBoundsError);
+			}
+			count=ch->func(tree, next_tvb, 0, actx);
+#ifdef DEBUG_BER_CHOICE
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+printf("CHOICE dissect_ber_old_choice(%s) subdissector ate %d bytes\n",name,count);
+}
+#endif
+			if((count==0)&&(((ch->class==class)&&(ch->tag==-1)&&(ch->flags&BER_FLAGS_NOOWNTAG)) || !first_pass)){
+				/* wrong one, break and try again */
+				ch++;
+#ifdef DEBUG_BER_CHOICE
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+printf("CHOICE dissect_ber_old_choice(%s) trying again\n",name);
+}
+#endif
+				goto choice_try_again;
+			}
+			if(!(ch->flags & BER_FLAGS_NOOWNTAG)){
+			 if(ind)
+			 	{
+			 	/* we are traversing a indfinite length choice where we did not pass the tag length */
+			 	/* we need to eat the EOC */
+			 	if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, start_offset, count+2, "CHOICE EOC");
+				}
+			 }
+			}
+			return end_offset;
+			break;
+		}
+		ch++;
+	}
+	if(branch_taken){
+		/* none of the branches were taken so set the param
+		   back to -1 */
+		*branch_taken=-1;
+	}
+
+#ifdef REMOVED
+	/*XXX here we should have another flag to the CHOICE to distinguish
+	 * between teh case when we know it is a mandatory   or if the CHOICE is optional == no arm matched */
+
+	/* oops no more entries and we still havent found
+	 * our guy :-(
+	 */
+	cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: This choice field was not found.");
+	proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+	expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: This choice field was not found");
+	return end_offset;
+#endif
+
+	return start_offset;
+}
+
 #if 0
 /* this function dissects a BER GeneralString
  */
@@ -2206,7 +3005,7 @@ int dissect_ber_object_identifier_str(gboolean implicit_tag, asn1_ctx_t *actx, p
 
 static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
 	gint8 class;
-	gboolean pc, ind = FALSE, ind_field;
+	gboolean pc, ind = FALSE, ind_field, imp_tag = FALSE;
 	gint32 tag;
 	guint32 len;
 
@@ -2368,6 +3167,202 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name);
 			/* dissect header and len for field */
 			hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
 			hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+			imp_tag = FALSE;
+		}
+		if((seq->flags == BER_FLAGS_IMPLTAG)&&(seq->class==BER_CLASS_CON)) {
+			/* Constructed sequence of with a tag */
+			/* dissect header and len for field */
+			hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+			/* Function has IMPLICIT TAG */
+			imp_tag = TRUE;
+		}
+
+		/* call the dissector for this field */
+		count=seq->func(imp_tag, tvb, 0, actx, tree, *seq->p_id)-hoffset;
+				/* hold on if we are implicit and the result is zero, i.e. the item in the sequence of
+				doesnt match the next item, thus this implicit sequence is over, return the number of bytes
+				we have eaten to allow the possible upper sequence continue... */
+		cnt++; /* rubbish*/
+		offset = eoffset;
+	}
+
+	/* if we didnt end up at exactly offset, then we ate too many bytes */
+	if(offset != end_offset) {
+		tvb_ensure_bytes_exist(tvb, offset-2, 2);
+		cause =proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: %s Of ate %d too many bytes",
+							(type==BER_UNI_TAG_SEQUENCE)?"Set":"Sequence", offset-end_offset);
+		proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+		expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error:too many byte in %s",(type==BER_UNI_TAG_SEQUENCE)?"Set":"Sequence");
+	}
+
+	return end_offset;
+}
+
+static int dissect_ber_old_sq_of(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id) {
+	gint8 class;
+	gboolean pc, ind = FALSE, ind_field;
+	gint32 tag;
+	guint32 len;
+
+	proto_tree *tree = parent_tree;
+	proto_item *item = NULL;
+	proto_item *cause;
+	int cnt, hoffset, end_offset;
+	header_field_info *hfi;
+
+#ifdef DEBUG_BER_SQ_OF
+{
+const char *name;
+header_field_info *hfinfo;
+if(hf_id>=0){
+hfinfo = proto_registrar_get_nth(hf_id);
+name=hfinfo->name;
+} else {
+name="unnamed";
+}
+if(tvb_length_remaining(tvb,offset)>3){
+printf("SQ OF dissect_ber_old_sq_of(%s) entered implicit_tag:%d offset:%d len:%d %02x:%02x:%02x\n",name,implicit_tag,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
+}else{
+printf("SQ OF dissect_ber_old_sq_of(%s) entered\n",name);
+}
+}
+#endif
+
+	if(!implicit_tag){
+		/* first we must read the sequence header */
+		offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+		offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+		if(ind){
+		  /* if the length is indefinite we dont really know (yet) where the
+		   * object ends so assume it spans the rest of the tvb for now.
+        	   */
+		  end_offset = offset + len;
+		} else {
+		  end_offset = offset + len;
+		}
+
+		/* sanity check: we only handle Constructed Universal Sequences */
+		if((class!=BER_CLASS_APP)&&(class!=BER_CLASS_PRI))
+		if(!pc
+			||(!implicit_tag&&((class!=BER_CLASS_UNI)
+							||(tag!=type)))) {
+			tvb_ensure_bytes_exist(tvb, offset-2, 2);
+			cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: %s Of expected but Class:%d PC:%d Tag:%d was unexpected",
+							(type==BER_UNI_TAG_SEQUENCE)?"Set":"Sequence", class, pc, tag);
+			proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+			expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: %s Of expected",(type==BER_UNI_TAG_SEQUENCE)?"Set":"Sequence");
+			return end_offset;
+		}
+	} else {
+		/* the tvb length should be correct now nope we could be comming from an implicit choice or sequence, thus we
+		read the items we match and return the length*/
+		len=tvb_length_remaining(tvb,offset);
+		end_offset = offset + len;
+	}
+
+	/* count number of items */
+	cnt = 0;
+	hoffset = offset;
+	/* only count the number of items IFF we have the full blob,
+	 * else this will just generate a [short frame] before we even start
+	 * dissecting a single item.
+	 */
+	/* XXX Do we really need to count them at all ?  ronnie */
+	if(tvb_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){
+		while (offset < end_offset){
+			guint32 len;
+                        gint s_offset;
+
+                        s_offset = offset;
+
+			if(ind){ /* this sequence of was of indefinite length, so check for EOC */
+				if((tvb_get_guint8(tvb, offset)==0)&&(tvb_get_guint8(tvb, offset+1)==0)){
+					break;
+				}
+			}
+
+			/* read header and len for next field */
+			offset = get_ber_identifier(tvb, offset, NULL, NULL, NULL);
+			offset = get_ber_length(tree, tvb, offset, &len, &ind);
+			/* best place to get real length of implicit sequence of or set of is here... */
+			/* adjust end_offset if we find somthing that doesnt match */
+			offset += len;
+			cnt++;
+			if (offset <= s_offset)
+				THROW(ReportedBoundsError);
+		}
+	}
+	offset = hoffset;
+
+	/* create subtree */
+	if(hf_id >= 0) {
+		hfi = proto_registrar_get_nth(hf_id);
+		if(parent_tree){
+			if(hfi->type == FT_NONE) {
+				item = proto_tree_add_item(parent_tree, hf_id, tvb, offset, len, FALSE);
+				proto_item_append_text(item, ":");
+			} else {
+				item = proto_tree_add_uint(parent_tree, hf_id, tvb, offset, len, cnt);
+				proto_item_append_text(item, (cnt==1)?" item":" items");
+			}
+			tree = proto_item_add_subtree(item, ett_id);
+		}
+	}
+
+	/* loop over all entries until we reach the end of the sequence */
+	while (offset < end_offset){
+		gint8 class;
+		gboolean pc;
+		gint32 tag;
+		guint32 len;
+		int eoffset;
+		int hoffset, count;
+		proto_item *cause;
+
+		hoffset = offset;
+	 	if(ind){ /*this sequence of was of indefinite length, so check for EOC */
+			if((tvb_get_guint8(tvb, offset)==0)&&(tvb_get_guint8(tvb, offset+1)==0)){
+				if(show_internal_ber_fields){
+					proto_tree_add_text(tree, tvb, hoffset, end_offset-hoffset, "SEQ OF EOC");
+				}
+				return offset+2;
+			}
+		}
+		/* read header and len for next field */
+		offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
+		offset = get_ber_length(tree, tvb, offset, &len, &ind_field);
+		eoffset = offset + len;
+                /* Make sure we move forward */
+		if (eoffset <= hoffset)
+			THROW(ReportedBoundsError);
+
+		if((class==BER_CLASS_UNI)&&(tag==BER_UNI_TAG_EOC)){
+			/* This is a zero length sequence of*/
+			hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
+			return eoffset;
+		}
+		/* verify that this one is the one we want */
+		/* ahup if we are implicit then we return to the uper layer how much we have used */
+		if(seq->class!=BER_CLASS_ANY){
+		  if((seq->class!=class)
+			||(seq->tag!=tag) ){
+			if(!(seq->flags & BER_FLAGS_NOTCHKTAG)) {
+				cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SQ OF");
+				proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
+				expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Wrong field in Sequence Of");
+				offset = eoffset;
+				continue;
+				/* wrong.... */
+			}
+		  }
+		}
+
+		if(!(seq->flags & BER_FLAGS_NOOWNTAG) && !(seq->flags & BER_FLAGS_IMPLTAG)) {
+			/* dissect header and len for field */
+			hoffset = dissect_ber_identifier(actx->pinfo, tree, tvb, hoffset, NULL, NULL, NULL);
+			hoffset = dissect_ber_length(actx->pinfo, tree, tvb, hoffset, NULL, NULL);
 		}
 		if((seq->flags == BER_FLAGS_IMPLTAG)&&(seq->class==BER_CLASS_CON)) {
 			/* Constructed sequence of with a tag */
@@ -2405,6 +3400,14 @@ int dissect_ber_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *pare
 	return dissect_ber_sq_of(implicit_tag, BER_UNI_TAG_SET, actx, parent_tree, tvb, offset, seq, hf_id, ett_id);
 }
 
+int dissect_ber_old_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id) {
+	return dissect_ber_old_sq_of(implicit_tag, BER_UNI_TAG_SEQUENCE, actx, parent_tree, tvb, offset, seq, hf_id, ett_id);
+}
+
+int dissect_ber_old_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id) {
+	return dissect_ber_old_sq_of(implicit_tag, BER_UNI_TAG_SET, actx, parent_tree, tvb, offset, seq, hf_id, ett_id);
+}
+
 int
 dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
 {
@@ -2638,10 +3641,10 @@ int dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree
  *		arbitrary						[2] IMPLICIT BIT STRING } }
  *	
  */
-
+/*
 static int dissect_single_ASN1_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
 
-	/* FIX ME */
+	/ FIX ME /
   return offset;
 }
 static int dissect_octet_aligned_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
@@ -2678,14 +3681,14 @@ static int dissect_data_value_descriptor(proto_tree *tree _U_, tvbuff_t *tvb _U_
 
 	return offset;
 }
-
+*/
 static const value_string ber_T_encoding_vals[] = {
   {   0, "single-ASN1-type" },
   {   1, "octet-aligned" },
   {   2, "arbitrary" },
   { 0, NULL }
 };
-
+/*
 static const ber_choice_t ber_T_encoding_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
@@ -2705,10 +3708,10 @@ static const ber_sequence_t EXTERNAL_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
-  { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_encoding },
+  { BER_CLASS_ANY/choice/, -1/choice/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_encoding },
   { 0, 0, 0, NULL }
 };
-
+*/
 static int
 dissect_ber_external(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_ , proto_tree *tree, int hf_index _U_)
 {
@@ -2722,10 +3725,11 @@ dissect_ber_external(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_
 		offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
 		offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
 	}
+	/*
 
 	offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
                                    EXTERNAL_sequence, hf_index, ett_ber_EXTERNAL);
-
+*/
 	return offset;
 
 }
diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h
index 0b2fd091f7..4f1f4aafd6 100644
--- a/epan/dissectors/packet-ber.h
+++ b/epan/dissectors/packet-ber.h
@@ -38,8 +38,12 @@ if (check_col(pinfo->cinfo, COL_INFO)){ \
 } \
 tvb_get_guint8(tvb, 9999);
 
-typedef int (*ber_callback)(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
+typedef int (*ber_callback)(gboolean imp_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
 typedef int (*ber_type_fn)(gboolean, tvbuff_t*, int, asn1_ctx_t *actx, proto_tree*, int);
+/* To be removed when the transition to the "New" type is complete */
+
+typedef int (*ber_old_callback)(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
+typedef int (*ber_old_type_fn)(gboolean, tvbuff_t*, int, asn1_ctx_t *actx, proto_tree*, int);
 
 
 #define BER_CLASS_UNI	0
@@ -105,6 +109,7 @@ extern int dissect_ber_tagged_type(gboolean implicit_tag, asn1_ctx_t *actx, prot
 
 extern int dissect_ber_octet_string(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
 extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
+extern int dissect_ber_old_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_old_callback func);
 
 extern int dissect_ber_integer64(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value);
 
@@ -122,33 +127,55 @@ extern int dissect_ber_external_type(gboolean implicit_tag, proto_tree *parent_t
 #define BER_FLAGS_NOOWNTAG	0x00000004
 #define BER_FLAGS_NOTCHKTAG	0x00000008
 typedef struct _ber_sequence_t {
+	const int *p_id;
 	gint8	class;
 	gint32	tag;
 	guint32	flags;
 	ber_callback	func;
 } ber_sequence_t;
-
-/* this function dissects a BER sequence 
+/* To be removed when the transition to the "New" type is complete */
+typedef struct _ber_old_sequence_t {
+	gint8	class;
+	gint32	tag;
+	guint32	flags;
+	ber_old_callback	func;
+} ber_old_sequence_t;
+/* 
+ * This function dissects a BER sequence 
  */
 extern int dissect_ber_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
 extern int dissect_ber_set(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
 
+/* To be removed when the transition to the "New" type is complete */
+extern int dissect_ber_old_sequence(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
+extern int dissect_ber_old_set(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
+
 
 typedef struct _ber_choice_t {
 	guint32	value;
+	const int *p_id;
 	gint8	class;
 	gint32	tag;
 	guint32	flags;
 	ber_callback	func;
 } ber_choice_t;
 
-
-/* this function dissects a BER choice 
+typedef struct _ber_old_choice_t {
+	guint32	value;
+	gint8	class;
+	gint32	tag;
+	guint32	flags;
+	ber_old_callback	func;
+} ber_old_choice_t;
+/* 
+ * This function dissects a BER choice 
  */
 extern int dissect_ber_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken);
+/* To be removed when the transition to the "New" type is complete */
+extern int dissect_ber_old_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken);
 
-
-/* this function dissects a BER strings
+/* 
+ * This function dissects a BER strings
  */
 extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
 extern int dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len);
@@ -165,6 +192,10 @@ extern int dissect_ber_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, prot
 
 extern int dissect_ber_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
 
+/* To be removed when the transition to the "New" type is complete */
+extern int dissect_ber_old_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
+extern int dissect_ber_old_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_old_sequence_t *seq, gint hf_id, gint ett_id);
+
 
 extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
 
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index a569e74041..4cbb091553 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -1132,7 +1132,7 @@ static const value_string camel_OPERATION_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OPERATION_choice[] = {
+static const ber_old_choice_t OPERATION_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -1140,9 +1140,9 @@ static const ber_choice_t OPERATION_choice[] = {
 
 static int
 dissect_camel_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OPERATION_choice, hf_index, ett_camel_OPERATION,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OPERATION_choice, hf_index, ett_camel_OPERATION,
+                                     NULL);
 
   return offset;
 }
@@ -1166,7 +1166,7 @@ static int dissect_invokeparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@@ -1176,8 +1176,8 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_camel_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_camel_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_camel_Invoke);
 
   return offset;
 }
@@ -1201,7 +1201,7 @@ static int dissect_returnparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_resultretres_sequence[] = {
+static const ber_old_sequence_t T_resultretres_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_returnparameter },
   { 0, 0, 0, NULL }
@@ -1209,8 +1209,8 @@ static const ber_sequence_t T_resultretres_sequence[] = {
 
 static int
 dissect_camel_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_resultretres_sequence, hf_index, ett_camel_T_resultretres);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_resultretres_sequence, hf_index, ett_camel_T_resultretres);
 
   return offset;
 }
@@ -1219,7 +1219,7 @@ static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
   { 0, 0, 0, NULL }
@@ -1227,8 +1227,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_camel_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_camel_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_camel_ReturnResult);
 
   return offset;
 }
@@ -1286,7 +1286,7 @@ static const value_string camel_ERROR_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ERROR_choice[] = {
+static const ber_old_choice_t ERROR_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localErrorValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalErrorValue },
   { 0, 0, 0, 0, NULL }
@@ -1294,9 +1294,9 @@ static const ber_choice_t ERROR_choice[] = {
 
 static int
 dissect_camel_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ERROR_choice, hf_index, ett_camel_ERROR,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ERROR_choice, hf_index, ett_camel_ERROR,
+                                     NULL);
 
   return offset;
 }
@@ -1320,7 +1320,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -1329,8 +1329,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_camel_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_camel_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_camel_ReturnError);
 
   return offset;
 }
@@ -1459,7 +1459,7 @@ static const value_string camel_T_invokeIDRej_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_invokeIDRej_choice[] = {
+static const ber_old_choice_t T_invokeIDRej_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
   { 0, 0, 0, 0, NULL }
@@ -1467,9 +1467,9 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
 
 static int
 dissect_camel_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_invokeIDRej_choice, hf_index, ett_camel_T_invokeIDRej,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_invokeIDRej_choice, hf_index, ett_camel_T_invokeIDRej,
+                                     NULL);
 
   return offset;
 }
@@ -1573,7 +1573,7 @@ static const value_string camel_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -1583,9 +1583,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_camel_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_camel_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_camel_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -1594,7 +1594,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -1602,8 +1602,8 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_camel_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_camel_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_camel_Reject);
 
   return offset;
 }
@@ -1620,7 +1620,7 @@ static const value_string camel_Component_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Component_choice[] = {
+static const ber_old_choice_t Component_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -1630,9 +1630,9 @@ static const ber_choice_t Component_choice[] = {
 
 static int
 dissect_camel_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Component_choice, hf_index, ett_camel_Component,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Component_choice, hf_index, ett_camel_Component,
+                                     NULL);
 
   return offset;
 }
@@ -1744,7 +1744,7 @@ static const value_string camel_Code_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Code_choice[] = {
+static const ber_old_choice_t Code_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global },
   { 0, 0, 0, 0, NULL }
@@ -1752,9 +1752,9 @@ static const ber_choice_t Code_choice[] = {
 
 static int
 dissect_camel_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Code_choice, hf_index, ett_camel_Code,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Code_choice, hf_index, ett_camel_Code,
+                                     NULL);
 
   return offset;
 }
@@ -1796,16 +1796,16 @@ static const value_string camel_SupportedExtensionsExtensionType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SupportedExtensionsExtensionType_choice[] = {
+static const ber_old_choice_t SupportedExtensionsExtensionType_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_firstExtensionExtensionType },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_SupportedExtensionsExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SupportedExtensionsExtensionType_choice, hf_index, ett_camel_SupportedExtensionsExtensionType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SupportedExtensionsExtensionType_choice, hf_index, ett_camel_SupportedExtensionsExtensionType,
+                                     NULL);
 
   return offset;
 }
@@ -1814,7 +1814,7 @@ static int dissect_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ExtensionField_sequence[] = {
+static const ber_old_sequence_t ExtensionField_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_criticality },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_value_impl },
@@ -1823,8 +1823,8 @@ static const ber_sequence_t ExtensionField_sequence[] = {
 
 static int
 dissect_camel_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensionField_sequence, hf_index, ett_camel_ExtensionField);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensionField_sequence, hf_index, ett_camel_ExtensionField);
 
   return offset;
 }
@@ -1833,14 +1833,14 @@ static int dissect_ExtensionsArray_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ExtensionsArray_sequence_of[1] = {
+static const ber_old_sequence_t ExtensionsArray_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ExtensionsArray_item },
 };
 
 static int
 dissect_camel_ExtensionsArray(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ExtensionsArray_sequence_of, hf_index, ett_camel_ExtensionsArray);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ExtensionsArray_sequence_of, hf_index, ett_camel_ExtensionsArray);
 
   return offset;
 }
@@ -1849,7 +1849,7 @@ static int dissect_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_actimeDurationCharging_sequence[] = {
+static const ber_old_sequence_t T_actimeDurationCharging_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_maxCallPeriodDuration_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseIfdurationExceeded_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tariffSwitchInterval_impl },
@@ -1860,8 +1860,8 @@ static const ber_sequence_t T_actimeDurationCharging_sequence[] = {
 
 static int
 dissect_camel_T_actimeDurationCharging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_actimeDurationCharging_sequence, hf_index, ett_camel_T_actimeDurationCharging);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_actimeDurationCharging_sequence, hf_index, ett_camel_T_actimeDurationCharging);
 
   return offset;
 }
@@ -1875,16 +1875,16 @@ static const value_string camel_AChBillingChargingCharacteristics_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AChBillingChargingCharacteristics_choice[] = {
+static const ber_old_choice_t AChBillingChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actimeDurationCharging_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_AChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AChBillingChargingCharacteristics_choice, hf_index, ett_camel_AChBillingChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AChBillingChargingCharacteristics_choice, hf_index, ett_camel_AChBillingChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
@@ -1915,7 +1915,7 @@ static const value_string camel_LegID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LegID_choice[] = {
+static const ber_old_choice_t LegID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl },
   { 0, 0, 0, 0, NULL }
@@ -1923,9 +1923,9 @@ static const ber_choice_t LegID_choice[] = {
 
 static int
 dissect_camel_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LegID_choice, hf_index, ett_camel_LegID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LegID_choice, hf_index, ett_camel_LegID,
+                                     NULL);
 
   return offset;
 }
@@ -1977,7 +1977,7 @@ static const value_string camel_AChChargingAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AChChargingAddress_choice[] = {
+static const ber_old_choice_t AChChargingAddress_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_legID_impl },
   {  50, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_srfConnection_impl },
   { 0, 0, 0, 0, NULL }
@@ -1985,9 +1985,9 @@ static const ber_choice_t AChChargingAddress_choice[] = {
 
 static int
 dissect_camel_AChChargingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AChChargingAddress_choice, hf_index, ett_camel_AChChargingAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AChChargingAddress_choice, hf_index, ett_camel_AChChargingAddress,
+                                     NULL);
 
   return offset;
 }
@@ -2080,7 +2080,7 @@ static int dissect_e7_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t CAI_Gsm0224_sequence[] = {
+static const ber_old_sequence_t CAI_Gsm0224_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e2_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e3_impl },
@@ -2093,8 +2093,8 @@ static const ber_sequence_t CAI_Gsm0224_sequence[] = {
 
 static int
 dissect_camel_CAI_Gsm0224(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAI_Gsm0224_sequence, hf_index, ett_camel_CAI_Gsm0224);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAI_Gsm0224_sequence, hf_index, ett_camel_CAI_Gsm0224);
 
   return offset;
 }
@@ -2106,7 +2106,7 @@ static int dissect_cAI_GSM0224_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AOCSubsequent_sequence[] = {
+static const ber_old_sequence_t AOCSubsequent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cAI_GSM0224_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -2114,8 +2114,8 @@ static const ber_sequence_t AOCSubsequent_sequence[] = {
 
 static int
 dissect_camel_AOCSubsequent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AOCSubsequent_sequence, hf_index, ett_camel_AOCSubsequent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AOCSubsequent_sequence, hf_index, ett_camel_AOCSubsequent);
 
   return offset;
 }
@@ -2127,7 +2127,7 @@ static int dissect_aOCAfterAnswer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AOCBeforeAnswer_sequence[] = {
+static const ber_old_sequence_t AOCBeforeAnswer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aOCInitial_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aOCSubsequent_impl },
   { 0, 0, 0, NULL }
@@ -2135,8 +2135,8 @@ static const ber_sequence_t AOCBeforeAnswer_sequence[] = {
 
 static int
 dissect_camel_AOCBeforeAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AOCBeforeAnswer_sequence, hf_index, ett_camel_AOCBeforeAnswer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AOCBeforeAnswer_sequence, hf_index, ett_camel_AOCBeforeAnswer);
 
   return offset;
 }
@@ -2145,7 +2145,7 @@ static int dissect_aOCBeforeAnswer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AOCGprs_sequence[] = {
+static const ber_old_sequence_t AOCGprs_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aOCInitial_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aOCSubsequent_impl },
   { 0, 0, 0, NULL }
@@ -2153,8 +2153,8 @@ static const ber_sequence_t AOCGprs_sequence[] = {
 
 static int
 dissect_camel_AOCGprs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AOCGprs_sequence, hf_index, ett_camel_AOCGprs);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AOCGprs_sequence, hf_index, ett_camel_AOCGprs);
 
   return offset;
 }
@@ -2255,7 +2255,7 @@ static int dissect_toneInterval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Burst_sequence[] = {
+static const ber_old_sequence_t Burst_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfBursts_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_burstInterval_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfTonesInBurst_impl },
@@ -2266,8 +2266,8 @@ static const ber_sequence_t Burst_sequence[] = {
 
 static int
 dissect_camel_Burst(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Burst_sequence, hf_index, ett_camel_Burst);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Burst_sequence, hf_index, ett_camel_Burst);
 
   return offset;
 }
@@ -2276,7 +2276,7 @@ static int dissect_bursts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t BurstList_sequence[] = {
+static const ber_old_sequence_t BurstList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_warningPeriod_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bursts_impl },
   { 0, 0, 0, NULL }
@@ -2284,8 +2284,8 @@ static const ber_sequence_t BurstList_sequence[] = {
 
 static int
 dissect_camel_BurstList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BurstList_sequence, hf_index, ett_camel_BurstList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BurstList_sequence, hf_index, ett_camel_BurstList);
 
   return offset;
 }
@@ -2300,7 +2300,7 @@ static const value_string camel_AudibleIndicator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AudibleIndicator_choice[] = {
+static const ber_old_choice_t AudibleIndicator_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_istone },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_burstList_impl },
   { 0, 0, 0, 0, NULL }
@@ -2308,9 +2308,9 @@ static const ber_choice_t AudibleIndicator_choice[] = {
 
 static int
 dissect_camel_AudibleIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AudibleIndicator_choice, hf_index, ett_camel_AudibleIndicator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AudibleIndicator_choice, hf_index, ett_camel_AudibleIndicator,
+                                     NULL);
 
   return offset;
 }
@@ -2350,7 +2350,7 @@ static int dissect_ectTreatmentIndicator_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t BackwardServiceInteractionInd_sequence[] = {
+static const ber_old_sequence_t BackwardServiceInteractionInd_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_conferenceTreatmentIndicator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callCompletionTreatmentIndicator_impl },
   { 0, 0, 0, NULL }
@@ -2358,8 +2358,8 @@ static const ber_sequence_t BackwardServiceInteractionInd_sequence[] = {
 
 static int
 dissect_camel_BackwardServiceInteractionInd(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BackwardServiceInteractionInd_sequence, hf_index, ett_camel_BackwardServiceInteractionInd);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BackwardServiceInteractionInd_sequence, hf_index, ett_camel_BackwardServiceInteractionInd);
 
   return offset;
 }
@@ -2381,15 +2381,15 @@ static int dissect_serviceKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t GapOnService_sequence[] = {
+static const ber_old_sequence_t GapOnService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_GapOnService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GapOnService_sequence, hf_index, ett_camel_GapOnService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GapOnService_sequence, hf_index, ett_camel_GapOnService);
 
   return offset;
 }
@@ -2398,7 +2398,7 @@ static int dissect_gapOnService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_calledAddressAndService_sequence[] = {
+static const ber_old_sequence_t T_calledAddressAndService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { 0, 0, 0, NULL }
@@ -2406,8 +2406,8 @@ static const ber_sequence_t T_calledAddressAndService_sequence[] = {
 
 static int
 dissect_camel_T_calledAddressAndService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_calledAddressAndService_sequence, hf_index, ett_camel_T_calledAddressAndService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_calledAddressAndService_sequence, hf_index, ett_camel_T_calledAddressAndService);
 
   return offset;
 }
@@ -2416,7 +2416,7 @@ static int dissect_calledAddressAndService_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_callingAddressAndService_sequence[] = {
+static const ber_old_sequence_t T_callingAddressAndService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callingAddressValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { 0, 0, 0, NULL }
@@ -2424,8 +2424,8 @@ static const ber_sequence_t T_callingAddressAndService_sequence[] = {
 
 static int
 dissect_camel_T_callingAddressAndService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_callingAddressAndService_sequence, hf_index, ett_camel_T_callingAddressAndService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_callingAddressAndService_sequence, hf_index, ett_camel_T_callingAddressAndService);
 
   return offset;
 }
@@ -2442,7 +2442,7 @@ static const value_string camel_BasicGapCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BasicGapCriteria_choice[] = {
+static const ber_old_choice_t BasicGapCriteria_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gapOnService_impl },
   {  29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_calledAddressAndService_impl },
@@ -2452,9 +2452,9 @@ static const ber_choice_t BasicGapCriteria_choice[] = {
 
 static int
 dissect_camel_BasicGapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BasicGapCriteria_choice, hf_index, ett_camel_BasicGapCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BasicGapCriteria_choice, hf_index, ett_camel_BasicGapCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -2588,7 +2588,7 @@ static int dissect_numberOfRepetitions_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t MidCallControlInfo_sequence[] = {
+static const ber_old_sequence_t MidCallControlInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimumNumberOfDigits_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximumNumberOfDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endOfReplyDigit_impl },
@@ -2600,8 +2600,8 @@ static const ber_sequence_t MidCallControlInfo_sequence[] = {
 
 static int
 dissect_camel_MidCallControlInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MidCallControlInfo_sequence, hf_index, ett_camel_MidCallControlInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MidCallControlInfo_sequence, hf_index, ett_camel_MidCallControlInfo);
 
   return offset;
 }
@@ -2610,14 +2610,14 @@ static int dissect_midCallControlInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ChangeOfLocationAlt_sequence[] = {
+static const ber_old_sequence_t ChangeOfLocationAlt_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_ChangeOfLocationAlt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChangeOfLocationAlt_sequence, hf_index, ett_camel_ChangeOfLocationAlt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChangeOfLocationAlt_sequence, hf_index, ett_camel_ChangeOfLocationAlt);
 
   return offset;
 }
@@ -2637,7 +2637,7 @@ static const value_string camel_ChangeOfLocation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChangeOfLocation_choice[] = {
+static const ber_old_choice_t ChangeOfLocation_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cellGlobalId_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceAreaId_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_locationAreaId_impl },
@@ -2650,9 +2650,9 @@ static const ber_choice_t ChangeOfLocation_choice[] = {
 
 static int
 dissect_camel_ChangeOfLocation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChangeOfLocation_choice, hf_index, ett_camel_ChangeOfLocation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChangeOfLocation_choice, hf_index, ett_camel_ChangeOfLocation,
+                                     NULL);
 
   return offset;
 }
@@ -2661,14 +2661,14 @@ static int dissect_ChangeOfPositionControlInfo_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t ChangeOfPositionControlInfo_sequence_of[1] = {
+static const ber_old_sequence_t ChangeOfPositionControlInfo_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ChangeOfPositionControlInfo_item },
 };
 
 static int
 dissect_camel_ChangeOfPositionControlInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ChangeOfPositionControlInfo_sequence_of, hf_index, ett_camel_ChangeOfPositionControlInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ChangeOfPositionControlInfo_sequence_of, hf_index, ett_camel_ChangeOfPositionControlInfo);
 
   return offset;
 }
@@ -2690,7 +2690,7 @@ static int dissect_numberOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DpSpecificCriteriaAlt_sequence[] = {
+static const ber_old_sequence_t DpSpecificCriteriaAlt_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_changeOfPositionControlInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_interDigitTimeout_impl },
@@ -2699,8 +2699,8 @@ static const ber_sequence_t DpSpecificCriteriaAlt_sequence[] = {
 
 static int
 dissect_camel_DpSpecificCriteriaAlt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DpSpecificCriteriaAlt_sequence, hf_index, ett_camel_DpSpecificCriteriaAlt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DpSpecificCriteriaAlt_sequence, hf_index, ett_camel_DpSpecificCriteriaAlt);
 
   return offset;
 }
@@ -2716,7 +2716,7 @@ static const value_string camel_DpSpecificCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DpSpecificCriteria_choice[] = {
+static const ber_old_choice_t DpSpecificCriteria_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_applicationTimer_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_midCallControlInfo_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dpSpecificCriteriaAlt_impl },
@@ -2725,9 +2725,9 @@ static const ber_choice_t DpSpecificCriteria_choice[] = {
 
 static int
 dissect_camel_DpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DpSpecificCriteria_choice, hf_index, ett_camel_DpSpecificCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DpSpecificCriteria_choice, hf_index, ett_camel_DpSpecificCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -2736,7 +2736,7 @@ static int dissect_dpSpecificCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t BCSMEvent_sequence[] = {
+static const ber_old_sequence_t BCSMEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID6_impl },
@@ -2747,8 +2747,8 @@ static const ber_sequence_t BCSMEvent_sequence[] = {
 
 static int
 dissect_camel_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BCSMEvent_sequence, hf_index, ett_camel_BCSMEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BCSMEvent_sequence, hf_index, ett_camel_BCSMEvent);
 
   return offset;
 }
@@ -2795,7 +2795,7 @@ static int dissect_releaseCauseValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t BCSM_Failure_sequence[] = {
+static const ber_old_sequence_t BCSM_Failure_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cause_impl },
   { 0, 0, 0, NULL }
@@ -2803,8 +2803,8 @@ static const ber_sequence_t BCSM_Failure_sequence[] = {
 
 static int
 dissect_camel_BCSM_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BCSM_Failure_sequence, hf_index, ett_camel_BCSM_Failure);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BCSM_Failure_sequence, hf_index, ett_camel_BCSM_Failure);
 
   return offset;
 }
@@ -2842,16 +2842,16 @@ static const value_string camel_BearerCapability_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BearerCapability_choice[] = {
+static const ber_old_choice_t BearerCapability_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bearerCap_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BearerCapability_choice, hf_index, ett_camel_BearerCapability,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BearerCapability_choice, hf_index, ett_camel_BearerCapability,
+                                     NULL);
 
   return offset;
 }
@@ -2997,16 +2997,16 @@ static const value_string camel_ReceivingSideID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReceivingSideID_choice[] = {
+static const ber_old_choice_t ReceivingSideID_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_ReceivingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReceivingSideID_choice, hf_index, ett_camel_ReceivingSideID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReceivingSideID_choice, hf_index, ett_camel_ReceivingSideID,
+                                     NULL);
 
   return offset;
 }
@@ -3047,7 +3047,7 @@ static int dissect_timeSinceTariffSwitch_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t TimeIfTariffSwitch_sequence[] = {
+static const ber_old_sequence_t TimeIfTariffSwitch_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeSinceTariffSwitch_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tttariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -3055,8 +3055,8 @@ static const ber_sequence_t TimeIfTariffSwitch_sequence[] = {
 
 static int
 dissect_camel_TimeIfTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeIfTariffSwitch_sequence, hf_index, ett_camel_TimeIfTariffSwitch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeIfTariffSwitch_sequence, hf_index, ett_camel_TimeIfTariffSwitch);
 
   return offset;
 }
@@ -3071,7 +3071,7 @@ static const value_string camel_TimeInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TimeInformation_choice[] = {
+static const ber_old_choice_t TimeInformation_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeIfNoTariffSwitch_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeIfTariffSwitch_impl },
   { 0, 0, 0, 0, NULL }
@@ -3079,9 +3079,9 @@ static const ber_choice_t TimeInformation_choice[] = {
 
 static int
 dissect_camel_TimeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TimeInformation_choice, hf_index, ett_camel_TimeInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TimeInformation_choice, hf_index, ett_camel_TimeInformation,
+                                     NULL);
 
   return offset;
 }
@@ -3090,7 +3090,7 @@ static int dissect_timeInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t TimeDurationChargingResult_sequence[] = {
+static const ber_old_sequence_t TimeDurationChargingResult_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_timeInformation_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_legActive_impl },
@@ -3102,8 +3102,8 @@ static const ber_sequence_t TimeDurationChargingResult_sequence[] = {
 
 static int
 dissect_camel_TimeDurationChargingResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeDurationChargingResult_sequence, hf_index, ett_camel_TimeDurationChargingResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeDurationChargingResult_sequence, hf_index, ett_camel_TimeDurationChargingResult);
 
   return offset;
 }
@@ -3118,7 +3118,7 @@ static const value_string camel_CAMEL_CallResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CAMEL_CallResult_choice[] = {
+static const ber_old_choice_t CAMEL_CallResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeDurationChargingResult_impl },
   {  99, BER_CLASS_CON, 99, BER_FLAGS_IMPLTAG, dissect_void_impl },
   { 0, 0, 0, 0, NULL }
@@ -3126,9 +3126,9 @@ static const ber_choice_t CAMEL_CallResult_choice[] = {
 
 static int
 dissect_camel_CAMEL_CallResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CAMEL_CallResult_choice, hf_index, ett_camel_CAMEL_CallResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CAMEL_CallResult_choice, hf_index, ett_camel_CAMEL_CallResult,
+                                     NULL);
 
   return offset;
 }
@@ -3146,7 +3146,7 @@ dissect_camel_CallResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t CallSegmentFailure_sequence[] = {
+static const ber_old_sequence_t CallSegmentFailure_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callSegmentID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cause_impl },
   { 0, 0, 0, NULL }
@@ -3154,8 +3154,8 @@ static const ber_sequence_t CallSegmentFailure_sequence[] = {
 
 static int
 dissect_camel_CallSegmentFailure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallSegmentFailure_sequence, hf_index, ett_camel_CallSegmentFailure);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallSegmentFailure_sequence, hf_index, ett_camel_CallSegmentFailure);
 
   return offset;
 }
@@ -3179,7 +3179,7 @@ static int dissect_operation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CallSegmentToCancel_sequence[] = {
+static const ber_old_sequence_t CallSegmentToCancel_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callInvokeID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callSegmentID_impl },
   { 0, 0, 0, NULL }
@@ -3187,8 +3187,8 @@ static const ber_sequence_t CallSegmentToCancel_sequence[] = {
 
 static int
 dissect_camel_CallSegmentToCancel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallSegmentToCancel_sequence, hf_index, ett_camel_CallSegmentToCancel);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallSegmentToCancel_sequence, hf_index, ett_camel_CallSegmentToCancel);
 
   return offset;
 }
@@ -3197,7 +3197,7 @@ static int dissect_callSegmentToCancel_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_timeDurationCharging_sequence[] = {
+static const ber_old_sequence_t T_timeDurationCharging_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_maxCallPeriodDuration_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseIfdurationExceeded_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tariffSwitchInterval_impl },
@@ -3208,8 +3208,8 @@ static const ber_sequence_t T_timeDurationCharging_sequence[] = {
 
 static int
 dissect_camel_T_timeDurationCharging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_timeDurationCharging_sequence, hf_index, ett_camel_T_timeDurationCharging);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_timeDurationCharging_sequence, hf_index, ett_camel_T_timeDurationCharging);
 
   return offset;
 }
@@ -3223,16 +3223,16 @@ static const value_string camel_CAMEL_AChBillingChargingCharacteristics_vals[] =
   { 0, NULL }
 };
 
-static const ber_choice_t CAMEL_AChBillingChargingCharacteristics_choice[] = {
+static const ber_old_choice_t CAMEL_AChBillingChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeDurationCharging_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CAMEL_AChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CAMEL_AChBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_AChBillingChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CAMEL_AChBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_AChBillingChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
@@ -3256,16 +3256,16 @@ static const value_string camel_SendingSideID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SendingSideID_choice[] = {
+static const ber_old_choice_t SendingSideID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_SendingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SendingSideID_choice, hf_index, ett_camel_SendingSideID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SendingSideID_choice, hf_index, ett_camel_SendingSideID,
+                                     NULL);
 
   return offset;
 }
@@ -3283,7 +3283,7 @@ static int dissect_partyToCharge2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_fCIBCCCAMELsequence1_sequence[] = {
+static const ber_old_sequence_t T_fCIBCCCAMELsequence1_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_freeFormatData_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge4_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_appendFreeFormatData_impl },
@@ -3292,8 +3292,8 @@ static const ber_sequence_t T_fCIBCCCAMELsequence1_sequence[] = {
 
 static int
 dissect_camel_T_fCIBCCCAMELsequence1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_fCIBCCCAMELsequence1_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence1);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_fCIBCCCAMELsequence1_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence1);
 
   return offset;
 }
@@ -3307,16 +3307,16 @@ static const value_string camel_CAMEL_FCIBillingChargingCharacteristics_vals[] =
   { 0, NULL }
 };
 
-static const ber_choice_t CAMEL_FCIBillingChargingCharacteristics_choice[] = {
+static const ber_old_choice_t CAMEL_FCIBillingChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fCIBCCCAMELsequence1_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CAMEL_FCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CAMEL_FCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_FCIBillingChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CAMEL_FCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_FCIBillingChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
@@ -3338,7 +3338,7 @@ static int dissect_pdpID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_fCIBCCCAMELsequence2_sequence[] = {
+static const ber_old_sequence_t T_fCIBCCCAMELsequence2_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_freeFormatData_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_appendFreeFormatData_impl },
@@ -3347,8 +3347,8 @@ static const ber_sequence_t T_fCIBCCCAMELsequence2_sequence[] = {
 
 static int
 dissect_camel_T_fCIBCCCAMELsequence2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_fCIBCCCAMELsequence2_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_fCIBCCCAMELsequence2_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence2);
 
   return offset;
 }
@@ -3357,21 +3357,21 @@ static int dissect_fCIBCCCAMELsequence2_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CAMEL_FCIGPRSBillingChargingCharacteristics_sequence[] = {
+static const ber_old_sequence_t CAMEL_FCIGPRSBillingChargingCharacteristics_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fCIBCCCAMELsequence2_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CAMEL_FCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAMEL_FCIGPRSBillingChargingCharacteristics_sequence, hf_index, ett_camel_CAMEL_FCIGPRSBillingChargingCharacteristics);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAMEL_FCIGPRSBillingChargingCharacteristics_sequence, hf_index, ett_camel_CAMEL_FCIGPRSBillingChargingCharacteristics);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_fCIBCCCAMELsequence3_sequence[] = {
+static const ber_old_sequence_t T_fCIBCCCAMELsequence3_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_freeFormatData_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_appendFreeFormatData_impl },
   { 0, 0, 0, NULL }
@@ -3379,8 +3379,8 @@ static const ber_sequence_t T_fCIBCCCAMELsequence3_sequence[] = {
 
 static int
 dissect_camel_T_fCIBCCCAMELsequence3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_fCIBCCCAMELsequence3_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_fCIBCCCAMELsequence3_sequence, hf_index, ett_camel_T_fCIBCCCAMELsequence3);
 
   return offset;
 }
@@ -3394,29 +3394,29 @@ static const value_string camel_CAMEL_FCISMSBillingChargingCharacteristics_vals[
   { 0, NULL }
 };
 
-static const ber_choice_t CAMEL_FCISMSBillingChargingCharacteristics_choice[] = {
+static const ber_old_choice_t CAMEL_FCISMSBillingChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fCIBCCCAMELsequence3_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CAMEL_FCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CAMEL_FCISMSBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_FCISMSBillingChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CAMEL_FCISMSBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_FCISMSBillingChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CAMEL_SCIBillingChargingCharacteristicsAlt_sequence[] = {
+static const ber_old_sequence_t CAMEL_SCIBillingChargingCharacteristicsAlt_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CAMEL_SCIBillingChargingCharacteristicsAlt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAMEL_SCIBillingChargingCharacteristicsAlt_sequence, hf_index, ett_camel_CAMEL_SCIBillingChargingCharacteristicsAlt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAMEL_SCIBillingChargingCharacteristicsAlt_sequence, hf_index, ett_camel_CAMEL_SCIBillingChargingCharacteristicsAlt);
 
   return offset;
 }
@@ -3432,7 +3432,7 @@ static const value_string camel_CAMEL_SCIBillingChargingCharacteristics_vals[] =
   { 0, NULL }
 };
 
-static const ber_choice_t CAMEL_SCIBillingChargingCharacteristics_choice[] = {
+static const ber_old_choice_t CAMEL_SCIBillingChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aOCBeforeAnswer_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aOCAfterAnswer_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aOC_extension_impl },
@@ -3441,15 +3441,15 @@ static const ber_choice_t CAMEL_SCIBillingChargingCharacteristics_choice[] = {
 
 static int
 dissect_camel_CAMEL_SCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CAMEL_SCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_SCIBillingChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CAMEL_SCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CAMEL_SCIBillingChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CamelSCIGPRSBillingChargingCharacteristics_sequence[] = {
+static const ber_old_sequence_t CamelSCIGPRSBillingChargingCharacteristics_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aOCGPRS_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
@@ -3457,8 +3457,8 @@ static const ber_sequence_t CamelSCIGPRSBillingChargingCharacteristics_sequence[
 
 static int
 dissect_camel_CamelSCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CamelSCIGPRSBillingChargingCharacteristics_sequence, hf_index, ett_camel_CamelSCIGPRSBillingChargingCharacteristics);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CamelSCIGPRSBillingChargingCharacteristics_sequence, hf_index, ett_camel_CamelSCIGPRSBillingChargingCharacteristics);
 
   return offset;
 }
@@ -3554,7 +3554,7 @@ static const value_string camel_ChargingCharacteristics_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChargingCharacteristics_choice[] = {
+static const ber_old_choice_t ChargingCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_maxTransferredVolume_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_maxElapsedTime_impl },
   { 0, 0, 0, 0, NULL }
@@ -3562,9 +3562,9 @@ static const ber_choice_t ChargingCharacteristics_choice[] = {
 
 static int
 dissect_camel_ChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChargingCharacteristics_choice, hf_index, ett_camel_ChargingCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChargingCharacteristics_choice, hf_index, ett_camel_ChargingCharacteristics,
+                                     NULL);
 
   return offset;
 }
@@ -3592,7 +3592,7 @@ static int dissect_volumeTariffSwitchInterval_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t T_volumeIfTariffSwitch_sequence[] = {
+static const ber_old_sequence_t T_volumeIfTariffSwitch_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_volumeSinceLastTariffSwitch_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_volumeTariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -3600,8 +3600,8 @@ static const ber_sequence_t T_volumeIfTariffSwitch_sequence[] = {
 
 static int
 dissect_camel_T_volumeIfTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_volumeIfTariffSwitch_sequence, hf_index, ett_camel_T_volumeIfTariffSwitch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_volumeIfTariffSwitch_sequence, hf_index, ett_camel_T_volumeIfTariffSwitch);
 
   return offset;
 }
@@ -3616,7 +3616,7 @@ static const value_string camel_TransferredVolume_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TransferredVolume_choice[] = {
+static const ber_old_choice_t TransferredVolume_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_volumeIfNoTariffSwitch_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_volumeIfTariffSwitch_impl },
   { 0, 0, 0, 0, NULL }
@@ -3624,9 +3624,9 @@ static const ber_choice_t TransferredVolume_choice[] = {
 
 static int
 dissect_camel_TransferredVolume(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TransferredVolume_choice, hf_index, ett_camel_TransferredVolume,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TransferredVolume_choice, hf_index, ett_camel_TransferredVolume,
+                                     NULL);
 
   return offset;
 }
@@ -3654,7 +3654,7 @@ static int dissect_timeGPRSTariffSwitchInterval_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t T_timeGPRSIfTariffSwitch_sequence[] = {
+static const ber_old_sequence_t T_timeGPRSIfTariffSwitch_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeGPRSSinceLastTariffSwitch_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timeGPRSTariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -3662,8 +3662,8 @@ static const ber_sequence_t T_timeGPRSIfTariffSwitch_sequence[] = {
 
 static int
 dissect_camel_T_timeGPRSIfTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_timeGPRSIfTariffSwitch_sequence, hf_index, ett_camel_T_timeGPRSIfTariffSwitch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_timeGPRSIfTariffSwitch_sequence, hf_index, ett_camel_T_timeGPRSIfTariffSwitch);
 
   return offset;
 }
@@ -3678,7 +3678,7 @@ static const value_string camel_ElapsedTime_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ElapsedTime_choice[] = {
+static const ber_old_choice_t ElapsedTime_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeGPRSIfNoTariffSwitch_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeGPRSIfTariffSwitch_impl },
   { 0, 0, 0, 0, NULL }
@@ -3686,9 +3686,9 @@ static const ber_choice_t ElapsedTime_choice[] = {
 
 static int
 dissect_camel_ElapsedTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ElapsedTime_choice, hf_index, ett_camel_ElapsedTime,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ElapsedTime_choice, hf_index, ett_camel_ElapsedTime,
+                                     NULL);
 
   return offset;
 }
@@ -3703,7 +3703,7 @@ static const value_string camel_ChargingResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChargingResult_choice[] = {
+static const ber_old_choice_t ChargingResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transferredVolume_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_elapsedTime_impl },
   { 0, 0, 0, 0, NULL }
@@ -3711,9 +3711,9 @@ static const ber_choice_t ChargingResult_choice[] = {
 
 static int
 dissect_camel_ChargingResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChargingResult_choice, hf_index, ett_camel_ChargingResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChargingResult_choice, hf_index, ett_camel_ChargingResult,
+                                     NULL);
 
   return offset;
 }
@@ -3753,7 +3753,7 @@ static int dissect_rOVolumeTariffSwitchInterval_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t T_rOVolumeIfTariffSwitch_sequence[] = {
+static const ber_old_sequence_t T_rOVolumeIfTariffSwitch_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rOVolumeSinceLastTariffSwitch_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rOVolumeTariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -3761,8 +3761,8 @@ static const ber_sequence_t T_rOVolumeIfTariffSwitch_sequence[] = {
 
 static int
 dissect_camel_T_rOVolumeIfTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_rOVolumeIfTariffSwitch_sequence, hf_index, ett_camel_T_rOVolumeIfTariffSwitch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_rOVolumeIfTariffSwitch_sequence, hf_index, ett_camel_T_rOVolumeIfTariffSwitch);
 
   return offset;
 }
@@ -3777,7 +3777,7 @@ static const value_string camel_TransferredVolumeRollOver_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TransferredVolumeRollOver_choice[] = {
+static const ber_old_choice_t TransferredVolumeRollOver_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rOVolumeIfNoTariffSwitch_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rOVolumeIfTariffSwitch_impl },
   { 0, 0, 0, 0, NULL }
@@ -3785,9 +3785,9 @@ static const ber_choice_t TransferredVolumeRollOver_choice[] = {
 
 static int
 dissect_camel_TransferredVolumeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TransferredVolumeRollOver_choice, hf_index, ett_camel_TransferredVolumeRollOver,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TransferredVolumeRollOver_choice, hf_index, ett_camel_TransferredVolumeRollOver,
+                                     NULL);
 
   return offset;
 }
@@ -3796,7 +3796,7 @@ static int dissect_transferredVolumeRollOver_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_rOTimeGPRSIfTariffSwitch_sequence[] = {
+static const ber_old_sequence_t T_rOTimeGPRSIfTariffSwitch_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSSinceLastTariffSwitch_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSTariffSwitchInterval_impl },
   { 0, 0, 0, NULL }
@@ -3804,8 +3804,8 @@ static const ber_sequence_t T_rOTimeGPRSIfTariffSwitch_sequence[] = {
 
 static int
 dissect_camel_T_rOTimeGPRSIfTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_rOTimeGPRSIfTariffSwitch_sequence, hf_index, ett_camel_T_rOTimeGPRSIfTariffSwitch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_rOTimeGPRSIfTariffSwitch_sequence, hf_index, ett_camel_T_rOTimeGPRSIfTariffSwitch);
 
   return offset;
 }
@@ -3820,7 +3820,7 @@ static const value_string camel_ElapsedTimeRollOver_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ElapsedTimeRollOver_choice[] = {
+static const ber_old_choice_t ElapsedTimeRollOver_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSIfNoTariffSwitch_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSIfTariffSwitch_impl },
   { 0, 0, 0, 0, NULL }
@@ -3828,9 +3828,9 @@ static const ber_choice_t ElapsedTimeRollOver_choice[] = {
 
 static int
 dissect_camel_ElapsedTimeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ElapsedTimeRollOver_choice, hf_index, ett_camel_ElapsedTimeRollOver,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ElapsedTimeRollOver_choice, hf_index, ett_camel_ElapsedTimeRollOver,
+                                     NULL);
 
   return offset;
 }
@@ -3845,7 +3845,7 @@ static const value_string camel_ChargingRollOver_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChargingRollOver_choice[] = {
+static const ber_old_choice_t ChargingRollOver_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transferredVolumeRollOver_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_elapsedTimeRollOver_impl },
   { 0, 0, 0, 0, NULL }
@@ -3853,9 +3853,9 @@ static const ber_choice_t ChargingRollOver_choice[] = {
 
 static int
 dissect_camel_ChargingRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChargingRollOver_choice, hf_index, ett_camel_ChargingRollOver,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChargingRollOver_choice, hf_index, ett_camel_ChargingRollOver,
+                                     NULL);
 
   return offset;
 }
@@ -3884,7 +3884,7 @@ static int dissect_errorTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CollectedDigits_sequence[] = {
+static const ber_old_sequence_t CollectedDigits_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimumNbOfDigits_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_maximumNbOfDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endOfReplyDigit_impl },
@@ -3901,8 +3901,8 @@ static const ber_sequence_t CollectedDigits_sequence[] = {
 
 static int
 dissect_camel_CollectedDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CollectedDigits_sequence, hf_index, ett_camel_CollectedDigits);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CollectedDigits_sequence, hf_index, ett_camel_CollectedDigits);
 
   return offset;
 }
@@ -3916,16 +3916,16 @@ static const value_string camel_CollectedInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CollectedInfo_choice[] = {
+static const ber_old_choice_t CollectedInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedDigits_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CollectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CollectedInfo_choice, hf_index, ett_camel_CollectedInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CollectedInfo_choice, hf_index, ett_camel_CollectedInfo,
+                                     NULL);
 
   return offset;
 }
@@ -3987,7 +3987,7 @@ static int dissect_scfID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t CompoundCriteria_sequence[] = {
+static const ber_old_sequence_t CompoundCriteria_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_basicGapCriteria_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scfID_impl },
   { 0, 0, 0, NULL }
@@ -3995,8 +3995,8 @@ static const ber_sequence_t CompoundCriteria_sequence[] = {
 
 static int
 dissect_camel_CompoundCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CompoundCriteria_sequence, hf_index, ett_camel_CompoundCriteria);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CompoundCriteria_sequence, hf_index, ett_camel_CompoundCriteria);
 
   return offset;
 }
@@ -4123,14 +4123,14 @@ static int dissect_callStopTimeValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t DestinationRoutingAddress_sequence_of[1] = {
+static const ber_old_sequence_t DestinationRoutingAddress_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DestinationRoutingAddress_item },
 };
 
 static int
 dissect_camel_DestinationRoutingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DestinationRoutingAddress_sequence_of, hf_index, ett_camel_DestinationRoutingAddress);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DestinationRoutingAddress_sequence_of, hf_index, ett_camel_DestinationRoutingAddress);
 
   return offset;
 }
@@ -4177,7 +4177,7 @@ static int dissect_natureOfServiceChange_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_oServiceChangeSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oServiceChangeSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ext_basicServiceCode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_initiatorOfServiceChange_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_natureOfServiceChange_impl },
@@ -4186,8 +4186,8 @@ static const ber_sequence_t T_oServiceChangeSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_oServiceChangeSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oServiceChangeSpecificInfo_sequence, hf_index, ett_camel_T_oServiceChangeSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oServiceChangeSpecificInfo_sequence, hf_index, ett_camel_T_oServiceChangeSpecificInfo);
 
   return offset;
 }
@@ -4196,7 +4196,7 @@ static int dissect_oServiceChangeSpecificInfo_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t T_tServiceChangeSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tServiceChangeSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ext_basicServiceCode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_initiatorOfServiceChange_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_natureOfServiceChange_impl },
@@ -4205,8 +4205,8 @@ static const ber_sequence_t T_tServiceChangeSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_tServiceChangeSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tServiceChangeSpecificInfo_sequence, hf_index, ett_camel_T_tServiceChangeSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tServiceChangeSpecificInfo_sequence, hf_index, ett_camel_T_tServiceChangeSpecificInfo);
 
   return offset;
 }
@@ -4215,7 +4215,7 @@ static int dissect_tServiceChangeSpecificInfo_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t DpSpecificInfoAlt_sequence[] = {
+static const ber_old_sequence_t DpSpecificInfoAlt_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oServiceChangeSpecificInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tServiceChangeSpecificInfo_impl },
   { 0, 0, 0, NULL }
@@ -4223,8 +4223,8 @@ static const ber_sequence_t DpSpecificInfoAlt_sequence[] = {
 
 static int
 dissect_camel_DpSpecificInfoAlt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DpSpecificInfoAlt_sequence, hf_index, ett_camel_DpSpecificInfoAlt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DpSpecificInfoAlt_sequence, hf_index, ett_camel_DpSpecificInfoAlt);
 
   return offset;
 }
@@ -4233,15 +4233,15 @@ static int dissect_dpSpecificInfoAlt_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_routeSelectFailureSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_routeSelectFailureSpecificInfo_sequence, hf_index, ett_camel_T_routeSelectFailureSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_routeSelectFailureSpecificInfo_sequence, hf_index, ett_camel_T_routeSelectFailureSpecificInfo);
 
   return offset;
 }
@@ -4250,15 +4250,15 @@ static int dissect_routeSelectFailureSpecificInfo_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oCalledPartyBusySpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_camel_T_oCalledPartyBusySpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_camel_T_oCalledPartyBusySpecificInfo);
 
   return offset;
 }
@@ -4267,14 +4267,14 @@ static int dissect_oCalledPartyBusySpecificInfo_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t T_oNoAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oNoAnswerSpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oNoAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oNoAnswerSpecificInfo_sequence, hf_index, ett_camel_T_oNoAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oNoAnswerSpecificInfo_sequence, hf_index, ett_camel_T_oNoAnswerSpecificInfo);
 
   return offset;
 }
@@ -4283,7 +4283,7 @@ static int dissect_oNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_oAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oAnswerSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationAddress_impl },
   { BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_or_Call_impl },
   { BER_CLASS_CON, 52, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedCall_impl },
@@ -4295,8 +4295,8 @@ static const ber_sequence_t T_oAnswerSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_oAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oAnswerSpecificInfo_sequence, hf_index, ett_camel_T_oAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oAnswerSpecificInfo_sequence, hf_index, ett_camel_T_oAnswerSpecificInfo);
 
   return offset;
 }
@@ -4311,7 +4311,7 @@ static const value_string camel_T_omidCallEvents_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_omidCallEvents_choice[] = {
+static const ber_old_choice_t T_omidCallEvents_choice[] = {
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsCompleted_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsTimeOut_impl },
   { 0, 0, 0, 0, NULL }
@@ -4319,9 +4319,9 @@ static const ber_choice_t T_omidCallEvents_choice[] = {
 
 static int
 dissect_camel_T_omidCallEvents(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_omidCallEvents_choice, hf_index, ett_camel_T_omidCallEvents,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_omidCallEvents_choice, hf_index, ett_camel_T_omidCallEvents,
+                                     NULL);
 
   return offset;
 }
@@ -4330,15 +4330,15 @@ static int dissect_omidCallEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_oMidCallSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oMidCallSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_omidCallEvents_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oMidCallSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oMidCallSpecificInfo_sequence, hf_index, ett_camel_T_oMidCallSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oMidCallSpecificInfo_sequence, hf_index, ett_camel_T_oMidCallSpecificInfo);
 
   return offset;
 }
@@ -4347,15 +4347,15 @@ static int dissect_oMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_oDisconnectSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oDisconnectSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oDisconnectSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oDisconnectSpecificInfo_sequence, hf_index, ett_camel_T_oDisconnectSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oDisconnectSpecificInfo_sequence, hf_index, ett_camel_T_oDisconnectSpecificInfo);
 
   return offset;
 }
@@ -4364,7 +4364,7 @@ static int dissect_oDisconnectSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_tBusySpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tBusySpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callForwarded_impl },
   { BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeNotPermitted_impl },
@@ -4374,8 +4374,8 @@ static const ber_sequence_t T_tBusySpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_tBusySpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tBusySpecificInfo_sequence, hf_index, ett_camel_T_tBusySpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tBusySpecificInfo_sequence, hf_index, ett_camel_T_tBusySpecificInfo);
 
   return offset;
 }
@@ -4384,7 +4384,7 @@ static int dissect_tBusySpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_tNoAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tNoAnswerSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callForwarded_impl },
   { BER_CLASS_CON, 52, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingDestinationNumber_impl },
   { 0, 0, 0, NULL }
@@ -4392,8 +4392,8 @@ static const ber_sequence_t T_tNoAnswerSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_tNoAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tNoAnswerSpecificInfo_sequence, hf_index, ett_camel_T_tNoAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tNoAnswerSpecificInfo_sequence, hf_index, ett_camel_T_tNoAnswerSpecificInfo);
 
   return offset;
 }
@@ -4402,7 +4402,7 @@ static int dissect_tNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_tAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tAnswerSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationAddress_impl },
   { BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_or_Call_impl },
   { BER_CLASS_CON, 52, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedCall_impl },
@@ -4414,8 +4414,8 @@ static const ber_sequence_t T_tAnswerSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_tAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tAnswerSpecificInfo_sequence, hf_index, ett_camel_T_tAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tAnswerSpecificInfo_sequence, hf_index, ett_camel_T_tAnswerSpecificInfo);
 
   return offset;
 }
@@ -4430,7 +4430,7 @@ static const value_string camel_T_tmidCallEvents_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_tmidCallEvents_choice[] = {
+static const ber_old_choice_t T_tmidCallEvents_choice[] = {
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsCompleted_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsTimeOut_impl },
   { 0, 0, 0, 0, NULL }
@@ -4438,9 +4438,9 @@ static const ber_choice_t T_tmidCallEvents_choice[] = {
 
 static int
 dissect_camel_T_tmidCallEvents(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_tmidCallEvents_choice, hf_index, ett_camel_T_tmidCallEvents,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_tmidCallEvents_choice, hf_index, ett_camel_T_tmidCallEvents,
+                                     NULL);
 
   return offset;
 }
@@ -4449,15 +4449,15 @@ static int dissect_tmidCallEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_tMidCallSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tMidCallSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tmidCallEvents_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_tMidCallSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tMidCallSpecificInfo_sequence, hf_index, ett_camel_T_tMidCallSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tMidCallSpecificInfo_sequence, hf_index, ett_camel_T_tMidCallSpecificInfo);
 
   return offset;
 }
@@ -4466,15 +4466,15 @@ static int dissect_tMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_tDisconnectSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tDisconnectSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_tDisconnectSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tDisconnectSpecificInfo_sequence, hf_index, ett_camel_T_tDisconnectSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tDisconnectSpecificInfo_sequence, hf_index, ett_camel_T_tDisconnectSpecificInfo);
 
   return offset;
 }
@@ -4483,15 +4483,15 @@ static int dissect_tDisconnectSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_oTermSeizedSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oTermSeizedSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oTermSeizedSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oTermSeizedSpecificInfo_sequence, hf_index, ett_camel_T_oTermSeizedSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oTermSeizedSpecificInfo_sequence, hf_index, ett_camel_T_oTermSeizedSpecificInfo);
 
   return offset;
 }
@@ -4500,15 +4500,15 @@ static int dissect_oTermSeizedSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_callAcceptedSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_callAcceptedSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_callAcceptedSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_callAcceptedSpecificInfo_sequence, hf_index, ett_camel_T_callAcceptedSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_callAcceptedSpecificInfo_sequence, hf_index, ett_camel_T_callAcceptedSpecificInfo);
 
   return offset;
 }
@@ -4517,15 +4517,15 @@ static int dissect_callAcceptedSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_oAbandonSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oAbandonSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeNotPermitted_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_oAbandonSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oAbandonSpecificInfo_sequence, hf_index, ett_camel_T_oAbandonSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oAbandonSpecificInfo_sequence, hf_index, ett_camel_T_oAbandonSpecificInfo);
 
   return offset;
 }
@@ -4534,14 +4534,14 @@ static int dissect_oAbandonSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t MetDPCriterionAlt_sequence[] = {
+static const ber_old_sequence_t MetDPCriterionAlt_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_MetDPCriterionAlt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MetDPCriterionAlt_sequence, hf_index, ett_camel_MetDPCriterionAlt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MetDPCriterionAlt_sequence, hf_index, ett_camel_MetDPCriterionAlt);
 
   return offset;
 }
@@ -4565,7 +4565,7 @@ static const value_string camel_MetDPCriterion_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MetDPCriterion_choice[] = {
+static const ber_old_choice_t MetDPCriterion_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_enteringCellGlobalId_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leavingCellGlobalId_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_enteringServiceAreaId_impl },
@@ -4582,9 +4582,9 @@ static const ber_choice_t MetDPCriterion_choice[] = {
 
 static int
 dissect_camel_MetDPCriterion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MetDPCriterion_choice, hf_index, ett_camel_MetDPCriterion,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MetDPCriterion_choice, hf_index, ett_camel_MetDPCriterion,
+                                     NULL);
 
   return offset;
 }
@@ -4593,14 +4593,14 @@ static int dissect_MetDPCriteriaList_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t MetDPCriteriaList_sequence_of[1] = {
+static const ber_old_sequence_t MetDPCriteriaList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_MetDPCriteriaList_item },
 };
 
 static int
 dissect_camel_MetDPCriteriaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MetDPCriteriaList_sequence_of, hf_index, ett_camel_MetDPCriteriaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MetDPCriteriaList_sequence_of, hf_index, ett_camel_MetDPCriteriaList);
 
   return offset;
 }
@@ -4609,7 +4609,7 @@ static int dissect_metDPCriteriaList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_oChangeOfPositionSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oChangeOfPositionSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl },
   { BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_metDPCriteriaList_impl },
   { 0, 0, 0, NULL }
@@ -4617,8 +4617,8 @@ static const ber_sequence_t T_oChangeOfPositionSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_oChangeOfPositionSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oChangeOfPositionSpecificInfo_sequence, hf_index, ett_camel_T_oChangeOfPositionSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oChangeOfPositionSpecificInfo_sequence, hf_index, ett_camel_T_oChangeOfPositionSpecificInfo);
 
   return offset;
 }
@@ -4627,7 +4627,7 @@ static int dissect_oChangeOfPositionSpecificInfo_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t T_tChangeOfPositionSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tChangeOfPositionSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl },
   { BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_metDPCriteriaList_impl },
   { 0, 0, 0, NULL }
@@ -4635,8 +4635,8 @@ static const ber_sequence_t T_tChangeOfPositionSpecificInfo_sequence[] = {
 
 static int
 dissect_camel_T_tChangeOfPositionSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tChangeOfPositionSpecificInfo_sequence, hf_index, ett_camel_T_tChangeOfPositionSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tChangeOfPositionSpecificInfo_sequence, hf_index, ett_camel_T_tChangeOfPositionSpecificInfo);
 
   return offset;
 }
@@ -4666,7 +4666,7 @@ static const value_string camel_EventSpecificInformationBCSM_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EventSpecificInformationBCSM_choice[] = {
+static const ber_old_choice_t EventSpecificInformationBCSM_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routeSelectFailureSpecificInfo_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_oCalledPartyBusySpecificInfo_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_oNoAnswerSpecificInfo_impl },
@@ -4689,9 +4689,9 @@ static const ber_choice_t EventSpecificInformationBCSM_choice[] = {
 
 static int
 dissect_camel_EventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EventSpecificInformationBCSM_choice, hf_index, ett_camel_EventSpecificInformationBCSM,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EventSpecificInformationBCSM_choice, hf_index, ett_camel_EventSpecificInformationBCSM,
+                                     NULL);
 
   return offset;
 }
@@ -4722,15 +4722,15 @@ static int dissect_smsfailureCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_o_smsFailureSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_o_smsFailureSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_smsfailureCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_o_smsFailureSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_o_smsFailureSpecificInfo_sequence, hf_index, ett_camel_T_o_smsFailureSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_o_smsFailureSpecificInfo_sequence, hf_index, ett_camel_T_o_smsFailureSpecificInfo);
 
   return offset;
 }
@@ -4752,15 +4752,15 @@ static int dissect_foo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t T_o_smsSubmittedSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_o_smsSubmittedSpecificInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_foo },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_o_smsSubmittedSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_o_smsSubmittedSpecificInfo_sequence, hf_index, ett_camel_T_o_smsSubmittedSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_o_smsSubmittedSpecificInfo_sequence, hf_index, ett_camel_T_o_smsSubmittedSpecificInfo);
 
   return offset;
 }
@@ -4782,15 +4782,15 @@ static int dissect_failureMTSMSCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_t_smsFailureSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_t_smsFailureSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureMTSMSCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_t_smsFailureSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_t_smsFailureSpecificInfo_sequence, hf_index, ett_camel_T_t_smsFailureSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_t_smsFailureSpecificInfo_sequence, hf_index, ett_camel_T_t_smsFailureSpecificInfo);
 
   return offset;
 }
@@ -4799,14 +4799,14 @@ static int dissect_t_smsFailureSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_t_smsDeliverySpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_t_smsDeliverySpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_t_smsDeliverySpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_t_smsDeliverySpecificInfo_sequence, hf_index, ett_camel_T_t_smsDeliverySpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_t_smsDeliverySpecificInfo_sequence, hf_index, ett_camel_T_t_smsDeliverySpecificInfo);
 
   return offset;
 }
@@ -4823,7 +4823,7 @@ static const value_string camel_EventSpecificInformationSMS_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EventSpecificInformationSMS_choice[] = {
+static const ber_old_choice_t EventSpecificInformationSMS_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_o_smsFailureSpecificInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_o_smsSubmittedSpecificInfo_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_t_smsFailureSpecificInfo_impl },
@@ -4833,9 +4833,9 @@ static const ber_choice_t EventSpecificInformationSMS_choice[] = {
 
 static int
 dissect_camel_EventSpecificInformationSMS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EventSpecificInformationSMS_choice, hf_index, ett_camel_EventSpecificInformationSMS,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EventSpecificInformationSMS_choice, hf_index, ett_camel_EventSpecificInformationSMS,
+                                     NULL);
 
   return offset;
 }
@@ -4894,7 +4894,7 @@ dissect_camel_FCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tv
 }
 
 
-static const ber_sequence_t ForwardServiceInteractionInd_sequence[] = {
+static const ber_old_sequence_t ForwardServiceInteractionInd_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_conferenceTreatmentIndicator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callDiversionTreatmentIndicator_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyRestrictionIndicator_impl },
@@ -4903,8 +4903,8 @@ static const ber_sequence_t ForwardServiceInteractionInd_sequence[] = {
 
 static int
 dissect_camel_ForwardServiceInteractionInd(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardServiceInteractionInd_sequence, hf_index, ett_camel_ForwardServiceInteractionInd);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardServiceInteractionInd_sequence, hf_index, ett_camel_ForwardServiceInteractionInd);
 
   return offset;
 }
@@ -4919,7 +4919,7 @@ static const value_string camel_GapCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GapCriteria_choice[] = {
+static const ber_old_choice_t GapCriteria_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_basicGapCriteria },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_compoundGapCriteria },
   { 0, 0, 0, 0, NULL }
@@ -4927,9 +4927,9 @@ static const ber_choice_t GapCriteria_choice[] = {
 
 static int
 dissect_camel_GapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GapCriteria_choice, hf_index, ett_camel_GapCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GapCriteria_choice, hf_index, ett_camel_GapCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -4964,7 +4964,7 @@ static int dissect_gapInterval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t GapIndicators_sequence[] = {
+static const ber_old_sequence_t GapIndicators_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_duration1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapInterval_impl },
   { 0, 0, 0, NULL }
@@ -4972,8 +4972,8 @@ static const ber_sequence_t GapIndicators_sequence[] = {
 
 static int
 dissect_camel_GapIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GapIndicators_sequence, hf_index, ett_camel_GapIndicators);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GapIndicators_sequence, hf_index, ett_camel_GapIndicators);
 
   return offset;
 }
@@ -5043,7 +5043,7 @@ static int dissect_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_text_sequence[] = {
+static const ber_old_sequence_t T_text_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageContent_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attributes_impl },
   { 0, 0, 0, NULL }
@@ -5051,8 +5051,8 @@ static const ber_sequence_t T_text_sequence[] = {
 
 static int
 dissect_camel_T_text(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_text_sequence, hf_index, ett_camel_T_text);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_text_sequence, hf_index, ett_camel_T_text);
 
   return offset;
 }
@@ -5061,14 +5061,14 @@ static int dissect_text_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_elementaryMessageIDs_item },
 };
 
 static int
 dissect_camel_SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_camel_SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_camel_SEQUENCE_SIZE_1_cAPSpecificBoundSetnumOfMessageIDs_OF_Integer4);
 
   return offset;
 }
@@ -5115,7 +5115,7 @@ static const value_string camel_VariablePart_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t VariablePart_choice[] = {
+static const ber_old_choice_t VariablePart_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integer_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_number_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_time_impl },
@@ -5126,9 +5126,9 @@ static const ber_choice_t VariablePart_choice[] = {
 
 static int
 dissect_camel_VariablePart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 VariablePart_choice, hf_index, ett_camel_VariablePart,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     VariablePart_choice, hf_index, ett_camel_VariablePart,
+                                     NULL);
 
   return offset;
 }
@@ -5137,14 +5137,14 @@ static int dissect_VariablePartsArray_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t VariablePartsArray_sequence_of[1] = {
+static const ber_old_sequence_t VariablePartsArray_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_VariablePartsArray_item },
 };
 
 static int
 dissect_camel_VariablePartsArray(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      VariablePartsArray_sequence_of, hf_index, ett_camel_VariablePartsArray);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          VariablePartsArray_sequence_of, hf_index, ett_camel_VariablePartsArray);
 
   return offset;
 }
@@ -5153,7 +5153,7 @@ static int dissect_variableParts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_variableMessage_sequence[] = {
+static const ber_old_sequence_t T_variableMessage_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_variableParts_impl },
   { 0, 0, 0, NULL }
@@ -5161,8 +5161,8 @@ static const ber_sequence_t T_variableMessage_sequence[] = {
 
 static int
 dissect_camel_T_variableMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_variableMessage_sequence, hf_index, ett_camel_T_variableMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_variableMessage_sequence, hf_index, ett_camel_T_variableMessage);
 
   return offset;
 }
@@ -5179,7 +5179,7 @@ static const value_string camel_MessageID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MessageID_choice[] = {
+static const ber_old_choice_t MessageID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_text_impl },
   {  29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_elementaryMessageIDs_impl },
@@ -5189,9 +5189,9 @@ static const ber_choice_t MessageID_choice[] = {
 
 static int
 dissect_camel_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MessageID_choice, hf_index, ett_camel_MessageID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MessageID_choice, hf_index, ett_camel_MessageID,
+                                     NULL);
 
   return offset;
 }
@@ -5216,7 +5216,7 @@ static int dissect_interval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t InbandInfo_sequence[] = {
+static const ber_old_sequence_t InbandInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_messageID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfRepetitions_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration2_impl },
@@ -5226,8 +5226,8 @@ static const ber_sequence_t InbandInfo_sequence[] = {
 
 static int
 dissect_camel_InbandInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InbandInfo_sequence, hf_index, ett_camel_InbandInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InbandInfo_sequence, hf_index, ett_camel_InbandInfo);
 
   return offset;
 }
@@ -5236,7 +5236,7 @@ static int dissect_inbandInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Tone_sequence[] = {
+static const ber_old_sequence_t Tone_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_toneID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration3_impl },
   { 0, 0, 0, NULL }
@@ -5244,8 +5244,8 @@ static const ber_sequence_t Tone_sequence[] = {
 
 static int
 dissect_camel_Tone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Tone_sequence, hf_index, ett_camel_Tone);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Tone_sequence, hf_index, ett_camel_Tone);
 
   return offset;
 }
@@ -5260,7 +5260,7 @@ static const value_string camel_InformationToSend_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InformationToSend_choice[] = {
+static const ber_old_choice_t InformationToSend_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inbandInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tone_impl },
   { 0, 0, 0, 0, NULL }
@@ -5268,9 +5268,9 @@ static const ber_choice_t InformationToSend_choice[] = {
 
 static int
 dissect_camel_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InformationToSend_choice, hf_index, ett_camel_InformationToSend,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InformationToSend_choice, hf_index, ett_camel_InformationToSend,
+                                     NULL);
 
   return offset;
 }
@@ -5285,7 +5285,7 @@ static const value_string camel_GapTreatment_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GapTreatment_choice[] = {
+static const ber_old_choice_t GapTreatment_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationToSend_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { 0, 0, 0, 0, NULL }
@@ -5293,9 +5293,9 @@ static const ber_choice_t GapTreatment_choice[] = {
 
 static int
 dissect_camel_GapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GapTreatment_choice, hf_index, ett_camel_GapTreatment,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GapTreatment_choice, hf_index, ett_camel_GapTreatment,
+                                     NULL);
 
   return offset;
 }
@@ -5317,14 +5317,14 @@ static int dissect_GenericNumbers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GenericNumbers_set_of[1] = {
+static const ber_old_sequence_t GenericNumbers_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_GenericNumbers_item },
 };
 
 static int
 dissect_camel_GenericNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 GenericNumbers_set_of, hf_index, ett_camel_GenericNumbers);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     GenericNumbers_set_of, hf_index, ett_camel_GenericNumbers);
 
   return offset;
 }
@@ -5339,7 +5339,7 @@ static const value_string camel_GPRS_QoS_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GPRS_QoS_choice[] = {
+static const ber_old_choice_t GPRS_QoS_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_short_QoS_format_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_long_QoS_format_impl },
   { 0, 0, 0, 0, NULL }
@@ -5347,9 +5347,9 @@ static const ber_choice_t GPRS_QoS_choice[] = {
 
 static int
 dissect_camel_GPRS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GPRS_QoS_choice, hf_index, ett_camel_GPRS_QoS,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GPRS_QoS_choice, hf_index, ett_camel_GPRS_QoS,
+                                     NULL);
 
   return offset;
 }
@@ -5364,15 +5364,15 @@ static int dissect_negotiated_QoS_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GPRS_QoS_Extension_sequence[] = {
+static const ber_old_sequence_t GPRS_QoS_Extension_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_supplement_to_long_QoS_format_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_GPRS_QoS_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRS_QoS_Extension_sequence, hf_index, ett_camel_GPRS_QoS_Extension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRS_QoS_Extension_sequence, hf_index, ett_camel_GPRS_QoS_Extension);
 
   return offset;
 }
@@ -5427,7 +5427,7 @@ static int dissect_gPRSEventType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t GPRSEvent_sequence[] = {
+static const ber_old_sequence_t GPRSEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gPRSEventType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { 0, 0, 0, NULL }
@@ -5435,8 +5435,8 @@ static const ber_sequence_t GPRSEvent_sequence[] = {
 
 static int
 dissect_camel_GPRSEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRSEvent_sequence, hf_index, ett_camel_GPRSEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRSEvent_sequence, hf_index, ett_camel_GPRSEvent);
 
   return offset;
 }
@@ -5487,15 +5487,15 @@ static int dissect_extId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t PrivateExtension_sequence[] = {
+static const ber_old_sequence_t PrivateExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extId },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_PrivateExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivateExtension_sequence, hf_index, ett_camel_PrivateExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivateExtension_sequence, hf_index, ett_camel_PrivateExtension);
 
   return offset;
 }
@@ -5504,14 +5504,14 @@ static int dissect_PrivateExtensionList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PrivateExtensionList_sequence_of[1] = {
+static const ber_old_sequence_t PrivateExtensionList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PrivateExtensionList_item },
 };
 
 static int
 dissect_camel_PrivateExtensionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PrivateExtensionList_sequence_of, hf_index, ett_camel_PrivateExtensionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PrivateExtensionList_sequence_of, hf_index, ett_camel_PrivateExtensionList);
 
   return offset;
 }
@@ -5520,15 +5520,15 @@ static int dissect_privateExtensionList_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PCS_Extensions_sequence[] = {
+static const ber_old_sequence_t PCS_Extensions_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_foo },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_PCS_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PCS_Extensions_sequence, hf_index, ett_camel_PCS_Extensions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PCS_Extensions_sequence, hf_index, ett_camel_PCS_Extensions);
 
   return offset;
 }
@@ -5537,7 +5537,7 @@ static int dissect_pcs_Extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ExtensionContainer_sequence[] = {
+static const ber_old_sequence_t ExtensionContainer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateExtensionList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pcs_Extensions_impl },
   { 0, 0, 0, NULL }
@@ -5545,8 +5545,8 @@ static const ber_sequence_t ExtensionContainer_sequence[] = {
 
 static int
 dissect_camel_ExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensionContainer_sequence, hf_index, ett_camel_ExtensionContainer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensionContainer_sequence, hf_index, ett_camel_ExtensionContainer);
 
   return offset;
 }
@@ -5555,7 +5555,7 @@ static int dissect_extensionContainer_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t LocationInformationGPRS_sequence[] = {
+static const ber_old_sequence_t LocationInformationGPRS_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cellGlobalIdOrServiceAreaIdOrLAI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeingAreaIdentity_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_geographicalInformation_impl },
@@ -5568,8 +5568,8 @@ static const ber_sequence_t LocationInformationGPRS_sequence[] = {
 
 static int
 dissect_camel_LocationInformationGPRS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationInformationGPRS_sequence, hf_index, ett_camel_LocationInformationGPRS);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationInformationGPRS_sequence, hf_index, ett_camel_LocationInformationGPRS);
 
   return offset;
 }
@@ -5578,15 +5578,15 @@ static int dissect_locationInformationGPRS_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_attachChangeOfPositionSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_attachChangeOfPositionSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformationGPRS_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_T_attachChangeOfPositionSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_attachChangeOfPositionSpecificInformation_sequence, hf_index, ett_camel_T_attachChangeOfPositionSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_attachChangeOfPositionSpecificInformation_sequence, hf_index, ett_camel_T_attachChangeOfPositionSpecificInformation);
 
   return offset;
 }
@@ -5699,7 +5699,7 @@ static int dissect_pDPAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PDPType_sequence[] = {
+static const ber_old_sequence_t PDPType_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pDPTypeOrganization_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pDPTypeNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPAddress_impl },
@@ -5708,8 +5708,8 @@ static const ber_sequence_t PDPType_sequence[] = {
 
 static int
 dissect_camel_PDPType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDPType_sequence, hf_index, ett_camel_PDPType);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDPType_sequence, hf_index, ett_camel_PDPType);
 
   return offset;
 }
@@ -5718,7 +5718,7 @@ static int dissect_pDPType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t QualityOfService_sequence[] = {
+static const ber_old_sequence_t QualityOfService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_requested_QoS_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_subscribed_QoS_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_negotiated_QoS_impl },
@@ -5730,8 +5730,8 @@ static const ber_sequence_t QualityOfService_sequence[] = {
 
 static int
 dissect_camel_QualityOfService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   QualityOfService_sequence, hf_index, ett_camel_QualityOfService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       QualityOfService_sequence, hf_index, ett_camel_QualityOfService);
 
   return offset;
 }
@@ -5756,7 +5756,7 @@ static int dissect_timeAndTimezone_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_pdp_ContextchangeOfPositionSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_pdp_ContextchangeOfPositionSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessPointName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chargingID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformationGPRS_impl },
@@ -5769,8 +5769,8 @@ static const ber_sequence_t T_pdp_ContextchangeOfPositionSpecificInformation_seq
 
 static int
 dissect_camel_T_pdp_ContextchangeOfPositionSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_pdp_ContextchangeOfPositionSpecificInformation_sequence, hf_index, ett_camel_T_pdp_ContextchangeOfPositionSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_pdp_ContextchangeOfPositionSpecificInformation_sequence, hf_index, ett_camel_T_pdp_ContextchangeOfPositionSpecificInformation);
 
   return offset;
 }
@@ -5800,7 +5800,7 @@ static int dissect_inititatingEntity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_detachSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_detachSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inititatingEntity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeingAreaUpdate_impl },
   { 0, 0, 0, NULL }
@@ -5808,8 +5808,8 @@ static const ber_sequence_t T_detachSpecificInformation_sequence[] = {
 
 static int
 dissect_camel_T_detachSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_detachSpecificInformation_sequence, hf_index, ett_camel_T_detachSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_detachSpecificInformation_sequence, hf_index, ett_camel_T_detachSpecificInformation);
 
   return offset;
 }
@@ -5818,7 +5818,7 @@ static int dissect_detachSpecificInformation_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_disconnectSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_disconnectSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inititatingEntity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeingAreaUpdate_impl },
   { 0, 0, 0, NULL }
@@ -5826,8 +5826,8 @@ static const ber_sequence_t T_disconnectSpecificInformation_sequence[] = {
 
 static int
 dissect_camel_T_disconnectSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_disconnectSpecificInformation_sequence, hf_index, ett_camel_T_disconnectSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_disconnectSpecificInformation_sequence, hf_index, ett_camel_T_disconnectSpecificInformation);
 
   return offset;
 }
@@ -5855,7 +5855,7 @@ static int dissect_pDPInitiationType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_pDPContextEstablishmentSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_pDPContextEstablishmentSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessPointName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPType_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_qualityOfService_impl },
@@ -5868,8 +5868,8 @@ static const ber_sequence_t T_pDPContextEstablishmentSpecificInformation_sequenc
 
 static int
 dissect_camel_T_pDPContextEstablishmentSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_pDPContextEstablishmentSpecificInformation_sequence, hf_index, ett_camel_T_pDPContextEstablishmentSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_pDPContextEstablishmentSpecificInformation_sequence, hf_index, ett_camel_T_pDPContextEstablishmentSpecificInformation);
 
   return offset;
 }
@@ -5878,7 +5878,7 @@ static int dissect_pDPContextEstablishmentSpecificInformation_impl(proto_tree *t
 }
 
 
-static const ber_sequence_t T_pDPContextEstablishmentAcknowledgementSpecificInformation_sequence[] = {
+static const ber_old_sequence_t T_pDPContextEstablishmentAcknowledgementSpecificInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessPointName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chargingID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPType_impl },
@@ -5891,8 +5891,8 @@ static const ber_sequence_t T_pDPContextEstablishmentAcknowledgementSpecificInfo
 
 static int
 dissect_camel_T_pDPContextEstablishmentAcknowledgementSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_pDPContextEstablishmentAcknowledgementSpecificInformation_sequence, hf_index, ett_camel_T_pDPContextEstablishmentAcknowledgementSpecificInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_pDPContextEstablishmentAcknowledgementSpecificInformation_sequence, hf_index, ett_camel_T_pDPContextEstablishmentAcknowledgementSpecificInformation);
 
   return offset;
 }
@@ -5911,7 +5911,7 @@ static const value_string camel_GPRSEventSpecificInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GPRSEventSpecificInformation_choice[] = {
+static const ber_old_choice_t GPRSEventSpecificInformation_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attachChangeOfPositionSpecificInformation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pdp_ContextchangeOfPositionSpecificInformation_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_detachSpecificInformation_impl },
@@ -5923,9 +5923,9 @@ static const ber_choice_t GPRSEventSpecificInformation_choice[] = {
 
 static int
 dissect_camel_GPRSEventSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GPRSEventSpecificInformation_choice, hf_index, ett_camel_GPRSEventSpecificInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GPRSEventSpecificInformation_choice, hf_index, ett_camel_GPRSEventSpecificInformation,
+                                     NULL);
 
   return offset;
 }
@@ -5988,7 +5988,7 @@ static int dissect_mSRadioAccessCapability_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t GPRSMSClass_sequence[] = {
+static const ber_old_sequence_t GPRSMSClass_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mSNetworkCapability_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mSRadioAccessCapability_impl },
   { 0, 0, 0, NULL }
@@ -5996,8 +5996,8 @@ static const ber_sequence_t GPRSMSClass_sequence[] = {
 
 static int
 dissect_camel_GPRSMSClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRSMSClass_sequence, hf_index, ett_camel_GPRSMSClass);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRSMSClass_sequence, hf_index, ett_camel_GPRSMSClass);
 
   return offset;
 }
@@ -6037,7 +6037,7 @@ static const value_string camel_LegOrCallSegment_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LegOrCallSegment_choice[] = {
+static const ber_old_choice_t LegOrCallSegment_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callSegmentID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legID_impl },
   { 0, 0, 0, 0, NULL }
@@ -6045,9 +6045,9 @@ static const ber_choice_t LegOrCallSegment_choice[] = {
 
 static int
 dissect_camel_LegOrCallSegment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LegOrCallSegment_choice, hf_index, ett_camel_LegOrCallSegment,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LegOrCallSegment_choice, hf_index, ett_camel_LegOrCallSegment,
+                                     NULL);
 
   return offset;
 }
@@ -6175,7 +6175,7 @@ static const value_string camel_RequestedInformationValue_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RequestedInformationValue_choice[] = {
+static const ber_old_choice_t RequestedInformationValue_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callAttemptElapsedTimeValue_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callStopTimeValue_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callConnectedElapsedTimeValue_impl },
@@ -6185,9 +6185,9 @@ static const ber_choice_t RequestedInformationValue_choice[] = {
 
 static int
 dissect_camel_RequestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RequestedInformationValue_choice, hf_index, ett_camel_RequestedInformationValue,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RequestedInformationValue_choice, hf_index, ett_camel_RequestedInformationValue,
+                                     NULL);
 
   return offset;
 }
@@ -6196,7 +6196,7 @@ static int dissect_requestedInformationValue_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformation_sequence[] = {
+static const ber_old_sequence_t RequestedInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_requestedInformationValue_impl },
   { 0, 0, 0, NULL }
@@ -6204,8 +6204,8 @@ static const ber_sequence_t RequestedInformation_sequence[] = {
 
 static int
 dissect_camel_RequestedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedInformation_sequence, hf_index, ett_camel_RequestedInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedInformation_sequence, hf_index, ett_camel_RequestedInformation);
 
   return offset;
 }
@@ -6214,14 +6214,14 @@ static int dissect_RequestedInformationList_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformationList_sequence_of[1] = {
+static const ber_old_sequence_t RequestedInformationList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationList_item },
 };
 
 static int
 dissect_camel_RequestedInformationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestedInformationList_sequence_of, hf_index, ett_camel_RequestedInformationList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestedInformationList_sequence_of, hf_index, ett_camel_RequestedInformationList);
 
   return offset;
 }
@@ -6230,14 +6230,14 @@ static int dissect_requestedInformationList_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformationTypeList_sequence_of[1] = {
+static const ber_old_sequence_t RequestedInformationTypeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationTypeList_item },
 };
 
 static int
 dissect_camel_RequestedInformationTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestedInformationTypeList_sequence_of, hf_index, ett_camel_RequestedInformationTypeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestedInformationTypeList_sequence_of, hf_index, ett_camel_RequestedInformationTypeList);
 
   return offset;
 }
@@ -6313,7 +6313,7 @@ static int dissect_bothwayThroughConnectionInd_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t ServiceInteractionIndicatorsTwo_sequence[] = {
+static const ber_old_sequence_t ServiceInteractionIndicatorsTwo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardServiceInteractionInd_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_backwardServiceInteractionInd_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bothwayThroughConnectionInd_impl },
@@ -6327,8 +6327,8 @@ static const ber_sequence_t ServiceInteractionIndicatorsTwo_sequence[] = {
 
 static int
 dissect_camel_ServiceInteractionIndicatorsTwo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceInteractionIndicatorsTwo_sequence, hf_index, ett_camel_ServiceInteractionIndicatorsTwo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceInteractionIndicatorsTwo_sequence, hf_index, ett_camel_ServiceInteractionIndicatorsTwo);
 
   return offset;
 }
@@ -6375,7 +6375,7 @@ static int dissect_callingPartyNumberas_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SMSEvent_sequence[] = {
+static const ber_old_sequence_t SMSEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeSMS_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { 0, 0, 0, NULL }
@@ -6383,8 +6383,8 @@ static const ber_sequence_t SMSEvent_sequence[] = {
 
 static int
 dissect_camel_SMSEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMSEvent_sequence, hf_index, ett_camel_SMSEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMSEvent_sequence, hf_index, ett_camel_SMSEvent);
 
   return offset;
 }
@@ -6500,7 +6500,7 @@ static const value_string camel_SpecializedResourceReportArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SpecializedResourceReportArg_choice[] = {
+static const ber_old_choice_t SpecializedResourceReportArg_choice[] = {
   {  50, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_allAnnouncementsComplete_impl },
   {  51, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_firstAnnouncementStarted_impl },
   { 0, 0, 0, 0, NULL }
@@ -6508,9 +6508,9 @@ static const ber_choice_t SpecializedResourceReportArg_choice[] = {
 
 static int
 dissect_camel_SpecializedResourceReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SpecializedResourceReportArg_choice, hf_index, ett_camel_SpecializedResourceReportArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SpecializedResourceReportArg_choice, hf_index, ett_camel_SpecializedResourceReportArg,
+                                     NULL);
 
   return offset;
 }
@@ -6637,15 +6637,15 @@ static int dissect_messageType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MiscCallInfo_sequence[] = {
+static const ber_old_sequence_t MiscCallInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageType_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_MiscCallInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MiscCallInfo_sequence, hf_index, ett_camel_MiscCallInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MiscCallInfo_sequence, hf_index, ett_camel_MiscCallInfo);
 
   return offset;
 }
@@ -6676,15 +6676,15 @@ tvbuff_t	*parameter_tvb;
 }
 
 
-static const ber_sequence_t ApplyChargingReportArg_sequence[] = {
+static const ber_old_sequence_t ApplyChargingReportArg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_callresultOctet },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_ApplyChargingReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplyChargingReportArg_sequence, hf_index, ett_camel_ApplyChargingReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplyChargingReportArg_sequence, hf_index, ett_camel_ApplyChargingReportArg);
 
   return offset;
 }
@@ -6697,7 +6697,7 @@ static const value_string camel_CancelArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CancelArg_choice[] = {
+static const ber_old_choice_t CancelArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callInvokeID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_allRequests_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callSegmentToCancel_impl },
@@ -6706,23 +6706,23 @@ static const ber_choice_t CancelArg_choice[] = {
 
 static int
 dissect_camel_CancelArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CancelArg_choice, hf_index, ett_camel_CancelArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CancelArg_choice, hf_index, ett_camel_CancelArg,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CollectInformationArg_sequence[] = {
+static const ber_old_sequence_t CollectInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CollectInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CollectInformationArg_sequence, hf_index, ett_camel_CollectInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CollectInformationArg_sequence, hf_index, ett_camel_CollectInformationArg);
 
   return offset;
 }
@@ -6774,16 +6774,16 @@ static const value_string camel_ReceivedInformationArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReceivedInformationArg_choice[] = {
+static const ber_old_choice_t ReceivedInformationArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitsResponse_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_ReceivedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReceivedInformationArg_choice, hf_index, ett_camel_ReceivedInformationArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReceivedInformationArg_choice, hf_index, ett_camel_ReceivedInformationArg,
+                                     NULL);
 
   return offset;
 }
@@ -6799,7 +6799,7 @@ dissect_camel_FurnishChargingInformationSMSArg(gboolean implicit_tag _U_, tvbuff
 }
 
 
-static const ber_sequence_t ConnectGPRSArg_sequence[] = {
+static const ber_old_sequence_t ConnectGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_accessPointName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pdpID_impl },
   { 0, 0, 0, NULL }
@@ -6807,14 +6807,14 @@ static const ber_sequence_t ConnectGPRSArg_sequence[] = {
 
 static int
 dissect_camel_ConnectGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectGPRSArg_sequence, hf_index, ett_camel_ConnectGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectGPRSArg_sequence, hf_index, ett_camel_ConnectGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t EntityReleasedGPRSArg_sequence[] = {
+static const ber_old_sequence_t EntityReleasedGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gPRSCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
@@ -6822,14 +6822,14 @@ static const ber_sequence_t EntityReleasedGPRSArg_sequence[] = {
 
 static int
 dissect_camel_EntityReleasedGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EntityReleasedGPRSArg_sequence, hf_index, ett_camel_EntityReleasedGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EntityReleasedGPRSArg_sequence, hf_index, ett_camel_EntityReleasedGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReleaseGPRSArg_sequence[] = {
+static const ber_old_sequence_t ReleaseGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprsCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
@@ -6837,21 +6837,21 @@ static const ber_sequence_t ReleaseGPRSArg_sequence[] = {
 
 static int
 dissect_camel_ReleaseGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReleaseGPRSArg_sequence, hf_index, ett_camel_ReleaseGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReleaseGPRSArg_sequence, hf_index, ett_camel_ReleaseGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t GPRSEventArray_sequence_of[1] = {
+static const ber_old_sequence_t GPRSEventArray_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GPRSEventArray_item },
 };
 
 static int
 dissect_camel_GPRSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GPRSEventArray_sequence_of, hf_index, ett_camel_GPRSEventArray);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GPRSEventArray_sequence_of, hf_index, ett_camel_GPRSEventArray);
 
   return offset;
 }
@@ -6860,7 +6860,7 @@ static int dissect_gPRSEvent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t RequestReportGPRSEventArg_sequence[] = {
+static const ber_old_sequence_t RequestReportGPRSEventArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gPRSEvent_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
@@ -6868,22 +6868,22 @@ static const ber_sequence_t RequestReportGPRSEventArg_sequence[] = {
 
 static int
 dissect_camel_RequestReportGPRSEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestReportGPRSEventArg_sequence, hf_index, ett_camel_RequestReportGPRSEventArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestReportGPRSEventArg_sequence, hf_index, ett_camel_RequestReportGPRSEventArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendChargingInformationGPRSArg_sequence[] = {
+static const ber_old_sequence_t SendChargingInformationGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sCIGPRSBillingChargingCharacteristics_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_SendChargingInformationGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendChargingInformationGPRSArg_sequence, hf_index, ett_camel_SendChargingInformationGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendChargingInformationGPRSArg_sequence, hf_index, ett_camel_SendChargingInformationGPRSArg);
 
   return offset;
 }
@@ -6897,7 +6897,7 @@ static const value_string camel_SubscriberState_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubscriberState_choice[] = {
+static const ber_old_choice_t SubscriberState_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assumedIdle_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_camelBusy_impl },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_netDetNotReachable },
@@ -6907,9 +6907,9 @@ static const ber_choice_t SubscriberState_choice[] = {
 
 static int
 dissect_camel_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubscriberState_choice, hf_index, ett_camel_SubscriberState,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubscriberState_choice, hf_index, ett_camel_SubscriberState,
+                                     NULL);
 
   return offset;
 }
@@ -6975,7 +6975,7 @@ static int dissect_offeredCamel4Functionalities_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t InitialDPArgExtension_sequence[] = {
+static const ber_old_sequence_t InitialDPArgExtension_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmscAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingDestinationNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ms_Classmark2_impl },
@@ -6995,8 +6995,8 @@ static const ber_sequence_t InitialDPArgExtension_sequence[] = {
 
 static int
 dissect_camel_InitialDPArgExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialDPArgExtension_sequence, hf_index, ett_camel_InitialDPArgExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialDPArgExtension_sequence, hf_index, ett_camel_InitialDPArgExtension);
 
   return offset;
 }
@@ -7005,7 +7005,7 @@ static int dissect_initialDPArgExtension_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t InitiateCallAttemptArg_sequence[] = {
+static const ber_old_sequence_t InitiateCallAttemptArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legToBeCreated_impl },
@@ -7019,14 +7019,14 @@ static const ber_sequence_t InitiateCallAttemptArg_sequence[] = {
 
 static int
 dissect_camel_InitiateCallAttemptArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitiateCallAttemptArg_sequence, hf_index, ett_camel_InitiateCallAttemptArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitiateCallAttemptArg_sequence, hf_index, ett_camel_InitiateCallAttemptArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t InitiateCallAttemptRes_sequence[] = {
+static const ber_old_sequence_t InitiateCallAttemptRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_supportedCamelPhases_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_offeredCamel4Functionalities_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7035,14 +7035,14 @@ static const ber_sequence_t InitiateCallAttemptRes_sequence[] = {
 
 static int
 dissect_camel_InitiateCallAttemptRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitiateCallAttemptRes_sequence, hf_index, ett_camel_InitiateCallAttemptRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitiateCallAttemptRes_sequence, hf_index, ett_camel_InitiateCallAttemptRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t MoveLegArg_sequence[] = {
+static const ber_old_sequence_t MoveLegArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legIDToMove_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -7050,14 +7050,14 @@ static const ber_sequence_t MoveLegArg_sequence[] = {
 
 static int
 dissect_camel_MoveLegArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MoveLegArg_sequence, hf_index, ett_camel_MoveLegArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MoveLegArg_sequence, hf_index, ett_camel_MoveLegArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PlayToneArg_sequence[] = {
+static const ber_old_sequence_t PlayToneArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legOrCallSegment_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bursts_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7066,14 +7066,14 @@ static const ber_sequence_t PlayToneArg_sequence[] = {
 
 static int
 dissect_camel_PlayToneArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PlayToneArg_sequence, hf_index, ett_camel_PlayToneArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PlayToneArg_sequence, hf_index, ett_camel_PlayToneArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t EventReportGPRSArg_sequence[] = {
+static const ber_old_sequence_t EventReportGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gPRSEventType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_miscGPRSInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gPRSEventSpecificInformation_impl },
@@ -7083,14 +7083,14 @@ static const ber_sequence_t EventReportGPRSArg_sequence[] = {
 
 static int
 dissect_camel_EventReportGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportGPRSArg_sequence, hf_index, ett_camel_EventReportGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportGPRSArg_sequence, hf_index, ett_camel_EventReportGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ApplyChargingArg_sequence[] = {
+static const ber_old_sequence_t ApplyChargingArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_aChBillingChargingCharacteristics_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge1_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7100,14 +7100,14 @@ static const ber_sequence_t ApplyChargingArg_sequence[] = {
 
 static int
 dissect_camel_ApplyChargingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplyChargingArg_sequence, hf_index, ett_camel_ApplyChargingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplyChargingArg_sequence, hf_index, ett_camel_ApplyChargingArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t AssistRequestInstructionsArg_sequence[] = {
+static const ber_old_sequence_t AssistRequestInstructionsArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_iPSSPCapabilities_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7116,14 +7116,14 @@ static const ber_sequence_t AssistRequestInstructionsArg_sequence[] = {
 
 static int
 dissect_camel_AssistRequestInstructionsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AssistRequestInstructionsArg_sequence, hf_index, ett_camel_AssistRequestInstructionsArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AssistRequestInstructionsArg_sequence, hf_index, ett_camel_AssistRequestInstructionsArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CallInformationRequestArg_sequence[] = {
+static const ber_old_sequence_t CallInformationRequestArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationTypeList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID3_impl },
@@ -7132,14 +7132,14 @@ static const ber_sequence_t CallInformationRequestArg_sequence[] = {
 
 static int
 dissect_camel_CallInformationRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallInformationRequestArg_sequence, hf_index, ett_camel_CallInformationRequestArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallInformationRequestArg_sequence, hf_index, ett_camel_CallInformationRequestArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ConnectArg_sequence[] = {
+static const ber_old_sequence_t ConnectArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl },
@@ -7164,8 +7164,8 @@ static const ber_sequence_t ConnectArg_sequence[] = {
 
 static int
 dissect_camel_ConnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectArg_sequence, hf_index, ett_camel_ConnectArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectArg_sequence, hf_index, ett_camel_ConnectArg);
 
   return offset;
 }
@@ -7177,7 +7177,7 @@ static const value_string camel_T_resourceAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_resourceAddress_choice[] = {
+static const ber_old_choice_t T_resourceAddress_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_none_impl },
   { 0, 0, 0, 0, NULL }
@@ -7185,9 +7185,9 @@ static const ber_choice_t T_resourceAddress_choice[] = {
 
 static int
 dissect_camel_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_resourceAddress_choice, hf_index, ett_camel_T_resourceAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_resourceAddress_choice, hf_index, ett_camel_T_resourceAddress,
+                                     NULL);
 
   return offset;
 }
@@ -7196,7 +7196,7 @@ static int dissect_resourceAddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ConnectToResourceArg_sequence[] = {
+static const ber_old_sequence_t ConnectToResourceArg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceAddress },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicatorsTwo_impl },
@@ -7206,14 +7206,14 @@ static const ber_sequence_t ConnectToResourceArg_sequence[] = {
 
 static int
 dissect_camel_ConnectToResourceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectToResourceArg_sequence, hf_index, ett_camel_ConnectToResourceArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectToResourceArg_sequence, hf_index, ett_camel_ConnectToResourceArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ContinueWithArgumentArgExtension_sequence[] = {
+static const ber_old_sequence_t ContinueWithArgumentArgExtension_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppress_D_CSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppress_N_CSI_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppressOutgoingCallBarring_impl },
@@ -7223,8 +7223,8 @@ static const ber_sequence_t ContinueWithArgumentArgExtension_sequence[] = {
 
 static int
 dissect_camel_ContinueWithArgumentArgExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContinueWithArgumentArgExtension_sequence, hf_index, ett_camel_ContinueWithArgumentArgExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContinueWithArgumentArgExtension_sequence, hf_index, ett_camel_ContinueWithArgumentArgExtension);
 
   return offset;
 }
@@ -7233,7 +7233,7 @@ static int dissect_continueWithArgumentArgExtension_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t ContinueWithArgumentArg_sequence[] = {
+static const ber_old_sequence_t ContinueWithArgumentArg_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicatorsTwo_impl },
@@ -7253,14 +7253,14 @@ static const ber_sequence_t ContinueWithArgumentArg_sequence[] = {
 
 static int
 dissect_camel_ContinueWithArgumentArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContinueWithArgumentArg_sequence, hf_index, ett_camel_ContinueWithArgumentArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContinueWithArgumentArg_sequence, hf_index, ett_camel_ContinueWithArgumentArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DisconnectLegArg_sequence[] = {
+static const ber_old_sequence_t DisconnectLegArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legToBeReleased_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7269,8 +7269,8 @@ static const ber_sequence_t DisconnectLegArg_sequence[] = {
 
 static int
 dissect_camel_DisconnectLegArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DisconnectLegArg_sequence, hf_index, ett_camel_DisconnectLegArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DisconnectLegArg_sequence, hf_index, ett_camel_DisconnectLegArg);
 
   return offset;
 }
@@ -7282,7 +7282,7 @@ static const value_string camel_EntityReleasedArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EntityReleasedArg_choice[] = {
+static const ber_old_choice_t EntityReleasedArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callSegmentFailure_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bCSM_Failure_impl },
   { 0, 0, 0, 0, NULL }
@@ -7290,15 +7290,15 @@ static const ber_choice_t EntityReleasedArg_choice[] = {
 
 static int
 dissect_camel_EntityReleasedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EntityReleasedArg_choice, hf_index, ett_camel_EntityReleasedArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EntityReleasedArg_choice, hf_index, ett_camel_EntityReleasedArg,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t DisconnectForwardConnectionWithArgumentArg_sequence[] = {
+static const ber_old_sequence_t DisconnectForwardConnectionWithArgumentArg_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callSegmentID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -7306,14 +7306,14 @@ static const ber_sequence_t DisconnectForwardConnectionWithArgumentArg_sequence[
 
 static int
 dissect_camel_DisconnectForwardConnectionWithArgumentArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DisconnectForwardConnectionWithArgumentArg_sequence, hf_index, ett_camel_DisconnectForwardConnectionWithArgumentArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DisconnectForwardConnectionWithArgumentArg_sequence, hf_index, ett_camel_DisconnectForwardConnectionWithArgumentArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
+static const ber_old_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assistingSSPIPRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scfID_impl },
@@ -7330,14 +7330,14 @@ static const ber_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
 
 static int
 dissect_camel_EstablishTemporaryConnectionArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EstablishTemporaryConnectionArg_sequence, hf_index, ett_camel_EstablishTemporaryConnectionArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EstablishTemporaryConnectionArg_sequence, hf_index, ett_camel_EstablishTemporaryConnectionArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t EventReportBCSMArg_sequence[] = {
+static const ber_old_sequence_t EventReportBCSMArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventSpecificInformationBCSM_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID4_impl },
@@ -7348,14 +7348,14 @@ static const ber_sequence_t EventReportBCSMArg_sequence[] = {
 
 static int
 dissect_camel_EventReportBCSMArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportBCSMArg_sequence, hf_index, ett_camel_EventReportBCSMArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportBCSMArg_sequence, hf_index, ett_camel_EventReportBCSMArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ResetTimerArg_sequence[] = {
+static const ber_old_sequence_t ResetTimerArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7365,14 +7365,14 @@ static const ber_sequence_t ResetTimerArg_sequence[] = {
 
 static int
 dissect_camel_ResetTimerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResetTimerArg_sequence, hf_index, ett_camel_ResetTimerArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResetTimerArg_sequence, hf_index, ett_camel_ResetTimerArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendChargingInformationArg_sequence[] = {
+static const ber_old_sequence_t SendChargingInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sCIBillingChargingCharacteristics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge2_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7381,14 +7381,14 @@ static const ber_sequence_t SendChargingInformationArg_sequence[] = {
 
 static int
 dissect_camel_SendChargingInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendChargingInformationArg_sequence, hf_index, ett_camel_SendChargingInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendChargingInformationArg_sequence, hf_index, ett_camel_SendChargingInformationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SplitLegArg_sequence[] = {
+static const ber_old_sequence_t SplitLegArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legToBeSplit_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_newCallSegment_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7397,14 +7397,14 @@ static const ber_sequence_t SplitLegArg_sequence[] = {
 
 static int
 dissect_camel_SplitLegArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SplitLegArg_sequence, hf_index, ett_camel_SplitLegArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SplitLegArg_sequence, hf_index, ett_camel_SplitLegArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CAPGPRSReferenceNumber_sequence[] = {
+static const ber_old_sequence_t CAPGPRSReferenceNumber_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_destinationReference },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_originationReference },
   { 0, 0, 0, NULL }
@@ -7412,14 +7412,14 @@ static const ber_sequence_t CAPGPRSReferenceNumber_sequence[] = {
 
 static int
 dissect_camel_CAPGPRSReferenceNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAPGPRSReferenceNumber_sequence, hf_index, ett_camel_CAPGPRSReferenceNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAPGPRSReferenceNumber_sequence, hf_index, ett_camel_CAPGPRSReferenceNumber);
 
   return offset;
 }
 
 
-static const ber_sequence_t EventReportSMSArg_sequence[] = {
+static const ber_old_sequence_t EventReportSMSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeSMS_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventSpecificInformationSMS_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_miscCallInfo_impl },
@@ -7429,14 +7429,14 @@ static const ber_sequence_t EventReportSMSArg_sequence[] = {
 
 static int
 dissect_camel_EventReportSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportSMSArg_sequence, hf_index, ett_camel_EventReportSMSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportSMSArg_sequence, hf_index, ett_camel_EventReportSMSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ResetTimerSMSArg_sequence[] = {
+static const ber_old_sequence_t ResetTimerSMSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -7445,21 +7445,21 @@ static const ber_sequence_t ResetTimerSMSArg_sequence[] = {
 
 static int
 dissect_camel_ResetTimerSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResetTimerSMSArg_sequence, hf_index, ett_camel_ResetTimerSMSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResetTimerSMSArg_sequence, hf_index, ett_camel_ResetTimerSMSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t BCSMEventArray_sequence_of[1] = {
+static const ber_old_sequence_t BCSMEventArray_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BCSMEventArray_item },
 };
 
 static int
 dissect_camel_BCSMEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BCSMEventArray_sequence_of, hf_index, ett_camel_BCSMEventArray);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BCSMEventArray_sequence_of, hf_index, ett_camel_BCSMEventArray);
 
   return offset;
 }
@@ -7468,7 +7468,7 @@ static int dissect_bcsmEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RequestReportBCSMEventArg_sequence[] = {
+static const ber_old_sequence_t RequestReportBCSMEventArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bcsmEvents_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -7476,14 +7476,14 @@ static const ber_sequence_t RequestReportBCSMEventArg_sequence[] = {
 
 static int
 dissect_camel_RequestReportBCSMEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestReportBCSMEventArg_sequence, hf_index, ett_camel_RequestReportBCSMEventArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestReportBCSMEventArg_sequence, hf_index, ett_camel_RequestReportBCSMEventArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ConnectSMSArg_sequence[] = {
+static const ber_old_sequence_t ConnectSMSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartysNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationSubscriberNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sMSCAddress_impl },
@@ -7493,14 +7493,14 @@ static const ber_sequence_t ConnectSMSArg_sequence[] = {
 
 static int
 dissect_camel_ConnectSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectSMSArg_sequence, hf_index, ett_camel_ConnectSMSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectSMSArg_sequence, hf_index, ett_camel_ConnectSMSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CallInformationReportArg_sequence[] = {
+static const ber_old_sequence_t CallInformationReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID5_impl },
@@ -7509,14 +7509,14 @@ static const ber_sequence_t CallInformationReportArg_sequence[] = {
 
 static int
 dissect_camel_CallInformationReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallInformationReportArg_sequence, hf_index, ett_camel_CallInformationReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallInformationReportArg_sequence, hf_index, ett_camel_CallInformationReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PlayAnnouncementArg_sequence[] = {
+static const ber_old_sequence_t PlayAnnouncementArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestAnnouncementComplete_impl },
@@ -7528,14 +7528,14 @@ static const ber_sequence_t PlayAnnouncementArg_sequence[] = {
 
 static int
 dissect_camel_PlayAnnouncementArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PlayAnnouncementArg_sequence, hf_index, ett_camel_PlayAnnouncementArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PlayAnnouncementArg_sequence, hf_index, ett_camel_PlayAnnouncementArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
+static const ber_old_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_collectedInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
@@ -7547,8 +7547,8 @@ static const ber_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
 
 static int
 dissect_camel_PromptAndCollectUserInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PromptAndCollectUserInformationArg_sequence, hf_index, ett_camel_PromptAndCollectUserInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PromptAndCollectUserInformationArg_sequence, hf_index, ett_camel_PromptAndCollectUserInformationArg);
 
   return offset;
 }
@@ -7563,7 +7563,7 @@ dissect_camel_FurnishChargingInformationGPRSArg(gboolean implicit_tag _U_, tvbuf
 }
 
 
-static const ber_sequence_t InitialDPGPRSArg_sequence[] = {
+static const ber_old_sequence_t InitialDPGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gPRSEventType_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mSISDN_impl },
@@ -7587,14 +7587,14 @@ static const ber_sequence_t InitialDPGPRSArg_sequence[] = {
 
 static int
 dissect_camel_InitialDPGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialDPGPRSArg_sequence, hf_index, ett_camel_InitialDPGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialDPGPRSArg_sequence, hf_index, ett_camel_InitialDPGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CallGapArg_sequence[] = {
+static const ber_old_sequence_t CallGapArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gapCriteria_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapIndicators_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlType_impl },
@@ -7605,14 +7605,14 @@ static const ber_sequence_t CallGapArg_sequence[] = {
 
 static int
 dissect_camel_CallGapArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallGapArg_sequence, hf_index, ett_camel_CallGapArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallGapArg_sequence, hf_index, ett_camel_CallGapArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t InitialDPArg_sequence[] = {
+static const ber_old_sequence_t InitialDPArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl },
@@ -7649,14 +7649,14 @@ static const ber_sequence_t InitialDPArg_sequence[] = {
 
 static int
 dissect_camel_InitialDPArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialDPArg_sequence, hf_index, ett_camel_InitialDPArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialDPArg_sequence, hf_index, ett_camel_InitialDPArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t InitialDPSMSArg_sequence[] = {
+static const ber_old_sequence_t InitialDPSMSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationSubscriberNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumberas_impl },
@@ -7683,8 +7683,8 @@ static const ber_sequence_t InitialDPSMSArg_sequence[] = {
 
 static int
 dissect_camel_InitialDPSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialDPSMSArg_sequence, hf_index, ett_camel_InitialDPSMSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialDPSMSArg_sequence, hf_index, ett_camel_InitialDPSMSArg);
 
   return offset;
 }
@@ -7699,14 +7699,14 @@ dissect_camel_ReleaseSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SMSEventArray_sequence_of[1] = {
+static const ber_old_sequence_t SMSEventArray_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMSEventArray_item },
 };
 
 static int
 dissect_camel_SMSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray);
 
   return offset;
 }
@@ -7715,7 +7715,7 @@ static int dissect_sMSEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t RequestReportSMSEventArg_sequence[] = {
+static const ber_old_sequence_t RequestReportSMSEventArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sMSEvents_impl },
   { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -7723,14 +7723,14 @@ static const ber_sequence_t RequestReportSMSEventArg_sequence[] = {
 
 static int
 dissect_camel_RequestReportSMSEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestReportSMSEventArg_sequence, hf_index, ett_camel_RequestReportSMSEventArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestReportSMSEventArg_sequence, hf_index, ett_camel_RequestReportSMSEventArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ApplyChargingGPRSArg_sequence[] = {
+static const ber_old_sequence_t ApplyChargingGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_chargingCharacteristics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tariffSwitchInterval_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
@@ -7739,14 +7739,14 @@ static const ber_sequence_t ApplyChargingGPRSArg_sequence[] = {
 
 static int
 dissect_camel_ApplyChargingGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplyChargingGPRSArg_sequence, hf_index, ett_camel_ApplyChargingGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplyChargingGPRSArg_sequence, hf_index, ett_camel_ApplyChargingGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ApplyChargingReportGPRSArg_sequence[] = {
+static const ber_old_sequence_t ApplyChargingReportGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_chargingResult_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_qualityOfService_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_active_impl },
@@ -7757,42 +7757,42 @@ static const ber_sequence_t ApplyChargingReportGPRSArg_sequence[] = {
 
 static int
 dissect_camel_ApplyChargingReportGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplyChargingReportGPRSArg_sequence, hf_index, ett_camel_ApplyChargingReportGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplyChargingReportGPRSArg_sequence, hf_index, ett_camel_ApplyChargingReportGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CancelGPRSArg_sequence[] = {
+static const ber_old_sequence_t CancelGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_CancelGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelGPRSArg_sequence, hf_index, ett_camel_CancelGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelGPRSArg_sequence, hf_index, ett_camel_CancelGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ContinueGPRSArg_sequence[] = {
+static const ber_old_sequence_t ContinueGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_camel_ContinueGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContinueGPRSArg_sequence, hf_index, ett_camel_ContinueGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContinueGPRSArg_sequence, hf_index, ett_camel_ContinueGPRSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ResetTimerGPRSArg_sequence[] = {
+static const ber_old_sequence_t ResetTimerGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl },
   { 0, 0, 0, NULL }
@@ -7800,8 +7800,8 @@ static const ber_sequence_t ResetTimerGPRSArg_sequence[] = {
 
 static int
 dissect_camel_ResetTimerGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResetTimerGPRSArg_sequence, hf_index, ett_camel_ResetTimerGPRSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResetTimerGPRSArg_sequence, hf_index, ett_camel_ResetTimerGPRSArg);
 
   return offset;
 }
@@ -7827,7 +7827,7 @@ static int dissect_cancelproblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t CancelFailedPARAM_sequence[] = {
+static const ber_old_sequence_t CancelFailedPARAM_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cancelproblem_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_operation_impl },
   { 0, 0, 0, NULL }
@@ -7835,8 +7835,8 @@ static const ber_sequence_t CancelFailedPARAM_sequence[] = {
 
 static int
 dissect_camel_CancelFailedPARAM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelFailedPARAM_sequence, hf_index, ett_camel_CancelFailedPARAM);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelFailedPARAM_sequence, hf_index, ett_camel_CancelFailedPARAM);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index d270ac851b..166e251d7d 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -164,7 +164,7 @@ static const value_string cdt_CompressionAlgorithmIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CompressionAlgorithmIdentifier_choice[] = {
+static const ber_old_choice_t CompressionAlgorithmIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_algorithmID_ShortForm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_algorithmID_OID_impl },
   { 0, 0, 0, 0, NULL }
@@ -172,9 +172,9 @@ static const ber_choice_t CompressionAlgorithmIdentifier_choice[] = {
 
 static int
 dissect_cdt_CompressionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CompressionAlgorithmIdentifier_choice, hf_index, ett_cdt_CompressionAlgorithmIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CompressionAlgorithmIdentifier_choice, hf_index, ett_cdt_CompressionAlgorithmIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -225,7 +225,7 @@ static const value_string cdt_T_contentType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_contentType_choice[] = {
+static const ber_old_choice_t T_contentType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contentType_ShortForm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_contentType_OID_impl },
   { 0, 0, 0, 0, NULL }
@@ -233,9 +233,9 @@ static const ber_choice_t T_contentType_choice[] = {
 
 static int
 dissect_cdt_T_contentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_contentType_choice, hf_index, ett_cdt_T_contentType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_contentType_choice, hf_index, ett_cdt_T_contentType,
+                                     NULL);
 
   return offset;
 }
@@ -293,7 +293,7 @@ static int dissect_compressedContent(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CompressedContentInfo_sequence[] = {
+static const ber_old_sequence_t CompressedContentInfo_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contentType },
   { BER_CLASS_CON, 0, 0, dissect_compressedContent },
   { 0, 0, 0, NULL }
@@ -301,8 +301,8 @@ static const ber_sequence_t CompressedContentInfo_sequence[] = {
 
 static int
 dissect_cdt_CompressedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CompressedContentInfo_sequence, hf_index, ett_cdt_CompressedContentInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CompressedContentInfo_sequence, hf_index, ett_cdt_CompressedContentInfo);
 
   return offset;
 }
@@ -311,7 +311,7 @@ static int dissect_compressedContentInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t CompressedData_sequence[] = {
+static const ber_old_sequence_t CompressedData_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_compressionAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_compressedContentInfo },
   { 0, 0, 0, NULL }
@@ -319,8 +319,8 @@ static const ber_sequence_t CompressedData_sequence[] = {
 
 int
 dissect_cdt_CompressedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CompressedData_sequence, hf_index, ett_cdt_CompressedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CompressedData_sequence, hf_index, ett_cdt_CompressedData);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index d12a140930..c71c285277 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -403,7 +403,7 @@ static int dissect_attributeValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ModificationItem_sequence[] = {
+static const ber_old_sequence_t ModificationItem_sequence[] = {
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributeValue },
@@ -412,8 +412,8 @@ static const ber_sequence_t ModificationItem_sequence[] = {
 
 static int
 dissect_cmip_ModificationItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationItem_sequence, hf_index, ett_cmip_ModificationItem);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationItem_sequence, hf_index, ett_cmip_ModificationItem);
 
   return offset;
 }
@@ -460,7 +460,7 @@ const value_string cmip_ObjectClass_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ObjectClass_choice[] = {
+static const ber_old_choice_t ObjectClass_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ocglobalForm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_oclocalForm_impl },
   { 0, 0, 0, 0, NULL }
@@ -468,9 +468,9 @@ static const ber_choice_t ObjectClass_choice[] = {
 
 int
 dissect_cmip_ObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ObjectClass_choice, hf_index, ett_cmip_ObjectClass,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ObjectClass_choice, hf_index, ett_cmip_ObjectClass,
+                                     NULL);
 
   return offset;
 }
@@ -509,7 +509,7 @@ static int dissect_value1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t AttributeValueAssertion_sequence[] = {
+static const ber_old_sequence_t AttributeValueAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_id1 },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value1 },
   { 0, 0, 0, NULL }
@@ -517,8 +517,8 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = {
 
 static int
 dissect_cmip_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeValueAssertion_sequence, hf_index, ett_cmip_AttributeValueAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeValueAssertion_sequence, hf_index, ett_cmip_AttributeValueAssertion);
 
   return offset;
 }
@@ -527,14 +527,14 @@ static int dissect_RelativeDistinguishedName_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
+static const ber_old_sequence_t RelativeDistinguishedName_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
 };
 
 static int
 dissect_cmip_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RelativeDistinguishedName_set_of, hf_index, ett_cmip_RelativeDistinguishedName);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RelativeDistinguishedName_set_of, hf_index, ett_cmip_RelativeDistinguishedName);
 
   return offset;
 }
@@ -543,14 +543,14 @@ static int dissect_RDNSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RDNSequence_sequence_of[1] = {
+static const ber_old_sequence_t RDNSequence_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
 };
 
 int
 dissect_cmip_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RDNSequence_sequence_of, hf_index, ett_cmip_RDNSequence);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RDNSequence_sequence_of, hf_index, ett_cmip_RDNSequence);
 
   return offset;
 }
@@ -594,7 +594,7 @@ const value_string cmip_ObjectInstance_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ObjectInstance_choice[] = {
+static const ber_old_choice_t ObjectInstance_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_distinguishedName_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_nonSpecificForm_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_localDistinguishedName_impl },
@@ -603,9 +603,9 @@ static const ber_choice_t ObjectInstance_choice[] = {
 
 int
 dissect_cmip_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance,
+                                     NULL);
 
   return offset;
 }
@@ -696,7 +696,7 @@ static const value_string cmip_AttributeId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AttributeId_choice[] = {
+static const ber_old_choice_t AttributeId_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_globalForm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_localForm_impl },
   { 0, 0, 0, 0, NULL }
@@ -704,9 +704,9 @@ static const ber_choice_t AttributeId_choice[] = {
 
 static int
 dissect_cmip_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AttributeId_choice, hf_index, ett_cmip_AttributeId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AttributeId_choice, hf_index, ett_cmip_AttributeId,
+                                     NULL);
 
   return offset;
 }
@@ -724,7 +724,7 @@ static int dissect_attributeIdList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AttributeIdError_sequence[] = {
+static const ber_old_sequence_t AttributeIdError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeId1 },
   { 0, 0, 0, NULL }
@@ -732,8 +732,8 @@ static const ber_sequence_t AttributeIdError_sequence[] = {
 
 static int
 dissect_cmip_AttributeIdError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeIdError_sequence, hf_index, ett_cmip_AttributeIdError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeIdError_sequence, hf_index, ett_cmip_AttributeIdError);
 
   return offset;
 }
@@ -759,7 +759,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t Attribute_sequence[] = {
+static const ber_old_sequence_t Attribute_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_id },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
   { 0, 0, 0, NULL }
@@ -767,8 +767,8 @@ static const ber_sequence_t Attribute_sequence[] = {
 
 int
 dissect_cmip_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_sequence, hf_index, ett_cmip_Attribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_sequence, hf_index, ett_cmip_Attribute);
 
   return offset;
 }
@@ -813,7 +813,7 @@ static const value_string cmip_GetInfoStatus_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GetInfoStatus_choice[] = {
+static const ber_old_choice_t GetInfoStatus_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeIdError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl },
   { 0, 0, 0, 0, NULL }
@@ -821,9 +821,9 @@ static const ber_choice_t GetInfoStatus_choice[] = {
 
 static int
 dissect_cmip_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus,
+                                     NULL);
 
   return offset;
 }
@@ -832,14 +832,14 @@ static int dissect_getInfoList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_GetInfoStatus_set_of[1] = {
+static const ber_old_sequence_t SET_OF_GetInfoStatus_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_getInfoList_item },
 };
 
 static int
 dissect_cmip_SET_OF_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_GetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_GetInfoStatus);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_GetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_GetInfoStatus);
 
   return offset;
 }
@@ -848,7 +848,7 @@ static int dissect_getInfoList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t GetListError_sequence[] = {
+static const ber_old_sequence_t GetListError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -858,8 +858,8 @@ static const ber_sequence_t GetListError_sequence[] = {
 
 static int
 dissect_cmip_GetListError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetListError_sequence, hf_index, ett_cmip_GetListError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetListError_sequence, hf_index, ett_cmip_GetListError);
 
   return offset;
 }
@@ -917,7 +917,7 @@ static int dissect_attributeValue1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AttributeError_sequence[] = {
+static const ber_old_sequence_t AttributeError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus2 },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId2 },
@@ -927,8 +927,8 @@ static const ber_sequence_t AttributeError_sequence[] = {
 
 static int
 dissect_cmip_AttributeError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeError_sequence, hf_index, ett_cmip_AttributeError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeError_sequence, hf_index, ett_cmip_AttributeError);
 
   return offset;
 }
@@ -943,7 +943,7 @@ static const value_string cmip_SetInfoStatus_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SetInfoStatus_choice[] = {
+static const ber_old_choice_t SetInfoStatus_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl },
   { 0, 0, 0, 0, NULL }
@@ -951,9 +951,9 @@ static const ber_choice_t SetInfoStatus_choice[] = {
 
 static int
 dissect_cmip_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus,
+                                     NULL);
 
   return offset;
 }
@@ -962,14 +962,14 @@ static int dissect_setInfoList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_SetInfoStatus_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SetInfoStatus_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_setInfoList_item },
 };
 
 static int
 dissect_cmip_SET_OF_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_SetInfoStatus);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_SetInfoStatus);
 
   return offset;
 }
@@ -978,7 +978,7 @@ static int dissect_setInfoList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SetListError_sequence[] = {
+static const ber_old_sequence_t SetListError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -988,8 +988,8 @@ static const ber_sequence_t SetListError_sequence[] = {
 
 static int
 dissect_cmip_SetListError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SetListError_sequence, hf_index, ett_cmip_SetListError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SetListError_sequence, hf_index, ett_cmip_SetListError);
 
   return offset;
 }
@@ -1043,7 +1043,7 @@ static int dissect_actionType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t NoSuchArgumentAction_sequence[] = {
+static const ber_old_sequence_t NoSuchArgumentAction_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType },
   { 0, 0, 0, NULL }
@@ -1051,8 +1051,8 @@ static const ber_sequence_t NoSuchArgumentAction_sequence[] = {
 
 static int
 dissect_cmip_NoSuchArgumentAction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoSuchArgumentAction_sequence, hf_index, ett_cmip_NoSuchArgumentAction);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoSuchArgumentAction_sequence, hf_index, ett_cmip_NoSuchArgumentAction);
 
   return offset;
 }
@@ -1073,7 +1073,7 @@ static int dissect_eventType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t NoSuchArgumentEvent_sequence[] = {
+static const ber_old_sequence_t NoSuchArgumentEvent_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType },
   { 0, 0, 0, NULL }
@@ -1081,8 +1081,8 @@ static const ber_sequence_t NoSuchArgumentEvent_sequence[] = {
 
 static int
 dissect_cmip_NoSuchArgumentEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoSuchArgumentEvent_sequence, hf_index, ett_cmip_NoSuchArgumentEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoSuchArgumentEvent_sequence, hf_index, ett_cmip_NoSuchArgumentEvent);
 
   return offset;
 }
@@ -1097,7 +1097,7 @@ static const value_string cmip_NoSuchArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NoSuchArgument_choice[] = {
+static const ber_old_choice_t NoSuchArgument_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionId_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventId_impl },
   { 0, 0, 0, 0, NULL }
@@ -1105,9 +1105,9 @@ static const ber_choice_t NoSuchArgument_choice[] = {
 
 static int
 dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1143,7 +1143,7 @@ static int dissect_actionInfoArg(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t ActionInfo_sequence[] = {
+static const ber_old_sequence_t ActionInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType3 },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_actionInfoArg },
   { 0, 0, 0, NULL }
@@ -1151,8 +1151,8 @@ static const ber_sequence_t ActionInfo_sequence[] = {
 
 static int
 dissect_cmip_ActionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionInfo_sequence, hf_index, ett_cmip_ActionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionInfo_sequence, hf_index, ett_cmip_ActionInfo);
 
   return offset;
 }
@@ -1191,7 +1191,7 @@ static int dissect_eventInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t InvalidArgumentValueEventValue_sequence[] = {
+static const ber_old_sequence_t InvalidArgumentValueEventValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType1 },
   { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventInfo },
   { 0, 0, 0, NULL }
@@ -1199,8 +1199,8 @@ static const ber_sequence_t InvalidArgumentValueEventValue_sequence[] = {
 
 static int
 dissect_cmip_InvalidArgumentValueEventValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InvalidArgumentValueEventValue_sequence, hf_index, ett_cmip_InvalidArgumentValueEventValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InvalidArgumentValueEventValue_sequence, hf_index, ett_cmip_InvalidArgumentValueEventValue);
 
   return offset;
 }
@@ -1215,7 +1215,7 @@ static const value_string cmip_InvalidArgumentValue_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InvalidArgumentValue_choice[] = {
+static const ber_old_choice_t InvalidArgumentValue_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionValue_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventValue_impl },
   { 0, 0, 0, 0, NULL }
@@ -1223,9 +1223,9 @@ static const ber_choice_t InvalidArgumentValue_choice[] = {
 
 static int
 dissect_cmip_InvalidArgumentValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue,
+                                     NULL);
 
   return offset;
 }
@@ -1241,7 +1241,7 @@ static const value_string cmip_ErrorInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ErrorInfo_choice[] = {
+static const ber_old_choice_t ErrorInfo_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType1 },
   {   1, BER_CLASS_CON, 0, 0, dissect_actionArgument },
   {   2, BER_CLASS_CON, 1, 0, dissect_argumentValue },
@@ -1250,9 +1250,9 @@ static const ber_choice_t ErrorInfo_choice[] = {
 
 static int
 dissect_cmip_ErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo,
+                                     NULL);
 
   return offset;
 }
@@ -1261,7 +1261,7 @@ static int dissect_errorInfo1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ActionErrorInfo_sequence[] = {
+static const ber_old_sequence_t ActionErrorInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus1 },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorInfo1 },
   { 0, 0, 0, NULL }
@@ -1269,8 +1269,8 @@ static const ber_sequence_t ActionErrorInfo_sequence[] = {
 
 static int
 dissect_cmip_ActionErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionErrorInfo_sequence, hf_index, ett_cmip_ActionErrorInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionErrorInfo_sequence, hf_index, ett_cmip_ActionErrorInfo);
 
   return offset;
 }
@@ -1279,7 +1279,7 @@ static int dissect_actionErrorInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ActionError_sequence[] = {
+static const ber_old_sequence_t ActionError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1289,8 +1289,8 @@ static const ber_sequence_t ActionError_sequence[] = {
 
 static int
 dissect_cmip_ActionError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionError_sequence, hf_index, ett_cmip_ActionError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionError_sequence, hf_index, ett_cmip_ActionError);
 
   return offset;
 }
@@ -1326,7 +1326,7 @@ static int dissect_errorInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SpecificErrorInfo_sequence[] = {
+static const ber_old_sequence_t SpecificErrorInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_errorId },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_errorInfo },
   { 0, 0, 0, NULL }
@@ -1334,8 +1334,8 @@ static const ber_sequence_t SpecificErrorInfo_sequence[] = {
 
 static int
 dissect_cmip_SpecificErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SpecificErrorInfo_sequence, hf_index, ett_cmip_SpecificErrorInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SpecificErrorInfo_sequence, hf_index, ett_cmip_SpecificErrorInfo);
 
   return offset;
 }
@@ -1344,7 +1344,7 @@ static int dissect_specificErrorInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ProcessingFailure_sequence[] = {
+static const ber_old_sequence_t ProcessingFailure_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, 0, dissect_specificErrorInfo },
@@ -1353,8 +1353,8 @@ static const ber_sequence_t ProcessingFailure_sequence[] = {
 
 static int
 dissect_cmip_ProcessingFailure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProcessingFailure_sequence, hf_index, ett_cmip_ProcessingFailure);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProcessingFailure_sequence, hf_index, ett_cmip_ProcessingFailure);
 
   return offset;
 }
@@ -1381,7 +1381,7 @@ static int dissect_deleteErrorInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DeleteError_sequence[] = {
+static const ber_old_sequence_t DeleteError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1391,8 +1391,8 @@ static const ber_sequence_t DeleteError_sequence[] = {
 
 static int
 dissect_cmip_DeleteError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteError_sequence, hf_index, ett_cmip_DeleteError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteError_sequence, hf_index, ett_cmip_DeleteError);
 
   return offset;
 }
@@ -1401,14 +1401,14 @@ static int dissect_deleteError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
 };
 
 static int
 dissect_cmip_SET_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Attribute_set_of, hf_index, ett_cmip_SET_OF_Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Attribute_set_of, hf_index, ett_cmip_SET_OF_Attribute);
 
   return offset;
 }
@@ -1417,7 +1417,7 @@ static int dissect_attributeList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SetResult_sequence[] = {
+static const ber_old_sequence_t SetResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1427,8 +1427,8 @@ static const ber_sequence_t SetResult_sequence[] = {
 
 static int
 dissect_cmip_SetResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SetResult_sequence, hf_index, ett_cmip_SetResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SetResult_sequence, hf_index, ett_cmip_SetResult);
 
   return offset;
 }
@@ -1511,7 +1511,7 @@ static const value_string cmip_Scope_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Scope_choice[] = {
+static const ber_old_choice_t Scope_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_namedNumbers },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_individualLevels_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseToNthLevel_impl },
@@ -1520,9 +1520,9 @@ static const ber_choice_t Scope_choice[] = {
 
 static int
 dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Scope_choice, hf_index, ett_cmip_Scope,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Scope_choice, hf_index, ett_cmip_Scope,
+                                     NULL);
 
   return offset;
 }
@@ -1538,7 +1538,7 @@ static const value_string cmip_T_substrings_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_substrings_item_choice[] = {
+static const ber_old_choice_t T_substrings_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initialString_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_anyString_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_finalString_impl },
@@ -1547,9 +1547,9 @@ static const ber_choice_t T_substrings_item_choice[] = {
 
 static int
 dissect_cmip_T_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item,
+                                     NULL);
 
   return offset;
 }
@@ -1558,14 +1558,14 @@ static int dissect_substrings_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_substrings_sequence_of[1] = {
+static const ber_old_sequence_t T_substrings_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substrings_item },
 };
 
 static int
 dissect_cmip_T_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_substrings_sequence_of, hf_index, ett_cmip_T_substrings);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_substrings_sequence_of, hf_index, ett_cmip_T_substrings);
 
   return offset;
 }
@@ -1586,7 +1586,7 @@ static const value_string cmip_FilterItem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FilterItem_choice[] = {
+static const ber_old_choice_t FilterItem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_substrings_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_greaterOrEqual_impl },
@@ -1600,9 +1600,9 @@ static const ber_choice_t FilterItem_choice[] = {
 
 static int
 dissect_cmip_FilterItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FilterItem_choice, hf_index, ett_cmip_FilterItem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FilterItem_choice, hf_index, ett_cmip_FilterItem,
+                                     NULL);
 
   return offset;
 }
@@ -1611,14 +1611,14 @@ static int dissect_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SET_OF_CMISFilter_set_of[1] = {
+static const ber_old_sequence_t SET_OF_CMISFilter_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 
 static int
 dissect_cmip_SET_OF_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_CMISFilter_set_of, hf_index, ett_cmip_SET_OF_CMISFilter);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_CMISFilter_set_of, hf_index, ett_cmip_SET_OF_CMISFilter);
 
   return offset;
 }
@@ -1638,7 +1638,7 @@ static const value_string cmip_CMISFilter_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CMISFilter_choice[] = {
+static const ber_old_choice_t CMISFilter_choice[] = {
   {   8, BER_CLASS_CON, 8, 0, dissect_item },
   {   9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_and_impl },
   {  10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_or_impl },
@@ -1648,22 +1648,22 @@ static const ber_choice_t CMISFilter_choice[] = {
 
 static int
 dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CMISFilter_choice, hf_index, ett_cmip_CMISFilter,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CMISFilter_choice, hf_index, ett_cmip_CMISFilter,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_ModificationItem_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ModificationItem_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modificationList_item },
 };
 
 static int
 dissect_cmip_SET_OF_ModificationItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ModificationItem_set_of, hf_index, ett_cmip_SET_OF_ModificationItem);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ModificationItem_set_of, hf_index, ett_cmip_SET_OF_ModificationItem);
 
   return offset;
 }
@@ -1672,7 +1672,7 @@ static int dissect_modificationList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SetArgument_sequence[] = {
+static const ber_old_sequence_t SetArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@@ -1685,14 +1685,14 @@ static const ber_sequence_t SetArgument_sequence[] = {
 
 static int
 dissect_cmip_SetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SetArgument_sequence, hf_index, ett_cmip_SetArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SetArgument_sequence, hf_index, ett_cmip_SetArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t GetResult_sequence[] = {
+static const ber_old_sequence_t GetResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1702,8 +1702,8 @@ static const ber_sequence_t GetResult_sequence[] = {
 
 static int
 dissect_cmip_GetResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetResult_sequence, hf_index, ett_cmip_GetResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetResult_sequence, hf_index, ett_cmip_GetResult);
 
   return offset;
 }
@@ -1739,7 +1739,7 @@ static int dissect_actionReplyInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ActionReply_sequence[] = {
+static const ber_old_sequence_t ActionReply_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType2 },
   { BER_CLASS_CON, 4, 0, dissect_actionReplyInfo },
   { 0, 0, 0, NULL }
@@ -1747,8 +1747,8 @@ static const ber_sequence_t ActionReply_sequence[] = {
 
 static int
 dissect_cmip_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionReply_sequence, hf_index, ett_cmip_ActionReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionReply_sequence, hf_index, ett_cmip_ActionReply);
 
   return offset;
 }
@@ -1757,7 +1757,7 @@ static int dissect_actionReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ActionResult_sequence[] = {
+static const ber_old_sequence_t ActionResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1767,8 +1767,8 @@ static const ber_sequence_t ActionResult_sequence[] = {
 
 static int
 dissect_cmip_ActionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionResult_sequence, hf_index, ett_cmip_ActionResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionResult_sequence, hf_index, ett_cmip_ActionResult);
 
   return offset;
 }
@@ -1777,7 +1777,7 @@ static int dissect_actionResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t DeleteResult_sequence[] = {
+static const ber_old_sequence_t DeleteResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1786,8 +1786,8 @@ static const ber_sequence_t DeleteResult_sequence[] = {
 
 static int
 dissect_cmip_DeleteResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteResult_sequence, hf_index, ett_cmip_DeleteResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteResult_sequence, hf_index, ett_cmip_DeleteResult);
 
   return offset;
 }
@@ -1809,7 +1809,7 @@ static const value_string cmip_LinkedReplyArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LinkedReplyArgument_choice[] = {
+static const ber_old_choice_t LinkedReplyArgument_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_getResult_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getListError_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_setResult_impl },
@@ -1824,9 +1824,9 @@ static const ber_choice_t LinkedReplyArgument_choice[] = {
 
 static int
 dissect_cmip_LinkedReplyArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1859,7 +1859,7 @@ static int dissect_eventReplyInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t EventReply_sequence[] = {
+static const ber_old_sequence_t EventReply_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType2 },
   { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventReplyInfo },
   { 0, 0, 0, NULL }
@@ -1867,8 +1867,8 @@ static const ber_sequence_t EventReply_sequence[] = {
 
 static int
 dissect_cmip_EventReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReply_sequence, hf_index, ett_cmip_EventReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReply_sequence, hf_index, ett_cmip_EventReply);
 
   return offset;
 }
@@ -1877,7 +1877,7 @@ static int dissect_eventReply(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t EventReportResult_sequence[] = {
+static const ber_old_sequence_t EventReportResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -1887,8 +1887,8 @@ static const ber_sequence_t EventReportResult_sequence[] = {
 
 static int
 dissect_cmip_EventReportResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportResult_sequence, hf_index, ett_cmip_EventReportResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportResult_sequence, hf_index, ett_cmip_EventReportResult);
 
   return offset;
 }
@@ -1921,7 +1921,7 @@ static int dissect_eventInfo1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t EventReportArgument_sequence[] = {
+static const ber_old_sequence_t EventReportArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventTime_impl },
@@ -1932,14 +1932,14 @@ static const ber_sequence_t EventReportArgument_sequence[] = {
 
 static int
 dissect_cmip_EventReportArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportArgument_sequence, hf_index, ett_cmip_EventReportArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportArgument_sequence, hf_index, ett_cmip_EventReportArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeleteArgument_sequence[] = {
+static const ber_old_sequence_t DeleteArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@@ -1951,8 +1951,8 @@ static const ber_sequence_t DeleteArgument_sequence[] = {
 
 static int
 dissect_cmip_DeleteArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteArgument_sequence, hf_index, ett_cmip_DeleteArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteArgument_sequence, hf_index, ett_cmip_DeleteArgument);
 
   return offset;
 }
@@ -1964,7 +1964,7 @@ static const value_string cmip_T_managedOrSuperiorObjectInstance_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = {
+static const ber_old_choice_t T_managedOrSuperiorObjectInstance_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_managedObjectInstance },
   {   1, BER_CLASS_CON, 8, 0, dissect_superiorObjectInstance },
   { 0, 0, 0, 0, NULL }
@@ -1972,9 +1972,9 @@ static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = {
 
 static int
 dissect_cmip_T_managedOrSuperiorObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance,
+                                     NULL);
 
   return offset;
 }
@@ -1983,7 +1983,7 @@ static int dissect_managedOrSuperiorObjectInstance(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t CreateArgument_sequence[] = {
+static const ber_old_sequence_t CreateArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedOrSuperiorObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@@ -1994,14 +1994,14 @@ static const ber_sequence_t CreateArgument_sequence[] = {
 
 static int
 dissect_cmip_CreateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CreateArgument_sequence, hf_index, ett_cmip_CreateArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CreateArgument_sequence, hf_index, ett_cmip_CreateArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t CreateResult_sequence[] = {
+static const ber_old_sequence_t CreateResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl },
@@ -2011,14 +2011,14 @@ static const ber_sequence_t CreateResult_sequence[] = {
 
 static int
 dissect_cmip_CreateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CreateResult_sequence, hf_index, ett_cmip_CreateResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CreateResult_sequence, hf_index, ett_cmip_CreateResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t ActionArgument_sequence[] = {
+static const ber_old_sequence_t ActionArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@@ -2031,14 +2031,14 @@ static const ber_sequence_t ActionArgument_sequence[] = {
 
 static int
 dissect_cmip_ActionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionArgument_sequence, hf_index, ett_cmip_ActionArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionArgument_sequence, hf_index, ett_cmip_ActionArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t BaseManagedObjectId_sequence[] = {
+static const ber_old_sequence_t BaseManagedObjectId_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
   { 0, 0, 0, NULL }
@@ -2046,8 +2046,8 @@ static const ber_sequence_t BaseManagedObjectId_sequence[] = {
 
 static int
 dissect_cmip_BaseManagedObjectId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BaseManagedObjectId_sequence, hf_index, ett_cmip_BaseManagedObjectId);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BaseManagedObjectId_sequence, hf_index, ett_cmip_BaseManagedObjectId);
 
   return offset;
 }
@@ -2084,16 +2084,16 @@ static const value_string cmip_Name_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Name_choice[] = {
+static const ber_old_choice_t Name_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_cmip_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Name_choice, hf_index, ett_cmip_Name,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Name_choice, hf_index, ett_cmip_Name,
+                                     NULL);
 
   return offset;
 }
@@ -2129,7 +2129,7 @@ static const value_string cmip_AE_title_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AE_title_choice[] = {
+static const ber_old_choice_t AE_title_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 },
   { 0, 0, 0, 0, NULL }
@@ -2137,9 +2137,9 @@ static const ber_choice_t AE_title_choice[] = {
 
 static int
 dissect_cmip_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AE_title_choice, hf_index, ett_cmip_AE_title,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AE_title_choice, hf_index, ett_cmip_AE_title,
+                                     NULL);
 
   return offset;
 }
@@ -2151,14 +2151,14 @@ static int dissect_multiple_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SET_OF_AE_title_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AE_title_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_multiple_item },
 };
 
 static int
 dissect_cmip_SET_OF_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AE_title_set_of, hf_index, ett_cmip_SET_OF_AE_title);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AE_title_set_of, hf_index, ett_cmip_SET_OF_AE_title);
 
   return offset;
 }
@@ -2173,7 +2173,7 @@ static const value_string cmip_Destination_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Destination_choice[] = {
+static const ber_old_choice_t Destination_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_single },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_multiple },
   { 0, 0, 0, 0, NULL }
@@ -2181,9 +2181,9 @@ static const ber_choice_t Destination_choice[] = {
 
 static int
 dissect_cmip_Destination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Destination_choice, hf_index, ett_cmip_Destination,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Destination_choice, hf_index, ett_cmip_Destination,
+                                     NULL);
 
   return offset;
 }
@@ -2214,14 +2214,14 @@ dissect_cmip_NameBinding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SET_OF_AttributeId_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeId_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeIdList_item },
 };
 
 static int
 dissect_cmip_SET_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeId_set_of, hf_index, ett_cmip_SET_OF_AttributeId);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeId_set_of, hf_index, ett_cmip_SET_OF_AttributeId);
 
   return offset;
 }
@@ -2230,7 +2230,7 @@ static int dissect_attributeIdList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GetArgument_sequence[] = {
+static const ber_old_sequence_t GetArgument_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl },
@@ -2243,8 +2243,8 @@ static const ber_sequence_t GetArgument_sequence[] = {
 
 static int
 dissect_cmip_GetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetArgument_sequence, hf_index, ett_cmip_GetArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetArgument_sequence, hf_index, ett_cmip_GetArgument);
 
   return offset;
 }
@@ -2370,7 +2370,7 @@ static int dissect_opcode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ReturnResultBody_sequence[] = {
+static const ber_old_sequence_t ReturnResultBody_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_argument },
   { 0, 0, 0, NULL }
@@ -2378,8 +2378,8 @@ static const ber_sequence_t ReturnResultBody_sequence[] = {
 
 static int
 dissect_cmip_ReturnResultBody(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResultBody_sequence, hf_index, ett_cmip_ReturnResultBody);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResultBody_sequence, hf_index, ett_cmip_ReturnResultBody);
 
   return offset;
 }
@@ -2432,7 +2432,7 @@ static const value_string cmip_InvokeId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InvokeId_choice[] = {
+static const ber_old_choice_t InvokeId_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
   { 0, 0, 0, 0, NULL }
@@ -2440,9 +2440,9 @@ static const ber_choice_t InvokeId_choice[] = {
 
 static int
 dissect_cmip_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InvokeId_choice, hf_index, ett_cmip_InvokeId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InvokeId_choice, hf_index, ett_cmip_InvokeId,
+                                     NULL);
 
   return offset;
 }
@@ -2460,7 +2460,7 @@ dissect_cmip_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedId_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
@@ -2476,8 +2476,8 @@ dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
     col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Invoke ");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_cmip_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_cmip_Invoke);
 
   return offset;
 }
@@ -2486,7 +2486,7 @@ static int dissect_invoke_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_rRBody },
   { 0, 0, 0, NULL }
@@ -2500,8 +2500,8 @@ dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
     col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnResult ");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_cmip_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_cmip_ReturnResult);
 
   return offset;
 }
@@ -2510,7 +2510,7 @@ static int dissect_returnResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { 0, 0, 0, NULL }
 };
@@ -2523,8 +2523,8 @@ dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
     col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnError ");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_cmip_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_cmip_ReturnError);
 
   return offset;
 }
@@ -2661,7 +2661,7 @@ static const value_string cmip_RejectProb_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RejectProb_choice[] = {
+static const ber_old_choice_t RejectProb_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -2671,9 +2671,9 @@ static const ber_choice_t RejectProb_choice[] = {
 
 static int
 dissect_cmip_RejectProb(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RejectProb_choice, hf_index, ett_cmip_RejectProb,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RejectProb_choice, hf_index, ett_cmip_RejectProb,
+                                     NULL);
 
   return offset;
 }
@@ -2682,7 +2682,7 @@ static int dissect_rejectProblem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectProblem },
   { 0, 0, 0, NULL }
@@ -2696,8 +2696,8 @@ dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
     col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Reject ");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_cmip_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_cmip_Reject);
 
   return offset;
 }
@@ -2714,7 +2714,7 @@ const value_string cmip_ROS_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ROS_choice[] = {
+static const ber_old_choice_t ROS_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -2724,9 +2724,9 @@ static const ber_choice_t ROS_choice[] = {
 
 int
 dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ROS_choice, hf_index, ett_cmip_ROS,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ROS_choice, hf_index, ett_cmip_ROS,
+                                     NULL);
 
   return offset;
 }
@@ -2759,7 +2759,7 @@ static int dissect_abortSource_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CMIPAbortInfo_sequence[] = {
+static const ber_old_sequence_t CMIPAbortInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abortSource_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_userInfo },
   { 0, 0, 0, NULL }
@@ -2772,8 +2772,8 @@ dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CMIPAbortInfo_sequence, hf_index, ett_cmip_CMIPAbortInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CMIPAbortInfo_sequence, hf_index, ett_cmip_CMIPAbortInfo);
 
   return offset;
 }
@@ -2820,7 +2820,7 @@ static int dissect_protocolVersion_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CMIPUserInfo_sequence[] = {
+static const ber_old_sequence_t CMIPUserInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocolVersion_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_functionalUnits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_accessControl1 },
@@ -2835,8 +2835,8 @@ dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
   }
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CMIPUserInfo_sequence, hf_index, ett_cmip_CMIPUserInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CMIPUserInfo_sequence, hf_index, ett_cmip_CMIPUserInfo);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index bb66053c22..33398039ae 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -434,14 +434,14 @@ static int dissect_PKIFreeText_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PKIFreeText_sequence_of[1] = {
+static const ber_old_sequence_t PKIFreeText_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_PKIFreeText_item },
 };
 
 int
 dissect_cmp_PKIFreeText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText);
 
   return offset;
 }
@@ -483,7 +483,7 @@ static int dissect_infoValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t InfoTypeAndValue_sequence[] = {
+static const ber_old_sequence_t InfoTypeAndValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_infoType },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_infoValue },
   { 0, 0, 0, NULL }
@@ -491,8 +491,8 @@ static const ber_sequence_t InfoTypeAndValue_sequence[] = {
 
 int
 dissect_cmp_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
 
   return offset;
 }
@@ -507,14 +507,14 @@ static int dissect_GenRepContent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_generalInfo_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue);
 
   return offset;
 }
@@ -523,7 +523,7 @@ static int dissect_generalInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t PKIHeader_sequence[] = {
+static const ber_old_sequence_t PKIHeader_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pvno },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_sender },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_recipient },
@@ -541,8 +541,8 @@ static const ber_sequence_t PKIHeader_sequence[] = {
 
 int
 dissect_cmp_PKIHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
 
   return offset;
 }
@@ -551,14 +551,14 @@ static int dissect_header(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extraCerts_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate);
 
   return offset;
 }
@@ -646,7 +646,7 @@ static int dissect_failInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PKIStatusInfo_sequence[] = {
+static const ber_old_sequence_t PKIStatusInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statusString },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
@@ -655,8 +655,8 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
 
 int
 dissect_cmp_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
 
   return offset;
 }
@@ -677,7 +677,7 @@ const value_string cmp_CertOrEncCert_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CertOrEncCert_choice[] = {
+static const ber_old_choice_t CertOrEncCert_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_certificate },
   {   1, BER_CLASS_CON, 1, 0, dissect_encryptedCert },
   { 0, 0, 0, 0, NULL }
@@ -685,9 +685,9 @@ static const ber_choice_t CertOrEncCert_choice[] = {
 
 int
 dissect_cmp_CertOrEncCert(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert,
+                                     NULL);
 
   return offset;
 }
@@ -696,7 +696,7 @@ static int dissect_certOrEncCert(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CertifiedKeyPair_sequence[] = {
+static const ber_old_sequence_t CertifiedKeyPair_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_privateKey },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_publicationInfo },
@@ -705,8 +705,8 @@ static const ber_sequence_t CertifiedKeyPair_sequence[] = {
 
 int
 dissect_cmp_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
 
   return offset;
 }
@@ -718,7 +718,7 @@ static int dissect_keyPairHist_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CertResponse_sequence[] = {
+static const ber_old_sequence_t CertResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certifiedKeyPair },
@@ -728,8 +728,8 @@ static const ber_sequence_t CertResponse_sequence[] = {
 
 int
 dissect_cmp_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertResponse_sequence, hf_index, ett_cmp_CertResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertResponse_sequence, hf_index, ett_cmp_CertResponse);
 
   return offset;
 }
@@ -738,14 +738,14 @@ static int dissect_response_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_OF_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse);
 
   return offset;
 }
@@ -754,7 +754,7 @@ static int dissect_response(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t CertRepMessage_sequence[] = {
+static const ber_old_sequence_t CertRepMessage_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caPubs },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response },
   { 0, 0, 0, NULL }
@@ -762,8 +762,8 @@ static const ber_sequence_t CertRepMessage_sequence[] = {
 
 int
 dissect_cmp_CertRepMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
 
   return offset;
 }
@@ -781,7 +781,7 @@ static int dissect_ccp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t Challenge_sequence[] = {
+static const ber_old_sequence_t Challenge_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_owf },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_witness },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_challenge },
@@ -790,8 +790,8 @@ static const ber_sequence_t Challenge_sequence[] = {
 
 int
 dissect_cmp_Challenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Challenge_sequence, hf_index, ett_cmp_Challenge);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Challenge_sequence, hf_index, ett_cmp_Challenge);
 
   return offset;
 }
@@ -800,14 +800,14 @@ static int dissect_POPODecKeyChallContent_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t POPODecKeyChallContent_sequence_of[1] = {
+static const ber_old_sequence_t POPODecKeyChallContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyChallContent_item },
 };
 
 int
 dissect_cmp_POPODecKeyChallContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent);
 
   return offset;
 }
@@ -816,14 +816,14 @@ static int dissect_popdecc(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t POPODecKeyRespContent_sequence_of[1] = {
+static const ber_old_sequence_t POPODecKeyRespContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyRespContent_item },
 };
 
 int
 dissect_cmp_POPODecKeyRespContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent);
 
   return offset;
 }
@@ -832,14 +832,14 @@ static int dissect_popdecr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyPairHist_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair);
 
   return offset;
 }
@@ -848,7 +848,7 @@ static int dissect_keyPairHist(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t KeyRecRepContent_sequence[] = {
+static const ber_old_sequence_t KeyRecRepContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_newSigCert },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caCerts },
@@ -858,8 +858,8 @@ static const ber_sequence_t KeyRecRepContent_sequence[] = {
 
 int
 dissect_cmp_KeyRecRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
 
   return offset;
 }
@@ -868,7 +868,7 @@ static int dissect_krp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t RevDetails_sequence[] = {
+static const ber_old_sequence_t RevDetails_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certDetails },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revocationReason },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_badSinceDate },
@@ -878,8 +878,8 @@ static const ber_sequence_t RevDetails_sequence[] = {
 
 int
 dissect_cmp_RevDetails(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RevDetails_sequence, hf_index, ett_cmp_RevDetails);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RevDetails_sequence, hf_index, ett_cmp_RevDetails);
 
   return offset;
 }
@@ -888,14 +888,14 @@ static int dissect_RevReqContent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RevReqContent_sequence_of[1] = {
+static const ber_old_sequence_t RevReqContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RevReqContent_item },
 };
 
 int
 dissect_cmp_RevReqContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent);
 
   return offset;
 }
@@ -904,14 +904,14 @@ static int dissect_rr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo);
 
   return offset;
 }
@@ -920,14 +920,14 @@ static int dissect_status2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revCerts_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId);
 
   return offset;
 }
@@ -936,14 +936,14 @@ static int dissect_revCerts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_crls_item },
 };
 
 static int
 dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList);
 
   return offset;
 }
@@ -952,7 +952,7 @@ static int dissect_crls(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t RevRepContent_sequence[] = {
+static const ber_old_sequence_t RevRepContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status2 },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revCerts },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crls },
@@ -961,8 +961,8 @@ static const ber_sequence_t RevRepContent_sequence[] = {
 
 int
 dissect_cmp_RevRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
 
   return offset;
 }
@@ -971,7 +971,7 @@ static int dissect_rp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
+static const ber_old_sequence_t CAKeyUpdAnnContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_oldWithNew },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithOld },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithNew },
@@ -980,8 +980,8 @@ static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
 
 int
 dissect_cmp_CAKeyUpdAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
 
   return offset;
 }
@@ -1002,7 +1002,7 @@ static int dissect_cann(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t RevAnnContent_sequence[] = {
+static const ber_old_sequence_t RevAnnContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certId },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_willBeRevokedAt },
@@ -1013,8 +1013,8 @@ static const ber_sequence_t RevAnnContent_sequence[] = {
 
 int
 dissect_cmp_RevAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
 
   return offset;
 }
@@ -1023,14 +1023,14 @@ static int dissect_rann(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t CRLAnnContent_sequence_of[1] = {
+static const ber_old_sequence_t CRLAnnContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLAnnContent_item },
 };
 
 int
 dissect_cmp_CRLAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent);
 
   return offset;
 }
@@ -1063,14 +1063,14 @@ static int dissect_nested(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t GenMsgContent_sequence_of[1] = {
+static const ber_old_sequence_t GenMsgContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenMsgContent_item },
 };
 
 int
 dissect_cmp_GenMsgContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent);
 
   return offset;
 }
@@ -1079,14 +1079,14 @@ static int dissect_genm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t GenRepContent_sequence_of[1] = {
+static const ber_old_sequence_t GenRepContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenRepContent_item },
 };
 
 int
 dissect_cmp_GenRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent);
 
   return offset;
 }
@@ -1095,7 +1095,7 @@ static int dissect_genp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t ErrorMsgContent_sequence[] = {
+static const ber_old_sequence_t ErrorMsgContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pKIStatusInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorCode },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorDetails },
@@ -1104,8 +1104,8 @@ static const ber_sequence_t ErrorMsgContent_sequence[] = {
 
 int
 dissect_cmp_ErrorMsgContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
 
   return offset;
 }
@@ -1141,7 +1141,7 @@ const value_string cmp_PKIBody_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PKIBody_choice[] = {
+static const ber_old_choice_t PKIBody_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_ir },
   {   1, BER_CLASS_CON, 1, 0, dissect_ip },
   {   2, BER_CLASS_CON, 2, 0, dissect_cr },
@@ -1170,9 +1170,9 @@ static const ber_choice_t PKIBody_choice[] = {
 
 int
 dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PKIBody_choice, hf_index, ett_cmp_PKIBody,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PKIBody_choice, hf_index, ett_cmp_PKIBody,
+                                     NULL);
 
   return offset;
 }
@@ -1195,7 +1195,7 @@ static int dissect_protection(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t PKIMessage_sequence[] = {
+static const ber_old_sequence_t PKIMessage_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_protection },
@@ -1205,14 +1205,14 @@ static const ber_sequence_t PKIMessage_sequence[] = {
 
 int
 dissect_cmp_PKIMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
 
   return offset;
 }
 
 
-static const ber_sequence_t ProtectedPart_sequence[] = {
+static const ber_old_sequence_t ProtectedPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
   { 0, 0, 0, NULL }
@@ -1220,8 +1220,8 @@ static const ber_sequence_t ProtectedPart_sequence[] = {
 
 int
 dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
 
   return offset;
 }
@@ -1236,7 +1236,7 @@ dissect_cmp_PasswordBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t PBMParameter_sequence[] = {
+static const ber_old_sequence_t PBMParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
@@ -1246,8 +1246,8 @@ static const ber_sequence_t PBMParameter_sequence[] = {
 
 int
 dissect_cmp_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
 
   return offset;
 }
@@ -1262,7 +1262,7 @@ dissect_cmp_DHBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t DHBMParameter_sequence[] = {
+static const ber_old_sequence_t DHBMParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac },
   { 0, 0, 0, NULL }
@@ -1270,8 +1270,8 @@ static const ber_sequence_t DHBMParameter_sequence[] = {
 
 int
 dissect_cmp_DHBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
 
   return offset;
 }
@@ -1300,7 +1300,7 @@ static int dissect_hashVal(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t OOBCertHash_sequence[] = {
+static const ber_old_sequence_t OOBCertHash_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_hashAlg },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_certId },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_hashVal },
@@ -1309,8 +1309,8 @@ static const ber_sequence_t OOBCertHash_sequence[] = {
 
 int
 dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 092b671717..a13e18003e 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -365,7 +365,7 @@ static int dissect_content(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t ContentInfo_sequence[] = {
+static const ber_old_sequence_t ContentInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
   { BER_CLASS_CON, 0, 0, dissect_content },
   { 0, 0, 0, NULL }
@@ -375,8 +375,8 @@ int
 dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 64 "cms.cnf"
   top_tree = tree;
-    offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
+    offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
 
   content_tvb = NULL;
   top_tree = NULL;
@@ -427,14 +427,14 @@ static int dissect_digestAlgorithm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = {
+static const ber_old_sequence_t DigestAlgorithmIdentifiers_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DigestAlgorithmIdentifiers_item },
 };
 
 int
 dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers);
 
   return offset;
 }
@@ -473,7 +473,7 @@ static int dissect_eContent(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
+static const ber_old_sequence_t EncapsulatedContentInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eContentType },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_eContent },
   { 0, 0, 0, NULL }
@@ -481,8 +481,8 @@ static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
 
 int
 dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
 
   return offset;
 }
@@ -530,14 +530,14 @@ static int dissect_attrValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeValue_set_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_attrValues_item },
 };
 
 static int
 dissect_cms_SET_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeValue_set_of, hf_index, ett_cms_SET_OF_AttributeValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeValue_set_of, hf_index, ett_cms_SET_OF_AttributeValue);
 
   return offset;
 }
@@ -546,7 +546,7 @@ static int dissect_attrValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Attribute_sequence[] = {
+static const ber_old_sequence_t Attribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrType },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attrValues },
   { 0, 0, 0, NULL }
@@ -554,8 +554,8 @@ static const ber_sequence_t Attribute_sequence[] = {
 
 static int
 dissect_cms_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_sequence, hf_index, ett_cms_Attribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_sequence, hf_index, ett_cms_Attribute);
 
   return offset;
 }
@@ -576,14 +576,14 @@ static int dissect_UnauthAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t UnauthAttributes_set_of[1] = {
+static const ber_old_sequence_t UnauthAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnauthAttributes_item },
 };
 
 static int
 dissect_cms_UnauthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
 
   return offset;
 }
@@ -595,7 +595,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
+static const ber_old_sequence_t ExtendedCertificateInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributes },
@@ -604,8 +604,8 @@ static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
 
 static int
 dissect_cms_ExtendedCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
 
   return offset;
 }
@@ -640,7 +640,7 @@ static int dissect_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ExtendedCertificate_sequence[] = {
+static const ber_old_sequence_t ExtendedCertificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extendedCertificateInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
@@ -649,8 +649,8 @@ static const ber_sequence_t ExtendedCertificate_sequence[] = {
 
 static int
 dissect_cms_ExtendedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
 
   return offset;
 }
@@ -666,7 +666,7 @@ static const value_string cms_CertificateChoices_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CertificateChoices_choice[] = {
+static const ber_old_choice_t CertificateChoices_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extendedCertificate_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attrCert_impl },
@@ -675,9 +675,9 @@ static const ber_choice_t CertificateChoices_choice[] = {
 
 static int
 dissect_cms_CertificateChoices(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CertificateChoices_choice, hf_index, ett_cms_CertificateChoices,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CertificateChoices_choice, hf_index, ett_cms_CertificateChoices,
+                                     NULL);
 
   return offset;
 }
@@ -686,14 +686,14 @@ static int dissect_CertificateSet_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CertificateSet_set_of[1] = {
+static const ber_old_sequence_t CertificateSet_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item },
 };
 
 static int
 dissect_cms_CertificateSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 CertificateSet_set_of, hf_index, ett_cms_CertificateSet);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     CertificateSet_set_of, hf_index, ett_cms_CertificateSet);
 
   return offset;
 }
@@ -705,14 +705,14 @@ static int dissect_certs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t CertificateRevocationLists_set_of[1] = {
+static const ber_old_sequence_t CertificateRevocationLists_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificateRevocationLists_item },
 };
 
 static int
 dissect_cms_CertificateRevocationLists(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists);
 
   return offset;
 }
@@ -721,7 +721,7 @@ static int dissect_crls_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
+static const ber_old_sequence_t IssuerAndSerialNumber_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { 0, 0, 0, NULL }
@@ -729,8 +729,8 @@ static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
 
 int
 dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
 
   return offset;
 }
@@ -767,7 +767,7 @@ const value_string cms_SignerIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SignerIdentifier_choice[] = {
+static const ber_old_choice_t SignerIdentifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
   { 0, 0, 0, 0, NULL }
@@ -775,9 +775,9 @@ static const ber_choice_t SignerIdentifier_choice[] = {
 
 int
 dissect_cms_SignerIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -786,14 +786,14 @@ static int dissect_sid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SignedAttributes_set_of[1] = {
+static const ber_old_sequence_t SignedAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignedAttributes_item },
 };
 
 int
 dissect_cms_SignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
 
   return offset;
 }
@@ -815,14 +815,14 @@ static int dissect_signatureValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t UnsignedAttributes_set_of[1] = {
+static const ber_old_sequence_t UnsignedAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnsignedAttributes_item },
 };
 
 int
 dissect_cms_UnsignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
 
   return offset;
 }
@@ -831,7 +831,7 @@ static int dissect_unsignedAttrs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SignerInfo_sequence[] = {
+static const ber_old_sequence_t SignerInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
@@ -844,8 +844,8 @@ static const ber_sequence_t SignerInfo_sequence[] = {
 
 int
 dissect_cms_SignerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
 
   return offset;
 }
@@ -854,14 +854,14 @@ static int dissect_SignerInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SignerInfos_set_of[1] = {
+static const ber_old_sequence_t SignerInfos_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignerInfos_item },
 };
 
 int
 dissect_cms_SignerInfos(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SignerInfos_set_of, hf_index, ett_cms_SignerInfos);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SignerInfos_set_of, hf_index, ett_cms_SignerInfos);
 
   return offset;
 }
@@ -870,7 +870,7 @@ static int dissect_signerInfos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SignedData_sequence[] = {
+static const ber_old_sequence_t SignedData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithms },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo },
@@ -882,14 +882,14 @@ static const ber_sequence_t SignedData_sequence[] = {
 
 int
 dissect_cms_SignedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SignedData_sequence, hf_index, ett_cms_SignedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SignedData_sequence, hf_index, ett_cms_SignedData);
 
   return offset;
 }
 
 
-static const ber_sequence_t OriginatorInfo_sequence[] = {
+static const ber_old_sequence_t OriginatorInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certs_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_crls_impl },
   { 0, 0, 0, NULL }
@@ -897,8 +897,8 @@ static const ber_sequence_t OriginatorInfo_sequence[] = {
 
 static int
 dissect_cms_OriginatorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
 
   return offset;
 }
@@ -913,7 +913,7 @@ static const value_string cms_RecipientIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RecipientIdentifier_choice[] = {
+static const ber_old_choice_t RecipientIdentifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
   { 0, 0, 0, 0, NULL }
@@ -921,9 +921,9 @@ static const ber_choice_t RecipientIdentifier_choice[] = {
 
 static int
 dissect_cms_RecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -957,7 +957,7 @@ static int dissect_encryptedKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
+static const ber_old_sequence_t KeyTransRecipientInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
@@ -967,8 +967,8 @@ static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
 
 static int
 dissect_cms_KeyTransRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
 
   return offset;
 }
@@ -991,7 +991,7 @@ static int dissect_publicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t OriginatorPublicKey_sequence[] = {
+static const ber_old_sequence_t OriginatorPublicKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_publicKey },
   { 0, 0, 0, NULL }
@@ -999,8 +999,8 @@ static const ber_sequence_t OriginatorPublicKey_sequence[] = {
 
 static int
 dissect_cms_OriginatorPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
 
   return offset;
 }
@@ -1016,7 +1016,7 @@ static const value_string cms_OriginatorIdentifierOrKey_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
+static const ber_old_choice_t OriginatorIdentifierOrKey_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originatorKey_impl },
@@ -1025,9 +1025,9 @@ static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
 
 static int
 dissect_cms_OriginatorIdentifierOrKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey,
+                                     NULL);
 
   return offset;
 }
@@ -1092,7 +1092,7 @@ static int dissect_keyAttr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t OtherKeyAttribute_sequence[] = {
+static const ber_old_sequence_t OtherKeyAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_keyAttrId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyAttr },
   { 0, 0, 0, NULL }
@@ -1100,8 +1100,8 @@ static const ber_sequence_t OtherKeyAttribute_sequence[] = {
 
 static int
 dissect_cms_OtherKeyAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
 
   return offset;
 }
@@ -1110,7 +1110,7 @@ static int dissect_other(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
+static const ber_old_sequence_t RecipientKeyIdentifier_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other },
@@ -1119,8 +1119,8 @@ static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
 
 static int
 dissect_cms_RecipientKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
 
   return offset;
 }
@@ -1138,7 +1138,7 @@ static const value_string cms_KeyAgreeRecipientIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = {
+static const ber_old_choice_t KeyAgreeRecipientIdentifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rKeyId_impl },
   { 0, 0, 0, 0, NULL }
@@ -1146,9 +1146,9 @@ static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = {
 
 static int
 dissect_cms_KeyAgreeRecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -1157,7 +1157,7 @@ static int dissect_rekRid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
+static const ber_old_sequence_t RecipientEncryptedKey_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey },
   { 0, 0, 0, NULL }
@@ -1165,8 +1165,8 @@ static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
 
 static int
 dissect_cms_RecipientEncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
 
   return offset;
 }
@@ -1175,14 +1175,14 @@ static int dissect_RecipientEncryptedKeys_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = {
+static const ber_old_sequence_t RecipientEncryptedKeys_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientEncryptedKeys_item },
 };
 
 static int
 dissect_cms_RecipientEncryptedKeys(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys);
 
   return offset;
 }
@@ -1191,7 +1191,7 @@ static int dissect_recipientEncryptedKeys(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
+static const ber_old_sequence_t KeyAgreeRecipientInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_originator },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ukm },
@@ -1202,8 +1202,8 @@ static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
 
 static int
 dissect_cms_KeyAgreeRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
 
   return offset;
 }
@@ -1228,7 +1228,7 @@ static int dissect_iv(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const ber_sequence_t KEKIdentifier_sequence[] = {
+static const ber_old_sequence_t KEKIdentifier_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_keyIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other },
@@ -1237,8 +1237,8 @@ static const ber_sequence_t KEKIdentifier_sequence[] = {
 
 static int
 dissect_cms_KEKIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
 
   return offset;
 }
@@ -1247,7 +1247,7 @@ static int dissect_kekid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t KEKRecipientInfo_sequence[] = {
+static const ber_old_sequence_t KEKRecipientInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kekid },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
@@ -1257,8 +1257,8 @@ static const ber_sequence_t KEKRecipientInfo_sequence[] = {
 
 static int
 dissect_cms_KEKRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
 
   return offset;
 }
@@ -1274,7 +1274,7 @@ static const value_string cms_RecipientInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RecipientInfo_choice[] = {
+static const ber_old_choice_t RecipientInfo_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_kari_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_kekri_impl },
@@ -1283,9 +1283,9 @@ static const ber_choice_t RecipientInfo_choice[] = {
 
 static int
 dissect_cms_RecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RecipientInfo_choice, hf_index, ett_cms_RecipientInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RecipientInfo_choice, hf_index, ett_cms_RecipientInfo,
+                                     NULL);
 
   return offset;
 }
@@ -1294,14 +1294,14 @@ static int dissect_RecipientInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RecipientInfos_set_of[1] = {
+static const ber_old_sequence_t RecipientInfos_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item },
 };
 
 static int
 dissect_cms_RecipientInfos(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
 
   return offset;
 }
@@ -1335,7 +1335,7 @@ static int dissect_encryptedContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t EncryptedContentInfo_sequence[] = {
+static const ber_old_sequence_t EncryptedContentInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_encryptedContentType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contentEncryptionAlgorithm },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptedContent_impl },
@@ -1344,8 +1344,8 @@ static const ber_sequence_t EncryptedContentInfo_sequence[] = {
 
 static int
 dissect_cms_EncryptedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
 
   return offset;
 }
@@ -1354,14 +1354,14 @@ static int dissect_encryptedContentInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UnprotectedAttributes_set_of[1] = {
+static const ber_old_sequence_t UnprotectedAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnprotectedAttributes_item },
 };
 
 static int
 dissect_cms_UnprotectedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
 
   return offset;
 }
@@ -1370,7 +1370,7 @@ static int dissect_unprotectedAttrs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t EnvelopedData_sequence[] = {
+static const ber_old_sequence_t EnvelopedData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos },
@@ -1381,8 +1381,8 @@ static const ber_sequence_t EnvelopedData_sequence[] = {
 
 int
 dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
 
   return offset;
 }
@@ -1401,7 +1401,7 @@ static int dissect_digest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t DigestedData_sequence[] = {
+static const ber_old_sequence_t DigestedData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo },
@@ -1411,14 +1411,14 @@ static const ber_sequence_t DigestedData_sequence[] = {
 
 static int
 dissect_cms_DigestedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DigestedData_sequence, hf_index, ett_cms_DigestedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DigestedData_sequence, hf_index, ett_cms_DigestedData);
 
   return offset;
 }
 
 
-static const ber_sequence_t EncryptedData_sequence[] = {
+static const ber_old_sequence_t EncryptedData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedContentInfo },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unprotectedAttrs_impl },
@@ -1427,8 +1427,8 @@ static const ber_sequence_t EncryptedData_sequence[] = {
 
 static int
 dissect_cms_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
 
   return offset;
 }
@@ -1446,14 +1446,14 @@ static int dissect_macAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AuthAttributes_set_of[1] = {
+static const ber_old_sequence_t AuthAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthAttributes_item },
 };
 
 static int
 dissect_cms_AuthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
 
   return offset;
 }
@@ -1475,7 +1475,7 @@ static int dissect_mac(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t AuthenticatedData_sequence[] = {
+static const ber_old_sequence_t AuthenticatedData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos },
@@ -1490,8 +1490,8 @@ static const ber_sequence_t AuthenticatedData_sequence[] = {
 
 static int
 dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
 
   return offset;
 }
@@ -1543,7 +1543,7 @@ static const value_string cms_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalTime },
   { 0, 0, 0, 0, NULL }
@@ -1551,9 +1551,9 @@ static const ber_choice_t Time_choice[] = {
 
 static int
 dissect_cms_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_cms_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_cms_Time,
+                                     NULL);
 
   return offset;
 }
@@ -1649,7 +1649,7 @@ static int dissect_rc2ParameterVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RC2CBCParameter_sequence[] = {
+static const ber_old_sequence_t RC2CBCParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rc2ParameterVersion },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_iv },
   { 0, 0, 0, NULL }
@@ -1657,8 +1657,8 @@ static const ber_sequence_t RC2CBCParameter_sequence[] = {
 
 static int
 dissect_cms_RC2CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RC2CBCParameter_sequence, hf_index, ett_cms_RC2CBCParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RC2CBCParameter_sequence, hf_index, ett_cms_RC2CBCParameter);
 
   return offset;
 }
@@ -1708,7 +1708,7 @@ static int dissect_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SMIMECapability_sequence[] = {
+static const ber_old_sequence_t SMIMECapability_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_capability },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters },
   { 0, 0, 0, NULL }
@@ -1716,8 +1716,8 @@ static const ber_sequence_t SMIMECapability_sequence[] = {
 
 static int
 dissect_cms_SMIMECapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMIMECapability_sequence, hf_index, ett_cms_SMIMECapability);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMIMECapability_sequence, hf_index, ett_cms_SMIMECapability);
 
   return offset;
 }
@@ -1726,14 +1726,14 @@ static int dissect_SMIMECapabilities_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SMIMECapabilities_sequence_of[1] = {
+static const ber_old_sequence_t SMIMECapabilities_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMIMECapabilities_item },
 };
 
 static int
 dissect_cms_SMIMECapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SMIMECapabilities_sequence_of, hf_index, ett_cms_SMIMECapabilities);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SMIMECapabilities_sequence_of, hf_index, ett_cms_SMIMECapabilities);
 
   return offset;
 }
@@ -1746,7 +1746,7 @@ static const value_string cms_SMIMEEncryptionKeyPreference_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SMIMEEncryptionKeyPreference_choice[] = {
+static const ber_old_choice_t SMIMEEncryptionKeyPreference_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_issuerAndSerialNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_recipientKeyId_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_subjectAltKeyIdentifier_impl },
@@ -1755,9 +1755,9 @@ static const ber_choice_t SMIMEEncryptionKeyPreference_choice[] = {
 
 static int
 dissect_cms_SMIMEEncryptionKeyPreference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SMIMEEncryptionKeyPreference_choice, hf_index, ett_cms_SMIMEEncryptionKeyPreference,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SMIMEEncryptionKeyPreference_choice, hf_index, ett_cms_SMIMEEncryptionKeyPreference,
+                                     NULL);
 
   return offset;
 }
@@ -1769,7 +1769,7 @@ static const value_string cms_RC2CBCParameters_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RC2CBCParameters_choice[] = {
+static const ber_old_choice_t RC2CBCParameters_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rc2WrapParameter },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rc2CBCParameter },
   { 0, 0, 0, 0, NULL }
@@ -1777,9 +1777,9 @@ static const ber_choice_t RC2CBCParameters_choice[] = {
 
 static int
 dissect_cms_RC2CBCParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RC2CBCParameters_choice, hf_index, ett_cms_RC2CBCParameters,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RC2CBCParameters_choice, hf_index, ett_cms_RC2CBCParameters,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 20d3087d19..2783923fb9 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -285,7 +285,7 @@ static const value_string crmf_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalTime },
   { 0, 0, 0, 0, NULL }
@@ -293,9 +293,9 @@ static const ber_choice_t Time_choice[] = {
 
 static int
 dissect_crmf_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_crmf_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_crmf_Time,
+                                     NULL);
 
   return offset;
 }
@@ -329,7 +329,7 @@ static int dissect_iterationCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t OptionalValidity_sequence[] = {
+static const ber_old_sequence_t OptionalValidity_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter_impl },
   { 0, 0, 0, NULL }
@@ -337,8 +337,8 @@ static const ber_sequence_t OptionalValidity_sequence[] = {
 
 int
 dissect_crmf_OptionalValidity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
 
   return offset;
 }
@@ -347,7 +347,7 @@ static int dissect_validity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CertTemplate_sequence[] = {
+static const ber_old_sequence_t CertTemplate_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_version_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signingAlg_impl },
@@ -363,8 +363,8 @@ static const ber_sequence_t CertTemplate_sequence[] = {
 
 int
 dissect_crmf_CertTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
 
   return offset;
 }
@@ -400,7 +400,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
+static const ber_old_sequence_t AttributeTypeAndValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
   { 0, 0, 0, NULL }
@@ -408,8 +408,8 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
 
 int
 dissect_crmf_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
 
   return offset;
 }
@@ -421,14 +421,14 @@ static int dissect_Controls_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Controls_sequence_of[1] = {
+static const ber_old_sequence_t Controls_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Controls_item },
 };
 
 int
 dissect_crmf_Controls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Controls_sequence_of, hf_index, ett_crmf_Controls);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Controls_sequence_of, hf_index, ett_crmf_Controls);
 
   return offset;
 }
@@ -437,7 +437,7 @@ static int dissect_controls(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t CertRequest_sequence[] = {
+static const ber_old_sequence_t CertRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certTemplate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_controls },
@@ -446,8 +446,8 @@ static const ber_sequence_t CertRequest_sequence[] = {
 
 int
 dissect_crmf_CertRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertRequest_sequence, hf_index, ett_crmf_CertRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertRequest_sequence, hf_index, ett_crmf_CertRequest);
 
   return offset;
 }
@@ -497,7 +497,7 @@ static int dissect_encValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PKMACValue_sequence[] = {
+static const ber_old_sequence_t PKMACValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algId },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_pkmac_value },
   { 0, 0, 0, NULL }
@@ -505,8 +505,8 @@ static const ber_sequence_t PKMACValue_sequence[] = {
 
 int
 dissect_crmf_PKMACValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
 
   return offset;
 }
@@ -521,7 +521,7 @@ static const value_string crmf_T_authInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_authInfo_choice[] = {
+static const ber_old_choice_t T_authInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sender_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKeyMAC },
   { 0, 0, 0, 0, NULL }
@@ -529,9 +529,9 @@ static const ber_choice_t T_authInfo_choice[] = {
 
 static int
 dissect_crmf_T_authInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_authInfo_choice, hf_index, ett_crmf_T_authInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_authInfo_choice, hf_index, ett_crmf_T_authInfo,
+                                     NULL);
 
   return offset;
 }
@@ -540,7 +540,7 @@ static int dissect_authInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
+static const ber_old_sequence_t POPOSigningKeyInput_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKey },
   { 0, 0, 0, NULL }
@@ -548,8 +548,8 @@ static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
 
 int
 dissect_crmf_POPOSigningKeyInput(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
 
   return offset;
 }
@@ -558,7 +558,7 @@ static int dissect_poposkInput_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t POPOSigningKey_sequence[] = {
+static const ber_old_sequence_t POPOSigningKey_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_poposkInput_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sk_signature },
@@ -567,8 +567,8 @@ static const ber_sequence_t POPOSigningKey_sequence[] = {
 
 int
 dissect_crmf_POPOSigningKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
 
   return offset;
 }
@@ -603,7 +603,7 @@ const value_string crmf_POPOPrivKey_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t POPOPrivKey_choice[] = {
+static const ber_old_choice_t POPOPrivKey_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_thisMessage_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_subsequentMessage_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dhMAC_impl },
@@ -612,9 +612,9 @@ static const ber_choice_t POPOPrivKey_choice[] = {
 
 int
 dissect_crmf_POPOPrivKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey,
+                                     NULL);
 
   return offset;
 }
@@ -634,7 +634,7 @@ const value_string crmf_ProofOfPossession_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ProofOfPossession_choice[] = {
+static const ber_old_choice_t ProofOfPossession_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_raVerified_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signature_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_keyEncipherment_impl },
@@ -644,9 +644,9 @@ static const ber_choice_t ProofOfPossession_choice[] = {
 
 int
 dissect_crmf_ProofOfPossession(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession,
+                                     NULL);
 
   return offset;
 }
@@ -655,14 +655,14 @@ static int dissect_pop(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_regInfo_item },
 };
 
 static int
 dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
 
   return offset;
 }
@@ -671,7 +671,7 @@ static int dissect_regInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t CertReqMsg_sequence[] = {
+static const ber_old_sequence_t CertReqMsg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certReq },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_regInfo },
@@ -680,8 +680,8 @@ static const ber_sequence_t CertReqMsg_sequence[] = {
 
 int
 dissect_crmf_CertReqMsg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
 
   return offset;
 }
@@ -690,14 +690,14 @@ static int dissect_CertReqMessages_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CertReqMessages_sequence_of[1] = {
+static const ber_old_sequence_t CertReqMessages_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertReqMessages_item },
 };
 
 int
 dissect_crmf_CertReqMessages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages);
 
   return offset;
 }
@@ -719,7 +719,7 @@ static int dissect_valueHint_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t PBMParameter_sequence[] = {
+static const ber_old_sequence_t PBMParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
@@ -729,8 +729,8 @@ static const ber_sequence_t PBMParameter_sequence[] = {
 
 int
 dissect_crmf_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
 
   return offset;
 }
@@ -798,7 +798,7 @@ static int dissect_pubMethod(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SinglePubInfo_sequence[] = {
+static const ber_old_sequence_t SinglePubInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pubMethod },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubLocation },
   { 0, 0, 0, NULL }
@@ -806,8 +806,8 @@ static const ber_sequence_t SinglePubInfo_sequence[] = {
 
 int
 dissect_crmf_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
 
   return offset;
 }
@@ -816,14 +816,14 @@ static int dissect_pubInfos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pubInfos_item },
 };
 
 static int
 dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo);
 
   return offset;
 }
@@ -832,7 +832,7 @@ static int dissect_pubInfos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PKIPublicationInfo_sequence[] = {
+static const ber_old_sequence_t PKIPublicationInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_action },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubInfos },
   { 0, 0, 0, NULL }
@@ -840,14 +840,14 @@ static const ber_sequence_t PKIPublicationInfo_sequence[] = {
 
 int
 dissect_crmf_PKIPublicationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
 
   return offset;
 }
 
 
-static const ber_sequence_t EncryptedValue_sequence[] = {
+static const ber_old_sequence_t EncryptedValue_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_intendedAlg_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_symmAlg_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encSymmKey_impl },
@@ -859,8 +859,8 @@ static const ber_sequence_t EncryptedValue_sequence[] = {
 
 int
 dissect_crmf_EncryptedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
 
   return offset;
 }
@@ -875,7 +875,7 @@ const value_string crmf_EncryptedKey_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EncryptedKey_choice[] = {
+static const ber_old_choice_t EncryptedKey_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedValue },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_envelopedData_impl },
   { 0, 0, 0, 0, NULL }
@@ -883,9 +883,9 @@ static const ber_choice_t EncryptedKey_choice[] = {
 
 int
 dissect_crmf_EncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey,
+                                     NULL);
 
   return offset;
 }
@@ -926,7 +926,7 @@ const value_string crmf_PKIArchiveOptions_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PKIArchiveOptions_choice[] = {
+static const ber_old_choice_t PKIArchiveOptions_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_encryptedPrivKey_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_keyGenParameters_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_archiveRemGenPrivKey_impl },
@@ -935,15 +935,15 @@ static const ber_choice_t PKIArchiveOptions_choice[] = {
 
 int
 dissect_crmf_PKIArchiveOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertId_sequence[] = {
+static const ber_old_sequence_t CertId_sequence[] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { 0, 0, 0, NULL }
@@ -951,8 +951,8 @@ static const ber_sequence_t CertId_sequence[] = {
 
 int
 dissect_crmf_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertId_sequence, hf_index, ett_crmf_CertId);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertId_sequence, hf_index, ett_crmf_CertId);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 61b193e2b9..8a6b18f960 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -911,7 +911,7 @@ static const value_string dap_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
   { 0, 0, 0, 0, NULL }
@@ -919,9 +919,9 @@ static const ber_choice_t Time_choice[] = {
 
 static int
 dissect_dap_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_dap_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_dap_Time,
+                                     NULL);
 
   return offset;
 }
@@ -1001,7 +1001,7 @@ static int dissect_errorProtection(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SecurityParameters_set[] = {
+static const ber_old_sequence_t SecurityParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certification_path },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_distinguished_name },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_time },
@@ -1017,8 +1017,8 @@ static const ber_sequence_t SecurityParameters_set[] = {
 
 int
 dissect_dap_SecurityParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SecurityParameters_set, hf_index, ett_dap_SecurityParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SecurityParameters_set, hf_index, ett_dap_SecurityParameters);
 
   return offset;
 }
@@ -1099,14 +1099,14 @@ static int dissect_deleteOldRDN(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notification_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_dap_SEQUENCE_OF_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_dap_SEQUENCE_OF_Attribute);
 
   return offset;
 }
@@ -1115,7 +1115,7 @@ static int dissect_notification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t CommonResults_set[] = {
+static const ber_old_sequence_t CommonResults_set[] = {
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
   { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL, dissect_aliasDereferenced },
@@ -1125,8 +1125,8 @@ static const ber_sequence_t CommonResults_set[] = {
 
 int
 dissect_dap_CommonResults(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CommonResults_set, hf_index, ett_dap_CommonResults);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CommonResults_set, hf_index, ett_dap_CommonResults);
 
   return offset;
 }
@@ -1242,7 +1242,7 @@ static const value_string dap_Name_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Name_choice[] = {
+static const ber_old_choice_t Name_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
   { 0, 0, 0, 0, NULL }
 };
@@ -1252,9 +1252,9 @@ dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 #line 253 "dap.cnf"
 	const char *dn;
 
-	  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Name_choice, hf_index, ett_dap_Name,
-                                 NULL);
+	  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Name_choice, hf_index, ett_dap_Name,
+                                     NULL);
 
 
 	if(check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1286,7 +1286,7 @@ static int dissect_matched_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_manageDSAITPlaneRef_sequence[] = {
+static const ber_old_sequence_t T_manageDSAITPlaneRef_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_dsaName },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
   { 0, 0, 0, NULL }
@@ -1294,8 +1294,8 @@ static const ber_sequence_t T_manageDSAITPlaneRef_sequence[] = {
 
 static int
 dissect_dap_T_manageDSAITPlaneRef(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_manageDSAITPlaneRef_sequence, hf_index, ett_dap_T_manageDSAITPlaneRef);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_manageDSAITPlaneRef_sequence, hf_index, ett_dap_T_manageDSAITPlaneRef);
 
   return offset;
 }
@@ -1334,7 +1334,7 @@ static int dissect_unknownErrors_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ServiceControls_set[] = {
+static const ber_old_sequence_t ServiceControls_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_options },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_priority },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_timeLimit },
@@ -1349,8 +1349,8 @@ static const ber_sequence_t ServiceControls_set[] = {
 
 static int
 dissect_dap_ServiceControls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ServiceControls_set, hf_index, ett_dap_ServiceControls);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ServiceControls_set, hf_index, ett_dap_ServiceControls);
 
   return offset;
 }
@@ -1383,14 +1383,14 @@ static int dissect_null(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_select_item },
 };
 
 static int
 dissect_dap_SET_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeType_set_of, hf_index, ett_dap_SET_OF_AttributeType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeType_set_of, hf_index, ett_dap_SET_OF_AttributeType);
 
   return offset;
 }
@@ -1405,7 +1405,7 @@ static const value_string dap_T_attributes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_attributes_choice[] = {
+static const ber_old_choice_t T_attributes_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_allUserAttributes },
   {   1, BER_CLASS_CON, 1, 0, dissect_select },
   { 0, 0, 0, 0, NULL }
@@ -1413,9 +1413,9 @@ static const ber_choice_t T_attributes_choice[] = {
 
 static int
 dissect_dap_T_attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_attributes_choice, hf_index, ett_dap_T_attributes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_attributes_choice, hf_index, ett_dap_T_attributes,
+                                     NULL);
 
   return offset;
 }
@@ -1449,7 +1449,7 @@ static const value_string dap_T_extraAttributes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extraAttributes_choice[] = {
+static const ber_old_choice_t T_extraAttributes_choice[] = {
   {   3, BER_CLASS_CON, 3, 0, dissect_allOperationalAttributes },
   {   4, BER_CLASS_CON, 4, 0, dissect_select },
   { 0, 0, 0, 0, NULL }
@@ -1457,9 +1457,9 @@ static const ber_choice_t T_extraAttributes_choice[] = {
 
 static int
 dissect_dap_T_extraAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extraAttributes_choice, hf_index, ett_dap_T_extraAttributes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extraAttributes_choice, hf_index, ett_dap_T_extraAttributes,
+                                     NULL);
 
   return offset;
 }
@@ -1468,14 +1468,14 @@ static int dissect_extraAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_preference_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_dap_SEQUENCE_OF_ContextAssertion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_dap_SEQUENCE_OF_ContextAssertion);
 
   return offset;
 }
@@ -1484,14 +1484,14 @@ static int dissect_preference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContextAssertion_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_all_item },
 };
 
 static int
 dissect_dap_SET_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContextAssertion_set_of, hf_index, ett_dap_SET_OF_ContextAssertion);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContextAssertion_set_of, hf_index, ett_dap_SET_OF_ContextAssertion);
 
   return offset;
 }
@@ -1506,7 +1506,7 @@ static const value_string dap_T_contextAssertions_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_contextAssertions_choice[] = {
+static const ber_old_choice_t T_contextAssertions_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_preference },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_all },
   { 0, 0, 0, 0, NULL }
@@ -1514,9 +1514,9 @@ static const ber_choice_t T_contextAssertions_choice[] = {
 
 static int
 dissect_dap_T_contextAssertions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_contextAssertions_choice, hf_index, ett_dap_T_contextAssertions,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_contextAssertions_choice, hf_index, ett_dap_T_contextAssertions,
+                                     NULL);
 
   return offset;
 }
@@ -1525,7 +1525,7 @@ static int dissect_contextAssertions(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t TypeAndContextAssertion_sequence[] = {
+static const ber_old_sequence_t TypeAndContextAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextAssertions },
   { 0, 0, 0, NULL }
@@ -1533,8 +1533,8 @@ static const ber_sequence_t TypeAndContextAssertion_sequence[] = {
 
 static int
 dissect_dap_TypeAndContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TypeAndContextAssertion_sequence, hf_index, ett_dap_TypeAndContextAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TypeAndContextAssertion_sequence, hf_index, ett_dap_TypeAndContextAssertion);
 
   return offset;
 }
@@ -1543,14 +1543,14 @@ static int dissect_selectedContexts_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SET_OF_TypeAndContextAssertion_set_of[1] = {
+static const ber_old_sequence_t SET_OF_TypeAndContextAssertion_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item },
 };
 
 static int
 dissect_dap_SET_OF_TypeAndContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_TypeAndContextAssertion_set_of, hf_index, ett_dap_SET_OF_TypeAndContextAssertion);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_TypeAndContextAssertion_set_of, hf_index, ett_dap_SET_OF_TypeAndContextAssertion);
 
   return offset;
 }
@@ -1565,7 +1565,7 @@ const value_string dap_ContextSelection_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ContextSelection_choice[] = {
+static const ber_old_choice_t ContextSelection_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allContexts },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_selectedContexts },
   { 0, 0, 0, 0, NULL }
@@ -1573,9 +1573,9 @@ static const ber_choice_t ContextSelection_choice[] = {
 
 int
 dissect_dap_ContextSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ContextSelection_choice, hf_index, ett_dap_ContextSelection,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ContextSelection_choice, hf_index, ett_dap_ContextSelection,
+                                     NULL);
 
   return offset;
 }
@@ -1607,14 +1607,14 @@ static int dissect_memberSelect(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_familySelect_sequence_of[1] = {
+static const ber_old_sequence_t T_familySelect_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_familySelect_item },
 };
 
 static int
 dissect_dap_T_familySelect(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_familySelect_sequence_of, hf_index, ett_dap_T_familySelect);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_familySelect_sequence_of, hf_index, ett_dap_T_familySelect);
 
   return offset;
 }
@@ -1623,7 +1623,7 @@ static int dissect_familySelect(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t FamilyReturn_sequence[] = {
+static const ber_old_sequence_t FamilyReturn_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_memberSelect },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_familySelect },
   { 0, 0, 0, NULL }
@@ -1631,8 +1631,8 @@ static const ber_sequence_t FamilyReturn_sequence[] = {
 
 static int
 dissect_dap_FamilyReturn(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FamilyReturn_sequence, hf_index, ett_dap_FamilyReturn);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FamilyReturn_sequence, hf_index, ett_dap_FamilyReturn);
 
   return offset;
 }
@@ -1641,7 +1641,7 @@ static int dissect_familyReturn(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t EntryInformationSelection_set[] = {
+static const ber_old_sequence_t EntryInformationSelection_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributes },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_infoTypes },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extraAttributes },
@@ -1653,8 +1653,8 @@ static const ber_sequence_t EntryInformationSelection_set[] = {
 
 static int
 dissect_dap_EntryInformationSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              EntryInformationSelection_set, hf_index, ett_dap_EntryInformationSelection);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  EntryInformationSelection_set, hf_index, ett_dap_EntryInformationSelection);
 
   return offset;
 }
@@ -1672,7 +1672,7 @@ static const value_string dap_EntryInformationItem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EntryInformationItem_choice[] = {
+static const ber_old_choice_t EntryInformationItem_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attribute },
   { 0, 0, 0, 0, NULL }
@@ -1680,9 +1680,9 @@ static const ber_choice_t EntryInformationItem_choice[] = {
 
 static int
 dissect_dap_EntryInformationItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EntryInformationItem_choice, hf_index, ett_dap_EntryInformationItem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EntryInformationItem_choice, hf_index, ett_dap_EntryInformationItem,
+                                     NULL);
 
   return offset;
 }
@@ -1691,14 +1691,14 @@ static int dissect_entry_information_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_entry_information_set_of[1] = {
+static const ber_old_sequence_t T_entry_information_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entry_information_item },
 };
 
 static int
 dissect_dap_T_entry_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_entry_information_set_of, hf_index, ett_dap_T_entry_information);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_entry_information_set_of, hf_index, ett_dap_T_entry_information);
 
   return offset;
 }
@@ -1707,7 +1707,7 @@ static int dissect_entry_information(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t EntryInformation_sequence[] = {
+static const ber_old_sequence_t EntryInformation_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fromEntry },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entry_information },
@@ -1719,8 +1719,8 @@ static const ber_sequence_t EntryInformation_sequence[] = {
 
 static int
 dissect_dap_EntryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EntryInformation_sequence, hf_index, ett_dap_EntryInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EntryInformation_sequence, hf_index, ett_dap_EntryInformation);
 
   return offset;
 }
@@ -1738,7 +1738,7 @@ static const value_string dap_T_family_information_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_family_information_item_choice[] = {
+static const ber_old_choice_t T_family_information_item_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attribute },
   { 0, 0, 0, 0, NULL }
@@ -1746,9 +1746,9 @@ static const ber_choice_t T_family_information_item_choice[] = {
 
 static int
 dissect_dap_T_family_information_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_family_information_item_choice, hf_index, ett_dap_T_family_information_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_family_information_item_choice, hf_index, ett_dap_T_family_information_item,
+                                     NULL);
 
   return offset;
 }
@@ -1757,14 +1757,14 @@ static int dissect_family_information_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t FamilyInformation_sequence_of[1] = {
+static const ber_old_sequence_t FamilyInformation_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_family_information_item },
 };
 
 static int
 dissect_dap_FamilyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      FamilyInformation_sequence_of, hf_index, ett_dap_FamilyInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          FamilyInformation_sequence_of, hf_index, ett_dap_FamilyInformation);
 
   return offset;
 }
@@ -1773,14 +1773,14 @@ static int dissect_family_information(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_FamilyEntries_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_FamilyEntries_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_family_info_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_FamilyEntries(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_FamilyEntries_sequence_of, hf_index, ett_dap_SEQUENCE_OF_FamilyEntries);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_FamilyEntries_sequence_of, hf_index, ett_dap_SEQUENCE_OF_FamilyEntries);
 
   return offset;
 }
@@ -1789,7 +1789,7 @@ static int dissect_family_info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t FamilyEntry_sequence[] = {
+static const ber_old_sequence_t FamilyEntry_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_rdn },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_family_information },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_family_info },
@@ -1798,8 +1798,8 @@ static const ber_sequence_t FamilyEntry_sequence[] = {
 
 static int
 dissect_dap_FamilyEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FamilyEntry_sequence, hf_index, ett_dap_FamilyEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FamilyEntry_sequence, hf_index, ett_dap_FamilyEntry);
 
   return offset;
 }
@@ -1808,14 +1808,14 @@ static int dissect_familyEntries_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_FamilyEntry_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_FamilyEntry_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_familyEntries_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_FamilyEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_FamilyEntry_sequence_of, hf_index, ett_dap_SEQUENCE_OF_FamilyEntry);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_FamilyEntry_sequence_of, hf_index, ett_dap_SEQUENCE_OF_FamilyEntry);
 
   return offset;
 }
@@ -1824,7 +1824,7 @@ static int dissect_familyEntries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t FamilyEntries_sequence[] = {
+static const ber_old_sequence_t FamilyEntries_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_family_class },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_familyEntries },
   { 0, 0, 0, NULL }
@@ -1832,8 +1832,8 @@ static const ber_sequence_t FamilyEntries_sequence[] = {
 
 static int
 dissect_dap_FamilyEntries(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FamilyEntries_sequence, hf_index, ett_dap_FamilyEntries);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FamilyEntries_sequence, hf_index, ett_dap_FamilyEntries);
 
   return offset;
 }
@@ -1894,7 +1894,7 @@ static const value_string dap_T_strings_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_strings_item_choice[] = {
+static const ber_old_choice_t T_strings_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_initial },
   {   1, BER_CLASS_CON, 1, 0, dissect_any },
   {   2, BER_CLASS_CON, 2, 0, dissect_final },
@@ -1904,9 +1904,9 @@ static const ber_choice_t T_strings_item_choice[] = {
 
 static int
 dissect_dap_T_strings_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_strings_item_choice, hf_index, ett_dap_T_strings_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_strings_item_choice, hf_index, ett_dap_T_strings_item,
+                                     NULL);
 
   return offset;
 }
@@ -1915,14 +1915,14 @@ static int dissect_strings_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_strings_sequence_of[1] = {
+static const ber_old_sequence_t T_strings_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_strings_item },
 };
 
 static int
 dissect_dap_T_strings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_strings_sequence_of, hf_index, ett_dap_T_strings);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_strings_sequence_of, hf_index, ett_dap_T_strings);
 
   return offset;
 }
@@ -1931,7 +1931,7 @@ static int dissect_strings(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_substrings_sequence[] = {
+static const ber_old_sequence_t T_substrings_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_sunstringType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_strings },
   { 0, 0, 0, NULL }
@@ -1939,8 +1939,8 @@ static const ber_sequence_t T_substrings_sequence[] = {
 
 static int
 dissect_dap_T_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_substrings_sequence, hf_index, ett_dap_T_substrings);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_substrings_sequence, hf_index, ett_dap_T_substrings);
 
   return offset;
 }
@@ -1949,14 +1949,14 @@ static int dissect_substrings(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_matchingRule_set_of[1] = {
+static const ber_old_sequence_t T_matchingRule_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_matchingRule_item },
 };
 
 static int
 dissect_dap_T_matchingRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_matchingRule_set_of, hf_index, ett_dap_T_matchingRule);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_matchingRule_set_of, hf_index, ett_dap_T_matchingRule);
 
   return offset;
 }
@@ -1980,7 +1980,7 @@ static int dissect_matchValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
+static const ber_old_sequence_t MatchingRuleAssertion_sequence[] = {
   { BER_CLASS_CON, 1, 0, dissect_matchingRule },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_type },
   { BER_CLASS_CON, 3, 0, dissect_matchValue },
@@ -1990,8 +1990,8 @@ static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
 
 static int
 dissect_dap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MatchingRuleAssertion_sequence, hf_index, ett_dap_MatchingRuleAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MatchingRuleAssertion_sequence, hf_index, ett_dap_MatchingRuleAssertion);
 
   return offset;
 }
@@ -2012,7 +2012,7 @@ static const value_string dap_FilterItem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FilterItem_choice[] = {
+static const ber_old_choice_t FilterItem_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_equality },
   {   1, BER_CLASS_CON, 1, 0, dissect_substrings },
   {   2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
@@ -2026,9 +2026,9 @@ static const ber_choice_t FilterItem_choice[] = {
 
 static int
 dissect_dap_FilterItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FilterItem_choice, hf_index, ett_dap_FilterItem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FilterItem_choice, hf_index, ett_dap_FilterItem,
+                                     NULL);
 
   return offset;
 }
@@ -2037,14 +2037,14 @@ static int dissect_filter_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SetOfFilter_set_of[1] = {
+static const ber_old_sequence_t SetOfFilter_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SetOfFilter_item },
 };
 
 static int
 dissect_dap_SetOfFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SetOfFilter_set_of, hf_index, ett_dap_SetOfFilter);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SetOfFilter_set_of, hf_index, ett_dap_SetOfFilter);
 
   return offset;
 }
@@ -2064,7 +2064,7 @@ const value_string dap_Filter_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Filter_choice[] = {
+static const ber_old_choice_t Filter_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_filter_item },
   {   1, BER_CLASS_CON, 1, 0, dissect_and },
   {   2, BER_CLASS_CON, 2, 0, dissect_or },
@@ -2074,15 +2074,15 @@ static const ber_choice_t Filter_choice[] = {
 
 int
 dissect_dap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Filter_choice, hf_index, ett_dap_Filter,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Filter_choice, hf_index, ett_dap_Filter,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SortKey_sequence[] = {
+static const ber_old_sequence_t SortKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_orderingRule },
   { 0, 0, 0, NULL }
@@ -2090,8 +2090,8 @@ static const ber_sequence_t SortKey_sequence[] = {
 
 static int
 dissect_dap_SortKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SortKey_sequence, hf_index, ett_dap_SortKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SortKey_sequence, hf_index, ett_dap_SortKey);
 
   return offset;
 }
@@ -2100,14 +2100,14 @@ static int dissect_sortKeys_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SortKey_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SortKey_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sortKeys_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_SortKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SortKey_sequence_of, hf_index, ett_dap_SEQUENCE_OF_SortKey);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SortKey_sequence_of, hf_index, ett_dap_SEQUENCE_OF_SortKey);
 
   return offset;
 }
@@ -2116,7 +2116,7 @@ static int dissect_sortKeys(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_newRequest_sequence[] = {
+static const ber_old_sequence_t T_newRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pageSize },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sortKeys },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_reverse },
@@ -2126,8 +2126,8 @@ static const ber_sequence_t T_newRequest_sequence[] = {
 
 static int
 dissect_dap_T_newRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_newRequest_sequence, hf_index, ett_dap_T_newRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_newRequest_sequence, hf_index, ett_dap_T_newRequest);
 
   return offset;
 }
@@ -2188,7 +2188,7 @@ static const value_string dap_PagedResultsRequest_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PagedResultsRequest_choice[] = {
+static const ber_old_choice_t PagedResultsRequest_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newRequest },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_queryReference },
   { 0, 0, 0, 0, NULL }
@@ -2196,9 +2196,9 @@ static const ber_choice_t PagedResultsRequest_choice[] = {
 
 static int
 dissect_dap_PagedResultsRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PagedResultsRequest_choice, hf_index, ett_dap_PagedResultsRequest,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PagedResultsRequest_choice, hf_index, ett_dap_PagedResultsRequest,
+                                     NULL);
 
   return offset;
 }
@@ -2213,7 +2213,7 @@ static const value_string dap_T_time1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_time1_choice[] = {
+static const ber_old_choice_t T_time1_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utc },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_gt },
   { 0, 0, 0, 0, NULL }
@@ -2221,9 +2221,9 @@ static const ber_choice_t T_time1_choice[] = {
 
 static int
 dissect_dap_T_time1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_time1_choice, hf_index, ett_dap_T_time1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_time1_choice, hf_index, ett_dap_T_time1,
+                                     NULL);
 
   return offset;
 }
@@ -2238,7 +2238,7 @@ static const value_string dap_T_time2_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_time2_choice[] = {
+static const ber_old_choice_t T_time2_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utc },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_gt },
   { 0, 0, 0, 0, NULL }
@@ -2246,9 +2246,9 @@ static const ber_choice_t T_time2_choice[] = {
 
 static int
 dissect_dap_T_time2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_time2_choice, hf_index, ett_dap_T_time2,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_time2_choice, hf_index, ett_dap_T_time2,
+                                     NULL);
 
   return offset;
 }
@@ -2257,7 +2257,7 @@ static int dissect_time2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t T_validity_set[] = {
+static const ber_old_sequence_t T_validity_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_time1 },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_time2 },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_random1 },
@@ -2267,8 +2267,8 @@ static const ber_sequence_t T_validity_set[] = {
 
 static int
 dissect_dap_T_validity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              T_validity_set, hf_index, ett_dap_T_validity);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  T_validity_set, hf_index, ett_dap_T_validity);
 
   return offset;
 }
@@ -2277,7 +2277,7 @@ static int dissect_validity(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_protected_sequence[] = {
+static const ber_old_sequence_t T_protected_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_protectedPassword },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2286,8 +2286,8 @@ static const ber_sequence_t T_protected_sequence[] = {
 
 static int
 dissect_dap_T_protected(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_protected_sequence, hf_index, ett_dap_T_protected);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_protected_sequence, hf_index, ett_dap_T_protected);
 
   return offset;
 }
@@ -2302,7 +2302,7 @@ static const value_string dap_T_password_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_password_choice[] = {
+static const ber_old_choice_t T_password_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_unprotected },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_protected },
   { 0, 0, 0, 0, NULL }
@@ -2310,9 +2310,9 @@ static const ber_choice_t T_password_choice[] = {
 
 static int
 dissect_dap_T_password(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_password_choice, hf_index, ett_dap_T_password,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_password_choice, hf_index, ett_dap_T_password,
+                                     NULL);
 
   return offset;
 }
@@ -2321,7 +2321,7 @@ static int dissect_password(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SimpleCredentials_sequence[] = {
+static const ber_old_sequence_t SimpleCredentials_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_distinguished_name },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_validity },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_password },
@@ -2332,8 +2332,8 @@ static int
 dissect_dap_SimpleCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 156 "dap.cnf"
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SimpleCredentials_sequence, hf_index, ett_dap_SimpleCredentials);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SimpleCredentials_sequence, hf_index, ett_dap_SimpleCredentials);
 
 
 	if(check_col(actx->pinfo->cinfo, COL_INFO))	
@@ -2348,14 +2348,14 @@ static int dissect_simple(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bindIntAlgorithm_item },
 };
 
 static int
 dissect_dap_SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_dap_SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_dap_SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier);
 
   return offset;
 }
@@ -2384,7 +2384,7 @@ static int dissect_bindConfKeyInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TokenData_sequence[] = {
+static const ber_old_sequence_t TokenData_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_algorithm },
   { BER_CLASS_CON, 1, 0, dissect_distinguished_name },
   { BER_CLASS_CON, 2, 0, dissect_utctime },
@@ -2399,8 +2399,8 @@ static const ber_sequence_t TokenData_sequence[] = {
 
 static int
 dissect_dap_TokenData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TokenData_sequence, hf_index, ett_dap_TokenData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TokenData_sequence, hf_index, ett_dap_TokenData);
 
   return offset;
 }
@@ -2409,7 +2409,7 @@ static int dissect_token_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Token_sequence[] = {
+static const ber_old_sequence_t Token_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_token_data },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2418,8 +2418,8 @@ static const ber_sequence_t Token_sequence[] = {
 
 static int
 dissect_dap_Token(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Token_sequence, hf_index, ett_dap_Token);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Token_sequence, hf_index, ett_dap_Token);
 
   return offset;
 }
@@ -2428,7 +2428,7 @@ static int dissect_bind_token(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t StrongCredentials_set[] = {
+static const ber_old_sequence_t StrongCredentials_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certification_path },
   { BER_CLASS_CON, 1, 0, dissect_bind_token },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_distinguished_name },
@@ -2438,8 +2438,8 @@ static const ber_sequence_t StrongCredentials_set[] = {
 
 static int
 dissect_dap_StrongCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              StrongCredentials_set, hf_index, ett_dap_StrongCredentials);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  StrongCredentials_set, hf_index, ett_dap_StrongCredentials);
 
   return offset;
 }
@@ -2484,7 +2484,7 @@ static const value_string dap_SpkmCredentials_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SpkmCredentials_choice[] = {
+static const ber_old_choice_t SpkmCredentials_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_req },
   {   1, BER_CLASS_CON, 1, 0, dissect_rep },
   { 0, 0, 0, 0, NULL }
@@ -2492,9 +2492,9 @@ static const ber_choice_t SpkmCredentials_choice[] = {
 
 static int
 dissect_dap_SpkmCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SpkmCredentials_choice, hf_index, ett_dap_SpkmCredentials,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SpkmCredentials_choice, hf_index, ett_dap_SpkmCredentials,
+                                     NULL);
 
   return offset;
 }
@@ -2511,7 +2511,7 @@ static const value_string dap_Credentials_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Credentials_choice[] = {
+static const ber_old_choice_t Credentials_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_simple },
   {   1, BER_CLASS_CON, 1, 0, dissect_strong },
   {   2, BER_CLASS_CON, 2, 0, dissect_externalProcedure },
@@ -2521,9 +2521,9 @@ static const ber_choice_t Credentials_choice[] = {
 
 static int
 dissect_dap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Credentials_choice, hf_index, ett_dap_Credentials,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Credentials_choice, hf_index, ett_dap_Credentials,
+                                     NULL);
 
   return offset;
 }
@@ -2551,7 +2551,7 @@ static int dissect_versions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t DirectoryBindArgument_set[] = {
+static const ber_old_sequence_t DirectoryBindArgument_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_credentials },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_versions },
   { 0, 0, 0, NULL }
@@ -2576,8 +2576,8 @@ dissect_dap_DirectoryBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 	}
 	/* do the default thing */
 
-	  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DirectoryBindArgument_set, hf_index, ett_dap_DirectoryBindArgument);
+	  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DirectoryBindArgument_set, hf_index, ett_dap_DirectoryBindArgument);
 	
 
 
@@ -2686,7 +2686,7 @@ static const value_string dap_T_error_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_error_choice[] = {
+static const ber_old_choice_t T_error_choice[] = {
   {   1, BER_CLASS_CON, 1, 0, dissect_serviceProblem },
   {   2, BER_CLASS_CON, 2, 0, dissect_securityProblem },
   { 0, 0, 0, 0, NULL }
@@ -2694,9 +2694,9 @@ static const ber_choice_t T_error_choice[] = {
 
 static int
 dissect_dap_T_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_error_choice, hf_index, ett_dap_T_error,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_error_choice, hf_index, ett_dap_T_error,
+                                     NULL);
 
   return offset;
 }
@@ -2705,7 +2705,7 @@ static int dissect_error(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t DirectoryBindErrorData_set[] = {
+static const ber_old_sequence_t DirectoryBindErrorData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_versions },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_error },
   { 0, 0, 0, NULL }
@@ -2713,8 +2713,8 @@ static const ber_sequence_t DirectoryBindErrorData_set[] = {
 
 static int
 dissect_dap_DirectoryBindErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DirectoryBindErrorData_set, hf_index, ett_dap_DirectoryBindErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DirectoryBindErrorData_set, hf_index, ett_dap_DirectoryBindErrorData);
 
   return offset;
 }
@@ -2726,7 +2726,7 @@ static int dissect_directoryBindError(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_signedDirectoryBindError_sequence[] = {
+static const ber_old_sequence_t T_signedDirectoryBindError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_directoryBindError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2735,8 +2735,8 @@ static const ber_sequence_t T_signedDirectoryBindError_sequence[] = {
 
 static int
 dissect_dap_T_signedDirectoryBindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedDirectoryBindError_sequence, hf_index, ett_dap_T_signedDirectoryBindError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedDirectoryBindError_sequence, hf_index, ett_dap_T_signedDirectoryBindError);
 
   return offset;
 }
@@ -2751,7 +2751,7 @@ const value_string dap_DirectoryBindError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DirectoryBindError_choice[] = {
+static const ber_old_choice_t DirectoryBindError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedDirectoryBindError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedDirectoryBindError },
   { 0, 0, 0, 0, NULL }
@@ -2759,15 +2759,15 @@ static const ber_choice_t DirectoryBindError_choice[] = {
 
 int
 dissect_dap_DirectoryBindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DirectoryBindError_choice, hf_index, ett_dap_DirectoryBindError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DirectoryBindError_choice, hf_index, ett_dap_DirectoryBindError,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReadArgumentData_set[] = {
+static const ber_old_sequence_t ReadArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_selection },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_modifyRightsRequest },
@@ -2787,8 +2787,8 @@ static const ber_sequence_t ReadArgumentData_set[] = {
 
 static int
 dissect_dap_ReadArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReadArgumentData_set, hf_index, ett_dap_ReadArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReadArgumentData_set, hf_index, ett_dap_ReadArgumentData);
 
   return offset;
 }
@@ -2800,7 +2800,7 @@ static int dissect_readArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_signedReadArgument_sequence[] = {
+static const ber_old_sequence_t T_signedReadArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_readArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2809,8 +2809,8 @@ static const ber_sequence_t T_signedReadArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedReadArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedReadArgument_sequence, hf_index, ett_dap_T_signedReadArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedReadArgument_sequence, hf_index, ett_dap_T_signedReadArgument);
 
   return offset;
 }
@@ -2825,7 +2825,7 @@ const value_string dap_ReadArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReadArgument_choice[] = {
+static const ber_old_choice_t ReadArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedReadArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedReadArgument },
   { 0, 0, 0, 0, NULL }
@@ -2833,9 +2833,9 @@ static const ber_choice_t ReadArgument_choice[] = {
 
 int
 dissect_dap_ReadArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReadArgument_choice, hf_index, ett_dap_ReadArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReadArgument_choice, hf_index, ett_dap_ReadArgument,
+                                     NULL);
 
   return offset;
 }
@@ -2848,7 +2848,7 @@ static const value_string dap_T_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_item_choice[] = {
+static const ber_old_choice_t T_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_item_entry },
   {   1, BER_CLASS_CON, 1, 0, dissect_attribute_type },
   {   2, BER_CLASS_CON, 2, 0, dissect_value_assertion },
@@ -2857,9 +2857,9 @@ static const ber_choice_t T_item_choice[] = {
 
 static int
 dissect_dap_T_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_item_choice, hf_index, ett_dap_T_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_item_choice, hf_index, ett_dap_T_item,
+                                     NULL);
 
   return offset;
 }
@@ -2889,7 +2889,7 @@ static int dissect_permission(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ModifyRights_item_sequence[] = {
+static const ber_old_sequence_t ModifyRights_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_item },
   { BER_CLASS_CON, 3, 0, dissect_permission },
   { 0, 0, 0, NULL }
@@ -2897,8 +2897,8 @@ static const ber_sequence_t ModifyRights_item_sequence[] = {
 
 static int
 dissect_dap_ModifyRights_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyRights_item_sequence, hf_index, ett_dap_ModifyRights_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyRights_item_sequence, hf_index, ett_dap_ModifyRights_item);
 
   return offset;
 }
@@ -2907,14 +2907,14 @@ static int dissect_ModifyRights_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ModifyRights_set_of[1] = {
+static const ber_old_sequence_t ModifyRights_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ModifyRights_item },
 };
 
 static int
 dissect_dap_ModifyRights(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ModifyRights_set_of, hf_index, ett_dap_ModifyRights);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ModifyRights_set_of, hf_index, ett_dap_ModifyRights);
 
   return offset;
 }
@@ -2923,7 +2923,7 @@ static int dissect_modifyRights(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReadResultData_set[] = {
+static const ber_old_sequence_t ReadResultData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_entry },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_modifyRights },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -2935,8 +2935,8 @@ static const ber_sequence_t ReadResultData_set[] = {
 
 static int
 dissect_dap_ReadResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReadResultData_set, hf_index, ett_dap_ReadResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReadResultData_set, hf_index, ett_dap_ReadResultData);
 
   return offset;
 }
@@ -2948,7 +2948,7 @@ static int dissect_readResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_signedReadResult_sequence[] = {
+static const ber_old_sequence_t T_signedReadResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_readResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2957,8 +2957,8 @@ static const ber_sequence_t T_signedReadResult_sequence[] = {
 
 static int
 dissect_dap_T_signedReadResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedReadResult_sequence, hf_index, ett_dap_T_signedReadResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedReadResult_sequence, hf_index, ett_dap_T_signedReadResult);
 
   return offset;
 }
@@ -2973,7 +2973,7 @@ const value_string dap_ReadResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReadResult_choice[] = {
+static const ber_old_choice_t ReadResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedReadResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedReadResult },
   { 0, 0, 0, 0, NULL }
@@ -2981,15 +2981,15 @@ static const ber_choice_t ReadResult_choice[] = {
 
 int
 dissect_dap_ReadResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReadResult_choice, hf_index, ett_dap_ReadResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReadResult_choice, hf_index, ett_dap_ReadResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CompareArgumentData_set[] = {
+static const ber_old_sequence_t CompareArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, 0, dissect_purported },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_serviceControls },
@@ -3008,8 +3008,8 @@ static const ber_sequence_t CompareArgumentData_set[] = {
 
 static int
 dissect_dap_CompareArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CompareArgumentData_set, hf_index, ett_dap_CompareArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CompareArgumentData_set, hf_index, ett_dap_CompareArgumentData);
 
   return offset;
 }
@@ -3021,7 +3021,7 @@ static int dissect_compareArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_signedCompareArgument_sequence[] = {
+static const ber_old_sequence_t T_signedCompareArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_compareArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3030,8 +3030,8 @@ static const ber_sequence_t T_signedCompareArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedCompareArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedCompareArgument_sequence, hf_index, ett_dap_T_signedCompareArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedCompareArgument_sequence, hf_index, ett_dap_T_signedCompareArgument);
 
   return offset;
 }
@@ -3046,7 +3046,7 @@ const value_string dap_CompareArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CompareArgument_choice[] = {
+static const ber_old_choice_t CompareArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedCompareArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCompareArgument },
   { 0, 0, 0, 0, NULL }
@@ -3054,15 +3054,15 @@ static const ber_choice_t CompareArgument_choice[] = {
 
 int
 dissect_dap_CompareArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CompareArgument_choice, hf_index, ett_dap_CompareArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CompareArgument_choice, hf_index, ett_dap_CompareArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CompareResultData_set[] = {
+static const ber_old_sequence_t CompareResultData_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_CON, 0, 0, dissect_matched },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_fromEntry },
@@ -3076,8 +3076,8 @@ static const ber_sequence_t CompareResultData_set[] = {
 
 static int
 dissect_dap_CompareResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CompareResultData_set, hf_index, ett_dap_CompareResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CompareResultData_set, hf_index, ett_dap_CompareResultData);
 
   return offset;
 }
@@ -3089,7 +3089,7 @@ static int dissect_compareResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_signedCompareResult_sequence[] = {
+static const ber_old_sequence_t T_signedCompareResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_compareResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3098,8 +3098,8 @@ static const ber_sequence_t T_signedCompareResult_sequence[] = {
 
 static int
 dissect_dap_T_signedCompareResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedCompareResult_sequence, hf_index, ett_dap_T_signedCompareResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedCompareResult_sequence, hf_index, ett_dap_T_signedCompareResult);
 
   return offset;
 }
@@ -3114,7 +3114,7 @@ const value_string dap_CompareResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CompareResult_choice[] = {
+static const ber_old_choice_t CompareResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedCompareResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCompareResult },
   { 0, 0, 0, 0, NULL }
@@ -3122,23 +3122,23 @@ static const ber_choice_t CompareResult_choice[] = {
 
 int
 dissect_dap_CompareResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CompareResult_choice, hf_index, ett_dap_CompareResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CompareResult_choice, hf_index, ett_dap_CompareResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AbandonArgumentData_sequence[] = {
+static const ber_old_sequence_t AbandonArgumentData_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_invokeID },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_dap_AbandonArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbandonArgumentData_sequence, hf_index, ett_dap_AbandonArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbandonArgumentData_sequence, hf_index, ett_dap_AbandonArgumentData);
 
   return offset;
 }
@@ -3150,7 +3150,7 @@ static int dissect_abandonArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_signedAbandonArgument_sequence[] = {
+static const ber_old_sequence_t T_signedAbandonArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_abandonArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3159,8 +3159,8 @@ static const ber_sequence_t T_signedAbandonArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedAbandonArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAbandonArgument_sequence, hf_index, ett_dap_T_signedAbandonArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAbandonArgument_sequence, hf_index, ett_dap_T_signedAbandonArgument);
 
   return offset;
 }
@@ -3175,7 +3175,7 @@ const value_string dap_AbandonArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AbandonArgument_choice[] = {
+static const ber_old_choice_t AbandonArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedAbandonArgument },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedAbandonArgument },
   { 0, 0, 0, 0, NULL }
@@ -3183,15 +3183,15 @@ static const ber_choice_t AbandonArgument_choice[] = {
 
 int
 dissect_dap_AbandonArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AbandonArgument_choice, hf_index, ett_dap_AbandonArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AbandonArgument_choice, hf_index, ett_dap_AbandonArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AbandonResultData_sequence[] = {
+static const ber_old_sequence_t AbandonResultData_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
@@ -3202,8 +3202,8 @@ static const ber_sequence_t AbandonResultData_sequence[] = {
 
 static int
 dissect_dap_AbandonResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbandonResultData_sequence, hf_index, ett_dap_AbandonResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbandonResultData_sequence, hf_index, ett_dap_AbandonResultData);
 
   return offset;
 }
@@ -3215,7 +3215,7 @@ static int dissect_abandonResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_signedAbandonResult_sequence[] = {
+static const ber_old_sequence_t T_signedAbandonResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_abandonResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3224,8 +3224,8 @@ static const ber_sequence_t T_signedAbandonResult_sequence[] = {
 
 static int
 dissect_dap_T_signedAbandonResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAbandonResult_sequence, hf_index, ett_dap_T_signedAbandonResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAbandonResult_sequence, hf_index, ett_dap_T_signedAbandonResult);
 
   return offset;
 }
@@ -3240,7 +3240,7 @@ static const value_string dap_AbandonInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AbandonInformation_choice[] = {
+static const ber_old_choice_t AbandonInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedAbandonResult },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedAbandonResult },
   { 0, 0, 0, 0, NULL }
@@ -3248,9 +3248,9 @@ static const ber_choice_t AbandonInformation_choice[] = {
 
 static int
 dissect_dap_AbandonInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AbandonInformation_choice, hf_index, ett_dap_AbandonInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AbandonInformation_choice, hf_index, ett_dap_AbandonInformation,
+                                     NULL);
 
   return offset;
 }
@@ -3265,7 +3265,7 @@ const value_string dap_AbandonResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AbandonResult_choice[] = {
+static const ber_old_choice_t AbandonResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_abandon_information },
   { 0, 0, 0, 0, NULL }
@@ -3273,15 +3273,15 @@ static const ber_choice_t AbandonResult_choice[] = {
 
 int
 dissect_dap_AbandonResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AbandonResult_choice, hf_index, ett_dap_AbandonResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AbandonResult_choice, hf_index, ett_dap_AbandonResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ListArgumentData_set[] = {
+static const ber_old_sequence_t ListArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_pagedResults },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_listFamily },
@@ -3301,8 +3301,8 @@ static const ber_sequence_t ListArgumentData_set[] = {
 
 static int
 dissect_dap_ListArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ListArgumentData_set, hf_index, ett_dap_ListArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ListArgumentData_set, hf_index, ett_dap_ListArgumentData);
 
   return offset;
 }
@@ -3314,7 +3314,7 @@ static int dissect_listArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_signedListArgument_sequence[] = {
+static const ber_old_sequence_t T_signedListArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_listArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3323,8 +3323,8 @@ static const ber_sequence_t T_signedListArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedListArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedListArgument_sequence, hf_index, ett_dap_T_signedListArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedListArgument_sequence, hf_index, ett_dap_T_signedListArgument);
 
   return offset;
 }
@@ -3339,7 +3339,7 @@ const value_string dap_ListArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ListArgument_choice[] = {
+static const ber_old_choice_t ListArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedListArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedListArgument },
   { 0, 0, 0, 0, NULL }
@@ -3347,15 +3347,15 @@ static const ber_choice_t ListArgument_choice[] = {
 
 int
 dissect_dap_ListArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ListArgument_choice, hf_index, ett_dap_ListArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ListArgument_choice, hf_index, ett_dap_ListArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_subordinates_item_sequence[] = {
+static const ber_old_sequence_t T_subordinates_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_rdn },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_aliasEntry },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_fromEntry },
@@ -3367,8 +3367,8 @@ dissect_dap_T_subordinates_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 #line 263 "dap.cnf"
 	proto_item *sub_item;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_subordinates_item_sequence, hf_index, ett_dap_T_subordinates_item);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_subordinates_item_sequence, hf_index, ett_dap_T_subordinates_item);
 
 
 	if((sub_item = get_ber_last_created_item())) {
@@ -3385,14 +3385,14 @@ static int dissect_subordinates_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_subordinates_set_of[1] = {
+static const ber_old_sequence_t T_subordinates_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subordinates_item },
 };
 
 static int
 dissect_dap_T_subordinates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_subordinates_set_of, hf_index, ett_dap_T_subordinates);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_subordinates_set_of, hf_index, ett_dap_T_subordinates);
 
   return offset;
 }
@@ -3431,14 +3431,14 @@ static int dissect_limitProblem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SET_OF_ContinuationReference_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContinuationReference_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unexplored_item },
 };
 
 static int
 dissect_dap_SET_OF_ContinuationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContinuationReference_set_of, hf_index, ett_dap_SET_OF_ContinuationReference);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContinuationReference_set_of, hf_index, ett_dap_SET_OF_ContinuationReference);
 
   return offset;
 }
@@ -3447,14 +3447,14 @@ static int dissect_unexplored(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_unknownErrors_set_of[1] = {
+static const ber_old_sequence_t T_unknownErrors_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_unknownErrors_item },
 };
 
 static int
 dissect_dap_T_unknownErrors(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_unknownErrors_set_of, hf_index, ett_dap_T_unknownErrors);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_unknownErrors_set_of, hf_index, ett_dap_T_unknownErrors);
 
   return offset;
 }
@@ -3469,7 +3469,7 @@ static const value_string dap_T_entryCount_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_entryCount_choice[] = {
+static const ber_old_choice_t T_entryCount_choice[] = {
   {   7, BER_CLASS_CON, 7, 0, dissect_bestEstimate },
   {   8, BER_CLASS_CON, 8, 0, dissect_lowEstimate },
   { 0, 0, 0, 0, NULL }
@@ -3477,9 +3477,9 @@ static const ber_choice_t T_entryCount_choice[] = {
 
 static int
 dissect_dap_T_entryCount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_entryCount_choice, hf_index, ett_dap_T_entryCount,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_entryCount_choice, hf_index, ett_dap_T_entryCount,
+                                     NULL);
 
   return offset;
 }
@@ -3488,7 +3488,7 @@ static int dissect_entryCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t PartialOutcomeQualifier_set[] = {
+static const ber_old_sequence_t PartialOutcomeQualifier_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_limitProblem },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_unexplored },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_unavailableCriticalExtensions },
@@ -3502,8 +3502,8 @@ static const ber_sequence_t PartialOutcomeQualifier_set[] = {
 
 static int
 dissect_dap_PartialOutcomeQualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PartialOutcomeQualifier_set, hf_index, ett_dap_PartialOutcomeQualifier);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PartialOutcomeQualifier_set, hf_index, ett_dap_PartialOutcomeQualifier);
 
   return offset;
 }
@@ -3512,7 +3512,7 @@ static int dissect_partialOutcomeQualifier(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t T_listInfo_set[] = {
+static const ber_old_sequence_t T_listInfo_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_CON, 1, 0, dissect_subordinates },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_partialOutcomeQualifier },
@@ -3525,8 +3525,8 @@ static const ber_sequence_t T_listInfo_set[] = {
 
 static int
 dissect_dap_T_listInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              T_listInfo_set, hf_index, ett_dap_T_listInfo);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  T_listInfo_set, hf_index, ett_dap_T_listInfo);
 
   return offset;
 }
@@ -3535,7 +3535,7 @@ static int dissect_listInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedListResult_sequence[] = {
+static const ber_old_sequence_t T_signedListResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3544,8 +3544,8 @@ static const ber_sequence_t T_signedListResult_sequence[] = {
 
 static int
 dissect_dap_T_signedListResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedListResult_sequence, hf_index, ett_dap_T_signedListResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedListResult_sequence, hf_index, ett_dap_T_signedListResult);
 
   return offset;
 }
@@ -3560,7 +3560,7 @@ const value_string dap_ListResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ListResult_choice[] = {
+static const ber_old_choice_t ListResult_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unsignedListResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedListResult },
   { 0, 0, 0, 0, NULL }
@@ -3568,9 +3568,9 @@ static const ber_choice_t ListResult_choice[] = {
 
 int
 dissect_dap_ListResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ListResult_choice, hf_index, ett_dap_ListResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ListResult_choice, hf_index, ett_dap_ListResult,
+                                     NULL);
 
   return offset;
 }
@@ -3579,14 +3579,14 @@ static int dissect_uncorrelatedListInfo_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SET_OF_ListResult_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ListResult_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_uncorrelatedListInfo_item },
 };
 
 static int
 dissect_dap_SET_OF_ListResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ListResult_set_of, hf_index, ett_dap_SET_OF_ListResult);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ListResult_set_of, hf_index, ett_dap_SET_OF_ListResult);
 
   return offset;
 }
@@ -3601,7 +3601,7 @@ static const value_string dap_ListResultData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ListResultData_choice[] = {
+static const ber_old_choice_t ListResultData_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_listInfo },
   {   1, BER_CLASS_CON, 0, 0, dissect_uncorrelatedListInfo },
   { 0, 0, 0, 0, NULL }
@@ -3609,9 +3609,9 @@ static const ber_choice_t ListResultData_choice[] = {
 
 static int
 dissect_dap_ListResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ListResultData_choice, hf_index, ett_dap_ListResultData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ListResultData_choice, hf_index, ett_dap_ListResultData,
+                                     NULL);
 
   return offset;
 }
@@ -3748,14 +3748,14 @@ static int dissect_joinContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_JoinContextType_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_JoinContextType_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_joinContext_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_JoinContextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_JoinContextType_sequence_of, hf_index, ett_dap_SEQUENCE_OF_JoinContextType);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_JoinContextType_sequence_of, hf_index, ett_dap_SEQUENCE_OF_JoinContextType);
 
   return offset;
 }
@@ -3764,7 +3764,7 @@ static int dissect_joinContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t JoinAttPair_sequence[] = {
+static const ber_old_sequence_t JoinAttPair_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_baseAtt },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_joinAtt },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_joinContext },
@@ -3773,8 +3773,8 @@ static const ber_sequence_t JoinAttPair_sequence[] = {
 
 static int
 dissect_dap_JoinAttPair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   JoinAttPair_sequence, hf_index, ett_dap_JoinAttPair);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       JoinAttPair_sequence, hf_index, ett_dap_JoinAttPair);
 
   return offset;
 }
@@ -3783,14 +3783,14 @@ static int dissect_joinAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_JoinAttPair_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_JoinAttPair_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_joinAttributes_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_JoinAttPair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_JoinAttPair_sequence_of, hf_index, ett_dap_SEQUENCE_OF_JoinAttPair);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_JoinAttPair_sequence_of, hf_index, ett_dap_SEQUENCE_OF_JoinAttPair);
 
   return offset;
 }
@@ -3799,7 +3799,7 @@ static int dissect_joinAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t JoinArgument_sequence[] = {
+static const ber_old_sequence_t JoinArgument_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_joinBaseObject },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_domainLocalID },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_joinSubset },
@@ -3811,8 +3811,8 @@ static const ber_sequence_t JoinArgument_sequence[] = {
 
 static int
 dissect_dap_JoinArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   JoinArgument_sequence, hf_index, ett_dap_JoinArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       JoinArgument_sequence, hf_index, ett_dap_JoinArgument);
 
   return offset;
 }
@@ -3821,14 +3821,14 @@ static int dissect_joinArguments_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_JoinArgument_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_JoinArgument_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_joinArguments_item },
 };
 
 static int
 dissect_dap_SEQUENCE_SIZE_1_MAX_OF_JoinArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_JoinArgument_sequence_of, hf_index, ett_dap_SEQUENCE_SIZE_1_MAX_OF_JoinArgument);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_JoinArgument_sequence_of, hf_index, ett_dap_SEQUENCE_SIZE_1_MAX_OF_JoinArgument);
 
   return offset;
 }
@@ -3857,7 +3857,7 @@ static int dissect_joinType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SearchArgumentData_set[] = {
+static const ber_old_sequence_t SearchArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_baseObject },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_subset },
   { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_filter },
@@ -3889,8 +3889,8 @@ static const ber_sequence_t SearchArgumentData_set[] = {
 
 static int
 dissect_dap_SearchArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SearchArgumentData_set, hf_index, ett_dap_SearchArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SearchArgumentData_set, hf_index, ett_dap_SearchArgumentData);
 
   return offset;
 }
@@ -3902,7 +3902,7 @@ static int dissect_searchArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_signedSearchArgument_sequence[] = {
+static const ber_old_sequence_t T_signedSearchArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_searchArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3911,8 +3911,8 @@ static const ber_sequence_t T_signedSearchArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedSearchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedSearchArgument_sequence, hf_index, ett_dap_T_signedSearchArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedSearchArgument_sequence, hf_index, ett_dap_T_signedSearchArgument);
 
   return offset;
 }
@@ -3927,7 +3927,7 @@ const value_string dap_SearchArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SearchArgument_choice[] = {
+static const ber_old_choice_t SearchArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedSearchArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedSearchArgument },
   { 0, 0, 0, 0, NULL }
@@ -3935,22 +3935,22 @@ static const ber_choice_t SearchArgument_choice[] = {
 
 int
 dissect_dap_SearchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SearchArgument_choice, hf_index, ett_dap_SearchArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SearchArgument_choice, hf_index, ett_dap_SearchArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_EntryInformation_set_of[1] = {
+static const ber_old_sequence_t SET_OF_EntryInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_entries_item },
 };
 
 static int
 dissect_dap_SET_OF_EntryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_EntryInformation_set_of, hf_index, ett_dap_SET_OF_EntryInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_EntryInformation_set_of, hf_index, ett_dap_SET_OF_EntryInformation);
 
   return offset;
 }
@@ -3959,7 +3959,7 @@ static int dissect_entries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_searchInfo_set[] = {
+static const ber_old_sequence_t T_searchInfo_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_CON, 0, 0, dissect_entries },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_partialOutcomeQualifier },
@@ -3973,8 +3973,8 @@ static const ber_sequence_t T_searchInfo_set[] = {
 
 static int
 dissect_dap_T_searchInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              T_searchInfo_set, hf_index, ett_dap_T_searchInfo);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  T_searchInfo_set, hf_index, ett_dap_T_searchInfo);
 
   return offset;
 }
@@ -3983,7 +3983,7 @@ static int dissect_searchInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_signedSearchResult_sequence[] = {
+static const ber_old_sequence_t T_signedSearchResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_searchResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -3992,8 +3992,8 @@ static const ber_sequence_t T_signedSearchResult_sequence[] = {
 
 static int
 dissect_dap_T_signedSearchResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedSearchResult_sequence, hf_index, ett_dap_T_signedSearchResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedSearchResult_sequence, hf_index, ett_dap_T_signedSearchResult);
 
   return offset;
 }
@@ -4008,7 +4008,7 @@ const value_string dap_SearchResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SearchResult_choice[] = {
+static const ber_old_choice_t SearchResult_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unsignedSearchResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedSearchResult },
   { 0, 0, 0, 0, NULL }
@@ -4016,9 +4016,9 @@ static const ber_choice_t SearchResult_choice[] = {
 
 int
 dissect_dap_SearchResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SearchResult_choice, hf_index, ett_dap_SearchResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SearchResult_choice, hf_index, ett_dap_SearchResult,
+                                     NULL);
 
   return offset;
 }
@@ -4027,14 +4027,14 @@ static int dissect_uncorrelatedSearchInfo_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SET_OF_SearchResult_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SearchResult_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_uncorrelatedSearchInfo_item },
 };
 
 static int
 dissect_dap_SET_OF_SearchResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SearchResult_set_of, hf_index, ett_dap_SET_OF_SearchResult);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SearchResult_set_of, hf_index, ett_dap_SET_OF_SearchResult);
 
   return offset;
 }
@@ -4049,7 +4049,7 @@ static const value_string dap_SearchResultData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SearchResultData_choice[] = {
+static const ber_old_choice_t SearchResultData_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_searchInfo },
   {   1, BER_CLASS_CON, 0, 0, dissect_uncorrelatedSearchInfo },
   { 0, 0, 0, 0, NULL }
@@ -4057,22 +4057,22 @@ static const ber_choice_t SearchResultData_choice[] = {
 
 static int
 dissect_dap_SearchResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SearchResultData_choice, hf_index, ett_dap_SearchResultData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SearchResultData_choice, hf_index, ett_dap_SearchResultData,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_add_entry_item },
 };
 
 static int
 dissect_dap_SET_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Attribute_set_of, hf_index, ett_dap_SET_OF_Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Attribute_set_of, hf_index, ett_dap_SET_OF_Attribute);
 
   return offset;
 }
@@ -4081,7 +4081,7 @@ static int dissect_add_entry(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t AddEntryArgumentData_set[] = {
+static const ber_old_sequence_t AddEntryArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, 0, dissect_add_entry },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_targetSystem },
@@ -4101,8 +4101,8 @@ static const ber_sequence_t AddEntryArgumentData_set[] = {
 
 static int
 dissect_dap_AddEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AddEntryArgumentData_set, hf_index, ett_dap_AddEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AddEntryArgumentData_set, hf_index, ett_dap_AddEntryArgumentData);
 
   return offset;
 }
@@ -4114,7 +4114,7 @@ static int dissect_addEntryArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_signedAddEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedAddEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_addEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4123,8 +4123,8 @@ static const ber_sequence_t T_signedAddEntryArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedAddEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAddEntryArgument_sequence, hf_index, ett_dap_T_signedAddEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAddEntryArgument_sequence, hf_index, ett_dap_T_signedAddEntryArgument);
 
   return offset;
 }
@@ -4139,7 +4139,7 @@ const value_string dap_AddEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AddEntryArgument_choice[] = {
+static const ber_old_choice_t AddEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedAddEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAddEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -4147,15 +4147,15 @@ static const ber_choice_t AddEntryArgument_choice[] = {
 
 int
 dissect_dap_AddEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AddEntryArgument_choice, hf_index, ett_dap_AddEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AddEntryArgument_choice, hf_index, ett_dap_AddEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AddEntryResultData_sequence[] = {
+static const ber_old_sequence_t AddEntryResultData_sequence[] = {
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
   { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL, dissect_aliasDereferenced },
@@ -4165,8 +4165,8 @@ static const ber_sequence_t AddEntryResultData_sequence[] = {
 
 static int
 dissect_dap_AddEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddEntryResultData_sequence, hf_index, ett_dap_AddEntryResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddEntryResultData_sequence, hf_index, ett_dap_AddEntryResultData);
 
   return offset;
 }
@@ -4178,7 +4178,7 @@ static int dissect_addEntryResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_signedAddEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedAddEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_addEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4187,8 +4187,8 @@ static const ber_sequence_t T_signedAddEntryResult_sequence[] = {
 
 static int
 dissect_dap_T_signedAddEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAddEntryResult_sequence, hf_index, ett_dap_T_signedAddEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAddEntryResult_sequence, hf_index, ett_dap_T_signedAddEntryResult);
 
   return offset;
 }
@@ -4203,7 +4203,7 @@ static const value_string dap_AddEntryInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AddEntryInformation_choice[] = {
+static const ber_old_choice_t AddEntryInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedAddEntryResult },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedAddEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -4211,9 +4211,9 @@ static const ber_choice_t AddEntryInformation_choice[] = {
 
 static int
 dissect_dap_AddEntryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AddEntryInformation_choice, hf_index, ett_dap_AddEntryInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AddEntryInformation_choice, hf_index, ett_dap_AddEntryInformation,
+                                     NULL);
 
   return offset;
 }
@@ -4228,7 +4228,7 @@ const value_string dap_AddEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AddEntryResult_choice[] = {
+static const ber_old_choice_t AddEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_add_entry_information },
   { 0, 0, 0, 0, NULL }
@@ -4236,15 +4236,15 @@ static const ber_choice_t AddEntryResult_choice[] = {
 
 int
 dissect_dap_AddEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AddEntryResult_choice, hf_index, ett_dap_AddEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AddEntryResult_choice, hf_index, ett_dap_AddEntryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoveEntryArgumentData_set[] = {
+static const ber_old_sequence_t RemoveEntryArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_serviceControls },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -4262,8 +4262,8 @@ static const ber_sequence_t RemoveEntryArgumentData_set[] = {
 
 static int
 dissect_dap_RemoveEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RemoveEntryArgumentData_set, hf_index, ett_dap_RemoveEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RemoveEntryArgumentData_set, hf_index, ett_dap_RemoveEntryArgumentData);
 
   return offset;
 }
@@ -4275,7 +4275,7 @@ static int dissect_removeEntryArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedRemoveEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedRemoveEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_removeEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4284,8 +4284,8 @@ static const ber_sequence_t T_signedRemoveEntryArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedRemoveEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedRemoveEntryArgument_sequence, hf_index, ett_dap_T_signedRemoveEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedRemoveEntryArgument_sequence, hf_index, ett_dap_T_signedRemoveEntryArgument);
 
   return offset;
 }
@@ -4300,7 +4300,7 @@ const value_string dap_RemoveEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RemoveEntryArgument_choice[] = {
+static const ber_old_choice_t RemoveEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedRemoveEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedRemoveEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -4308,15 +4308,15 @@ static const ber_choice_t RemoveEntryArgument_choice[] = {
 
 int
 dissect_dap_RemoveEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RemoveEntryArgument_choice, hf_index, ett_dap_RemoveEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RemoveEntryArgument_choice, hf_index, ett_dap_RemoveEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoveEntryResultData_sequence[] = {
+static const ber_old_sequence_t RemoveEntryResultData_sequence[] = {
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
   { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL, dissect_aliasDereferenced },
@@ -4326,8 +4326,8 @@ static const ber_sequence_t RemoveEntryResultData_sequence[] = {
 
 static int
 dissect_dap_RemoveEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoveEntryResultData_sequence, hf_index, ett_dap_RemoveEntryResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoveEntryResultData_sequence, hf_index, ett_dap_RemoveEntryResultData);
 
   return offset;
 }
@@ -4339,7 +4339,7 @@ static int dissect_removeEntryResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_signedRemoveEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedRemoveEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_removeEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4348,8 +4348,8 @@ static const ber_sequence_t T_signedRemoveEntryResult_sequence[] = {
 
 static int
 dissect_dap_T_signedRemoveEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedRemoveEntryResult_sequence, hf_index, ett_dap_T_signedRemoveEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedRemoveEntryResult_sequence, hf_index, ett_dap_T_signedRemoveEntryResult);
 
   return offset;
 }
@@ -4364,7 +4364,7 @@ static const value_string dap_RemoveEntryInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RemoveEntryInformation_choice[] = {
+static const ber_old_choice_t RemoveEntryInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedRemoveEntryResult },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedRemoveEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -4372,9 +4372,9 @@ static const ber_choice_t RemoveEntryInformation_choice[] = {
 
 static int
 dissect_dap_RemoveEntryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RemoveEntryInformation_choice, hf_index, ett_dap_RemoveEntryInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RemoveEntryInformation_choice, hf_index, ett_dap_RemoveEntryInformation,
+                                     NULL);
 
   return offset;
 }
@@ -4389,7 +4389,7 @@ const value_string dap_RemoveEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RemoveEntryResult_choice[] = {
+static const ber_old_choice_t RemoveEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_remove_entry_information },
   { 0, 0, 0, 0, NULL }
@@ -4397,9 +4397,9 @@ static const ber_choice_t RemoveEntryResult_choice[] = {
 
 int
 dissect_dap_RemoveEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RemoveEntryResult_choice, hf_index, ett_dap_RemoveEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RemoveEntryResult_choice, hf_index, ett_dap_RemoveEntryResult,
+                                     NULL);
 
   return offset;
 }
@@ -4415,7 +4415,7 @@ const value_string dap_EntryModification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EntryModification_choice[] = {
+static const ber_old_choice_t EntryModification_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_addAttribute },
   {   1, BER_CLASS_CON, 1, 0, dissect_removeAttribute },
   {   2, BER_CLASS_CON, 2, 0, dissect_addValues },
@@ -4427,9 +4427,9 @@ static const ber_choice_t EntryModification_choice[] = {
 
 int
 dissect_dap_EntryModification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EntryModification_choice, hf_index, ett_dap_EntryModification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EntryModification_choice, hf_index, ett_dap_EntryModification,
+                                     NULL);
 
   return offset;
 }
@@ -4438,14 +4438,14 @@ static int dissect_changes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_changes_item },
 };
 
 static int
 dissect_dap_SEQUENCE_OF_EntryModification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_EntryModification_sequence_of, hf_index, ett_dap_SEQUENCE_OF_EntryModification);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_EntryModification_sequence_of, hf_index, ett_dap_SEQUENCE_OF_EntryModification);
 
   return offset;
 }
@@ -4454,7 +4454,7 @@ static int dissect_changes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t ModifyEntryArgumentData_set[] = {
+static const ber_old_sequence_t ModifyEntryArgumentData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, 0, dissect_changes },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_selection },
@@ -4474,8 +4474,8 @@ static const ber_sequence_t ModifyEntryArgumentData_set[] = {
 
 static int
 dissect_dap_ModifyEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ModifyEntryArgumentData_set, hf_index, ett_dap_ModifyEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ModifyEntryArgumentData_set, hf_index, ett_dap_ModifyEntryArgumentData);
 
   return offset;
 }
@@ -4487,7 +4487,7 @@ static int dissect_modifyEntryArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedModifyEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedModifyEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifyEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4496,8 +4496,8 @@ static const ber_sequence_t T_signedModifyEntryArgument_sequence[] = {
 
 static int
 dissect_dap_T_signedModifyEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedModifyEntryArgument_sequence, hf_index, ett_dap_T_signedModifyEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedModifyEntryArgument_sequence, hf_index, ett_dap_T_signedModifyEntryArgument);
 
   return offset;
 }
@@ -4512,7 +4512,7 @@ const value_string dap_ModifyEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyEntryArgument_choice[] = {
+static const ber_old_choice_t ModifyEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedModifyEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedModifyEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -4520,15 +4520,15 @@ static const ber_choice_t ModifyEntryArgument_choice[] = {
 
 int
 dissect_dap_ModifyEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyEntryArgument_choice, hf_index, ett_dap_ModifyEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyEntryArgument_choice, hf_index, ett_dap_ModifyEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ModifyEntryResultData_sequence[] = {
+static const ber_old_sequence_t ModifyEntryResultData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_entry },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
@@ -4539,8 +4539,8 @@ static const ber_sequence_t ModifyEntryResultData_sequence[] = {
 
 static int
 dissect_dap_ModifyEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyEntryResultData_sequence, hf_index, ett_dap_ModifyEntryResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyEntryResultData_sequence, hf_index, ett_dap_ModifyEntryResultData);
 
   return offset;
 }
@@ -4552,7 +4552,7 @@ static int dissect_modifyEntryResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_signedModifyEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedModifyEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4561,8 +4561,8 @@ static const ber_sequence_t T_signedModifyEntryResult_sequence[] = {
 
 static int
 dissect_dap_T_signedModifyEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedModifyEntryResult_sequence, hf_index, ett_dap_T_signedModifyEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedModifyEntryResult_sequence, hf_index, ett_dap_T_signedModifyEntryResult);
 
   return offset;
 }
@@ -4577,7 +4577,7 @@ static const value_string dap_ModifyEntryInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyEntryInformation_choice[] = {
+static const ber_old_choice_t ModifyEntryInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedModifyEntryResult },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedModifyEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -4585,9 +4585,9 @@ static const ber_choice_t ModifyEntryInformation_choice[] = {
 
 static int
 dissect_dap_ModifyEntryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyEntryInformation_choice, hf_index, ett_dap_ModifyEntryInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyEntryInformation_choice, hf_index, ett_dap_ModifyEntryInformation,
+                                     NULL);
 
   return offset;
 }
@@ -4602,7 +4602,7 @@ const value_string dap_ModifyEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyEntryResult_choice[] = {
+static const ber_old_choice_t ModifyEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_modify_entry_information },
   { 0, 0, 0, 0, NULL }
@@ -4610,15 +4610,15 @@ static const ber_choice_t ModifyEntryResult_choice[] = {
 
 int
 dissect_dap_ModifyEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyEntryResult_choice, hf_index, ett_dap_ModifyEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyEntryResult_choice, hf_index, ett_dap_ModifyEntryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ModifyDNArgument_set[] = {
+static const ber_old_sequence_t ModifyDNArgument_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_distinguished_name },
   { BER_CLASS_CON, 1, 0, dissect_newRDN },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_deleteOldRDN },
@@ -4639,14 +4639,14 @@ static const ber_sequence_t ModifyDNArgument_set[] = {
 
 int
 dissect_dap_ModifyDNArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ModifyDNArgument_set, hf_index, ett_dap_ModifyDNArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ModifyDNArgument_set, hf_index, ett_dap_ModifyDNArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t ModifyDNResultData_sequence[] = {
+static const ber_old_sequence_t ModifyDNResultData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_newRDN },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
@@ -4657,8 +4657,8 @@ static const ber_sequence_t ModifyDNResultData_sequence[] = {
 
 static int
 dissect_dap_ModifyDNResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyDNResultData_sequence, hf_index, ett_dap_ModifyDNResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyDNResultData_sequence, hf_index, ett_dap_ModifyDNResultData);
 
   return offset;
 }
@@ -4670,7 +4670,7 @@ static int dissect_modifyDNResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_signedModifyDNResult_sequence[] = {
+static const ber_old_sequence_t T_signedModifyDNResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyDNResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4679,8 +4679,8 @@ static const ber_sequence_t T_signedModifyDNResult_sequence[] = {
 
 static int
 dissect_dap_T_signedModifyDNResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedModifyDNResult_sequence, hf_index, ett_dap_T_signedModifyDNResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedModifyDNResult_sequence, hf_index, ett_dap_T_signedModifyDNResult);
 
   return offset;
 }
@@ -4695,7 +4695,7 @@ static const value_string dap_ModifyDNInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyDNInformation_choice[] = {
+static const ber_old_choice_t ModifyDNInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedModifyDNResult },
   {   1, BER_CLASS_CON, 0, 0, dissect_signedModifyDNResult },
   { 0, 0, 0, 0, NULL }
@@ -4703,9 +4703,9 @@ static const ber_choice_t ModifyDNInformation_choice[] = {
 
 static int
 dissect_dap_ModifyDNInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyDNInformation_choice, hf_index, ett_dap_ModifyDNInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyDNInformation_choice, hf_index, ett_dap_ModifyDNInformation,
+                                     NULL);
 
   return offset;
 }
@@ -4720,7 +4720,7 @@ const value_string dap_ModifyDNResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyDNResult_choice[] = {
+static const ber_old_choice_t ModifyDNResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_modify_dn_information },
   { 0, 0, 0, 0, NULL }
@@ -4728,15 +4728,15 @@ static const ber_choice_t ModifyDNResult_choice[] = {
 
 int
 dissect_dap_ModifyDNResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyDNResult_choice, hf_index, ett_dap_ModifyDNResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyDNResult_choice, hf_index, ett_dap_ModifyDNResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AbandonedData_set[] = {
+static const ber_old_sequence_t AbandonedData_set[] = {
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
   { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL, dissect_aliasDereferenced },
@@ -4746,8 +4746,8 @@ static const ber_sequence_t AbandonedData_set[] = {
 
 static int
 dissect_dap_AbandonedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AbandonedData_set, hf_index, ett_dap_AbandonedData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AbandonedData_set, hf_index, ett_dap_AbandonedData);
 
   return offset;
 }
@@ -4759,7 +4759,7 @@ static int dissect_abandoned(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedAbandoned_sequence[] = {
+static const ber_old_sequence_t T_signedAbandoned_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_abandoned },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4768,8 +4768,8 @@ static const ber_sequence_t T_signedAbandoned_sequence[] = {
 
 static int
 dissect_dap_T_signedAbandoned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAbandoned_sequence, hf_index, ett_dap_T_signedAbandoned);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAbandoned_sequence, hf_index, ett_dap_T_signedAbandoned);
 
   return offset;
 }
@@ -4784,7 +4784,7 @@ const value_string dap_Abandoned_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Abandoned_choice[] = {
+static const ber_old_choice_t Abandoned_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedAbandoned },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAbandoned },
   { 0, 0, 0, 0, NULL }
@@ -4792,9 +4792,9 @@ static const ber_choice_t Abandoned_choice[] = {
 
 int
 dissect_dap_Abandoned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Abandoned_choice, hf_index, ett_dap_Abandoned,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Abandoned_choice, hf_index, ett_dap_Abandoned,
+                                     NULL);
 
   return offset;
 }
@@ -4820,7 +4820,7 @@ static int dissect_abandon_failed_problem(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AbandonFailedErrorData_set[] = {
+static const ber_old_sequence_t AbandonFailedErrorData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_abandon_failed_problem },
   { BER_CLASS_CON, 1, 0, dissect_operation },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -4832,8 +4832,8 @@ static const ber_sequence_t AbandonFailedErrorData_set[] = {
 
 static int
 dissect_dap_AbandonFailedErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AbandonFailedErrorData_set, hf_index, ett_dap_AbandonFailedErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AbandonFailedErrorData_set, hf_index, ett_dap_AbandonFailedErrorData);
 
   return offset;
 }
@@ -4845,7 +4845,7 @@ static int dissect_abandonFailedError(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_signedAbandonFailedError_sequence[] = {
+static const ber_old_sequence_t T_signedAbandonFailedError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_abandonFailedError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4854,8 +4854,8 @@ static const ber_sequence_t T_signedAbandonFailedError_sequence[] = {
 
 static int
 dissect_dap_T_signedAbandonFailedError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAbandonFailedError_sequence, hf_index, ett_dap_T_signedAbandonFailedError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAbandonFailedError_sequence, hf_index, ett_dap_T_signedAbandonFailedError);
 
   return offset;
 }
@@ -4870,7 +4870,7 @@ const value_string dap_AbandonFailedError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AbandonFailedError_choice[] = {
+static const ber_old_choice_t AbandonFailedError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedAbandonFailedError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAbandonFailedError },
   { 0, 0, 0, 0, NULL }
@@ -4878,9 +4878,9 @@ static const ber_choice_t AbandonFailedError_choice[] = {
 
 int
 dissect_dap_AbandonFailedError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AbandonFailedError_choice, hf_index, ett_dap_AbandonFailedError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AbandonFailedError_choice, hf_index, ett_dap_AbandonFailedError,
+                                     NULL);
 
   return offset;
 }
@@ -4910,7 +4910,7 @@ static int dissect_attribute_error_problem(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t T_problems_item_sequence[] = {
+static const ber_old_sequence_t T_problems_item_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_attribute_error_problem },
   { BER_CLASS_CON, 1, 0, dissect_type },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_value },
@@ -4919,8 +4919,8 @@ static const ber_sequence_t T_problems_item_sequence[] = {
 
 static int
 dissect_dap_T_problems_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_problems_item_sequence, hf_index, ett_dap_T_problems_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_problems_item_sequence, hf_index, ett_dap_T_problems_item);
 
   return offset;
 }
@@ -4929,14 +4929,14 @@ static int dissect_problems_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_problems_set_of[1] = {
+static const ber_old_sequence_t T_problems_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_problems_item },
 };
 
 static int
 dissect_dap_T_problems(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_problems_set_of, hf_index, ett_dap_T_problems);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_problems_set_of, hf_index, ett_dap_T_problems);
 
   return offset;
 }
@@ -4945,7 +4945,7 @@ static int dissect_problems(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t AttributeErrorData_set[] = {
+static const ber_old_sequence_t AttributeErrorData_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_object },
   { BER_CLASS_CON, 1, 0, dissect_problems },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -4957,8 +4957,8 @@ static const ber_sequence_t AttributeErrorData_set[] = {
 
 static int
 dissect_dap_AttributeErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AttributeErrorData_set, hf_index, ett_dap_AttributeErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AttributeErrorData_set, hf_index, ett_dap_AttributeErrorData);
 
   return offset;
 }
@@ -4970,7 +4970,7 @@ static int dissect_attributeError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_signedAttributeError_sequence[] = {
+static const ber_old_sequence_t T_signedAttributeError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributeError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -4979,8 +4979,8 @@ static const ber_sequence_t T_signedAttributeError_sequence[] = {
 
 static int
 dissect_dap_T_signedAttributeError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedAttributeError_sequence, hf_index, ett_dap_T_signedAttributeError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedAttributeError_sequence, hf_index, ett_dap_T_signedAttributeError);
 
   return offset;
 }
@@ -4995,7 +4995,7 @@ const value_string dap_AttributeError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AttributeError_choice[] = {
+static const ber_old_choice_t AttributeError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedAttributeError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeError },
   { 0, 0, 0, 0, NULL }
@@ -5003,9 +5003,9 @@ static const ber_choice_t AttributeError_choice[] = {
 
 int
 dissect_dap_AttributeError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AttributeError_choice, hf_index, ett_dap_AttributeError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AttributeError_choice, hf_index, ett_dap_AttributeError,
+                                     NULL);
 
   return offset;
 }
@@ -5033,7 +5033,7 @@ static int dissect_name_error_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t NameErrorData_set[] = {
+static const ber_old_sequence_t NameErrorData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_name_error_problem },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_matched_name },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -5045,8 +5045,8 @@ static const ber_sequence_t NameErrorData_set[] = {
 
 static int
 dissect_dap_NameErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              NameErrorData_set, hf_index, ett_dap_NameErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  NameErrorData_set, hf_index, ett_dap_NameErrorData);
 
   return offset;
 }
@@ -5058,7 +5058,7 @@ static int dissect_nameError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedNameError_sequence[] = {
+static const ber_old_sequence_t T_signedNameError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_nameError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -5067,8 +5067,8 @@ static const ber_sequence_t T_signedNameError_sequence[] = {
 
 static int
 dissect_dap_T_signedNameError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedNameError_sequence, hf_index, ett_dap_T_signedNameError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedNameError_sequence, hf_index, ett_dap_T_signedNameError);
 
   return offset;
 }
@@ -5083,7 +5083,7 @@ const value_string dap_NameError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NameError_choice[] = {
+static const ber_old_choice_t NameError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedNameError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedNameError },
   { 0, 0, 0, 0, NULL }
@@ -5091,15 +5091,15 @@ static const ber_choice_t NameError_choice[] = {
 
 int
 dissect_dap_NameError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NameError_choice, hf_index, ett_dap_NameError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NameError_choice, hf_index, ett_dap_NameError,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReferralData_set[] = {
+static const ber_old_sequence_t ReferralData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_candidate },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
@@ -5110,8 +5110,8 @@ static const ber_sequence_t ReferralData_set[] = {
 
 static int
 dissect_dap_ReferralData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReferralData_set, hf_index, ett_dap_ReferralData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReferralData_set, hf_index, ett_dap_ReferralData);
 
   return offset;
 }
@@ -5123,7 +5123,7 @@ static int dissect_referral(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedReferral_sequence[] = {
+static const ber_old_sequence_t T_signedReferral_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_referral },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -5132,8 +5132,8 @@ static const ber_sequence_t T_signedReferral_sequence[] = {
 
 static int
 dissect_dap_T_signedReferral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedReferral_sequence, hf_index, ett_dap_T_signedReferral);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedReferral_sequence, hf_index, ett_dap_T_signedReferral);
 
   return offset;
 }
@@ -5148,7 +5148,7 @@ const value_string dap_Referral_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Referral_choice[] = {
+static const ber_old_choice_t Referral_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedReferral },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedReferral },
   { 0, 0, 0, 0, NULL }
@@ -5156,9 +5156,9 @@ static const ber_choice_t Referral_choice[] = {
 
 int
 dissect_dap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Referral_choice, hf_index, ett_dap_Referral,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Referral_choice, hf_index, ett_dap_Referral,
+                                     NULL);
 
   return offset;
 }
@@ -5179,7 +5179,7 @@ static int dissect_spkmInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SecurityErrorData_set[] = {
+static const ber_old_sequence_t SecurityErrorData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_security_error_problem },
   { BER_CLASS_CON, 1, 0, dissect_spkmInfo },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -5191,8 +5191,8 @@ static const ber_sequence_t SecurityErrorData_set[] = {
 
 static int
 dissect_dap_SecurityErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SecurityErrorData_set, hf_index, ett_dap_SecurityErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SecurityErrorData_set, hf_index, ett_dap_SecurityErrorData);
 
   return offset;
 }
@@ -5204,7 +5204,7 @@ static int dissect_securityErrorData(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_signedSecurityError_sequence[] = {
+static const ber_old_sequence_t T_signedSecurityError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_securityErrorData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -5213,8 +5213,8 @@ static const ber_sequence_t T_signedSecurityError_sequence[] = {
 
 static int
 dissect_dap_T_signedSecurityError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedSecurityError_sequence, hf_index, ett_dap_T_signedSecurityError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedSecurityError_sequence, hf_index, ett_dap_T_signedSecurityError);
 
   return offset;
 }
@@ -5229,7 +5229,7 @@ const value_string dap_SecurityError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SecurityError_choice[] = {
+static const ber_old_choice_t SecurityError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedSecurityError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedSecurityError },
   { 0, 0, 0, 0, NULL }
@@ -5237,15 +5237,15 @@ static const ber_choice_t SecurityError_choice[] = {
 
 int
 dissect_dap_SecurityError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SecurityError_choice, hf_index, ett_dap_SecurityError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SecurityError_choice, hf_index, ett_dap_SecurityError,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ServiceErrorData_set[] = {
+static const ber_old_sequence_t ServiceErrorData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_service_error_problem },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
   { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_performer },
@@ -5256,8 +5256,8 @@ static const ber_sequence_t ServiceErrorData_set[] = {
 
 static int
 dissect_dap_ServiceErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ServiceErrorData_set, hf_index, ett_dap_ServiceErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ServiceErrorData_set, hf_index, ett_dap_ServiceErrorData);
 
   return offset;
 }
@@ -5269,7 +5269,7 @@ static int dissect_serviceError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_signedServiceError_sequence[] = {
+static const ber_old_sequence_t T_signedServiceError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_serviceError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -5278,8 +5278,8 @@ static const ber_sequence_t T_signedServiceError_sequence[] = {
 
 static int
 dissect_dap_T_signedServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedServiceError_sequence, hf_index, ett_dap_T_signedServiceError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedServiceError_sequence, hf_index, ett_dap_T_signedServiceError);
 
   return offset;
 }
@@ -5294,7 +5294,7 @@ const value_string dap_ServiceError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ServiceError_choice[] = {
+static const ber_old_choice_t ServiceError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedServiceError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedServiceError },
   { 0, 0, 0, 0, NULL }
@@ -5302,9 +5302,9 @@ static const ber_choice_t ServiceError_choice[] = {
 
 int
 dissect_dap_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ServiceError_choice, hf_index, ett_dap_ServiceError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ServiceError_choice, hf_index, ett_dap_ServiceError,
+                                     NULL);
 
   return offset;
 }
@@ -5355,7 +5355,7 @@ static const value_string dap_T_attributeInfo_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_attributeInfo_item_choice[] = {
+static const ber_old_choice_t T_attributeInfo_item_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attribute },
   { 0, 0, 0, 0, NULL }
@@ -5363,9 +5363,9 @@ static const ber_choice_t T_attributeInfo_item_choice[] = {
 
 static int
 dissect_dap_T_attributeInfo_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_attributeInfo_item_choice, hf_index, ett_dap_T_attributeInfo_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_attributeInfo_item_choice, hf_index, ett_dap_T_attributeInfo_item,
+                                     NULL);
 
   return offset;
 }
@@ -5374,14 +5374,14 @@ static int dissect_attributeInfo_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_attributeInfo_set_of[1] = {
+static const ber_old_sequence_t T_attributeInfo_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeInfo_item },
 };
 
 static int
 dissect_dap_T_attributeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_attributeInfo_set_of, hf_index, ett_dap_T_attributeInfo);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_attributeInfo_set_of, hf_index, ett_dap_T_attributeInfo);
 
   return offset;
 }
@@ -5390,7 +5390,7 @@ static int dissect_attributeInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t UpdateErrorData_set[] = {
+static const ber_old_sequence_t UpdateErrorData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_update_error_problem },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeInfo },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -5402,8 +5402,8 @@ static const ber_sequence_t UpdateErrorData_set[] = {
 
 static int
 dissect_dap_UpdateErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UpdateErrorData_set, hf_index, ett_dap_UpdateErrorData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UpdateErrorData_set, hf_index, ett_dap_UpdateErrorData);
 
   return offset;
 }
@@ -5415,7 +5415,7 @@ static int dissect_updateError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_signedUpdateError_sequence[] = {
+static const ber_old_sequence_t T_signedUpdateError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_updateError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -5424,8 +5424,8 @@ static const ber_sequence_t T_signedUpdateError_sequence[] = {
 
 static int
 dissect_dap_T_signedUpdateError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedUpdateError_sequence, hf_index, ett_dap_T_signedUpdateError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedUpdateError_sequence, hf_index, ett_dap_T_signedUpdateError);
 
   return offset;
 }
@@ -5440,7 +5440,7 @@ const value_string dap_UpdateError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UpdateError_choice[] = {
+static const ber_old_choice_t UpdateError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedUpdateError },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedUpdateError },
   { 0, 0, 0, 0, NULL }
@@ -5448,9 +5448,9 @@ static const ber_choice_t UpdateError_choice[] = {
 
 int
 dissect_dap_UpdateError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UpdateError_choice, hf_index, ett_dap_UpdateError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UpdateError_choice, hf_index, ett_dap_UpdateError,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index f43a18976f..afd6393d09 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -381,14 +381,14 @@ dissect_disp_EstablishParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_SupplierAndConsumers_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SupplierAndConsumers_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifiedSecondaryShadows_item },
 };
 
 static int
 dissect_disp_SET_OF_SupplierAndConsumers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SupplierAndConsumers_set_of, hf_index, ett_disp_SET_OF_SupplierAndConsumers);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SupplierAndConsumers_set_of, hf_index, ett_disp_SET_OF_SupplierAndConsumers);
 
   return offset;
 }
@@ -397,15 +397,15 @@ static int dissect_modifiedSecondaryShadows(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ModificationParameter_sequence[] = {
+static const ber_old_sequence_t ModificationParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifiedSecondaryShadows },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_disp_ModificationParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationParameter_sequence, hf_index, ett_disp_ModificationParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationParameter_sequence, hf_index, ett_disp_ModificationParameter);
 
   return offset;
 }
@@ -423,7 +423,7 @@ static int dissect_agreementID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t AreaSpecification_sequence[] = {
+static const ber_old_sequence_t AreaSpecification_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextPrefix },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_replicationArea },
   { 0, 0, 0, NULL }
@@ -431,8 +431,8 @@ static const ber_sequence_t AreaSpecification_sequence[] = {
 
 static int
 dissect_disp_AreaSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AreaSpecification_sequence, hf_index, ett_disp_AreaSpecification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AreaSpecification_sequence, hf_index, ett_disp_AreaSpecification);
 
   return offset;
 }
@@ -480,14 +480,14 @@ static int dissect_remove(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t AttributeTypes_set_of[1] = {
+static const ber_old_sequence_t AttributeTypes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AttributeTypes_item },
 };
 
 static int
 dissect_disp_AttributeTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AttributeTypes_set_of, hf_index, ett_disp_AttributeTypes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AttributeTypes_set_of, hf_index, ett_disp_AttributeTypes);
 
   return offset;
 }
@@ -506,7 +506,7 @@ static const value_string disp_ClassAttributes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ClassAttributes_choice[] = {
+static const ber_old_choice_t ClassAttributes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allAttributes },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_include_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_exclude_impl },
@@ -515,9 +515,9 @@ static const ber_choice_t ClassAttributes_choice[] = {
 
 static int
 dissect_disp_ClassAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ClassAttributes_choice, hf_index, ett_disp_ClassAttributes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ClassAttributes_choice, hf_index, ett_disp_ClassAttributes,
+                                     NULL);
 
   return offset;
 }
@@ -526,7 +526,7 @@ static int dissect_classAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ClassAttributeSelection_sequence[] = {
+static const ber_old_sequence_t ClassAttributeSelection_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_class },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_classAttributes },
   { 0, 0, 0, NULL }
@@ -534,8 +534,8 @@ static const ber_sequence_t ClassAttributeSelection_sequence[] = {
 
 static int
 dissect_disp_ClassAttributeSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ClassAttributeSelection_sequence, hf_index, ett_disp_ClassAttributeSelection);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ClassAttributeSelection_sequence, hf_index, ett_disp_ClassAttributeSelection);
 
   return offset;
 }
@@ -544,14 +544,14 @@ static int dissect_AttributeSelection_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AttributeSelection_set_of[1] = {
+static const ber_old_sequence_t AttributeSelection_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributeSelection_item },
 };
 
 static int
 dissect_disp_AttributeSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AttributeSelection_set_of, hf_index, ett_disp_AttributeSelection);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AttributeSelection_set_of, hf_index, ett_disp_AttributeSelection);
 
   return offset;
 }
@@ -613,7 +613,7 @@ static int dissect_attComplete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Knowledge_sequence[] = {
+static const ber_old_sequence_t Knowledge_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_knowledgeType },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extendedKnowledge },
   { 0, 0, 0, NULL }
@@ -621,8 +621,8 @@ static const ber_sequence_t Knowledge_sequence[] = {
 
 static int
 dissect_disp_Knowledge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Knowledge_sequence, hf_index, ett_disp_Knowledge);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Knowledge_sequence, hf_index, ett_disp_Knowledge);
 
   return offset;
 }
@@ -631,14 +631,14 @@ static int dissect_knowledge(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_selectedContexts_set_of[1] = {
+static const ber_old_sequence_t T_selectedContexts_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item },
 };
 
 static int
 dissect_disp_T_selectedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_selectedContexts_set_of, hf_index, ett_disp_T_selectedContexts);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_selectedContexts_set_of, hf_index, ett_disp_T_selectedContexts);
 
   return offset;
 }
@@ -653,7 +653,7 @@ static const value_string disp_T_supplyContexts_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_supplyContexts_choice[] = {
+static const ber_old_choice_t T_supplyContexts_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allContexts },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_selectedContexts },
   { 0, 0, 0, 0, NULL }
@@ -661,9 +661,9 @@ static const ber_choice_t T_supplyContexts_choice[] = {
 
 static int
 dissect_disp_T_supplyContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_supplyContexts_choice, hf_index, ett_disp_T_supplyContexts,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_supplyContexts_choice, hf_index, ett_disp_T_supplyContexts,
+                                     NULL);
 
   return offset;
 }
@@ -672,7 +672,7 @@ static int dissect_supplyContexts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UnitOfReplication_sequence[] = {
+static const ber_old_sequence_t UnitOfReplication_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_area },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_replication_attributes },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_knowledge },
@@ -684,8 +684,8 @@ static const ber_sequence_t UnitOfReplication_sequence[] = {
 
 static int
 dissect_disp_UnitOfReplication(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnitOfReplication_sequence, hf_index, ett_disp_UnitOfReplication);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnitOfReplication_sequence, hf_index, ett_disp_UnitOfReplication);
 
   return offset;
 }
@@ -734,7 +734,7 @@ static int dissect_updateInterval(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t PeriodicStrategy_sequence[] = {
+static const ber_old_sequence_t PeriodicStrategy_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_beginTime },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_windowSize },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_updateInterval },
@@ -743,8 +743,8 @@ static const ber_sequence_t PeriodicStrategy_sequence[] = {
 
 static int
 dissect_disp_PeriodicStrategy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PeriodicStrategy_sequence, hf_index, ett_disp_PeriodicStrategy);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PeriodicStrategy_sequence, hf_index, ett_disp_PeriodicStrategy);
 
   return offset;
 }
@@ -753,7 +753,7 @@ static int dissect_periodic(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SchedulingParameters_sequence[] = {
+static const ber_old_sequence_t SchedulingParameters_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_periodic },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_othertimes },
   { 0, 0, 0, NULL }
@@ -761,8 +761,8 @@ static const ber_sequence_t SchedulingParameters_sequence[] = {
 
 static int
 dissect_disp_SchedulingParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SchedulingParameters_sequence, hf_index, ett_disp_SchedulingParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SchedulingParameters_sequence, hf_index, ett_disp_SchedulingParameters);
 
   return offset;
 }
@@ -777,7 +777,7 @@ static const value_string disp_SupplierUpdateMode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SupplierUpdateMode_choice[] = {
+static const ber_old_choice_t SupplierUpdateMode_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_onChange },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_scheduled },
   { 0, 0, 0, 0, NULL }
@@ -785,9 +785,9 @@ static const ber_choice_t SupplierUpdateMode_choice[] = {
 
 static int
 dissect_disp_SupplierUpdateMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SupplierUpdateMode_choice, hf_index, ett_disp_SupplierUpdateMode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SupplierUpdateMode_choice, hf_index, ett_disp_SupplierUpdateMode,
+                                     NULL);
 
   return offset;
 }
@@ -814,7 +814,7 @@ static const value_string disp_UpdateMode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UpdateMode_choice[] = {
+static const ber_old_choice_t UpdateMode_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_supplierInitiated_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_consumerInitiated_impl },
   { 0, 0, 0, 0, NULL }
@@ -822,9 +822,9 @@ static const ber_choice_t UpdateMode_choice[] = {
 
 static int
 dissect_disp_UpdateMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UpdateMode_choice, hf_index, ett_disp_UpdateMode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UpdateMode_choice, hf_index, ett_disp_UpdateMode,
+                                     NULL);
 
   return offset;
 }
@@ -833,7 +833,7 @@ static int dissect_updateMode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ShadowingAgreementInfo_sequence[] = {
+static const ber_old_sequence_t ShadowingAgreementInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_shadowSubject },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_updateMode },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_master },
@@ -843,8 +843,8 @@ static const ber_sequence_t ShadowingAgreementInfo_sequence[] = {
 
 static int
 dissect_disp_ShadowingAgreementInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ShadowingAgreementInfo_sequence, hf_index, ett_disp_ShadowingAgreementInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ShadowingAgreementInfo_sequence, hf_index, ett_disp_ShadowingAgreementInfo);
 
   return offset;
 }
@@ -886,7 +886,7 @@ static const value_string disp_T_updateStrategy_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_updateStrategy_choice[] = {
+static const ber_old_choice_t T_updateStrategy_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_standardUpdate },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
   { 0, 0, 0, 0, NULL }
@@ -894,9 +894,9 @@ static const ber_choice_t T_updateStrategy_choice[] = {
 
 static int
 dissect_disp_T_updateStrategy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_updateStrategy_choice, hf_index, ett_disp_T_updateStrategy,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_updateStrategy_choice, hf_index, ett_disp_T_updateStrategy,
+                                     NULL);
 
   return offset;
 }
@@ -905,7 +905,7 @@ static int dissect_updateStrategy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
+static const ber_old_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_updateStrategy },
@@ -915,8 +915,8 @@ static const ber_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
 
 static int
 dissect_disp_CoordinateShadowUpdateArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CoordinateShadowUpdateArgumentData_sequence, hf_index, ett_disp_CoordinateShadowUpdateArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CoordinateShadowUpdateArgumentData_sequence, hf_index, ett_disp_CoordinateShadowUpdateArgumentData);
 
   return offset;
 }
@@ -942,7 +942,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] = {
+static const ber_old_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_coordinateShadowUpdateArgument_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -951,8 +951,8 @@ static const ber_sequence_t T_signedCoordinateShadowUpdateArgument_sequence[] =
 
 static int
 dissect_disp_T_signedCoordinateShadowUpdateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedCoordinateShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedCoordinateShadowUpdateArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedCoordinateShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedCoordinateShadowUpdateArgument);
 
   return offset;
 }
@@ -967,7 +967,7 @@ static const value_string disp_CoordinateShadowUpdateArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CoordinateShadowUpdateArgument_choice[] = {
+static const ber_old_choice_t CoordinateShadowUpdateArgument_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedCoordinateShadowUpdateArgument_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCoordinateShadowUpdateArgument },
   { 0, 0, 0, 0, NULL }
@@ -975,22 +975,22 @@ static const ber_choice_t CoordinateShadowUpdateArgument_choice[] = {
 
 static int
 dissect_disp_CoordinateShadowUpdateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CoordinateShadowUpdateArgument_choice, hf_index, ett_disp_CoordinateShadowUpdateArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CoordinateShadowUpdateArgument_choice, hf_index, ett_disp_CoordinateShadowUpdateArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notification_item },
 };
 
 static int
 dissect_disp_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_disp_SEQUENCE_OF_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_disp_SEQUENCE_OF_Attribute);
 
   return offset;
 }
@@ -999,7 +999,7 @@ static int dissect_notification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t InformationData_sequence[] = {
+static const ber_old_sequence_t InformationData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_securityParameters_impl },
@@ -1011,8 +1011,8 @@ static const ber_sequence_t InformationData_sequence[] = {
 
 static int
 dissect_disp_InformationData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformationData_sequence, hf_index, ett_disp_InformationData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformationData_sequence, hf_index, ett_disp_InformationData);
 
   return offset;
 }
@@ -1024,7 +1024,7 @@ static int dissect_information_data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_signedInformation_sequence[] = {
+static const ber_old_sequence_t T_signedInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_information_data_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1033,8 +1033,8 @@ static const ber_sequence_t T_signedInformation_sequence[] = {
 
 static int
 dissect_disp_T_signedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedInformation_sequence, hf_index, ett_disp_T_signedInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedInformation_sequence, hf_index, ett_disp_T_signedInformation);
 
   return offset;
 }
@@ -1049,7 +1049,7 @@ static const value_string disp_Information_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Information_choice[] = {
+static const ber_old_choice_t Information_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedInformation_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedInformation },
   { 0, 0, 0, 0, NULL }
@@ -1057,9 +1057,9 @@ static const ber_choice_t Information_choice[] = {
 
 static int
 dissect_disp_Information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Information_choice, hf_index, ett_disp_Information,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Information_choice, hf_index, ett_disp_Information,
+                                     NULL);
 
   return offset;
 }
@@ -1074,7 +1074,7 @@ static const value_string disp_CoordinateShadowUpdateResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CoordinateShadowUpdateResult_choice[] = {
+static const ber_old_choice_t CoordinateShadowUpdateResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
   { 0, 0, 0, 0, NULL }
@@ -1085,9 +1085,9 @@ dissect_disp_CoordinateShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *t
 #line 75 "disp.cnf"
   guint32 update;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CoordinateShadowUpdateResult_choice, hf_index, ett_disp_CoordinateShadowUpdateResult,
-                                 &update);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CoordinateShadowUpdateResult_choice, hf_index, ett_disp_CoordinateShadowUpdateResult,
+                                     &update);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1135,7 +1135,7 @@ static const value_string disp_T_requestedStrategy_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_requestedStrategy_choice[] = {
+static const ber_old_choice_t T_requestedStrategy_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_standard },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
   { 0, 0, 0, 0, NULL }
@@ -1143,9 +1143,9 @@ static const ber_choice_t T_requestedStrategy_choice[] = {
 
 static int
 dissect_disp_T_requestedStrategy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_requestedStrategy_choice, hf_index, ett_disp_T_requestedStrategy,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_requestedStrategy_choice, hf_index, ett_disp_T_requestedStrategy,
+                                     NULL);
 
   return offset;
 }
@@ -1154,7 +1154,7 @@ static int dissect_requestedStrategy(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
+static const ber_old_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_requestedStrategy },
@@ -1164,8 +1164,8 @@ static const ber_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
 
 static int
 dissect_disp_RequestShadowUpdateArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestShadowUpdateArgumentData_sequence, hf_index, ett_disp_RequestShadowUpdateArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestShadowUpdateArgumentData_sequence, hf_index, ett_disp_RequestShadowUpdateArgumentData);
 
   return offset;
 }
@@ -1177,7 +1177,7 @@ static int dissect_requestShadowUpdateArgument_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
+static const ber_old_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestShadowUpdateArgument_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1186,8 +1186,8 @@ static const ber_sequence_t T_signedRequestShadowUpdateArgument_sequence[] = {
 
 static int
 dissect_disp_T_signedRequestShadowUpdateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedRequestShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedRequestShadowUpdateArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedRequestShadowUpdateArgument_sequence, hf_index, ett_disp_T_signedRequestShadowUpdateArgument);
 
   return offset;
 }
@@ -1202,7 +1202,7 @@ static const value_string disp_RequestShadowUpdateArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RequestShadowUpdateArgument_choice[] = {
+static const ber_old_choice_t RequestShadowUpdateArgument_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedRequestShadowUpdateArgument_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedRequestShadowUpdateArgument },
   { 0, 0, 0, 0, NULL }
@@ -1210,9 +1210,9 @@ static const ber_choice_t RequestShadowUpdateArgument_choice[] = {
 
 static int
 dissect_disp_RequestShadowUpdateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RequestShadowUpdateArgument_choice, hf_index, ett_disp_RequestShadowUpdateArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RequestShadowUpdateArgument_choice, hf_index, ett_disp_RequestShadowUpdateArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1224,7 +1224,7 @@ static const value_string disp_RequestShadowUpdateResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RequestShadowUpdateResult_choice[] = {
+static const ber_old_choice_t RequestShadowUpdateResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
   { 0, 0, 0, 0, NULL }
@@ -1235,9 +1235,9 @@ dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb
 #line 87 "disp.cnf"
   guint32 update;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RequestShadowUpdateResult_choice, hf_index, ett_disp_RequestShadowUpdateResult,
-                                 &update);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RequestShadowUpdateResult_choice, hf_index, ett_disp_RequestShadowUpdateResult,
+                                     &update);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1250,7 +1250,7 @@ dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t UpdateWindow_sequence[] = {
+static const ber_old_sequence_t UpdateWindow_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_start },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_stop },
   { 0, 0, 0, NULL }
@@ -1258,8 +1258,8 @@ static const ber_sequence_t UpdateWindow_sequence[] = {
 
 static int
 dissect_disp_UpdateWindow(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateWindow_sequence, hf_index, ett_disp_UpdateWindow);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateWindow_sequence, hf_index, ett_disp_UpdateWindow);
 
   return offset;
 }
@@ -1280,14 +1280,14 @@ static int dissect_sDSEType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
 };
 
 static int
 dissect_disp_SET_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Attribute_set_of, hf_index, ett_disp_SET_OF_Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Attribute_set_of, hf_index, ett_disp_SET_OF_Attribute);
 
   return offset;
 }
@@ -1299,14 +1299,14 @@ static int dissect_replace_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attValIncomplete_item },
 };
 
 static int
 dissect_disp_SET_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeType_set_of, hf_index, ett_disp_SET_OF_AttributeType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeType_set_of, hf_index, ett_disp_SET_OF_AttributeType);
 
   return offset;
 }
@@ -1315,7 +1315,7 @@ static int dissect_attValIncomplete(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SDSEContent_sequence[] = {
+static const ber_old_sequence_t SDSEContent_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sDSEType },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subComplete_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attComplete_impl },
@@ -1326,8 +1326,8 @@ static const ber_sequence_t SDSEContent_sequence[] = {
 
 static int
 dissect_disp_SDSEContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SDSEContent_sequence, hf_index, ett_disp_SDSEContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SDSEContent_sequence, hf_index, ett_disp_SDSEContent);
 
   return offset;
 }
@@ -1339,14 +1339,14 @@ static int dissect_add_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_Subtree_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Subtree_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subtree_item },
 };
 
 static int
 dissect_disp_SET_OF_Subtree(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Subtree_set_of, hf_index, ett_disp_SET_OF_Subtree);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Subtree_set_of, hf_index, ett_disp_SET_OF_Subtree);
 
   return offset;
 }
@@ -1355,7 +1355,7 @@ static int dissect_subtree(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Subtree_sequence[] = {
+static const ber_old_sequence_t Subtree_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_rdn },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sDSE },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subtree },
@@ -1364,14 +1364,14 @@ static const ber_sequence_t Subtree_sequence[] = {
 
 static int
 dissect_disp_Subtree(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Subtree_sequence, hf_index, ett_disp_Subtree);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Subtree_sequence, hf_index, ett_disp_Subtree);
 
   return offset;
 }
 
 
-static const ber_sequence_t TotalRefresh_sequence[] = {
+static const ber_old_sequence_t TotalRefresh_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sDSE },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subtree },
   { 0, 0, 0, NULL }
@@ -1379,8 +1379,8 @@ static const ber_sequence_t TotalRefresh_sequence[] = {
 
 static int
 dissect_disp_TotalRefresh(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TotalRefresh_sequence, hf_index, ett_disp_TotalRefresh);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TotalRefresh_sequence, hf_index, ett_disp_TotalRefresh);
 
   return offset;
 }
@@ -1395,7 +1395,7 @@ static const value_string disp_T_rename_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_rename_choice[] = {
+static const ber_old_choice_t T_rename_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_newRDN },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newDN },
   { 0, 0, 0, 0, NULL }
@@ -1403,9 +1403,9 @@ static const ber_choice_t T_rename_choice[] = {
 
 static int
 dissect_disp_T_rename(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_rename_choice, hf_index, ett_disp_T_rename,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_rename_choice, hf_index, ett_disp_T_rename,
+                                     NULL);
 
   return offset;
 }
@@ -1414,14 +1414,14 @@ static int dissect_rename(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_changes_item },
 };
 
 static int
 dissect_disp_SEQUENCE_OF_EntryModification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_EntryModification_sequence_of, hf_index, ett_disp_SEQUENCE_OF_EntryModification);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_EntryModification_sequence_of, hf_index, ett_disp_SEQUENCE_OF_EntryModification);
 
   return offset;
 }
@@ -1436,7 +1436,7 @@ static const value_string disp_T_attributeChanges_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_attributeChanges_choice[] = {
+static const ber_old_choice_t T_attributeChanges_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_replace_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_changes_impl },
   { 0, 0, 0, 0, NULL }
@@ -1444,9 +1444,9 @@ static const ber_choice_t T_attributeChanges_choice[] = {
 
 static int
 dissect_disp_T_attributeChanges(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_attributeChanges_choice, hf_index, ett_disp_T_attributeChanges,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_attributeChanges_choice, hf_index, ett_disp_T_attributeChanges,
+                                     NULL);
 
   return offset;
 }
@@ -1455,7 +1455,7 @@ static int dissect_attributeChanges(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ContentChange_sequence[] = {
+static const ber_old_sequence_t ContentChange_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rename },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeChanges },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_sDSEType },
@@ -1467,8 +1467,8 @@ static const ber_sequence_t ContentChange_sequence[] = {
 
 static int
 dissect_disp_ContentChange(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContentChange_sequence, hf_index, ett_disp_ContentChange);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContentChange_sequence, hf_index, ett_disp_ContentChange);
 
   return offset;
 }
@@ -1484,7 +1484,7 @@ static const value_string disp_T_sDSEChanges_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_sDSEChanges_choice[] = {
+static const ber_old_choice_t T_sDSEChanges_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_add_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_remove },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modify_impl },
@@ -1493,9 +1493,9 @@ static const ber_choice_t T_sDSEChanges_choice[] = {
 
 static int
 dissect_disp_T_sDSEChanges(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_sDSEChanges_choice, hf_index, ett_disp_T_sDSEChanges,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_sDSEChanges_choice, hf_index, ett_disp_T_sDSEChanges,
+                                     NULL);
 
   return offset;
 }
@@ -1504,7 +1504,7 @@ static int dissect_sDSEChanges(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SubordinateChanges_sequence[] = {
+static const ber_old_sequence_t SubordinateChanges_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_subordinate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subordinate_changes },
   { 0, 0, 0, NULL }
@@ -1512,8 +1512,8 @@ static const ber_sequence_t SubordinateChanges_sequence[] = {
 
 static int
 dissect_disp_SubordinateChanges(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubordinateChanges_sequence, hf_index, ett_disp_SubordinateChanges);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubordinateChanges_sequence, hf_index, ett_disp_SubordinateChanges);
 
   return offset;
 }
@@ -1522,14 +1522,14 @@ static int dissect_subordinateUpdates_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SubordinateChanges_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SubordinateChanges_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subordinateUpdates_item },
 };
 
 static int
 dissect_disp_SEQUENCE_OF_SubordinateChanges(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SubordinateChanges_sequence_of, hf_index, ett_disp_SEQUENCE_OF_SubordinateChanges);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SubordinateChanges_sequence_of, hf_index, ett_disp_SEQUENCE_OF_SubordinateChanges);
 
   return offset;
 }
@@ -1538,7 +1538,7 @@ static int dissect_subordinateUpdates(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t IncrementalStepRefresh_sequence[] = {
+static const ber_old_sequence_t IncrementalStepRefresh_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sDSEChanges },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subordinateUpdates },
   { 0, 0, 0, NULL }
@@ -1546,21 +1546,21 @@ static const ber_sequence_t IncrementalStepRefresh_sequence[] = {
 
 static int
 dissect_disp_IncrementalStepRefresh(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IncrementalStepRefresh_sequence, hf_index, ett_disp_IncrementalStepRefresh);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IncrementalStepRefresh_sequence, hf_index, ett_disp_IncrementalStepRefresh);
 
   return offset;
 }
 
 
-static const ber_sequence_t IncrementalRefresh_sequence_of[1] = {
+static const ber_old_sequence_t IncrementalRefresh_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IncrementalRefresh_item },
 };
 
 static int
 dissect_disp_IncrementalRefresh(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      IncrementalRefresh_sequence_of, hf_index, ett_disp_IncrementalRefresh);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          IncrementalRefresh_sequence_of, hf_index, ett_disp_IncrementalRefresh);
 
   return offset;
 }
@@ -1577,7 +1577,7 @@ static const value_string disp_RefreshInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RefreshInformation_choice[] = {
+static const ber_old_choice_t RefreshInformation_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_noRefresh },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_total_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_incremental_impl },
@@ -1590,9 +1590,9 @@ dissect_disp_RefreshInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 #line 51 "disp.cnf"
   guint32 update;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RefreshInformation_choice, hf_index, ett_disp_RefreshInformation,
-                                 &update);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RefreshInformation_choice, hf_index, ett_disp_RefreshInformation,
+                                     &update);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1608,7 +1608,7 @@ static int dissect_updatedInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t UpdateShadowArgumentData_sequence[] = {
+static const ber_old_sequence_t UpdateShadowArgumentData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_agreementID },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_updateTime },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_updateWindow },
@@ -1619,8 +1619,8 @@ static const ber_sequence_t UpdateShadowArgumentData_sequence[] = {
 
 static int
 dissect_disp_UpdateShadowArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateShadowArgumentData_sequence, hf_index, ett_disp_UpdateShadowArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateShadowArgumentData_sequence, hf_index, ett_disp_UpdateShadowArgumentData);
 
   return offset;
 }
@@ -1632,7 +1632,7 @@ static int dissect_updateShadowArgument_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_signedUpdateShadowArgument_sequence[] = {
+static const ber_old_sequence_t T_signedUpdateShadowArgument_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_updateShadowArgument_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1641,8 +1641,8 @@ static const ber_sequence_t T_signedUpdateShadowArgument_sequence[] = {
 
 static int
 dissect_disp_T_signedUpdateShadowArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedUpdateShadowArgument_sequence, hf_index, ett_disp_T_signedUpdateShadowArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedUpdateShadowArgument_sequence, hf_index, ett_disp_T_signedUpdateShadowArgument);
 
   return offset;
 }
@@ -1657,7 +1657,7 @@ static const value_string disp_UpdateShadowArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UpdateShadowArgument_choice[] = {
+static const ber_old_choice_t UpdateShadowArgument_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedUpdateShadowArgument_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedUpdateShadowArgument },
   { 0, 0, 0, 0, NULL }
@@ -1665,9 +1665,9 @@ static const ber_choice_t UpdateShadowArgument_choice[] = {
 
 static int
 dissect_disp_UpdateShadowArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UpdateShadowArgument_choice, hf_index, ett_disp_UpdateShadowArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UpdateShadowArgument_choice, hf_index, ett_disp_UpdateShadowArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1679,7 +1679,7 @@ static const value_string disp_UpdateShadowResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UpdateShadowResult_choice[] = {
+static const ber_old_choice_t UpdateShadowResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_information },
   { 0, 0, 0, 0, NULL }
@@ -1690,9 +1690,9 @@ dissect_disp_UpdateShadowResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 #line 99 "disp.cnf"
   guint32 update;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UpdateShadowResult_choice, hf_index, ett_disp_UpdateShadowResult,
-                                 &update);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UpdateShadowResult_choice, hf_index, ett_disp_UpdateShadowResult,
+                                     &update);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1742,7 +1742,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t ShadowErrorData_sequence[] = {
+static const ber_old_sequence_t ShadowErrorData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_problem },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastUpdate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_updateWindow },
@@ -1755,8 +1755,8 @@ static const ber_sequence_t ShadowErrorData_sequence[] = {
 
 static int
 dissect_disp_ShadowErrorData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ShadowErrorData_sequence, hf_index, ett_disp_ShadowErrorData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ShadowErrorData_sequence, hf_index, ett_disp_ShadowErrorData);
 
   return offset;
 }
@@ -1768,7 +1768,7 @@ static int dissect_shadowError(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_signedShadowError_sequence[] = {
+static const ber_old_sequence_t T_signedShadowError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_shadowError },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1777,8 +1777,8 @@ static const ber_sequence_t T_signedShadowError_sequence[] = {
 
 static int
 dissect_disp_T_signedShadowError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedShadowError_sequence, hf_index, ett_disp_T_signedShadowError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedShadowError_sequence, hf_index, ett_disp_T_signedShadowError);
 
   return offset;
 }
@@ -1793,7 +1793,7 @@ static const value_string disp_ShadowError_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ShadowError_choice[] = {
+static const ber_old_choice_t ShadowError_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedShadowError },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signedShadowError_impl },
   { 0, 0, 0, 0, NULL }
@@ -1801,9 +1801,9 @@ static const ber_choice_t ShadowError_choice[] = {
 
 static int
 dissect_disp_ShadowError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ShadowError_choice, hf_index, ett_disp_ShadowError,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ShadowError_choice, hf_index, ett_disp_ShadowError,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index dc3bbfaf59..24baadee5a 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -479,14 +479,14 @@ dissect_dop_DSEType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t SET_OF_ProtocolInformation_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ProtocolInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_protocolInformation_item },
 };
 
 static int
 dissect_dop_SET_OF_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ProtocolInformation_set_of, hf_index, ett_dop_SET_OF_ProtocolInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ProtocolInformation_set_of, hf_index, ett_dop_SET_OF_ProtocolInformation);
 
   return offset;
 }
@@ -534,7 +534,7 @@ static int dissect_localQualifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t OperationalBindingID_sequence[] = {
+static const ber_old_sequence_t OperationalBindingID_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { 0, 0, 0, NULL }
@@ -542,8 +542,8 @@ static const ber_sequence_t OperationalBindingID_sequence[] = {
 
 int
 dissect_dop_OperationalBindingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OperationalBindingID_sequence, hf_index, ett_dop_OperationalBindingID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OperationalBindingID_sequence, hf_index, ett_dop_OperationalBindingID);
 
   return offset;
 }
@@ -558,7 +558,7 @@ static int dissect_newBindingID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SupplierOrConsumer_set[] = {
+static const ber_old_sequence_t SupplierOrConsumer_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -568,8 +568,8 @@ static const ber_sequence_t SupplierOrConsumer_set[] = {
 
 static int
 dissect_dop_SupplierOrConsumer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SupplierOrConsumer_set, hf_index, ett_dop_SupplierOrConsumer);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SupplierOrConsumer_set, hf_index, ett_dop_SupplierOrConsumer);
 
   return offset;
 }
@@ -596,7 +596,7 @@ static int dissect_signed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t SupplierInformation_set[] = {
+static const ber_old_sequence_t SupplierInformation_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -608,8 +608,8 @@ static const ber_sequence_t SupplierInformation_set[] = {
 
 static int
 dissect_dop_SupplierInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SupplierInformation_set, hf_index, ett_dop_SupplierInformation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SupplierInformation_set, hf_index, ett_dop_SupplierInformation);
 
   return offset;
 }
@@ -624,14 +624,14 @@ dissect_dop_ConsumerInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_AccessPoint_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AccessPoint_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_consumers_item },
 };
 
 static int
 dissect_dop_SET_OF_AccessPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AccessPoint_set_of, hf_index, ett_dop_SET_OF_AccessPoint);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AccessPoint_set_of, hf_index, ett_dop_SET_OF_AccessPoint);
 
   return offset;
 }
@@ -640,7 +640,7 @@ static int dissect_consumers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SupplierAndConsumers_set[] = {
+static const ber_old_sequence_t SupplierAndConsumers_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -650,8 +650,8 @@ static const ber_sequence_t SupplierAndConsumers_set[] = {
 
 int
 dissect_dop_SupplierAndConsumers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SupplierAndConsumers_set, hf_index, ett_dop_SupplierAndConsumers);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SupplierAndConsumers_set, hf_index, ett_dop_SupplierAndConsumers);
 
   return offset;
 }
@@ -762,7 +762,7 @@ static const value_string dop_EstablishArgumentInitiator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EstablishArgumentInitiator_choice[] = {
+static const ber_old_choice_t EstablishArgumentInitiator_choice[] = {
   {   3, BER_CLASS_CON, 3, 0, dissect_establishSymmetric },
   {   4, BER_CLASS_CON, 4, 0, dissect_establishRoleAInitiates },
   {   5, BER_CLASS_CON, 5, 0, dissect_establishRoleBInitiates },
@@ -771,9 +771,9 @@ static const ber_choice_t EstablishArgumentInitiator_choice[] = {
 
 static int
 dissect_dop_EstablishArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EstablishArgumentInitiator_choice, hf_index, ett_dop_EstablishArgumentInitiator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EstablishArgumentInitiator_choice, hf_index, ett_dop_EstablishArgumentInitiator,
+                                     NULL);
 
   return offset;
 }
@@ -866,7 +866,7 @@ static const value_string dop_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
   { 0, 0, 0, 0, NULL }
@@ -874,9 +874,9 @@ static const ber_choice_t Time_choice[] = {
 
 static int
 dissect_dop_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_dop_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_dop_Time,
+                                     NULL);
 
   return offset;
 }
@@ -897,7 +897,7 @@ static const value_string dop_T_validFrom_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_validFrom_choice[] = {
+static const ber_old_choice_t T_validFrom_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_now },
   {   1, BER_CLASS_CON, 1, 0, dissect_time },
   { 0, 0, 0, 0, NULL }
@@ -905,9 +905,9 @@ static const ber_choice_t T_validFrom_choice[] = {
 
 static int
 dissect_dop_T_validFrom(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_validFrom_choice, hf_index, ett_dop_T_validFrom,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_validFrom_choice, hf_index, ett_dop_T_validFrom,
+                                     NULL);
 
   return offset;
 }
@@ -922,7 +922,7 @@ static const value_string dop_T_validUntil_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_validUntil_choice[] = {
+static const ber_old_choice_t T_validUntil_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_explicitTermination },
   {   1, BER_CLASS_CON, 1, 0, dissect_time },
   { 0, 0, 0, 0, NULL }
@@ -930,9 +930,9 @@ static const ber_choice_t T_validUntil_choice[] = {
 
 static int
 dissect_dop_T_validUntil(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_validUntil_choice, hf_index, ett_dop_T_validUntil,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_validUntil_choice, hf_index, ett_dop_T_validUntil,
+                                     NULL);
 
   return offset;
 }
@@ -941,7 +941,7 @@ static int dissect_validUntil(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Validity_sequence[] = {
+static const ber_old_sequence_t Validity_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_validFrom },
   { BER_CLASS_CON, 1, 0, dissect_validUntil },
   { 0, 0, 0, NULL }
@@ -949,8 +949,8 @@ static const ber_sequence_t Validity_sequence[] = {
 
 static int
 dissect_dop_Validity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Validity_sequence, hf_index, ett_dop_Validity);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Validity_sequence, hf_index, ett_dop_Validity);
 
   return offset;
 }
@@ -959,7 +959,7 @@ static int dissect_valid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t EstablishOperationalBindingArgumentData_sequence[] = {
+static const ber_old_sequence_t EstablishOperationalBindingArgumentData_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_bindingType },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_bindingID },
   { BER_CLASS_CON, 2, 0, dissect_accessPoint },
@@ -972,8 +972,8 @@ static const ber_sequence_t EstablishOperationalBindingArgumentData_sequence[] =
 
 static int
 dissect_dop_EstablishOperationalBindingArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EstablishOperationalBindingArgumentData_sequence, hf_index, ett_dop_EstablishOperationalBindingArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EstablishOperationalBindingArgumentData_sequence, hf_index, ett_dop_EstablishOperationalBindingArgumentData);
 
   return offset;
 }
@@ -999,7 +999,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedEstablishOperationalBindingArgument_sequence[] = {
+static const ber_old_sequence_t T_signedEstablishOperationalBindingArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_establishOperationalBindingArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1008,8 +1008,8 @@ static const ber_sequence_t T_signedEstablishOperationalBindingArgument_sequence
 
 static int
 dissect_dop_T_signedEstablishOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedEstablishOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedEstablishOperationalBindingArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedEstablishOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedEstablishOperationalBindingArgument);
 
   return offset;
 }
@@ -1024,7 +1024,7 @@ static const value_string dop_EstablishOperationalBindingArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EstablishOperationalBindingArgument_choice[] = {
+static const ber_old_choice_t EstablishOperationalBindingArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedEstablishOperationalBindingArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedEstablishOperationalBindingArgument },
   { 0, 0, 0, 0, NULL }
@@ -1032,9 +1032,9 @@ static const ber_choice_t EstablishOperationalBindingArgument_choice[] = {
 
 static int
 dissect_dop_EstablishOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EstablishOperationalBindingArgument_choice, hf_index, ett_dop_EstablishOperationalBindingArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EstablishOperationalBindingArgument_choice, hf_index, ett_dop_EstablishOperationalBindingArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1095,7 +1095,7 @@ static const value_string dop_T_initiator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_initiator_choice[] = {
+static const ber_old_choice_t T_initiator_choice[] = {
   {   3, BER_CLASS_CON, 3, 0, dissect_symmetric },
   {   4, BER_CLASS_CON, 4, 0, dissect_roleA_replies },
   {   5, BER_CLASS_CON, 5, 0, dissect_roleB_replies },
@@ -1104,9 +1104,9 @@ static const ber_choice_t T_initiator_choice[] = {
 
 static int
 dissect_dop_T_initiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_initiator_choice, hf_index, ett_dop_T_initiator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_initiator_choice, hf_index, ett_dop_T_initiator,
+                                     NULL);
 
   return offset;
 }
@@ -1115,14 +1115,14 @@ static int dissect_initiator(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notification_item },
 };
 
 static int
 dissect_dop_SEQUENCE_SIZE_1_MAX_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_Attribute_sequence_of, hf_index, ett_dop_SEQUENCE_SIZE_1_MAX_OF_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_Attribute_sequence_of, hf_index, ett_dop_SEQUENCE_SIZE_1_MAX_OF_Attribute);
 
   return offset;
 }
@@ -1131,7 +1131,7 @@ static int dissect_notification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t EstablishOperationalBindingResult_sequence[] = {
+static const ber_old_sequence_t EstablishOperationalBindingResult_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_bindingType },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_bindingID },
   { BER_CLASS_CON, 2, 0, dissect_accessPoint },
@@ -1145,8 +1145,8 @@ static const ber_sequence_t EstablishOperationalBindingResult_sequence[] = {
 
 static int
 dissect_dop_EstablishOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EstablishOperationalBindingResult_sequence, hf_index, ett_dop_EstablishOperationalBindingResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EstablishOperationalBindingResult_sequence, hf_index, ett_dop_EstablishOperationalBindingResult);
 
   return offset;
 }
@@ -1207,7 +1207,7 @@ static const value_string dop_ModifyArgumentInitiator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyArgumentInitiator_choice[] = {
+static const ber_old_choice_t ModifyArgumentInitiator_choice[] = {
   {   3, BER_CLASS_CON, 3, 0, dissect_modifySymmetric },
   {   4, BER_CLASS_CON, 4, 0, dissect_modifyRoleAInitiates },
   {   5, BER_CLASS_CON, 5, 0, dissect_modifyRoleBInitiates },
@@ -1216,9 +1216,9 @@ static const ber_choice_t ModifyArgumentInitiator_choice[] = {
 
 static int
 dissect_dop_ModifyArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyArgumentInitiator_choice, hf_index, ett_dop_ModifyArgumentInitiator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyArgumentInitiator_choice, hf_index, ett_dop_ModifyArgumentInitiator,
+                                     NULL);
 
   return offset;
 }
@@ -1244,7 +1244,7 @@ static int dissect_argumentNewAgreement(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ModifyOperationalBindingArgumentData_sequence[] = {
+static const ber_old_sequence_t ModifyOperationalBindingArgumentData_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_bindingType },
   { BER_CLASS_CON, 1, 0, dissect_bindingID },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_accessPoint },
@@ -1258,8 +1258,8 @@ static const ber_sequence_t ModifyOperationalBindingArgumentData_sequence[] = {
 
 static int
 dissect_dop_ModifyOperationalBindingArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyOperationalBindingArgumentData_sequence, hf_index, ett_dop_ModifyOperationalBindingArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyOperationalBindingArgumentData_sequence, hf_index, ett_dop_ModifyOperationalBindingArgumentData);
 
   return offset;
 }
@@ -1271,7 +1271,7 @@ static int dissect_modifyOperationalBindingArgument(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t T_signedModifyOperationalBindingArgument_sequence[] = {
+static const ber_old_sequence_t T_signedModifyOperationalBindingArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyOperationalBindingArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1280,8 +1280,8 @@ static const ber_sequence_t T_signedModifyOperationalBindingArgument_sequence[]
 
 static int
 dissect_dop_T_signedModifyOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedModifyOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedModifyOperationalBindingArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedModifyOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedModifyOperationalBindingArgument);
 
   return offset;
 }
@@ -1296,7 +1296,7 @@ static const value_string dop_ModifyOperationalBindingArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyOperationalBindingArgument_choice[] = {
+static const ber_old_choice_t ModifyOperationalBindingArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedModifyOperationalBindingArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedModifyOperationalBindingArgument },
   { 0, 0, 0, 0, NULL }
@@ -1304,9 +1304,9 @@ static const ber_choice_t ModifyOperationalBindingArgument_choice[] = {
 
 static int
 dissect_dop_ModifyOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyOperationalBindingArgument_choice, hf_index, ett_dop_ModifyOperationalBindingArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyOperationalBindingArgument_choice, hf_index, ett_dop_ModifyOperationalBindingArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1328,7 +1328,7 @@ static int dissect_resultNewAgreement(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ModifyOperationalBindingResultData_sequence[] = {
+static const ber_old_sequence_t ModifyOperationalBindingResultData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newBindingID },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_bindingType },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_resultNewAgreement },
@@ -1342,8 +1342,8 @@ static const ber_sequence_t ModifyOperationalBindingResultData_sequence[] = {
 
 static int
 dissect_dop_ModifyOperationalBindingResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyOperationalBindingResultData_sequence, hf_index, ett_dop_ModifyOperationalBindingResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyOperationalBindingResultData_sequence, hf_index, ett_dop_ModifyOperationalBindingResultData);
 
   return offset;
 }
@@ -1352,7 +1352,7 @@ static int dissect_modifyOperationalBindingResultData(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t ProtectedModifyResult_sequence[] = {
+static const ber_old_sequence_t ProtectedModifyResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyOperationalBindingResultData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1361,8 +1361,8 @@ static const ber_sequence_t ProtectedModifyResult_sequence[] = {
 
 static int
 dissect_dop_ProtectedModifyResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProtectedModifyResult_sequence, hf_index, ett_dop_ProtectedModifyResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProtectedModifyResult_sequence, hf_index, ett_dop_ProtectedModifyResult);
 
   return offset;
 }
@@ -1377,7 +1377,7 @@ static const value_string dop_ModifyOperationalBindingResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ModifyOperationalBindingResult_choice[] = {
+static const ber_old_choice_t ModifyOperationalBindingResult_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_null },
   {   1, BER_CLASS_CON, 1, 0, dissect_protectedModifyResult },
   { 0, 0, 0, 0, NULL }
@@ -1385,9 +1385,9 @@ static const ber_choice_t ModifyOperationalBindingResult_choice[] = {
 
 static int
 dissect_dop_ModifyOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ModifyOperationalBindingResult_choice, hf_index, ett_dop_ModifyOperationalBindingResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ModifyOperationalBindingResult_choice, hf_index, ett_dop_ModifyOperationalBindingResult,
+                                     NULL);
 
   return offset;
 }
@@ -1448,7 +1448,7 @@ static const value_string dop_TerminateArgumentInitiator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TerminateArgumentInitiator_choice[] = {
+static const ber_old_choice_t TerminateArgumentInitiator_choice[] = {
   {   2, BER_CLASS_CON, 2, 0, dissect_terminateSymmetric },
   {   3, BER_CLASS_CON, 3, 0, dissect_terminateRoleAInitiates },
   {   4, BER_CLASS_CON, 4, 0, dissect_terminateRoleBInitiates },
@@ -1457,9 +1457,9 @@ static const ber_choice_t TerminateArgumentInitiator_choice[] = {
 
 static int
 dissect_dop_TerminateArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TerminateArgumentInitiator_choice, hf_index, ett_dop_TerminateArgumentInitiator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TerminateArgumentInitiator_choice, hf_index, ett_dop_TerminateArgumentInitiator,
+                                     NULL);
 
   return offset;
 }
@@ -1468,7 +1468,7 @@ static int dissect_terminateInitiator(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t TerminateOperationalBindingArgumentData_sequence[] = {
+static const ber_old_sequence_t TerminateOperationalBindingArgumentData_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_bindingType },
   { BER_CLASS_CON, 1, 0, dissect_bindingID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_terminateInitiator },
@@ -1479,8 +1479,8 @@ static const ber_sequence_t TerminateOperationalBindingArgumentData_sequence[] =
 
 static int
 dissect_dop_TerminateOperationalBindingArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TerminateOperationalBindingArgumentData_sequence, hf_index, ett_dop_TerminateOperationalBindingArgumentData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TerminateOperationalBindingArgumentData_sequence, hf_index, ett_dop_TerminateOperationalBindingArgumentData);
 
   return offset;
 }
@@ -1492,7 +1492,7 @@ static int dissect_terminateOperationalBindingArgument(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t T_signedTerminateOperationalBindingArgument_sequence[] = {
+static const ber_old_sequence_t T_signedTerminateOperationalBindingArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_terminateOperationalBindingArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1501,8 +1501,8 @@ static const ber_sequence_t T_signedTerminateOperationalBindingArgument_sequence
 
 static int
 dissect_dop_T_signedTerminateOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedTerminateOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedTerminateOperationalBindingArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedTerminateOperationalBindingArgument_sequence, hf_index, ett_dop_T_signedTerminateOperationalBindingArgument);
 
   return offset;
 }
@@ -1517,7 +1517,7 @@ static const value_string dop_TerminateOperationalBindingArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TerminateOperationalBindingArgument_choice[] = {
+static const ber_old_choice_t TerminateOperationalBindingArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedTerminateOperationalBindingArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedTerminateOperationalBindingArgument },
   { 0, 0, 0, 0, NULL }
@@ -1525,15 +1525,15 @@ static const ber_choice_t TerminateOperationalBindingArgument_choice[] = {
 
 static int
 dissect_dop_TerminateOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TerminateOperationalBindingArgument_choice, hf_index, ett_dop_TerminateOperationalBindingArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TerminateOperationalBindingArgument_choice, hf_index, ett_dop_TerminateOperationalBindingArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t TerminateOperationalBindingResultData_sequence[] = {
+static const ber_old_sequence_t TerminateOperationalBindingResultData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bindingID },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_bindingType },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_terminateAtGeneralizedTime },
@@ -1546,8 +1546,8 @@ static const ber_sequence_t TerminateOperationalBindingResultData_sequence[] = {
 
 static int
 dissect_dop_TerminateOperationalBindingResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TerminateOperationalBindingResultData_sequence, hf_index, ett_dop_TerminateOperationalBindingResultData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TerminateOperationalBindingResultData_sequence, hf_index, ett_dop_TerminateOperationalBindingResultData);
 
   return offset;
 }
@@ -1556,7 +1556,7 @@ static int dissect_terminateOperationalBindingResultData(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t ProtectedTerminateResult_sequence[] = {
+static const ber_old_sequence_t ProtectedTerminateResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_terminateOperationalBindingResultData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1565,8 +1565,8 @@ static const ber_sequence_t ProtectedTerminateResult_sequence[] = {
 
 static int
 dissect_dop_ProtectedTerminateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProtectedTerminateResult_sequence, hf_index, ett_dop_ProtectedTerminateResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProtectedTerminateResult_sequence, hf_index, ett_dop_ProtectedTerminateResult);
 
   return offset;
 }
@@ -1581,7 +1581,7 @@ static const value_string dop_TerminateOperationalBindingResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TerminateOperationalBindingResult_choice[] = {
+static const ber_old_choice_t TerminateOperationalBindingResult_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_null },
   {   1, BER_CLASS_CON, 1, 0, dissect_protectedTerminateResult },
   { 0, 0, 0, 0, NULL }
@@ -1589,9 +1589,9 @@ static const ber_choice_t TerminateOperationalBindingResult_choice[] = {
 
 static int
 dissect_dop_TerminateOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TerminateOperationalBindingResult_choice, hf_index, ett_dop_TerminateOperationalBindingResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TerminateOperationalBindingResult_choice, hf_index, ett_dop_TerminateOperationalBindingResult,
+                                     NULL);
 
   return offset;
 }
@@ -1641,7 +1641,7 @@ static int dissect_agreementProposal(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t OpBindingErrorParam_sequence[] = {
+static const ber_old_sequence_t OpBindingErrorParam_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_problem },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_bindingType },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_agreementProposal },
@@ -1655,14 +1655,14 @@ static const ber_sequence_t OpBindingErrorParam_sequence[] = {
 
 static int
 dissect_dop_OpBindingErrorParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OpBindingErrorParam_sequence, hf_index, ett_dop_OpBindingErrorParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OpBindingErrorParam_sequence, hf_index, ett_dop_OpBindingErrorParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t HierarchicalAgreement_sequence[] = {
+static const ber_old_sequence_t HierarchicalAgreement_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_rdn },
   { BER_CLASS_CON, 1, 0, dissect_immediateSuperior },
   { 0, 0, 0, NULL }
@@ -1670,21 +1670,21 @@ static const ber_sequence_t HierarchicalAgreement_sequence[] = {
 
 static int
 dissect_dop_HierarchicalAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   HierarchicalAgreement_sequence, hf_index, ett_dop_HierarchicalAgreement);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       HierarchicalAgreement_sequence, hf_index, ett_dop_HierarchicalAgreement);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_Attribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_entryInfo_item },
 };
 
 static int
 dissect_dop_SET_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Attribute_set_of, hf_index, ett_dop_SET_OF_Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Attribute_set_of, hf_index, ett_dop_SET_OF_Attribute);
 
   return offset;
 }
@@ -1702,7 +1702,7 @@ static int dissect_info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SubentryInfo_sequence[] = {
+static const ber_old_sequence_t SubentryInfo_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_rdn },
   { BER_CLASS_CON, 1, 0, dissect_info },
   { 0, 0, 0, NULL }
@@ -1710,8 +1710,8 @@ static const ber_sequence_t SubentryInfo_sequence[] = {
 
 static int
 dissect_dop_SubentryInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubentryInfo_sequence, hf_index, ett_dop_SubentryInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubentryInfo_sequence, hf_index, ett_dop_SubentryInfo);
 
   return offset;
 }
@@ -1720,14 +1720,14 @@ static int dissect_subentries_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_SubentryInfo_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SubentryInfo_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subentries_item },
 };
 
 static int
 dissect_dop_SET_OF_SubentryInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SubentryInfo_set_of, hf_index, ett_dop_SET_OF_SubentryInfo);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SubentryInfo_set_of, hf_index, ett_dop_SET_OF_SubentryInfo);
 
   return offset;
 }
@@ -1736,7 +1736,7 @@ static int dissect_subentries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Vertex_sequence[] = {
+static const ber_old_sequence_t Vertex_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_rdn },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_admPointInfo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_subentries },
@@ -1746,8 +1746,8 @@ static const ber_sequence_t Vertex_sequence[] = {
 
 static int
 dissect_dop_Vertex(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Vertex_sequence, hf_index, ett_dop_Vertex);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Vertex_sequence, hf_index, ett_dop_Vertex);
 
   return offset;
 }
@@ -1756,14 +1756,14 @@ static int dissect_DITcontext_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DITcontext_sequence_of[1] = {
+static const ber_old_sequence_t DITcontext_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DITcontext_item },
 };
 
 static int
 dissect_dop_DITcontext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DITcontext_sequence_of, hf_index, ett_dop_DITcontext);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DITcontext_sequence_of, hf_index, ett_dop_DITcontext);
 
   return offset;
 }
@@ -1772,7 +1772,7 @@ static int dissect_contextPrefixInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SuperiorToSubordinate_sequence[] = {
+static const ber_old_sequence_t SuperiorToSubordinate_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_contextPrefixInfo },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_entryInfo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_immediateSuperiorInfo },
@@ -1781,14 +1781,14 @@ static const ber_sequence_t SuperiorToSubordinate_sequence[] = {
 
 static int
 dissect_dop_SuperiorToSubordinate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SuperiorToSubordinate_sequence, hf_index, ett_dop_SuperiorToSubordinate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SuperiorToSubordinate_sequence, hf_index, ett_dop_SuperiorToSubordinate);
 
   return offset;
 }
 
 
-static const ber_sequence_t SubordinateToSuperior_sequence[] = {
+static const ber_old_sequence_t SubordinateToSuperior_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_accessPoints },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_alias },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_entryInfo },
@@ -1798,14 +1798,14 @@ static const ber_sequence_t SubordinateToSuperior_sequence[] = {
 
 static int
 dissect_dop_SubordinateToSuperior(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubordinateToSuperior_sequence, hf_index, ett_dop_SubordinateToSuperior);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubordinateToSuperior_sequence, hf_index, ett_dop_SubordinateToSuperior);
 
   return offset;
 }
 
 
-static const ber_sequence_t SuperiorToSubordinateModification_sequence[] = {
+static const ber_old_sequence_t SuperiorToSubordinateModification_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_contextPrefixInfo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_immediateSuperiorInfo },
   { 0, 0, 0, NULL }
@@ -1813,28 +1813,28 @@ static const ber_sequence_t SuperiorToSubordinateModification_sequence[] = {
 
 static int
 dissect_dop_SuperiorToSubordinateModification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SuperiorToSubordinateModification_sequence, hf_index, ett_dop_SuperiorToSubordinateModification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SuperiorToSubordinateModification_sequence, hf_index, ett_dop_SuperiorToSubordinateModification);
 
   return offset;
 }
 
 
-static const ber_sequence_t NonSpecificHierarchicalAgreement_sequence[] = {
+static const ber_old_sequence_t NonSpecificHierarchicalAgreement_sequence[] = {
   { BER_CLASS_CON, 1, 0, dissect_immediateSuperior },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_dop_NonSpecificHierarchicalAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NonSpecificHierarchicalAgreement_sequence, hf_index, ett_dop_NonSpecificHierarchicalAgreement);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NonSpecificHierarchicalAgreement_sequence, hf_index, ett_dop_NonSpecificHierarchicalAgreement);
 
   return offset;
 }
 
 
-static const ber_sequence_t NHOBSuperiorToSubordinate_sequence[] = {
+static const ber_old_sequence_t NHOBSuperiorToSubordinate_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_contextPrefixInfo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_immediateSuperiorInfo },
   { 0, 0, 0, NULL }
@@ -1842,14 +1842,14 @@ static const ber_sequence_t NHOBSuperiorToSubordinate_sequence[] = {
 
 static int
 dissect_dop_NHOBSuperiorToSubordinate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NHOBSuperiorToSubordinate_sequence, hf_index, ett_dop_NHOBSuperiorToSubordinate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NHOBSuperiorToSubordinate_sequence, hf_index, ett_dop_NHOBSuperiorToSubordinate);
 
   return offset;
 }
 
 
-static const ber_sequence_t NHOBSubordinateToSuperior_sequence[] = {
+static const ber_old_sequence_t NHOBSubordinateToSuperior_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_accessPoints },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_subentries },
   { 0, 0, 0, NULL }
@@ -1857,8 +1857,8 @@ static const ber_sequence_t NHOBSubordinateToSuperior_sequence[] = {
 
 static int
 dissect_dop_NHOBSubordinateToSuperior(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NHOBSubordinateToSuperior_sequence, hf_index, ett_dop_NHOBSubordinateToSuperior);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NHOBSubordinateToSuperior_sequence, hf_index, ett_dop_NHOBSubordinateToSuperior);
 
   return offset;
 }
@@ -1905,7 +1905,7 @@ static int dissect_level(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t T_basicLevels_sequence[] = {
+static const ber_old_sequence_t T_basicLevels_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_level },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_localQualifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_signed },
@@ -1914,8 +1914,8 @@ static const ber_sequence_t T_basicLevels_sequence[] = {
 
 static int
 dissect_dop_T_basicLevels(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_basicLevels_sequence, hf_index, ett_dop_T_basicLevels);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_basicLevels_sequence, hf_index, ett_dop_T_basicLevels);
 
   return offset;
 }
@@ -1930,7 +1930,7 @@ static const value_string dop_AuthenticationLevel_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuthenticationLevel_choice[] = {
+static const ber_old_choice_t AuthenticationLevel_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_basicLevels },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
   { 0, 0, 0, 0, NULL }
@@ -1938,9 +1938,9 @@ static const ber_choice_t AuthenticationLevel_choice[] = {
 
 static int
 dissect_dop_AuthenticationLevel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuthenticationLevel_choice, hf_index, ett_dop_AuthenticationLevel,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuthenticationLevel_choice, hf_index, ett_dop_AuthenticationLevel,
+                                     NULL);
 
   return offset;
 }
@@ -1949,14 +1949,14 @@ static int dissect_authenticationLevel(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType_item },
 };
 
 static int
 dissect_dop_SET_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeType_set_of, hf_index, ett_dop_SET_OF_AttributeType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeType_set_of, hf_index, ett_dop_SET_OF_AttributeType);
 
   return offset;
 }
@@ -1971,14 +1971,14 @@ static int dissect_selfValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_AttributeTypeAndValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeTypeAndValue_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeValue_item },
 };
 
 static int
 dissect_dop_SET_OF_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeTypeAndValue_set_of, hf_index, ett_dop_SET_OF_AttributeTypeAndValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeTypeAndValue_set_of, hf_index, ett_dop_SET_OF_AttributeTypeAndValue);
 
   return offset;
 }
@@ -1987,7 +1987,7 @@ static int dissect_attributeValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t MaxValueCount_sequence[] = {
+static const ber_old_sequence_t MaxValueCount_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_maxCount },
   { 0, 0, 0, NULL }
@@ -1995,8 +1995,8 @@ static const ber_sequence_t MaxValueCount_sequence[] = {
 
 static int
 dissect_dop_MaxValueCount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MaxValueCount_sequence, hf_index, ett_dop_MaxValueCount);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MaxValueCount_sequence, hf_index, ett_dop_MaxValueCount);
 
   return offset;
 }
@@ -2005,14 +2005,14 @@ static int dissect_maxValueCount_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SET_OF_MaxValueCount_set_of[1] = {
+static const ber_old_sequence_t SET_OF_MaxValueCount_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_maxValueCount_item },
 };
 
 static int
 dissect_dop_SET_OF_MaxValueCount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_MaxValueCount_set_of, hf_index, ett_dop_SET_OF_MaxValueCount);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_MaxValueCount_set_of, hf_index, ett_dop_SET_OF_MaxValueCount);
 
   return offset;
 }
@@ -2021,7 +2021,7 @@ static int dissect_maxValueCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t RestrictedValue_sequence[] = {
+static const ber_old_sequence_t RestrictedValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_valuesIn },
   { 0, 0, 0, NULL }
@@ -2029,8 +2029,8 @@ static const ber_sequence_t RestrictedValue_sequence[] = {
 
 static int
 dissect_dop_RestrictedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RestrictedValue_sequence, hf_index, ett_dop_RestrictedValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RestrictedValue_sequence, hf_index, ett_dop_RestrictedValue);
 
   return offset;
 }
@@ -2039,14 +2039,14 @@ static int dissect_restrictedBy_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_RestrictedValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_RestrictedValue_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_restrictedBy_item },
 };
 
 static int
 dissect_dop_SET_OF_RestrictedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_RestrictedValue_set_of, hf_index, ett_dop_SET_OF_RestrictedValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_RestrictedValue_set_of, hf_index, ett_dop_SET_OF_RestrictedValue);
 
   return offset;
 }
@@ -2055,14 +2055,14 @@ static int dissect_restrictedBy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContextAssertion_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item },
 };
 
 static int
 dissect_dop_SET_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContextAssertion_set_of, hf_index, ett_dop_SET_OF_ContextAssertion);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContextAssertion_set_of, hf_index, ett_dop_SET_OF_ContextAssertion);
 
   return offset;
 }
@@ -2071,7 +2071,7 @@ static int dissect_contexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ProtectedItems_sequence[] = {
+static const ber_old_sequence_t ProtectedItems_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_entry },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_allUserAttributeTypes },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attributeType },
@@ -2090,8 +2090,8 @@ static const ber_sequence_t ProtectedItems_sequence[] = {
 
 static int
 dissect_dop_ProtectedItems(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProtectedItems_sequence, hf_index, ett_dop_ProtectedItems);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProtectedItems_sequence, hf_index, ett_dop_ProtectedItems);
 
   return offset;
 }
@@ -2100,14 +2100,14 @@ static int dissect_protectedItems(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SET_OF_NameAndOptionalUID_set_of[1] = {
+static const ber_old_sequence_t SET_OF_NameAndOptionalUID_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_name_item },
 };
 
 static int
 dissect_dop_SET_OF_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_NameAndOptionalUID_set_of, hf_index, ett_dop_SET_OF_NameAndOptionalUID);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_NameAndOptionalUID_set_of, hf_index, ett_dop_SET_OF_NameAndOptionalUID);
 
   return offset;
 }
@@ -2119,14 +2119,14 @@ static int dissect_userGroup(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_SubtreeSpecification_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SubtreeSpecification_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subtree_item },
 };
 
 static int
 dissect_dop_SET_OF_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SubtreeSpecification_set_of, hf_index, ett_dop_SET_OF_SubtreeSpecification);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SubtreeSpecification_set_of, hf_index, ett_dop_SET_OF_SubtreeSpecification);
 
   return offset;
 }
@@ -2135,7 +2135,7 @@ static int dissect_subtree(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t UserClasses_sequence[] = {
+static const ber_old_sequence_t UserClasses_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_allUsers },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_thisEntry },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_name },
@@ -2146,8 +2146,8 @@ static const ber_sequence_t UserClasses_sequence[] = {
 
 static int
 dissect_dop_UserClasses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserClasses_sequence, hf_index, ett_dop_UserClasses);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserClasses_sequence, hf_index, ett_dop_UserClasses);
 
   return offset;
 }
@@ -2199,7 +2199,7 @@ static int dissect_grantsAndDenials(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ItemPermission_sequence[] = {
+static const ber_old_sequence_t ItemPermission_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_precedence },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userClasses },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_grantsAndDenials },
@@ -2208,8 +2208,8 @@ static const ber_sequence_t ItemPermission_sequence[] = {
 
 static int
 dissect_dop_ItemPermission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ItemPermission_sequence, hf_index, ett_dop_ItemPermission);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ItemPermission_sequence, hf_index, ett_dop_ItemPermission);
 
   return offset;
 }
@@ -2218,14 +2218,14 @@ static int dissect_itemPermissions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SET_OF_ItemPermission_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ItemPermission_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_itemPermissions_item },
 };
 
 static int
 dissect_dop_SET_OF_ItemPermission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ItemPermission_set_of, hf_index, ett_dop_SET_OF_ItemPermission);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ItemPermission_set_of, hf_index, ett_dop_SET_OF_ItemPermission);
 
   return offset;
 }
@@ -2234,7 +2234,7 @@ static int dissect_itemPermissions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_itemFirst_sequence[] = {
+static const ber_old_sequence_t T_itemFirst_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_protectedItems },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_itemPermissions },
   { 0, 0, 0, NULL }
@@ -2242,8 +2242,8 @@ static const ber_sequence_t T_itemFirst_sequence[] = {
 
 static int
 dissect_dop_T_itemFirst(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_itemFirst_sequence, hf_index, ett_dop_T_itemFirst);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_itemFirst_sequence, hf_index, ett_dop_T_itemFirst);
 
   return offset;
 }
@@ -2252,7 +2252,7 @@ static int dissect_itemFirst(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t UserPermission_sequence[] = {
+static const ber_old_sequence_t UserPermission_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_precedence },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_protectedItems },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_grantsAndDenials },
@@ -2261,8 +2261,8 @@ static const ber_sequence_t UserPermission_sequence[] = {
 
 static int
 dissect_dop_UserPermission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserPermission_sequence, hf_index, ett_dop_UserPermission);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserPermission_sequence, hf_index, ett_dop_UserPermission);
 
   return offset;
 }
@@ -2271,14 +2271,14 @@ static int dissect_userPermissions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SET_OF_UserPermission_set_of[1] = {
+static const ber_old_sequence_t SET_OF_UserPermission_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userPermissions_item },
 };
 
 static int
 dissect_dop_SET_OF_UserPermission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_UserPermission_set_of, hf_index, ett_dop_SET_OF_UserPermission);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_UserPermission_set_of, hf_index, ett_dop_SET_OF_UserPermission);
 
   return offset;
 }
@@ -2287,7 +2287,7 @@ static int dissect_userPermissions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_userFirst_sequence[] = {
+static const ber_old_sequence_t T_userFirst_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userClasses },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_userPermissions },
   { 0, 0, 0, NULL }
@@ -2295,8 +2295,8 @@ static const ber_sequence_t T_userFirst_sequence[] = {
 
 static int
 dissect_dop_T_userFirst(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_userFirst_sequence, hf_index, ett_dop_T_userFirst);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_userFirst_sequence, hf_index, ett_dop_T_userFirst);
 
   return offset;
 }
@@ -2311,7 +2311,7 @@ static const value_string dop_T_itemOrUserFirst_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_itemOrUserFirst_choice[] = {
+static const ber_old_choice_t T_itemOrUserFirst_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_itemFirst },
   {   1, BER_CLASS_CON, 1, 0, dissect_userFirst },
   { 0, 0, 0, 0, NULL }
@@ -2319,9 +2319,9 @@ static const ber_choice_t T_itemOrUserFirst_choice[] = {
 
 static int
 dissect_dop_T_itemOrUserFirst(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_itemOrUserFirst_choice, hf_index, ett_dop_T_itemOrUserFirst,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_itemOrUserFirst_choice, hf_index, ett_dop_T_itemOrUserFirst,
+                                     NULL);
 
   return offset;
 }
@@ -2330,7 +2330,7 @@ static int dissect_itemOrUserFirst(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ACIItem_sequence[] = {
+static const ber_old_sequence_t ACIItem_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_identificationTag },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_precedence },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authenticationLevel },
@@ -2340,8 +2340,8 @@ static const ber_sequence_t ACIItem_sequence[] = {
 
 static int
 dissect_dop_ACIItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ACIItem_sequence, hf_index, ett_dop_ACIItem);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ACIItem_sequence, hf_index, ett_dop_ACIItem);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 53268b47c7..1f2e90c786 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -468,7 +468,7 @@ static int dissect_localQualifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t OperationProgress_set[] = {
+static const ber_old_sequence_t OperationProgress_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_nameResolutionPhase },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_nextRDNToBeResolved },
   { 0, 0, 0, NULL }
@@ -476,8 +476,8 @@ static const ber_sequence_t OperationProgress_set[] = {
 
 int
 dissect_dsp_OperationProgress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OperationProgress_set, hf_index, ett_dsp_OperationProgress);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OperationProgress_set, hf_index, ett_dsp_OperationProgress);
 
   return offset;
 }
@@ -486,7 +486,7 @@ static int dissect_operationProgress(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t TraceItem_set[] = {
+static const ber_old_sequence_t TraceItem_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_dsa },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_targetObject },
   { BER_CLASS_CON, 2, 0, dissect_operationProgress },
@@ -495,8 +495,8 @@ static const ber_sequence_t TraceItem_set[] = {
 
 static int
 dissect_dsp_TraceItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TraceItem_set, hf_index, ett_dsp_TraceItem);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TraceItem_set, hf_index, ett_dsp_TraceItem);
 
   return offset;
 }
@@ -505,14 +505,14 @@ static int dissect_TraceInformation_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t TraceInformation_sequence_of[1] = {
+static const ber_old_sequence_t TraceInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_TraceInformation_item },
 };
 
 static int
 dissect_dsp_TraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TraceInformation_sequence_of, hf_index, ett_dsp_TraceInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TraceInformation_sequence_of, hf_index, ett_dsp_TraceInformation);
 
   return offset;
 }
@@ -623,7 +623,7 @@ static const value_string dsp_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
   { 0, 0, 0, 0, NULL }
@@ -631,9 +631,9 @@ static const ber_choice_t Time_choice[] = {
 
 static int
 dissect_dsp_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_dsp_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_dsp_Time,
+                                     NULL);
 
   return offset;
 }
@@ -662,7 +662,7 @@ static int dissect_level(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t T_basicLevels_sequence[] = {
+static const ber_old_sequence_t T_basicLevels_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_level },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_localQualifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_signed },
@@ -671,8 +671,8 @@ static const ber_sequence_t T_basicLevels_sequence[] = {
 
 static int
 dissect_dsp_T_basicLevels(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_basicLevels_sequence, hf_index, ett_dsp_T_basicLevels);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_basicLevels_sequence, hf_index, ett_dsp_T_basicLevels);
 
   return offset;
 }
@@ -687,7 +687,7 @@ static const value_string dsp_AuthenticationLevel_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuthenticationLevel_choice[] = {
+static const ber_old_choice_t AuthenticationLevel_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_basicLevels },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_other },
   { 0, 0, 0, 0, NULL }
@@ -695,9 +695,9 @@ static const ber_choice_t AuthenticationLevel_choice[] = {
 
 static int
 dissect_dsp_AuthenticationLevel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuthenticationLevel_choice, hf_index, ett_dsp_AuthenticationLevel,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuthenticationLevel_choice, hf_index, ett_dsp_AuthenticationLevel,
+                                     NULL);
 
   return offset;
 }
@@ -706,14 +706,14 @@ static int dissect_authenticationLevel(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Exclusions_set_of[1] = {
+static const ber_old_sequence_t Exclusions_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Exclusions_item },
 };
 
 static int
 dissect_dsp_Exclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 Exclusions_set_of, hf_index, ett_dsp_Exclusions);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     Exclusions_set_of, hf_index, ett_dsp_Exclusions);
 
   return offset;
 }
@@ -725,7 +725,7 @@ static int dissect_alreadySearched(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ChainingArguments_set[] = {
+static const ber_old_sequence_t ChainingArguments_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_originator },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_targetObjectDN },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_operationProgress },
@@ -752,8 +752,8 @@ static const ber_sequence_t ChainingArguments_set[] = {
 
 static int
 dissect_dsp_ChainingArguments(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainingArguments_set, hf_index, ett_dsp_ChainingArguments);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainingArguments_set, hf_index, ett_dsp_ChainingArguments);
 
   return offset;
 }
@@ -762,7 +762,7 @@ static int dissect_chainedArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ChainedReadArgumentData_set[] = {
+static const ber_old_sequence_t ChainedReadArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_readArgument },
   { 0, 0, 0, NULL }
@@ -770,8 +770,8 @@ static const ber_sequence_t ChainedReadArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedReadArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedReadArgumentData_set, hf_index, ett_dsp_ChainedReadArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedReadArgumentData_set, hf_index, ett_dsp_ChainedReadArgumentData);
 
   return offset;
 }
@@ -797,7 +797,7 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_signedChainedReadArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedReadArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedReadArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -806,8 +806,8 @@ static const ber_sequence_t T_signedChainedReadArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedReadArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedReadArgument_sequence, hf_index, ett_dsp_T_signedChainedReadArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedReadArgument_sequence, hf_index, ett_dsp_T_signedChainedReadArgument);
 
   return offset;
 }
@@ -822,7 +822,7 @@ static const value_string dsp_ChainedReadArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedReadArgument_choice[] = {
+static const ber_old_choice_t ChainedReadArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedReadArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedReadArgument },
   { 0, 0, 0, 0, NULL }
@@ -830,22 +830,22 @@ static const ber_choice_t ChainedReadArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedReadArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedReadArgument_choice, hf_index, ett_dsp_ChainedReadArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedReadArgument_choice, hf_index, ett_dsp_ChainedReadArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_ProtocolInformation_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ProtocolInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_protocolInformation_item },
 };
 
 static int
 dissect_dsp_SET_OF_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ProtocolInformation_set_of, hf_index, ett_dsp_SET_OF_ProtocolInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ProtocolInformation_set_of, hf_index, ett_dsp_SET_OF_ProtocolInformation);
 
   return offset;
 }
@@ -892,7 +892,7 @@ static int dissect_access_point_category(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t MasterOrShadowAccessPoint_set[] = {
+static const ber_old_sequence_t MasterOrShadowAccessPoint_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -903,8 +903,8 @@ static const ber_sequence_t MasterOrShadowAccessPoint_set[] = {
 
 static int
 dissect_dsp_MasterOrShadowAccessPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MasterOrShadowAccessPoint_set, hf_index, ett_dsp_MasterOrShadowAccessPoint);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MasterOrShadowAccessPoint_set, hf_index, ett_dsp_MasterOrShadowAccessPoint);
 
   return offset;
 }
@@ -913,14 +913,14 @@ static int dissect_MasterAndShadowAccessPoints_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t MasterAndShadowAccessPoints_set_of[1] = {
+static const ber_old_sequence_t MasterAndShadowAccessPoints_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_MasterAndShadowAccessPoints_item },
 };
 
 int
 dissect_dsp_MasterAndShadowAccessPoints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 MasterAndShadowAccessPoints_set_of, hf_index, ett_dsp_MasterAndShadowAccessPoints);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     MasterAndShadowAccessPoints_set_of, hf_index, ett_dsp_MasterAndShadowAccessPoints);
 
   return offset;
 }
@@ -929,7 +929,7 @@ static int dissect_additionalPoints(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AccessPointInformation_set[] = {
+static const ber_old_sequence_t AccessPointInformation_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -941,8 +941,8 @@ static const ber_sequence_t AccessPointInformation_set[] = {
 
 static int
 dissect_dsp_AccessPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AccessPointInformation_set, hf_index, ett_dsp_AccessPointInformation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AccessPointInformation_set, hf_index, ett_dsp_AccessPointInformation);
 
   return offset;
 }
@@ -954,7 +954,7 @@ static int dissect_accessPoints_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CrossReference_set[] = {
+static const ber_old_sequence_t CrossReference_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_contextPrefix },
   { BER_CLASS_CON, 1, 0, dissect_accessPoint },
   { 0, 0, 0, NULL }
@@ -962,8 +962,8 @@ static const ber_sequence_t CrossReference_set[] = {
 
 static int
 dissect_dsp_CrossReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CrossReference_set, hf_index, ett_dsp_CrossReference);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CrossReference_set, hf_index, ett_dsp_CrossReference);
 
   return offset;
 }
@@ -972,14 +972,14 @@ static int dissect_crossReferences_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_CrossReference_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_CrossReference_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_crossReferences_item },
 };
 
 static int
 dissect_dsp_SEQUENCE_OF_CrossReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_CrossReference_sequence_of, hf_index, ett_dsp_SEQUENCE_OF_CrossReference);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_CrossReference_sequence_of, hf_index, ett_dsp_SEQUENCE_OF_CrossReference);
 
   return offset;
 }
@@ -988,7 +988,7 @@ static int dissect_crossReferences(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ChainingResults_set[] = {
+static const ber_old_sequence_t ChainingResults_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_info },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crossReferences },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -998,8 +998,8 @@ static const ber_sequence_t ChainingResults_set[] = {
 
 static int
 dissect_dsp_ChainingResults(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainingResults_set, hf_index, ett_dsp_ChainingResults);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainingResults_set, hf_index, ett_dsp_ChainingResults);
 
   return offset;
 }
@@ -1008,7 +1008,7 @@ static int dissect_chainedResults(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ChainedReadResultData_set[] = {
+static const ber_old_sequence_t ChainedReadResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_readResult },
   { 0, 0, 0, NULL }
@@ -1016,8 +1016,8 @@ static const ber_sequence_t ChainedReadResultData_set[] = {
 
 static int
 dissect_dsp_ChainedReadResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedReadResultData_set, hf_index, ett_dsp_ChainedReadResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedReadResultData_set, hf_index, ett_dsp_ChainedReadResultData);
 
   return offset;
 }
@@ -1029,7 +1029,7 @@ static int dissect_chainedReadResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_signedChainedReadResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedReadResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedReadResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1038,8 +1038,8 @@ static const ber_sequence_t T_signedChainedReadResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedReadResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedReadResult_sequence, hf_index, ett_dsp_T_signedChainedReadResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedReadResult_sequence, hf_index, ett_dsp_T_signedChainedReadResult);
 
   return offset;
 }
@@ -1054,7 +1054,7 @@ static const value_string dsp_ChainedReadResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedReadResult_choice[] = {
+static const ber_old_choice_t ChainedReadResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedReadResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedReadResult },
   { 0, 0, 0, 0, NULL }
@@ -1062,15 +1062,15 @@ static const ber_choice_t ChainedReadResult_choice[] = {
 
 static int
 dissect_dsp_ChainedReadResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedReadResult_choice, hf_index, ett_dsp_ChainedReadResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedReadResult_choice, hf_index, ett_dsp_ChainedReadResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedCompareArgumentData_set[] = {
+static const ber_old_sequence_t ChainedCompareArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_compareArgument },
   { 0, 0, 0, NULL }
@@ -1078,8 +1078,8 @@ static const ber_sequence_t ChainedCompareArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedCompareArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedCompareArgumentData_set, hf_index, ett_dsp_ChainedCompareArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedCompareArgumentData_set, hf_index, ett_dsp_ChainedCompareArgumentData);
 
   return offset;
 }
@@ -1091,7 +1091,7 @@ static int dissect_chainedCompareArgument(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_signedChainedCompareArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedCompareArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedCompareArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1100,8 +1100,8 @@ static const ber_sequence_t T_signedChainedCompareArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedCompareArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedCompareArgument_sequence, hf_index, ett_dsp_T_signedChainedCompareArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedCompareArgument_sequence, hf_index, ett_dsp_T_signedChainedCompareArgument);
 
   return offset;
 }
@@ -1116,7 +1116,7 @@ static const value_string dsp_ChainedCompareArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedCompareArgument_choice[] = {
+static const ber_old_choice_t ChainedCompareArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedCompareArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedCompareArgument },
   { 0, 0, 0, 0, NULL }
@@ -1124,15 +1124,15 @@ static const ber_choice_t ChainedCompareArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedCompareArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedCompareArgument_choice, hf_index, ett_dsp_ChainedCompareArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedCompareArgument_choice, hf_index, ett_dsp_ChainedCompareArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedCompareResultData_set[] = {
+static const ber_old_sequence_t ChainedCompareResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_compareResult },
   { 0, 0, 0, NULL }
@@ -1140,8 +1140,8 @@ static const ber_sequence_t ChainedCompareResultData_set[] = {
 
 static int
 dissect_dsp_ChainedCompareResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedCompareResultData_set, hf_index, ett_dsp_ChainedCompareResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedCompareResultData_set, hf_index, ett_dsp_ChainedCompareResultData);
 
   return offset;
 }
@@ -1153,7 +1153,7 @@ static int dissect_chainedCompareResult(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedChainedCompareResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedCompareResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedCompareResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1162,8 +1162,8 @@ static const ber_sequence_t T_signedChainedCompareResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedCompareResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedCompareResult_sequence, hf_index, ett_dsp_T_signedChainedCompareResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedCompareResult_sequence, hf_index, ett_dsp_T_signedChainedCompareResult);
 
   return offset;
 }
@@ -1178,7 +1178,7 @@ static const value_string dsp_ChainedCompareResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedCompareResult_choice[] = {
+static const ber_old_choice_t ChainedCompareResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedCompareResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedCompareResult },
   { 0, 0, 0, 0, NULL }
@@ -1186,9 +1186,9 @@ static const ber_choice_t ChainedCompareResult_choice[] = {
 
 static int
 dissect_dsp_ChainedCompareResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedCompareResult_choice, hf_index, ett_dsp_ChainedCompareResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedCompareResult_choice, hf_index, ett_dsp_ChainedCompareResult,
+                                     NULL);
 
   return offset;
 }
@@ -1212,7 +1212,7 @@ dissect_dsp_ChainedAbandonResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ChainedListArgumentData_set[] = {
+static const ber_old_sequence_t ChainedListArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_listArgument },
   { 0, 0, 0, NULL }
@@ -1220,8 +1220,8 @@ static const ber_sequence_t ChainedListArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedListArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedListArgumentData_set, hf_index, ett_dsp_ChainedListArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedListArgumentData_set, hf_index, ett_dsp_ChainedListArgumentData);
 
   return offset;
 }
@@ -1233,7 +1233,7 @@ static int dissect_chainedListArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedChainedListArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedListArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedListArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1242,8 +1242,8 @@ static const ber_sequence_t T_signedChainedListArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedListArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedListArgument_sequence, hf_index, ett_dsp_T_signedChainedListArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedListArgument_sequence, hf_index, ett_dsp_T_signedChainedListArgument);
 
   return offset;
 }
@@ -1258,7 +1258,7 @@ static const value_string dsp_ChainedListArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedListArgument_choice[] = {
+static const ber_old_choice_t ChainedListArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedListArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedListArgument },
   { 0, 0, 0, 0, NULL }
@@ -1266,15 +1266,15 @@ static const ber_choice_t ChainedListArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedListArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedListArgument_choice, hf_index, ett_dsp_ChainedListArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedListArgument_choice, hf_index, ett_dsp_ChainedListArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedListResultData_set[] = {
+static const ber_old_sequence_t ChainedListResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_listResult },
   { 0, 0, 0, NULL }
@@ -1282,8 +1282,8 @@ static const ber_sequence_t ChainedListResultData_set[] = {
 
 static int
 dissect_dsp_ChainedListResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedListResultData_set, hf_index, ett_dsp_ChainedListResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedListResultData_set, hf_index, ett_dsp_ChainedListResultData);
 
   return offset;
 }
@@ -1295,7 +1295,7 @@ static int dissect_chainedListResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_signedChainedListResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedListResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedListResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1304,8 +1304,8 @@ static const ber_sequence_t T_signedChainedListResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedListResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedListResult_sequence, hf_index, ett_dsp_T_signedChainedListResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedListResult_sequence, hf_index, ett_dsp_T_signedChainedListResult);
 
   return offset;
 }
@@ -1320,7 +1320,7 @@ static const value_string dsp_ChainedListResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedListResult_choice[] = {
+static const ber_old_choice_t ChainedListResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedListResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedListResult },
   { 0, 0, 0, 0, NULL }
@@ -1328,15 +1328,15 @@ static const ber_choice_t ChainedListResult_choice[] = {
 
 static int
 dissect_dsp_ChainedListResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedListResult_choice, hf_index, ett_dsp_ChainedListResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedListResult_choice, hf_index, ett_dsp_ChainedListResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedSearchArgumentData_set[] = {
+static const ber_old_sequence_t ChainedSearchArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_searchArgument },
   { 0, 0, 0, NULL }
@@ -1344,8 +1344,8 @@ static const ber_sequence_t ChainedSearchArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedSearchArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedSearchArgumentData_set, hf_index, ett_dsp_ChainedSearchArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedSearchArgumentData_set, hf_index, ett_dsp_ChainedSearchArgumentData);
 
   return offset;
 }
@@ -1357,7 +1357,7 @@ static int dissect_chainedSearchArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_signedChainedSearchArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedSearchArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedSearchArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1366,8 +1366,8 @@ static const ber_sequence_t T_signedChainedSearchArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedSearchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedSearchArgument_sequence, hf_index, ett_dsp_T_signedChainedSearchArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedSearchArgument_sequence, hf_index, ett_dsp_T_signedChainedSearchArgument);
 
   return offset;
 }
@@ -1382,7 +1382,7 @@ static const value_string dsp_ChainedSearchArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedSearchArgument_choice[] = {
+static const ber_old_choice_t ChainedSearchArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedSearchArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedSearchArgument },
   { 0, 0, 0, 0, NULL }
@@ -1390,15 +1390,15 @@ static const ber_choice_t ChainedSearchArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedSearchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedSearchArgument_choice, hf_index, ett_dsp_ChainedSearchArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedSearchArgument_choice, hf_index, ett_dsp_ChainedSearchArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedSearchResultData_set[] = {
+static const ber_old_sequence_t ChainedSearchResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_searchResult },
   { 0, 0, 0, NULL }
@@ -1406,8 +1406,8 @@ static const ber_sequence_t ChainedSearchResultData_set[] = {
 
 static int
 dissect_dsp_ChainedSearchResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedSearchResultData_set, hf_index, ett_dsp_ChainedSearchResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedSearchResultData_set, hf_index, ett_dsp_ChainedSearchResultData);
 
   return offset;
 }
@@ -1419,7 +1419,7 @@ static int dissect_chainedSearchResult(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedChainedSearchResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedSearchResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedSearchResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1428,8 +1428,8 @@ static const ber_sequence_t T_signedChainedSearchResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedSearchResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedSearchResult_sequence, hf_index, ett_dsp_T_signedChainedSearchResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedSearchResult_sequence, hf_index, ett_dsp_T_signedChainedSearchResult);
 
   return offset;
 }
@@ -1444,7 +1444,7 @@ static const value_string dsp_ChainedSearchResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedSearchResult_choice[] = {
+static const ber_old_choice_t ChainedSearchResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedSearchResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedSearchResult },
   { 0, 0, 0, 0, NULL }
@@ -1452,15 +1452,15 @@ static const ber_choice_t ChainedSearchResult_choice[] = {
 
 static int
 dissect_dsp_ChainedSearchResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedSearchResult_choice, hf_index, ett_dsp_ChainedSearchResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedSearchResult_choice, hf_index, ett_dsp_ChainedSearchResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedAddEntryArgumentData_set[] = {
+static const ber_old_sequence_t ChainedAddEntryArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_addEntryArgument },
   { 0, 0, 0, NULL }
@@ -1468,8 +1468,8 @@ static const ber_sequence_t ChainedAddEntryArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedAddEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedAddEntryArgumentData_set, hf_index, ett_dsp_ChainedAddEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedAddEntryArgumentData_set, hf_index, ett_dsp_ChainedAddEntryArgumentData);
 
   return offset;
 }
@@ -1481,7 +1481,7 @@ static int dissect_chainedAddEntryArgument(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t T_signedChainedAddEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedAddEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedAddEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1490,8 +1490,8 @@ static const ber_sequence_t T_signedChainedAddEntryArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedAddEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedAddEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedAddEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedAddEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedAddEntryArgument);
 
   return offset;
 }
@@ -1506,7 +1506,7 @@ static const value_string dsp_ChainedAddEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedAddEntryArgument_choice[] = {
+static const ber_old_choice_t ChainedAddEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedAddEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedAddEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -1514,15 +1514,15 @@ static const ber_choice_t ChainedAddEntryArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedAddEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedAddEntryArgument_choice, hf_index, ett_dsp_ChainedAddEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedAddEntryArgument_choice, hf_index, ett_dsp_ChainedAddEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedAddEntryResultData_set[] = {
+static const ber_old_sequence_t ChainedAddEntryResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_addEntryResult },
   { 0, 0, 0, NULL }
@@ -1530,8 +1530,8 @@ static const ber_sequence_t ChainedAddEntryResultData_set[] = {
 
 static int
 dissect_dsp_ChainedAddEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedAddEntryResultData_set, hf_index, ett_dsp_ChainedAddEntryResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedAddEntryResultData_set, hf_index, ett_dsp_ChainedAddEntryResultData);
 
   return offset;
 }
@@ -1543,7 +1543,7 @@ static int dissect_chainedAddEntryResult(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_signedChainedAddEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedAddEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedAddEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1552,8 +1552,8 @@ static const ber_sequence_t T_signedChainedAddEntryResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedAddEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedAddEntryResult_sequence, hf_index, ett_dsp_T_signedChainedAddEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedAddEntryResult_sequence, hf_index, ett_dsp_T_signedChainedAddEntryResult);
 
   return offset;
 }
@@ -1568,7 +1568,7 @@ static const value_string dsp_ChainedAddEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedAddEntryResult_choice[] = {
+static const ber_old_choice_t ChainedAddEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedAddEntryResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedAddEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -1576,15 +1576,15 @@ static const ber_choice_t ChainedAddEntryResult_choice[] = {
 
 static int
 dissect_dsp_ChainedAddEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedAddEntryResult_choice, hf_index, ett_dsp_ChainedAddEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedAddEntryResult_choice, hf_index, ett_dsp_ChainedAddEntryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedRemoveEntryArgumentData_set[] = {
+static const ber_old_sequence_t ChainedRemoveEntryArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_removeEntryArgument },
   { 0, 0, 0, NULL }
@@ -1592,8 +1592,8 @@ static const ber_sequence_t ChainedRemoveEntryArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedRemoveEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedRemoveEntryArgumentData_set, hf_index, ett_dsp_ChainedRemoveEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedRemoveEntryArgumentData_set, hf_index, ett_dsp_ChainedRemoveEntryArgumentData);
 
   return offset;
 }
@@ -1605,7 +1605,7 @@ static int dissect_chainedRemoveEntryArgument(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_signedChainedRemoveEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedRemoveEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedRemoveEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1614,8 +1614,8 @@ static const ber_sequence_t T_signedChainedRemoveEntryArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedRemoveEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedRemoveEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedRemoveEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedRemoveEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedRemoveEntryArgument);
 
   return offset;
 }
@@ -1630,7 +1630,7 @@ static const value_string dsp_ChainedRemoveEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedRemoveEntryArgument_choice[] = {
+static const ber_old_choice_t ChainedRemoveEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedRemoveEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedRemoveEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -1638,15 +1638,15 @@ static const ber_choice_t ChainedRemoveEntryArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedRemoveEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedRemoveEntryArgument_choice, hf_index, ett_dsp_ChainedRemoveEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedRemoveEntryArgument_choice, hf_index, ett_dsp_ChainedRemoveEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedRemoveEntryResultData_set[] = {
+static const ber_old_sequence_t ChainedRemoveEntryResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_removeEntryResult },
   { 0, 0, 0, NULL }
@@ -1654,8 +1654,8 @@ static const ber_sequence_t ChainedRemoveEntryResultData_set[] = {
 
 static int
 dissect_dsp_ChainedRemoveEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedRemoveEntryResultData_set, hf_index, ett_dsp_ChainedRemoveEntryResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedRemoveEntryResultData_set, hf_index, ett_dsp_ChainedRemoveEntryResultData);
 
   return offset;
 }
@@ -1667,7 +1667,7 @@ static int dissect_chainedRemoveEntryResult(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_signedChainedRemoveEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedRemoveEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedRemoveEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1676,8 +1676,8 @@ static const ber_sequence_t T_signedChainedRemoveEntryResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedRemoveEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedRemoveEntryResult_sequence, hf_index, ett_dsp_T_signedChainedRemoveEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedRemoveEntryResult_sequence, hf_index, ett_dsp_T_signedChainedRemoveEntryResult);
 
   return offset;
 }
@@ -1692,7 +1692,7 @@ static const value_string dsp_ChainedRemoveEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedRemoveEntryResult_choice[] = {
+static const ber_old_choice_t ChainedRemoveEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedRemoveEntryResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedRemoveEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -1700,15 +1700,15 @@ static const ber_choice_t ChainedRemoveEntryResult_choice[] = {
 
 static int
 dissect_dsp_ChainedRemoveEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedRemoveEntryResult_choice, hf_index, ett_dsp_ChainedRemoveEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedRemoveEntryResult_choice, hf_index, ett_dsp_ChainedRemoveEntryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedModifyEntryArgumentData_set[] = {
+static const ber_old_sequence_t ChainedModifyEntryArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_modifyEntryArgument },
   { 0, 0, 0, NULL }
@@ -1716,8 +1716,8 @@ static const ber_sequence_t ChainedModifyEntryArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedModifyEntryArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedModifyEntryArgumentData_set, hf_index, ett_dsp_ChainedModifyEntryArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedModifyEntryArgumentData_set, hf_index, ett_dsp_ChainedModifyEntryArgumentData);
 
   return offset;
 }
@@ -1729,7 +1729,7 @@ static int dissect_chainedModifyEntryArgument(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_signedChainedModifyEntryArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedModifyEntryArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedModifyEntryArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1738,8 +1738,8 @@ static const ber_sequence_t T_signedChainedModifyEntryArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedModifyEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedModifyEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedModifyEntryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedModifyEntryArgument_sequence, hf_index, ett_dsp_T_signedChainedModifyEntryArgument);
 
   return offset;
 }
@@ -1754,7 +1754,7 @@ static const value_string dsp_ChainedModifyEntryArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedModifyEntryArgument_choice[] = {
+static const ber_old_choice_t ChainedModifyEntryArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedModifyEntryArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedModifyEntryArgument },
   { 0, 0, 0, 0, NULL }
@@ -1762,15 +1762,15 @@ static const ber_choice_t ChainedModifyEntryArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedModifyEntryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedModifyEntryArgument_choice, hf_index, ett_dsp_ChainedModifyEntryArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedModifyEntryArgument_choice, hf_index, ett_dsp_ChainedModifyEntryArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedModifyEntryResultData_set[] = {
+static const ber_old_sequence_t ChainedModifyEntryResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_modifyEntryResult },
   { 0, 0, 0, NULL }
@@ -1778,8 +1778,8 @@ static const ber_sequence_t ChainedModifyEntryResultData_set[] = {
 
 static int
 dissect_dsp_ChainedModifyEntryResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedModifyEntryResultData_set, hf_index, ett_dsp_ChainedModifyEntryResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedModifyEntryResultData_set, hf_index, ett_dsp_ChainedModifyEntryResultData);
 
   return offset;
 }
@@ -1791,7 +1791,7 @@ static int dissect_chainedModifyEntryResult(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_signedChainedModifyEntryResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedModifyEntryResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedModifyEntryResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1800,8 +1800,8 @@ static const ber_sequence_t T_signedChainedModifyEntryResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedModifyEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedModifyEntryResult_sequence, hf_index, ett_dsp_T_signedChainedModifyEntryResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedModifyEntryResult_sequence, hf_index, ett_dsp_T_signedChainedModifyEntryResult);
 
   return offset;
 }
@@ -1816,7 +1816,7 @@ static const value_string dsp_ChainedModifyEntryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedModifyEntryResult_choice[] = {
+static const ber_old_choice_t ChainedModifyEntryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedModifyEntryResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedModifyEntryResult },
   { 0, 0, 0, 0, NULL }
@@ -1824,15 +1824,15 @@ static const ber_choice_t ChainedModifyEntryResult_choice[] = {
 
 static int
 dissect_dsp_ChainedModifyEntryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedModifyEntryResult_choice, hf_index, ett_dsp_ChainedModifyEntryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedModifyEntryResult_choice, hf_index, ett_dsp_ChainedModifyEntryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedModifyDNArgumentData_set[] = {
+static const ber_old_sequence_t ChainedModifyDNArgumentData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedArgument },
   { BER_CLASS_CON, 0, 0, dissect_modifyDNArgument },
   { 0, 0, 0, NULL }
@@ -1840,8 +1840,8 @@ static const ber_sequence_t ChainedModifyDNArgumentData_set[] = {
 
 static int
 dissect_dsp_ChainedModifyDNArgumentData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedModifyDNArgumentData_set, hf_index, ett_dsp_ChainedModifyDNArgumentData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedModifyDNArgumentData_set, hf_index, ett_dsp_ChainedModifyDNArgumentData);
 
   return offset;
 }
@@ -1853,7 +1853,7 @@ static int dissect_chainedModifyDNArgument(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t T_signedChainedModifyDNArgument_sequence[] = {
+static const ber_old_sequence_t T_signedChainedModifyDNArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedModifyDNArgument },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1862,8 +1862,8 @@ static const ber_sequence_t T_signedChainedModifyDNArgument_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedModifyDNArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedModifyDNArgument_sequence, hf_index, ett_dsp_T_signedChainedModifyDNArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedModifyDNArgument_sequence, hf_index, ett_dsp_T_signedChainedModifyDNArgument);
 
   return offset;
 }
@@ -1878,7 +1878,7 @@ static const value_string dsp_ChainedModifyDNArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedModifyDNArgument_choice[] = {
+static const ber_old_choice_t ChainedModifyDNArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedModifyDNArgument },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedModifyDNArgument },
   { 0, 0, 0, 0, NULL }
@@ -1886,15 +1886,15 @@ static const ber_choice_t ChainedModifyDNArgument_choice[] = {
 
 static int
 dissect_dsp_ChainedModifyDNArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedModifyDNArgument_choice, hf_index, ett_dsp_ChainedModifyDNArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedModifyDNArgument_choice, hf_index, ett_dsp_ChainedModifyDNArgument,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChainedModifyDNResultData_set[] = {
+static const ber_old_sequence_t ChainedModifyDNResultData_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedResults },
   { BER_CLASS_CON, 0, 0, dissect_modifyDNResult },
   { 0, 0, 0, NULL }
@@ -1902,8 +1902,8 @@ static const ber_sequence_t ChainedModifyDNResultData_set[] = {
 
 static int
 dissect_dsp_ChainedModifyDNResultData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChainedModifyDNResultData_set, hf_index, ett_dsp_ChainedModifyDNResultData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChainedModifyDNResultData_set, hf_index, ett_dsp_ChainedModifyDNResultData);
 
   return offset;
 }
@@ -1915,7 +1915,7 @@ static int dissect_chainedModifyDNResult(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_signedChainedModifyDNResult_sequence[] = {
+static const ber_old_sequence_t T_signedChainedModifyDNResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_chainedModifyDNResult },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -1924,8 +1924,8 @@ static const ber_sequence_t T_signedChainedModifyDNResult_sequence[] = {
 
 static int
 dissect_dsp_T_signedChainedModifyDNResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedChainedModifyDNResult_sequence, hf_index, ett_dsp_T_signedChainedModifyDNResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedChainedModifyDNResult_sequence, hf_index, ett_dsp_T_signedChainedModifyDNResult);
 
   return offset;
 }
@@ -1940,7 +1940,7 @@ static const value_string dsp_ChainedModifyDNResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChainedModifyDNResult_choice[] = {
+static const ber_old_choice_t ChainedModifyDNResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedChainedModifyDNResult },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedChainedModifyDNResult },
   { 0, 0, 0, 0, NULL }
@@ -1948,22 +1948,22 @@ static const ber_choice_t ChainedModifyDNResult_choice[] = {
 
 static int
 dissect_dsp_ChainedModifyDNResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChainedModifyDNResult_choice, hf_index, ett_dsp_ChainedModifyDNResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChainedModifyDNResult_choice, hf_index, ett_dsp_ChainedModifyDNResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_AccessPointInformation_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AccessPointInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_accessPoints_item },
 };
 
 static int
 dissect_dsp_SET_OF_AccessPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AccessPointInformation_set_of, hf_index, ett_dsp_SET_OF_AccessPointInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AccessPointInformation_set_of, hf_index, ett_dsp_SET_OF_AccessPointInformation);
 
   return offset;
 }
@@ -1972,7 +1972,7 @@ static int dissect_accessPoints(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ContinuationReference_set[] = {
+static const ber_old_sequence_t ContinuationReference_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_targetObject },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_aliasedRDNs },
   { BER_CLASS_CON, 2, 0, dissect_operationProgress },
@@ -1988,8 +1988,8 @@ static const ber_sequence_t ContinuationReference_set[] = {
 
 int
 dissect_dsp_ContinuationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ContinuationReference_set, hf_index, ett_dsp_ContinuationReference);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ContinuationReference_set, hf_index, ett_dsp_ContinuationReference);
 
   return offset;
 }
@@ -1998,14 +1998,14 @@ static int dissect_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notification_item },
 };
 
 static int
 dissect_dsp_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_dsp_SEQUENCE_OF_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_dsp_SEQUENCE_OF_Attribute);
 
   return offset;
 }
@@ -2014,7 +2014,7 @@ static int dissect_notification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t DSAReferralData_set[] = {
+static const ber_old_sequence_t DSAReferralData_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_reference },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_contextPrefix },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_securityParameters },
@@ -2026,8 +2026,8 @@ static const ber_sequence_t DSAReferralData_set[] = {
 
 static int
 dissect_dsp_DSAReferralData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DSAReferralData_set, hf_index, ett_dsp_DSAReferralData);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DSAReferralData_set, hf_index, ett_dsp_DSAReferralData);
 
   return offset;
 }
@@ -2039,7 +2039,7 @@ static int dissect_dsaReferral(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_signedDSAReferral_sequence[] = {
+static const ber_old_sequence_t T_signedDSAReferral_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_dsaReferral },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2048,8 +2048,8 @@ static const ber_sequence_t T_signedDSAReferral_sequence[] = {
 
 static int
 dissect_dsp_T_signedDSAReferral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedDSAReferral_sequence, hf_index, ett_dsp_T_signedDSAReferral);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedDSAReferral_sequence, hf_index, ett_dsp_T_signedDSAReferral);
 
   return offset;
 }
@@ -2064,7 +2064,7 @@ static const value_string dsp_DSAReferral_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DSAReferral_choice[] = {
+static const ber_old_choice_t DSAReferral_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_unsignedDSAReferral },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedDSAReferral },
   { 0, 0, 0, 0, NULL }
@@ -2072,15 +2072,15 @@ static const ber_choice_t DSAReferral_choice[] = {
 
 static int
 dissect_dsp_DSAReferral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DSAReferral_choice, hf_index, ett_dsp_DSAReferral,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DSAReferral_choice, hf_index, ett_dsp_DSAReferral,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AccessPoint_set[] = {
+static const ber_old_sequence_t AccessPoint_set[] = {
   { BER_CLASS_CON, 0, 0, dissect_ae_title },
   { BER_CLASS_CON, 1, 0, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_protocolInformation },
@@ -2089,8 +2089,8 @@ static const ber_sequence_t AccessPoint_set[] = {
 
 int
 dissect_dsp_AccessPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AccessPoint_set, hf_index, ett_dsp_AccessPoint);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AccessPoint_set, hf_index, ett_dsp_AccessPoint);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 8ca264d4a0..504e035b38 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -229,14 +229,14 @@ static int dissect_allOrFirstTier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item },
 };
 
 static int
 dissect_ess_SEQUENCE_OF_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames);
 
   return offset;
 }
@@ -260,7 +260,7 @@ static const value_string ess_ReceiptsFrom_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReceiptsFrom_choice[] = {
+static const ber_old_choice_t ReceiptsFrom_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_allOrFirstTier_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receiptList_impl },
   { 0, 0, 0, 0, NULL }
@@ -268,9 +268,9 @@ static const ber_choice_t ReceiptsFrom_choice[] = {
 
 static int
 dissect_ess_ReceiptsFrom(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom,
+                                     NULL);
 
   return offset;
 }
@@ -279,7 +279,7 @@ static int dissect_receiptsFrom(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReceiptRequest_sequence[] = {
+static const ber_old_sequence_t ReceiptRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo },
@@ -288,8 +288,8 @@ static const ber_sequence_t ReceiptRequest_sequence[] = {
 
 static int
 dissect_ess_ReceiptRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
 
   return offset;
 }
@@ -326,7 +326,7 @@ static int dissect_originatorSignatureValue(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Receipt_sequence[] = {
+static const ber_old_sequence_t Receipt_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
@@ -336,8 +336,8 @@ static const ber_sequence_t Receipt_sequence[] = {
 
 static int
 dissect_ess_Receipt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Receipt_sequence, hf_index, ett_ess_Receipt);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Receipt_sequence, hf_index, ett_ess_Receipt);
 
   return offset;
 }
@@ -360,7 +360,7 @@ static int dissect_utf8String(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ContentHints_sequence[] = {
+static const ber_old_sequence_t ContentHints_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contentDescription },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
   { 0, 0, 0, NULL }
@@ -368,8 +368,8 @@ static const ber_sequence_t ContentHints_sequence[] = {
 
 static int
 dissect_ess_ContentHints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContentHints_sequence, hf_index, ett_ess_ContentHints);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContentHints_sequence, hf_index, ett_ess_ContentHints);
 
   return offset;
 }
@@ -385,7 +385,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ContentReference_sequence[] = {
+static const ber_old_sequence_t ContentReference_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_originatorSignatureValue },
@@ -394,8 +394,8 @@ static const ber_sequence_t ContentReference_sequence[] = {
 
 static int
 dissect_ess_ContentReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContentReference_sequence, hf_index, ett_ess_ContentReference);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContentReference_sequence, hf_index, ett_ess_ContentReference);
 
   return offset;
 }
@@ -456,7 +456,7 @@ static const value_string ess_ESSPrivacyMark_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ESSPrivacyMark_choice[] = {
+static const ber_old_choice_t ESSPrivacyMark_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_pString },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
   { 0, 0, 0, 0, NULL }
@@ -464,9 +464,9 @@ static const ber_choice_t ESSPrivacyMark_choice[] = {
 
 static int
 dissect_ess_ESSPrivacyMark(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark,
+                                     NULL);
 
   return offset;
 }
@@ -502,7 +502,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t SecurityCategory_sequence[] = {
+static const ber_old_sequence_t SecurityCategory_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl },
   { BER_CLASS_CON, 1, 0, dissect_value },
   { 0, 0, 0, NULL }
@@ -510,8 +510,8 @@ static const ber_sequence_t SecurityCategory_sequence[] = {
 
 static int
 dissect_ess_SecurityCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
 
   return offset;
 }
@@ -520,14 +520,14 @@ static int dissect_SecurityCategories_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SecurityCategories_set_of[1] = {
+static const ber_old_sequence_t SecurityCategories_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item },
 };
 
 static int
 dissect_ess_SecurityCategories(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories);
 
   return offset;
 }
@@ -536,7 +536,7 @@ static int dissect_security_categories(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ESSSecurityLabel_set[] = {
+static const ber_old_sequence_t ESSSecurityLabel_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_security_policy_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_security_classification },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_privacy_mark },
@@ -546,8 +546,8 @@ static const ber_sequence_t ESSSecurityLabel_set[] = {
 
 static int
 dissect_ess_ESSSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ESSSecurityLabel_set, hf_index, ett_ess_ESSSecurityLabel);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ESSSecurityLabel_set, hf_index, ett_ess_ESSSecurityLabel);
 
   return offset;
 }
@@ -585,7 +585,7 @@ static int dissect_bitSetAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RestrictiveTag_sequence[] = {
+static const ber_old_sequence_t RestrictiveTag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeFlags },
   { 0, 0, 0, NULL }
@@ -593,8 +593,8 @@ static const ber_sequence_t RestrictiveTag_sequence[] = {
 
 static int
 dissect_ess_RestrictiveTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RestrictiveTag_sequence, hf_index, ett_ess_RestrictiveTag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RestrictiveTag_sequence, hf_index, ett_ess_RestrictiveTag);
 
   return offset;
 }
@@ -616,14 +616,14 @@ static int dissect_securityAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SET_OF_SecurityAttribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_SecurityAttribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
 };
 
 static int
 dissect_ess_SET_OF_SecurityAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_SecurityAttribute_set_of, hf_index, ett_ess_SET_OF_SecurityAttribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_SecurityAttribute_set_of, hf_index, ett_ess_SET_OF_SecurityAttribute);
 
   return offset;
 }
@@ -635,7 +635,7 @@ static int dissect_securityAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t EnumeratedTag_sequence[] = {
+static const ber_old_sequence_t EnumeratedTag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributeList },
   { 0, 0, 0, NULL }
@@ -643,14 +643,14 @@ static const ber_sequence_t EnumeratedTag_sequence[] = {
 
 static int
 dissect_ess_EnumeratedTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EnumeratedTag_sequence, hf_index, ett_ess_EnumeratedTag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EnumeratedTag_sequence, hf_index, ett_ess_EnumeratedTag);
 
   return offset;
 }
 
 
-static const ber_sequence_t PermissiveTag_sequence[] = {
+static const ber_old_sequence_t PermissiveTag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeFlags },
   { 0, 0, 0, NULL }
@@ -658,8 +658,8 @@ static const ber_sequence_t PermissiveTag_sequence[] = {
 
 static int
 dissect_ess_PermissiveTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PermissiveTag_sequence, hf_index, ett_ess_PermissiveTag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PermissiveTag_sequence, hf_index, ett_ess_PermissiveTag);
 
   return offset;
 }
@@ -671,7 +671,7 @@ static const value_string ess_FreeFormField_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FreeFormField_choice[] = {
+static const ber_old_choice_t FreeFormField_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitSetAttributes },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_securityAttributes },
   { 0, 0, 0, 0, NULL }
@@ -679,9 +679,9 @@ static const ber_choice_t FreeFormField_choice[] = {
 
 static int
 dissect_ess_FreeFormField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FreeFormField_choice, hf_index, ett_ess_FreeFormField,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FreeFormField_choice, hf_index, ett_ess_FreeFormField,
+                                     NULL);
 
   return offset;
 }
@@ -690,7 +690,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t InformativeTag_sequence[] = {
+static const ber_old_sequence_t InformativeTag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tagName },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributes },
   { 0, 0, 0, NULL }
@@ -698,21 +698,21 @@ static const ber_sequence_t InformativeTag_sequence[] = {
 
 static int
 dissect_ess_InformativeTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformativeTag_sequence, hf_index, ett_ess_InformativeTag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformativeTag_sequence, hf_index, ett_ess_InformativeTag);
 
   return offset;
 }
 
 
-static const ber_sequence_t EquivalentLabels_sequence_of[1] = {
+static const ber_old_sequence_t EquivalentLabels_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_EquivalentLabels_item },
 };
 
 static int
 dissect_ess_EquivalentLabels(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      EquivalentLabels_sequence_of, hf_index, ett_ess_EquivalentLabels);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          EquivalentLabels_sequence_of, hf_index, ett_ess_EquivalentLabels);
 
   return offset;
 }
@@ -724,7 +724,7 @@ static const value_string ess_EntityIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EntityIdentifier_choice[] = {
+static const ber_old_choice_t EntityIdentifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier },
   { 0, 0, 0, 0, NULL }
@@ -732,9 +732,9 @@ static const ber_choice_t EntityIdentifier_choice[] = {
 
 static int
 dissect_ess_EntityIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -774,7 +774,7 @@ static const value_string ess_MLReceiptPolicy_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MLReceiptPolicy_choice[] = {
+static const ber_old_choice_t MLReceiptPolicy_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_none_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insteadOf_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inAdditionTo_impl },
@@ -783,9 +783,9 @@ static const ber_choice_t MLReceiptPolicy_choice[] = {
 
 static int
 dissect_ess_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy,
+                                     NULL);
 
   return offset;
 }
@@ -794,7 +794,7 @@ static int dissect_mlReceiptPolicy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MLData_sequence[] = {
+static const ber_old_sequence_t MLData_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy },
@@ -803,8 +803,8 @@ static const ber_sequence_t MLData_sequence[] = {
 
 static int
 dissect_ess_MLData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MLData_sequence, hf_index, ett_ess_MLData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MLData_sequence, hf_index, ett_ess_MLData);
 
   return offset;
 }
@@ -813,14 +813,14 @@ static int dissect_MLExpansionHistory_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t MLExpansionHistory_sequence_of[1] = {
+static const ber_old_sequence_t MLExpansionHistory_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MLExpansionHistory_item },
 };
 
 static int
 dissect_ess_MLExpansionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory);
 
   return offset;
 }
@@ -839,7 +839,7 @@ static int dissect_certHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t IssuerSerial_sequence[] = {
+static const ber_old_sequence_t IssuerSerial_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { 0, 0, 0, NULL }
@@ -847,8 +847,8 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
 
 static int
 dissect_ess_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
 
   return offset;
 }
@@ -857,7 +857,7 @@ static int dissect_issuerSerial(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ESSCertID_sequence[] = {
+static const ber_old_sequence_t ESSCertID_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_certHash },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerSerial },
   { 0, 0, 0, NULL }
@@ -865,8 +865,8 @@ static const ber_sequence_t ESSCertID_sequence[] = {
 
 static int
 dissect_ess_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
 
   return offset;
 }
@@ -875,14 +875,14 @@ static int dissect_certs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
 };
 
 static int
 dissect_ess_SEQUENCE_OF_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID);
 
   return offset;
 }
@@ -891,14 +891,14 @@ static int dissect_certs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item },
 };
 
 static int
 dissect_ess_SEQUENCE_OF_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation);
 
   return offset;
 }
@@ -907,7 +907,7 @@ static int dissect_policies(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SigningCertificate_sequence[] = {
+static const ber_old_sequence_t SigningCertificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policies },
   { 0, 0, 0, NULL }
@@ -915,8 +915,8 @@ static const ber_sequence_t SigningCertificate_sequence[] = {
 
 static int
 dissect_ess_SigningCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index eb199c0fc2..baceb27ae7 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -989,7 +989,7 @@ static const value_string ftam_Contents_Type_List_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Contents_Type_List_item_choice[] = {
+static const ber_old_choice_t Contents_Type_List_item_choice[] = {
   {  14, BER_CLASS_APP, 14, BER_FLAGS_IMPLTAG, dissect_document_type_name_impl },
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_abstract_Syntax_name },
   { 0, 0, 0, 0, NULL }
@@ -997,9 +997,9 @@ static const ber_choice_t Contents_Type_List_item_choice[] = {
 
 static int
 dissect_ftam_Contents_Type_List_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item,
+                                     NULL);
 
   return offset;
 }
@@ -1008,7 +1008,7 @@ static int dissect_Contents_Type_List_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Contents_Type_List_sequence_of[1] = {
+static const ber_old_sequence_t Contents_Type_List_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Contents_Type_List_item },
 };
 
@@ -1027,7 +1027,7 @@ dissect_ftam_Contents_Type_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Contents_Type_List_sequence_of, hf_index, ett_ftam_Contents_Type_List);
 
 
@@ -1159,7 +1159,7 @@ static const value_string ftam_Password_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Password_choice[] = {
+static const ber_old_choice_t Password_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_graphicString },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octetString },
   { 0, 0, 0, 0, NULL }
@@ -1180,7 +1180,7 @@ dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               Password_choice, hf_index, ett_ftam_Password, NULL);
 
 
@@ -1335,7 +1335,7 @@ static int dissect_success_Object_count_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_INITIALIZE_request_sequence[] = {
+static const ber_old_sequence_t F_INITIALIZE_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protocol_Version },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_implementation_information },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_tontext_management_impl },
@@ -1354,8 +1354,8 @@ static const ber_sequence_t F_INITIALIZE_request_sequence[] = {
 
 static int
 dissect_ftam_F_INITIALIZE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_INITIALIZE_request_sequence, hf_index, ett_ftam_F_INITIALIZE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_INITIALIZE_request_sequence, hf_index, ett_ftam_F_INITIALIZE_request);
 
   return offset;
 }
@@ -1480,7 +1480,7 @@ static int dissect_error_Source_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Diagnostic_item_sequence[] = {
+static const ber_old_sequence_t Diagnostic_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_diagnostic_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_identifier_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_error_observer_impl },
@@ -1492,8 +1492,8 @@ static const ber_sequence_t Diagnostic_item_sequence[] = {
 
 static int
 dissect_ftam_Diagnostic_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Diagnostic_item_sequence, hf_index, ett_ftam_Diagnostic_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Diagnostic_item_sequence, hf_index, ett_ftam_Diagnostic_item);
 
   return offset;
 }
@@ -1502,7 +1502,7 @@ static int dissect_Diagnostic_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Diagnostic_sequence_of[1] = {
+static const ber_old_sequence_t Diagnostic_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Diagnostic_item },
 };
 
@@ -1521,7 +1521,7 @@ dissect_ftam_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic);
 
 
@@ -1534,7 +1534,7 @@ static int dissect_diagnostic(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t F_INITIALIZE_response_sequence[] = {
+static const ber_old_sequence_t F_INITIALIZE_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protocol_Version },
@@ -1553,8 +1553,8 @@ static const ber_sequence_t F_INITIALIZE_response_sequence[] = {
 
 static int
 dissect_ftam_F_INITIALIZE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_INITIALIZE_response_sequence, hf_index, ett_ftam_F_INITIALIZE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_INITIALIZE_response_sequence, hf_index, ett_ftam_F_INITIALIZE_response);
 
   return offset;
 }
@@ -1563,15 +1563,15 @@ static int dissect_f_initialize_response_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_TERMINATE_request_sequence[] = {
+static const ber_old_sequence_t F_TERMINATE_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_TERMINATE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_TERMINATE_request_sequence, hf_index, ett_ftam_F_TERMINATE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_TERMINATE_request_sequence, hf_index, ett_ftam_F_TERMINATE_request);
 
   return offset;
 }
@@ -1580,7 +1580,7 @@ static int dissect_f_terminate_request_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Charging_item_sequence[] = {
+static const ber_old_sequence_t Charging_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_resource_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_charging_unit_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_charging_value_impl },
@@ -1589,8 +1589,8 @@ static const ber_sequence_t Charging_item_sequence[] = {
 
 static int
 dissect_ftam_Charging_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Charging_item_sequence, hf_index, ett_ftam_Charging_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Charging_item_sequence, hf_index, ett_ftam_Charging_item);
 
   return offset;
 }
@@ -1599,7 +1599,7 @@ static int dissect_Charging_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Charging_sequence_of[1] = {
+static const ber_old_sequence_t Charging_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Charging_item },
 };
 
@@ -1618,7 +1618,7 @@ dissect_ftam_Charging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Charging_sequence_of, hf_index, ett_ftam_Charging);
 
 
@@ -1631,7 +1631,7 @@ static int dissect_charging(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t F_TERMINATE_response_sequence[] = {
+static const ber_old_sequence_t F_TERMINATE_response_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging },
   { 0, 0, 0, NULL }
@@ -1639,8 +1639,8 @@ static const ber_sequence_t F_TERMINATE_response_sequence[] = {
 
 static int
 dissect_ftam_F_TERMINATE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_TERMINATE_response_sequence, hf_index, ett_ftam_F_TERMINATE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_TERMINATE_response_sequence, hf_index, ett_ftam_F_TERMINATE_response);
 
   return offset;
 }
@@ -1649,7 +1649,7 @@ static int dissect_f_terminate_response_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_U_ABORT_request_sequence[] = {
+static const ber_old_sequence_t F_U_ABORT_request_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
   { 0, 0, 0, NULL }
@@ -1657,8 +1657,8 @@ static const ber_sequence_t F_U_ABORT_request_sequence[] = {
 
 static int
 dissect_ftam_F_U_ABORT_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_U_ABORT_request_sequence, hf_index, ett_ftam_F_U_ABORT_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_U_ABORT_request_sequence, hf_index, ett_ftam_F_U_ABORT_request);
 
   return offset;
 }
@@ -1667,7 +1667,7 @@ static int dissect_f_u_abort_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_P_ABORT_request_sequence[] = {
+static const ber_old_sequence_t F_P_ABORT_request_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
   { 0, 0, 0, NULL }
@@ -1675,8 +1675,8 @@ static const ber_sequence_t F_P_ABORT_request_sequence[] = {
 
 static int
 dissect_ftam_F_P_ABORT_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_P_ABORT_request_sequence, hf_index, ett_ftam_F_P_ABORT_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_P_ABORT_request_sequence, hf_index, ett_ftam_F_P_ABORT_request);
 
   return offset;
 }
@@ -1695,7 +1695,7 @@ static const value_string ftam_FTAM_Regime_PDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FTAM_Regime_PDU_choice[] = {
+static const ber_old_choice_t FTAM_Regime_PDU_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_f_initialize_request_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_f_initialize_response_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_f_terminate_request_impl },
@@ -1710,9 +1710,9 @@ dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 #line 697 "ftam.cnf"
   gint branch_taken;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU,
-                                 &branch_taken);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU,
+                                     &branch_taken);
 
   
   if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){
@@ -1730,14 +1730,14 @@ static int dissect_fTAM_Regime_PDU(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Pathname_sequence_of[1] = {
+static const ber_old_sequence_t Pathname_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_Pathname_item },
 };
 
 int
 dissect_ftam_Pathname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Pathname_sequence_of, hf_index, ett_ftam_Pathname);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Pathname_sequence_of, hf_index, ett_ftam_Pathname);
 
   return offset;
 }
@@ -1758,7 +1758,7 @@ static const value_string ftam_Pathname_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Pathname_Attribute_choice[] = {
+static const ber_old_choice_t Pathname_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_incomplete_pathname_impl },
   {   1, BER_CLASS_APP, 23, BER_FLAGS_IMPLTAG, dissect_complete_pathname_impl },
   { 0, 0, 0, 0, NULL }
@@ -1766,9 +1766,9 @@ static const ber_choice_t Pathname_Attribute_choice[] = {
 
 static int
 dissect_ftam_Pathname_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -1792,7 +1792,7 @@ static int dissect_root_directory(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Select_Attributes_sequence[] = {
+static const ber_old_sequence_t Select_Attributes_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
   { 0, 0, 0, NULL }
 };
@@ -1812,7 +1812,7 @@ dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Select_Attributes_sequence, hf_index, ett_ftam_Select_Attributes);
 
 
@@ -1866,14 +1866,14 @@ static int dissect_action_list_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Pass_Passwords_sequence_of[1] = {
+static const ber_old_sequence_t Pass_Passwords_sequence_of[1] = {
   { BER_CLASS_APP, 17, BER_FLAGS_NOOWNTAG, dissect_Pass_Passwords_item },
 };
 
 static int
 dissect_ftam_Pass_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Pass_Passwords_sequence_of, hf_index, ett_ftam_Pass_Passwords);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Pass_Passwords_sequence_of, hf_index, ett_ftam_Pass_Passwords);
 
   return offset;
 }
@@ -1882,7 +1882,7 @@ static int dissect_pass_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Access_Passwords_sequence[] = {
+static const ber_old_sequence_t Access_Passwords_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_read_password },
   { BER_CLASS_CON, 1, 0, dissect_insert_password },
   { BER_CLASS_CON, 2, 0, dissect_replace_password },
@@ -1911,7 +1911,7 @@ dissect_ftam_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Access_Passwords_sequence, hf_index, ett_ftam_Access_Passwords);
 
 
@@ -1926,7 +1926,7 @@ static int dissect_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Path_Access_Passwords_item_sequence[] = {
+static const ber_old_sequence_t Path_Access_Passwords_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_password_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_password_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_replace_password_impl },
@@ -1942,8 +1942,8 @@ static const ber_sequence_t Path_Access_Passwords_item_sequence[] = {
 
 static int
 dissect_ftam_Path_Access_Passwords_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Path_Access_Passwords_item_sequence, hf_index, ett_ftam_Path_Access_Passwords_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Path_Access_Passwords_item_sequence, hf_index, ett_ftam_Path_Access_Passwords_item);
 
   return offset;
 }
@@ -1952,7 +1952,7 @@ static int dissect_Path_Access_Passwords_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Path_Access_Passwords_sequence_of[1] = {
+static const ber_old_sequence_t Path_Access_Passwords_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Path_Access_Passwords_item },
 };
 
@@ -1971,7 +1971,7 @@ dissect_ftam_Path_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Path_Access_Passwords_sequence_of, hf_index, ett_ftam_Path_Access_Passwords);
 
 
@@ -2025,7 +2025,7 @@ static int dissect_delete_Object_lock_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Concurrency_Control_sequence[] = {
+static const ber_old_sequence_t Concurrency_Control_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_lock_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_lock_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_replace_lock_impl },
@@ -2052,7 +2052,7 @@ dissect_ftam_Concurrency_Control(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Concurrency_Control_sequence, hf_index, ett_ftam_Concurrency_Control);
 
 
@@ -2065,7 +2065,7 @@ static int dissect_concurrency_control(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_SELECT_request_sequence[] = {
+static const ber_old_sequence_t F_SELECT_request_sequence[] = {
   { BER_CLASS_APP, 19, BER_FLAGS_NOOWNTAG, dissect_select_attributes },
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access },
   { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_access_passwords },
@@ -2078,8 +2078,8 @@ static const ber_sequence_t F_SELECT_request_sequence[] = {
 
 static int
 dissect_ftam_F_SELECT_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_SELECT_request_sequence, hf_index, ett_ftam_F_SELECT_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_SELECT_request_sequence, hf_index, ett_ftam_F_SELECT_request);
 
   return offset;
 }
@@ -2115,7 +2115,7 @@ static int dissect_referent_indicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t F_SELECT_response_sequence[] = {
+static const ber_old_sequence_t F_SELECT_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 19, BER_FLAGS_NOOWNTAG, dissect_select_attributes },
@@ -2127,8 +2127,8 @@ static const ber_sequence_t F_SELECT_response_sequence[] = {
 
 static int
 dissect_ftam_F_SELECT_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_SELECT_response_sequence, hf_index, ett_ftam_F_SELECT_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_SELECT_response_sequence, hf_index, ett_ftam_F_SELECT_response);
 
   return offset;
 }
@@ -2137,15 +2137,15 @@ static int dissect_f_select_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_DESELECT_request_sequence[] = {
+static const ber_old_sequence_t F_DESELECT_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_DESELECT_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_DESELECT_request_sequence, hf_index, ett_ftam_F_DESELECT_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_DESELECT_request_sequence, hf_index, ett_ftam_F_DESELECT_request);
 
   return offset;
 }
@@ -2154,7 +2154,7 @@ static int dissect_f_deselect_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t F_DESELECT_response_sequence[] = {
+static const ber_old_sequence_t F_DESELECT_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
@@ -2164,8 +2164,8 @@ static const ber_sequence_t F_DESELECT_response_sequence[] = {
 
 static int
 dissect_ftam_F_DESELECT_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_DESELECT_response_sequence, hf_index, ett_ftam_F_DESELECT_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_DESELECT_response_sequence, hf_index, ett_ftam_F_DESELECT_response);
 
   return offset;
 }
@@ -2260,7 +2260,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_document_type_sequence[] = {
+static const ber_old_sequence_t T_document_type_sequence[] = {
   { BER_CLASS_APP, 14, BER_FLAGS_IMPLTAG, dissect_document_type_name_impl },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_parameter },
   { 0, 0, 0, NULL }
@@ -2268,8 +2268,8 @@ static const ber_sequence_t T_document_type_sequence[] = {
 
 static int
 dissect_ftam_T_document_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_document_type_sequence, hf_index, ett_ftam_T_document_type);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_document_type_sequence, hf_index, ett_ftam_T_document_type);
 
   return offset;
 }
@@ -2306,7 +2306,7 @@ static int dissect_constraint_set_name(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_constraint_set_and_abstract_Syntax_sequence[] = {
+static const ber_old_sequence_t T_constraint_set_and_abstract_Syntax_sequence[] = {
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_constraint_set_name },
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_abstract_Syntax_name },
   { 0, 0, 0, NULL }
@@ -2314,8 +2314,8 @@ static const ber_sequence_t T_constraint_set_and_abstract_Syntax_sequence[] = {
 
 static int
 dissect_ftam_T_constraint_set_and_abstract_Syntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_constraint_set_and_abstract_Syntax_sequence, hf_index, ett_ftam_T_constraint_set_and_abstract_Syntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_constraint_set_and_abstract_Syntax_sequence, hf_index, ett_ftam_T_constraint_set_and_abstract_Syntax);
 
   return offset;
 }
@@ -2330,7 +2330,7 @@ static const value_string ftam_Contents_Type_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Contents_Type_Attribute_choice[] = {
+static const ber_old_choice_t Contents_Type_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_document_type_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_constraint_set_and_abstract_Syntax_impl },
   { 0, 0, 0, 0, NULL }
@@ -2338,9 +2338,9 @@ static const ber_choice_t Contents_Type_Attribute_choice[] = {
 
 static int
 dissect_ftam_Contents_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2379,7 +2379,7 @@ static const value_string ftam_Account_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Account_Attribute_choice[] = {
+static const ber_old_choice_t Account_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_actual_values2 },
   { 0, 0, 0, 0, NULL }
@@ -2387,9 +2387,9 @@ static const ber_choice_t Account_Attribute_choice[] = {
 
 static int
 dissect_ftam_Account_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2423,7 +2423,7 @@ const value_string ftam_Object_Availability_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Object_Availability_Attribute_choice[] = {
+static const ber_old_choice_t Object_Availability_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values8_impl },
   { 0, 0, 0, 0, NULL }
@@ -2431,9 +2431,9 @@ static const ber_choice_t Object_Availability_Attribute_choice[] = {
 
 int
 dissect_ftam_Object_Availability_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2448,7 +2448,7 @@ const value_string ftam_Object_Size_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Object_Size_Attribute_choice[] = {
+static const ber_old_choice_t Object_Size_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values7_impl },
   { 0, 0, 0, 0, NULL }
@@ -2456,9 +2456,9 @@ static const ber_choice_t Object_Size_Attribute_choice[] = {
 
 int
 dissect_ftam_Object_Size_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2512,7 +2512,7 @@ static int dissect_delete_Object_key_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t Concurrency_Access_sequence[] = {
+static const ber_old_sequence_t Concurrency_Access_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_key_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_key_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_replace_key_impl },
@@ -2526,8 +2526,8 @@ static const ber_sequence_t Concurrency_Access_sequence[] = {
 
 int
 dissect_ftam_Concurrency_Access(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Concurrency_Access_sequence, hf_index, ett_ftam_Concurrency_Access);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Concurrency_Access_sequence, hf_index, ett_ftam_Concurrency_Access);
 
   return offset;
 }
@@ -2565,7 +2565,7 @@ static int dissect_ae(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const ber_sequence_t AE_title_sequence[] = {
+static const ber_old_sequence_t AE_title_sequence[] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ap },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ae },
   { 0, 0, 0, NULL }
@@ -2573,8 +2573,8 @@ static const ber_sequence_t AE_title_sequence[] = {
 
 static int
 dissect_ftam_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AE_title_sequence, hf_index, ett_ftam_AE_title);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AE_title_sequence, hf_index, ett_ftam_AE_title);
 
   return offset;
 }
@@ -2592,7 +2592,7 @@ static int dissect_location_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Access_Control_Element_sequence[] = {
+static const ber_old_sequence_t Access_Control_Element_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_action_list_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concurrency_access_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_identity_impl },
@@ -2603,8 +2603,8 @@ static const ber_sequence_t Access_Control_Element_sequence[] = {
 
 static int
 dissect_ftam_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Access_Control_Element_sequence, hf_index, ett_ftam_Access_Control_Element);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Access_Control_Element_sequence, hf_index, ett_ftam_Access_Control_Element);
 
   return offset;
 }
@@ -2619,14 +2619,14 @@ static int dissect_delete_values_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values3_item },
 };
 
 static int
 dissect_ftam_SET_OF_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Access_Control_Element_set_of, hf_index, ett_ftam_SET_OF_Access_Control_Element);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Access_Control_Element_set_of, hf_index, ett_ftam_SET_OF_Access_Control_Element);
 
   return offset;
 }
@@ -2647,7 +2647,7 @@ static const value_string ftam_Access_Control_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Access_Control_Attribute_choice[] = {
+static const ber_old_choice_t Access_Control_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values3_impl },
   { 0, 0, 0, 0, NULL }
@@ -2655,9 +2655,9 @@ static const ber_choice_t Access_Control_Attribute_choice[] = {
 
 static int
 dissect_ftam_Access_Control_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2678,7 +2678,7 @@ const value_string ftam_Legal_Qualification_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Legal_Qualification_Attribute_choice[] = {
+static const ber_old_choice_t Legal_Qualification_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values9_impl },
   { 0, 0, 0, 0, NULL }
@@ -2686,9 +2686,9 @@ static const ber_choice_t Legal_Qualification_Attribute_choice[] = {
 
 int
 dissect_ftam_Legal_Qualification_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2704,7 +2704,7 @@ const value_string ftam_Private_Use_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Private_Use_Attribute_choice[] = {
+static const ber_old_choice_t Private_Use_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_abstract_Syntax_not_supported_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_actual_values4_impl },
@@ -2713,9 +2713,9 @@ static const ber_choice_t Private_Use_Attribute_choice[] = {
 
 int
 dissect_ftam_Private_Use_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -2763,7 +2763,7 @@ static int dissect_extension_attribute(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Extension_Attribute_sequence[] = {
+static const ber_old_sequence_t Extension_Attribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_identifier },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extension_attribute },
   { 0, 0, 0, NULL }
@@ -2771,8 +2771,8 @@ static const ber_sequence_t Extension_Attribute_sequence[] = {
 
 static int
 dissect_ftam_Extension_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Extension_Attribute_sequence, hf_index, ett_ftam_Extension_Attribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Extension_Attribute_sequence, hf_index, ett_ftam_Extension_Attribute);
 
   return offset;
 }
@@ -2781,14 +2781,14 @@ static int dissect_extension_set_attributes_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Extension_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extension_set_attributes_item },
 };
 
 static int
 dissect_ftam_SEQUENCE_OF_Extension_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Extension_Attribute_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Extension_Attribute_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute);
 
   return offset;
 }
@@ -2797,7 +2797,7 @@ static int dissect_extension_set_attributes(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Attribute_Extension_Set_sequence[] = {
+static const ber_old_sequence_t Attribute_Extension_Set_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl },
   { BER_CLASS_CON, 1, 0, dissect_extension_set_attributes },
   { 0, 0, 0, NULL }
@@ -2805,8 +2805,8 @@ static const ber_sequence_t Attribute_Extension_Set_sequence[] = {
 
 static int
 dissect_ftam_Attribute_Extension_Set(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_Extension_Set_sequence, hf_index, ett_ftam_Attribute_Extension_Set);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_Extension_Set_sequence, hf_index, ett_ftam_Attribute_Extension_Set);
 
   return offset;
 }
@@ -2815,14 +2815,14 @@ static int dissect_Attribute_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Attribute_Extensions_sequence_of[1] = {
+static const ber_old_sequence_t Attribute_Extensions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extensions_item },
 };
 
 int
 dissect_ftam_Attribute_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Attribute_Extensions_sequence_of, hf_index, ett_ftam_Attribute_Extensions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Attribute_Extensions_sequence_of, hf_index, ett_ftam_Attribute_Extensions);
 
   return offset;
 }
@@ -2831,7 +2831,7 @@ static int dissect_attribute_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Create_Attributes_sequence[] = {
+static const ber_old_sequence_t Create_Attributes_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
   { BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_object_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl },
@@ -2862,7 +2862,7 @@ dissect_ftam_Create_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Create_Attributes_sequence, hf_index, ett_ftam_Create_Attributes);
 
 
@@ -2874,7 +2874,7 @@ static int dissect_initial_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t F_CREATE_request_sequence[] = {
+static const ber_old_sequence_t F_CREATE_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl },
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
   { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password },
@@ -2889,8 +2889,8 @@ static const ber_sequence_t F_CREATE_request_sequence[] = {
 
 static int
 dissect_ftam_F_CREATE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CREATE_request_sequence, hf_index, ett_ftam_F_CREATE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CREATE_request_sequence, hf_index, ett_ftam_F_CREATE_request);
 
   return offset;
 }
@@ -2899,7 +2899,7 @@ static int dissect_f_create_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_CREATE_response_sequence[] = {
+static const ber_old_sequence_t F_CREATE_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
@@ -2910,8 +2910,8 @@ static const ber_sequence_t F_CREATE_response_sequence[] = {
 
 static int
 dissect_ftam_F_CREATE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CREATE_response_sequence, hf_index, ett_ftam_F_CREATE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CREATE_response_sequence, hf_index, ett_ftam_F_CREATE_response);
 
   return offset;
 }
@@ -2920,15 +2920,15 @@ static int dissect_f_create_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_DELETE_request_sequence[] = {
+static const ber_old_sequence_t F_DELETE_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_DELETE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_DELETE_request_sequence, hf_index, ett_ftam_F_DELETE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_DELETE_request_sequence, hf_index, ett_ftam_F_DELETE_request);
 
   return offset;
 }
@@ -2937,7 +2937,7 @@ static int dissect_f_delete_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_DELETE_response_sequence[] = {
+static const ber_old_sequence_t F_DELETE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging },
@@ -2947,8 +2947,8 @@ static const ber_sequence_t F_DELETE_response_sequence[] = {
 
 static int
 dissect_ftam_F_DELETE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_DELETE_response_sequence, hf_index, ett_ftam_F_DELETE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_DELETE_response_sequence, hf_index, ett_ftam_F_DELETE_response);
 
   return offset;
 }
@@ -3009,14 +3009,14 @@ static int dissect_extension_attribute_names_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_identifier_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Extension_Attribute_identifier_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_names_item },
 };
 
 static int
 dissect_ftam_SEQUENCE_OF_Extension_Attribute_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Extension_Attribute_identifier_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute_identifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Extension_Attribute_identifier_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute_identifier);
 
   return offset;
 }
@@ -3025,7 +3025,7 @@ static int dissect_extension_attribute_names(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Attribute_Extension_Set_Name_sequence[] = {
+static const ber_old_sequence_t Attribute_Extension_Set_Name_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl },
   { BER_CLASS_CON, 1, 0, dissect_extension_attribute_names },
   { 0, 0, 0, NULL }
@@ -3033,8 +3033,8 @@ static const ber_sequence_t Attribute_Extension_Set_Name_sequence[] = {
 
 static int
 dissect_ftam_Attribute_Extension_Set_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_Extension_Set_Name_sequence, hf_index, ett_ftam_Attribute_Extension_Set_Name);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_Extension_Set_Name_sequence, hf_index, ett_ftam_Attribute_Extension_Set_Name);
 
   return offset;
 }
@@ -3043,14 +3043,14 @@ static int dissect_Attribute_Extension_Names_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t Attribute_Extension_Names_sequence_of[1] = {
+static const ber_old_sequence_t Attribute_Extension_Names_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extension_Names_item },
 };
 
 static int
 dissect_ftam_Attribute_Extension_Names(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Attribute_Extension_Names_sequence_of, hf_index, ett_ftam_Attribute_Extension_Names);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Attribute_Extension_Names_sequence_of, hf_index, ett_ftam_Attribute_Extension_Names);
 
   return offset;
 }
@@ -3059,7 +3059,7 @@ static int dissect_attribute_extension_names_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t F_READ_ATTRIB_request_sequence[] = {
+static const ber_old_sequence_t F_READ_ATTRIB_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl },
   { 0, 0, 0, NULL }
@@ -3067,8 +3067,8 @@ static const ber_sequence_t F_READ_ATTRIB_request_sequence[] = {
 
 static int
 dissect_ftam_F_READ_ATTRIB_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_READ_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_ATTRIB_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_READ_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_ATTRIB_request);
 
   return offset;
 }
@@ -3077,14 +3077,14 @@ static int dissect_f_read_attrib_request_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Child_Objects_Attribute_set_of[1] = {
+static const ber_old_sequence_t Child_Objects_Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_Child_Objects_Attribute_item },
 };
 
 static int
 dissect_ftam_Child_Objects_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 Child_Objects_Attribute_set_of, hf_index, ett_ftam_Child_Objects_Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     Child_Objects_Attribute_set_of, hf_index, ett_ftam_Child_Objects_Attribute);
 
   return offset;
 }
@@ -3114,7 +3114,7 @@ const value_string ftam_Date_and_Time_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Date_and_Time_Attribute_choice[] = {
+static const ber_old_choice_t Date_and_Time_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values5_impl },
   { 0, 0, 0, 0, NULL }
@@ -3122,9 +3122,9 @@ static const ber_choice_t Date_and_Time_Attribute_choice[] = {
 
 int
 dissect_ftam_Date_and_Time_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -3148,7 +3148,7 @@ static const value_string ftam_User_Identity_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t User_Identity_Attribute_choice[] = {
+static const ber_old_choice_t User_Identity_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_APP, 22, BER_FLAGS_NOOWNTAG, dissect_actual_values6 },
   { 0, 0, 0, 0, NULL }
@@ -3156,9 +3156,9 @@ static const ber_choice_t User_Identity_Attribute_choice[] = {
 
 static int
 dissect_ftam_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -3176,7 +3176,7 @@ static int dissect_identity_last_attribute_modifier(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t Read_Attributes_sequence[] = {
+static const ber_old_sequence_t Read_Attributes_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
   { BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_object_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl },
@@ -3219,7 +3219,7 @@ dissect_ftam_Read_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Read_Attributes_sequence, hf_index, ett_ftam_Read_Attributes);
 
 
@@ -3237,7 +3237,7 @@ static int dissect_Objects_Attributes_List_item(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t F_READ_ATTRIB_response_sequence[] = {
+static const ber_old_sequence_t F_READ_ATTRIB_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_read_attributes },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -3246,8 +3246,8 @@ static const ber_sequence_t F_READ_ATTRIB_response_sequence[] = {
 
 static int
 dissect_ftam_F_READ_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_READ_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_ATTRIB_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_READ_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_ATTRIB_response);
 
   return offset;
 }
@@ -3259,7 +3259,7 @@ static int dissect_f_read_attrib_response_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_actual_values1_sequence[] = {
+static const ber_old_sequence_t T_actual_values1_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_insert_values_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delete_values_impl },
   { 0, 0, 0, NULL }
@@ -3267,8 +3267,8 @@ static const ber_sequence_t T_actual_values1_sequence[] = {
 
 static int
 dissect_ftam_T_actual_values1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_actual_values1_sequence, hf_index, ett_ftam_T_actual_values1);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_actual_values1_sequence, hf_index, ett_ftam_T_actual_values1);
 
   return offset;
 }
@@ -3283,7 +3283,7 @@ static const value_string ftam_Access_Control_Change_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Access_Control_Change_Attribute_choice[] = {
+static const ber_old_choice_t Access_Control_Change_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values1_impl },
   { 0, 0, 0, 0, NULL }
@@ -3291,9 +3291,9 @@ static const ber_choice_t Access_Control_Change_Attribute_choice[] = {
 
 static int
 dissect_ftam_Access_Control_Change_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -3305,7 +3305,7 @@ static int dissect_change_path_access_control(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Change_Attributes_sequence[] = {
+static const ber_old_sequence_t Change_Attributes_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_storage_account },
   { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_object_availability },
@@ -3333,7 +3333,7 @@ dissect_ftam_Change_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Change_Attributes_sequence, hf_index, ett_ftam_Change_Attributes);
 
 
@@ -3346,15 +3346,15 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t F_CHANGE_ATTRIB_request_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_ATTRIB_request_sequence[] = {
   { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_CHANGE_ATTRIB_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_request);
 
   return offset;
 }
@@ -3363,7 +3363,7 @@ static int dissect_f_Change_attrib_reques_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t F_CHANGE_ATTRIB_response_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_ATTRIB_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -3372,8 +3372,8 @@ static const ber_sequence_t F_CHANGE_ATTRIB_response_sequence[] = {
 
 static int
 dissect_ftam_F_CHANGE_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_response);
 
   return offset;
 }
@@ -3410,7 +3410,7 @@ static const value_string ftam_T_open_contents_type_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_open_contents_type_choice[] = {
+static const ber_old_choice_t T_open_contents_type_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknown_impl },
   {   1, BER_CLASS_CON, 1, 0, dissect_proposed },
   { 0, 0, 0, 0, NULL }
@@ -3418,9 +3418,9 @@ static const ber_choice_t T_open_contents_type_choice[] = {
 
 static int
 dissect_ftam_T_open_contents_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_open_contents_type_choice, hf_index, ett_ftam_T_open_contents_type,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_open_contents_type_choice, hf_index, ett_ftam_T_open_contents_type,
+                                     NULL);
 
   return offset;
 }
@@ -3477,14 +3477,14 @@ static int dissect_request_recovery_mode_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t SET_OF_Abstract_Syntax_Name_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Abstract_Syntax_Name_set_of[1] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_remove_contexts_item },
 };
 
 static int
 dissect_ftam_SET_OF_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Abstract_Syntax_Name_set_of, hf_index, ett_ftam_SET_OF_Abstract_Syntax_Name);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Abstract_Syntax_Name_set_of, hf_index, ett_ftam_SET_OF_Abstract_Syntax_Name);
 
   return offset;
 }
@@ -3531,7 +3531,7 @@ static int dissect_degree_of_overlap(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t F_OPEN_request_sequence[] = {
+static const ber_old_sequence_t F_OPEN_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_processing_mode_impl },
   { BER_CLASS_CON, 1, 0, dissect_open_contents_type },
   { BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_concurrency_control },
@@ -3548,8 +3548,8 @@ static const ber_sequence_t F_OPEN_request_sequence[] = {
 
 static int
 dissect_ftam_F_OPEN_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_OPEN_request_sequence, hf_index, ett_ftam_F_OPEN_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_OPEN_request_sequence, hf_index, ett_ftam_F_OPEN_request);
 
   return offset;
 }
@@ -3578,7 +3578,7 @@ static int dissect_response_recovery_mode_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t F_OPEN_response_sequence[] = {
+static const ber_old_sequence_t F_OPEN_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_contents_type },
@@ -3594,8 +3594,8 @@ static const ber_sequence_t F_OPEN_response_sequence[] = {
 
 static int
 dissect_ftam_F_OPEN_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_OPEN_response_sequence, hf_index, ett_ftam_F_OPEN_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_OPEN_response_sequence, hf_index, ett_ftam_F_OPEN_response);
 
   return offset;
 }
@@ -3604,7 +3604,7 @@ static int dissect_f_open_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_CLOSE_request_sequence[] = {
+static const ber_old_sequence_t F_CLOSE_request_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -3613,8 +3613,8 @@ static const ber_sequence_t F_CLOSE_request_sequence[] = {
 
 static int
 dissect_ftam_F_CLOSE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CLOSE_request_sequence, hf_index, ett_ftam_F_CLOSE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CLOSE_request_sequence, hf_index, ett_ftam_F_CLOSE_request);
 
   return offset;
 }
@@ -3623,7 +3623,7 @@ static int dissect_f_close_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_CLOSE_response_sequence[] = {
+static const ber_old_sequence_t F_CLOSE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -3632,8 +3632,8 @@ static const ber_sequence_t F_CLOSE_response_sequence[] = {
 
 static int
 dissect_ftam_F_CLOSE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CLOSE_response_sequence, hf_index, ett_ftam_F_CLOSE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CLOSE_response_sequence, hf_index, ett_ftam_F_CLOSE_response);
 
   return offset;
 }
@@ -3642,15 +3642,15 @@ static int dissect_f_close_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_BEGIN_GROUP_request_sequence[] = {
+static const ber_old_sequence_t F_BEGIN_GROUP_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_threshold_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_BEGIN_GROUP_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_BEGIN_GROUP_request_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_BEGIN_GROUP_request_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_request);
 
   return offset;
 }
@@ -3659,14 +3659,14 @@ static int dissect_f_begin_group_request_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_BEGIN_GROUP_response_sequence[] = {
+static const ber_old_sequence_t F_BEGIN_GROUP_response_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_BEGIN_GROUP_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_BEGIN_GROUP_response_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_BEGIN_GROUP_response_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_response);
 
   return offset;
 }
@@ -3675,14 +3675,14 @@ static int dissect_f_begin_group_response_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t F_END_GROUP_request_sequence[] = {
+static const ber_old_sequence_t F_END_GROUP_request_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_END_GROUP_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_END_GROUP_request_sequence, hf_index, ett_ftam_F_END_GROUP_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_END_GROUP_request_sequence, hf_index, ett_ftam_F_END_GROUP_request);
 
   return offset;
 }
@@ -3691,14 +3691,14 @@ static int dissect_f_end_group_request_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_END_GROUP_response_sequence[] = {
+static const ber_old_sequence_t F_END_GROUP_response_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_END_GROUP_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_END_GROUP_response_sequence, hf_index, ett_ftam_F_END_GROUP_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_END_GROUP_response_sequence, hf_index, ett_ftam_F_END_GROUP_response);
 
   return offset;
 }
@@ -3707,7 +3707,7 @@ static int dissect_f_end_group_response_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_RECOVER_request_sequence[] = {
+static const ber_old_sequence_t F_RECOVER_request_sequence[] = {
   { BER_CLASS_APP, 6, BER_FLAGS_NOOWNTAG, dissect_activity_identifier },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bulk_transfer_number_impl },
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access },
@@ -3724,8 +3724,8 @@ static const ber_sequence_t F_RECOVER_request_sequence[] = {
 
 static int
 dissect_ftam_F_RECOVER_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_RECOVER_request_sequence, hf_index, ett_ftam_F_RECOVER_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_RECOVER_request_sequence, hf_index, ett_ftam_F_RECOVER_request);
 
   return offset;
 }
@@ -3734,7 +3734,7 @@ static int dissect_f_recover_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_RECOVER_response_sequence[] = {
+static const ber_old_sequence_t F_RECOVER_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_contents_type },
@@ -3749,8 +3749,8 @@ static const ber_sequence_t F_RECOVER_response_sequence[] = {
 
 static int
 dissect_ftam_F_RECOVER_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_RECOVER_response_sequence, hf_index, ett_ftam_F_RECOVER_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_RECOVER_response_sequence, hf_index, ett_ftam_F_RECOVER_response);
 
   return offset;
 }
@@ -3832,14 +3832,14 @@ static int dissect_name_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Node_Name_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Node_Name_sequence_of[1] = {
   { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_name_list_item },
 };
 
 static int
 dissect_ftam_SEQUENCE_OF_Node_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Node_Name_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Node_Name);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Node_Name_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Node_Name);
 
   return offset;
 }
@@ -3858,7 +3858,7 @@ static const value_string ftam_FADU_Identity_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FADU_Identity_choice[] = {
+static const ber_old_choice_t FADU_Identity_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_first_last_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_relative_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_begin_end_impl },
@@ -3883,7 +3883,7 @@ dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL);
 
 
@@ -3929,7 +3929,7 @@ static int dissect_fadu_lock(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t F_LOCATE_request_sequence[] = {
+static const ber_old_sequence_t F_LOCATE_request_sequence[] = {
   { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity },
   { BER_CLASS_APP, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fadu_lock },
   { 0, 0, 0, NULL }
@@ -3937,8 +3937,8 @@ static const ber_sequence_t F_LOCATE_request_sequence[] = {
 
 static int
 dissect_ftam_F_LOCATE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LOCATE_request_sequence, hf_index, ett_ftam_F_LOCATE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LOCATE_request_sequence, hf_index, ett_ftam_F_LOCATE_request);
 
   return offset;
 }
@@ -3947,7 +3947,7 @@ static int dissect_f_locate_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_LOCATE_response_sequence[] = {
+static const ber_old_sequence_t F_LOCATE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -3956,8 +3956,8 @@ static const ber_sequence_t F_LOCATE_response_sequence[] = {
 
 static int
 dissect_ftam_F_LOCATE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LOCATE_response_sequence, hf_index, ett_ftam_F_LOCATE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LOCATE_response_sequence, hf_index, ett_ftam_F_LOCATE_response);
 
   return offset;
 }
@@ -3966,15 +3966,15 @@ static int dissect_f_locate_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_ERASE_request_sequence[] = {
+static const ber_old_sequence_t F_ERASE_request_sequence[] = {
   { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_ERASE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_ERASE_request_sequence, hf_index, ett_ftam_F_ERASE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_ERASE_request_sequence, hf_index, ett_ftam_F_ERASE_request);
 
   return offset;
 }
@@ -3983,7 +3983,7 @@ static int dissect_f_erase_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_ERASE_response_sequence[] = {
+static const ber_old_sequence_t F_ERASE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
   { 0, 0, 0, NULL }
@@ -3991,8 +3991,8 @@ static const ber_sequence_t F_ERASE_response_sequence[] = {
 
 static int
 dissect_ftam_F_ERASE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_ERASE_response_sequence, hf_index, ett_ftam_F_ERASE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_ERASE_response_sequence, hf_index, ett_ftam_F_ERASE_response);
 
   return offset;
 }
@@ -4031,7 +4031,7 @@ static const value_string ftam_File_PDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t File_PDU_choice[] = {
+static const ber_old_choice_t File_PDU_choice[] = {
   {   6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_f_select_request_impl },
   {   7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_f_select_response_impl },
   {   8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_f_deselect_request_impl },
@@ -4066,9 +4066,9 @@ dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 #line 711 "ftam.cnf"
   gint branch_taken;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 File_PDU_choice, hf_index, ett_ftam_File_PDU,
-                                 &branch_taken);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     File_PDU_choice, hf_index, ett_ftam_File_PDU,
+                                     &branch_taken);
 
 
   if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){
@@ -4110,7 +4110,7 @@ static int dissect_access_context_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Access_Context_sequence[] = {
+static const ber_old_sequence_t Access_Context_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_access_context_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_level_number_impl },
   { 0, 0, 0, NULL }
@@ -4131,7 +4131,7 @@ dissect_ftam_Access_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 Access_Context_sequence, hf_index, ett_ftam_Access_Context);
 
 
@@ -4143,7 +4143,7 @@ static int dissect_read_access_context(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_READ_request_sequence[] = {
+static const ber_old_sequence_t F_READ_request_sequence[] = {
   { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity },
   { BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_read_access_context },
   { BER_CLASS_APP, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fadu_lock },
@@ -4153,8 +4153,8 @@ static const ber_sequence_t F_READ_request_sequence[] = {
 
 static int
 dissect_ftam_F_READ_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_READ_request_sequence, hf_index, ett_ftam_F_READ_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_READ_request_sequence, hf_index, ett_ftam_F_READ_request);
 
   return offset;
 }
@@ -4183,7 +4183,7 @@ static int dissect_file_access_data_unit_Operation_impl(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t F_WRITE_request_sequence[] = {
+static const ber_old_sequence_t F_WRITE_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_file_access_data_unit_Operation_impl },
   { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity },
   { BER_CLASS_APP, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fadu_lock },
@@ -4193,8 +4193,8 @@ static const ber_sequence_t F_WRITE_request_sequence[] = {
 
 static int
 dissect_ftam_F_WRITE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_WRITE_request_sequence, hf_index, ett_ftam_F_WRITE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_WRITE_request_sequence, hf_index, ett_ftam_F_WRITE_request);
 
   return offset;
 }
@@ -4203,7 +4203,7 @@ static int dissect_f_write_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_DATA_END_request_sequence[] = {
+static const ber_old_sequence_t F_DATA_END_request_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
   { 0, 0, 0, NULL }
@@ -4211,8 +4211,8 @@ static const ber_sequence_t F_DATA_END_request_sequence[] = {
 
 static int
 dissect_ftam_F_DATA_END_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_DATA_END_request_sequence, hf_index, ett_ftam_F_DATA_END_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_DATA_END_request_sequence, hf_index, ett_ftam_F_DATA_END_request);
 
   return offset;
 }
@@ -4255,7 +4255,7 @@ static int dissect_request_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t F_TRANSFER_END_request_sequence[] = {
+static const ber_old_sequence_t F_TRANSFER_END_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_transfer_number_impl },
@@ -4266,8 +4266,8 @@ static const ber_sequence_t F_TRANSFER_END_request_sequence[] = {
 
 static int
 dissect_ftam_F_TRANSFER_END_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_TRANSFER_END_request_sequence, hf_index, ett_ftam_F_TRANSFER_END_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_TRANSFER_END_request_sequence, hf_index, ett_ftam_F_TRANSFER_END_request);
 
   return offset;
 }
@@ -4276,7 +4276,7 @@ static int dissect_f_transfer_end_request_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t F_TRANSFER_END_response_sequence[] = {
+static const ber_old_sequence_t F_TRANSFER_END_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -4287,8 +4287,8 @@ static const ber_sequence_t F_TRANSFER_END_response_sequence[] = {
 
 static int
 dissect_ftam_F_TRANSFER_END_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_TRANSFER_END_response_sequence, hf_index, ett_ftam_F_TRANSFER_END_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_TRANSFER_END_response_sequence, hf_index, ett_ftam_F_TRANSFER_END_response);
 
   return offset;
 }
@@ -4297,7 +4297,7 @@ static int dissect_f_transfer_end_response_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t F_CANCEL_request_sequence[] = {
+static const ber_old_sequence_t F_CANCEL_request_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -4312,8 +4312,8 @@ static const ber_sequence_t F_CANCEL_request_sequence[] = {
 
 static int
 dissect_ftam_F_CANCEL_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CANCEL_request_sequence, hf_index, ett_ftam_F_CANCEL_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CANCEL_request_sequence, hf_index, ett_ftam_F_CANCEL_request);
 
   return offset;
 }
@@ -4322,7 +4322,7 @@ static int dissect_f_cancel_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_CANCEL_response_sequence[] = {
+static const ber_old_sequence_t F_CANCEL_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -4337,8 +4337,8 @@ static const ber_sequence_t F_CANCEL_response_sequence[] = {
 
 static int
 dissect_ftam_F_CANCEL_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CANCEL_response_sequence, hf_index, ett_ftam_F_CANCEL_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CANCEL_response_sequence, hf_index, ett_ftam_F_CANCEL_response);
 
   return offset;
 }
@@ -4347,7 +4347,7 @@ static int dissect_f_cancel_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_RESTART_request_sequence[] = {
+static const ber_old_sequence_t F_RESTART_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl },
   { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl },
@@ -4360,8 +4360,8 @@ static const ber_sequence_t F_RESTART_request_sequence[] = {
 
 static int
 dissect_ftam_F_RESTART_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_RESTART_request_sequence, hf_index, ett_ftam_F_RESTART_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_RESTART_request_sequence, hf_index, ett_ftam_F_RESTART_request);
 
   return offset;
 }
@@ -4370,7 +4370,7 @@ static int dissect_f_restart_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_RESTART_response_sequence[] = {
+static const ber_old_sequence_t F_RESTART_response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl },
   { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl },
@@ -4383,8 +4383,8 @@ static const ber_sequence_t F_RESTART_response_sequence[] = {
 
 static int
 dissect_ftam_F_RESTART_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_RESTART_response_sequence, hf_index, ett_ftam_F_RESTART_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_RESTART_response_sequence, hf_index, ett_ftam_F_RESTART_response);
 
   return offset;
 }
@@ -4406,7 +4406,7 @@ static const value_string ftam_Bulk_Data_PDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Bulk_Data_PDU_choice[] = {
+static const ber_old_choice_t Bulk_Data_PDU_choice[] = {
   {  32, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_f_read_request_impl },
   {  33, BER_CLASS_CON, 33, BER_FLAGS_IMPLTAG, dissect_f_write_request_impl },
   {  34, BER_CLASS_CON, 34, BER_FLAGS_IMPLTAG, dissect_f_data_end_request_impl },
@@ -4424,9 +4424,9 @@ dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 #line 725 "ftam.cnf"
   gint branch_taken;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU,
-                                 &branch_taken);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU,
+                                     &branch_taken);
 
 
   if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){
@@ -4456,7 +4456,7 @@ static int dissect_destination_file_directory(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_CHANGE_PREFIX_request_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_PREFIX_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reset_impl },
   { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_access_passwords },
@@ -4466,8 +4466,8 @@ static const ber_sequence_t F_CHANGE_PREFIX_request_sequence[] = {
 
 static int
 dissect_ftam_F_CHANGE_PREFIX_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_PREFIX_request_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_PREFIX_request_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_request);
 
   return offset;
 }
@@ -4476,7 +4476,7 @@ static int dissect_f_Change_prefix_request_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t F_CHANGE_PREFIX_response_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_PREFIX_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -4485,8 +4485,8 @@ static const ber_sequence_t F_CHANGE_PREFIX_response_sequence[] = {
 
 static int
 dissect_ftam_F_CHANGE_PREFIX_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_PREFIX_response_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_PREFIX_response_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_response);
 
   return offset;
 }
@@ -4524,7 +4524,7 @@ static const value_string ftam_T_string_value_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_string_value_item_choice[] = {
+static const ber_old_choice_t T_string_value_item_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_substring_match_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_any_match_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_number_of_characters_match_impl },
@@ -4533,9 +4533,9 @@ static const ber_choice_t T_string_value_item_choice[] = {
 
 static int
 dissect_ftam_T_string_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item,
+                                     NULL);
 
   return offset;
 }
@@ -4544,14 +4544,14 @@ static int dissect_string_value_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_string_value_sequence_of[1] = {
+static const ber_old_sequence_t T_string_value_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_string_value_item },
 };
 
 static int
 dissect_ftam_T_string_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_string_value_sequence_of, hf_index, ett_ftam_T_string_value);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_string_value_sequence_of, hf_index, ett_ftam_T_string_value);
 
   return offset;
 }
@@ -4560,7 +4560,7 @@ static int dissect_string_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t String_Pattern_sequence[] = {
+static const ber_old_sequence_t String_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_string_value_impl },
   { 0, 0, 0, NULL }
@@ -4568,8 +4568,8 @@ static const ber_sequence_t String_Pattern_sequence[] = {
 
 static int
 dissect_ftam_String_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   String_Pattern_sequence, hf_index, ett_ftam_String_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       String_Pattern_sequence, hf_index, ett_ftam_String_Pattern);
 
   return offset;
 }
@@ -4590,7 +4590,7 @@ static const value_string ftam_T_pathname_value_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_pathname_value_item_choice[] = {
+static const ber_old_choice_t T_pathname_value_item_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_string_match_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_any_match_impl },
   { 0, 0, 0, 0, NULL }
@@ -4598,9 +4598,9 @@ static const ber_choice_t T_pathname_value_item_choice[] = {
 
 static int
 dissect_ftam_T_pathname_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item,
+                                     NULL);
 
   return offset;
 }
@@ -4609,14 +4609,14 @@ static int dissect_pathname_value_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_pathname_value_sequence_of[1] = {
+static const ber_old_sequence_t T_pathname_value_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname_value_item },
 };
 
 static int
 dissect_ftam_T_pathname_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_pathname_value_sequence_of, hf_index, ett_ftam_T_pathname_value);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_pathname_value_sequence_of, hf_index, ett_ftam_T_pathname_value);
 
   return offset;
 }
@@ -4625,7 +4625,7 @@ static int dissect_pathname_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Pathname_Pattern_sequence[] = {
+static const ber_old_sequence_t Pathname_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pathname_value_impl },
   { 0, 0, 0, NULL }
@@ -4633,8 +4633,8 @@ static const ber_sequence_t Pathname_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Pathname_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Pathname_Pattern_sequence, hf_index, ett_ftam_Pathname_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Pathname_Pattern_sequence, hf_index, ett_ftam_Pathname_Pattern);
 
   return offset;
 }
@@ -4673,7 +4673,7 @@ static int dissect_relational_comparision_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Integer_Pattern_sequence[] = {
+static const ber_old_sequence_t Integer_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relational_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_integer_value_impl },
   { 0, 0, 0, NULL }
@@ -4681,8 +4681,8 @@ static const ber_sequence_t Integer_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Integer_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Integer_Pattern_sequence, hf_index, ett_ftam_Integer_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Integer_Pattern_sequence, hf_index, ett_ftam_Integer_Pattern);
 
   return offset;
 }
@@ -4714,7 +4714,7 @@ static int dissect_significance_bitstring_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Bitstring_Pattern_sequence[] = {
+static const ber_old_sequence_t Bitstring_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_match_bitstring_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_significance_bitstring_impl },
@@ -4723,8 +4723,8 @@ static const ber_sequence_t Bitstring_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Bitstring_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Bitstring_Pattern_sequence, hf_index, ett_ftam_Bitstring_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Bitstring_Pattern_sequence, hf_index, ett_ftam_Bitstring_Pattern);
 
   return offset;
 }
@@ -4745,7 +4745,7 @@ static int dissect_object_identifier_value_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t Object_Identifier_Pattern_sequence[] = {
+static const ber_old_sequence_t Object_Identifier_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_object_identifier_value_impl },
   { 0, 0, 0, NULL }
@@ -4753,8 +4753,8 @@ static const ber_sequence_t Object_Identifier_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Object_Identifier_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Object_Identifier_Pattern_sequence, hf_index, ett_ftam_Object_Identifier_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Object_Identifier_Pattern_sequence, hf_index, ett_ftam_Object_Identifier_Pattern);
 
   return offset;
 }
@@ -4769,7 +4769,7 @@ static int dissect_abstract_Syntax_Pattern_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_constraint_set_abstract_Syntax_Pattern_sequence[] = {
+static const ber_old_sequence_t T_constraint_set_abstract_Syntax_Pattern_sequence[] = {
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_constraint_Set_Pattern_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abstract_Syntax_Pattern_impl },
   { 0, 0, 0, NULL }
@@ -4777,8 +4777,8 @@ static const ber_sequence_t T_constraint_set_abstract_Syntax_Pattern_sequence[]
 
 static int
 dissect_ftam_T_constraint_set_abstract_Syntax_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_constraint_set_abstract_Syntax_Pattern_sequence, hf_index, ett_ftam_T_constraint_set_abstract_Syntax_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_constraint_set_abstract_Syntax_Pattern_sequence, hf_index, ett_ftam_T_constraint_set_abstract_Syntax_Pattern);
 
   return offset;
 }
@@ -4793,7 +4793,7 @@ static const value_string ftam_Contents_Type_Pattern_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Contents_Type_Pattern_choice[] = {
+static const ber_old_choice_t Contents_Type_Pattern_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_document_type_Pattern_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_constraint_set_abstract_Syntax_Pattern_impl },
   { 0, 0, 0, 0, NULL }
@@ -4801,9 +4801,9 @@ static const ber_choice_t Contents_Type_Pattern_choice[] = {
 
 static int
 dissect_ftam_Contents_Type_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern,
+                                     NULL);
 
   return offset;
 }
@@ -4812,7 +4812,7 @@ static int dissect_contents_type_Pattern(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Date_and_Time_Pattern_sequence[] = {
+static const ber_old_sequence_t Date_and_Time_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relational_camparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_and_date_value_impl },
   { 0, 0, 0, NULL }
@@ -4820,8 +4820,8 @@ static const ber_sequence_t Date_and_Time_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Date_and_Time_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Date_and_Time_Pattern_sequence, hf_index, ett_ftam_Date_and_Time_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Date_and_Time_Pattern_sequence, hf_index, ett_ftam_Date_and_Time_Pattern);
 
   return offset;
 }
@@ -4860,7 +4860,7 @@ static int dissect_identity_of_last_attribute_modifier_Pattern_impl(proto_tree *
 }
 
 
-static const ber_sequence_t Boolean_Pattern_sequence[] = {
+static const ber_old_sequence_t Boolean_Pattern_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_boolean_value_impl },
   { 0, 0, 0, NULL }
@@ -4868,8 +4868,8 @@ static const ber_sequence_t Boolean_Pattern_sequence[] = {
 
 static int
 dissect_ftam_Boolean_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Boolean_Pattern_sequence, hf_index, ett_ftam_Boolean_Pattern);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Boolean_Pattern_sequence, hf_index, ett_ftam_Boolean_Pattern);
 
   return offset;
 }
@@ -4905,7 +4905,7 @@ static int dissect_extension_attribute_Pattern(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_extension_set_attribute_Patterns_item_sequence[] = {
+static const ber_old_sequence_t T_extension_set_attribute_Patterns_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute_extension_attribute_identifier },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_Pattern },
   { 0, 0, 0, NULL }
@@ -4913,8 +4913,8 @@ static const ber_sequence_t T_extension_set_attribute_Patterns_item_sequence[] =
 
 static int
 dissect_ftam_T_extension_set_attribute_Patterns_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_extension_set_attribute_Patterns_item_sequence, hf_index, ett_ftam_T_extension_set_attribute_Patterns_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_extension_set_attribute_Patterns_item_sequence, hf_index, ett_ftam_T_extension_set_attribute_Patterns_item);
 
   return offset;
 }
@@ -4923,14 +4923,14 @@ static int dissect_extension_set_attribute_Patterns_item(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t T_extension_set_attribute_Patterns_sequence_of[1] = {
+static const ber_old_sequence_t T_extension_set_attribute_Patterns_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extension_set_attribute_Patterns_item },
 };
 
 static int
 dissect_ftam_T_extension_set_attribute_Patterns(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_extension_set_attribute_Patterns_sequence_of, hf_index, ett_ftam_T_extension_set_attribute_Patterns);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_extension_set_attribute_Patterns_sequence_of, hf_index, ett_ftam_T_extension_set_attribute_Patterns);
 
   return offset;
 }
@@ -4939,7 +4939,7 @@ static int dissect_extension_set_attribute_Patterns_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t Attribute_Extensions_Pattern_item_sequence[] = {
+static const ber_old_sequence_t Attribute_Extensions_Pattern_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_extension_set_attribute_Patterns_impl },
   { 0, 0, 0, NULL }
@@ -4947,8 +4947,8 @@ static const ber_sequence_t Attribute_Extensions_Pattern_item_sequence[] = {
 
 static int
 dissect_ftam_Attribute_Extensions_Pattern_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_Extensions_Pattern_item_sequence, hf_index, ett_ftam_Attribute_Extensions_Pattern_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_Extensions_Pattern_item_sequence, hf_index, ett_ftam_Attribute_Extensions_Pattern_item);
 
   return offset;
 }
@@ -4957,14 +4957,14 @@ static int dissect_Attribute_Extensions_Pattern_item(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t Attribute_Extensions_Pattern_sequence_of[1] = {
+static const ber_old_sequence_t Attribute_Extensions_Pattern_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extensions_Pattern_item },
 };
 
 static int
 dissect_ftam_Attribute_Extensions_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Attribute_Extensions_Pattern_sequence_of, hf_index, ett_ftam_Attribute_Extensions_Pattern);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Attribute_Extensions_Pattern_sequence_of, hf_index, ett_ftam_Attribute_Extensions_Pattern);
 
   return offset;
 }
@@ -4998,7 +4998,7 @@ static const value_string ftam_AND_Set_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AND_Set_item_choice[] = {
+static const ber_old_choice_t AND_Set_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pathname_Pattern_impl },
   {  18, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_object_type_Pattern_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_permitted_actions_Pattern_impl },
@@ -5025,9 +5025,9 @@ static const ber_choice_t AND_Set_item_choice[] = {
 
 static int
 dissect_ftam_AND_Set_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item,
+                                     NULL);
 
   return offset;
 }
@@ -5036,14 +5036,14 @@ static int dissect_AND_Set_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AND_Set_sequence_of[1] = {
+static const ber_old_sequence_t AND_Set_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AND_Set_item },
 };
 
 static int
 dissect_ftam_AND_Set(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AND_Set_sequence_of, hf_index, ett_ftam_AND_Set);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AND_Set_sequence_of, hf_index, ett_ftam_AND_Set);
 
   return offset;
 }
@@ -5055,7 +5055,7 @@ static int dissect_Attribute_Value_Assertions_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t Attribute_Value_Assertions_sequence_of[1] = {
+static const ber_old_sequence_t Attribute_Value_Assertions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Value_Assertions_item },
 };
 
@@ -5107,7 +5107,7 @@ static int dissect_retrieval_scope_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Scope_item_sequence[] = {
+static const ber_old_sequence_t Scope_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_root_directory },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_retrieval_scope_impl },
   { 0, 0, 0, NULL }
@@ -5115,8 +5115,8 @@ static const ber_sequence_t Scope_item_sequence[] = {
 
 static int
 dissect_ftam_Scope_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Scope_item_sequence, hf_index, ett_ftam_Scope_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Scope_item_sequence, hf_index, ett_ftam_Scope_item);
 
   return offset;
 }
@@ -5125,7 +5125,7 @@ static int dissect_Scope_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Scope_sequence_of[1] = {
+static const ber_old_sequence_t Scope_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Scope_item },
 };
 
@@ -5144,7 +5144,7 @@ dissect_ftam_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Scope_sequence_of, hf_index, ett_ftam_Scope);
 
 
@@ -5156,7 +5156,7 @@ static int dissect_scope(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t F_LIST_request_sequence[] = {
+static const ber_old_sequence_t F_LIST_request_sequence[] = {
   { BER_CLASS_APP, 26, BER_FLAGS_NOOWNTAG, dissect_attribute_value_asset_tions },
   { BER_CLASS_APP, 28, BER_FLAGS_NOOWNTAG, dissect_scope },
   { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_access_passwords },
@@ -5168,8 +5168,8 @@ static const ber_sequence_t F_LIST_request_sequence[] = {
 
 static int
 dissect_ftam_F_LIST_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LIST_request_sequence, hf_index, ett_ftam_F_LIST_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LIST_request_sequence, hf_index, ett_ftam_F_LIST_request);
 
   return offset;
 }
@@ -5178,7 +5178,7 @@ static int dissect_f_list_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Objects_Attributes_List_sequence_of[1] = {
+static const ber_old_sequence_t Objects_Attributes_List_sequence_of[1] = {
   { BER_CLASS_APP, 18, BER_FLAGS_NOOWNTAG, dissect_Objects_Attributes_List_item },
 };
 
@@ -5197,7 +5197,7 @@ dissect_ftam_Objects_Attributes_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_sequence_of(TRUE,  actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
                                    Objects_Attributes_List_sequence_of, hf_index, ett_ftam_Objects_Attributes_List);
 
 
@@ -5210,7 +5210,7 @@ static int dissect_objects_attributes_list(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t F_LIST_response_sequence[] = {
+static const ber_old_sequence_t F_LIST_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_objects_attributes_list },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -5219,8 +5219,8 @@ static const ber_sequence_t F_LIST_response_sequence[] = {
 
 static int
 dissect_ftam_F_LIST_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LIST_response_sequence, hf_index, ett_ftam_F_LIST_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LIST_response_sequence, hf_index, ett_ftam_F_LIST_response);
 
   return offset;
 }
@@ -5229,7 +5229,7 @@ static int dissect_f_list_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_GROUP_SELECT_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_SELECT_request_sequence[] = {
   { BER_CLASS_APP, 26, BER_FLAGS_NOOWNTAG, dissect_attribute_value_assertions },
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access },
   { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_access_passwords },
@@ -5244,8 +5244,8 @@ static const ber_sequence_t F_GROUP_SELECT_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_SELECT_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_SELECT_request_sequence, hf_index, ett_ftam_F_GROUP_SELECT_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_SELECT_request_sequence, hf_index, ett_ftam_F_GROUP_SELECT_request);
 
   return offset;
 }
@@ -5254,7 +5254,7 @@ static int dissect_f_group_select_request_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t F_GROUP_SELECT_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_SELECT_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -5263,8 +5263,8 @@ static const ber_sequence_t F_GROUP_SELECT_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_SELECT_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_SELECT_response_sequence, hf_index, ett_ftam_F_GROUP_SELECT_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_SELECT_response_sequence, hf_index, ett_ftam_F_GROUP_SELECT_response);
 
   return offset;
 }
@@ -5307,7 +5307,7 @@ static int dissect_request_Operation_result(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_GROUP_DELETE_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_DELETE_request_sequence[] = {
   { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_Operation_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
@@ -5315,8 +5315,8 @@ static const ber_sequence_t F_GROUP_DELETE_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_DELETE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_DELETE_request_sequence, hf_index, ett_ftam_F_GROUP_DELETE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_DELETE_request_sequence, hf_index, ett_ftam_F_GROUP_DELETE_request);
 
   return offset;
 }
@@ -5325,14 +5325,14 @@ static int dissect_f_group_delete_request_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Pathname_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Pathname_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_success_Object_names_item },
 };
 
 static int
 dissect_ftam_SEQUENCE_OF_Pathname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Pathname_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Pathname);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Pathname_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Pathname);
 
   return offset;
 }
@@ -5347,7 +5347,7 @@ static const value_string ftam_Operation_Result_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Operation_Result_choice[] = {
+static const ber_old_choice_t Operation_Result_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_success_Object_count_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_success_Object_names_impl },
   { 0, 0, 0, 0, NULL }
@@ -5368,7 +5368,7 @@ dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL);
 
 
@@ -5379,7 +5379,7 @@ static int dissect_operation_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t F_GROUP_DELETE_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_DELETE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging },
   { BER_CLASS_APP, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_operation_result },
@@ -5390,8 +5390,8 @@ static const ber_sequence_t F_GROUP_DELETE_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_DELETE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_DELETE_response_sequence, hf_index, ett_ftam_F_GROUP_DELETE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_DELETE_response_sequence, hf_index, ett_ftam_F_GROUP_DELETE_response);
 
   return offset;
 }
@@ -5419,7 +5419,7 @@ static int dissect_error_action_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t F_GROUP_MOVE_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_MOVE_request_sequence[] = {
   { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl },
   { BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_error_action_impl },
@@ -5433,8 +5433,8 @@ static const ber_sequence_t F_GROUP_MOVE_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_MOVE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_MOVE_request_sequence, hf_index, ett_ftam_F_GROUP_MOVE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_MOVE_request_sequence, hf_index, ett_ftam_F_GROUP_MOVE_request);
 
   return offset;
 }
@@ -5443,7 +5443,7 @@ static int dissect_f_group_move_request_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_GROUP_MOVE_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_MOVE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_operation_result },
@@ -5453,8 +5453,8 @@ static const ber_sequence_t F_GROUP_MOVE_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_MOVE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_MOVE_response_sequence, hf_index, ett_ftam_F_GROUP_MOVE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_MOVE_response_sequence, hf_index, ett_ftam_F_GROUP_MOVE_response);
 
   return offset;
 }
@@ -5463,7 +5463,7 @@ static int dissect_f_group_move_response_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_GROUP_COPY_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_COPY_request_sequence[] = {
   { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_action_impl },
@@ -5477,8 +5477,8 @@ static const ber_sequence_t F_GROUP_COPY_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_COPY_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_COPY_request_sequence, hf_index, ett_ftam_F_GROUP_COPY_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_COPY_request_sequence, hf_index, ett_ftam_F_GROUP_COPY_request);
 
   return offset;
 }
@@ -5487,7 +5487,7 @@ static int dissect_f_group_copy_request_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_GROUP_COPY_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_COPY_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_operation_result },
@@ -5497,8 +5497,8 @@ static const ber_sequence_t F_GROUP_COPY_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_COPY_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_COPY_response_sequence, hf_index, ett_ftam_F_GROUP_COPY_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_COPY_response_sequence, hf_index, ett_ftam_F_GROUP_COPY_response);
 
   return offset;
 }
@@ -5507,7 +5507,7 @@ static int dissect_f_group_copy_response_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_GROUP_LIST_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_LIST_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl },
   { 0, 0, 0, NULL }
@@ -5515,8 +5515,8 @@ static const ber_sequence_t F_GROUP_LIST_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_LIST_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_LIST_request_sequence, hf_index, ett_ftam_F_GROUP_LIST_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_LIST_request_sequence, hf_index, ett_ftam_F_GROUP_LIST_request);
 
   return offset;
 }
@@ -5525,7 +5525,7 @@ static int dissect_f_group_list_request_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t F_GROUP_LIST_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_LIST_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_objects_attributes_list },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -5534,8 +5534,8 @@ static const ber_sequence_t F_GROUP_LIST_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_LIST_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_LIST_response_sequence, hf_index, ett_ftam_F_GROUP_LIST_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_LIST_response_sequence, hf_index, ett_ftam_F_GROUP_LIST_response);
 
   return offset;
 }
@@ -5544,7 +5544,7 @@ static int dissect_f_group_list_response_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_request_sequence[] = {
+static const ber_old_sequence_t F_GROUP_CHANGE_ATTRIB_request_sequence[] = {
   { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_action_impl },
   { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_Operation_result },
@@ -5554,8 +5554,8 @@ static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_request_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_CHANGE_ATTRIB_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_request);
 
   return offset;
 }
@@ -5564,7 +5564,7 @@ static int dissect_f_group_Change_attrib_request_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_response_sequence[] = {
+static const ber_old_sequence_t F_GROUP_CHANGE_ATTRIB_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_operation_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
@@ -5574,8 +5574,8 @@ static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_response_sequence[] = {
 
 static int
 dissect_ftam_F_GROUP_CHANGE_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_GROUP_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_GROUP_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_response);
 
   return offset;
 }
@@ -5584,15 +5584,15 @@ static int dissect_f_group_Change_attrib_response_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t F_SELECT_ANOTHER_request_sequence[] = {
+static const ber_old_sequence_t F_SELECT_ANOTHER_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_SELECT_ANOTHER_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_SELECT_ANOTHER_request_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_SELECT_ANOTHER_request_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_request);
 
   return offset;
 }
@@ -5601,7 +5601,7 @@ static int dissect_f_select_another_request_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t F_SELECT_ANOTHER_response_sequence[] = {
+static const ber_old_sequence_t F_SELECT_ANOTHER_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_last_member_indicator_impl },
@@ -5613,8 +5613,8 @@ static const ber_sequence_t F_SELECT_ANOTHER_response_sequence[] = {
 
 static int
 dissect_ftam_F_SELECT_ANOTHER_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_SELECT_ANOTHER_response_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_SELECT_ANOTHER_response_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_response);
 
   return offset;
 }
@@ -5623,7 +5623,7 @@ static int dissect_f_select_another_response_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t F_CREATE_DIRECTORY_request_sequence[] = {
+static const ber_old_sequence_t F_CREATE_DIRECTORY_request_sequence[] = {
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
   { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password },
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access },
@@ -5634,8 +5634,8 @@ static const ber_sequence_t F_CREATE_DIRECTORY_request_sequence[] = {
 
 static int
 dissect_ftam_F_CREATE_DIRECTORY_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CREATE_DIRECTORY_request_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CREATE_DIRECTORY_request_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_request);
 
   return offset;
 }
@@ -5644,7 +5644,7 @@ static int dissect_f_create_directory_request_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t F_CREATE_DIRECTORY_response_sequence[] = {
+static const ber_old_sequence_t F_CREATE_DIRECTORY_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
@@ -5655,8 +5655,8 @@ static const ber_sequence_t F_CREATE_DIRECTORY_response_sequence[] = {
 
 static int
 dissect_ftam_F_CREATE_DIRECTORY_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CREATE_DIRECTORY_response_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CREATE_DIRECTORY_response_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_response);
 
   return offset;
 }
@@ -5665,7 +5665,7 @@ static int dissect_f_create_directory_response_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t F_LINK_request_sequence[] = {
+static const ber_old_sequence_t F_LINK_request_sequence[] = {
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_target_object },
   { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password },
@@ -5680,8 +5680,8 @@ static const ber_sequence_t F_LINK_request_sequence[] = {
 
 static int
 dissect_ftam_F_LINK_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LINK_request_sequence, hf_index, ett_ftam_F_LINK_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LINK_request_sequence, hf_index, ett_ftam_F_LINK_request);
 
   return offset;
 }
@@ -5690,7 +5690,7 @@ static int dissect_f_link_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_LINK_response_sequence[] = {
+static const ber_old_sequence_t F_LINK_response_sequence[] = {
   { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes },
@@ -5702,8 +5702,8 @@ static const ber_sequence_t F_LINK_response_sequence[] = {
 
 static int
 dissect_ftam_F_LINK_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_LINK_response_sequence, hf_index, ett_ftam_F_LINK_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_LINK_response_sequence, hf_index, ett_ftam_F_LINK_response);
 
   return offset;
 }
@@ -5712,15 +5712,15 @@ static int dissect_f_link_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_UNLINK_request_sequence[] = {
+static const ber_old_sequence_t F_UNLINK_request_sequence[] = {
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_UNLINK_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_UNLINK_request_sequence, hf_index, ett_ftam_F_UNLINK_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_UNLINK_request_sequence, hf_index, ett_ftam_F_UNLINK_request);
 
   return offset;
 }
@@ -5729,7 +5729,7 @@ static int dissect_f_unlink_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t F_UNLINK_response_sequence[] = {
+static const ber_old_sequence_t F_UNLINK_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging },
@@ -5739,8 +5739,8 @@ static const ber_sequence_t F_UNLINK_response_sequence[] = {
 
 static int
 dissect_ftam_F_UNLINK_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_UNLINK_response_sequence, hf_index, ett_ftam_F_UNLINK_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_UNLINK_response_sequence, hf_index, ett_ftam_F_UNLINK_response);
 
   return offset;
 }
@@ -5749,7 +5749,7 @@ static int dissect_f_unlink_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t F_READ_LINK_ATTRIB_request_sequence[] = {
+static const ber_old_sequence_t F_READ_LINK_ATTRIB_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl },
   { 0, 0, 0, NULL }
@@ -5757,8 +5757,8 @@ static const ber_sequence_t F_READ_LINK_ATTRIB_request_sequence[] = {
 
 static int
 dissect_ftam_F_READ_LINK_ATTRIB_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_READ_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_READ_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_request);
 
   return offset;
 }
@@ -5767,7 +5767,7 @@ static int dissect_f_read_link_attrib_request_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t F_READ_LINK_ATTRIB_response_sequence[] = {
+static const ber_old_sequence_t F_READ_LINK_ATTRIB_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_read_link_attributes },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -5776,8 +5776,8 @@ static const ber_sequence_t F_READ_LINK_ATTRIB_response_sequence[] = {
 
 static int
 dissect_ftam_F_READ_LINK_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_READ_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_READ_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_response);
 
   return offset;
 }
@@ -5786,15 +5786,15 @@ static int dissect_f_read_link_attrib_response_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t F_CHANGE_LINK_ATTRIB_request_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_LINK_ATTRIB_request_sequence[] = {
   { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_ftam_F_CHANGE_LINK_ATTRIB_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_request);
 
   return offset;
 }
@@ -5803,7 +5803,7 @@ static int dissect_f_Change_link_attrib_request_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t F_CHANGE_LINK_ATTRIB_response_sequence[] = {
+static const ber_old_sequence_t F_CHANGE_LINK_ATTRIB_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes },
   { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic },
@@ -5812,8 +5812,8 @@ static const ber_sequence_t F_CHANGE_LINK_ATTRIB_response_sequence[] = {
 
 static int
 dissect_ftam_F_CHANGE_LINK_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHANGE_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHANGE_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_response);
 
   return offset;
 }
@@ -5822,7 +5822,7 @@ static int dissect_f_Change_Iink_attrib_response_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t F_MOVE_request_sequence[] = {
+static const ber_old_sequence_t F_MOVE_request_sequence[] = {
   { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl },
   { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password },
@@ -5834,8 +5834,8 @@ static const ber_sequence_t F_MOVE_request_sequence[] = {
 
 static int
 dissect_ftam_F_MOVE_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_MOVE_request_sequence, hf_index, ett_ftam_F_MOVE_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_MOVE_request_sequence, hf_index, ett_ftam_F_MOVE_request);
 
   return offset;
 }
@@ -5844,7 +5844,7 @@ static int dissect_f_move_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_MOVE_response_sequence[] = {
+static const ber_old_sequence_t F_MOVE_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes },
@@ -5854,8 +5854,8 @@ static const ber_sequence_t F_MOVE_response_sequence[] = {
 
 static int
 dissect_ftam_F_MOVE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_MOVE_response_sequence, hf_index, ett_ftam_F_MOVE_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_MOVE_response_sequence, hf_index, ett_ftam_F_MOVE_response);
 
   return offset;
 }
@@ -5864,7 +5864,7 @@ static int dissect_f_move_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_COPY_request_sequence[] = {
+static const ber_old_sequence_t F_COPY_request_sequence[] = {
   { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl },
   { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password },
@@ -5876,8 +5876,8 @@ static const ber_sequence_t F_COPY_request_sequence[] = {
 
 static int
 dissect_ftam_F_COPY_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_COPY_request_sequence, hf_index, ett_ftam_F_COPY_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_COPY_request_sequence, hf_index, ett_ftam_F_COPY_request);
 
   return offset;
 }
@@ -5886,7 +5886,7 @@ static int dissect_f_copy_request_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t F_COPY_response_sequence[] = {
+static const ber_old_sequence_t F_COPY_response_sequence[] = {
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result },
   { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory },
   { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes },
@@ -5896,8 +5896,8 @@ static const ber_sequence_t F_COPY_response_sequence[] = {
 
 static int
 dissect_ftam_F_COPY_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_COPY_response_sequence, hf_index, ett_ftam_F_COPY_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_COPY_response_sequence, hf_index, ett_ftam_F_COPY_response);
 
   return offset;
 }
@@ -5942,7 +5942,7 @@ static const value_string ftam_FSM_PDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FSM_PDU_choice[] = {
+static const ber_old_choice_t FSM_PDU_choice[] = {
   {  41, BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_f_Change_prefix_request_impl },
   {  42, BER_CLASS_CON, 42, BER_FLAGS_IMPLTAG, dissect_f_Change_prefix_response_impl },
   {  43, BER_CLASS_CON, 43, BER_FLAGS_IMPLTAG, dissect_f_list_request_impl },
@@ -5983,9 +5983,9 @@ dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 #line 739 "ftam.cnf"
   gint branch_taken;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU,
-                                 &branch_taken);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU,
+                                     &branch_taken);
 
 
   if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){
@@ -6011,7 +6011,7 @@ static const value_string ftam_PDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PDU_choice[] = {
+static const ber_old_choice_t PDU_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fTAM_Regime_PDU },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_file_PDU },
   {   2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_bulk_Data_PDU },
@@ -6022,15 +6022,15 @@ static const ber_choice_t PDU_choice[] = {
 
 static int
 dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PDU_choice, hf_index, ett_ftam_PDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PDU_choice, hf_index, ett_ftam_PDU,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t F_CHECK_request_sequence[] = {
+static const ber_old_sequence_t F_CHECK_request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl },
   { 0, 0, 0, NULL }
@@ -6038,14 +6038,14 @@ static const ber_sequence_t F_CHECK_request_sequence[] = {
 
 static int
 dissect_ftam_F_CHECK_request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHECK_request_sequence, hf_index, ett_ftam_F_CHECK_request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHECK_request_sequence, hf_index, ett_ftam_F_CHECK_request);
 
   return offset;
 }
 
 
-static const ber_sequence_t F_CHECK_response_sequence[] = {
+static const ber_old_sequence_t F_CHECK_response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl },
   { 0, 0, 0, NULL }
@@ -6053,21 +6053,21 @@ static const ber_sequence_t F_CHECK_response_sequence[] = {
 
 static int
 dissect_ftam_F_CHECK_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   F_CHECK_response_sequence, hf_index, ett_ftam_F_CHECK_response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       F_CHECK_response_sequence, hf_index, ett_ftam_F_CHECK_response);
 
   return offset;
 }
 
 
-static const ber_sequence_t OR_Set_sequence_of[1] = {
+static const ber_old_sequence_t OR_Set_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_OR_Set_item },
 };
 
 static int
 dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OR_Set_sequence_of, hf_index, ett_ftam_OR_Set);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OR_Set_sequence_of, hf_index, ett_ftam_OR_Set);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ftbp.c b/epan/dissectors/packet-ftbp.c
index b669adc113..77dc5313b3 100644
--- a/epan/dissectors/packet-ftbp.c
+++ b/epan/dissectors/packet-ftbp.c
@@ -266,7 +266,7 @@ static const value_string ftbp_Pathname_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Pathname_Attribute_choice[] = {
+static const ber_old_choice_t Pathname_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_incomplete_pathname_impl },
   {  23, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_complete_pathname_impl },
   { 0, 0, 0, 0, NULL }
@@ -274,9 +274,9 @@ static const ber_choice_t Pathname_Attribute_choice[] = {
 
 static int
 dissect_ftbp_Pathname_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Pathname_Attribute_choice, hf_index, ett_ftbp_Pathname_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Pathname_Attribute_choice, hf_index, ett_ftbp_Pathname_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -314,7 +314,7 @@ static int dissect_graphic_string(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t PathnameandVersion_sequence[] = {
+static const ber_old_sequence_t PathnameandVersion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_file_version_impl },
   { 0, 0, 0, NULL }
@@ -322,8 +322,8 @@ static const ber_sequence_t PathnameandVersion_sequence[] = {
 
 static int
 dissect_ftbp_PathnameandVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PathnameandVersion_sequence, hf_index, ett_ftbp_PathnameandVersion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PathnameandVersion_sequence, hf_index, ett_ftbp_PathnameandVersion);
 
   return offset;
 }
@@ -362,7 +362,7 @@ static int dissect_user_relative_identifier_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t MessageReference_set[] = {
+static const ber_old_sequence_t MessageReference_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_user_relative_identifier_impl },
   { 0, 0, 0, NULL }
@@ -370,8 +370,8 @@ static const ber_sequence_t MessageReference_set[] = {
 
 static int
 dissect_ftbp_MessageReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageReference_set, hf_index, ett_ftbp_MessageReference);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageReference_set, hf_index, ett_ftbp_MessageReference);
 
   return offset;
 }
@@ -393,7 +393,7 @@ static int dissect_body_part_reference_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CrossReference_sequence[] = {
+static const ber_old_sequence_t CrossReference_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_application_cross_reference_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_message_reference_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_reference_impl },
@@ -402,8 +402,8 @@ static const ber_sequence_t CrossReference_sequence[] = {
 
 static int
 dissect_ftbp_CrossReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CrossReference_sequence, hf_index, ett_ftbp_CrossReference);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CrossReference_sequence, hf_index, ett_ftbp_CrossReference);
 
   return offset;
 }
@@ -418,7 +418,7 @@ static const value_string ftbp_FileIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FileIdentifier_choice[] = {
+static const ber_old_choice_t FileIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pathname_and_version_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cross_reference_impl },
   { 0, 0, 0, 0, NULL }
@@ -426,9 +426,9 @@ static const ber_choice_t FileIdentifier_choice[] = {
 
 static int
 dissect_ftbp_FileIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FileIdentifier_choice, hf_index, ett_ftbp_FileIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FileIdentifier_choice, hf_index, ett_ftbp_FileIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -464,7 +464,7 @@ static const value_string ftbp_Relationship_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Relationship_choice[] = {
+static const ber_old_choice_t Relationship_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_explicit_relationship_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptive_relationship_impl },
   { 0, 0, 0, 0, NULL }
@@ -472,9 +472,9 @@ static const ber_choice_t Relationship_choice[] = {
 
 static int
 dissect_ftbp_Relationship(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Relationship_choice, hf_index, ett_ftbp_Relationship,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Relationship_choice, hf_index, ett_ftbp_Relationship,
+                                     NULL);
 
   return offset;
 }
@@ -483,7 +483,7 @@ static int dissect_relationship(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t RelatedStoredFile_item_sequence[] = {
+static const ber_old_sequence_t RelatedStoredFile_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_file_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_relationship },
   { 0, 0, 0, NULL }
@@ -491,8 +491,8 @@ static const ber_sequence_t RelatedStoredFile_item_sequence[] = {
 
 static int
 dissect_ftbp_RelatedStoredFile_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RelatedStoredFile_item_sequence, hf_index, ett_ftbp_RelatedStoredFile_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RelatedStoredFile_item_sequence, hf_index, ett_ftbp_RelatedStoredFile_item);
 
   return offset;
 }
@@ -501,14 +501,14 @@ static int dissect_RelatedStoredFile_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t RelatedStoredFile_set_of[1] = {
+static const ber_old_sequence_t RelatedStoredFile_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelatedStoredFile_item },
 };
 
 static int
 dissect_ftbp_RelatedStoredFile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RelatedStoredFile_set_of, hf_index, ett_ftbp_RelatedStoredFile);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RelatedStoredFile_set_of, hf_index, ett_ftbp_RelatedStoredFile);
 
   return offset;
 }
@@ -544,7 +544,7 @@ static int dissect_parameter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_document_type_sequence[] = {
+static const ber_old_sequence_t T_document_type_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_document_type_name },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_parameter_impl },
   { 0, 0, 0, NULL }
@@ -552,8 +552,8 @@ static const ber_sequence_t T_document_type_sequence[] = {
 
 static int
 dissect_ftbp_T_document_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_document_type_sequence, hf_index, ett_ftbp_T_document_type);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_document_type_sequence, hf_index, ett_ftbp_T_document_type);
 
   return offset;
 }
@@ -586,7 +586,7 @@ static int dissect_abstract_syntax_name(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
+static const ber_old_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_constraint_set_name },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax_name },
   { 0, 0, 0, NULL }
@@ -594,8 +594,8 @@ static const ber_sequence_t T_constraint_set_and_abstract_syntax_sequence[] = {
 
 static int
 dissect_ftbp_T_constraint_set_and_abstract_syntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_constraint_set_and_abstract_syntax_sequence, hf_index, ett_ftbp_T_constraint_set_and_abstract_syntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_constraint_set_and_abstract_syntax_sequence, hf_index, ett_ftbp_T_constraint_set_and_abstract_syntax);
 
   return offset;
 }
@@ -610,7 +610,7 @@ static const value_string ftbp_Contents_Type_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Contents_Type_Attribute_choice[] = {
+static const ber_old_choice_t Contents_Type_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_document_type_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_constraint_set_and_abstract_syntax_impl },
   { 0, 0, 0, 0, NULL }
@@ -618,9 +618,9 @@ static const ber_choice_t Contents_Type_Attribute_choice[] = {
 
 static int
 dissect_ftbp_Contents_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Contents_Type_Attribute_choice, hf_index, ett_ftbp_Contents_Type_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Contents_Type_Attribute_choice, hf_index, ett_ftbp_Contents_Type_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -656,14 +656,14 @@ static int dissect_compression_algorithm_id_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_descriptive_identifier_sequence_of[1] = {
+static const ber_old_sequence_t T_descriptive_identifier_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_descriptive_identifier_item },
 };
 
 static int
 dissect_ftbp_T_descriptive_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_descriptive_identifier_sequence_of, hf_index, ett_ftbp_T_descriptive_identifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_descriptive_identifier_sequence_of, hf_index, ett_ftbp_T_descriptive_identifier);
 
   return offset;
 }
@@ -678,7 +678,7 @@ static const value_string ftbp_GeneralIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GeneralIdentifier_choice[] = {
+static const ber_old_choice_t GeneralIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_registered_identifier_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptive_identifier_impl },
   { 0, 0, 0, 0, NULL }
@@ -686,9 +686,9 @@ static const ber_choice_t GeneralIdentifier_choice[] = {
 
 static int
 dissect_ftbp_GeneralIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GeneralIdentifier_choice, hf_index, ett_ftbp_GeneralIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GeneralIdentifier_choice, hf_index, ett_ftbp_GeneralIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -700,14 +700,14 @@ static int dissect_machine_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_user_visible_string_sequence_of[1] = {
+static const ber_old_sequence_t T_user_visible_string_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_user_visible_string_item },
 };
 
 static int
 dissect_ftbp_T_user_visible_string(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_user_visible_string_sequence_of, hf_index, ett_ftbp_T_user_visible_string);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_user_visible_string_sequence_of, hf_index, ett_ftbp_T_user_visible_string);
 
   return offset;
 }
@@ -716,7 +716,7 @@ static int dissect_user_visible_string_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t EnvironmentParameter_sequence[] = {
+static const ber_old_sequence_t EnvironmentParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_application_reference_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_machine_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_operating_system_impl },
@@ -726,8 +726,8 @@ static const ber_sequence_t EnvironmentParameter_sequence[] = {
 
 static int
 dissect_ftbp_EnvironmentParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EnvironmentParameter_sequence, hf_index, ett_ftbp_EnvironmentParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EnvironmentParameter_sequence, hf_index, ett_ftbp_EnvironmentParameter);
 
   return offset;
 }
@@ -749,7 +749,7 @@ static int dissect_compression_algorithm_param_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t CompressionParameter_sequence[] = {
+static const ber_old_sequence_t CompressionParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_compression_algorithm_id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_compression_algorithm_param_impl },
   { 0, 0, 0, NULL }
@@ -757,8 +757,8 @@ static const ber_sequence_t CompressionParameter_sequence[] = {
 
 static int
 dissect_ftbp_CompressionParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CompressionParameter_sequence, hf_index, ett_ftbp_CompressionParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CompressionParameter_sequence, hf_index, ett_ftbp_CompressionParameter);
 
   return offset;
 }
@@ -799,7 +799,7 @@ static const value_string ftbp_Account_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Account_Attribute_choice[] = {
+static const ber_old_choice_t Account_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_account_actual_values },
   { 0, 0, 0, 0, NULL }
@@ -807,9 +807,9 @@ static const ber_choice_t Account_Attribute_choice[] = {
 
 static int
 dissect_ftbp_Account_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Account_Attribute_choice, hf_index, ett_ftbp_Account_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Account_Attribute_choice, hf_index, ett_ftbp_Account_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -841,7 +841,7 @@ static const value_string ftbp_User_Identity_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t User_Identity_Attribute_choice[] = {
+static const ber_old_choice_t User_Identity_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_identity_actual_values },
   { 0, 0, 0, 0, NULL }
@@ -849,9 +849,9 @@ static const ber_choice_t User_Identity_Attribute_choice[] = {
 
 static int
 dissect_ftbp_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 User_Identity_Attribute_choice, hf_index, ett_ftbp_User_Identity_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     User_Identity_Attribute_choice, hf_index, ett_ftbp_User_Identity_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -900,7 +900,7 @@ static const value_string ftbp_Password_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Password_choice[] = {
+static const ber_old_choice_t Password_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_graphic_string },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_string },
   { 0, 0, 0, 0, NULL }
@@ -908,9 +908,9 @@ static const ber_choice_t Password_choice[] = {
 
 static int
 dissect_ftbp_Password(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Password_choice, hf_index, ett_ftbp_Password,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Password_choice, hf_index, ett_ftbp_Password,
+                                     NULL);
 
   return offset;
 }
@@ -946,14 +946,14 @@ static int dissect_Pass_Passwords_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Pass_Passwords_sequence_of[1] = {
+static const ber_old_sequence_t Pass_Passwords_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Pass_Passwords_item },
 };
 
 static int
 dissect_ftbp_Pass_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Pass_Passwords_sequence_of, hf_index, ett_ftbp_Pass_Passwords);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Pass_Passwords_sequence_of, hf_index, ett_ftbp_Pass_Passwords);
 
   return offset;
 }
@@ -962,7 +962,7 @@ static int dissect_pass_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Access_Passwords_sequence[] = {
+static const ber_old_sequence_t Access_Passwords_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_read_password_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_insert_password_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_replace_password_impl },
@@ -978,8 +978,8 @@ static const ber_sequence_t Access_Passwords_sequence[] = {
 
 static int
 dissect_ftbp_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Access_Passwords_sequence, hf_index, ett_ftbp_Access_Passwords);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Access_Passwords_sequence, hf_index, ett_ftbp_Access_Passwords);
 
   return offset;
 }
@@ -988,7 +988,7 @@ static int dissect_passwords_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Application_Entity_Title_sequence[] = {
+static const ber_old_sequence_t Application_Entity_Title_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_qualifier },
   { 0, 0, 0, NULL }
@@ -996,8 +996,8 @@ static const ber_sequence_t Application_Entity_Title_sequence[] = {
 
 static int
 dissect_ftbp_Application_Entity_Title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Application_Entity_Title_sequence, hf_index, ett_ftbp_Application_Entity_Title);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Application_Entity_Title_sequence, hf_index, ett_ftbp_Application_Entity_Title);
 
   return offset;
 }
@@ -1006,7 +1006,7 @@ static int dissect_location_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Access_Control_Element_sequence[] = {
+static const ber_old_sequence_t Access_Control_Element_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_action_list_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concurrency_access_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_identity_impl },
@@ -1017,8 +1017,8 @@ static const ber_sequence_t Access_Control_Element_sequence[] = {
 
 static int
 dissect_ftbp_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Access_Control_Element_sequence, hf_index, ett_ftbp_Access_Control_Element);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Access_Control_Element_sequence, hf_index, ett_ftbp_Access_Control_Element);
 
   return offset;
 }
@@ -1027,14 +1027,14 @@ static int dissect_actual_values_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Access_Control_Element_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values_item },
 };
 
 static int
 dissect_ftbp_SET_OF_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Access_Control_Element_set_of, hf_index, ett_ftbp_SET_OF_Access_Control_Element);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Access_Control_Element_set_of, hf_index, ett_ftbp_SET_OF_Access_Control_Element);
 
   return offset;
 }
@@ -1049,7 +1049,7 @@ static const value_string ftbp_Access_Control_Attribute_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Access_Control_Attribute_choice[] = {
+static const ber_old_choice_t Access_Control_Attribute_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_no_value_available_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actual_values_impl },
   { 0, 0, 0, 0, NULL }
@@ -1057,9 +1057,9 @@ static const ber_choice_t Access_Control_Attribute_choice[] = {
 
 static int
 dissect_ftbp_Access_Control_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Access_Control_Attribute_choice, hf_index, ett_ftbp_Access_Control_Attribute,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Access_Control_Attribute_choice, hf_index, ett_ftbp_Access_Control_Attribute,
+                                     NULL);
 
   return offset;
 }
@@ -1068,7 +1068,7 @@ static int dissect_access_control_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FileAttributes_sequence[] = {
+static const ber_old_sequence_t FileAttributes_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_storage_account_impl },
@@ -1092,8 +1092,8 @@ static const ber_sequence_t FileAttributes_sequence[] = {
 
 static int
 dissect_ftbp_FileAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileAttributes_sequence, hf_index, ett_ftbp_FileAttributes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileAttributes_sequence, hf_index, ett_ftbp_FileAttributes);
 
   return offset;
 }
@@ -1102,7 +1102,7 @@ static int dissect_file_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FileTransferParameters_sequence[] = {
+static const ber_old_sequence_t FileTransferParameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_related_stored_file_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_contents_type_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_environment_impl },
@@ -1114,21 +1114,21 @@ static const ber_sequence_t FileTransferParameters_sequence[] = {
 
 static int
 dissect_ftbp_FileTransferParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileTransferParameters_sequence, hf_index, ett_ftbp_FileTransferParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileTransferParameters_sequence, hf_index, ett_ftbp_FileTransferParameters);
 
   return offset;
 }
 
 
-static const ber_sequence_t FileTransferData_sequence_of[1] = {
+static const ber_old_sequence_t FileTransferData_sequence_of[1] = {
   { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_FileTransferData_item },
 };
 
 static int
 dissect_ftbp_FileTransferData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      FileTransferData_sequence_of, hf_index, ett_ftbp_FileTransferData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          FileTransferData_sequence_of, hf_index, ett_ftbp_FileTransferData);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index d0d3a79ce7..723d3b6c1c 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -610,7 +610,7 @@ static const value_string gnm_ProbableCause_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ProbableCause_choice[] = {
+static const ber_old_choice_t ProbableCause_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   { 0, 0, 0, 0, NULL }
@@ -618,9 +618,9 @@ static const ber_choice_t ProbableCause_choice[] = {
 
 static int
 dissect_gnm_ProbableCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ProbableCause_choice, hf_index, ett_gnm_ProbableCause,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ProbableCause_choice, hf_index, ett_gnm_ProbableCause,
+                                     NULL);
 
   return offset;
 }
@@ -678,27 +678,27 @@ static int dissect_AvailabilityStatus_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AvailabilityStatus_set_of[1] = {
+static const ber_old_sequence_t AvailabilityStatus_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_AvailabilityStatus_item },
 };
 
 static int
 dissect_gnm_AvailabilityStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AvailabilityStatus_set_of, hf_index, ett_gnm_AvailabilityStatus);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AvailabilityStatus_set_of, hf_index, ett_gnm_AvailabilityStatus);
 
   return offset;
 }
 
 
-static const ber_sequence_t AttributeList_set_of[1] = {
+static const ber_old_sequence_t AttributeList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributeList_item },
 };
 
 static int
 dissect_gnm_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AttributeList_set_of, hf_index, ett_gnm_AttributeList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AttributeList_set_of, hf_index, ett_gnm_AttributeList);
 
   return offset;
 }
@@ -737,7 +737,7 @@ static int dissect_information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ManagementExtension_sequence[] = {
+static const ber_old_sequence_t ManagementExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_identifier },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_significance_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_information_impl },
@@ -746,8 +746,8 @@ static const ber_sequence_t ManagementExtension_sequence[] = {
 
 static int
 dissect_gnm_ManagementExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ManagementExtension_sequence, hf_index, ett_gnm_ManagementExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ManagementExtension_sequence, hf_index, ett_gnm_ManagementExtension);
 
   return offset;
 }
@@ -756,14 +756,14 @@ static int dissect_AdditionalInformation_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AdditionalInformation_set_of[1] = {
+static const ber_old_sequence_t AdditionalInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AdditionalInformation_item },
 };
 
 static int
 dissect_gnm_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AdditionalInformation_set_of, hf_index, ett_gnm_AdditionalInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AdditionalInformation_set_of, hf_index, ett_gnm_AdditionalInformation);
 
   return offset;
 }
@@ -793,14 +793,14 @@ static int dissect_ControlStatus_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ControlStatus_set_of[1] = {
+static const ber_old_sequence_t ControlStatus_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ControlStatus_item },
 };
 
 static int
 dissect_gnm_ControlStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ControlStatus_set_of, hf_index, ett_gnm_ControlStatus);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ControlStatus_set_of, hf_index, ett_gnm_ControlStatus);
 
   return offset;
 }
@@ -839,14 +839,14 @@ static int dissect_MappingList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MappingList_sequence_of[1] = {
+static const ber_old_sequence_t MappingList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_MappingList_item },
 };
 
 static int
 dissect_gnm_MappingList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MappingList_sequence_of, hf_index, ett_gnm_MappingList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MappingList_sequence_of, hf_index, ett_gnm_MappingList);
 
   return offset;
 }
@@ -855,14 +855,14 @@ static int dissect_mappingList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Packages_set_of[1] = {
+static const ber_old_sequence_t Packages_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_Packages_item },
 };
 
 static int
 dissect_gnm_Packages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 Packages_set_of, hf_index, ett_gnm_Packages);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     Packages_set_of, hf_index, ett_gnm_Packages);
 
   return offset;
 }
@@ -874,7 +874,7 @@ static const value_string gnm_SignalRate_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SignalRate_choice[] = {
+static const ber_old_choice_t SignalRate_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_objectClass_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_characteristicInformation_impl },
   { 0, 0, 0, 0, NULL }
@@ -882,9 +882,9 @@ static const ber_choice_t SignalRate_choice[] = {
 
 static int
 dissect_gnm_SignalRate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SignalRate_choice, hf_index, ett_gnm_SignalRate,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SignalRate_choice, hf_index, ett_gnm_SignalRate,
+                                     NULL);
 
   return offset;
 }
@@ -893,14 +893,14 @@ static int dissect_signalRate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SupportedTOClasses_set_of[1] = {
+static const ber_old_sequence_t SupportedTOClasses_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_SupportedTOClasses_item },
 };
 
 static int
 dissect_gnm_SupportedTOClasses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SupportedTOClasses_set_of, hf_index, ett_gnm_SupportedTOClasses);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SupportedTOClasses_set_of, hf_index, ett_gnm_SupportedTOClasses);
 
   return offset;
 }
@@ -926,27 +926,27 @@ static int dissect_softwareIdentifiers_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AcceptableCircuitPackTypeList_set_of[1] = {
+static const ber_old_sequence_t AcceptableCircuitPackTypeList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_AcceptableCircuitPackTypeList_item },
 };
 
 static int
 dissect_gnm_AcceptableCircuitPackTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AcceptableCircuitPackTypeList_set_of, hf_index, ett_gnm_AcceptableCircuitPackTypeList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AcceptableCircuitPackTypeList_set_of, hf_index, ett_gnm_AcceptableCircuitPackTypeList);
 
   return offset;
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ObjectInstance_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ObjectInstance_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_tpsAdded_item },
 };
 
 static int
 dissect_gnm_SEQUENCE_OF_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ObjectInstance_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_ObjectInstance);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ObjectInstance_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_ObjectInstance);
 
   return offset;
 }
@@ -967,7 +967,7 @@ static int dissect_softwareInstances_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AddedTps_sequence[] = {
+static const ber_old_sequence_t AddedTps_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_gtp },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tpsAdded },
   { 0, 0, 0, NULL }
@@ -975,8 +975,8 @@ static const ber_sequence_t AddedTps_sequence[] = {
 
 static int
 dissect_gnm_AddedTps(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddedTps_sequence, hf_index, ett_gnm_AddedTps);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddedTps_sequence, hf_index, ett_gnm_AddedTps);
 
   return offset;
 }
@@ -991,7 +991,7 @@ static const value_string gnm_ExplicitTP_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExplicitTP_choice[] = {
+static const ber_old_choice_t ExplicitTP_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_oneTPorGTP },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listofTPs },
   { 0, 0, 0, 0, NULL }
@@ -999,9 +999,9 @@ static const ber_choice_t ExplicitTP_choice[] = {
 
 static int
 dissect_gnm_ExplicitTP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExplicitTP_choice, hf_index, ett_gnm_ExplicitTP,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExplicitTP_choice, hf_index, ett_gnm_ExplicitTP,
+                                     NULL);
 
   return offset;
 }
@@ -1025,7 +1025,7 @@ static const value_string gnm_ToTermSpecifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ToTermSpecifier_choice[] = {
+static const ber_old_choice_t ToTermSpecifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_toTpOrGTP_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_toPool_impl },
   { 0, 0, 0, 0, NULL }
@@ -1033,9 +1033,9 @@ static const ber_choice_t ToTermSpecifier_choice[] = {
 
 static int
 dissect_gnm_ToTermSpecifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ToTermSpecifier_choice, hf_index, ett_gnm_ToTermSpecifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ToTermSpecifier_choice, hf_index, ett_gnm_ToTermSpecifier,
+                                     NULL);
 
   return offset;
 }
@@ -1044,14 +1044,14 @@ static int dissect_legs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_ToTermSpecifier_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ToTermSpecifier_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_legs_item },
 };
 
 static int
 dissect_gnm_SET_OF_ToTermSpecifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ToTermSpecifier_set_of, hf_index, ett_gnm_SET_OF_ToTermSpecifier);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ToTermSpecifier_set_of, hf_index, ett_gnm_SET_OF_ToTermSpecifier);
 
   return offset;
 }
@@ -1060,7 +1060,7 @@ static int dissect_legs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t AddLeg_sequence[] = {
+static const ber_old_sequence_t AddLeg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_mpCrossConnection },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_legs },
   { 0, 0, 0, NULL }
@@ -1068,8 +1068,8 @@ static const ber_sequence_t AddLeg_sequence[] = {
 
 static int
 dissect_gnm_AddLeg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddLeg_sequence, hf_index, ett_gnm_AddLeg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddLeg_sequence, hf_index, ett_gnm_AddLeg);
 
   return offset;
 }
@@ -1085,7 +1085,7 @@ static const value_string gnm_TerminationPointInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TerminationPointInformation_choice[] = {
+static const ber_old_choice_t TerminationPointInformation_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_tPOrGTP_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sourceTP_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sinkTP_impl },
@@ -1094,9 +1094,9 @@ static const ber_choice_t TerminationPointInformation_choice[] = {
 
 static int
 dissect_gnm_TerminationPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TerminationPointInformation_choice, hf_index, ett_gnm_TerminationPointInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TerminationPointInformation_choice, hf_index, ett_gnm_TerminationPointInformation,
+                                     NULL);
 
   return offset;
 }
@@ -1108,14 +1108,14 @@ static int dissect_tps_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_TerminationPointInformation_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_TerminationPointInformation_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_tpsAdded_item1 },
 };
 
 static int
 dissect_gnm_SEQUENCE_OF_TerminationPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_TerminationPointInformation_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_TerminationPointInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_TerminationPointInformation_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_TerminationPointInformation);
 
   return offset;
 }
@@ -1124,7 +1124,7 @@ static int dissect_tpsAdded1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t AddTpsToGtpInformation_item_sequence[] = {
+static const ber_old_sequence_t AddTpsToGtpInformation_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tpsAdded1 },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gtp },
   { 0, 0, 0, NULL }
@@ -1132,8 +1132,8 @@ static const ber_sequence_t AddTpsToGtpInformation_item_sequence[] = {
 
 static int
 dissect_gnm_AddTpsToGtpInformation_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddTpsToGtpInformation_item_sequence, hf_index, ett_gnm_AddTpsToGtpInformation_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddTpsToGtpInformation_item_sequence, hf_index, ett_gnm_AddTpsToGtpInformation_item);
 
   return offset;
 }
@@ -1142,14 +1142,14 @@ static int dissect_AddTpsToGtpInformation_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t AddTpsToGtpInformation_sequence_of[1] = {
+static const ber_old_sequence_t AddTpsToGtpInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AddTpsToGtpInformation_item },
 };
 
 static int
 dissect_gnm_AddTpsToGtpInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AddTpsToGtpInformation_sequence_of, hf_index, ett_gnm_AddTpsToGtpInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AddTpsToGtpInformation_sequence_of, hf_index, ett_gnm_AddTpsToGtpInformation);
 
   return offset;
 }
@@ -1191,7 +1191,7 @@ static const value_string gnm_ProblemCause_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ProblemCause_choice[] = {
+static const ber_old_choice_t ProblemCause_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unknown },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_integerValue },
   { 0, 0, 0, 0, NULL }
@@ -1199,9 +1199,9 @@ static const ber_choice_t ProblemCause_choice[] = {
 
 static int
 dissect_gnm_ProblemCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ProblemCause_choice, hf_index, ett_gnm_ProblemCause,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ProblemCause_choice, hf_index, ett_gnm_ProblemCause,
+                                     NULL);
 
   return offset;
 }
@@ -1210,14 +1210,14 @@ static int dissect_problemCause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SET_OF_ObjectInstance_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ObjectInstance_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_broadcast_item },
 };
 
 static int
 dissect_gnm_SET_OF_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ObjectInstance_set_of, hf_index, ett_gnm_SET_OF_ObjectInstance);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ObjectInstance_set_of, hf_index, ett_gnm_SET_OF_ObjectInstance);
 
   return offset;
 }
@@ -1235,7 +1235,7 @@ static int dissect_tps1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t LogicalProblem_sequence[] = {
+static const ber_old_sequence_t LogicalProblem_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problemCause },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_incorrectInstances },
   { 0, 0, 0, NULL }
@@ -1243,8 +1243,8 @@ static const ber_sequence_t LogicalProblem_sequence[] = {
 
 static int
 dissect_gnm_LogicalProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogicalProblem_sequence, hf_index, ett_gnm_LogicalProblem);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogicalProblem_sequence, hf_index, ett_gnm_LogicalProblem);
 
   return offset;
 }
@@ -1259,7 +1259,7 @@ static const value_string gnm_ResourceProblem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ResourceProblem_choice[] = {
+static const ber_old_choice_t ResourceProblem_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unknown },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_integerValue },
   { 0, 0, 0, 0, NULL }
@@ -1267,9 +1267,9 @@ static const ber_choice_t ResourceProblem_choice[] = {
 
 static int
 dissect_gnm_ResourceProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ResourceProblem_choice, hf_index, ett_gnm_ResourceProblem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ResourceProblem_choice, hf_index, ett_gnm_ResourceProblem,
+                                     NULL);
 
   return offset;
 }
@@ -1284,7 +1284,7 @@ static const value_string gnm_Failed_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Failed_choice[] = {
+static const ber_old_choice_t Failed_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logicalProblem },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_resourceProblem },
   { 0, 0, 0, 0, NULL }
@@ -1292,9 +1292,9 @@ static const ber_choice_t Failed_choice[] = {
 
 static int
 dissect_gnm_Failed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Failed_choice, hf_index, ett_gnm_Failed,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Failed_choice, hf_index, ett_gnm_Failed,
+                                     NULL);
 
   return offset;
 }
@@ -1312,7 +1312,7 @@ static const value_string gnm_AddTpsToGtpResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AddTpsToGtpResult_item_choice[] = {
+static const ber_old_choice_t AddTpsToGtpResult_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_addedTps_impl },
   { 0, 0, 0, 0, NULL }
@@ -1320,9 +1320,9 @@ static const ber_choice_t AddTpsToGtpResult_item_choice[] = {
 
 static int
 dissect_gnm_AddTpsToGtpResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AddTpsToGtpResult_item_choice, hf_index, ett_gnm_AddTpsToGtpResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AddTpsToGtpResult_item_choice, hf_index, ett_gnm_AddTpsToGtpResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -1331,27 +1331,27 @@ static int dissect_AddTpsToGtpResult_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AddTpsToGtpResult_sequence_of[1] = {
+static const ber_old_sequence_t AddTpsToGtpResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AddTpsToGtpResult_item },
 };
 
 static int
 dissect_gnm_AddTpsToGtpResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AddTpsToGtpResult_sequence_of, hf_index, ett_gnm_AddTpsToGtpResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AddTpsToGtpResult_sequence_of, hf_index, ett_gnm_AddTpsToGtpResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t SET_OF_TerminationPointInformation_set_of[1] = {
+static const ber_old_sequence_t SET_OF_TerminationPointInformation_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_tps_item },
 };
 
 static int
 dissect_gnm_SET_OF_TerminationPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_TerminationPointInformation_set_of, hf_index, ett_gnm_SET_OF_TerminationPointInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_TerminationPointInformation_set_of, hf_index, ett_gnm_SET_OF_TerminationPointInformation);
 
   return offset;
 }
@@ -1360,7 +1360,7 @@ static int dissect_tps(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t AddTpsToTpPoolInformation_item_sequence[] = {
+static const ber_old_sequence_t AddTpsToTpPoolInformation_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_tps },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_toTpPool },
   { 0, 0, 0, NULL }
@@ -1368,8 +1368,8 @@ static const ber_sequence_t AddTpsToTpPoolInformation_item_sequence[] = {
 
 static int
 dissect_gnm_AddTpsToTpPoolInformation_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddTpsToTpPoolInformation_item_sequence, hf_index, ett_gnm_AddTpsToTpPoolInformation_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddTpsToTpPoolInformation_item_sequence, hf_index, ett_gnm_AddTpsToTpPoolInformation_item);
 
   return offset;
 }
@@ -1378,20 +1378,20 @@ static int dissect_AddTpsToTpPoolInformation_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t AddTpsToTpPoolInformation_sequence_of[1] = {
+static const ber_old_sequence_t AddTpsToTpPoolInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AddTpsToTpPoolInformation_item },
 };
 
 static int
 dissect_gnm_AddTpsToTpPoolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AddTpsToTpPoolInformation_sequence_of, hf_index, ett_gnm_AddTpsToTpPoolInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AddTpsToTpPoolInformation_sequence_of, hf_index, ett_gnm_AddTpsToTpPoolInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t TpsAddedToTpPool_sequence[] = {
+static const ber_old_sequence_t TpsAddedToTpPool_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_tpPool },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_tps1 },
   { 0, 0, 0, NULL }
@@ -1399,8 +1399,8 @@ static const ber_sequence_t TpsAddedToTpPool_sequence[] = {
 
 static int
 dissect_gnm_TpsAddedToTpPool(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TpsAddedToTpPool_sequence, hf_index, ett_gnm_TpsAddedToTpPool);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TpsAddedToTpPool_sequence, hf_index, ett_gnm_TpsAddedToTpPool);
 
   return offset;
 }
@@ -1415,7 +1415,7 @@ static const value_string gnm_AddTpsToTpPoolResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AddTpsToTpPoolResult_item_choice[] = {
+static const ber_old_choice_t AddTpsToTpPoolResult_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tpsAddedToTpPool_impl },
   { 0, 0, 0, 0, NULL }
@@ -1423,9 +1423,9 @@ static const ber_choice_t AddTpsToTpPoolResult_item_choice[] = {
 
 static int
 dissect_gnm_AddTpsToTpPoolResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AddTpsToTpPoolResult_item_choice, hf_index, ett_gnm_AddTpsToTpPoolResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AddTpsToTpPoolResult_item_choice, hf_index, ett_gnm_AddTpsToTpPoolResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -1434,14 +1434,14 @@ static int dissect_AddTpsToTpPoolResult_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AddTpsToTpPoolResult_sequence_of[1] = {
+static const ber_old_sequence_t AddTpsToTpPoolResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AddTpsToTpPoolResult_item },
 };
 
 static int
 dissect_gnm_AddTpsToTpPoolResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AddTpsToTpPoolResult_sequence_of, hf_index, ett_gnm_AddTpsToTpPoolResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AddTpsToTpPoolResult_sequence_of, hf_index, ett_gnm_AddTpsToTpPoolResult);
 
   return offset;
 }
@@ -1484,7 +1484,7 @@ static int dissect_severityAssignedServiceIndependent_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t AlarmSeverityAssignment_sequence[] = {
+static const ber_old_sequence_t AlarmSeverityAssignment_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severityAssignedServiceAffecting_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severityAssignedNonServiceAffecting_impl },
@@ -1494,8 +1494,8 @@ static const ber_sequence_t AlarmSeverityAssignment_sequence[] = {
 
 static int
 dissect_gnm_AlarmSeverityAssignment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlarmSeverityAssignment_sequence, hf_index, ett_gnm_AlarmSeverityAssignment);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlarmSeverityAssignment_sequence, hf_index, ett_gnm_AlarmSeverityAssignment);
 
   return offset;
 }
@@ -1504,14 +1504,14 @@ static int dissect_AlarmSeverityAssignmentList_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t AlarmSeverityAssignmentList_set_of[1] = {
+static const ber_old_sequence_t AlarmSeverityAssignmentList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AlarmSeverityAssignmentList_item },
 };
 
 static int
 dissect_gnm_AlarmSeverityAssignmentList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 AlarmSeverityAssignmentList_set_of, hf_index, ett_gnm_AlarmSeverityAssignmentList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     AlarmSeverityAssignmentList_set_of, hf_index, ett_gnm_AlarmSeverityAssignmentList);
 
   return offset;
 }
@@ -1553,7 +1553,7 @@ static int dissect_redline_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t Bundle_sequence[] = {
+static const ber_old_sequence_t Bundle_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_characteristicInfoType },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_bundlingFactor },
   { 0, 0, 0, NULL }
@@ -1561,8 +1561,8 @@ static const ber_sequence_t Bundle_sequence[] = {
 
 static int
 dissect_gnm_Bundle(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Bundle_sequence, hf_index, ett_gnm_Bundle);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Bundle_sequence, hf_index, ett_gnm_Bundle);
 
   return offset;
 }
@@ -1627,7 +1627,7 @@ static int dissect_notInTheAcceptableList_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t PointToPoint_sequence[] = {
+static const ber_old_sequence_t PointToPoint_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fromTp1 },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_toTp1 },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_xCon },
@@ -1636,8 +1636,8 @@ static const ber_sequence_t PointToPoint_sequence[] = {
 
 static int
 dissect_gnm_PointToPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PointToPoint_sequence, hf_index, ett_gnm_PointToPoint);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PointToPoint_sequence, hf_index, ett_gnm_PointToPoint);
 
   return offset;
 }
@@ -1646,7 +1646,7 @@ static int dissect_pointToPoint_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_toTps_item_sequence[] = {
+static const ber_old_sequence_t T_toTps_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_tp },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_xConnection },
   { 0, 0, 0, NULL }
@@ -1654,8 +1654,8 @@ static const ber_sequence_t T_toTps_item_sequence[] = {
 
 static int
 dissect_gnm_T_toTps_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_toTps_item_sequence, hf_index, ett_gnm_T_toTps_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_toTps_item_sequence, hf_index, ett_gnm_T_toTps_item);
 
   return offset;
 }
@@ -1664,14 +1664,14 @@ static int dissect_toTps_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_toTps_set_of[1] = {
+static const ber_old_sequence_t T_toTps_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_toTps_item },
 };
 
 static int
 dissect_gnm_T_toTps(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_toTps_set_of, hf_index, ett_gnm_T_toTps);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_toTps_set_of, hf_index, ett_gnm_T_toTps);
 
   return offset;
 }
@@ -1680,7 +1680,7 @@ static int dissect_toTps(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t PointToMultipoint_sequence[] = {
+static const ber_old_sequence_t PointToMultipoint_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fromTp1 },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_toTps },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_mpXCon },
@@ -1689,8 +1689,8 @@ static const ber_sequence_t PointToMultipoint_sequence[] = {
 
 static int
 dissect_gnm_PointToMultipoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PointToMultipoint_sequence, hf_index, ett_gnm_PointToMultipoint);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PointToMultipoint_sequence, hf_index, ett_gnm_PointToMultipoint);
 
   return offset;
 }
@@ -1705,7 +1705,7 @@ static const value_string gnm_Connected_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Connected_choice[] = {
+static const ber_old_choice_t Connected_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pointToPoint_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pointToMultipoint_impl },
   { 0, 0, 0, 0, NULL }
@@ -1713,9 +1713,9 @@ static const ber_choice_t Connected_choice[] = {
 
 static int
 dissect_gnm_Connected(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Connected_choice, hf_index, ett_gnm_Connected,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Connected_choice, hf_index, ett_gnm_Connected,
+                                     NULL);
 
   return offset;
 }
@@ -1727,7 +1727,7 @@ static int dissect_pass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ExplicitPtoP_sequence[] = {
+static const ber_old_sequence_t ExplicitPtoP_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_fromTp },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_toTp },
   { 0, 0, 0, NULL }
@@ -1735,8 +1735,8 @@ static const ber_sequence_t ExplicitPtoP_sequence[] = {
 
 static int
 dissect_gnm_ExplicitPtoP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExplicitPtoP_sequence, hf_index, ett_gnm_ExplicitPtoP);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExplicitPtoP_sequence, hf_index, ett_gnm_ExplicitPtoP);
 
   return offset;
 }
@@ -1745,7 +1745,7 @@ static int dissect_explicitPToP_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t PtoTPPool_sequence[] = {
+static const ber_old_sequence_t PtoTPPool_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_fromTp },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_toTpPool },
   { 0, 0, 0, NULL }
@@ -1753,8 +1753,8 @@ static const ber_sequence_t PtoTPPool_sequence[] = {
 
 static int
 dissect_gnm_PtoTPPool(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PtoTPPool_sequence, hf_index, ett_gnm_PtoTPPool);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PtoTPPool_sequence, hf_index, ett_gnm_PtoTPPool);
 
   return offset;
 }
@@ -1763,14 +1763,14 @@ static int dissect_ptoTpPool_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SET_OF_ExplicitTP_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ExplicitTP_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_toTPs_item },
 };
 
 static int
 dissect_gnm_SET_OF_ExplicitTP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ExplicitTP_set_of, hf_index, ett_gnm_SET_OF_ExplicitTP);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ExplicitTP_set_of, hf_index, ett_gnm_SET_OF_ExplicitTP);
 
   return offset;
 }
@@ -1779,7 +1779,7 @@ static int dissect_toTPs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t ExplicitPtoMP_sequence[] = {
+static const ber_old_sequence_t ExplicitPtoMP_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_fromTp },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_toTPs },
   { 0, 0, 0, NULL }
@@ -1787,8 +1787,8 @@ static const ber_sequence_t ExplicitPtoMP_sequence[] = {
 
 static int
 dissect_gnm_ExplicitPtoMP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExplicitPtoMP_sequence, hf_index, ett_gnm_ExplicitPtoMP);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExplicitPtoMP_sequence, hf_index, ett_gnm_ExplicitPtoMP);
 
   return offset;
 }
@@ -1797,7 +1797,7 @@ static int dissect_explicitPtoMP_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ToTPPools_item_sequence[] = {
+static const ber_old_sequence_t ToTPPools_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_tpPoolId },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numberOfTPs },
   { 0, 0, 0, NULL }
@@ -1805,8 +1805,8 @@ static const ber_sequence_t ToTPPools_item_sequence[] = {
 
 static int
 dissect_gnm_ToTPPools_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ToTPPools_item_sequence, hf_index, ett_gnm_ToTPPools_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ToTPPools_item_sequence, hf_index, ett_gnm_ToTPPools_item);
 
   return offset;
 }
@@ -1815,14 +1815,14 @@ static int dissect_ToTPPools_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ToTPPools_set_of[1] = {
+static const ber_old_sequence_t ToTPPools_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ToTPPools_item },
 };
 
 static int
 dissect_gnm_ToTPPools(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ToTPPools_set_of, hf_index, ett_gnm_ToTPPools);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ToTPPools_set_of, hf_index, ett_gnm_ToTPPools);
 
   return offset;
 }
@@ -1831,7 +1831,7 @@ static int dissect_toTPPools(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PtoMPools_sequence[] = {
+static const ber_old_sequence_t PtoMPools_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_fromTp },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_toTPPools },
   { 0, 0, 0, NULL }
@@ -1839,8 +1839,8 @@ static const ber_sequence_t PtoMPools_sequence[] = {
 
 static int
 dissect_gnm_PtoMPools(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PtoMPools_sequence, hf_index, ett_gnm_PtoMPools);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PtoMPools_sequence, hf_index, ett_gnm_PtoMPools);
 
   return offset;
 }
@@ -1857,7 +1857,7 @@ static const value_string gnm_ConnectionType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConnectionType_choice[] = {
+static const ber_old_choice_t ConnectionType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_explicitPToP_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ptoTpPool_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_explicitPtoMP_impl },
@@ -1867,9 +1867,9 @@ static const ber_choice_t ConnectionType_choice[] = {
 
 static int
 dissect_gnm_ConnectionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConnectionType_choice, hf_index, ett_gnm_ConnectionType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConnectionType_choice, hf_index, ett_gnm_ConnectionType,
+                                     NULL);
 
   return offset;
 }
@@ -1884,7 +1884,7 @@ static const value_string gnm_ConnectionTypeBi_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConnectionTypeBi_choice[] = {
+static const ber_old_choice_t ConnectionTypeBi_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_explicitPToP_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ptoTpPool_impl },
   { 0, 0, 0, 0, NULL }
@@ -1892,9 +1892,9 @@ static const ber_choice_t ConnectionTypeBi_choice[] = {
 
 static int
 dissect_gnm_ConnectionTypeBi(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConnectionTypeBi_choice, hf_index, ett_gnm_ConnectionTypeBi,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConnectionTypeBi_choice, hf_index, ett_gnm_ConnectionTypeBi,
+                                     NULL);
 
   return offset;
 }
@@ -1910,7 +1910,7 @@ static const value_string gnm_T_itemType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_itemType_choice[] = {
+static const ber_old_choice_t T_itemType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unidirectional_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bidirectional_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_addleg_impl },
@@ -1919,9 +1919,9 @@ static const ber_choice_t T_itemType_choice[] = {
 
 static int
 dissect_gnm_T_itemType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_itemType_choice, hf_index, ett_gnm_T_itemType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_itemType_choice, hf_index, ett_gnm_T_itemType,
+                                     NULL);
 
   return offset;
 }
@@ -1944,7 +1944,7 @@ static int dissect_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t NamedCrossConnection_sequence[] = {
+static const ber_old_sequence_t NamedCrossConnection_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_redline1 },
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_name },
   { 0, 0, 0, NULL }
@@ -1952,8 +1952,8 @@ static const ber_sequence_t NamedCrossConnection_sequence[] = {
 
 static int
 dissect_gnm_NamedCrossConnection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NamedCrossConnection_sequence, hf_index, ett_gnm_NamedCrossConnection);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NamedCrossConnection_sequence, hf_index, ett_gnm_NamedCrossConnection);
 
   return offset;
 }
@@ -1976,7 +1976,7 @@ static int dissect_userLabel_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ConnectInformation_item_sequence[] = {
+static const ber_old_sequence_t ConnectInformation_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_itemType },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_administrativeState },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedCrossConnection_impl },
@@ -1988,8 +1988,8 @@ static const ber_sequence_t ConnectInformation_item_sequence[] = {
 
 static int
 dissect_gnm_ConnectInformation_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectInformation_item_sequence, hf_index, ett_gnm_ConnectInformation_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectInformation_item_sequence, hf_index, ett_gnm_ConnectInformation_item);
 
   return offset;
 }
@@ -1998,14 +1998,14 @@ static int dissect_ConnectInformation_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ConnectInformation_sequence_of[1] = {
+static const ber_old_sequence_t ConnectInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ConnectInformation_item },
 };
 
 static int
 dissect_gnm_ConnectInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ConnectInformation_sequence_of, hf_index, ett_gnm_ConnectInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ConnectInformation_sequence_of, hf_index, ett_gnm_ConnectInformation);
 
   return offset;
 }
@@ -2035,7 +2035,7 @@ static const value_string gnm_ConnectivityPointer_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConnectivityPointer_choice[] = {
+static const ber_old_choice_t ConnectivityPointer_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_none },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_single },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_concatenated },
@@ -2044,9 +2044,9 @@ static const ber_choice_t ConnectivityPointer_choice[] = {
 
 static int
 dissect_gnm_ConnectivityPointer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConnectivityPointer_choice, hf_index, ett_gnm_ConnectivityPointer,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConnectivityPointer_choice, hf_index, ett_gnm_ConnectivityPointer,
+                                     NULL);
 
   return offset;
 }
@@ -2058,7 +2058,7 @@ static const value_string gnm_ConnectResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConnectResult_item_choice[] = {
+static const ber_old_choice_t ConnectResult_item_choice[] = {
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_failed },
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_connected },
   { 0, 0, 0, 0, NULL }
@@ -2066,9 +2066,9 @@ static const ber_choice_t ConnectResult_item_choice[] = {
 
 static int
 dissect_gnm_ConnectResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConnectResult_item_choice, hf_index, ett_gnm_ConnectResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConnectResult_item_choice, hf_index, ett_gnm_ConnectResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -2077,14 +2077,14 @@ static int dissect_ConnectResult_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ConnectResult_sequence_of[1] = {
+static const ber_old_sequence_t ConnectResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ConnectResult_item },
 };
 
 static int
 dissect_gnm_ConnectResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ConnectResult_sequence_of, hf_index, ett_gnm_ConnectResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ConnectResult_sequence_of, hf_index, ett_gnm_ConnectResult);
 
   return offset;
 }
@@ -2118,7 +2118,7 @@ static const value_string gnm_MultipleConnections_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MultipleConnections_item_choice[] = {
+static const ber_old_choice_t MultipleConnections_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_downstreamNotConnected_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_downstreamConnected_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_upstreamNotConnected_impl },
@@ -2128,9 +2128,9 @@ static const ber_choice_t MultipleConnections_item_choice[] = {
 
 static int
 dissect_gnm_MultipleConnections_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MultipleConnections_item_choice, hf_index, ett_gnm_MultipleConnections_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MultipleConnections_item_choice, hf_index, ett_gnm_MultipleConnections_item,
+                                     NULL);
 
   return offset;
 }
@@ -2139,14 +2139,14 @@ static int dissect_MultipleConnections_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t MultipleConnections_set_of[1] = {
+static const ber_old_sequence_t MultipleConnections_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_MultipleConnections_item },
 };
 
 static int
 dissect_gnm_MultipleConnections(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 MultipleConnections_set_of, hf_index, ett_gnm_MultipleConnections);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     MultipleConnections_set_of, hf_index, ett_gnm_MultipleConnections);
 
   return offset;
 }
@@ -2162,7 +2162,7 @@ static const value_string gnm_CrossConnectionObjectPointer_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CrossConnectionObjectPointer_choice[] = {
+static const ber_old_choice_t CrossConnectionObjectPointer_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_notConnected_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_connected1_impl },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_multipleConnections },
@@ -2171,9 +2171,9 @@ static const ber_choice_t CrossConnectionObjectPointer_choice[] = {
 
 static int
 dissect_gnm_CrossConnectionObjectPointer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CrossConnectionObjectPointer_choice, hf_index, ett_gnm_CrossConnectionObjectPointer,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CrossConnectionObjectPointer_choice, hf_index, ett_gnm_CrossConnectionObjectPointer,
+                                     NULL);
 
   return offset;
 }
@@ -2188,14 +2188,14 @@ dissect_gnm_CTPUpstreamPointer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_broadcastConcatenated_set_of[1] = {
+static const ber_old_sequence_t T_broadcastConcatenated_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_broadcastConcatenated_item },
 };
 
 static int
 dissect_gnm_T_broadcastConcatenated(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_broadcastConcatenated_set_of, hf_index, ett_gnm_T_broadcastConcatenated);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_broadcastConcatenated_set_of, hf_index, ett_gnm_T_broadcastConcatenated);
 
   return offset;
 }
@@ -2213,7 +2213,7 @@ static const value_string gnm_DownstreamConnectivityPointer_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DownstreamConnectivityPointer_choice[] = {
+static const ber_old_choice_t DownstreamConnectivityPointer_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_none },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_single },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_concatenated },
@@ -2224,9 +2224,9 @@ static const ber_choice_t DownstreamConnectivityPointer_choice[] = {
 
 static int
 dissect_gnm_DownstreamConnectivityPointer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DownstreamConnectivityPointer_choice, hf_index, ett_gnm_DownstreamConnectivityPointer,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DownstreamConnectivityPointer_choice, hf_index, ett_gnm_DownstreamConnectivityPointer,
+                                     NULL);
 
   return offset;
 }
@@ -2241,7 +2241,7 @@ dissect_gnm_CTPDownstreamPointer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t CurrentProblem_sequence[] = {
+static const ber_old_sequence_t CurrentProblem_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_problem_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_alarmStatus_impl },
   { 0, 0, 0, NULL }
@@ -2249,8 +2249,8 @@ static const ber_sequence_t CurrentProblem_sequence[] = {
 
 static int
 dissect_gnm_CurrentProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CurrentProblem_sequence, hf_index, ett_gnm_CurrentProblem);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CurrentProblem_sequence, hf_index, ett_gnm_CurrentProblem);
 
   return offset;
 }
@@ -2259,14 +2259,14 @@ static int dissect_CurrentProblemList_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t CurrentProblemList_set_of[1] = {
+static const ber_old_sequence_t CurrentProblemList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CurrentProblemList_item },
 };
 
 static int
 dissect_gnm_CurrentProblemList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 CurrentProblemList_set_of, hf_index, ett_gnm_CurrentProblemList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     CurrentProblemList_set_of, hf_index, ett_gnm_CurrentProblemList);
 
   return offset;
 }
@@ -2288,14 +2288,14 @@ dissect_gnm_Directionality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t DisconnectInformation_sequence_of[1] = {
+static const ber_old_sequence_t DisconnectInformation_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_DisconnectInformation_item },
 };
 
 static int
 dissect_gnm_DisconnectInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DisconnectInformation_sequence_of, hf_index, ett_gnm_DisconnectInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DisconnectInformation_sequence_of, hf_index, ett_gnm_DisconnectInformation);
 
   return offset;
 }
@@ -2307,7 +2307,7 @@ static const value_string gnm_DisconnectResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DisconnectResult_item_choice[] = {
+static const ber_old_choice_t DisconnectResult_item_choice[] = {
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_failed },
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_disconnected },
   { 0, 0, 0, 0, NULL }
@@ -2315,9 +2315,9 @@ static const ber_choice_t DisconnectResult_item_choice[] = {
 
 static int
 dissect_gnm_DisconnectResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DisconnectResult_item_choice, hf_index, ett_gnm_DisconnectResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DisconnectResult_item_choice, hf_index, ett_gnm_DisconnectResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -2326,14 +2326,14 @@ static int dissect_DisconnectResult_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t DisconnectResult_sequence_of[1] = {
+static const ber_old_sequence_t DisconnectResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_DisconnectResult_item },
 };
 
 static int
 dissect_gnm_DisconnectResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DisconnectResult_sequence_of, hf_index, ett_gnm_DisconnectResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DisconnectResult_sequence_of, hf_index, ett_gnm_DisconnectResult);
 
   return offset;
 }
@@ -2348,14 +2348,14 @@ dissect_gnm_ExternalTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t EquipmentHolderAddress_sequence_of[1] = {
+static const ber_old_sequence_t EquipmentHolderAddress_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_EquipmentHolderAddress_item },
 };
 
 static int
 dissect_gnm_EquipmentHolderAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      EquipmentHolderAddress_sequence_of, hf_index, ett_gnm_EquipmentHolderAddress);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          EquipmentHolderAddress_sequence_of, hf_index, ett_gnm_EquipmentHolderAddress);
 
   return offset;
 }
@@ -2378,7 +2378,7 @@ static const value_string gnm_GeneralErrorCause_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GeneralErrorCause_choice[] = {
+static const ber_old_choice_t GeneralErrorCause_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   { 0, 0, 0, 0, NULL }
@@ -2386,9 +2386,9 @@ static const ber_choice_t GeneralErrorCause_choice[] = {
 
 static int
 dissect_gnm_GeneralErrorCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GeneralErrorCause_choice, hf_index, ett_gnm_GeneralErrorCause,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GeneralErrorCause_choice, hf_index, ett_gnm_GeneralErrorCause,
+                                     NULL);
 
   return offset;
 }
@@ -2414,7 +2414,7 @@ static int dissect_pString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t GeneralError_item_sequence[] = {
+static const ber_old_sequence_t GeneralError_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_cause },
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_details },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_relatedObjects_impl },
@@ -2424,8 +2424,8 @@ static const ber_sequence_t GeneralError_item_sequence[] = {
 
 static int
 dissect_gnm_GeneralError_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GeneralError_item_sequence, hf_index, ett_gnm_GeneralError_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GeneralError_item_sequence, hf_index, ett_gnm_GeneralError_item);
 
   return offset;
 }
@@ -2434,14 +2434,14 @@ static int dissect_GeneralError_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t GeneralError_sequence_of[1] = {
+static const ber_old_sequence_t GeneralError_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralError_item },
 };
 
 static int
 dissect_gnm_GeneralError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GeneralError_sequence_of, hf_index, ett_gnm_GeneralError);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GeneralError_sequence_of, hf_index, ett_gnm_GeneralError);
 
   return offset;
 }
@@ -2455,7 +2455,7 @@ static const value_string gnm_HolderStatus_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t HolderStatus_choice[] = {
+static const ber_old_choice_t HolderStatus_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_holderEmpty_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inTheAcceptableList_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_notInTheAcceptableList_impl },
@@ -2465,15 +2465,15 @@ static const ber_choice_t HolderStatus_choice[] = {
 
 static int
 dissect_gnm_HolderStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 HolderStatus_choice, hf_index, ett_gnm_HolderStatus,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     HolderStatus_choice, hf_index, ett_gnm_HolderStatus,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t IndividualSwitchOver_sequence[] = {
+static const ber_old_sequence_t IndividualSwitchOver_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_connection },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unchangedTP },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_newTP },
@@ -2482,8 +2482,8 @@ static const ber_sequence_t IndividualSwitchOver_sequence[] = {
 
 static int
 dissect_gnm_IndividualSwitchOver(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndividualSwitchOver_sequence, hf_index, ett_gnm_IndividualSwitchOver);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndividualSwitchOver_sequence, hf_index, ett_gnm_IndividualSwitchOver);
 
   return offset;
 }
@@ -2498,7 +2498,7 @@ static const value_string gnm_IndividualResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t IndividualResult_choice[] = {
+static const ber_old_choice_t IndividualResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pass_impl },
   { 0, 0, 0, 0, NULL }
@@ -2506,9 +2506,9 @@ static const ber_choice_t IndividualResult_choice[] = {
 
 static int
 dissect_gnm_IndividualResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 IndividualResult_choice, hf_index, ett_gnm_IndividualResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     IndividualResult_choice, hf_index, ett_gnm_IndividualResult,
+                                     NULL);
 
   return offset;
 }
@@ -2537,27 +2537,27 @@ dissect_gnm_InformationTransferCapabilities(gboolean implicit_tag _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t ListOfCharacteristicInformation_set_of[1] = {
+static const ber_old_sequence_t ListOfCharacteristicInformation_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ListOfCharacteristicInformation_item },
 };
 
 static int
 dissect_gnm_ListOfCharacteristicInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ListOfCharacteristicInformation_set_of, hf_index, ett_gnm_ListOfCharacteristicInformation);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ListOfCharacteristicInformation_set_of, hf_index, ett_gnm_ListOfCharacteristicInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t ListOfTPs_set_of[1] = {
+static const ber_old_sequence_t ListOfTPs_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ListOfTPs_item },
 };
 
 static int
 dissect_gnm_ListOfTPs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ListOfTPs_set_of, hf_index, ett_gnm_ListOfTPs);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ListOfTPs_set_of, hf_index, ett_gnm_ListOfTPs);
 
   return offset;
 }
@@ -2580,7 +2580,7 @@ static const value_string gnm_NameType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NameType_choice[] = {
+static const ber_old_choice_t NameType_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numericName },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_pString },
   { 0, 0, 0, 0, NULL }
@@ -2588,9 +2588,9 @@ static const ber_choice_t NameType_choice[] = {
 
 static int
 dissect_gnm_NameType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NameType_choice, hf_index, ett_gnm_NameType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NameType_choice, hf_index, ett_gnm_NameType,
+                                     NULL);
 
   return offset;
 }
@@ -2606,14 +2606,14 @@ dissect_gnm_NumberOfCircuits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ObjectList_set_of[1] = {
+static const ber_old_sequence_t ObjectList_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ObjectList_item },
 };
 
 static int
 dissect_gnm_ObjectList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ObjectList_set_of, hf_index, ett_gnm_ObjectList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ObjectList_set_of, hf_index, ett_gnm_ObjectList);
 
   return offset;
 }
@@ -2632,7 +2632,7 @@ static int dissect_wavelength(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SignalRateAndMappingList_item_sequence[] = {
+static const ber_old_sequence_t SignalRateAndMappingList_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_signalRate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_mappingList },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_wavelength },
@@ -2641,8 +2641,8 @@ static const ber_sequence_t SignalRateAndMappingList_item_sequence[] = {
 
 static int
 dissect_gnm_SignalRateAndMappingList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SignalRateAndMappingList_item_sequence, hf_index, ett_gnm_SignalRateAndMappingList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SignalRateAndMappingList_item_sequence, hf_index, ett_gnm_SignalRateAndMappingList_item);
 
   return offset;
 }
@@ -2651,14 +2651,14 @@ static int dissect_SignalRateAndMappingList_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SignalRateAndMappingList_set_of[1] = {
+static const ber_old_sequence_t SignalRateAndMappingList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignalRateAndMappingList_item },
 };
 
 static int
 dissect_gnm_SignalRateAndMappingList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SignalRateAndMappingList_set_of, hf_index, ett_gnm_SignalRateAndMappingList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SignalRateAndMappingList_set_of, hf_index, ett_gnm_SignalRateAndMappingList);
 
   return offset;
 }
@@ -2673,7 +2673,7 @@ static int dissect_uniform(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_diverse_sequence[] = {
+static const ber_old_sequence_t T_diverse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_downstream },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_upStream },
   { 0, 0, 0, NULL }
@@ -2681,8 +2681,8 @@ static const ber_sequence_t T_diverse_sequence[] = {
 
 static int
 dissect_gnm_T_diverse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_diverse_sequence, hf_index, ett_gnm_T_diverse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_diverse_sequence, hf_index, ett_gnm_T_diverse);
 
   return offset;
 }
@@ -2697,7 +2697,7 @@ static const value_string gnm_PhysicalPortSignalRateAndMappingList_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PhysicalPortSignalRateAndMappingList_choice[] = {
+static const ber_old_choice_t PhysicalPortSignalRateAndMappingList_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_diverse },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_uniform },
   { 0, 0, 0, 0, NULL }
@@ -2705,9 +2705,9 @@ static const ber_choice_t PhysicalPortSignalRateAndMappingList_choice[] = {
 
 static int
 dissect_gnm_PhysicalPortSignalRateAndMappingList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PhysicalPortSignalRateAndMappingList_choice, hf_index, ett_gnm_PhysicalPortSignalRateAndMappingList,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PhysicalPortSignalRateAndMappingList_choice, hf_index, ett_gnm_PhysicalPortSignalRateAndMappingList,
+                                     NULL);
 
   return offset;
 }
@@ -2728,7 +2728,7 @@ static const value_string gnm_PointerOrNull_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PointerOrNull_choice[] = {
+static const ber_old_choice_t PointerOrNull_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_pointer },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   { 0, 0, 0, 0, NULL }
@@ -2736,9 +2736,9 @@ static const ber_choice_t PointerOrNull_choice[] = {
 
 static int
 dissect_gnm_PointerOrNull(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PointerOrNull_choice, hf_index, ett_gnm_PointerOrNull,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PointerOrNull_choice, hf_index, ett_gnm_PointerOrNull,
+                                     NULL);
 
   return offset;
 }
@@ -2770,7 +2770,7 @@ static const value_string gnm_RelatedObjectInstance_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RelatedObjectInstance_choice[] = {
+static const ber_old_choice_t RelatedObjectInstance_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_notAvailable },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_relatedObject },
   { 0, 0, 0, 0, NULL }
@@ -2778,15 +2778,15 @@ static const ber_choice_t RelatedObjectInstance_choice[] = {
 
 static int
 dissect_gnm_RelatedObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RelatedObjectInstance_choice, hf_index, ett_gnm_RelatedObjectInstance,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RelatedObjectInstance_choice, hf_index, ett_gnm_RelatedObjectInstance,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoveTpsFromGtpInformation_item_sequence[] = {
+static const ber_old_sequence_t RemoveTpsFromGtpInformation_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fromGtp },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_tps1 },
   { 0, 0, 0, NULL }
@@ -2794,8 +2794,8 @@ static const ber_sequence_t RemoveTpsFromGtpInformation_item_sequence[] = {
 
 static int
 dissect_gnm_RemoveTpsFromGtpInformation_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoveTpsFromGtpInformation_item_sequence, hf_index, ett_gnm_RemoveTpsFromGtpInformation_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoveTpsFromGtpInformation_item_sequence, hf_index, ett_gnm_RemoveTpsFromGtpInformation_item);
 
   return offset;
 }
@@ -2804,20 +2804,20 @@ static int dissect_RemoveTpsFromGtpInformation_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t RemoveTpsFromGtpInformation_sequence_of[1] = {
+static const ber_old_sequence_t RemoveTpsFromGtpInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RemoveTpsFromGtpInformation_item },
 };
 
 static int
 dissect_gnm_RemoveTpsFromGtpInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RemoveTpsFromGtpInformation_sequence_of, hf_index, ett_gnm_RemoveTpsFromGtpInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RemoveTpsFromGtpInformation_sequence_of, hf_index, ett_gnm_RemoveTpsFromGtpInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoveTpsResultInformation_sequence[] = {
+static const ber_old_sequence_t RemoveTpsResultInformation_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_deletedTpPoolOrGTP },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_tps1 },
   { 0, 0, 0, NULL }
@@ -2825,8 +2825,8 @@ static const ber_sequence_t RemoveTpsResultInformation_sequence[] = {
 
 static int
 dissect_gnm_RemoveTpsResultInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoveTpsResultInformation_sequence, hf_index, ett_gnm_RemoveTpsResultInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoveTpsResultInformation_sequence, hf_index, ett_gnm_RemoveTpsResultInformation);
 
   return offset;
 }
@@ -2841,7 +2841,7 @@ static const value_string gnm_RemoveTpsFromGtpResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RemoveTpsFromGtpResult_item_choice[] = {
+static const ber_old_choice_t RemoveTpsFromGtpResult_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_removed_impl },
   { 0, 0, 0, 0, NULL }
@@ -2849,9 +2849,9 @@ static const ber_choice_t RemoveTpsFromGtpResult_item_choice[] = {
 
 static int
 dissect_gnm_RemoveTpsFromGtpResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RemoveTpsFromGtpResult_item_choice, hf_index, ett_gnm_RemoveTpsFromGtpResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RemoveTpsFromGtpResult_item_choice, hf_index, ett_gnm_RemoveTpsFromGtpResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -2860,20 +2860,20 @@ static int dissect_RemoveTpsFromGtpResult_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t RemoveTpsFromGtpResult_sequence_of[1] = {
+static const ber_old_sequence_t RemoveTpsFromGtpResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RemoveTpsFromGtpResult_item },
 };
 
 static int
 dissect_gnm_RemoveTpsFromGtpResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RemoveTpsFromGtpResult_sequence_of, hf_index, ett_gnm_RemoveTpsFromGtpResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RemoveTpsFromGtpResult_sequence_of, hf_index, ett_gnm_RemoveTpsFromGtpResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoveTpsFromTpPoolInformation_item_sequence[] = {
+static const ber_old_sequence_t RemoveTpsFromTpPoolInformation_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fromTpPool },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_tps1 },
   { 0, 0, 0, NULL }
@@ -2881,8 +2881,8 @@ static const ber_sequence_t RemoveTpsFromTpPoolInformation_item_sequence[] = {
 
 static int
 dissect_gnm_RemoveTpsFromTpPoolInformation_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoveTpsFromTpPoolInformation_item_sequence, hf_index, ett_gnm_RemoveTpsFromTpPoolInformation_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoveTpsFromTpPoolInformation_item_sequence, hf_index, ett_gnm_RemoveTpsFromTpPoolInformation_item);
 
   return offset;
 }
@@ -2891,14 +2891,14 @@ static int dissect_RemoveTpsFromTpPoolInformation_item(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t RemoveTpsFromTpPoolInformation_sequence_of[1] = {
+static const ber_old_sequence_t RemoveTpsFromTpPoolInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RemoveTpsFromTpPoolInformation_item },
 };
 
 static int
 dissect_gnm_RemoveTpsFromTpPoolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RemoveTpsFromTpPoolInformation_sequence_of, hf_index, ett_gnm_RemoveTpsFromTpPoolInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RemoveTpsFromTpPoolInformation_sequence_of, hf_index, ett_gnm_RemoveTpsFromTpPoolInformation);
 
   return offset;
 }
@@ -2910,7 +2910,7 @@ static const value_string gnm_RemoveTpsFromTpPoolResult_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RemoveTpsFromTpPoolResult_item_choice[] = {
+static const ber_old_choice_t RemoveTpsFromTpPoolResult_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_removed_impl },
   { 0, 0, 0, 0, NULL }
@@ -2918,9 +2918,9 @@ static const ber_choice_t RemoveTpsFromTpPoolResult_item_choice[] = {
 
 static int
 dissect_gnm_RemoveTpsFromTpPoolResult_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RemoveTpsFromTpPoolResult_item_choice, hf_index, ett_gnm_RemoveTpsFromTpPoolResult_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RemoveTpsFromTpPoolResult_item_choice, hf_index, ett_gnm_RemoveTpsFromTpPoolResult_item,
+                                     NULL);
 
   return offset;
 }
@@ -2929,14 +2929,14 @@ static int dissect_RemoveTpsFromTpPoolResult_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RemoveTpsFromTpPoolResult_sequence_of[1] = {
+static const ber_old_sequence_t RemoveTpsFromTpPoolResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RemoveTpsFromTpPoolResult_item },
 };
 
 static int
 dissect_gnm_RemoveTpsFromTpPoolResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RemoveTpsFromTpPoolResult_sequence_of, hf_index, ett_gnm_RemoveTpsFromTpPoolResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RemoveTpsFromTpPoolResult_sequence_of, hf_index, ett_gnm_RemoveTpsFromTpPoolResult);
 
   return offset;
 }
@@ -2959,14 +2959,14 @@ dissect_gnm_Replaceable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SequenceOfObjectInstance_sequence_of[1] = {
+static const ber_old_sequence_t SequenceOfObjectInstance_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_SequenceOfObjectInstance_item },
 };
 
 static int
 dissect_gnm_SequenceOfObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SequenceOfObjectInstance_sequence_of, hf_index, ett_gnm_SequenceOfObjectInstance);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SequenceOfObjectInstance_sequence_of, hf_index, ett_gnm_SequenceOfObjectInstance);
 
   return offset;
 }
@@ -3003,14 +3003,14 @@ dissect_gnm_SignallingCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Bundle_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Bundle_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_complex_item },
 };
 
 static int
 dissect_gnm_SEQUENCE_OF_Bundle(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Bundle_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_Bundle);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Bundle_sequence_of, hf_index, ett_gnm_SEQUENCE_OF_Bundle);
 
   return offset;
 }
@@ -3026,7 +3026,7 @@ static const value_string gnm_SignalType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SignalType_choice[] = {
+static const ber_old_choice_t SignalType_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_simple },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bundle },
   {   2, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_complex_impl },
@@ -3035,22 +3035,22 @@ static const ber_choice_t SignalType_choice[] = {
 
 static int
 dissect_gnm_SignalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SignalType_choice, hf_index, ett_gnm_SignalType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SignalType_choice, hf_index, ett_gnm_SignalType,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_softwareIdentifiers_sequence_of[1] = {
+static const ber_old_sequence_t T_softwareIdentifiers_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_softwareIdentifiers_item },
 };
 
 static int
 dissect_gnm_T_softwareIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_softwareIdentifiers_sequence_of, hf_index, ett_gnm_T_softwareIdentifiers);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_softwareIdentifiers_sequence_of, hf_index, ett_gnm_T_softwareIdentifiers);
 
   return offset;
 }
@@ -3066,7 +3066,7 @@ static const value_string gnm_SubordinateCircuitPackSoftwareLoad_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubordinateCircuitPackSoftwareLoad_choice[] = {
+static const ber_old_choice_t SubordinateCircuitPackSoftwareLoad_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_notApplicable },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_softwareInstances_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_softwareIdentifiers_impl },
@@ -3075,22 +3075,22 @@ static const ber_choice_t SubordinateCircuitPackSoftwareLoad_choice[] = {
 
 static int
 dissect_gnm_SubordinateCircuitPackSoftwareLoad(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubordinateCircuitPackSoftwareLoad_choice, hf_index, ett_gnm_SubordinateCircuitPackSoftwareLoad,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubordinateCircuitPackSoftwareLoad_choice, hf_index, ett_gnm_SubordinateCircuitPackSoftwareLoad,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SupportableClientList_set_of[1] = {
+static const ber_old_sequence_t SupportableClientList_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_SupportableClientList_item },
 };
 
 static int
 dissect_gnm_SupportableClientList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SupportableClientList_set_of, hf_index, ett_gnm_SupportableClientList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SupportableClientList_set_of, hf_index, ett_gnm_SupportableClientList);
 
   return offset;
 }
@@ -3116,7 +3116,7 @@ static int dissect_sourceType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SystemTiming_sequence[] = {
+static const ber_old_sequence_t SystemTiming_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sourceType },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sourceID },
   { 0, 0, 0, NULL }
@@ -3124,8 +3124,8 @@ static const ber_sequence_t SystemTiming_sequence[] = {
 
 static int
 dissect_gnm_SystemTiming(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SystemTiming_sequence, hf_index, ett_gnm_SystemTiming);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SystemTiming_sequence, hf_index, ett_gnm_SystemTiming);
 
   return offset;
 }
@@ -3137,7 +3137,7 @@ static int dissect_secondaryTimingSource(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SystemTimingSource_sequence[] = {
+static const ber_old_sequence_t SystemTimingSource_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_primaryTimingSource },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_secondaryTimingSource },
   { 0, 0, 0, NULL }
@@ -3145,47 +3145,47 @@ static const ber_sequence_t SystemTimingSource_sequence[] = {
 
 static int
 dissect_gnm_SystemTimingSource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SystemTimingSource_sequence, hf_index, ett_gnm_SystemTimingSource);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SystemTimingSource_sequence, hf_index, ett_gnm_SystemTimingSource);
 
   return offset;
 }
 
 
-static const ber_sequence_t SwitchOverInformation_sequence_of[1] = {
+static const ber_old_sequence_t SwitchOverInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SwitchOverInformation_item },
 };
 
 static int
 dissect_gnm_SwitchOverInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SwitchOverInformation_sequence_of, hf_index, ett_gnm_SwitchOverInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SwitchOverInformation_sequence_of, hf_index, ett_gnm_SwitchOverInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t SwitchOverResult_sequence_of[1] = {
+static const ber_old_sequence_t SwitchOverResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SwitchOverResult_item },
 };
 
 static int
 dissect_gnm_SwitchOverResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SwitchOverResult_sequence_of, hf_index, ett_gnm_SwitchOverResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SwitchOverResult_sequence_of, hf_index, ett_gnm_SwitchOverResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t TpsInGtpList_sequence_of[1] = {
+static const ber_old_sequence_t TpsInGtpList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_TpsInGtpList_item },
 };
 
 static int
 dissect_gnm_TpsInGtpList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TpsInGtpList_sequence_of, hf_index, ett_gnm_TpsInGtpList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TpsInGtpList_sequence_of, hf_index, ett_gnm_TpsInGtpList);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index 1e001ff4ce..e456a32d1f 100644
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -7658,7 +7658,7 @@ static const value_string ROS_OPERATION_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OPERATION_choice[] = {
+static const ber_old_choice_t OPERATION_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -7666,7 +7666,7 @@ static const ber_choice_t OPERATION_choice[] = {
 
 static int
 dissect_ROS_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               OPERATION_choice, hf_index, ett_ROS_OPERATION, NULL);
 
   return offset;
@@ -7687,7 +7687,7 @@ static int dissect_parameter( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
   return dissect_ROS_Parameter(FALSE, tvb, offset, actx, tree, hf_ROS_parameter);
 }
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@@ -7697,7 +7697,7 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_ROS_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                 Invoke_sequence, hf_index, ett_ROS_Invoke);
 
   return offset;
@@ -7706,7 +7706,7 @@ static int dissect_invoke_impl( proto_tree *tree, tvbuff_t *tvb, int offset, asn
   return dissect_ROS_Invoke(TRUE, tvb, offset, actx, tree, hf_ROS_invoke);
 }
 
-static const ber_sequence_t T_resultretres_sequence[] = {
+static const ber_old_sequence_t T_resultretres_sequence[] = {
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
   { 0, 0, 0, NULL }
@@ -7714,7 +7714,7 @@ static const ber_sequence_t T_resultretres_sequence[] = {
 
 static int
 dissect_ROS_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                 T_resultretres_sequence, hf_index, ett_ROS_T_resultretres);
 
   return offset;
@@ -7723,7 +7723,7 @@ static int dissect_resultretres( proto_tree *tree, tvbuff_t *tvb, int offset, as
   return dissect_ROS_T_resultretres(FALSE, tvb, offset, actx, tree, hf_ROS_resultretres);
 }
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
   { 0, 0, 0, NULL }
@@ -7731,7 +7731,7 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_ROS_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                 ReturnResult_sequence, hf_index, ett_ROS_ReturnResult);
 
   return offset;
@@ -7760,7 +7760,7 @@ static const value_string ROS_ErrorCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ErrorCode_choice[] = {
+static const ber_old_choice_t ErrorCode_choice[] = {
   {  19, BER_CLASS_PRI, 19, BER_FLAGS_IMPLTAG, dissect_nationaler_impl },
   {  20, BER_CLASS_PRI, 20, BER_FLAGS_IMPLTAG, dissect_privateer_impl },
   { 0, 0, 0, 0, NULL }
@@ -7768,7 +7768,7 @@ static const ber_choice_t ErrorCode_choice[] = {
 
 static int
 dissect_ROS_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               ErrorCode_choice, hf_index, ett_ROS_ErrorCode, NULL);
 
   return offset;
@@ -7777,7 +7777,7 @@ static int dissect_errorCode( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
   return dissect_ROS_ErrorCode(FALSE, tvb, offset, actx, tree, hf_ROS_errorCode);
 }
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_PRI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -7786,7 +7786,7 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_ROS_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                 ReturnError_sequence, hf_index, ett_ROS_ReturnError);
 
   return offset;
@@ -7814,7 +7814,7 @@ static const value_string ROS_T_invokeIDRej_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_invokeIDRej_choice[] = {
+static const ber_old_choice_t T_invokeIDRej_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
   { 0, 0, 0, 0, NULL }
@@ -7822,7 +7822,7 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
 
 static int
 dissect_ROS_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               T_invokeIDRej_choice, hf_index, ett_ROS_T_invokeIDRej, NULL);
 
   return offset;
@@ -7927,7 +7927,7 @@ static const value_string ROS_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -7937,7 +7937,7 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_ROS_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               T_problem_choice, hf_index, ett_ROS_T_problem, NULL);
 
   return offset;
@@ -7946,7 +7946,7 @@ static int dissect_problem( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
   return dissect_ROS_T_problem(FALSE, tvb, offset, actx, tree, hf_ROS_problem);
 }
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -7954,7 +7954,7 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_ROS_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
                                 Reject_sequence, hf_index, ett_ROS_Reject);
 
   return offset;
@@ -7972,7 +7972,7 @@ static const value_string ROS_Component_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Component_choice[] = {
+static const ber_old_choice_t Component_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -7983,7 +7983,7 @@ static const ber_choice_t Component_choice[] = {
 static int
 dissect_ROS_Component(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               Component_choice, hf_index, ett_ROS_Component, NULL);
   /* branch taken will be component type -1 */
 
@@ -7998,7 +7998,7 @@ static const value_string ROS_ERROR_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ERROR_choice[] = {
+static const ber_old_choice_t ERROR_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -8006,7 +8006,7 @@ static const ber_choice_t ERROR_choice[] = {
 
 static int
 dissect_ROS_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               ERROR_choice, hf_index, ett_ROS_ERROR, NULL);
 
   return offset;
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 1c6bf5a97a..43a35cbf36 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -2103,7 +2103,7 @@ static const value_string gsm_map_OPERATION_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OPERATION_choice[] = {
+static const ber_old_choice_t OPERATION_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_operationLocalvalue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -2111,9 +2111,9 @@ static const ber_choice_t OPERATION_choice[] = {
 
 static int
 dissect_gsm_map_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OPERATION_choice, hf_index, ett_gsm_map_OPERATION,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OPERATION_choice, hf_index, ett_gsm_map_OPERATION,
+                                     NULL);
 
   return offset;
 }
@@ -2137,7 +2137,7 @@ static int dissect_invokeparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@@ -2147,8 +2147,8 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_gsm_map_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_gsm_map_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_gsm_map_Invoke);
 
   return offset;
 }
@@ -2172,7 +2172,7 @@ static int dissect_returnparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_resultretres_sequence[] = {
+static const ber_old_sequence_t T_resultretres_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_returnparameter },
   { 0, 0, 0, NULL }
@@ -2180,8 +2180,8 @@ static const ber_sequence_t T_resultretres_sequence[] = {
 
 static int
 dissect_gsm_map_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_resultretres_sequence, hf_index, ett_gsm_map_T_resultretres);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_resultretres_sequence, hf_index, ett_gsm_map_T_resultretres);
 
   return offset;
 }
@@ -2190,7 +2190,7 @@ static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
   { 0, 0, 0, NULL }
@@ -2198,8 +2198,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_gsm_map_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_gsm_map_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_gsm_map_ReturnResult);
 
   return offset;
 }
@@ -2299,7 +2299,7 @@ static const value_string gsm_map_ERROR_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ERROR_choice[] = {
+static const ber_old_choice_t ERROR_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localErrorcode },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -2307,9 +2307,9 @@ static const ber_choice_t ERROR_choice[] = {
 
 static int
 dissect_gsm_map_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ERROR_choice, hf_index, ett_gsm_map_ERROR,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ERROR_choice, hf_index, ett_gsm_map_ERROR,
+                                     NULL);
 
   return offset;
 }
@@ -2333,7 +2333,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_returnErrorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -2342,8 +2342,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_gsm_map_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_gsm_map_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_gsm_map_ReturnError);
 
   return offset;
 }
@@ -2736,7 +2736,7 @@ static const value_string gsm_map_T_invokeIDRej_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_invokeIDRej_choice[] = {
+static const ber_old_choice_t T_invokeIDRej_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
   { 0, 0, 0, 0, NULL }
@@ -2744,9 +2744,9 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
 
 static int
 dissect_gsm_map_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_invokeIDRej_choice, hf_index, ett_gsm_map_T_invokeIDRej,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_invokeIDRej_choice, hf_index, ett_gsm_map_T_invokeIDRej,
+                                     NULL);
 
   return offset;
 }
@@ -2850,7 +2850,7 @@ static const value_string gsm_map_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -2860,9 +2860,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_gsm_map_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_gsm_map_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_gsm_map_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -2871,7 +2871,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -2879,8 +2879,8 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_gsm_map_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_gsm_map_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_gsm_map_Reject);
 
   return offset;
 }
@@ -2898,7 +2898,7 @@ static const value_string gsm_map_Component_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Component_choice[] = {
+static const ber_old_choice_t Component_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -2909,9 +2909,9 @@ static const ber_choice_t Component_choice[] = {
 
 static int
 dissect_gsm_map_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Component_choice, hf_index, ett_gsm_map_Component,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Component_choice, hf_index, ett_gsm_map_Component,
+                                     NULL);
 
   return offset;
 }
@@ -3018,7 +3018,7 @@ static int dissect_extType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t PrivateExtension_sequence[] = {
+static const ber_old_sequence_t PrivateExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extType },
   { 0, 0, 0, NULL }
@@ -3026,8 +3026,8 @@ static const ber_sequence_t PrivateExtension_sequence[] = {
 
 static int
 dissect_gsm_map_PrivateExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivateExtension_sequence, hf_index, ett_gsm_map_PrivateExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivateExtension_sequence, hf_index, ett_gsm_map_PrivateExtension);
 
   return offset;
 }
@@ -3036,14 +3036,14 @@ static int dissect_PrivateExtensionList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PrivateExtensionList_sequence_of[1] = {
+static const ber_old_sequence_t PrivateExtensionList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PrivateExtensionList_item },
 };
 
 static int
 dissect_gsm_map_PrivateExtensionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PrivateExtensionList_sequence_of, hf_index, ett_gsm_map_PrivateExtensionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PrivateExtensionList_sequence_of, hf_index, ett_gsm_map_PrivateExtensionList);
 
   return offset;
 }
@@ -3052,14 +3052,14 @@ static int dissect_privateExtensionList_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PcsExtensions_sequence[] = {
+static const ber_old_sequence_t PcsExtensions_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_PcsExtensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PcsExtensions_sequence, hf_index, ett_gsm_map_PcsExtensions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PcsExtensions_sequence, hf_index, ett_gsm_map_PcsExtensions);
 
   return offset;
 }
@@ -3068,7 +3068,7 @@ static int dissect_pcsExtensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ExtensionContainer_sequence[] = {
+static const ber_old_sequence_t ExtensionContainer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateExtensionList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pcsExtensions_impl },
   { 0, 0, 0, NULL }
@@ -3076,8 +3076,8 @@ static const ber_sequence_t ExtensionContainer_sequence[] = {
 
 int
 dissect_gsm_map_ExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensionContainer_sequence, hf_index, ett_gsm_map_ExtensionContainer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensionContainer_sequence, hf_index, ett_gsm_map_ExtensionContainer);
 
   return offset;
 }
@@ -3089,7 +3089,7 @@ static int dissect_extensionContainer_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Bss_APDU_sequence[] = {
+static const ber_old_sequence_t Bss_APDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_protocolId },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signalInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -3098,8 +3098,8 @@ static const ber_sequence_t Bss_APDU_sequence[] = {
 
 static int
 dissect_gsm_map_Bss_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Bss_APDU_sequence, hf_index, ett_gsm_map_Bss_APDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Bss_APDU_sequence, hf_index, ett_gsm_map_Bss_APDU);
 
   return offset;
 }
@@ -3409,7 +3409,7 @@ static const value_string gsm_map_SuperChargerInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SuperChargerInfo_choice[] = {
+static const ber_old_choice_t SuperChargerInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendSubscriberData_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_subscriberDataStored_impl },
   { 0, 0, 0, 0, NULL }
@@ -3417,9 +3417,9 @@ static const ber_choice_t SuperChargerInfo_choice[] = {
 
 static int
 dissect_gsm_map_SuperChargerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SuperChargerInfo_choice, hf_index, ett_gsm_map_SuperChargerInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SuperChargerInfo_choice, hf_index, ett_gsm_map_SuperChargerInfo,
+                                     NULL);
 
   return offset;
 }
@@ -3510,7 +3510,7 @@ static int dissect_supportedRAT_TypesIndicator_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t VLR_Capability_sequence[] = {
+static const ber_old_sequence_t VLR_Capability_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_supportedCamelPhases_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_solsaSupportIndicator_impl },
@@ -3525,8 +3525,8 @@ static const ber_sequence_t VLR_Capability_sequence[] = {
 
 static int
 dissect_gsm_map_VLR_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VLR_Capability_sequence, hf_index, ett_gsm_map_VLR_Capability);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VLR_Capability_sequence, hf_index, ett_gsm_map_VLR_Capability);
 
   return offset;
 }
@@ -3630,7 +3630,7 @@ static int dissect_imei_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ADD_Info_sequence[] = {
+static const ber_old_sequence_t ADD_Info_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imeisv_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_skipSubscriberDataUpdate_impl },
   { 0, 0, 0, NULL }
@@ -3638,8 +3638,8 @@ static const ber_sequence_t ADD_Info_sequence[] = {
 
 static int
 dissect_gsm_map_ADD_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ADD_Info_sequence, hf_index, ett_gsm_map_ADD_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ADD_Info_sequence, hf_index, ett_gsm_map_ADD_Info);
 
   return offset;
 }
@@ -3648,7 +3648,7 @@ static int dissect_add_info_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t UpdateLocationArg_sequence[] = {
+static const ber_old_sequence_t UpdateLocationArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_vlr_Number },
@@ -3664,14 +3664,14 @@ static const ber_sequence_t UpdateLocationArg_sequence[] = {
 
 static int
 dissect_gsm_map_UpdateLocationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateLocationArg_sequence, hf_index, ett_gsm_map_UpdateLocationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateLocationArg_sequence, hf_index, ett_gsm_map_UpdateLocationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t UpdateLocationRes_sequence[] = {
+static const ber_old_sequence_t UpdateLocationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_add_Capability },
@@ -3680,22 +3680,22 @@ static const ber_sequence_t UpdateLocationRes_sequence[] = {
 
 static int
 dissect_gsm_map_UpdateLocationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateLocationRes_sequence, hf_index, ett_gsm_map_UpdateLocationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateLocationRes_sequence, hf_index, ett_gsm_map_UpdateLocationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SLR_Arg_PCS_Extensions_sequence[] = {
+static const ber_old_sequence_t SLR_Arg_PCS_Extensions_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_na_ESRK_Request_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_SLR_Arg_PCS_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SLR_Arg_PCS_Extensions_sequence, hf_index, ett_gsm_map_SLR_Arg_PCS_Extensions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SLR_Arg_PCS_Extensions_sequence, hf_index, ett_gsm_map_SLR_Arg_PCS_Extensions);
 
   return offset;
 }
@@ -3704,7 +3704,7 @@ static int dissect_slr_Arg_PCS_Extensions_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SLR_ArgExtensionContainer_sequence[] = {
+static const ber_old_sequence_t SLR_ArgExtensionContainer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateExtensionList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_slr_Arg_PCS_Extensions_impl },
   { 0, 0, 0, NULL }
@@ -3712,8 +3712,8 @@ static const ber_sequence_t SLR_ArgExtensionContainer_sequence[] = {
 
 static int
 dissect_gsm_map_SLR_ArgExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SLR_ArgExtensionContainer_sequence, hf_index, ett_gsm_map_SLR_ArgExtensionContainer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SLR_ArgExtensionContainer_sequence, hf_index, ett_gsm_map_SLR_ArgExtensionContainer);
 
   return offset;
 }
@@ -3722,7 +3722,7 @@ static int dissect_slr_ArgExtensionContainer_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t IMSI_WithLMSI_sequence[] = {
+static const ber_old_sequence_t IMSI_WithLMSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_lmsi },
   { 0, 0, 0, NULL }
@@ -3730,8 +3730,8 @@ static const ber_sequence_t IMSI_WithLMSI_sequence[] = {
 
 static int
 dissect_gsm_map_IMSI_WithLMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IMSI_WithLMSI_sequence, hf_index, ett_gsm_map_IMSI_WithLMSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IMSI_WithLMSI_sequence, hf_index, ett_gsm_map_IMSI_WithLMSI);
 
   return offset;
 }
@@ -3746,7 +3746,7 @@ static const value_string gsm_map_Identity_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Identity_choice[] = {
+static const ber_old_choice_t Identity_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imsi_WithLMSI },
   { 0, 0, 0, 0, NULL }
@@ -3754,9 +3754,9 @@ static const ber_choice_t Identity_choice[] = {
 
 static int
 dissect_gsm_map_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Identity_choice, hf_index, ett_gsm_map_Identity,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Identity_choice, hf_index, ett_gsm_map_Identity,
+                                     NULL);
 
   return offset;
 }
@@ -3784,7 +3784,7 @@ static int dissect_cancellationType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CancelLocationArg_sequence[] = {
+static const ber_old_sequence_t CancelLocationArg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_identity },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cancellationType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -3793,8 +3793,8 @@ static const ber_sequence_t CancelLocationArg_sequence[] = {
 
 static int
 dissect_gsm_map_CancelLocationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelLocationArg_sequence, hf_index, ett_gsm_map_CancelLocationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelLocationArg_sequence, hf_index, ett_gsm_map_CancelLocationArg);
 
   return offset;
 }
@@ -3806,7 +3806,7 @@ static const value_string gsm_map_CancelLocationArgV2_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CancelLocationArgV2_choice[] = {
+static const ber_old_choice_t CancelLocationArgV2_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imsi_WithLMSI },
   { 0, 0, 0, 0, NULL }
@@ -3814,29 +3814,29 @@ static const ber_choice_t CancelLocationArgV2_choice[] = {
 
 static int
 dissect_gsm_map_CancelLocationArgV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CancelLocationArgV2_choice, hf_index, ett_gsm_map_CancelLocationArgV2,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CancelLocationArgV2_choice, hf_index, ett_gsm_map_CancelLocationArgV2,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CancelLocationRes_sequence[] = {
+static const ber_old_sequence_t CancelLocationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_CancelLocationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelLocationRes_sequence, hf_index, ett_gsm_map_CancelLocationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelLocationRes_sequence, hf_index, ett_gsm_map_CancelLocationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t PurgeMSArg_sequence[] = {
+static const ber_old_sequence_t PurgeMSArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vlr_Number_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsn_Number_impl },
@@ -3846,14 +3846,14 @@ static const ber_sequence_t PurgeMSArg_sequence[] = {
 
 static int
 dissect_gsm_map_PurgeMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PurgeMSArg_sequence, hf_index, ett_gsm_map_PurgeMSArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PurgeMSArg_sequence, hf_index, ett_gsm_map_PurgeMSArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PurgeMSArgV2_sequence[] = {
+static const ber_old_sequence_t PurgeMSArgV2_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_vlr_Number },
   { 0, 0, 0, NULL }
@@ -3861,14 +3861,14 @@ static const ber_sequence_t PurgeMSArgV2_sequence[] = {
 
 static int
 dissect_gsm_map_PurgeMSArgV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PurgeMSArgV2_sequence, hf_index, ett_gsm_map_PurgeMSArgV2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PurgeMSArgV2_sequence, hf_index, ett_gsm_map_PurgeMSArgV2);
 
   return offset;
 }
 
 
-static const ber_sequence_t PurgeMSRes_sequence[] = {
+static const ber_old_sequence_t PurgeMSRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_freezeTMSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_freezeP_TMSI_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -3877,8 +3877,8 @@ static const ber_sequence_t PurgeMSRes_sequence[] = {
 
 static int
 dissect_gsm_map_PurgeMSRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PurgeMSRes_sequence, hf_index, ett_gsm_map_PurgeMSRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PurgeMSRes_sequence, hf_index, ett_gsm_map_PurgeMSRes);
 
   return offset;
 }
@@ -3957,7 +3957,7 @@ static int dissect_hopCounter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SendIdentificationArg_sequence[] = {
+static const ber_old_sequence_t SendIdentificationArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_tmsi },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_numberOfRequestedVectors },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_segmentationProhibited },
@@ -3970,8 +3970,8 @@ static const ber_sequence_t SendIdentificationArg_sequence[] = {
 
 static int
 dissect_gsm_map_SendIdentificationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendIdentificationArg_sequence, hf_index, ett_gsm_map_SendIdentificationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendIdentificationArg_sequence, hf_index, ett_gsm_map_SendIdentificationArg);
 
   return offset;
 }
@@ -4022,7 +4022,7 @@ static int dissect_groupKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t AuthenticationTriplet_sequence[] = {
+static const ber_old_sequence_t AuthenticationTriplet_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sres },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kc },
@@ -4031,8 +4031,8 @@ static const ber_sequence_t AuthenticationTriplet_sequence[] = {
 
 static int
 dissect_gsm_map_AuthenticationTriplet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticationTriplet_sequence, hf_index, ett_gsm_map_AuthenticationTriplet);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticationTriplet_sequence, hf_index, ett_gsm_map_AuthenticationTriplet);
 
   return offset;
 }
@@ -4041,14 +4041,14 @@ static int dissect_TripletList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TripletList_sequence_of[1] = {
+static const ber_old_sequence_t TripletList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TripletList_item },
 };
 
 static int
 dissect_gsm_map_TripletList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TripletList_sequence_of, hf_index, ett_gsm_map_TripletList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TripletList_sequence_of, hf_index, ett_gsm_map_TripletList);
 
   return offset;
 }
@@ -4112,7 +4112,7 @@ static int dissect_autn(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t AuthenticationQuintuplet_sequence[] = {
+static const ber_old_sequence_t AuthenticationQuintuplet_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_xres },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ck },
@@ -4123,8 +4123,8 @@ static const ber_sequence_t AuthenticationQuintuplet_sequence[] = {
 
 static int
 dissect_gsm_map_AuthenticationQuintuplet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticationQuintuplet_sequence, hf_index, ett_gsm_map_AuthenticationQuintuplet);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticationQuintuplet_sequence, hf_index, ett_gsm_map_AuthenticationQuintuplet);
 
   return offset;
 }
@@ -4133,14 +4133,14 @@ static int dissect_QuintupletList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t QuintupletList_sequence_of[1] = {
+static const ber_old_sequence_t QuintupletList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QuintupletList_item },
 };
 
 static int
 dissect_gsm_map_QuintupletList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      QuintupletList_sequence_of, hf_index, ett_gsm_map_QuintupletList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          QuintupletList_sequence_of, hf_index, ett_gsm_map_QuintupletList);
 
   return offset;
 }
@@ -4155,7 +4155,7 @@ static const value_string gsm_map_AuthenticationSetList_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuthenticationSetList_choice[] = {
+static const ber_old_choice_t AuthenticationSetList_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_tripletList_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_quintupletList_impl },
   { 0, 0, 0, 0, NULL }
@@ -4163,9 +4163,9 @@ static const ber_choice_t AuthenticationSetList_choice[] = {
 
 static int
 dissect_gsm_map_AuthenticationSetList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuthenticationSetList_choice, hf_index, ett_gsm_map_AuthenticationSetList,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuthenticationSetList_choice, hf_index, ett_gsm_map_AuthenticationSetList,
+                                     NULL);
 
   return offset;
 }
@@ -4190,7 +4190,7 @@ static int dissect_cksn_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t GSM_SecurityContextData_sequence[] = {
+static const ber_old_sequence_t GSM_SecurityContextData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kc },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cksn },
   { 0, 0, 0, NULL }
@@ -4198,8 +4198,8 @@ static const ber_sequence_t GSM_SecurityContextData_sequence[] = {
 
 static int
 dissect_gsm_map_GSM_SecurityContextData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GSM_SecurityContextData_sequence, hf_index, ett_gsm_map_GSM_SecurityContextData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GSM_SecurityContextData_sequence, hf_index, ett_gsm_map_GSM_SecurityContextData);
 
   return offset;
 }
@@ -4221,7 +4221,7 @@ static int dissect_ksi(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t UMTS_SecurityContextData_sequence[] = {
+static const ber_old_sequence_t UMTS_SecurityContextData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ck },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ik },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ksi },
@@ -4230,8 +4230,8 @@ static const ber_sequence_t UMTS_SecurityContextData_sequence[] = {
 
 static int
 dissect_gsm_map_UMTS_SecurityContextData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UMTS_SecurityContextData_sequence, hf_index, ett_gsm_map_UMTS_SecurityContextData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UMTS_SecurityContextData_sequence, hf_index, ett_gsm_map_UMTS_SecurityContextData);
 
   return offset;
 }
@@ -4246,7 +4246,7 @@ static const value_string gsm_map_CurrentSecurityContext_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CurrentSecurityContext_choice[] = {
+static const ber_old_choice_t CurrentSecurityContext_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_SecurityContextData_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_umts_SecurityContextData_impl },
   { 0, 0, 0, 0, NULL }
@@ -4254,9 +4254,9 @@ static const ber_choice_t CurrentSecurityContext_choice[] = {
 
 static int
 dissect_gsm_map_CurrentSecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CurrentSecurityContext_choice, hf_index, ett_gsm_map_CurrentSecurityContext,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CurrentSecurityContext_choice, hf_index, ett_gsm_map_CurrentSecurityContext,
+                                     NULL);
 
   return offset;
 }
@@ -4265,7 +4265,7 @@ static int dissect_currentSecurityContext_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SendIdentificationRes_sequence[] = {
+static const ber_old_sequence_t SendIdentificationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authenticationSetList },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_currentSecurityContext_impl },
@@ -4275,14 +4275,14 @@ static const ber_sequence_t SendIdentificationRes_sequence[] = {
 
 static int
 dissect_gsm_map_SendIdentificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendIdentificationRes_sequence, hf_index, ett_gsm_map_SendIdentificationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendIdentificationRes_sequence, hf_index, ett_gsm_map_SendIdentificationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendIdentificationResV2_sequence[] = {
+static const ber_old_sequence_t SendIdentificationResV2_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_tripletList },
   { 0, 0, 0, NULL }
@@ -4290,8 +4290,8 @@ static const ber_sequence_t SendIdentificationResV2_sequence[] = {
 
 static int
 dissect_gsm_map_SendIdentificationResV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendIdentificationResV2_sequence, hf_index, ett_gsm_map_SendIdentificationResV2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendIdentificationResV2_sequence, hf_index, ett_gsm_map_SendIdentificationResV2);
 
   return offset;
 }
@@ -4329,7 +4329,7 @@ static int dissect_cellId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t PrepareHO_Arg_sequence[] = {
+static const ber_old_sequence_t PrepareHO_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_targetCellId },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ho_NumberNotRequired },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bss_APDU },
@@ -4338,8 +4338,8 @@ static const ber_sequence_t PrepareHO_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareHO_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareHO_Arg_sequence, hf_index, ett_gsm_map_PrepareHO_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareHO_Arg_sequence, hf_index, ett_gsm_map_PrepareHO_Arg);
 
   return offset;
 }
@@ -4429,7 +4429,7 @@ static int dissect_longsignalInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t AccessNetworkSignalInfo_sequence[] = {
+static const ber_old_sequence_t AccessNetworkSignalInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_accessNetworkProtocolId },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_longsignalInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -4438,8 +4438,8 @@ static const ber_sequence_t AccessNetworkSignalInfo_sequence[] = {
 
 static int
 dissect_gsm_map_AccessNetworkSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AccessNetworkSignalInfo_sequence, hf_index, ett_gsm_map_AccessNetworkSignalInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AccessNetworkSignalInfo_sequence, hf_index, ett_gsm_map_AccessNetworkSignalInfo);
 
   return offset;
 }
@@ -4576,7 +4576,7 @@ static int dissect_encryptionAlgorithms_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AllowedUMTS_Algorithms_sequence[] = {
+static const ber_old_sequence_t AllowedUMTS_Algorithms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_integrityProtectionAlgorithms_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptionAlgorithms_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -4585,8 +4585,8 @@ static const ber_sequence_t AllowedUMTS_Algorithms_sequence[] = {
 
 static int
 dissect_gsm_map_AllowedUMTS_Algorithms(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AllowedUMTS_Algorithms_sequence, hf_index, ett_gsm_map_AllowedUMTS_Algorithms);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AllowedUMTS_Algorithms_sequence, hf_index, ett_gsm_map_AllowedUMTS_Algorithms);
 
   return offset;
 }
@@ -4614,7 +4614,7 @@ static int dissect_selectedRab_Id_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RadioResource_sequence[] = {
+static const ber_old_sequence_t RadioResource_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_radioResourceInformation },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rab_Id },
   { 0, 0, 0, NULL }
@@ -4622,8 +4622,8 @@ static const ber_sequence_t RadioResource_sequence[] = {
 
 static int
 dissect_gsm_map_RadioResource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RadioResource_sequence, hf_index, ett_gsm_map_RadioResource);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RadioResource_sequence, hf_index, ett_gsm_map_RadioResource);
 
   return offset;
 }
@@ -4632,14 +4632,14 @@ static int dissect_RadioResourceList_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t RadioResourceList_sequence_of[1] = {
+static const ber_old_sequence_t RadioResourceList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RadioResourceList_item },
 };
 
 static int
 dissect_gsm_map_RadioResourceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RadioResourceList_sequence_of, hf_index, ett_gsm_map_RadioResourceList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RadioResourceList_sequence_of, hf_index, ett_gsm_map_RadioResourceList);
 
   return offset;
 }
@@ -4690,7 +4690,7 @@ static int dissect_ranap_ServiceHandover_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t BSSMAP_ServiceHandoverInfo_sequence[] = {
+static const ber_old_sequence_t BSSMAP_ServiceHandoverInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_bssmap_ServiceHandover },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rab_Id },
   { 0, 0, 0, NULL }
@@ -4698,8 +4698,8 @@ static const ber_sequence_t BSSMAP_ServiceHandoverInfo_sequence[] = {
 
 static int
 dissect_gsm_map_BSSMAP_ServiceHandoverInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BSSMAP_ServiceHandoverInfo_sequence, hf_index, ett_gsm_map_BSSMAP_ServiceHandoverInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BSSMAP_ServiceHandoverInfo_sequence, hf_index, ett_gsm_map_BSSMAP_ServiceHandoverInfo);
 
   return offset;
 }
@@ -4708,14 +4708,14 @@ static int dissect_BSSMAP_ServiceHandoverList_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t BSSMAP_ServiceHandoverList_sequence_of[1] = {
+static const ber_old_sequence_t BSSMAP_ServiceHandoverList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BSSMAP_ServiceHandoverList_item },
 };
 
 static int
 dissect_gsm_map_BSSMAP_ServiceHandoverList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BSSMAP_ServiceHandoverList_sequence_of, hf_index, ett_gsm_map_BSSMAP_ServiceHandoverList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BSSMAP_ServiceHandoverList_sequence_of, hf_index, ett_gsm_map_BSSMAP_ServiceHandoverList);
 
   return offset;
 }
@@ -4801,7 +4801,7 @@ static int dissect_currentlyUsedCodec_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t CodecList_sequence[] = {
+static const ber_old_sequence_t CodecList_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_codec1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_codec2_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_codec3_impl },
@@ -4816,8 +4816,8 @@ static const ber_sequence_t CodecList_sequence[] = {
 
 static int
 dissect_gsm_map_CodecList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CodecList_sequence, hf_index, ett_gsm_map_CodecList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CodecList_sequence, hf_index, ett_gsm_map_CodecList);
 
   return offset;
 }
@@ -4835,7 +4835,7 @@ static int dissect_geranCodecList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SupportedCodecsList_sequence[] = {
+static const ber_old_sequence_t SupportedCodecsList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_utranCodecList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_geranCodecList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -4844,8 +4844,8 @@ static const ber_sequence_t SupportedCodecsList_sequence[] = {
 
 static int
 dissect_gsm_map_SupportedCodecsList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SupportedCodecsList_sequence, hf_index, ett_gsm_map_SupportedCodecsList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SupportedCodecsList_sequence, hf_index, ett_gsm_map_SupportedCodecsList);
 
   return offset;
 }
@@ -4882,7 +4882,7 @@ static int dissect_uesbi_IuB_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t UESBI_Iu_sequence[] = {
+static const ber_old_sequence_t UESBI_Iu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uesbi_IuA_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uesbi_IuB_impl },
   { 0, 0, 0, NULL }
@@ -4890,8 +4890,8 @@ static const ber_sequence_t UESBI_Iu_sequence[] = {
 
 static int
 dissect_gsm_map_UESBI_Iu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UESBI_Iu_sequence, hf_index, ett_gsm_map_UESBI_Iu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UESBI_Iu_sequence, hf_index, ett_gsm_map_UESBI_Iu);
 
   return offset;
 }
@@ -5113,7 +5113,7 @@ static int dissect_mgw_EventList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t TracePropagationList_sequence[] = {
+static const ber_old_sequence_t TracePropagationList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_traceReference_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_traceType_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_traceReference2_impl },
@@ -5131,8 +5131,8 @@ static const ber_sequence_t TracePropagationList_sequence[] = {
 
 static int
 dissect_gsm_map_TracePropagationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TracePropagationList_sequence, hf_index, ett_gsm_map_TracePropagationList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TracePropagationList_sequence, hf_index, ett_gsm_map_TracePropagationList);
 
   return offset;
 }
@@ -5141,7 +5141,7 @@ static int dissect_tracePropagationList_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PrepareHO_ArgV3_sequence[] = {
+static const ber_old_sequence_t PrepareHO_ArgV3_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetCellId_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ho_NumberNotRequired },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetRNCId_impl },
@@ -5173,14 +5173,14 @@ static const ber_sequence_t PrepareHO_ArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareHO_ArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareHO_ArgV3_sequence, hf_index, ett_gsm_map_PrepareHO_ArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareHO_ArgV3_sequence, hf_index, ett_gsm_map_PrepareHO_ArgV3);
 
   return offset;
 }
 
 
-static const ber_sequence_t PrepareHO_Res_sequence[] = {
+static const ber_old_sequence_t PrepareHO_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_handoverNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bss_APDU },
   { 0, 0, 0, NULL }
@@ -5188,14 +5188,14 @@ static const ber_sequence_t PrepareHO_Res_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareHO_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareHO_Res_sequence, hf_index, ett_gsm_map_PrepareHO_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareHO_Res_sequence, hf_index, ett_gsm_map_PrepareHO_Res);
 
   return offset;
 }
 
 
-static const ber_sequence_t RelocationNumber_sequence[] = {
+static const ber_old_sequence_t RelocationNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_handoverNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_rab_Id },
   { 0, 0, 0, NULL }
@@ -5203,8 +5203,8 @@ static const ber_sequence_t RelocationNumber_sequence[] = {
 
 static int
 dissect_gsm_map_RelocationNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RelocationNumber_sequence, hf_index, ett_gsm_map_RelocationNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RelocationNumber_sequence, hf_index, ett_gsm_map_RelocationNumber);
 
   return offset;
 }
@@ -5213,14 +5213,14 @@ static int dissect_RelocationNumberList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t RelocationNumberList_sequence_of[1] = {
+static const ber_old_sequence_t RelocationNumberList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelocationNumberList_item },
 };
 
 static int
 dissect_gsm_map_RelocationNumberList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RelocationNumberList_sequence_of, hf_index, ett_gsm_map_RelocationNumberList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RelocationNumberList_sequence_of, hf_index, ett_gsm_map_RelocationNumberList);
 
   return offset;
 }
@@ -5268,7 +5268,7 @@ static int dissect_encryptionAlgorithm_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SelectedUMTS_Algorithms_sequence[] = {
+static const ber_old_sequence_t SelectedUMTS_Algorithms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_integrityProtectionAlgorithm_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptionAlgorithm_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -5277,8 +5277,8 @@ static const ber_sequence_t SelectedUMTS_Algorithms_sequence[] = {
 
 static int
 dissect_gsm_map_SelectedUMTS_Algorithms(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SelectedUMTS_Algorithms_sequence, hf_index, ett_gsm_map_SelectedUMTS_Algorithms);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SelectedUMTS_Algorithms_sequence, hf_index, ett_gsm_map_SelectedUMTS_Algorithms);
 
   return offset;
 }
@@ -5313,7 +5313,7 @@ static int dissect_chosenSpeechVersion_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ChosenRadioResourceInformation_sequence[] = {
+static const ber_old_sequence_t ChosenRadioResourceInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chosenChannelInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chosenSpeechVersion_impl },
   { 0, 0, 0, NULL }
@@ -5321,8 +5321,8 @@ static const ber_sequence_t ChosenRadioResourceInformation_sequence[] = {
 
 static int
 dissect_gsm_map_ChosenRadioResourceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChosenRadioResourceInformation_sequence, hf_index, ett_gsm_map_ChosenRadioResourceInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChosenRadioResourceInformation_sequence, hf_index, ett_gsm_map_ChosenRadioResourceInformation);
 
   return offset;
 }
@@ -5331,7 +5331,7 @@ static int dissect_chosenRadioResourceInformation_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t PrepareHO_ResV3_sequence[] = {
+static const ber_old_sequence_t PrepareHO_ResV3_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_handoverNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_relocationNumberList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_an_APDU_impl },
@@ -5347,14 +5347,14 @@ static const ber_sequence_t PrepareHO_ResV3_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareHO_ResV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareHO_ResV3_sequence, hf_index, ett_gsm_map_PrepareHO_ResV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareHO_ResV3_sequence, hf_index, ett_gsm_map_PrepareHO_ResV3);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendEndSignalArgV3_sequence[] = {
+static const ber_old_sequence_t SendEndSignalArgV3_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_an_APDU },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -5362,22 +5362,22 @@ static const ber_sequence_t SendEndSignalArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_SendEndSignalArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendEndSignalArgV3_sequence, hf_index, ett_gsm_map_SendEndSignalArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendEndSignalArgV3_sequence, hf_index, ett_gsm_map_SendEndSignalArgV3);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendEndSignalRes_sequence[] = {
+static const ber_old_sequence_t SendEndSignalRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_SendEndSignalRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendEndSignalRes_sequence, hf_index, ett_gsm_map_SendEndSignalRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendEndSignalRes_sequence, hf_index, ett_gsm_map_SendEndSignalRes);
 
   return offset;
 }
@@ -5396,7 +5396,7 @@ static int dissect_selectedGSM_Algorithm_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ProcessAccessSignallingArgV3_sequence[] = {
+static const ber_old_sequence_t ProcessAccessSignallingArgV3_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_an_APDU },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_selectedUMTS_Algorithms_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_selectedGSM_Algorithm_impl },
@@ -5410,8 +5410,8 @@ static const ber_sequence_t ProcessAccessSignallingArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_ProcessAccessSignallingArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProcessAccessSignallingArgV3_sequence, hf_index, ett_gsm_map_ProcessAccessSignallingArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProcessAccessSignallingArgV3_sequence, hf_index, ett_gsm_map_ProcessAccessSignallingArgV3);
 
   return offset;
 }
@@ -5436,7 +5436,7 @@ static int dissect_keyStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ForwardAccessSignallingArgV3_sequence[] = {
+static const ber_old_sequence_t ForwardAccessSignallingArgV3_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_an_APDU },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_integrityProtectionInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptionInfo_impl },
@@ -5460,14 +5460,14 @@ static const ber_sequence_t ForwardAccessSignallingArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardAccessSignallingArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardAccessSignallingArgV3_sequence, hf_index, ett_gsm_map_ForwardAccessSignallingArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardAccessSignallingArgV3_sequence, hf_index, ett_gsm_map_ForwardAccessSignallingArgV3);
 
   return offset;
 }
 
 
-static const ber_sequence_t PrepareSubsequentHOArg_sequence[] = {
+static const ber_old_sequence_t PrepareSubsequentHOArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_targetCellId },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_targetMSC_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bss_APDU },
@@ -5476,14 +5476,14 @@ static const ber_sequence_t PrepareSubsequentHOArg_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareSubsequentHOArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareSubsequentHOArg_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareSubsequentHOArg_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PrepareSubsequentHOArgV3_sequence[] = {
+static const ber_old_sequence_t PrepareSubsequentHOArgV3_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetCellId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_targetMSC_Number_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_targetRNCId_impl },
@@ -5497,14 +5497,14 @@ static const ber_sequence_t PrepareSubsequentHOArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareSubsequentHOArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareSubsequentHOArgV3_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareSubsequentHOArgV3_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOArgV3);
 
   return offset;
 }
 
 
-static const ber_sequence_t PrepareSubsequentHOResV3_sequence[] = {
+static const ber_old_sequence_t PrepareSubsequentHOResV3_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_an_APDU },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -5512,8 +5512,8 @@ static const ber_sequence_t PrepareSubsequentHOResV3_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareSubsequentHOResV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareSubsequentHOResV3_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOResV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareSubsequentHOResV3_sequence, hf_index, ett_gsm_map_PrepareSubsequentHOResV3);
 
   return offset;
 }
@@ -5528,7 +5528,7 @@ dissect_gsm_map_SendAuthenticationInfoArg(gboolean implicit_tag _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Re_synchronisationInfo_sequence[] = {
+static const ber_old_sequence_t Re_synchronisationInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_auts },
   { 0, 0, 0, NULL }
@@ -5536,8 +5536,8 @@ static const ber_sequence_t Re_synchronisationInfo_sequence[] = {
 
 static int
 dissect_gsm_map_Re_synchronisationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Re_synchronisationInfo_sequence, hf_index, ett_gsm_map_Re_synchronisationInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Re_synchronisationInfo_sequence, hf_index, ett_gsm_map_Re_synchronisationInfo);
 
   return offset;
 }
@@ -5585,7 +5585,7 @@ static int dissect_plmn_Id_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SendAuthenticationInfoArgV2_sequence[] = {
+static const ber_old_sequence_t SendAuthenticationInfoArgV2_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numberOfRequestedVectors },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_segmentationProhibited },
@@ -5599,14 +5599,14 @@ static const ber_sequence_t SendAuthenticationInfoArgV2_sequence[] = {
 
 static int
 dissect_gsm_map_SendAuthenticationInfoArgV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendAuthenticationInfoArgV2_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoArgV2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendAuthenticationInfoArgV2_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoArgV2);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendAuthenticationInfoRes_item_sequence[] = {
+static const ber_old_sequence_t SendAuthenticationInfoRes_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sres },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kc },
@@ -5615,8 +5615,8 @@ static const ber_sequence_t SendAuthenticationInfoRes_item_sequence[] = {
 
 static int
 dissect_gsm_map_SendAuthenticationInfoRes_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendAuthenticationInfoRes_item_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoRes_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendAuthenticationInfoRes_item_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoRes_item);
 
   return offset;
 }
@@ -5625,20 +5625,20 @@ static int dissect_SendAuthenticationInfoRes_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SendAuthenticationInfoRes_sequence_of[1] = {
+static const ber_old_sequence_t SendAuthenticationInfoRes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SendAuthenticationInfoRes_item },
 };
 
 static int
 dissect_gsm_map_SendAuthenticationInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SendAuthenticationInfoRes_sequence_of, hf_index, ett_gsm_map_SendAuthenticationInfoRes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SendAuthenticationInfoRes_sequence_of, hf_index, ett_gsm_map_SendAuthenticationInfoRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendAuthenticationInfoResV3_sequence[] = {
+static const ber_old_sequence_t SendAuthenticationInfoResV3_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authenticationSetList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -5646,8 +5646,8 @@ static const ber_sequence_t SendAuthenticationInfoResV3_sequence[] = {
 
 static int
 dissect_gsm_map_SendAuthenticationInfoResV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendAuthenticationInfoResV3_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoResV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendAuthenticationInfoResV3_sequence, hf_index, ett_gsm_map_SendAuthenticationInfoResV3);
 
   return offset;
 }
@@ -5672,7 +5672,7 @@ static int dissect_requestedEquipmentInfo(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t CheckIMEIArgV3_sequence[] = {
+static const ber_old_sequence_t CheckIMEIArgV3_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imei },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_requestedEquipmentInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -5681,8 +5681,8 @@ static const ber_sequence_t CheckIMEIArgV3_sequence[] = {
 
 static int
 dissect_gsm_map_CheckIMEIArgV3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CheckIMEIArgV3_sequence, hf_index, ett_gsm_map_CheckIMEIArgV3);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CheckIMEIArgV3_sequence, hf_index, ett_gsm_map_CheckIMEIArgV3);
 
   return offset;
 }
@@ -5708,7 +5708,7 @@ static int dissect_equipmentStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CheckIMEIRes_sequence[] = {
+static const ber_old_sequence_t CheckIMEIRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_equipmentStatus },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bmuef },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -5717,8 +5717,8 @@ static const ber_sequence_t CheckIMEIRes_sequence[] = {
 
 static int
 dissect_gsm_map_CheckIMEIRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CheckIMEIRes_sequence, hf_index, ett_gsm_map_CheckIMEIRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CheckIMEIRes_sequence, hf_index, ett_gsm_map_CheckIMEIRes);
 
   return offset;
 }
@@ -5775,7 +5775,7 @@ static const value_string gsm_map_BasicServiceCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BasicServiceCode_choice[] = {
+static const ber_old_choice_t BasicServiceCode_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_bearerService_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_teleservice_code_impl },
   { 0, 0, 0, 0, NULL }
@@ -5783,9 +5783,9 @@ static const ber_choice_t BasicServiceCode_choice[] = {
 
 static int
 dissect_gsm_map_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BasicServiceCode_choice, hf_index, ett_gsm_map_BasicServiceCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BasicServiceCode_choice, hf_index, ett_gsm_map_BasicServiceCode,
+                                     NULL);
 
   return offset;
 }
@@ -5800,14 +5800,14 @@ static int dissect_basicServiceGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t BasicServiceGroupList_sequence_of[1] = {
+static const ber_old_sequence_t BasicServiceGroupList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_BasicServiceGroupList_item },
 };
 
 static int
 dissect_gsm_map_BasicServiceGroupList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BasicServiceGroupList_sequence_of, hf_index, ett_gsm_map_BasicServiceGroupList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BasicServiceGroupList_sequence_of, hf_index, ett_gsm_map_BasicServiceGroupList);
 
   return offset;
 }
@@ -5965,7 +5965,7 @@ static int dissect_defaultCallHandling_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t O_BcsmCamelTDPData_sequence[] = {
+static const ber_old_sequence_t O_BcsmCamelTDPData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_o_BcsmTriggerDetectionPoint },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -5976,8 +5976,8 @@ static const ber_sequence_t O_BcsmCamelTDPData_sequence[] = {
 
 static int
 dissect_gsm_map_O_BcsmCamelTDPData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   O_BcsmCamelTDPData_sequence, hf_index, ett_gsm_map_O_BcsmCamelTDPData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       O_BcsmCamelTDPData_sequence, hf_index, ett_gsm_map_O_BcsmCamelTDPData);
 
   return offset;
 }
@@ -5986,14 +5986,14 @@ static int dissect_O_BcsmCamelTDPDataList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t O_BcsmCamelTDPDataList_sequence_of[1] = {
+static const ber_old_sequence_t O_BcsmCamelTDPDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_O_BcsmCamelTDPDataList_item },
 };
 
 static int
 dissect_gsm_map_O_BcsmCamelTDPDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      O_BcsmCamelTDPDataList_sequence_of, hf_index, ett_gsm_map_O_BcsmCamelTDPDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          O_BcsmCamelTDPDataList_sequence_of, hf_index, ett_gsm_map_O_BcsmCamelTDPDataList);
 
   return offset;
 }
@@ -6015,7 +6015,7 @@ static int dissect_camelCapabilityHandling_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t O_CSI_sequence[] = {
+static const ber_old_sequence_t O_CSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_o_BcsmCamelTDPDataList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl },
@@ -6026,8 +6026,8 @@ static const ber_sequence_t O_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_O_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   O_CSI_sequence, hf_index, ett_gsm_map_O_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       O_CSI_sequence, hf_index, ett_gsm_map_O_CSI);
 
   return offset;
 }
@@ -6068,14 +6068,14 @@ static int dissect_ext_BearerService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t BearerServiceList_sequence_of[1] = {
+static const ber_old_sequence_t BearerServiceList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_BearerServiceList_item },
 };
 
 static int
 dissect_gsm_map_BearerServiceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BearerServiceList_sequence_of, hf_index, ett_gsm_map_BearerServiceList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BearerServiceList_sequence_of, hf_index, ett_gsm_map_BearerServiceList);
 
   return offset;
 }
@@ -6106,14 +6106,14 @@ static int dissect_ext_teleservice(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TeleserviceList_sequence_of[1] = {
+static const ber_old_sequence_t TeleserviceList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_TeleserviceList_item },
 };
 
 static int
 dissect_gsm_map_TeleserviceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TeleserviceList_sequence_of, hf_index, ett_gsm_map_TeleserviceList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TeleserviceList_sequence_of, hf_index, ett_gsm_map_TeleserviceList);
 
   return offset;
 }
@@ -6153,7 +6153,7 @@ const value_string gsm_map_Ext_BasicServiceCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Ext_BasicServiceCode_choice[] = {
+static const ber_old_choice_t Ext_BasicServiceCode_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ext_BearerService_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ext_Teleservice_impl },
   { 0, 0, 0, 0, NULL }
@@ -6161,9 +6161,9 @@ static const ber_choice_t Ext_BasicServiceCode_choice[] = {
 
 int
 dissect_gsm_map_Ext_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Ext_BasicServiceCode_choice, hf_index, ett_gsm_map_Ext_BasicServiceCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Ext_BasicServiceCode_choice, hf_index, ett_gsm_map_Ext_BasicServiceCode,
+                                     NULL);
 
   return offset;
 }
@@ -6361,7 +6361,7 @@ static int dissect_longForwardedToNumber_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Ext_ForwFeature_sequence[] = {
+static const ber_old_sequence_t Ext_ForwFeature_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ext_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl },
@@ -6375,8 +6375,8 @@ static const ber_sequence_t Ext_ForwFeature_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_ForwFeature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_ForwFeature_sequence, hf_index, ett_gsm_map_Ext_ForwFeature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_ForwFeature_sequence, hf_index, ett_gsm_map_Ext_ForwFeature);
 
   return offset;
 }
@@ -6385,14 +6385,14 @@ static int dissect_Ext_ForwFeatureList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Ext_ForwFeatureList_sequence_of[1] = {
+static const ber_old_sequence_t Ext_ForwFeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Ext_ForwFeatureList_item },
 };
 
 static int
 dissect_gsm_map_Ext_ForwFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Ext_ForwFeatureList_sequence_of, hf_index, ett_gsm_map_Ext_ForwFeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Ext_ForwFeatureList_sequence_of, hf_index, ett_gsm_map_Ext_ForwFeatureList);
 
   return offset;
 }
@@ -6404,7 +6404,7 @@ static int dissect_ext_forwardingFeatureList_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t Ext_ForwInfo_sequence[] = {
+static const ber_old_sequence_t Ext_ForwInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ext_forwardingFeatureList },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -6413,8 +6413,8 @@ static const ber_sequence_t Ext_ForwInfo_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_ForwInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_ForwInfo_sequence, hf_index, ett_gsm_map_Ext_ForwInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_ForwInfo_sequence, hf_index, ett_gsm_map_Ext_ForwInfo);
 
   return offset;
 }
@@ -6423,7 +6423,7 @@ static int dissect_ext_forwardingInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Ext_CallBarringFeature_sequence[] = {
+static const ber_old_sequence_t Ext_CallBarringFeature_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ext_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -6432,8 +6432,8 @@ static const ber_sequence_t Ext_CallBarringFeature_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_CallBarringFeature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_CallBarringFeature_sequence, hf_index, ett_gsm_map_Ext_CallBarringFeature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_CallBarringFeature_sequence, hf_index, ett_gsm_map_Ext_CallBarringFeature);
 
   return offset;
 }
@@ -6442,14 +6442,14 @@ static int dissect_Ext_CallBarFeatureList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Ext_CallBarFeatureList_sequence_of[1] = {
+static const ber_old_sequence_t Ext_CallBarFeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Ext_CallBarFeatureList_item },
 };
 
 static int
 dissect_gsm_map_Ext_CallBarFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Ext_CallBarFeatureList_sequence_of, hf_index, ett_gsm_map_Ext_CallBarFeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Ext_CallBarFeatureList_sequence_of, hf_index, ett_gsm_map_Ext_CallBarFeatureList);
 
   return offset;
 }
@@ -6461,7 +6461,7 @@ static int dissect_ext_callBarringFeatureList_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t Ext_CallBarInfo_sequence[] = {
+static const ber_old_sequence_t Ext_CallBarInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ext_callBarringFeatureList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -6470,8 +6470,8 @@ static const ber_sequence_t Ext_CallBarInfo_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_CallBarInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_CallBarInfo_sequence, hf_index, ett_gsm_map_Ext_CallBarInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_CallBarInfo_sequence, hf_index, ett_gsm_map_Ext_CallBarInfo);
 
   return offset;
 }
@@ -6529,14 +6529,14 @@ static int dissect_intraCUG_Options(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Ext_BasicServiceGroupList_sequence_of[1] = {
+static const ber_old_sequence_t Ext_BasicServiceGroupList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Ext_BasicServiceGroupList_item },
 };
 
 static int
 dissect_gsm_map_Ext_BasicServiceGroupList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Ext_BasicServiceGroupList_sequence_of, hf_index, ett_gsm_map_Ext_BasicServiceGroupList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Ext_BasicServiceGroupList_sequence_of, hf_index, ett_gsm_map_Ext_BasicServiceGroupList);
 
   return offset;
 }
@@ -6545,7 +6545,7 @@ static int dissect_basicServiceGroupList(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t CUG_Subscription_sequence[] = {
+static const ber_old_sequence_t CUG_Subscription_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_cug_Index },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cug_Interlock },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intraCUG_Options },
@@ -6556,8 +6556,8 @@ static const ber_sequence_t CUG_Subscription_sequence[] = {
 
 static int
 dissect_gsm_map_CUG_Subscription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CUG_Subscription_sequence, hf_index, ett_gsm_map_CUG_Subscription);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CUG_Subscription_sequence, hf_index, ett_gsm_map_CUG_Subscription);
 
   return offset;
 }
@@ -6566,14 +6566,14 @@ static int dissect_CUG_SubscriptionList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CUG_SubscriptionList_sequence_of[1] = {
+static const ber_old_sequence_t CUG_SubscriptionList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CUG_SubscriptionList_item },
 };
 
 static int
 dissect_gsm_map_CUG_SubscriptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CUG_SubscriptionList_sequence_of, hf_index, ett_gsm_map_CUG_SubscriptionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CUG_SubscriptionList_sequence_of, hf_index, ett_gsm_map_CUG_SubscriptionList);
 
   return offset;
 }
@@ -6595,7 +6595,7 @@ static int dissect_interCUG_Restrictions(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t CUG_Feature_sequence[] = {
+static const ber_old_sequence_t CUG_Feature_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ext_basicService },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_preferentialCUG_Indicator },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_interCUG_Restrictions },
@@ -6605,8 +6605,8 @@ static const ber_sequence_t CUG_Feature_sequence[] = {
 
 static int
 dissect_gsm_map_CUG_Feature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CUG_Feature_sequence, hf_index, ett_gsm_map_CUG_Feature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CUG_Feature_sequence, hf_index, ett_gsm_map_CUG_Feature);
 
   return offset;
 }
@@ -6615,14 +6615,14 @@ static int dissect_CUG_FeatureList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CUG_FeatureList_sequence_of[1] = {
+static const ber_old_sequence_t CUG_FeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CUG_FeatureList_item },
 };
 
 static int
 dissect_gsm_map_CUG_FeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CUG_FeatureList_sequence_of, hf_index, ett_gsm_map_CUG_FeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CUG_FeatureList_sequence_of, hf_index, ett_gsm_map_CUG_FeatureList);
 
   return offset;
 }
@@ -6631,7 +6631,7 @@ static int dissect_cug_FeatureList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CUG_Info_sequence[] = {
+static const ber_old_sequence_t CUG_Info_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cug_SubscriptionList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_FeatureList },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -6640,8 +6640,8 @@ static const ber_sequence_t CUG_Info_sequence[] = {
 
 int
 dissect_gsm_map_CUG_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CUG_Info_sequence, hf_index, ett_gsm_map_CUG_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CUG_Info_sequence, hf_index, ett_gsm_map_CUG_Info);
 
   return offset;
 }
@@ -6679,7 +6679,7 @@ static const value_string gsm_map_SS_SubscriptionOption_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SS_SubscriptionOption_choice[] = {
+static const ber_old_choice_t SS_SubscriptionOption_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cliRestrictionOption_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_overrideCategory_impl },
   { 0, 0, 0, 0, NULL }
@@ -6687,9 +6687,9 @@ static const ber_choice_t SS_SubscriptionOption_choice[] = {
 
 static int
 dissect_gsm_map_SS_SubscriptionOption(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SS_SubscriptionOption_choice, hf_index, ett_gsm_map_SS_SubscriptionOption,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SS_SubscriptionOption_choice, hf_index, ett_gsm_map_SS_SubscriptionOption,
+                                     NULL);
 
   return offset;
 }
@@ -6698,7 +6698,7 @@ static int dissect_ss_SubscriptionOption(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Ext_SS_Data_sequence[] = {
+static const ber_old_sequence_t Ext_SS_Data_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ss_SubscriptionOption },
@@ -6709,8 +6709,8 @@ static const ber_sequence_t Ext_SS_Data_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_SS_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_SS_Data_sequence, hf_index, ett_gsm_map_Ext_SS_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_SS_Data_sequence, hf_index, ett_gsm_map_Ext_SS_Data);
 
   return offset;
 }
@@ -6744,7 +6744,7 @@ static int dissect_priority_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t EMLPP_Info_sequence[] = {
+static const ber_old_sequence_t EMLPP_Info_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_maximumentitledPriority },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_defaultPriority },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -6753,8 +6753,8 @@ static const ber_sequence_t EMLPP_Info_sequence[] = {
 
 static int
 dissect_gsm_map_EMLPP_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EMLPP_Info_sequence, hf_index, ett_gsm_map_EMLPP_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EMLPP_Info_sequence, hf_index, ett_gsm_map_EMLPP_Info);
 
   return offset;
 }
@@ -6772,7 +6772,7 @@ static const value_string gsm_map_Ext_SS_Info_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Ext_SS_Info_choice[] = {
+static const ber_old_choice_t Ext_SS_Info_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ext_forwardingInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ext_callBarringInfo_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cug_Info_impl },
@@ -6783,9 +6783,9 @@ static const ber_choice_t Ext_SS_Info_choice[] = {
 
 static int
 dissect_gsm_map_Ext_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Ext_SS_Info_choice, hf_index, ett_gsm_map_Ext_SS_Info,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Ext_SS_Info_choice, hf_index, ett_gsm_map_Ext_SS_Info,
+                                     NULL);
 
   return offset;
 }
@@ -6794,14 +6794,14 @@ static int dissect_Ext_SS_InfoList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Ext_SS_InfoList_sequence_of[1] = {
+static const ber_old_sequence_t Ext_SS_InfoList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Ext_SS_InfoList_item },
 };
 
 static int
 dissect_gsm_map_Ext_SS_InfoList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Ext_SS_InfoList_sequence_of, hf_index, ett_gsm_map_Ext_SS_InfoList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Ext_SS_InfoList_sequence_of, hf_index, ett_gsm_map_Ext_SS_InfoList);
 
   return offset;
 }
@@ -6810,7 +6810,7 @@ static int dissect_provisionedSS_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ODB_Data_sequence[] = {
+static const ber_old_sequence_t ODB_Data_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_odb_GeneralData },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_odb_HPLMN_Data },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -6819,8 +6819,8 @@ static const ber_sequence_t ODB_Data_sequence[] = {
 
 static int
 dissect_gsm_map_ODB_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ODB_Data_sequence, hf_index, ett_gsm_map_ODB_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ODB_Data_sequence, hf_index, ett_gsm_map_ODB_Data);
 
   return offset;
 }
@@ -6851,14 +6851,14 @@ static int dissect_ZoneCodeList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ZoneCodeList_sequence_of[1] = {
+static const ber_old_sequence_t ZoneCodeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ZoneCodeList_item },
 };
 
 static int
 dissect_gsm_map_ZoneCodeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ZoneCodeList_sequence_of, hf_index, ett_gsm_map_ZoneCodeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ZoneCodeList_sequence_of, hf_index, ett_gsm_map_ZoneCodeList);
 
   return offset;
 }
@@ -6919,7 +6919,7 @@ static int dissect_additionalInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t VoiceBroadcastData_sequence[] = {
+static const ber_old_sequence_t VoiceBroadcastData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupid },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_broadcastInitEntitlement },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -6930,8 +6930,8 @@ static const ber_sequence_t VoiceBroadcastData_sequence[] = {
 
 static int
 dissect_gsm_map_VoiceBroadcastData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VoiceBroadcastData_sequence, hf_index, ett_gsm_map_VoiceBroadcastData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VoiceBroadcastData_sequence, hf_index, ett_gsm_map_VoiceBroadcastData);
 
   return offset;
 }
@@ -6940,14 +6940,14 @@ static int dissect_VBSDataList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t VBSDataList_sequence_of[1] = {
+static const ber_old_sequence_t VBSDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_VBSDataList_item },
 };
 
 static int
 dissect_gsm_map_VBSDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      VBSDataList_sequence_of, hf_index, ett_gsm_map_VBSDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          VBSDataList_sequence_of, hf_index, ett_gsm_map_VBSDataList);
 
   return offset;
 }
@@ -6956,7 +6956,7 @@ static int dissect_vbsSubscriptionData_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t VoiceGroupCallData_sequence[] = {
+static const ber_old_sequence_t VoiceGroupCallData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -6964,8 +6964,8 @@ static const ber_sequence_t VoiceGroupCallData_sequence[] = {
 
 static int
 dissect_gsm_map_VoiceGroupCallData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VoiceGroupCallData_sequence, hf_index, ett_gsm_map_VoiceGroupCallData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VoiceGroupCallData_sequence, hf_index, ett_gsm_map_VoiceGroupCallData);
 
   return offset;
 }
@@ -6974,14 +6974,14 @@ static int dissect_VGCSDataList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t VGCSDataList_sequence_of[1] = {
+static const ber_old_sequence_t VGCSDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_VGCSDataList_item },
 };
 
 static int
 dissect_gsm_map_VGCSDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      VGCSDataList_sequence_of, hf_index, ett_gsm_map_VGCSDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          VGCSDataList_sequence_of, hf_index, ett_gsm_map_VGCSDataList);
 
   return offset;
 }
@@ -6990,14 +6990,14 @@ static int dissect_vgcsSubscriptionData_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SS_EventList_sequence_of[1] = {
+static const ber_old_sequence_t SS_EventList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SS_EventList_item },
 };
 
 static int
 dissect_gsm_map_SS_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SS_EventList_sequence_of, hf_index, ett_gsm_map_SS_EventList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SS_EventList_sequence_of, hf_index, ett_gsm_map_SS_EventList);
 
   return offset;
 }
@@ -7006,7 +7006,7 @@ static int dissect_ss_EventList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SS_CamelData_sequence[] = {
+static const ber_old_sequence_t SS_CamelData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ss_EventList },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsmSCF_Address },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -7015,8 +7015,8 @@ static const ber_sequence_t SS_CamelData_sequence[] = {
 
 static int
 dissect_gsm_map_SS_CamelData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_CamelData_sequence, hf_index, ett_gsm_map_SS_CamelData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_CamelData_sequence, hf_index, ett_gsm_map_SS_CamelData);
 
   return offset;
 }
@@ -7025,7 +7025,7 @@ static int dissect_ss_CamelData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SS_CSI_sequence[] = {
+static const ber_old_sequence_t SS_CSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ss_CamelData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToCSE_impl },
@@ -7035,8 +7035,8 @@ static const ber_sequence_t SS_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_SS_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_CSI_sequence, hf_index, ett_gsm_map_SS_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_CSI_sequence, hf_index, ett_gsm_map_SS_CSI);
 
   return offset;
 }
@@ -7064,14 +7064,14 @@ static int dissect_matchType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t DestinationNumberList_sequence_of[1] = {
+static const ber_old_sequence_t DestinationNumberList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DestinationNumberList_item },
 };
 
 static int
 dissect_gsm_map_DestinationNumberList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DestinationNumberList_sequence_of, hf_index, ett_gsm_map_DestinationNumberList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DestinationNumberList_sequence_of, hf_index, ett_gsm_map_DestinationNumberList);
 
   return offset;
 }
@@ -7093,14 +7093,14 @@ static int dissect_DestinationNumberLengthList_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t DestinationNumberLengthList_sequence_of[1] = {
+static const ber_old_sequence_t DestinationNumberLengthList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_DestinationNumberLengthList_item },
 };
 
 static int
 dissect_gsm_map_DestinationNumberLengthList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DestinationNumberLengthList_sequence_of, hf_index, ett_gsm_map_DestinationNumberLengthList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DestinationNumberLengthList_sequence_of, hf_index, ett_gsm_map_DestinationNumberLengthList);
 
   return offset;
 }
@@ -7109,7 +7109,7 @@ static int dissect_destinationNumberLengthList_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t DestinationNumberCriteria_sequence[] = {
+static const ber_old_sequence_t DestinationNumberCriteria_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_matchType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberLengthList_impl },
@@ -7118,8 +7118,8 @@ static const ber_sequence_t DestinationNumberCriteria_sequence[] = {
 
 static int
 dissect_gsm_map_DestinationNumberCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DestinationNumberCriteria_sequence, hf_index, ett_gsm_map_DestinationNumberCriteria);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DestinationNumberCriteria_sequence, hf_index, ett_gsm_map_DestinationNumberCriteria);
 
   return offset;
 }
@@ -7128,14 +7128,14 @@ static int dissect_destinationNumberCriteria_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t BasicServiceCriteria_sequence_of[1] = {
+static const ber_old_sequence_t BasicServiceCriteria_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_BasicServiceCriteria_item },
 };
 
 static int
 dissect_gsm_map_BasicServiceCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BasicServiceCriteria_sequence_of, hf_index, ett_gsm_map_BasicServiceCriteria);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BasicServiceCriteria_sequence_of, hf_index, ett_gsm_map_BasicServiceCriteria);
 
   return offset;
 }
@@ -7179,14 +7179,14 @@ static int dissect_O_CauseValueCriteria_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t O_CauseValueCriteria_sequence_of[1] = {
+static const ber_old_sequence_t O_CauseValueCriteria_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_O_CauseValueCriteria_item },
 };
 
 static int
 dissect_gsm_map_O_CauseValueCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      O_CauseValueCriteria_sequence_of, hf_index, ett_gsm_map_O_CauseValueCriteria);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          O_CauseValueCriteria_sequence_of, hf_index, ett_gsm_map_O_CauseValueCriteria);
 
   return offset;
 }
@@ -7195,7 +7195,7 @@ static int dissect_o_CauseValueCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t O_BcsmCamelTDP_Criteria_sequence[] = {
+static const ber_old_sequence_t O_BcsmCamelTDP_Criteria_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_o_BcsmTriggerDetectionPoint },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberCriteria_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceCriteria_impl },
@@ -7207,8 +7207,8 @@ static const ber_sequence_t O_BcsmCamelTDP_Criteria_sequence[] = {
 
 static int
 dissect_gsm_map_O_BcsmCamelTDP_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   O_BcsmCamelTDP_Criteria_sequence, hf_index, ett_gsm_map_O_BcsmCamelTDP_Criteria);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       O_BcsmCamelTDP_Criteria_sequence, hf_index, ett_gsm_map_O_BcsmCamelTDP_Criteria);
 
   return offset;
 }
@@ -7217,14 +7217,14 @@ static int dissect_O_BcsmCamelTDPCriteriaList_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t O_BcsmCamelTDPCriteriaList_sequence_of[1] = {
+static const ber_old_sequence_t O_BcsmCamelTDPCriteriaList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_O_BcsmCamelTDPCriteriaList_item },
 };
 
 static int
 dissect_gsm_map_O_BcsmCamelTDPCriteriaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      O_BcsmCamelTDPCriteriaList_sequence_of, hf_index, ett_gsm_map_O_BcsmCamelTDPCriteriaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          O_BcsmCamelTDPCriteriaList_sequence_of, hf_index, ett_gsm_map_O_BcsmCamelTDPCriteriaList);
 
   return offset;
 }
@@ -7255,14 +7255,14 @@ static int dissect_MobilityTriggers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t MobilityTriggers_sequence_of[1] = {
+static const ber_old_sequence_t MobilityTriggers_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_MobilityTriggers_item },
 };
 
 static int
 dissect_gsm_map_MobilityTriggers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MobilityTriggers_sequence_of, hf_index, ett_gsm_map_MobilityTriggers);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MobilityTriggers_sequence_of, hf_index, ett_gsm_map_MobilityTriggers);
 
   return offset;
 }
@@ -7271,7 +7271,7 @@ static int dissect_mobilityTriggers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t M_CSI_sequence[] = {
+static const ber_old_sequence_t M_CSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mobilityTriggers },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -7283,8 +7283,8 @@ static const ber_sequence_t M_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_M_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   M_CSI_sequence, hf_index, ett_gsm_map_M_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       M_CSI_sequence, hf_index, ett_gsm_map_M_CSI);
 
   return offset;
 }
@@ -7334,7 +7334,7 @@ static int dissect_defaultSMS_Handling_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SMS_CAMEL_TDP_Data_sequence[] = {
+static const ber_old_sequence_t SMS_CAMEL_TDP_Data_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sms_TriggerDetectionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 2, 0, dissect_gsmSCF_Address },
@@ -7345,8 +7345,8 @@ static const ber_sequence_t SMS_CAMEL_TDP_Data_sequence[] = {
 
 static int
 dissect_gsm_map_SMS_CAMEL_TDP_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMS_CAMEL_TDP_Data_sequence, hf_index, ett_gsm_map_SMS_CAMEL_TDP_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMS_CAMEL_TDP_Data_sequence, hf_index, ett_gsm_map_SMS_CAMEL_TDP_Data);
 
   return offset;
 }
@@ -7355,14 +7355,14 @@ static int dissect_SMS_CAMEL_TDP_DataList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SMS_CAMEL_TDP_DataList_sequence_of[1] = {
+static const ber_old_sequence_t SMS_CAMEL_TDP_DataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMS_CAMEL_TDP_DataList_item },
 };
 
 static int
 dissect_gsm_map_SMS_CAMEL_TDP_DataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SMS_CAMEL_TDP_DataList_sequence_of, hf_index, ett_gsm_map_SMS_CAMEL_TDP_DataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SMS_CAMEL_TDP_DataList_sequence_of, hf_index, ett_gsm_map_SMS_CAMEL_TDP_DataList);
 
   return offset;
 }
@@ -7371,7 +7371,7 @@ static int dissect_sms_CAMEL_TDP_DataList_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SMS_CSI_sequence[] = {
+static const ber_old_sequence_t SMS_CSI_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sms_CAMEL_TDP_DataList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -7382,8 +7382,8 @@ static const ber_sequence_t SMS_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_SMS_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMS_CSI_sequence, hf_index, ett_gsm_map_SMS_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMS_CSI_sequence, hf_index, ett_gsm_map_SMS_CSI);
 
   return offset;
 }
@@ -7418,7 +7418,7 @@ static int dissect_t_BcsmTriggerDetectionPoint(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_BcsmCamelTDPData_sequence[] = {
+static const ber_old_sequence_t T_BcsmCamelTDPData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_t_BcsmTriggerDetectionPoint },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -7429,8 +7429,8 @@ static const ber_sequence_t T_BcsmCamelTDPData_sequence[] = {
 
 static int
 dissect_gsm_map_T_BcsmCamelTDPData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_BcsmCamelTDPData_sequence, hf_index, ett_gsm_map_T_BcsmCamelTDPData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_BcsmCamelTDPData_sequence, hf_index, ett_gsm_map_T_BcsmCamelTDPData);
 
   return offset;
 }
@@ -7439,14 +7439,14 @@ static int dissect_T_BcsmCamelTDPDataList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_BcsmCamelTDPDataList_sequence_of[1] = {
+static const ber_old_sequence_t T_BcsmCamelTDPDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_T_BcsmCamelTDPDataList_item },
 };
 
 static int
 dissect_gsm_map_T_BcsmCamelTDPDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_BcsmCamelTDPDataList_sequence_of, hf_index, ett_gsm_map_T_BcsmCamelTDPDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_BcsmCamelTDPDataList_sequence_of, hf_index, ett_gsm_map_T_BcsmCamelTDPDataList);
 
   return offset;
 }
@@ -7455,7 +7455,7 @@ static int dissect_t_BcsmCamelTDPDataList(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_CSI_sequence[] = {
+static const ber_old_sequence_t T_CSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_t_BcsmCamelTDPDataList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl },
@@ -7466,8 +7466,8 @@ static const ber_sequence_t T_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_T_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_CSI_sequence, hf_index, ett_gsm_map_T_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_CSI_sequence, hf_index, ett_gsm_map_T_CSI);
 
   return offset;
 }
@@ -7482,14 +7482,14 @@ static int dissect_vt_IM_CSI_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_CauseValueCriteria_sequence_of[1] = {
+static const ber_old_sequence_t T_CauseValueCriteria_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_T_CauseValueCriteria_item },
 };
 
 static int
 dissect_gsm_map_T_CauseValueCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_CauseValueCriteria_sequence_of, hf_index, ett_gsm_map_T_CauseValueCriteria);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_CauseValueCriteria_sequence_of, hf_index, ett_gsm_map_T_CauseValueCriteria);
 
   return offset;
 }
@@ -7498,7 +7498,7 @@ static int dissect_t_CauseValueCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_BCSM_CAMEL_TDP_Criteria_sequence[] = {
+static const ber_old_sequence_t T_BCSM_CAMEL_TDP_Criteria_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_t_BCSM_TriggerDetectionPoint },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceCriteria_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_t_CauseValueCriteria_impl },
@@ -7507,8 +7507,8 @@ static const ber_sequence_t T_BCSM_CAMEL_TDP_Criteria_sequence[] = {
 
 static int
 dissect_gsm_map_T_BCSM_CAMEL_TDP_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_BCSM_CAMEL_TDP_Criteria_sequence, hf_index, ett_gsm_map_T_BCSM_CAMEL_TDP_Criteria);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_BCSM_CAMEL_TDP_Criteria_sequence, hf_index, ett_gsm_map_T_BCSM_CAMEL_TDP_Criteria);
 
   return offset;
 }
@@ -7517,14 +7517,14 @@ static int dissect_T_BCSM_CAMEL_TDP_CriteriaList_item(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t T_BCSM_CAMEL_TDP_CriteriaList_sequence_of[1] = {
+static const ber_old_sequence_t T_BCSM_CAMEL_TDP_CriteriaList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_T_BCSM_CAMEL_TDP_CriteriaList_item },
 };
 
 static int
 dissect_gsm_map_T_BCSM_CAMEL_TDP_CriteriaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_BCSM_CAMEL_TDP_CriteriaList_sequence_of, hf_index, ett_gsm_map_T_BCSM_CAMEL_TDP_CriteriaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_BCSM_CAMEL_TDP_CriteriaList_sequence_of, hf_index, ett_gsm_map_T_BCSM_CAMEL_TDP_CriteriaList);
 
   return offset;
 }
@@ -7539,7 +7539,7 @@ static int dissect_vt_IM_BCSM_CAMEL_TDP_CriteriaList_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t DP_AnalysedInfoCriterium_sequence[] = {
+static const ber_old_sequence_t DP_AnalysedInfoCriterium_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_dialledNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsmSCF_Address },
@@ -7550,8 +7550,8 @@ static const ber_sequence_t DP_AnalysedInfoCriterium_sequence[] = {
 
 static int
 dissect_gsm_map_DP_AnalysedInfoCriterium(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DP_AnalysedInfoCriterium_sequence, hf_index, ett_gsm_map_DP_AnalysedInfoCriterium);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DP_AnalysedInfoCriterium_sequence, hf_index, ett_gsm_map_DP_AnalysedInfoCriterium);
 
   return offset;
 }
@@ -7560,14 +7560,14 @@ static int dissect_DP_AnalysedInfoCriteriaList_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t DP_AnalysedInfoCriteriaList_sequence_of[1] = {
+static const ber_old_sequence_t DP_AnalysedInfoCriteriaList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DP_AnalysedInfoCriteriaList_item },
 };
 
 static int
 dissect_gsm_map_DP_AnalysedInfoCriteriaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DP_AnalysedInfoCriteriaList_sequence_of, hf_index, ett_gsm_map_DP_AnalysedInfoCriteriaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DP_AnalysedInfoCriteriaList_sequence_of, hf_index, ett_gsm_map_DP_AnalysedInfoCriteriaList);
 
   return offset;
 }
@@ -7576,7 +7576,7 @@ static int dissect_dp_AnalysedInfoCriteriaList_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t D_CSI_sequence[] = {
+static const ber_old_sequence_t D_CSI_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dp_AnalysedInfoCriteriaList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -7587,8 +7587,8 @@ static const ber_sequence_t D_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_D_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   D_CSI_sequence, hf_index, ett_gsm_map_D_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       D_CSI_sequence, hf_index, ett_gsm_map_D_CSI);
 
   return offset;
 }
@@ -7623,14 +7623,14 @@ static int dissect_TPDU_TypeCriterion_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t TPDU_TypeCriterion_sequence_of[1] = {
+static const ber_old_sequence_t TPDU_TypeCriterion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_TPDU_TypeCriterion_item },
 };
 
 static int
 dissect_gsm_map_TPDU_TypeCriterion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TPDU_TypeCriterion_sequence_of, hf_index, ett_gsm_map_TPDU_TypeCriterion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TPDU_TypeCriterion_sequence_of, hf_index, ett_gsm_map_TPDU_TypeCriterion);
 
   return offset;
 }
@@ -7639,7 +7639,7 @@ static int dissect_tpdu_TypeCriterion_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t MT_smsCAMELTDP_Criteria_sequence[] = {
+static const ber_old_sequence_t MT_smsCAMELTDP_Criteria_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sms_TriggerDetectionPoint },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tpdu_TypeCriterion_impl },
   { 0, 0, 0, NULL }
@@ -7647,8 +7647,8 @@ static const ber_sequence_t MT_smsCAMELTDP_Criteria_sequence[] = {
 
 static int
 dissect_gsm_map_MT_smsCAMELTDP_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MT_smsCAMELTDP_Criteria_sequence, hf_index, ett_gsm_map_MT_smsCAMELTDP_Criteria);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MT_smsCAMELTDP_Criteria_sequence, hf_index, ett_gsm_map_MT_smsCAMELTDP_Criteria);
 
   return offset;
 }
@@ -7657,14 +7657,14 @@ static int dissect_MT_smsCAMELTDP_CriteriaList_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t MT_smsCAMELTDP_CriteriaList_sequence_of[1] = {
+static const ber_old_sequence_t MT_smsCAMELTDP_CriteriaList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MT_smsCAMELTDP_CriteriaList_item },
 };
 
 static int
 dissect_gsm_map_MT_smsCAMELTDP_CriteriaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MT_smsCAMELTDP_CriteriaList_sequence_of, hf_index, ett_gsm_map_MT_smsCAMELTDP_CriteriaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MT_smsCAMELTDP_CriteriaList_sequence_of, hf_index, ett_gsm_map_MT_smsCAMELTDP_CriteriaList);
 
   return offset;
 }
@@ -7673,7 +7673,7 @@ static int dissect_mt_smsCAMELTDP_CriteriaList_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t VlrCamelSubscriptionInfo_sequence[] = {
+static const ber_old_sequence_t VlrCamelSubscriptionInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_CSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_CSI_impl },
@@ -7691,8 +7691,8 @@ static const ber_sequence_t VlrCamelSubscriptionInfo_sequence[] = {
 
 static int
 dissect_gsm_map_VlrCamelSubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VlrCamelSubscriptionInfo_sequence, hf_index, ett_gsm_map_VlrCamelSubscriptionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VlrCamelSubscriptionInfo_sequence, hf_index, ett_gsm_map_VlrCamelSubscriptionInfo);
 
   return offset;
 }
@@ -7714,7 +7714,7 @@ static int dissect_naea_PreferredCIC_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t NAEA_PreferredCI_sequence[] = {
+static const ber_old_sequence_t NAEA_PreferredCI_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_naea_PreferredCIC_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -7722,8 +7722,8 @@ static const ber_sequence_t NAEA_PreferredCI_sequence[] = {
 
 static int
 dissect_gsm_map_NAEA_PreferredCI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NAEA_PreferredCI_sequence, hf_index, ett_gsm_map_NAEA_PreferredCI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NAEA_PreferredCI_sequence, hf_index, ett_gsm_map_NAEA_PreferredCI);
 
   return offset;
 }
@@ -7917,7 +7917,7 @@ static int dissect_qos2_Negotiated_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PDP_Context_sequence[] = {
+static const ber_old_sequence_t PDP_Context_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pdp_ContextId },
   { BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_pdp_Type_impl },
   { BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pdp_Address_impl },
@@ -7933,8 +7933,8 @@ static const ber_sequence_t PDP_Context_sequence[] = {
 
 static int
 dissect_gsm_map_PDP_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDP_Context_sequence, hf_index, ett_gsm_map_PDP_Context);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDP_Context_sequence, hf_index, ett_gsm_map_PDP_Context);
 
   return offset;
 }
@@ -7943,14 +7943,14 @@ static int dissect_GPRSDataList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t GPRSDataList_sequence_of[1] = {
+static const ber_old_sequence_t GPRSDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GPRSDataList_item },
 };
 
 static int
 dissect_gsm_map_GPRSDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GPRSDataList_sequence_of, hf_index, ett_gsm_map_GPRSDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GPRSDataList_sequence_of, hf_index, ett_gsm_map_GPRSDataList);
 
   return offset;
 }
@@ -7959,7 +7959,7 @@ static int dissect_gprsDataList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t GPRSSubscriptionData_sequence[] = {
+static const ber_old_sequence_t GPRSSubscriptionData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_completeDataListIncluded },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gprsDataList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -7968,8 +7968,8 @@ static const ber_sequence_t GPRSSubscriptionData_sequence[] = {
 
 static int
 dissect_gsm_map_GPRSSubscriptionData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRSSubscriptionData_sequence, hf_index, ett_gsm_map_GPRSSubscriptionData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRSSubscriptionData_sequence, hf_index, ett_gsm_map_GPRSSubscriptionData);
 
   return offset;
 }
@@ -8052,7 +8052,7 @@ static int dissect_lsaAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t LSAData_sequence[] = {
+static const ber_old_sequence_t LSAData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lsaIdentity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lsaAttributes_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaActiveModeIndicator_impl },
@@ -8062,8 +8062,8 @@ static const ber_sequence_t LSAData_sequence[] = {
 
 static int
 dissect_gsm_map_LSAData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LSAData_sequence, hf_index, ett_gsm_map_LSAData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LSAData_sequence, hf_index, ett_gsm_map_LSAData);
 
   return offset;
 }
@@ -8072,14 +8072,14 @@ static int dissect_LSADataList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t LSADataList_sequence_of[1] = {
+static const ber_old_sequence_t LSADataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_LSADataList_item },
 };
 
 static int
 dissect_gsm_map_LSADataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      LSADataList_sequence_of, hf_index, ett_gsm_map_LSADataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          LSADataList_sequence_of, hf_index, ett_gsm_map_LSADataList);
 
   return offset;
 }
@@ -8088,7 +8088,7 @@ static int dissect_lsaDataList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t LSAInformation_sequence[] = {
+static const ber_old_sequence_t LSAInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_completeDataListIncluded },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaOnlyAccessIndicator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaDataList_impl },
@@ -8098,8 +8098,8 @@ static const ber_sequence_t LSAInformation_sequence[] = {
 
 static int
 dissect_gsm_map_LSAInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LSAInformation_sequence, hf_index, ett_gsm_map_LSAInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LSAInformation_sequence, hf_index, ett_gsm_map_LSAInformation);
 
   return offset;
 }
@@ -8108,14 +8108,14 @@ static int dissect_lsaInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GMLC_List_sequence_of[1] = {
+static const ber_old_sequence_t GMLC_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_GMLC_List_item },
 };
 
 static int
 dissect_gsm_map_GMLC_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GMLC_List_sequence_of, hf_index, ett_gsm_map_GMLC_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GMLC_List_sequence_of, hf_index, ett_gsm_map_GMLC_List);
 
   return offset;
 }
@@ -8145,7 +8145,7 @@ static int dissect_notificationToMSUser_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LCSClientExternalID_sequence[] = {
+static const ber_old_sequence_t LCSClientExternalID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_externalAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -8153,8 +8153,8 @@ static const ber_sequence_t LCSClientExternalID_sequence[] = {
 
 int
 dissect_gsm_map_LCSClientExternalID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSClientExternalID_sequence, hf_index, ett_gsm_map_LCSClientExternalID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSClientExternalID_sequence, hf_index, ett_gsm_map_LCSClientExternalID);
 
   return offset;
 }
@@ -8185,7 +8185,7 @@ static int dissect_gmlc_Restriction_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ExternalClient_sequence[] = {
+static const ber_old_sequence_t ExternalClient_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_clientIdentity },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmlc_Restriction_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToMSUser_impl },
@@ -8195,8 +8195,8 @@ static const ber_sequence_t ExternalClient_sequence[] = {
 
 static int
 dissect_gsm_map_ExternalClient(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExternalClient_sequence, hf_index, ett_gsm_map_ExternalClient);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExternalClient_sequence, hf_index, ett_gsm_map_ExternalClient);
 
   return offset;
 }
@@ -8208,14 +8208,14 @@ static int dissect_Ext_ExternalClientList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t ExternalClientList_sequence_of[1] = {
+static const ber_old_sequence_t ExternalClientList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ExternalClientList_item },
 };
 
 static int
 dissect_gsm_map_ExternalClientList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ExternalClientList_sequence_of, hf_index, ett_gsm_map_ExternalClientList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ExternalClientList_sequence_of, hf_index, ett_gsm_map_ExternalClientList);
 
   return offset;
 }
@@ -8249,14 +8249,14 @@ static int dissect_lcsClientInternalID_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PLMNClientList_sequence_of[1] = {
+static const ber_old_sequence_t PLMNClientList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_PLMNClientList_item },
 };
 
 static int
 dissect_gsm_map_PLMNClientList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PLMNClientList_sequence_of, hf_index, ett_gsm_map_PLMNClientList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PLMNClientList_sequence_of, hf_index, ett_gsm_map_PLMNClientList);
 
   return offset;
 }
@@ -8265,14 +8265,14 @@ static int dissect_plmnClientList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Ext_ExternalClientList_sequence_of[1] = {
+static const ber_old_sequence_t Ext_ExternalClientList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Ext_ExternalClientList_item },
 };
 
 static int
 dissect_gsm_map_Ext_ExternalClientList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Ext_ExternalClientList_sequence_of, hf_index, ett_gsm_map_Ext_ExternalClientList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Ext_ExternalClientList_sequence_of, hf_index, ett_gsm_map_Ext_ExternalClientList);
 
   return offset;
 }
@@ -8297,7 +8297,7 @@ static int dissect_lcsServiceTypeID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ServiceType_sequence[] = {
+static const ber_old_sequence_t ServiceType_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceTypeIdentity },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmlc_Restriction_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToMSUser_impl },
@@ -8307,8 +8307,8 @@ static const ber_sequence_t ServiceType_sequence[] = {
 
 static int
 dissect_gsm_map_ServiceType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceType_sequence, hf_index, ett_gsm_map_ServiceType);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceType_sequence, hf_index, ett_gsm_map_ServiceType);
 
   return offset;
 }
@@ -8317,14 +8317,14 @@ static int dissect_ServiceTypeList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ServiceTypeList_sequence_of[1] = {
+static const ber_old_sequence_t ServiceTypeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ServiceTypeList_item },
 };
 
 static int
 dissect_gsm_map_ServiceTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ServiceTypeList_sequence_of, hf_index, ett_gsm_map_ServiceTypeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ServiceTypeList_sequence_of, hf_index, ett_gsm_map_ServiceTypeList);
 
   return offset;
 }
@@ -8333,7 +8333,7 @@ static int dissect_serviceTypeList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LCS_PrivacyClass_sequence[] = {
+static const ber_old_sequence_t LCS_PrivacyClass_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ext_ss_Status },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToMSUser_impl },
@@ -8347,8 +8347,8 @@ static const ber_sequence_t LCS_PrivacyClass_sequence[] = {
 
 static int
 dissect_gsm_map_LCS_PrivacyClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_PrivacyClass_sequence, hf_index, ett_gsm_map_LCS_PrivacyClass);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_PrivacyClass_sequence, hf_index, ett_gsm_map_LCS_PrivacyClass);
 
   return offset;
 }
@@ -8357,14 +8357,14 @@ static int dissect_LCS_PrivacyExceptionList_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t LCS_PrivacyExceptionList_sequence_of[1] = {
+static const ber_old_sequence_t LCS_PrivacyExceptionList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_LCS_PrivacyExceptionList_item },
 };
 
 static int
 dissect_gsm_map_LCS_PrivacyExceptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      LCS_PrivacyExceptionList_sequence_of, hf_index, ett_gsm_map_LCS_PrivacyExceptionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          LCS_PrivacyExceptionList_sequence_of, hf_index, ett_gsm_map_LCS_PrivacyExceptionList);
 
   return offset;
 }
@@ -8376,7 +8376,7 @@ static int dissect_add_lcs_PrivacyExceptionList(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t MOLR_Class_sequence[] = {
+static const ber_old_sequence_t MOLR_Class_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ext_ss_Status },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -8385,8 +8385,8 @@ static const ber_sequence_t MOLR_Class_sequence[] = {
 
 static int
 dissect_gsm_map_MOLR_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MOLR_Class_sequence, hf_index, ett_gsm_map_MOLR_Class);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MOLR_Class_sequence, hf_index, ett_gsm_map_MOLR_Class);
 
   return offset;
 }
@@ -8395,14 +8395,14 @@ static int dissect_MOLR_List_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t MOLR_List_sequence_of[1] = {
+static const ber_old_sequence_t MOLR_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MOLR_List_item },
 };
 
 static int
 dissect_gsm_map_MOLR_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MOLR_List_sequence_of, hf_index, ett_gsm_map_MOLR_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MOLR_List_sequence_of, hf_index, ett_gsm_map_MOLR_List);
 
   return offset;
 }
@@ -8411,7 +8411,7 @@ static int dissect_molr_List_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t LCSInformation_sequence[] = {
+static const ber_old_sequence_t LCSInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmlc_List_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_PrivacyExceptionList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_molr_List_impl },
@@ -8421,8 +8421,8 @@ static const ber_sequence_t LCSInformation_sequence[] = {
 
 static int
 dissect_gsm_map_LCSInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSInformation_sequence, hf_index, ett_gsm_map_LCSInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSInformation_sequence, hf_index, ett_gsm_map_LCSInformation);
 
   return offset;
 }
@@ -8473,7 +8473,7 @@ static int dissect_nbrSN_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t MC_SS_Info_sequence[] = {
+static const ber_old_sequence_t MC_SS_Info_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nbrSB_impl },
@@ -8484,8 +8484,8 @@ static const ber_sequence_t MC_SS_Info_sequence[] = {
 
 static int
 dissect_gsm_map_MC_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MC_SS_Info_sequence, hf_index, ett_gsm_map_MC_SS_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MC_SS_Info_sequence, hf_index, ett_gsm_map_MC_SS_Info);
 
   return offset;
 }
@@ -8548,7 +8548,7 @@ static int dissect_defaultSessionHandling_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t GPRS_CamelTDPData_sequence[] = {
+static const ber_old_sequence_t GPRS_CamelTDPData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprs_TriggerDetectionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -8559,8 +8559,8 @@ static const ber_sequence_t GPRS_CamelTDPData_sequence[] = {
 
 static int
 dissect_gsm_map_GPRS_CamelTDPData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRS_CamelTDPData_sequence, hf_index, ett_gsm_map_GPRS_CamelTDPData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRS_CamelTDPData_sequence, hf_index, ett_gsm_map_GPRS_CamelTDPData);
 
   return offset;
 }
@@ -8569,14 +8569,14 @@ static int dissect_GPRS_CamelTDPDataList_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t GPRS_CamelTDPDataList_sequence_of[1] = {
+static const ber_old_sequence_t GPRS_CamelTDPDataList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GPRS_CamelTDPDataList_item },
 };
 
 static int
 dissect_gsm_map_GPRS_CamelTDPDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GPRS_CamelTDPDataList_sequence_of, hf_index, ett_gsm_map_GPRS_CamelTDPDataList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GPRS_CamelTDPDataList_sequence_of, hf_index, ett_gsm_map_GPRS_CamelTDPDataList);
 
   return offset;
 }
@@ -8585,7 +8585,7 @@ static int dissect_gprs_CamelTDPDataList_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t GPRS_CSI_sequence[] = {
+static const ber_old_sequence_t GPRS_CSI_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprs_CamelTDPDataList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -8596,8 +8596,8 @@ static const ber_sequence_t GPRS_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_GPRS_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRS_CSI_sequence, hf_index, ett_gsm_map_GPRS_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRS_CSI_sequence, hf_index, ett_gsm_map_GPRS_CSI);
 
   return offset;
 }
@@ -8606,7 +8606,7 @@ static int dissect_gprs_CSI_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t MG_CSI_sequence[] = {
+static const ber_old_sequence_t MG_CSI_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mobilityTriggers },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -8618,8 +8618,8 @@ static const ber_sequence_t MG_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_MG_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MG_CSI_sequence, hf_index, ett_gsm_map_MG_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MG_CSI_sequence, hf_index, ett_gsm_map_MG_CSI);
 
   return offset;
 }
@@ -8628,7 +8628,7 @@ static int dissect_mg_csi_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SGSN_CAMEL_SubscriptionInfo_sequence[] = {
+static const ber_old_sequence_t SGSN_CAMEL_SubscriptionInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprs_CSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mo_sms_CSI_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -8640,8 +8640,8 @@ static const ber_sequence_t SGSN_CAMEL_SubscriptionInfo_sequence[] = {
 
 static int
 dissect_gsm_map_SGSN_CAMEL_SubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SGSN_CAMEL_SubscriptionInfo_sequence, hf_index, ett_gsm_map_SGSN_CAMEL_SubscriptionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SGSN_CAMEL_SubscriptionInfo_sequence, hf_index, ett_gsm_map_SGSN_CAMEL_SubscriptionInfo);
 
   return offset;
 }
@@ -8669,7 +8669,7 @@ static int dissect_accessRestrictionData_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t InsertSubscriberDataArg_sequence[] = {
+static const ber_old_sequence_t InsertSubscriberDataArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_category_impl },
@@ -8703,21 +8703,21 @@ static const ber_sequence_t InsertSubscriberDataArg_sequence[] = {
 
 static int
 dissect_gsm_map_InsertSubscriberDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InsertSubscriberDataArg_sequence, hf_index, ett_gsm_map_InsertSubscriberDataArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InsertSubscriberDataArg_sequence, hf_index, ett_gsm_map_InsertSubscriberDataArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_List_sequence_of[1] = {
+static const ber_old_sequence_t SS_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SS_List_item },
 };
 
 static int
 dissect_gsm_map_SS_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SS_List_sequence_of, hf_index, ett_gsm_map_SS_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SS_List_sequence_of, hf_index, ett_gsm_map_SS_List);
 
   return offset;
 }
@@ -8750,7 +8750,7 @@ static int dissect_regionalSubscriptionResponse_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t InsertSubscriberDataRes_sequence[] = {
+static const ber_old_sequence_t InsertSubscriberDataRes_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teleserviceList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bearerServiceList_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_List_impl },
@@ -8764,21 +8764,21 @@ static const ber_sequence_t InsertSubscriberDataRes_sequence[] = {
 
 static int
 dissect_gsm_map_InsertSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InsertSubscriberDataRes_sequence, hf_index, ett_gsm_map_InsertSubscriberDataRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InsertSubscriberDataRes_sequence, hf_index, ett_gsm_map_InsertSubscriberDataRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t BasicServiceList_sequence_of[1] = {
+static const ber_old_sequence_t BasicServiceList_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_BasicServiceList_item },
 };
 
 static int
 dissect_gsm_map_BasicServiceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BasicServiceList_sequence_of, hf_index, ett_gsm_map_BasicServiceList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BasicServiceList_sequence_of, hf_index, ett_gsm_map_BasicServiceList);
 
   return offset;
 }
@@ -8787,14 +8787,14 @@ static int dissect_basicServiceList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ContextIdList_sequence_of[1] = {
+static const ber_old_sequence_t ContextIdList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ContextIdList_item },
 };
 
 static int
 dissect_gsm_map_ContextIdList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ContextIdList_sequence_of, hf_index, ett_gsm_map_ContextIdList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ContextIdList_sequence_of, hf_index, ett_gsm_map_ContextIdList);
 
   return offset;
 }
@@ -8809,7 +8809,7 @@ static const value_string gsm_map_GPRSSubscriptionDataWithdraw_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GPRSSubscriptionDataWithdraw_choice[] = {
+static const ber_old_choice_t GPRSSubscriptionDataWithdraw_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allGPRSData },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextIdList },
   { 0, 0, 0, 0, NULL }
@@ -8817,9 +8817,9 @@ static const ber_choice_t GPRSSubscriptionDataWithdraw_choice[] = {
 
 static int
 dissect_gsm_map_GPRSSubscriptionDataWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GPRSSubscriptionDataWithdraw_choice, hf_index, ett_gsm_map_GPRSSubscriptionDataWithdraw,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GPRSSubscriptionDataWithdraw_choice, hf_index, ett_gsm_map_GPRSSubscriptionDataWithdraw,
+                                     NULL);
 
   return offset;
 }
@@ -8828,14 +8828,14 @@ static int dissect_gprsSubscriptionDataWithdraw_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t LSAIdentityList_sequence_of[1] = {
+static const ber_old_sequence_t LSAIdentityList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_LSAIdentityList_item },
 };
 
 static int
 dissect_gsm_map_LSAIdentityList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      LSAIdentityList_sequence_of, hf_index, ett_gsm_map_LSAIdentityList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          LSAIdentityList_sequence_of, hf_index, ett_gsm_map_LSAIdentityList);
 
   return offset;
 }
@@ -8850,7 +8850,7 @@ static const value_string gsm_map_LSAInformationWithdraw_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LSAInformationWithdraw_choice[] = {
+static const ber_old_choice_t LSAInformationWithdraw_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allLSAData },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lsaIdentityList },
   { 0, 0, 0, 0, NULL }
@@ -8858,9 +8858,9 @@ static const ber_choice_t LSAInformationWithdraw_choice[] = {
 
 static int
 dissect_gsm_map_LSAInformationWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LSAInformationWithdraw_choice, hf_index, ett_gsm_map_LSAInformationWithdraw,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LSAInformationWithdraw_choice, hf_index, ett_gsm_map_LSAInformationWithdraw,
+                                     NULL);
 
   return offset;
 }
@@ -8903,7 +8903,7 @@ static int dissect_specificCSIDeletedList_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t DeleteSubscriberDataArg_sequence[] = {
+static const ber_old_sequence_t DeleteSubscriberDataArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_List_impl },
@@ -8925,14 +8925,14 @@ static const ber_sequence_t DeleteSubscriberDataArg_sequence[] = {
 
 static int
 dissect_gsm_map_DeleteSubscriberDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteSubscriberDataArg_sequence, hf_index, ett_gsm_map_DeleteSubscriberDataArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteSubscriberDataArg_sequence, hf_index, ett_gsm_map_DeleteSubscriberDataArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeleteSubscriberDataRes_sequence[] = {
+static const ber_old_sequence_t DeleteSubscriberDataRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_regionalSubscriptionResponse_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -8940,8 +8940,8 @@ static const ber_sequence_t DeleteSubscriberDataRes_sequence[] = {
 
 static int
 dissect_gsm_map_DeleteSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteSubscriberDataRes_sequence, hf_index, ett_gsm_map_DeleteSubscriberDataRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteSubscriberDataRes_sequence, hf_index, ett_gsm_map_DeleteSubscriberDataRes);
 
   return offset;
 }
@@ -8985,7 +8985,7 @@ static int dissect_ss_Status_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CallBarringFeature_sequence[] = {
+static const ber_old_sequence_t CallBarringFeature_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   { 0, 0, 0, NULL }
@@ -8993,8 +8993,8 @@ static const ber_sequence_t CallBarringFeature_sequence[] = {
 
 static int
 dissect_gsm_map_CallBarringFeature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallBarringFeature_sequence, hf_index, ett_gsm_map_CallBarringFeature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallBarringFeature_sequence, hf_index, ett_gsm_map_CallBarringFeature);
 
   return offset;
 }
@@ -9003,14 +9003,14 @@ static int dissect_CallBarringFeatureList_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t CallBarringFeatureList_sequence_of[1] = {
+static const ber_old_sequence_t CallBarringFeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CallBarringFeatureList_item },
 };
 
 static int
 dissect_gsm_map_CallBarringFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CallBarringFeatureList_sequence_of, hf_index, ett_gsm_map_CallBarringFeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CallBarringFeatureList_sequence_of, hf_index, ett_gsm_map_CallBarringFeatureList);
 
   return offset;
 }
@@ -9052,7 +9052,7 @@ static int dissect_noReplyConditionTime_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ForwardingFeature_sequence[] = {
+static const ber_old_sequence_t ForwardingFeature_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl },
@@ -9065,8 +9065,8 @@ static const ber_sequence_t ForwardingFeature_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardingFeature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardingFeature_sequence, hf_index, ett_gsm_map_ForwardingFeature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardingFeature_sequence, hf_index, ett_gsm_map_ForwardingFeature);
 
   return offset;
 }
@@ -9075,14 +9075,14 @@ static int dissect_ForwardingFeatureList_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ForwardingFeatureList_sequence_of[1] = {
+static const ber_old_sequence_t ForwardingFeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ForwardingFeatureList_item },
 };
 
 static int
 dissect_gsm_map_ForwardingFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ForwardingFeatureList_sequence_of, hf_index, ett_gsm_map_ForwardingFeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ForwardingFeatureList_sequence_of, hf_index, ett_gsm_map_ForwardingFeatureList);
 
   return offset;
 }
@@ -9094,7 +9094,7 @@ static int dissect_forwardingFeatureList_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ForwardingInfo_sequence[] = {
+static const ber_old_sequence_t ForwardingInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList },
   { 0, 0, 0, NULL }
@@ -9102,8 +9102,8 @@ static const ber_sequence_t ForwardingInfo_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardingInfo_sequence, hf_index, ett_gsm_map_ForwardingInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardingInfo_sequence, hf_index, ett_gsm_map_ForwardingInfo);
 
   return offset;
 }
@@ -9112,7 +9112,7 @@ static int dissect_forwardingInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CallBarringInfo_sequence[] = {
+static const ber_old_sequence_t CallBarringInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_callBarringFeatureList },
   { 0, 0, 0, NULL }
@@ -9120,8 +9120,8 @@ static const ber_sequence_t CallBarringInfo_sequence[] = {
 
 static int
 dissect_gsm_map_CallBarringInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallBarringInfo_sequence, hf_index, ett_gsm_map_CallBarringInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallBarringInfo_sequence, hf_index, ett_gsm_map_CallBarringInfo);
 
   return offset;
 }
@@ -9142,14 +9142,14 @@ static int dissect_HLR_List_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t HLR_List_sequence_of[1] = {
+static const ber_old_sequence_t HLR_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_HLR_List_item },
 };
 
 static int
 dissect_gsm_map_HLR_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      HLR_List_sequence_of, hf_index, ett_gsm_map_HLR_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          HLR_List_sequence_of, hf_index, ett_gsm_map_HLR_List);
 
   return offset;
 }
@@ -9158,7 +9158,7 @@ static int dissect_hlr_List(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ResetArg_sequence[] = {
+static const ber_old_sequence_t ResetArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_hlr_List },
   { 0, 0, 0, NULL }
@@ -9166,14 +9166,14 @@ static const ber_sequence_t ResetArg_sequence[] = {
 
 static int
 dissect_gsm_map_ResetArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResetArg_sequence, hf_index, ett_gsm_map_ResetArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResetArg_sequence, hf_index, ett_gsm_map_ResetArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RestoreDataArg_sequence[] = {
+static const ber_old_sequence_t RestoreDataArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lmsi },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9183,14 +9183,14 @@ static const ber_sequence_t RestoreDataArg_sequence[] = {
 
 static int
 dissect_gsm_map_RestoreDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RestoreDataArg_sequence, hf_index, ett_gsm_map_RestoreDataArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RestoreDataArg_sequence, hf_index, ett_gsm_map_RestoreDataArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RestoreDataRes_sequence[] = {
+static const ber_old_sequence_t RestoreDataRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_msNotReachable },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9199,14 +9199,14 @@ static const ber_sequence_t RestoreDataRes_sequence[] = {
 
 static int
 dissect_gsm_map_RestoreDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RestoreDataRes_sequence, hf_index, ett_gsm_map_RestoreDataRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RestoreDataRes_sequence, hf_index, ett_gsm_map_RestoreDataRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t TraceDepthList_sequence[] = {
+static const ber_old_sequence_t TraceDepthList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msc_s_TraceDepth_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mgw_TraceDepth_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsn_TraceDepth_impl },
@@ -9218,8 +9218,8 @@ static const ber_sequence_t TraceDepthList_sequence[] = {
 
 static int
 dissect_gsm_map_TraceDepthList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TraceDepthList_sequence, hf_index, ett_gsm_map_TraceDepthList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TraceDepthList_sequence, hf_index, ett_gsm_map_TraceDepthList);
 
   return offset;
 }
@@ -9314,7 +9314,7 @@ static int dissect_bmsc_IList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TraceInterfaceList_sequence[] = {
+static const ber_old_sequence_t TraceInterfaceList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msc_s_IList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mgw_IList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsn_IList_impl },
@@ -9326,8 +9326,8 @@ static const ber_sequence_t TraceInterfaceList_sequence[] = {
 
 static int
 dissect_gsm_map_TraceInterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TraceInterfaceList_sequence, hf_index, ett_gsm_map_TraceInterfaceList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TraceInterfaceList_sequence, hf_index, ett_gsm_map_TraceInterfaceList);
 
   return offset;
 }
@@ -9394,7 +9394,7 @@ static int dissect_bmsc_EList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TraceEventList_sequence[] = {
+static const ber_old_sequence_t TraceEventList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msc_s_EList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mgw_EList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsn_EList_impl },
@@ -9405,8 +9405,8 @@ static const ber_sequence_t TraceEventList_sequence[] = {
 
 static int
 dissect_gsm_map_TraceEventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TraceEventList_sequence, hf_index, ett_gsm_map_TraceEventList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TraceEventList_sequence, hf_index, ett_gsm_map_TraceEventList);
 
   return offset;
 }
@@ -9415,7 +9415,7 @@ static int dissect_traceEventList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ActivateTraceModeArg_sequence[] = {
+static const ber_old_sequence_t ActivateTraceModeArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_traceReference_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_traceType_impl },
@@ -9431,14 +9431,14 @@ static const ber_sequence_t ActivateTraceModeArg_sequence[] = {
 
 static int
 dissect_gsm_map_ActivateTraceModeArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActivateTraceModeArg_sequence, hf_index, ett_gsm_map_ActivateTraceModeArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActivateTraceModeArg_sequence, hf_index, ett_gsm_map_ActivateTraceModeArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ActivateTraceModeRes_sequence[] = {
+static const ber_old_sequence_t ActivateTraceModeRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_traceSupportIndicator_impl },
   { 0, 0, 0, NULL }
@@ -9446,14 +9446,14 @@ static const ber_sequence_t ActivateTraceModeRes_sequence[] = {
 
 static int
 dissect_gsm_map_ActivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActivateTraceModeRes_sequence, hf_index, ett_gsm_map_ActivateTraceModeRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActivateTraceModeRes_sequence, hf_index, ett_gsm_map_ActivateTraceModeRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeactivateTraceModeArg_sequence[] = {
+static const ber_old_sequence_t DeactivateTraceModeArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_traceReference_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -9463,28 +9463,28 @@ static const ber_sequence_t DeactivateTraceModeArg_sequence[] = {
 
 static int
 dissect_gsm_map_DeactivateTraceModeArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeactivateTraceModeArg_sequence, hf_index, ett_gsm_map_DeactivateTraceModeArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeactivateTraceModeArg_sequence, hf_index, ett_gsm_map_DeactivateTraceModeArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeactivateTraceModeRes_sequence[] = {
+static const ber_old_sequence_t DeactivateTraceModeRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_DeactivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeactivateTraceModeRes_sequence, hf_index, ett_gsm_map_DeactivateTraceModeRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeactivateTraceModeRes_sequence, hf_index, ett_gsm_map_DeactivateTraceModeRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t CUG_CheckInfo_sequence[] = {
+static const ber_old_sequence_t CUG_CheckInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cug_Interlock },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_OutgoingAccess },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9493,8 +9493,8 @@ static const ber_sequence_t CUG_CheckInfo_sequence[] = {
 
 static int
 dissect_gsm_map_CUG_CheckInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CUG_CheckInfo_sequence, hf_index, ett_gsm_map_CUG_CheckInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CUG_CheckInfo_sequence, hf_index, ett_gsm_map_CUG_CheckInfo);
 
   return offset;
 }
@@ -9581,7 +9581,7 @@ static int dissect_forwardingReason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ExternalSignalInfo_sequence[] = {
+static const ber_old_sequence_t ExternalSignalInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_protocolId },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signalInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9590,8 +9590,8 @@ static const ber_sequence_t ExternalSignalInfo_sequence[] = {
 
 static int
 dissect_gsm_map_ExternalSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExternalSignalInfo_sequence, hf_index, ett_gsm_map_ExternalSignalInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExternalSignalInfo_sequence, hf_index, ett_gsm_map_ExternalSignalInfo);
 
   return offset;
 }
@@ -9630,7 +9630,7 @@ static int dissect_callInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CamelInfo_sequence[] = {
+static const ber_old_sequence_t CamelInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_supportedCamelPhases },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_suppress_T_CSI },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9640,8 +9640,8 @@ static const ber_sequence_t CamelInfo_sequence[] = {
 
 static int
 dissect_gsm_map_CamelInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CamelInfo_sequence, hf_index, ett_gsm_map_CamelInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CamelInfo_sequence, hf_index, ett_gsm_map_CamelInfo);
 
   return offset;
 }
@@ -9709,7 +9709,7 @@ static int dissect_ext_ProtocolId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Ext_ExternalSignalInfo_sequence[] = {
+static const ber_old_sequence_t Ext_ExternalSignalInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ext_ProtocolId },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signalInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -9718,8 +9718,8 @@ static const ber_sequence_t Ext_ExternalSignalInfo_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_ExternalSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_ExternalSignalInfo_sequence, hf_index, ett_gsm_map_Ext_ExternalSignalInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_ExternalSignalInfo_sequence, hf_index, ett_gsm_map_Ext_ExternalSignalInfo);
 
   return offset;
 }
@@ -9741,7 +9741,7 @@ static int dissect_callDiversionTreatmentIndicator_impl(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t SendRoutingInfoArg_sequence[] = {
+static const ber_old_sequence_t SendRoutingInfoArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_CheckInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfForwarding_impl },
@@ -9774,14 +9774,14 @@ static const ber_sequence_t SendRoutingInfoArg_sequence[] = {
 
 static int
 dissect_gsm_map_SendRoutingInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendRoutingInfoArg_sequence, hf_index, ett_gsm_map_SendRoutingInfoArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendRoutingInfoArg_sequence, hf_index, ett_gsm_map_SendRoutingInfoArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ForwardingData_sequence[] = {
+static const ber_old_sequence_t ForwardingData_sequence[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToSubaddress_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingOptions_impl },
@@ -9792,8 +9792,8 @@ static const ber_sequence_t ForwardingData_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardingData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardingData_sequence, hf_index, ett_gsm_map_ForwardingData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardingData_sequence, hf_index, ett_gsm_map_ForwardingData);
 
   return offset;
 }
@@ -9811,7 +9811,7 @@ static const value_string gsm_map_RoutingInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RoutingInfo_choice[] = {
+static const ber_old_choice_t RoutingInfo_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_roamingNumber },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingData },
   { 0, 0, 0, 0, NULL }
@@ -9819,9 +9819,9 @@ static const ber_choice_t RoutingInfo_choice[] = {
 
 static int
 dissect_gsm_map_RoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RoutingInfo_choice, hf_index, ett_gsm_map_RoutingInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RoutingInfo_choice, hf_index, ett_gsm_map_RoutingInfo,
+                                     NULL);
 
   return offset;
 }
@@ -9833,7 +9833,7 @@ static int dissect_routingInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t GmscCamelSubscriptionInfo_sequence[] = {
+static const ber_old_sequence_t GmscCamelSubscriptionInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_t_CSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_CSI_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -9845,8 +9845,8 @@ static const ber_sequence_t GmscCamelSubscriptionInfo_sequence[] = {
 
 static int
 dissect_gsm_map_GmscCamelSubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GmscCamelSubscriptionInfo_sequence, hf_index, ett_gsm_map_GmscCamelSubscriptionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GmscCamelSubscriptionInfo_sequence, hf_index, ett_gsm_map_GmscCamelSubscriptionInfo);
 
   return offset;
 }
@@ -9855,7 +9855,7 @@ static int dissect_gmscCamelSubscriptionInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t CamelRoutingInfo_sequence[] = {
+static const ber_old_sequence_t CamelRoutingInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_forwardingData },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gmscCamelSubscriptionInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -9864,8 +9864,8 @@ static const ber_sequence_t CamelRoutingInfo_sequence[] = {
 
 static int
 dissect_gsm_map_CamelRoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CamelRoutingInfo_sequence, hf_index, ett_gsm_map_CamelRoutingInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CamelRoutingInfo_sequence, hf_index, ett_gsm_map_CamelRoutingInfo);
 
   return offset;
 }
@@ -9880,7 +9880,7 @@ static const value_string gsm_map_ExtendedRoutingInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExtendedRoutingInfo_choice[] = {
+static const ber_old_choice_t ExtendedRoutingInfo_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_routingInfo },
   {   1, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_camelRoutingInfo_impl },
   { 0, 0, 0, 0, NULL }
@@ -9888,9 +9888,9 @@ static const ber_choice_t ExtendedRoutingInfo_choice[] = {
 
 static int
 dissect_gsm_map_ExtendedRoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExtendedRoutingInfo_choice, hf_index, ett_gsm_map_ExtendedRoutingInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExtendedRoutingInfo_choice, hf_index, ett_gsm_map_ExtendedRoutingInfo,
+                                     NULL);
 
   return offset;
 }
@@ -9963,7 +9963,7 @@ static const value_string gsm_map_CellGlobalIdOrServiceAreaIdOrLAI_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CellGlobalIdOrServiceAreaIdOrLAI_choice[] = {
+static const ber_old_choice_t CellGlobalIdOrServiceAreaIdOrLAI_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cellGlobalIdOrServiceAreaIdFixedLength_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_laiFixedLength_impl },
   { 0, 0, 0, 0, NULL }
@@ -9971,9 +9971,9 @@ static const ber_choice_t CellGlobalIdOrServiceAreaIdOrLAI_choice[] = {
 
 static int
 dissect_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CellGlobalIdOrServiceAreaIdOrLAI_choice, hf_index, ett_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CellGlobalIdOrServiceAreaIdOrLAI_choice, hf_index, ett_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI,
+                                     NULL);
 
   return offset;
 }
@@ -10004,7 +10004,7 @@ static int dissect_geodeticInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LocationInformation_sequence[] = {
+static const ber_old_sequence_t LocationInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ageOfLocationInformation },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_geographicalInformation_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vlr_number_impl },
@@ -10021,8 +10021,8 @@ static const ber_sequence_t LocationInformation_sequence[] = {
 
 int
 dissect_gsm_map_LocationInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationInformation_sequence, hf_index, ett_gsm_map_LocationInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationInformation_sequence, hf_index, ett_gsm_map_LocationInformation);
 
   return offset;
 }
@@ -10060,7 +10060,7 @@ const value_string gsm_map_SubscriberState_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubscriberState_choice[] = {
+static const ber_old_choice_t SubscriberState_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assumedIdle_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_camelBusy_impl },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_netDetNotReachable },
@@ -10070,9 +10070,9 @@ static const ber_choice_t SubscriberState_choice[] = {
 
 int
 dissect_gsm_map_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubscriberState_choice, hf_index, ett_gsm_map_SubscriberState,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubscriberState_choice, hf_index, ett_gsm_map_SubscriberState,
+                                     NULL);
 
   return offset;
 }
@@ -10109,7 +10109,7 @@ static int dissect_routeingAreaIdentity(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LocationInformationGPRS_sequence[] = {
+static const ber_old_sequence_t LocationInformationGPRS_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cellGlobalIdOrServiceAreaIdOrLAI },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_routeingAreaIdentity },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_geographicalInformation },
@@ -10125,8 +10125,8 @@ static const ber_sequence_t LocationInformationGPRS_sequence[] = {
 
 static int
 dissect_gsm_map_LocationInformationGPRS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationInformationGPRS_sequence, hf_index, ett_gsm_map_LocationInformationGPRS);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationInformationGPRS_sequence, hf_index, ett_gsm_map_LocationInformationGPRS);
 
   return offset;
 }
@@ -10193,7 +10193,7 @@ static int dissect_chargingId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PDP_ContextInfo_sequence[] = {
+static const ber_old_sequence_t PDP_ContextInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pdp_ContextIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pdp_ContextActive_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_pdp_Type_impl },
@@ -10220,8 +10220,8 @@ static const ber_sequence_t PDP_ContextInfo_sequence[] = {
 
 static int
 dissect_gsm_map_PDP_ContextInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDP_ContextInfo_sequence, hf_index, ett_gsm_map_PDP_ContextInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDP_ContextInfo_sequence, hf_index, ett_gsm_map_PDP_ContextInfo);
 
   return offset;
 }
@@ -10230,14 +10230,14 @@ static int dissect_PDP_ContextInfoList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PDP_ContextInfoList_sequence_of[1] = {
+static const ber_old_sequence_t PDP_ContextInfoList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PDP_ContextInfoList_item },
 };
 
 static int
 dissect_gsm_map_PDP_ContextInfoList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PDP_ContextInfoList_sequence_of, hf_index, ett_gsm_map_PDP_ContextInfoList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PDP_ContextInfoList_sequence_of, hf_index, ett_gsm_map_PDP_ContextInfoList);
 
   return offset;
 }
@@ -10260,7 +10260,7 @@ static const value_string gsm_map_PS_SubscriberState_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PS_SubscriberState_choice[] = {
+static const ber_old_choice_t PS_SubscriberState_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_notProvidedFromSGSN_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ps_Detached_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ps_AttachedNotReachableForPaging_impl },
@@ -10273,9 +10273,9 @@ static const ber_choice_t PS_SubscriberState_choice[] = {
 
 static int
 dissect_gsm_map_PS_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PS_SubscriberState_choice, hf_index, ett_gsm_map_PS_SubscriberState,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PS_SubscriberState_choice, hf_index, ett_gsm_map_PS_SubscriberState,
+                                     NULL);
 
   return offset;
 }
@@ -10323,7 +10323,7 @@ static int dissect_mSRadioAccessCapability_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t GPRSMSClass_sequence[] = {
+static const ber_old_sequence_t GPRSMSClass_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mSNetworkCapability_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mSRadioAccessCapability_impl },
   { 0, 0, 0, NULL }
@@ -10331,8 +10331,8 @@ static const ber_sequence_t GPRSMSClass_sequence[] = {
 
 static int
 dissect_gsm_map_GPRSMSClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GPRSMSClass_sequence, hf_index, ett_gsm_map_GPRSMSClass);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GPRSMSClass_sequence, hf_index, ett_gsm_map_GPRSMSClass);
 
   return offset;
 }
@@ -10375,7 +10375,7 @@ static int dissect_numberPortabilityStatus_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t MNPInfoRes_sequence[] = {
+static const ber_old_sequence_t MNPInfoRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeingNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
@@ -10386,8 +10386,8 @@ static const ber_sequence_t MNPInfoRes_sequence[] = {
 
 static int
 dissect_gsm_map_MNPInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MNPInfoRes_sequence, hf_index, ett_gsm_map_MNPInfoRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MNPInfoRes_sequence, hf_index, ett_gsm_map_MNPInfoRes);
 
   return offset;
 }
@@ -10396,7 +10396,7 @@ static int dissect_mnpInfoRes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SubscriberInfo_sequence[] = {
+static const ber_old_sequence_t SubscriberInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_subscriberState },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -10411,8 +10411,8 @@ static const ber_sequence_t SubscriberInfo_sequence[] = {
 
 static int
 dissect_gsm_map_SubscriberInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubscriberInfo_sequence, hf_index, ett_gsm_map_SubscriberInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubscriberInfo_sequence, hf_index, ett_gsm_map_SubscriberInfo);
 
   return offset;
 }
@@ -10424,7 +10424,7 @@ static int dissect_subscriberInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CCBS_Indicators_sequence[] = {
+static const ber_old_sequence_t CCBS_Indicators_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Possible_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepCCBS_CallIndicator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -10433,8 +10433,8 @@ static const ber_sequence_t CCBS_Indicators_sequence[] = {
 
 static int
 dissect_gsm_map_CCBS_Indicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CCBS_Indicators_sequence, hf_index, ett_gsm_map_CCBS_Indicators);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CCBS_Indicators_sequence, hf_index, ett_gsm_map_CCBS_Indicators);
 
   return offset;
 }
@@ -10485,7 +10485,7 @@ static int dissect_unavailabilityCause_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SendRoutingInfoRes_sequence[] = {
+static const ber_old_sequence_t SendRoutingInfoRes_sequence[] = {
   { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extendedRoutingInfo },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_CheckInfo_impl },
@@ -10515,8 +10515,8 @@ static const ber_sequence_t SendRoutingInfoRes_sequence[] = {
 
 static int
 dissect_gsm_map_SendRoutingInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendRoutingInfoRes_sequence, hf_index, ett_gsm_map_SendRoutingInfoRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendRoutingInfoRes_sequence, hf_index, ett_gsm_map_SendRoutingInfoRes);
 
   return offset;
 }
@@ -10528,7 +10528,7 @@ static const value_string gsm_map_SubscriberIdentity_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubscriberIdentity_choice[] = {
+static const ber_old_choice_t SubscriberIdentity_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { 0, 0, 0, 0, NULL }
@@ -10536,9 +10536,9 @@ static const ber_choice_t SubscriberIdentity_choice[] = {
 
 static int
 dissect_gsm_map_SubscriberIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubscriberIdentity_choice, hf_index, ett_gsm_map_SubscriberIdentity,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubscriberIdentity_choice, hf_index, ett_gsm_map_SubscriberIdentity,
+                                     NULL);
 
   return offset;
 }
@@ -10556,7 +10556,7 @@ static int dissect_targetMS_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t ProvideRoamingNumberArg_sequence[] = {
+static const ber_old_sequence_t ProvideRoamingNumberArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
@@ -10582,14 +10582,14 @@ static const ber_sequence_t ProvideRoamingNumberArg_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideRoamingNumberArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideRoamingNumberArg_sequence, hf_index, ett_gsm_map_ProvideRoamingNumberArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideRoamingNumberArg_sequence, hf_index, ett_gsm_map_ProvideRoamingNumberArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ProvideRoamingNumberRes_sequence[] = {
+static const ber_old_sequence_t ProvideRoamingNumberRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_roamingNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_releaseResourcesSupported },
@@ -10598,8 +10598,8 @@ static const ber_sequence_t ProvideRoamingNumberRes_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideRoamingNumberRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideRoamingNumberRes_sequence, hf_index, ett_gsm_map_ProvideRoamingNumberRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideRoamingNumberRes_sequence, hf_index, ett_gsm_map_ProvideRoamingNumberRes);
 
   return offset;
 }
@@ -10631,7 +10631,7 @@ static int dissect_uui_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t UU_Data_sequence[] = {
+static const ber_old_sequence_t UU_Data_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uuIndicator_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uui_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uusCFInteraction_impl },
@@ -10641,8 +10641,8 @@ static const ber_sequence_t UU_Data_sequence[] = {
 
 int
 dissect_gsm_map_UU_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UU_Data_sequence, hf_index, ett_gsm_map_UU_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UU_Data_sequence, hf_index, ett_gsm_map_UU_Data);
 
   return offset;
 }
@@ -10651,7 +10651,7 @@ static int dissect_uu_Data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ResumeCallHandlingArg_sequence[] = {
+static const ber_old_sequence_t ResumeCallHandlingArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callReferenceNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_ext_basicServiceGroup },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingData_impl },
@@ -10671,22 +10671,22 @@ static const ber_sequence_t ResumeCallHandlingArg_sequence[] = {
 
 static int
 dissect_gsm_map_ResumeCallHandlingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResumeCallHandlingArg_sequence, hf_index, ett_gsm_map_ResumeCallHandlingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResumeCallHandlingArg_sequence, hf_index, ett_gsm_map_ResumeCallHandlingArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ResumeCallHandlingRes_sequence[] = {
+static const ber_old_sequence_t ResumeCallHandlingRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ResumeCallHandlingRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResumeCallHandlingRes_sequence, hf_index, ett_gsm_map_ResumeCallHandlingRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResumeCallHandlingRes_sequence, hf_index, ett_gsm_map_ResumeCallHandlingRes);
 
   return offset;
 }
@@ -10705,7 +10705,7 @@ static int dissect_call_Direction_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ProvideSIWFSNumberArg_sequence[] = {
+static const ber_old_sequence_t ProvideSIWFSNumberArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_BearerCapability_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_isdn_BearerCapability_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_call_Direction_impl },
@@ -10719,14 +10719,14 @@ static const ber_sequence_t ProvideSIWFSNumberArg_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSIWFSNumberArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSIWFSNumberArg_sequence, hf_index, ett_gsm_map_ProvideSIWFSNumberArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSIWFSNumberArg_sequence, hf_index, ett_gsm_map_ProvideSIWFSNumberArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ProvideSIWFSNumberRes_sequence[] = {
+static const ber_old_sequence_t ProvideSIWFSNumberRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sIWFSNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -10734,14 +10734,14 @@ static const ber_sequence_t ProvideSIWFSNumberRes_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSIWFSNumberRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSIWFSNumberRes_sequence, hf_index, ett_gsm_map_ProvideSIWFSNumberRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSIWFSNumberRes_sequence, hf_index, ett_gsm_map_ProvideSIWFSNumberRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SIWFSSignallingModifyArg_sequence[] = {
+static const ber_old_sequence_t SIWFSSignallingModifyArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_channelType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chosenChannel_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -10750,14 +10750,14 @@ static const ber_sequence_t SIWFSSignallingModifyArg_sequence[] = {
 
 static int
 dissect_gsm_map_SIWFSSignallingModifyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SIWFSSignallingModifyArg_sequence, hf_index, ett_gsm_map_SIWFSSignallingModifyArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SIWFSSignallingModifyArg_sequence, hf_index, ett_gsm_map_SIWFSSignallingModifyArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SIWFSSignallingModifyRes_sequence[] = {
+static const ber_old_sequence_t SIWFSSignallingModifyRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_channelType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -10765,8 +10765,8 @@ static const ber_sequence_t SIWFSSignallingModifyRes_sequence[] = {
 
 static int
 dissect_gsm_map_SIWFSSignallingModifyRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SIWFSSignallingModifyRes_sequence, hf_index, ett_gsm_map_SIWFSSignallingModifyRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SIWFSSignallingModifyRes_sequence, hf_index, ett_gsm_map_SIWFSSignallingModifyRes);
 
   return offset;
 }
@@ -10791,7 +10791,7 @@ static int dissect_ccbs_Monitoring(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SetReportingStateArg_sequence[] = {
+static const ber_old_sequence_t SetReportingStateArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_imsi },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_lmsi },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_ccbs_Monitoring },
@@ -10801,8 +10801,8 @@ static const ber_sequence_t SetReportingStateArg_sequence[] = {
 
 static int
 dissect_gsm_map_SetReportingStateArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SetReportingStateArg_sequence, hf_index, ett_gsm_map_SetReportingStateArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SetReportingStateArg_sequence, hf_index, ett_gsm_map_SetReportingStateArg);
 
   return offset;
 }
@@ -10828,7 +10828,7 @@ static int dissect_ccbs_SubscriberStatus_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t SetReportingStateRes_sequence[] = {
+static const ber_old_sequence_t SetReportingStateRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_SubscriberStatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -10836,14 +10836,14 @@ static const ber_sequence_t SetReportingStateRes_sequence[] = {
 
 static int
 dissect_gsm_map_SetReportingStateRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SetReportingStateRes_sequence, hf_index, ett_gsm_map_SetReportingStateRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SetReportingStateRes_sequence, hf_index, ett_gsm_map_SetReportingStateRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t EventReportData_sequence[] = {
+static const ber_old_sequence_t EventReportData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_SubscriberStatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -10851,8 +10851,8 @@ static const ber_sequence_t EventReportData_sequence[] = {
 
 static int
 dissect_gsm_map_EventReportData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportData_sequence, hf_index, ett_gsm_map_EventReportData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportData_sequence, hf_index, ett_gsm_map_EventReportData);
 
   return offset;
 }
@@ -10900,7 +10900,7 @@ static int dissect_callOutcome_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CallReportData_sequence[] = {
+static const ber_old_sequence_t CallReportData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitoringMode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callOutcome_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -10909,8 +10909,8 @@ static const ber_sequence_t CallReportData_sequence[] = {
 
 static int
 dissect_gsm_map_CallReportData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallReportData_sequence, hf_index, ett_gsm_map_CallReportData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallReportData_sequence, hf_index, ett_gsm_map_CallReportData);
 
   return offset;
 }
@@ -10919,7 +10919,7 @@ static int dissect_callReportdata_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t StatusReportArg_sequence[] = {
+static const ber_old_sequence_t StatusReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventReportData_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callReportdata_impl },
@@ -10929,22 +10929,22 @@ static const ber_sequence_t StatusReportArg_sequence[] = {
 
 static int
 dissect_gsm_map_StatusReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StatusReportArg_sequence, hf_index, ett_gsm_map_StatusReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StatusReportArg_sequence, hf_index, ett_gsm_map_StatusReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t StatusReportRes_sequence[] = {
+static const ber_old_sequence_t StatusReportRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_StatusReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StatusReportRes_sequence, hf_index, ett_gsm_map_StatusReportRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StatusReportRes_sequence, hf_index, ett_gsm_map_StatusReportRes);
 
   return offset;
 }
@@ -10973,7 +10973,7 @@ static int dissect_ruf_Outcome_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t IST_AlertArg_sequence[] = {
+static const ber_old_sequence_t IST_AlertArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -10981,8 +10981,8 @@ static const ber_sequence_t IST_AlertArg_sequence[] = {
 
 static int
 dissect_gsm_map_IST_AlertArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IST_AlertArg_sequence, hf_index, ett_gsm_map_IST_AlertArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IST_AlertArg_sequence, hf_index, ett_gsm_map_IST_AlertArg);
 
   return offset;
 }
@@ -11007,7 +11007,7 @@ static int dissect_callTerminationIndicator_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t IST_AlertRes_sequence[] = {
+static const ber_old_sequence_t IST_AlertRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_istAlertTimer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_istInformationWithdraw_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callTerminationIndicator_impl },
@@ -11017,14 +11017,14 @@ static const ber_sequence_t IST_AlertRes_sequence[] = {
 
 static int
 dissect_gsm_map_IST_AlertRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IST_AlertRes_sequence, hf_index, ett_gsm_map_IST_AlertRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IST_AlertRes_sequence, hf_index, ett_gsm_map_IST_AlertRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t IST_CommandArg_sequence[] = {
+static const ber_old_sequence_t IST_CommandArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -11032,28 +11032,28 @@ static const ber_sequence_t IST_CommandArg_sequence[] = {
 
 static int
 dissect_gsm_map_IST_CommandArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IST_CommandArg_sequence, hf_index, ett_gsm_map_IST_CommandArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IST_CommandArg_sequence, hf_index, ett_gsm_map_IST_CommandArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t IST_CommandRes_sequence[] = {
+static const ber_old_sequence_t IST_CommandRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_IST_CommandRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IST_CommandRes_sequence, hf_index, ett_gsm_map_IST_CommandRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IST_CommandRes_sequence, hf_index, ett_gsm_map_IST_CommandRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReleaseResourcesArg_sequence[] = {
+static const ber_old_sequence_t ReleaseResourcesArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_msrn },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -11061,22 +11061,22 @@ static const ber_sequence_t ReleaseResourcesArg_sequence[] = {
 
 static int
 dissect_gsm_map_ReleaseResourcesArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReleaseResourcesArg_sequence, hf_index, ett_gsm_map_ReleaseResourcesArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReleaseResourcesArg_sequence, hf_index, ett_gsm_map_ReleaseResourcesArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReleaseResourcesRes_sequence[] = {
+static const ber_old_sequence_t ReleaseResourcesRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ReleaseResourcesRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReleaseResourcesRes_sequence, hf_index, ett_gsm_map_ReleaseResourcesRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReleaseResourcesRes_sequence, hf_index, ett_gsm_map_ReleaseResourcesRes);
 
   return offset;
 }
@@ -11095,7 +11095,7 @@ static int dissect_ccbs_Index_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CCBS_Feature_sequence[] = {
+static const ber_old_sequence_t CCBS_Feature_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberSubaddress_impl },
@@ -11105,8 +11105,8 @@ static const ber_sequence_t CCBS_Feature_sequence[] = {
 
 int
 dissect_gsm_map_CCBS_Feature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CCBS_Feature_sequence, hf_index, ett_gsm_map_CCBS_Feature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CCBS_Feature_sequence, hf_index, ett_gsm_map_CCBS_Feature);
 
   return offset;
 }
@@ -11121,7 +11121,7 @@ static int dissect_CCBS_FeatureList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t RemoteUserFreeArg_sequence[] = {
+static const ber_old_sequence_t RemoteUserFreeArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ccbs_Feature_impl },
@@ -11134,14 +11134,14 @@ static const ber_sequence_t RemoteUserFreeArg_sequence[] = {
 
 static int
 dissect_gsm_map_RemoteUserFreeArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoteUserFreeArg_sequence, hf_index, ett_gsm_map_RemoteUserFreeArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoteUserFreeArg_sequence, hf_index, ett_gsm_map_RemoteUserFreeArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RemoteUserFreeRes_sequence[] = {
+static const ber_old_sequence_t RemoteUserFreeRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ruf_Outcome_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -11149,14 +11149,14 @@ static const ber_sequence_t RemoteUserFreeRes_sequence[] = {
 
 static int
 dissect_gsm_map_RemoteUserFreeRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemoteUserFreeRes_sequence, hf_index, ett_gsm_map_RemoteUserFreeRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemoteUserFreeRes_sequence, hf_index, ett_gsm_map_RemoteUserFreeRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_Data_sequence[] = {
+static const ber_old_sequence_t SS_Data_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ss_SubscriptionOption },
@@ -11168,8 +11168,8 @@ static const ber_sequence_t SS_Data_sequence[] = {
 
 static int
 dissect_gsm_map_SS_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_Data_sequence, hf_index, ett_gsm_map_SS_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_Data_sequence, hf_index, ett_gsm_map_SS_Data);
 
   return offset;
 }
@@ -11178,7 +11178,7 @@ static int dissect_ss_Data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t RegisterSS_Arg_sequence[] = {
+static const ber_old_sequence_t RegisterSS_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_addr_impl },
@@ -11192,8 +11192,8 @@ static const ber_sequence_t RegisterSS_Arg_sequence[] = {
 
 int
 dissect_gsm_map_RegisterSS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegisterSS_Arg_sequence, hf_index, ett_gsm_map_RegisterSS_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegisterSS_Arg_sequence, hf_index, ett_gsm_map_RegisterSS_Arg);
 
   return offset;
 }
@@ -11206,7 +11206,7 @@ const value_string gsm_map_SS_Info_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SS_Info_choice[] = {
+static const ber_old_choice_t SS_Info_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_forwardingInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callBarringInfo_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ss_Data_impl },
@@ -11215,22 +11215,22 @@ static const ber_choice_t SS_Info_choice[] = {
 
 int
 dissect_gsm_map_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SS_Info_choice, hf_index, ett_gsm_map_SS_Info,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SS_Info_choice, hf_index, ett_gsm_map_SS_Info,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t CCBS_FeatureList_sequence_of[1] = {
+static const ber_old_sequence_t CCBS_FeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CCBS_FeatureList_item },
 };
 
 static int
 dissect_gsm_map_CCBS_FeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CCBS_FeatureList_sequence_of, hf_index, ett_gsm_map_CCBS_FeatureList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CCBS_FeatureList_sequence_of, hf_index, ett_gsm_map_CCBS_FeatureList);
 
   return offset;
 }
@@ -11239,7 +11239,7 @@ static int dissect_ccbs_FeatureList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t GenericServiceInfo_sequence[] = {
+static const ber_old_sequence_t GenericServiceInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Status },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cliRestrictionOption },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximumEntitledPriority_impl },
@@ -11253,8 +11253,8 @@ static const ber_sequence_t GenericServiceInfo_sequence[] = {
 
 static int
 dissect_gsm_map_GenericServiceInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GenericServiceInfo_sequence, hf_index, ett_gsm_map_GenericServiceInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GenericServiceInfo_sequence, hf_index, ett_gsm_map_GenericServiceInfo);
 
   return offset;
 }
@@ -11271,7 +11271,7 @@ const value_string gsm_map_InterrogateSS_Res_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InterrogateSS_Res_choice[] = {
+static const ber_old_choice_t InterrogateSS_Res_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ext_basicServiceGroupList_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_forwardingFeatureList_impl },
@@ -11281,9 +11281,9 @@ static const ber_choice_t InterrogateSS_Res_choice[] = {
 
 int
 dissect_gsm_map_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InterrogateSS_Res_choice, hf_index, ett_gsm_map_InterrogateSS_Res,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InterrogateSS_Res_choice, hf_index, ett_gsm_map_InterrogateSS_Res,
+                                     NULL);
 
   return offset;
 }
@@ -11361,7 +11361,7 @@ static int dissect_ussd_String(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Ussd_Arg_sequence[] = {
+static const ber_old_sequence_t Ussd_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_DataCodingScheme },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_String },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alertingPattern },
@@ -11371,14 +11371,14 @@ static const ber_sequence_t Ussd_Arg_sequence[] = {
 
 int
 dissect_gsm_map_Ussd_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ussd_Arg_sequence, hf_index, ett_gsm_map_Ussd_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ussd_Arg_sequence, hf_index, ett_gsm_map_Ussd_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t Ussd_Res_sequence[] = {
+static const ber_old_sequence_t Ussd_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_DataCodingScheme },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_String },
   { 0, 0, 0, NULL }
@@ -11386,8 +11386,8 @@ static const ber_sequence_t Ussd_Res_sequence[] = {
 
 int
 dissect_gsm_map_Ussd_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ussd_Res_sequence, hf_index, ett_gsm_map_Ussd_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ussd_Res_sequence, hf_index, ett_gsm_map_Ussd_Res);
 
   return offset;
 }
@@ -11455,7 +11455,7 @@ static int dissect_accessType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t AuthenticationFailureReportArg_sequence[] = {
+static const ber_old_sequence_t AuthenticationFailureReportArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_failureCause },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -11469,22 +11469,22 @@ static const ber_sequence_t AuthenticationFailureReportArg_sequence[] = {
 
 static int
 dissect_gsm_map_AuthenticationFailureReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticationFailureReportArg_sequence, hf_index, ett_gsm_map_AuthenticationFailureReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticationFailureReportArg_sequence, hf_index, ett_gsm_map_AuthenticationFailureReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t AuthenticationFailureReportRes_sequence[] = {
+static const ber_old_sequence_t AuthenticationFailureReportRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_AuthenticationFailureReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticationFailureReportRes_sequence, hf_index, ett_gsm_map_AuthenticationFailureReportRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticationFailureReportRes_sequence, hf_index, ett_gsm_map_AuthenticationFailureReportRes);
 
   return offset;
 }
@@ -11548,7 +11548,7 @@ static int dissect_serviceIndicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CCBS_Data_sequence[] = {
+static const ber_old_sequence_t CCBS_Data_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_ccbs_Feature },
   { BER_CLASS_CON, 1, 0, dissect_translatedB_Number },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_serviceIndicator },
@@ -11559,8 +11559,8 @@ static const ber_sequence_t CCBS_Data_sequence[] = {
 
 static int
 dissect_gsm_map_CCBS_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CCBS_Data_sequence, hf_index, ett_gsm_map_CCBS_Data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CCBS_Data_sequence, hf_index, ett_gsm_map_CCBS_Data);
 
   return offset;
 }
@@ -11569,7 +11569,7 @@ static int dissect_ccbs_Data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t RegisterCC_EntryArg_sequence[] = {
+static const ber_old_sequence_t RegisterCC_EntryArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Data_impl },
   { 0, 0, 0, NULL }
@@ -11577,28 +11577,28 @@ static const ber_sequence_t RegisterCC_EntryArg_sequence[] = {
 
 static int
 dissect_gsm_map_RegisterCC_EntryArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegisterCC_EntryArg_sequence, hf_index, ett_gsm_map_RegisterCC_EntryArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegisterCC_EntryArg_sequence, hf_index, ett_gsm_map_RegisterCC_EntryArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RegisterCC_EntryRes_sequence[] = {
+static const ber_old_sequence_t RegisterCC_EntryRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Feature_impl },
   { 0, 0, 0, NULL }
 };
 
 int
 dissect_gsm_map_RegisterCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegisterCC_EntryRes_sequence, hf_index, ett_gsm_map_RegisterCC_EntryRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegisterCC_EntryRes_sequence, hf_index, ett_gsm_map_RegisterCC_EntryRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t EraseCC_EntryArg_sequence[] = {
+static const ber_old_sequence_t EraseCC_EntryArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl },
   { 0, 0, 0, NULL }
@@ -11606,14 +11606,14 @@ static const ber_sequence_t EraseCC_EntryArg_sequence[] = {
 
 int
 dissect_gsm_map_EraseCC_EntryArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EraseCC_EntryArg_sequence, hf_index, ett_gsm_map_EraseCC_EntryArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EraseCC_EntryArg_sequence, hf_index, ett_gsm_map_EraseCC_EntryArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t EraseCC_EntryRes_sequence[] = {
+static const ber_old_sequence_t EraseCC_EntryRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   { 0, 0, 0, NULL }
@@ -11621,8 +11621,8 @@ static const ber_sequence_t EraseCC_EntryRes_sequence[] = {
 
 int
 dissect_gsm_map_EraseCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EraseCC_EntryRes_sequence, hf_index, ett_gsm_map_EraseCC_EntryRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EraseCC_EntryRes_sequence, hf_index, ett_gsm_map_EraseCC_EntryRes);
 
   return offset;
 }
@@ -11696,7 +11696,7 @@ static int dissect_sm_RP_SMEA_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RoutingInfoForSMArg_sequence[] = {
+static const ber_old_sequence_t RoutingInfoForSMArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sm_RP_PRI_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddress_impl },
@@ -11709,8 +11709,8 @@ static const ber_sequence_t RoutingInfoForSMArg_sequence[] = {
 
 static int
 dissect_gsm_map_RoutingInfoForSMArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RoutingInfoForSMArg_sequence, hf_index, ett_gsm_map_RoutingInfoForSMArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RoutingInfoForSMArg_sequence, hf_index, ett_gsm_map_RoutingInfoForSMArg);
 
   return offset;
 }
@@ -11722,7 +11722,7 @@ static const value_string gsm_map_Additional_Number_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Additional_Number_choice[] = {
+static const ber_old_choice_t Additional_Number_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sgsn_Number_impl },
   { 0, 0, 0, 0, NULL }
@@ -11730,9 +11730,9 @@ static const ber_choice_t Additional_Number_choice[] = {
 
 static int
 dissect_gsm_map_Additional_Number(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Additional_Number_choice, hf_index, ett_gsm_map_Additional_Number,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Additional_Number_choice, hf_index, ett_gsm_map_Additional_Number,
+                                     NULL);
 
   return offset;
 }
@@ -11741,7 +11741,7 @@ static int dissect_additional_Number_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t LocationInfoWithLMSI_sequence[] = {
+static const ber_old_sequence_t LocationInfoWithLMSI_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_networkNode_Number_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lmsi },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -11752,8 +11752,8 @@ static const ber_sequence_t LocationInfoWithLMSI_sequence[] = {
 
 static int
 dissect_gsm_map_LocationInfoWithLMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationInfoWithLMSI_sequence, hf_index, ett_gsm_map_LocationInfoWithLMSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationInfoWithLMSI_sequence, hf_index, ett_gsm_map_LocationInfoWithLMSI);
 
   return offset;
 }
@@ -11762,7 +11762,7 @@ static int dissect_locationInfoWithLMSI_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t RoutingInfoForSM_Res_sequence[] = {
+static const ber_old_sequence_t RoutingInfoForSM_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_locationInfoWithLMSI_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -11771,8 +11771,8 @@ static const ber_sequence_t RoutingInfoForSM_Res_sequence[] = {
 
 static int
 dissect_gsm_map_RoutingInfoForSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RoutingInfoForSM_Res_sequence, hf_index, ett_gsm_map_RoutingInfoForSM_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RoutingInfoForSM_Res_sequence, hf_index, ett_gsm_map_RoutingInfoForSM_Res);
 
   return offset;
 }
@@ -11786,7 +11786,7 @@ static const value_string gsm_map_Sm_RP_DA_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Sm_RP_DA_choice[] = {
+static const ber_old_choice_t Sm_RP_DA_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lmsi_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddressDA_impl },
@@ -11796,9 +11796,9 @@ static const ber_choice_t Sm_RP_DA_choice[] = {
 
 static int
 dissect_gsm_map_Sm_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Sm_RP_DA_choice, hf_index, ett_gsm_map_Sm_RP_DA,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Sm_RP_DA_choice, hf_index, ett_gsm_map_Sm_RP_DA,
+                                     NULL);
 
   return offset;
 }
@@ -11814,7 +11814,7 @@ static const value_string gsm_map_Sm_RP_OA_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Sm_RP_OA_choice[] = {
+static const ber_old_choice_t Sm_RP_OA_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddressOA_impl },
   {   5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_noSM_RP_OA_impl },
@@ -11823,9 +11823,9 @@ static const ber_choice_t Sm_RP_OA_choice[] = {
 
 static int
 dissect_gsm_map_Sm_RP_OA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Sm_RP_OA_choice, hf_index, ett_gsm_map_Sm_RP_OA,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Sm_RP_OA_choice, hf_index, ett_gsm_map_Sm_RP_OA,
+                                     NULL);
 
   return offset;
 }
@@ -11864,7 +11864,7 @@ static int dissect_sm_RP_UI_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Mo_forwardSM_Arg_sequence[] = {
+static const ber_old_sequence_t Mo_forwardSM_Arg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_DA },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
@@ -11875,14 +11875,14 @@ static const ber_sequence_t Mo_forwardSM_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_Mo_forwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mo_forwardSM_Arg_sequence, hf_index, ett_gsm_map_Mo_forwardSM_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mo_forwardSM_Arg_sequence, hf_index, ett_gsm_map_Mo_forwardSM_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t Mo_forwardSM_Res_sequence[] = {
+static const ber_old_sequence_t Mo_forwardSM_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -11890,14 +11890,14 @@ static const ber_sequence_t Mo_forwardSM_Res_sequence[] = {
 
 static int
 dissect_gsm_map_Mo_forwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mo_forwardSM_Res_sequence, hf_index, ett_gsm_map_Mo_forwardSM_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mo_forwardSM_Res_sequence, hf_index, ett_gsm_map_Mo_forwardSM_Res);
 
   return offset;
 }
 
 
-static const ber_sequence_t Mt_forwardSM_Arg_sequence[] = {
+static const ber_old_sequence_t Mt_forwardSM_Arg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_DA },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
@@ -11908,14 +11908,14 @@ static const ber_sequence_t Mt_forwardSM_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_Mt_forwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mt_forwardSM_Arg_sequence, hf_index, ett_gsm_map_Mt_forwardSM_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mt_forwardSM_Arg_sequence, hf_index, ett_gsm_map_Mt_forwardSM_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t Mt_forwardSM_Res_sequence[] = {
+static const ber_old_sequence_t Mt_forwardSM_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -11923,14 +11923,14 @@ static const ber_sequence_t Mt_forwardSM_Res_sequence[] = {
 
 static int
 dissect_gsm_map_Mt_forwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mt_forwardSM_Res_sequence, hf_index, ett_gsm_map_Mt_forwardSM_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mt_forwardSM_Res_sequence, hf_index, ett_gsm_map_Mt_forwardSM_Res);
 
   return offset;
 }
 
 
-static const ber_sequence_t ForwardSM_Arg_sequence[] = {
+static const ber_old_sequence_t ForwardSM_Arg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_DA },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
@@ -11940,8 +11940,8 @@ static const ber_sequence_t ForwardSM_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardSM_Arg_sequence, hf_index, ett_gsm_map_ForwardSM_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardSM_Arg_sequence, hf_index, ett_gsm_map_ForwardSM_Arg);
 
   return offset;
 }
@@ -11992,7 +11992,7 @@ static int dissect_mobileNotReachableReason_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t ReportSM_DeliveryStatusArg_sequence[] = {
+static const ber_old_sequence_t ReportSM_DeliveryStatusArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_serviceCentreAddress },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sm_DeliveryOutcome },
@@ -12007,14 +12007,14 @@ static const ber_sequence_t ReportSM_DeliveryStatusArg_sequence[] = {
 
 static int
 dissect_gsm_map_ReportSM_DeliveryStatusArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportSM_DeliveryStatusArg_sequence, hf_index, ett_gsm_map_ReportSM_DeliveryStatusArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportSM_DeliveryStatusArg_sequence, hf_index, ett_gsm_map_ReportSM_DeliveryStatusArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReportSM_DeliveryStatusRes_sequence[] = {
+static const ber_old_sequence_t ReportSM_DeliveryStatusRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_storedMSISDN },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -12022,8 +12022,8 @@ static const ber_sequence_t ReportSM_DeliveryStatusRes_sequence[] = {
 
 static int
 dissect_gsm_map_ReportSM_DeliveryStatusRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportSM_DeliveryStatusRes_sequence, hf_index, ett_gsm_map_ReportSM_DeliveryStatusRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportSM_DeliveryStatusRes_sequence, hf_index, ett_gsm_map_ReportSM_DeliveryStatusRes);
 
   return offset;
 }
@@ -12050,7 +12050,7 @@ static int dissect_mw_Status(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t InformServiceCentreArg_sequence[] = {
+static const ber_old_sequence_t InformServiceCentreArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_storedMSISDN },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_mw_Status },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -12061,14 +12061,14 @@ static const ber_sequence_t InformServiceCentreArg_sequence[] = {
 
 static int
 dissect_gsm_map_InformServiceCentreArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformServiceCentreArg_sequence, hf_index, ett_gsm_map_InformServiceCentreArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformServiceCentreArg_sequence, hf_index, ett_gsm_map_InformServiceCentreArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t AlertServiceCentreArg_sequence[] = {
+static const ber_old_sequence_t AlertServiceCentreArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_serviceCentreAddress },
   { 0, 0, 0, NULL }
@@ -12076,8 +12076,8 @@ static const ber_sequence_t AlertServiceCentreArg_sequence[] = {
 
 static int
 dissect_gsm_map_AlertServiceCentreArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlertServiceCentreArg_sequence, hf_index, ett_gsm_map_AlertServiceCentreArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlertServiceCentreArg_sequence, hf_index, ett_gsm_map_AlertServiceCentreArg);
 
   return offset;
 }
@@ -12102,7 +12102,7 @@ static int dissect_alertReason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ReadyForSM_Arg_sequence[] = {
+static const ber_old_sequence_t ReadyForSM_Arg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_alertReason },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alertReasonIndicator },
@@ -12112,28 +12112,28 @@ static const ber_sequence_t ReadyForSM_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_ReadyForSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReadyForSM_Arg_sequence, hf_index, ett_gsm_map_ReadyForSM_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReadyForSM_Arg_sequence, hf_index, ett_gsm_map_ReadyForSM_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReadyForSM_Res_sequence[] = {
+static const ber_old_sequence_t ReadyForSM_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ReadyForSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReadyForSM_Res_sequence, hf_index, ett_gsm_map_ReadyForSM_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReadyForSM_Res_sequence, hf_index, ett_gsm_map_ReadyForSM_Res);
 
   return offset;
 }
 
 
-static const ber_sequence_t Mt_ForwardSM_VGCS_Arg_sequence[] = {
+static const ber_old_sequence_t Mt_ForwardSM_VGCS_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_asciCallReference },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI },
@@ -12143,21 +12143,21 @@ static const ber_sequence_t Mt_ForwardSM_VGCS_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_Mt_ForwardSM_VGCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mt_ForwardSM_VGCS_Arg_sequence, hf_index, ett_gsm_map_Mt_ForwardSM_VGCS_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mt_ForwardSM_VGCS_Arg_sequence, hf_index, ett_gsm_map_Mt_ForwardSM_VGCS_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DispatcherList_sequence_of[1] = {
+static const ber_old_sequence_t DispatcherList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DispatcherList_item },
 };
 
 static int
 dissect_gsm_map_DispatcherList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DispatcherList_sequence_of, hf_index, ett_gsm_map_DispatcherList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DispatcherList_sequence_of, hf_index, ett_gsm_map_DispatcherList);
 
   return offset;
 }
@@ -12166,7 +12166,7 @@ static int dissect_dispatcherList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Mt_ForwardSM_VGCS_Res_sequence[] = {
+static const ber_old_sequence_t Mt_ForwardSM_VGCS_Res_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sm_RP_UI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dispatcherList_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ongoingCall },
@@ -12176,8 +12176,8 @@ static const ber_sequence_t Mt_ForwardSM_VGCS_Res_sequence[] = {
 
 static int
 dissect_gsm_map_Mt_ForwardSM_VGCS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mt_ForwardSM_VGCS_Res_sequence, hf_index, ett_gsm_map_Mt_ForwardSM_VGCS_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mt_ForwardSM_VGCS_Res_sequence, hf_index, ett_gsm_map_Mt_ForwardSM_VGCS_Res);
 
   return offset;
 }
@@ -12202,7 +12202,7 @@ static int dissect_requestedDomain_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RequestedInfo_sequence[] = {
+static const ber_old_sequence_t RequestedInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_flg_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subscriberState_flg_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -12216,8 +12216,8 @@ static const ber_sequence_t RequestedInfo_sequence[] = {
 
 static int
 dissect_gsm_map_RequestedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedInfo_sequence, hf_index, ett_gsm_map_RequestedInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedInfo_sequence, hf_index, ett_gsm_map_RequestedInfo);
 
   return offset;
 }
@@ -12226,7 +12226,7 @@ static int dissect_requestedInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ProvideSubscriberInfoArg_sequence[] = {
+static const ber_old_sequence_t ProvideSubscriberInfoArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lmsi_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_requestedInfo_impl },
@@ -12236,14 +12236,14 @@ static const ber_sequence_t ProvideSubscriberInfoArg_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSubscriberInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSubscriberInfoArg_sequence, hf_index, ett_gsm_map_ProvideSubscriberInfoArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSubscriberInfoArg_sequence, hf_index, ett_gsm_map_ProvideSubscriberInfoArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ProvideSubscriberInfoRes_sequence[] = {
+static const ber_old_sequence_t ProvideSubscriberInfoRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subscriberInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -12251,14 +12251,14 @@ static const ber_sequence_t ProvideSubscriberInfoRes_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSubscriberInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSubscriberInfoRes_sequence, hf_index, ett_gsm_map_ProvideSubscriberInfoRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSubscriberInfoRes_sequence, hf_index, ett_gsm_map_ProvideSubscriberInfoRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t AnyTimeInterrogationArg_sequence[] = {
+static const ber_old_sequence_t AnyTimeInterrogationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_subscriberIdentity },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_requestedInfo_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -12268,14 +12268,14 @@ static const ber_sequence_t AnyTimeInterrogationArg_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeInterrogationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeInterrogationArg_sequence, hf_index, ett_gsm_map_AnyTimeInterrogationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeInterrogationArg_sequence, hf_index, ett_gsm_map_AnyTimeInterrogationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t AnyTimeInterrogationRes_sequence[] = {
+static const ber_old_sequence_t AnyTimeInterrogationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subscriberInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -12283,14 +12283,14 @@ static const ber_sequence_t AnyTimeInterrogationRes_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeInterrogationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeInterrogationRes_sequence, hf_index, ett_gsm_map_AnyTimeInterrogationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeInterrogationRes_sequence, hf_index, ett_gsm_map_AnyTimeInterrogationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_ForBS_Code_sequence[] = {
+static const ber_old_sequence_t SS_ForBS_Code_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_longFTN_Supported_impl },
@@ -12299,8 +12299,8 @@ static const ber_sequence_t SS_ForBS_Code_sequence[] = {
 
 int
 dissect_gsm_map_SS_ForBS_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_ForBS_Code_sequence, hf_index, ett_gsm_map_SS_ForBS_Code);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_ForBS_Code_sequence, hf_index, ett_gsm_map_SS_ForBS_Code);
 
   return offset;
 }
@@ -12363,7 +12363,7 @@ static int dissect_additionalRequestedCAMEL_SubscriptionInfo_impl(proto_tree *tr
 }
 
 
-static const ber_sequence_t RequestedSubscriptionInfo_sequence[] = {
+static const ber_old_sequence_t RequestedSubscriptionInfo_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestedSS_Info_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_odb_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestedCAMEL_SubscriptionInfo_impl },
@@ -12377,8 +12377,8 @@ static const ber_sequence_t RequestedSubscriptionInfo_sequence[] = {
 
 static int
 dissect_gsm_map_RequestedSubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedSubscriptionInfo_sequence, hf_index, ett_gsm_map_RequestedSubscriptionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedSubscriptionInfo_sequence, hf_index, ett_gsm_map_RequestedSubscriptionInfo);
 
   return offset;
 }
@@ -12387,7 +12387,7 @@ static int dissect_requestedSubscriptionInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t AnyTimeSubscriptionInterrogationArg_sequence[] = {
+static const ber_old_sequence_t AnyTimeSubscriptionInterrogationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_subscriberIdentity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_requestedSubscriptionInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
@@ -12398,14 +12398,14 @@ static const ber_sequence_t AnyTimeSubscriptionInterrogationArg_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeSubscriptionInterrogationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeSubscriptionInterrogationArg_sequence, hf_index, ett_gsm_map_AnyTimeSubscriptionInterrogationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeSubscriptionInterrogationArg_sequence, hf_index, ett_gsm_map_AnyTimeSubscriptionInterrogationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CallForwardingData_sequence[] = {
+static const ber_old_sequence_t CallForwardingData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ext_forwardingFeatureList },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notificationToCSE },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -12414,8 +12414,8 @@ static const ber_sequence_t CallForwardingData_sequence[] = {
 
 static int
 dissect_gsm_map_CallForwardingData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallForwardingData_sequence, hf_index, ett_gsm_map_CallForwardingData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallForwardingData_sequence, hf_index, ett_gsm_map_CallForwardingData);
 
   return offset;
 }
@@ -12457,7 +12457,7 @@ static int dissect_wrongPasswordAttemptsCounter_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t CallBarringData_sequence[] = {
+static const ber_old_sequence_t CallBarringData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ext_callBarringFeatureList },
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_password },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_wrongPasswordAttemptsCounter },
@@ -12468,8 +12468,8 @@ static const ber_sequence_t CallBarringData_sequence[] = {
 
 static int
 dissect_gsm_map_CallBarringData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallBarringData_sequence, hf_index, ett_gsm_map_CallBarringData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallBarringData_sequence, hf_index, ett_gsm_map_CallBarringData);
 
   return offset;
 }
@@ -12478,7 +12478,7 @@ static int dissect_callBarringData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ODB_Info_sequence[] = {
+static const ber_old_sequence_t ODB_Info_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_odb_Data },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notificationToCSE },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -12487,8 +12487,8 @@ static const ber_sequence_t ODB_Info_sequence[] = {
 
 static int
 dissect_gsm_map_ODB_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ODB_Info_sequence, hf_index, ett_gsm_map_ODB_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ODB_Info_sequence, hf_index, ett_gsm_map_ODB_Info);
 
   return offset;
 }
@@ -12497,7 +12497,7 @@ static int dissect_odb_Info_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CAMEL_SubscriptionInfo_sequence[] = {
+static const ber_old_sequence_t CAMEL_SubscriptionInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_CSI_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_BcsmCamelTDP_CriteriaList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_d_CSI_impl },
@@ -12526,8 +12526,8 @@ static const ber_sequence_t CAMEL_SubscriptionInfo_sequence[] = {
 
 static int
 dissect_gsm_map_CAMEL_SubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CAMEL_SubscriptionInfo_sequence, hf_index, ett_gsm_map_CAMEL_SubscriptionInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CAMEL_SubscriptionInfo_sequence, hf_index, ett_gsm_map_CAMEL_SubscriptionInfo);
 
   return offset;
 }
@@ -12536,7 +12536,7 @@ static int dissect_camel_SubscriptionInfo_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t MSISDN_BS_sequence[] = {
+static const ber_old_sequence_t MSISDN_BS_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -12545,8 +12545,8 @@ static const ber_sequence_t MSISDN_BS_sequence[] = {
 
 static int
 dissect_gsm_map_MSISDN_BS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MSISDN_BS_sequence, hf_index, ett_gsm_map_MSISDN_BS);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MSISDN_BS_sequence, hf_index, ett_gsm_map_MSISDN_BS);
 
   return offset;
 }
@@ -12555,14 +12555,14 @@ static int dissect_MSISDN_BS_List_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t MSISDN_BS_List_sequence_of[1] = {
+static const ber_old_sequence_t MSISDN_BS_List_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MSISDN_BS_List_item },
 };
 
 static int
 dissect_gsm_map_MSISDN_BS_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MSISDN_BS_List_sequence_of, hf_index, ett_gsm_map_MSISDN_BS_List);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MSISDN_BS_List_sequence_of, hf_index, ett_gsm_map_MSISDN_BS_List);
 
   return offset;
 }
@@ -12571,7 +12571,7 @@ static int dissect_msisdn_BS_List_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AnyTimeSubscriptionInterrogationRes_sequence[] = {
+static const ber_old_sequence_t AnyTimeSubscriptionInterrogationRes_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callForwardingData_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callBarringData_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_odb_Info_impl },
@@ -12587,8 +12587,8 @@ static const ber_sequence_t AnyTimeSubscriptionInterrogationRes_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeSubscriptionInterrogationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeSubscriptionInterrogationRes_sequence, hf_index, ett_gsm_map_AnyTimeSubscriptionInterrogationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeSubscriptionInterrogationRes_sequence, hf_index, ett_gsm_map_AnyTimeSubscriptionInterrogationRes);
 
   return offset;
 }
@@ -12670,7 +12670,7 @@ static int dissect_modifyCSI_State_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ModificationRequestFor_CF_Info_sequence[] = {
+static const ber_old_sequence_t ModificationRequestFor_CF_Info_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_ext_basicService_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
@@ -12684,8 +12684,8 @@ static const ber_sequence_t ModificationRequestFor_CF_Info_sequence[] = {
 
 static int
 dissect_gsm_map_ModificationRequestFor_CF_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationRequestFor_CF_Info_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CF_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationRequestFor_CF_Info_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CF_Info);
 
   return offset;
 }
@@ -12694,7 +12694,7 @@ static int dissect_modificationRequestFor_CF_Info_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t ModificationRequestFor_CB_Info_sequence[] = {
+static const ber_old_sequence_t ModificationRequestFor_CB_Info_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_ext_basicService_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ext_ss_Status_impl },
@@ -12707,8 +12707,8 @@ static const ber_sequence_t ModificationRequestFor_CB_Info_sequence[] = {
 
 static int
 dissect_gsm_map_ModificationRequestFor_CB_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationRequestFor_CB_Info_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CB_Info);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationRequestFor_CB_Info_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CB_Info);
 
   return offset;
 }
@@ -12717,7 +12717,7 @@ static int dissect_modificationRequestFor_CB_Info_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t ModificationRequestFor_CSI_sequence[] = {
+static const ber_old_sequence_t ModificationRequestFor_CSI_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedCamel_SubscriptionInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyNotificationToCSE_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyCSI_State_impl },
@@ -12728,8 +12728,8 @@ static const ber_sequence_t ModificationRequestFor_CSI_sequence[] = {
 
 static int
 dissect_gsm_map_ModificationRequestFor_CSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationRequestFor_CSI_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationRequestFor_CSI_sequence, hf_index, ett_gsm_map_ModificationRequestFor_CSI);
 
   return offset;
 }
@@ -12738,7 +12738,7 @@ static int dissect_modificationRequestFor_CSI_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ModificationRequestFor_ODB_data_sequence[] = {
+static const ber_old_sequence_t ModificationRequestFor_ODB_data_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_odb_data_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyNotificationToCSE_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -12747,8 +12747,8 @@ static const ber_sequence_t ModificationRequestFor_ODB_data_sequence[] = {
 
 static int
 dissect_gsm_map_ModificationRequestFor_ODB_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModificationRequestFor_ODB_data_sequence, hf_index, ett_gsm_map_ModificationRequestFor_ODB_data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModificationRequestFor_ODB_data_sequence, hf_index, ett_gsm_map_ModificationRequestFor_ODB_data);
 
   return offset;
 }
@@ -12757,7 +12757,7 @@ static int dissect_modificationRequestFor_ODB_data(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t AnyTimeModificationArg_sequence[] = {
+static const ber_old_sequence_t AnyTimeModificationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_subscriberIdentity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modificationRequestFor_CF_Info_impl },
@@ -12771,14 +12771,14 @@ static const ber_sequence_t AnyTimeModificationArg_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeModificationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeModificationArg_sequence, hf_index, ett_gsm_map_AnyTimeModificationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeModificationArg_sequence, hf_index, ett_gsm_map_AnyTimeModificationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t Ext_ForwardingInfoFor_CSE_sequence[] = {
+static const ber_old_sequence_t Ext_ForwardingInfoFor_CSE_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ext_forwardingFeatureList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToCSE_impl },
@@ -12788,8 +12788,8 @@ static const ber_sequence_t Ext_ForwardingInfoFor_CSE_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_ForwardingInfoFor_CSE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_ForwardingInfoFor_CSE_sequence, hf_index, ett_gsm_map_Ext_ForwardingInfoFor_CSE);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_ForwardingInfoFor_CSE_sequence, hf_index, ett_gsm_map_Ext_ForwardingInfoFor_CSE);
 
   return offset;
 }
@@ -12798,7 +12798,7 @@ static int dissect_forwardingInfoFor_CSE_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Ext_CallBarringInfoFor_CSE_sequence[] = {
+static const ber_old_sequence_t Ext_CallBarringInfoFor_CSE_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ext_callBarringFeatureList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_password_impl },
@@ -12810,8 +12810,8 @@ static const ber_sequence_t Ext_CallBarringInfoFor_CSE_sequence[] = {
 
 static int
 dissect_gsm_map_Ext_CallBarringInfoFor_CSE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ext_CallBarringInfoFor_CSE_sequence, hf_index, ett_gsm_map_Ext_CallBarringInfoFor_CSE);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ext_CallBarringInfoFor_CSE_sequence, hf_index, ett_gsm_map_Ext_CallBarringInfoFor_CSE);
 
   return offset;
 }
@@ -12826,7 +12826,7 @@ static const value_string gsm_map_Ext_SS_InfoFor_CSE_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Ext_SS_InfoFor_CSE_choice[] = {
+static const ber_old_choice_t Ext_SS_InfoFor_CSE_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_forwardingInfoFor_CSE_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callBarringInfoFor_CSE_impl },
   { 0, 0, 0, 0, NULL }
@@ -12834,9 +12834,9 @@ static const ber_choice_t Ext_SS_InfoFor_CSE_choice[] = {
 
 static int
 dissect_gsm_map_Ext_SS_InfoFor_CSE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Ext_SS_InfoFor_CSE_choice, hf_index, ett_gsm_map_Ext_SS_InfoFor_CSE,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Ext_SS_InfoFor_CSE_choice, hf_index, ett_gsm_map_Ext_SS_InfoFor_CSE,
+                                     NULL);
 
   return offset;
 }
@@ -12845,7 +12845,7 @@ static int dissect_ss_InfoFor_CSE_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AnyTimeModificationRes_sequence[] = {
+static const ber_old_sequence_t AnyTimeModificationRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_ss_InfoFor_CSE_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_SubscriptionInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -12855,14 +12855,14 @@ static const ber_sequence_t AnyTimeModificationRes_sequence[] = {
 
 static int
 dissect_gsm_map_AnyTimeModificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnyTimeModificationRes_sequence, hf_index, ett_gsm_map_AnyTimeModificationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnyTimeModificationRes_sequence, hf_index, ett_gsm_map_AnyTimeModificationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteSubscriberDataModifiedArg_sequence[] = {
+static const ber_old_sequence_t NoteSubscriberDataModifiedArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingInfoFor_CSE_impl },
@@ -12876,28 +12876,28 @@ static const ber_sequence_t NoteSubscriberDataModifiedArg_sequence[] = {
 
 static int
 dissect_gsm_map_NoteSubscriberDataModifiedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteSubscriberDataModifiedArg_sequence, hf_index, ett_gsm_map_NoteSubscriberDataModifiedArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteSubscriberDataModifiedArg_sequence, hf_index, ett_gsm_map_NoteSubscriberDataModifiedArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteSubscriberDataModifiedRes_sequence[] = {
+static const ber_old_sequence_t NoteSubscriberDataModifiedRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoteSubscriberDataModifiedRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteSubscriberDataModifiedRes_sequence, hf_index, ett_gsm_map_NoteSubscriberDataModifiedRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteSubscriberDataModifiedRes_sequence, hf_index, ett_gsm_map_NoteSubscriberDataModifiedRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteMM_EventArg_sequence[] = {
+static const ber_old_sequence_t NoteMM_EventArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventMet_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
@@ -12912,35 +12912,35 @@ static const ber_sequence_t NoteMM_EventArg_sequence[] = {
 
 static int
 dissect_gsm_map_NoteMM_EventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteMM_EventArg_sequence, hf_index, ett_gsm_map_NoteMM_EventArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteMM_EventArg_sequence, hf_index, ett_gsm_map_NoteMM_EventArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteMM_EventRes_sequence[] = {
+static const ber_old_sequence_t NoteMM_EventRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoteMM_EventRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteMM_EventRes_sequence, hf_index, ett_gsm_map_NoteMM_EventRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteMM_EventRes_sequence, hf_index, ett_gsm_map_NoteMM_EventRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_EventSpecification_sequence_of[1] = {
+static const ber_old_sequence_t SS_EventSpecification_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SS_EventSpecification_item },
 };
 
 static int
 dissect_gsm_map_SS_EventSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SS_EventSpecification_sequence_of, hf_index, ett_gsm_map_SS_EventSpecification);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SS_EventSpecification_sequence_of, hf_index, ett_gsm_map_SS_EventSpecification);
 
   return offset;
 }
@@ -12973,7 +12973,7 @@ static int dissect_ccbs_RequestState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t Ss_InvocationNotificationArg_sequence[] = {
+static const ber_old_sequence_t Ss_InvocationNotificationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ss_Event_impl },
@@ -12986,22 +12986,22 @@ static const ber_sequence_t Ss_InvocationNotificationArg_sequence[] = {
 
 static int
 dissect_gsm_map_Ss_InvocationNotificationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ss_InvocationNotificationArg_sequence, hf_index, ett_gsm_map_Ss_InvocationNotificationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ss_InvocationNotificationArg_sequence, hf_index, ett_gsm_map_Ss_InvocationNotificationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t Ss_InvocationNotificationRes_sequence[] = {
+static const ber_old_sequence_t Ss_InvocationNotificationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_Ss_InvocationNotificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Ss_InvocationNotificationRes_sequence, hf_index, ett_gsm_map_Ss_InvocationNotificationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Ss_InvocationNotificationRes_sequence, hf_index, ett_gsm_map_Ss_InvocationNotificationRes);
 
   return offset;
 }
@@ -13072,7 +13072,7 @@ static int dissect_vstk_rand_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t PrepareGroupCallArg_sequence[] = {
+static const ber_old_sequence_t PrepareGroupCallArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ext_teleservice },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_asciCallReference },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_codec_Info },
@@ -13089,14 +13089,14 @@ static const ber_sequence_t PrepareGroupCallArg_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareGroupCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareGroupCallArg_sequence, hf_index, ett_gsm_map_PrepareGroupCallArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareGroupCallArg_sequence, hf_index, ett_gsm_map_PrepareGroupCallArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t PrepareGroupCallRes_sequence[] = {
+static const ber_old_sequence_t PrepareGroupCallRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupCallNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -13104,8 +13104,8 @@ static const ber_sequence_t PrepareGroupCallRes_sequence[] = {
 
 static int
 dissect_gsm_map_PrepareGroupCallRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrepareGroupCallRes_sequence, hf_index, ett_gsm_map_PrepareGroupCallRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrepareGroupCallRes_sequence, hf_index, ett_gsm_map_PrepareGroupCallRes);
 
   return offset;
 }
@@ -13131,7 +13131,7 @@ static int dissect_talkerPriority_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SendGroupCallEndSignalArg_sequence[] = {
+static const ber_old_sequence_t SendGroupCallEndSignalArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_talkerPriority_impl },
@@ -13141,28 +13141,28 @@ static const ber_sequence_t SendGroupCallEndSignalArg_sequence[] = {
 
 static int
 dissect_gsm_map_SendGroupCallEndSignalArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendGroupCallEndSignalArg_sequence, hf_index, ett_gsm_map_SendGroupCallEndSignalArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendGroupCallEndSignalArg_sequence, hf_index, ett_gsm_map_SendGroupCallEndSignalArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendGroupCallEndSignalRes_sequence[] = {
+static const ber_old_sequence_t SendGroupCallEndSignalRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_SendGroupCallEndSignalRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendGroupCallEndSignalRes_sequence, hf_index, ett_gsm_map_SendGroupCallEndSignalRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendGroupCallEndSignalRes_sequence, hf_index, ett_gsm_map_SendGroupCallEndSignalRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t ProcessGroupCallSignallingArg_sequence[] = {
+static const ber_old_sequence_t ProcessGroupCallSignallingArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkRequest_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkReleaseIndication_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseGroupCall_impl },
@@ -13175,14 +13175,14 @@ static const ber_sequence_t ProcessGroupCallSignallingArg_sequence[] = {
 
 static int
 dissect_gsm_map_ProcessGroupCallSignallingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProcessGroupCallSignallingArg_sequence, hf_index, ett_gsm_map_ProcessGroupCallSignallingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProcessGroupCallSignallingArg_sequence, hf_index, ett_gsm_map_ProcessGroupCallSignallingArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t StateAttributes_sequence[] = {
+static const ber_old_sequence_t StateAttributes_sequence[] = {
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_downlinkAttached_impl },
   { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkAttached_impl },
   { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dualCommunication_impl },
@@ -13192,8 +13192,8 @@ static const ber_sequence_t StateAttributes_sequence[] = {
 
 static int
 dissect_gsm_map_StateAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StateAttributes_sequence, hf_index, ett_gsm_map_StateAttributes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StateAttributes_sequence, hf_index, ett_gsm_map_StateAttributes);
 
   return offset;
 }
@@ -13221,7 +13221,7 @@ static int dissect_groupRequestedInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SendGroupCallInfoArg_sequence[] = {
+static const ber_old_sequence_t SendGroupCallInfoArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_groupRequestedInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupId },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cellId_impl },
@@ -13236,14 +13236,14 @@ static const ber_sequence_t SendGroupCallInfoArg_sequence[] = {
 
 static int
 dissect_gsm_map_SendGroupCallInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendGroupCallInfoArg_sequence, hf_index, ett_gsm_map_SendGroupCallInfoArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendGroupCallInfoArg_sequence, hf_index, ett_gsm_map_SendGroupCallInfoArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendGroupCallInfoRes_sequence[] = {
+static const ber_old_sequence_t SendGroupCallInfoRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_anchorMSC_Address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asciCallReference_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl },
@@ -13256,14 +13256,14 @@ static const ber_sequence_t SendGroupCallInfoRes_sequence[] = {
 
 static int
 dissect_gsm_map_SendGroupCallInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendGroupCallInfoRes_sequence, hf_index, ett_gsm_map_SendGroupCallInfoRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendGroupCallInfoRes_sequence, hf_index, ett_gsm_map_SendGroupCallInfoRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t ForwardGroupCallSignallingArg_sequence[] = {
+static const ber_old_sequence_t ForwardGroupCallSignallingArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkRequestAck_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkReleaseIndication_impl },
@@ -13281,14 +13281,14 @@ static const ber_sequence_t ForwardGroupCallSignallingArg_sequence[] = {
 
 static int
 dissect_gsm_map_ForwardGroupCallSignallingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardGroupCallSignallingArg_sequence, hf_index, ett_gsm_map_ForwardGroupCallSignallingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardGroupCallSignallingArg_sequence, hf_index, ett_gsm_map_ForwardGroupCallSignallingArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SGSN_Capability_sequence[] = {
+static const ber_old_sequence_t SGSN_Capability_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_solsaSupportIndicator },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_superChargerSupportedInServingNetworkEntity_impl },
@@ -13303,8 +13303,8 @@ static const ber_sequence_t SGSN_Capability_sequence[] = {
 
 static int
 dissect_gsm_map_SGSN_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SGSN_Capability_sequence, hf_index, ett_gsm_map_SGSN_Capability);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SGSN_Capability_sequence, hf_index, ett_gsm_map_SGSN_Capability);
 
   return offset;
 }
@@ -13313,7 +13313,7 @@ static int dissect_sgsn_Capability_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UpdateGprsLocationArg_sequence[] = {
+static const ber_old_sequence_t UpdateGprsLocationArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sgsn_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sgsn_Address },
@@ -13328,14 +13328,14 @@ static const ber_sequence_t UpdateGprsLocationArg_sequence[] = {
 
 static int
 dissect_gsm_map_UpdateGprsLocationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateGprsLocationArg_sequence, hf_index, ett_gsm_map_UpdateGprsLocationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateGprsLocationArg_sequence, hf_index, ett_gsm_map_UpdateGprsLocationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t UpdateGprsLocationRes_sequence[] = {
+static const ber_old_sequence_t UpdateGprsLocationRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_add_Capability },
@@ -13344,14 +13344,14 @@ static const ber_sequence_t UpdateGprsLocationRes_sequence[] = {
 
 static int
 dissect_gsm_map_UpdateGprsLocationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UpdateGprsLocationRes_sequence, hf_index, ett_gsm_map_UpdateGprsLocationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UpdateGprsLocationRes_sequence, hf_index, ett_gsm_map_UpdateGprsLocationRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendRoutingInfoForGprsArg_sequence[] = {
+static const ber_old_sequence_t SendRoutingInfoForGprsArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ggsn_Number_impl },
@@ -13361,14 +13361,14 @@ static const ber_sequence_t SendRoutingInfoForGprsArg_sequence[] = {
 
 static int
 dissect_gsm_map_SendRoutingInfoForGprsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendRoutingInfoForGprsArg_sequence, hf_index, ett_gsm_map_SendRoutingInfoForGprsArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendRoutingInfoForGprsArg_sequence, hf_index, ett_gsm_map_SendRoutingInfoForGprsArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SendRoutingInfoForGprsRes_sequence[] = {
+static const ber_old_sequence_t SendRoutingInfoForGprsRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sgsn_Address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileNotReachableReason_impl },
@@ -13378,14 +13378,14 @@ static const ber_sequence_t SendRoutingInfoForGprsRes_sequence[] = {
 
 static int
 dissect_gsm_map_SendRoutingInfoForGprsRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendRoutingInfoForGprsRes_sequence, hf_index, ett_gsm_map_SendRoutingInfoForGprsRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendRoutingInfoForGprsRes_sequence, hf_index, ett_gsm_map_SendRoutingInfoForGprsRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t FailureReportArg_sequence[] = {
+static const ber_old_sequence_t FailureReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ggsn_Number_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl },
@@ -13395,14 +13395,14 @@ static const ber_sequence_t FailureReportArg_sequence[] = {
 
 static int
 dissect_gsm_map_FailureReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FailureReportArg_sequence, hf_index, ett_gsm_map_FailureReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FailureReportArg_sequence, hf_index, ett_gsm_map_FailureReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t FailureReportRes_sequence[] = {
+static const ber_old_sequence_t FailureReportRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -13410,14 +13410,14 @@ static const ber_sequence_t FailureReportRes_sequence[] = {
 
 static int
 dissect_gsm_map_FailureReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FailureReportRes_sequence, hf_index, ett_gsm_map_FailureReportRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FailureReportRes_sequence, hf_index, ett_gsm_map_FailureReportRes);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteMsPresentForGprsArg_sequence[] = {
+static const ber_old_sequence_t NoteMsPresentForGprsArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sgsn_Address_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl },
@@ -13427,22 +13427,22 @@ static const ber_sequence_t NoteMsPresentForGprsArg_sequence[] = {
 
 static int
 dissect_gsm_map_NoteMsPresentForGprsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteMsPresentForGprsArg_sequence, hf_index, ett_gsm_map_NoteMsPresentForGprsArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteMsPresentForGprsArg_sequence, hf_index, ett_gsm_map_NoteMsPresentForGprsArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoteMsPresentForGprsRes_sequence[] = {
+static const ber_old_sequence_t NoteMsPresentForGprsRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoteMsPresentForGprsRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoteMsPresentForGprsRes_sequence, hf_index, ett_gsm_map_NoteMsPresentForGprsRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoteMsPresentForGprsRes_sequence, hf_index, ett_gsm_map_NoteMsPresentForGprsRes);
 
   return offset;
 }
@@ -13496,7 +13496,7 @@ static int dissect_deferredLocationEventType_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t LocationType_sequence[] = {
+static const ber_old_sequence_t LocationType_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_locationEstimateType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deferredLocationEventType_impl },
   { 0, 0, 0, NULL }
@@ -13504,8 +13504,8 @@ static const ber_sequence_t LocationType_sequence[] = {
 
 int
 dissect_gsm_map_LocationType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationType_sequence, hf_index, ett_gsm_map_LocationType);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationType_sequence, hf_index, ett_gsm_map_LocationType);
 
   return offset;
 }
@@ -13569,7 +13569,7 @@ static int dissect_lcs_FormatIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LCSClientName_sequence[] = {
+static const ber_old_sequence_t LCSClientName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameString_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_FormatIndicator_impl },
@@ -13578,8 +13578,8 @@ static const ber_sequence_t LCSClientName_sequence[] = {
 
 int
 dissect_gsm_map_LCSClientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSClientName_sequence, hf_index, ett_gsm_map_LCSClientName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSClientName_sequence, hf_index, ett_gsm_map_LCSClientName);
 
   return offset;
 }
@@ -13600,7 +13600,7 @@ static int dissect_requestorIDString_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t LCSRequestorID_sequence[] = {
+static const ber_old_sequence_t LCSRequestorID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_requestorIDString_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_FormatIndicator_impl },
@@ -13609,8 +13609,8 @@ static const ber_sequence_t LCSRequestorID_sequence[] = {
 
 int
 dissect_gsm_map_LCSRequestorID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSRequestorID_sequence, hf_index, ett_gsm_map_LCSRequestorID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSRequestorID_sequence, hf_index, ett_gsm_map_LCSRequestorID);
 
   return offset;
 }
@@ -13619,7 +13619,7 @@ static int dissect_lcsRequestorID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LCS_ClientID_sequence[] = {
+static const ber_old_sequence_t LCS_ClientID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lcsClientType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientExternalID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientDialedByMS_impl },
@@ -13632,8 +13632,8 @@ static const ber_sequence_t LCS_ClientID_sequence[] = {
 
 static int
 dissect_gsm_map_LCS_ClientID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_ClientID_sequence, hf_index, ett_gsm_map_LCS_ClientID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_ClientID_sequence, hf_index, ett_gsm_map_LCS_ClientID);
 
   return offset;
 }
@@ -13703,15 +13703,15 @@ static int dissect_responseTimeCategory(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ResponseTime_sequence[] = {
+static const ber_old_sequence_t ResponseTime_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseTimeCategory },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ResponseTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResponseTime_sequence, hf_index, ett_gsm_map_ResponseTime);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResponseTime_sequence, hf_index, ett_gsm_map_ResponseTime);
 
   return offset;
 }
@@ -13720,7 +13720,7 @@ static int dissect_responseTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t LCS_QoS_sequence[] = {
+static const ber_old_sequence_t LCS_QoS_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_horizontal_accuracy_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_verticalCoordinateRequest_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vertical_accuracy_impl },
@@ -13732,8 +13732,8 @@ static const ber_sequence_t LCS_QoS_sequence[] = {
 
 int
 dissect_gsm_map_LCS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_QoS_sequence, hf_index, ett_gsm_map_LCS_QoS);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_QoS_sequence, hf_index, ett_gsm_map_LCS_QoS);
 
   return offset;
 }
@@ -13791,7 +13791,7 @@ static int dissect_lcsCodewordString_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t LCSCodeword_sequence[] = {
+static const ber_old_sequence_t LCSCodeword_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lcsCodewordString_impl },
   { 0, 0, 0, NULL }
@@ -13799,8 +13799,8 @@ static const ber_sequence_t LCSCodeword_sequence[] = {
 
 int
 dissect_gsm_map_LCSCodeword(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSCodeword_sequence, hf_index, ett_gsm_map_LCSCodeword);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSCodeword_sequence, hf_index, ett_gsm_map_LCSCodeword);
 
   return offset;
 }
@@ -13834,7 +13834,7 @@ static int dissect_callSessionRelated_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t LCS_PrivacyCheck_sequence[] = {
+static const ber_old_sequence_t LCS_PrivacyCheck_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callSessionUnrelated_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callSessionRelated_impl },
   { 0, 0, 0, NULL }
@@ -13842,8 +13842,8 @@ static const ber_sequence_t LCS_PrivacyCheck_sequence[] = {
 
 static int
 dissect_gsm_map_LCS_PrivacyCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_PrivacyCheck_sequence, hf_index, ett_gsm_map_LCS_PrivacyCheck);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_PrivacyCheck_sequence, hf_index, ett_gsm_map_LCS_PrivacyCheck);
 
   return offset;
 }
@@ -13888,7 +13888,7 @@ static int dissect_areaIdentification_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Area_sequence[] = {
+static const ber_old_sequence_t Area_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_areaType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_areaIdentification_impl },
   { 0, 0, 0, NULL }
@@ -13896,8 +13896,8 @@ static const ber_sequence_t Area_sequence[] = {
 
 static int
 dissect_gsm_map_Area(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Area_sequence, hf_index, ett_gsm_map_Area);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Area_sequence, hf_index, ett_gsm_map_Area);
 
   return offset;
 }
@@ -13906,14 +13906,14 @@ static int dissect_AreaList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t AreaList_sequence_of[1] = {
+static const ber_old_sequence_t AreaList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AreaList_item },
 };
 
 static int
 dissect_gsm_map_AreaList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AreaList_sequence_of, hf_index, ett_gsm_map_AreaList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AreaList_sequence_of, hf_index, ett_gsm_map_AreaList);
 
   return offset;
 }
@@ -13922,15 +13922,15 @@ static int dissect_areaList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t AreaDefinition_sequence[] = {
+static const ber_old_sequence_t AreaDefinition_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_areaList_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_AreaDefinition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AreaDefinition_sequence, hf_index, ett_gsm_map_AreaDefinition);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AreaDefinition_sequence, hf_index, ett_gsm_map_AreaDefinition);
 
   return offset;
 }
@@ -13971,7 +13971,7 @@ static int dissect_intervalTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AreaEventInfo_sequence[] = {
+static const ber_old_sequence_t AreaEventInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_areaDefinition_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_occurrenceInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_intervalTime_impl },
@@ -13980,8 +13980,8 @@ static const ber_sequence_t AreaEventInfo_sequence[] = {
 
 int
 dissect_gsm_map_AreaEventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AreaEventInfo_sequence, hf_index, ett_gsm_map_AreaEventInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AreaEventInfo_sequence, hf_index, ett_gsm_map_AreaEventInfo);
 
   return offset;
 }
@@ -14016,7 +14016,7 @@ static int dissect_reportingInterval(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t PeriodicLDRInfo_sequence[] = {
+static const ber_old_sequence_t PeriodicLDRInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_reportingAmount },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_reportingInterval },
   { 0, 0, 0, NULL }
@@ -14024,8 +14024,8 @@ static const ber_sequence_t PeriodicLDRInfo_sequence[] = {
 
 static int
 dissect_gsm_map_PeriodicLDRInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PeriodicLDRInfo_sequence, hf_index, ett_gsm_map_PeriodicLDRInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PeriodicLDRInfo_sequence, hf_index, ett_gsm_map_PeriodicLDRInfo);
 
   return offset;
 }
@@ -14053,7 +14053,7 @@ static int dissect_ran_Technology_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ReportingPLMN_sequence[] = {
+static const ber_old_sequence_t ReportingPLMN_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_plmn_Id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ran_Technology_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ran_PeriodicLocationSupport_impl },
@@ -14062,8 +14062,8 @@ static const ber_sequence_t ReportingPLMN_sequence[] = {
 
 static int
 dissect_gsm_map_ReportingPLMN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportingPLMN_sequence, hf_index, ett_gsm_map_ReportingPLMN);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportingPLMN_sequence, hf_index, ett_gsm_map_ReportingPLMN);
 
   return offset;
 }
@@ -14072,14 +14072,14 @@ static int dissect_PLMNList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t PLMNList_sequence_of[1] = {
+static const ber_old_sequence_t PLMNList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PLMNList_item },
 };
 
 static int
 dissect_gsm_map_PLMNList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PLMNList_sequence_of, hf_index, ett_gsm_map_PLMNList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PLMNList_sequence_of, hf_index, ett_gsm_map_PLMNList);
 
   return offset;
 }
@@ -14088,7 +14088,7 @@ static int dissect_plmn_List_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ReportingPLMNList_sequence[] = {
+static const ber_old_sequence_t ReportingPLMNList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_plmn_ListPrioritized_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_plmn_List_impl },
   { 0, 0, 0, NULL }
@@ -14096,8 +14096,8 @@ static const ber_sequence_t ReportingPLMNList_sequence[] = {
 
 static int
 dissect_gsm_map_ReportingPLMNList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportingPLMNList_sequence, hf_index, ett_gsm_map_ReportingPLMNList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportingPLMNList_sequence, hf_index, ett_gsm_map_ReportingPLMNList);
 
   return offset;
 }
@@ -14106,7 +14106,7 @@ static int dissect_reportingPLMNList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ProvideSubscriberLocation_Arg_sequence[] = {
+static const ber_old_sequence_t ProvideSubscriberLocation_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locationType },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mlc_Number },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_ClientID_impl },
@@ -14133,8 +14133,8 @@ static const ber_sequence_t ProvideSubscriberLocation_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSubscriberLocation_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSubscriberLocation_Arg_sequence, hf_index, ett_gsm_map_ProvideSubscriberLocation_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSubscriberLocation_Arg_sequence, hf_index, ett_gsm_map_ProvideSubscriberLocation_Arg);
 
   return offset;
 }
@@ -14227,7 +14227,7 @@ static int dissect_velocityEstimate_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ProvideSubscriberLocation_Res_sequence[] = {
+static const ber_old_sequence_t ProvideSubscriberLocation_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_locationEstimate },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ageOfLocationEstimate_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -14245,14 +14245,14 @@ static const ber_sequence_t ProvideSubscriberLocation_Res_sequence[] = {
 
 static int
 dissect_gsm_map_ProvideSubscriberLocation_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProvideSubscriberLocation_Res_sequence, hf_index, ett_gsm_map_ProvideSubscriberLocation_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProvideSubscriberLocation_Res_sequence, hf_index, ett_gsm_map_ProvideSubscriberLocation_Res);
 
   return offset;
 }
 
 
-static const ber_sequence_t RoutingInfoForLCS_Arg_sequence[] = {
+static const ber_old_sequence_t RoutingInfoForLCS_Arg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mlcNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_targetMS_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -14261,14 +14261,14 @@ static const ber_sequence_t RoutingInfoForLCS_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_RoutingInfoForLCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RoutingInfoForLCS_Arg_sequence, hf_index, ett_gsm_map_RoutingInfoForLCS_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RoutingInfoForLCS_Arg_sequence, hf_index, ett_gsm_map_RoutingInfoForLCS_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t LCSLocationInfo_sequence[] = {
+static const ber_old_sequence_t LCSLocationInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_networkNode_Number },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lmsi_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
@@ -14281,8 +14281,8 @@ static const ber_sequence_t LCSLocationInfo_sequence[] = {
 
 static int
 dissect_gsm_map_LCSLocationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCSLocationInfo_sequence, hf_index, ett_gsm_map_LCSLocationInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCSLocationInfo_sequence, hf_index, ett_gsm_map_LCSLocationInfo);
 
   return offset;
 }
@@ -14294,7 +14294,7 @@ static int dissect_lcsLocationInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RoutingInfoForLCS_Res_sequence[] = {
+static const ber_old_sequence_t RoutingInfoForLCS_Res_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_targetMS },
   { BER_CLASS_CON, 1, 0, dissect_lcsLocationInfo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_extensionContainer },
@@ -14307,8 +14307,8 @@ static const ber_sequence_t RoutingInfoForLCS_Res_sequence[] = {
 
 static int
 dissect_gsm_map_RoutingInfoForLCS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RoutingInfoForLCS_Res_sequence, hf_index, ett_gsm_map_RoutingInfoForLCS_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RoutingInfoForLCS_Res_sequence, hf_index, ett_gsm_map_RoutingInfoForLCS_Res);
 
   return offset;
 }
@@ -14363,7 +14363,7 @@ static int dissect_terminationCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Deferredmt_lrData_sequence[] = {
+static const ber_old_sequence_t Deferredmt_lrData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_deferredLocationEventType },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsLocationInfo_impl },
@@ -14372,8 +14372,8 @@ static const ber_sequence_t Deferredmt_lrData_sequence[] = {
 
 static int
 dissect_gsm_map_Deferredmt_lrData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Deferredmt_lrData_sequence, hf_index, ett_gsm_map_Deferredmt_lrData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Deferredmt_lrData_sequence, hf_index, ett_gsm_map_Deferredmt_lrData);
 
   return offset;
 }
@@ -14395,7 +14395,7 @@ static int dissect_sequenceNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SubscriberLocationReport_Arg_sequence[] = {
+static const ber_old_sequence_t SubscriberLocationReport_Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_lcs_Event },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_ClientID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcsLocationInfo },
@@ -14427,14 +14427,14 @@ static const ber_sequence_t SubscriberLocationReport_Arg_sequence[] = {
 
 static int
 dissect_gsm_map_SubscriberLocationReport_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubscriberLocationReport_Arg_sequence, hf_index, ett_gsm_map_SubscriberLocationReport_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubscriberLocationReport_Arg_sequence, hf_index, ett_gsm_map_SubscriberLocationReport_Arg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SubscriberLocationReport_Res_sequence[] = {
+static const ber_old_sequence_t SubscriberLocationReport_Res_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_na_ESRK_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_na_ESRD_impl },
@@ -14447,8 +14447,8 @@ static const ber_sequence_t SubscriberLocationReport_Res_sequence[] = {
 
 static int
 dissect_gsm_map_SubscriberLocationReport_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubscriberLocationReport_Res_sequence, hf_index, ett_gsm_map_SubscriberLocationReport_Res);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubscriberLocationReport_Res_sequence, hf_index, ett_gsm_map_SubscriberLocationReport_Res);
 
   return offset;
 }
@@ -14486,7 +14486,7 @@ static const value_string gsm_map_OperationCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OperationCode_choice[] = {
+static const ber_old_choice_t OperationCode_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -14494,9 +14494,9 @@ static const ber_choice_t OperationCode_choice[] = {
 
 static int
 dissect_gsm_map_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OperationCode_choice, hf_index, ett_gsm_map_OperationCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OperationCode_choice, hf_index, ett_gsm_map_OperationCode,
+                                     NULL);
 
   return offset;
 }
@@ -14511,7 +14511,7 @@ static const value_string gsm_map_ErrorCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ErrorCode_choice[] = {
+static const ber_old_choice_t ErrorCode_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -14519,9 +14519,9 @@ static const ber_choice_t ErrorCode_choice[] = {
 
 static int
 dissect_gsm_map_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ErrorCode_choice, hf_index, ett_gsm_map_ErrorCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ErrorCode_choice, hf_index, ett_gsm_map_ErrorCode,
+                                     NULL);
 
   return offset;
 }
@@ -14537,7 +14537,7 @@ static const value_string gsm_map_OriginalComponentIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OriginalComponentIdentifier_choice[] = {
+static const ber_old_choice_t OriginalComponentIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operationCode_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_errorCode_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_userInfo_impl },
@@ -14546,9 +14546,9 @@ static const ber_choice_t OriginalComponentIdentifier_choice[] = {
 
 static int
 dissect_gsm_map_OriginalComponentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OriginalComponentIdentifier_choice, hf_index, ett_gsm_map_OriginalComponentIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OriginalComponentIdentifier_choice, hf_index, ett_gsm_map_OriginalComponentIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -14570,7 +14570,7 @@ static int dissect_initialisationVector(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SecurityHeader_sequence[] = {
+static const ber_old_sequence_t SecurityHeader_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_securityParametersIndex },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_originalComponentIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_initialisationVector },
@@ -14579,8 +14579,8 @@ static const ber_sequence_t SecurityHeader_sequence[] = {
 
 int
 dissect_gsm_map_SecurityHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecurityHeader_sequence, hf_index, ett_gsm_map_SecurityHeader);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecurityHeader_sequence, hf_index, ett_gsm_map_SecurityHeader);
 
   return offset;
 }
@@ -14602,7 +14602,7 @@ static int dissect_protectedPayload(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SecureTransportArg_sequence[] = {
+static const ber_old_sequence_t SecureTransportArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_securityHeader },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protectedPayload },
   { 0, 0, 0, NULL }
@@ -14610,14 +14610,14 @@ static const ber_sequence_t SecureTransportArg_sequence[] = {
 
 static int
 dissect_gsm_map_SecureTransportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecureTransportArg_sequence, hf_index, ett_gsm_map_SecureTransportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecureTransportArg_sequence, hf_index, ett_gsm_map_SecureTransportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SecureTransportRes_sequence[] = {
+static const ber_old_sequence_t SecureTransportRes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_securityHeader },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protectedPayload },
   { 0, 0, 0, NULL }
@@ -14625,8 +14625,8 @@ static const ber_sequence_t SecureTransportRes_sequence[] = {
 
 static int
 dissect_gsm_map_SecureTransportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecureTransportRes_sequence, hf_index, ett_gsm_map_SecureTransportRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecureTransportRes_sequence, hf_index, ett_gsm_map_SecureTransportRes);
 
   return offset;
 }
@@ -14693,14 +14693,14 @@ static int dissect_operatorSS_Code_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_operatorSS_Code_sequence_of[1] = {
+static const ber_old_sequence_t T_operatorSS_Code_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_operatorSS_Code_item },
 };
 
 static int
 dissect_gsm_map_T_operatorSS_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_operatorSS_Code_sequence_of, hf_index, ett_gsm_map_T_operatorSS_Code);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_operatorSS_Code_sequence_of, hf_index, ett_gsm_map_T_operatorSS_Code);
 
   return offset;
 }
@@ -14709,7 +14709,7 @@ static int dissect_operatorSS_Code_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PlmnContainer_sequence[] = {
+static const ber_old_sequence_t PlmnContainer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_category_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
@@ -14719,14 +14719,14 @@ static const ber_sequence_t PlmnContainer_sequence[] = {
 
 static int
 dissect_gsm_map_PlmnContainer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PlmnContainer_sequence, hf_index, ett_gsm_map_PlmnContainer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PlmnContainer_sequence, hf_index, ett_gsm_map_PlmnContainer);
 
   return offset;
 }
 
 
-static const ber_sequence_t ExtensibleSystemFailureParam_sequence[] = {
+static const ber_old_sequence_t ExtensibleSystemFailureParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_networkResource },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalNetworkResource_impl },
@@ -14735,8 +14735,8 @@ static const ber_sequence_t ExtensibleSystemFailureParam_sequence[] = {
 
 static int
 dissect_gsm_map_ExtensibleSystemFailureParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensibleSystemFailureParam_sequence, hf_index, ett_gsm_map_ExtensibleSystemFailureParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensibleSystemFailureParam_sequence, hf_index, ett_gsm_map_ExtensibleSystemFailureParam);
 
   return offset;
 }
@@ -14751,7 +14751,7 @@ static const value_string gsm_map_SystemFailureParam_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SystemFailureParam_choice[] = {
+static const ber_old_choice_t SystemFailureParam_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_networkResource },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extensibleSystemFailureParam },
   { 0, 0, 0, 0, NULL }
@@ -14759,43 +14759,43 @@ static const ber_choice_t SystemFailureParam_choice[] = {
 
 static int
 dissect_gsm_map_SystemFailureParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SystemFailureParam_choice, hf_index, ett_gsm_map_SystemFailureParam,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SystemFailureParam_choice, hf_index, ett_gsm_map_SystemFailureParam,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t DataMissingParam_sequence[] = {
+static const ber_old_sequence_t DataMissingParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_DataMissingParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DataMissingParam_sequence, hf_index, ett_gsm_map_DataMissingParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DataMissingParam_sequence, hf_index, ett_gsm_map_DataMissingParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t UnexpectedDataParam_sequence[] = {
+static const ber_old_sequence_t UnexpectedDataParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_UnexpectedDataParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnexpectedDataParam_sequence, hf_index, ett_gsm_map_UnexpectedDataParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnexpectedDataParam_sequence, hf_index, ett_gsm_map_UnexpectedDataParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t FacilityNotSupParam_sequence[] = {
+static const ber_old_sequence_t FacilityNotSupParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_shapeOfLocationEstimateNotSupported_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_neededLcsCapabilityNotSupportedInServingNode_impl },
@@ -14804,36 +14804,36 @@ static const ber_sequence_t FacilityNotSupParam_sequence[] = {
 
 static int
 dissect_gsm_map_FacilityNotSupParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FacilityNotSupParam_sequence, hf_index, ett_gsm_map_FacilityNotSupParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FacilityNotSupParam_sequence, hf_index, ett_gsm_map_FacilityNotSupParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t IncompatibleTerminalParam_sequence[] = {
+static const ber_old_sequence_t IncompatibleTerminalParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_IncompatibleTerminalParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IncompatibleTerminalParam_sequence, hf_index, ett_gsm_map_IncompatibleTerminalParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IncompatibleTerminalParam_sequence, hf_index, ett_gsm_map_IncompatibleTerminalParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ResourceLimitationParam_sequence[] = {
+static const ber_old_sequence_t ResourceLimitationParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ResourceLimitationParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResourceLimitationParam_sequence, hf_index, ett_gsm_map_ResourceLimitationParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResourceLimitationParam_sequence, hf_index, ett_gsm_map_ResourceLimitationParam);
 
   return offset;
 }
@@ -14859,7 +14859,7 @@ static int dissect_unknownSubscriberDiagnostic(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t UnknownSubscriberParam_sequence[] = {
+static const ber_old_sequence_t UnknownSubscriberParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_unknownSubscriberDiagnostic },
   { 0, 0, 0, NULL }
@@ -14867,36 +14867,36 @@ static const ber_sequence_t UnknownSubscriberParam_sequence[] = {
 
 static int
 dissect_gsm_map_UnknownSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnknownSubscriberParam_sequence, hf_index, ett_gsm_map_UnknownSubscriberParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnknownSubscriberParam_sequence, hf_index, ett_gsm_map_UnknownSubscriberParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t NumberChangedParam_sequence[] = {
+static const ber_old_sequence_t NumberChangedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NumberChangedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NumberChangedParam_sequence, hf_index, ett_gsm_map_NumberChangedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NumberChangedParam_sequence, hf_index, ett_gsm_map_NumberChangedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t UnidentifiedSubParam_sequence[] = {
+static const ber_old_sequence_t UnidentifiedSubParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_UnidentifiedSubParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnidentifiedSubParam_sequence, hf_index, ett_gsm_map_UnidentifiedSubParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnidentifiedSubParam_sequence, hf_index, ett_gsm_map_UnidentifiedSubParam);
 
   return offset;
 }
@@ -14939,7 +14939,7 @@ static int dissect_additionalRoamingNotAllowedCause_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t RoamingNotAllowedParam_sequence[] = {
+static const ber_old_sequence_t RoamingNotAllowedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_roamingNotAllowedCause },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalRoamingNotAllowedCause_impl },
@@ -14948,92 +14948,92 @@ static const ber_sequence_t RoamingNotAllowedParam_sequence[] = {
 
 static int
 dissect_gsm_map_RoamingNotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RoamingNotAllowedParam_sequence, hf_index, ett_gsm_map_RoamingNotAllowedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RoamingNotAllowedParam_sequence, hf_index, ett_gsm_map_RoamingNotAllowedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t IllegalSubscriberParam_sequence[] = {
+static const ber_old_sequence_t IllegalSubscriberParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_IllegalSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IllegalSubscriberParam_sequence, hf_index, ett_gsm_map_IllegalSubscriberParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IllegalSubscriberParam_sequence, hf_index, ett_gsm_map_IllegalSubscriberParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t IllegalEquipmentParam_sequence[] = {
+static const ber_old_sequence_t IllegalEquipmentParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_IllegalEquipmentParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IllegalEquipmentParam_sequence, hf_index, ett_gsm_map_IllegalEquipmentParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IllegalEquipmentParam_sequence, hf_index, ett_gsm_map_IllegalEquipmentParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t BearerServNotProvParam_sequence[] = {
+static const ber_old_sequence_t BearerServNotProvParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_BearerServNotProvParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BearerServNotProvParam_sequence, hf_index, ett_gsm_map_BearerServNotProvParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BearerServNotProvParam_sequence, hf_index, ett_gsm_map_BearerServNotProvParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t TeleservNotProvParam_sequence[] = {
+static const ber_old_sequence_t TeleservNotProvParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_TeleservNotProvParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TeleservNotProvParam_sequence, hf_index, ett_gsm_map_TeleservNotProvParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TeleservNotProvParam_sequence, hf_index, ett_gsm_map_TeleservNotProvParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t TracingBufferFullParam_sequence[] = {
+static const ber_old_sequence_t TracingBufferFullParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_TracingBufferFullParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TracingBufferFullParam_sequence, hf_index, ett_gsm_map_TracingBufferFullParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TracingBufferFullParam_sequence, hf_index, ett_gsm_map_TracingBufferFullParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoRoamingNbParam_sequence[] = {
+static const ber_old_sequence_t NoRoamingNbParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoRoamingNbParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoRoamingNbParam_sequence, hf_index, ett_gsm_map_NoRoamingNbParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoRoamingNbParam_sequence, hf_index, ett_gsm_map_NoRoamingNbParam);
 
   return offset;
 }
@@ -15060,7 +15060,7 @@ static int dissect_absentSubscriberReason_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t AbsentSubscriberParam_sequence[] = {
+static const ber_old_sequence_t AbsentSubscriberParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_absentSubscriberReason_impl },
   { 0, 0, 0, NULL }
@@ -15068,14 +15068,14 @@ static const ber_sequence_t AbsentSubscriberParam_sequence[] = {
 
 static int
 dissect_gsm_map_AbsentSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbsentSubscriberParam_sequence, hf_index, ett_gsm_map_AbsentSubscriberParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbsentSubscriberParam_sequence, hf_index, ett_gsm_map_AbsentSubscriberParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t BusySubscriberParam_sequence[] = {
+static const ber_old_sequence_t BusySubscriberParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Possible_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Busy_impl },
@@ -15084,154 +15084,154 @@ static const ber_sequence_t BusySubscriberParam_sequence[] = {
 
 static int
 dissect_gsm_map_BusySubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BusySubscriberParam_sequence, hf_index, ett_gsm_map_BusySubscriberParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BusySubscriberParam_sequence, hf_index, ett_gsm_map_BusySubscriberParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoSubscriberReplyParam_sequence[] = {
+static const ber_old_sequence_t NoSubscriberReplyParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoSubscriberReplyParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoSubscriberReplyParam_sequence, hf_index, ett_gsm_map_NoSubscriberReplyParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoSubscriberReplyParam_sequence, hf_index, ett_gsm_map_NoSubscriberReplyParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ForwardingViolationParam_sequence[] = {
+static const ber_old_sequence_t ForwardingViolationParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ForwardingViolationParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardingViolationParam_sequence, hf_index, ett_gsm_map_ForwardingViolationParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardingViolationParam_sequence, hf_index, ett_gsm_map_ForwardingViolationParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ForwardingFailedParam_sequence[] = {
+static const ber_old_sequence_t ForwardingFailedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ForwardingFailedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardingFailedParam_sequence, hf_index, ett_gsm_map_ForwardingFailedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardingFailedParam_sequence, hf_index, ett_gsm_map_ForwardingFailedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ATI_NotAllowedParam_sequence[] = {
+static const ber_old_sequence_t ATI_NotAllowedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ATI_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ATI_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATI_NotAllowedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ATI_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATI_NotAllowedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ATSI_NotAllowedParam_sequence[] = {
+static const ber_old_sequence_t ATSI_NotAllowedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ATSI_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ATSI_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATSI_NotAllowedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ATSI_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATSI_NotAllowedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t ATM_NotAllowedParam_sequence[] = {
+static const ber_old_sequence_t ATM_NotAllowedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ATM_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ATM_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATM_NotAllowedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ATM_NotAllowedParam_sequence, hf_index, ett_gsm_map_ATM_NotAllowedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t IllegalSS_OperationParam_sequence[] = {
+static const ber_old_sequence_t IllegalSS_OperationParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_IllegalSS_OperationParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IllegalSS_OperationParam_sequence, hf_index, ett_gsm_map_IllegalSS_OperationParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IllegalSS_OperationParam_sequence, hf_index, ett_gsm_map_IllegalSS_OperationParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_NotAvailableParam_sequence[] = {
+static const ber_old_sequence_t SS_NotAvailableParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_SS_NotAvailableParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_NotAvailableParam_sequence, hf_index, ett_gsm_map_SS_NotAvailableParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_NotAvailableParam_sequence, hf_index, ett_gsm_map_SS_NotAvailableParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_SubscriptionViolationParam_sequence[] = {
+static const ber_old_sequence_t SS_SubscriptionViolationParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_SS_SubscriptionViolationParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_SubscriptionViolationParam_sequence, hf_index, ett_gsm_map_SS_SubscriptionViolationParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_SubscriptionViolationParam_sequence, hf_index, ett_gsm_map_SS_SubscriptionViolationParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t InformationNotAvailableParam_sequence[] = {
+static const ber_old_sequence_t InformationNotAvailableParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_InformationNotAvailableParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformationNotAvailableParam_sequence, hf_index, ett_gsm_map_InformationNotAvailableParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformationNotAvailableParam_sequence, hf_index, ett_gsm_map_InformationNotAvailableParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t SubBusyForMT_SMS_Param_sequence[] = {
+static const ber_old_sequence_t SubBusyForMT_SMS_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gprsConnectionSuspended },
   { 0, 0, 0, NULL }
@@ -15239,8 +15239,8 @@ static const ber_sequence_t SubBusyForMT_SMS_Param_sequence[] = {
 
 static int
 dissect_gsm_map_SubBusyForMT_SMS_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubBusyForMT_SMS_Param_sequence, hf_index, ett_gsm_map_SubBusyForMT_SMS_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubBusyForMT_SMS_Param_sequence, hf_index, ett_gsm_map_SubBusyForMT_SMS_Param);
 
   return offset;
 }
@@ -15265,7 +15265,7 @@ static int dissect_callBarringCause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ExtensibleCallBarredParam_sequence[] = {
+static const ber_old_sequence_t ExtensibleCallBarredParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_callBarringCause },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unauthorisedMessageOriginator_impl },
@@ -15274,8 +15274,8 @@ static const ber_sequence_t ExtensibleCallBarredParam_sequence[] = {
 
 static int
 dissect_gsm_map_ExtensibleCallBarredParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensibleCallBarredParam_sequence, hf_index, ett_gsm_map_ExtensibleCallBarredParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensibleCallBarredParam_sequence, hf_index, ett_gsm_map_ExtensibleCallBarredParam);
 
   return offset;
 }
@@ -15290,7 +15290,7 @@ static const value_string gsm_map_CallBarredParam_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CallBarredParam_choice[] = {
+static const ber_old_choice_t CallBarredParam_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_callBarringCause },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extensibleCallBarredParam },
   { 0, 0, 0, 0, NULL }
@@ -15298,9 +15298,9 @@ static const ber_choice_t CallBarredParam_choice[] = {
 
 static int
 dissect_gsm_map_CallBarredParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CallBarredParam_choice, hf_index, ett_gsm_map_CallBarredParam,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CallBarredParam_choice, hf_index, ett_gsm_map_CallBarredParam,
+                                     NULL);
 
   return offset;
 }
@@ -15327,7 +15327,7 @@ static int dissect_cug_RejectCause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CUG_RejectParam_sequence[] = {
+static const ber_old_sequence_t CUG_RejectParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_RejectCause },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
@@ -15335,42 +15335,42 @@ static const ber_sequence_t CUG_RejectParam_sequence[] = {
 
 static int
 dissect_gsm_map_CUG_RejectParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CUG_RejectParam_sequence, hf_index, ett_gsm_map_CUG_RejectParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CUG_RejectParam_sequence, hf_index, ett_gsm_map_CUG_RejectParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t Or_NotAllowedParam_sequence[] = {
+static const ber_old_sequence_t Or_NotAllowedParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_Or_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Or_NotAllowedParam_sequence, hf_index, ett_gsm_map_Or_NotAllowedParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Or_NotAllowedParam_sequence, hf_index, ett_gsm_map_Or_NotAllowedParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t NoGroupCallNbParam_sequence[] = {
+static const ber_old_sequence_t NoGroupCallNbParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_NoGroupCallNbParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoGroupCallNbParam_sequence, hf_index, ett_gsm_map_NoGroupCallNbParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoGroupCallNbParam_sequence, hf_index, ett_gsm_map_NoGroupCallNbParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t SS_IncompatibilityCause_sequence[] = {
+static const ber_old_sequence_t SS_IncompatibilityCause_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
@@ -15379,8 +15379,8 @@ static const ber_sequence_t SS_IncompatibilityCause_sequence[] = {
 
 static int
 dissect_gsm_map_SS_IncompatibilityCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SS_IncompatibilityCause_sequence, hf_index, ett_gsm_map_SS_IncompatibilityCause);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SS_IncompatibilityCause_sequence, hf_index, ett_gsm_map_SS_IncompatibilityCause);
 
   return offset;
 }
@@ -15403,27 +15403,27 @@ dissect_gsm_map_PW_RegistrationFailureCause(gboolean implicit_tag _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t ShortTermDenialParam_sequence[] = {
+static const ber_old_sequence_t ShortTermDenialParam_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_ShortTermDenialParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ShortTermDenialParam_sequence, hf_index, ett_gsm_map_ShortTermDenialParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ShortTermDenialParam_sequence, hf_index, ett_gsm_map_ShortTermDenialParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t LongTermDenialParam_sequence[] = {
+static const ber_old_sequence_t LongTermDenialParam_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_LongTermDenialParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LongTermDenialParam_sequence, hf_index, ett_gsm_map_LongTermDenialParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LongTermDenialParam_sequence, hf_index, ett_gsm_map_LongTermDenialParam);
 
   return offset;
 }
@@ -15453,7 +15453,7 @@ static int dissect_sm_EnumeratedDeliveryFailureCause(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t SM_DeliveryFailureCause_sequence[] = {
+static const ber_old_sequence_t SM_DeliveryFailureCause_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sm_EnumeratedDeliveryFailureCause },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnosticInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@@ -15462,28 +15462,28 @@ static const ber_sequence_t SM_DeliveryFailureCause_sequence[] = {
 
 static int
 dissect_gsm_map_SM_DeliveryFailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SM_DeliveryFailureCause_sequence, hf_index, ett_gsm_map_SM_DeliveryFailureCause);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SM_DeliveryFailureCause_sequence, hf_index, ett_gsm_map_SM_DeliveryFailureCause);
 
   return offset;
 }
 
 
-static const ber_sequence_t MessageWaitListFullParam_sequence[] = {
+static const ber_old_sequence_t MessageWaitListFullParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_MessageWaitListFullParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageWaitListFullParam_sequence, hf_index, ett_gsm_map_MessageWaitListFullParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageWaitListFullParam_sequence, hf_index, ett_gsm_map_MessageWaitListFullParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t AbsentSubscriberSM_Param_sequence[] = {
+static const ber_old_sequence_t AbsentSubscriberSM_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_absentSubscriberDiagnosticSM },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalAbsentSubscriberDiagnosticSM_impl },
@@ -15492,22 +15492,22 @@ static const ber_sequence_t AbsentSubscriberSM_Param_sequence[] = {
 
 static int
 dissect_gsm_map_AbsentSubscriberSM_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbsentSubscriberSM_Param_sequence, hf_index, ett_gsm_map_AbsentSubscriberSM_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbsentSubscriberSM_Param_sequence, hf_index, ett_gsm_map_AbsentSubscriberSM_Param);
 
   return offset;
 }
 
 
-static const ber_sequence_t UnauthorizedRequestingNetwork_Param_sequence[] = {
+static const ber_old_sequence_t UnauthorizedRequestingNetwork_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_UnauthorizedRequestingNetwork_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnauthorizedRequestingNetwork_Param_sequence, hf_index, ett_gsm_map_UnauthorizedRequestingNetwork_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnauthorizedRequestingNetwork_Param_sequence, hf_index, ett_gsm_map_UnauthorizedRequestingNetwork_Param);
 
   return offset;
 }
@@ -15538,7 +15538,7 @@ static int dissect_unauthorizedLCSClient_Diagnostic_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t UnauthorizedLCSClient_Param_sequence[] = {
+static const ber_old_sequence_t UnauthorizedLCSClient_Param_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unauthorizedLCSClient_Diagnostic_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -15546,8 +15546,8 @@ static const ber_sequence_t UnauthorizedLCSClient_Param_sequence[] = {
 
 static int
 dissect_gsm_map_UnauthorizedLCSClient_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnauthorizedLCSClient_Param_sequence, hf_index, ett_gsm_map_UnauthorizedLCSClient_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnauthorizedLCSClient_Param_sequence, hf_index, ett_gsm_map_UnauthorizedLCSClient_Param);
 
   return offset;
 }
@@ -15579,7 +15579,7 @@ static int dissect_positionMethodFailure_Diagnostic_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t PositionMethodFailure_Param_sequence[] = {
+static const ber_old_sequence_t PositionMethodFailure_Param_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_positionMethodFailure_Diagnostic_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { 0, 0, 0, NULL }
@@ -15587,70 +15587,70 @@ static const ber_sequence_t PositionMethodFailure_Param_sequence[] = {
 
 static int
 dissect_gsm_map_PositionMethodFailure_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PositionMethodFailure_Param_sequence, hf_index, ett_gsm_map_PositionMethodFailure_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PositionMethodFailure_Param_sequence, hf_index, ett_gsm_map_PositionMethodFailure_Param);
 
   return offset;
 }
 
 
-static const ber_sequence_t UnknownOrUnreachableLCSClient_Param_sequence[] = {
+static const ber_old_sequence_t UnknownOrUnreachableLCSClient_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_UnknownOrUnreachableLCSClient_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UnknownOrUnreachableLCSClient_Param_sequence, hf_index, ett_gsm_map_UnknownOrUnreachableLCSClient_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UnknownOrUnreachableLCSClient_Param_sequence, hf_index, ett_gsm_map_UnknownOrUnreachableLCSClient_Param);
 
   return offset;
 }
 
 
-static const ber_sequence_t MM_EventNotSupported_Param_sequence[] = {
+static const ber_old_sequence_t MM_EventNotSupported_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_MM_EventNotSupported_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MM_EventNotSupported_Param_sequence, hf_index, ett_gsm_map_MM_EventNotSupported_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MM_EventNotSupported_Param_sequence, hf_index, ett_gsm_map_MM_EventNotSupported_Param);
 
   return offset;
 }
 
 
-static const ber_sequence_t TargetCellOutsideGCA_Param_sequence[] = {
+static const ber_old_sequence_t TargetCellOutsideGCA_Param_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_TargetCellOutsideGCA_Param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TargetCellOutsideGCA_Param_sequence, hf_index, ett_gsm_map_TargetCellOutsideGCA_Param);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TargetCellOutsideGCA_Param_sequence, hf_index, ett_gsm_map_TargetCellOutsideGCA_Param);
 
   return offset;
 }
 
 
-static const ber_sequence_t OngoingGroupCallParam_sequence[] = {
+static const ber_old_sequence_t OngoingGroupCallParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_map_OngoingGroupCallParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OngoingGroupCallParam_sequence, hf_index, ett_gsm_map_OngoingGroupCallParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OngoingGroupCallParam_sequence, hf_index, ett_gsm_map_OngoingGroupCallParam);
 
   return offset;
 }
 
 
-static const ber_sequence_t SecureTransportErrorParam_sequence[] = {
+static const ber_old_sequence_t SecureTransportErrorParam_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_securityHeader },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protectedPayload },
   { 0, 0, 0, NULL }
@@ -15658,8 +15658,8 @@ static const ber_sequence_t SecureTransportErrorParam_sequence[] = {
 
 static int
 dissect_gsm_map_SecureTransportErrorParam(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecureTransportErrorParam_sequence, hf_index, ett_gsm_map_SecureTransportErrorParam);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecureTransportErrorParam_sequence, hf_index, ett_gsm_map_SecureTransportErrorParam);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index 40d61381df..2db4617b2a 100644
--- a/epan/dissectors/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
@@ -474,7 +474,7 @@ static int dissect_ect_CallState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RemotePartyNumber_sequence[] = {
+static const ber_old_sequence_t RemotePartyNumber_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_partyNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_partyNumberSubaddress_impl },
   { 0, 0, 0, NULL }
@@ -482,8 +482,8 @@ static const ber_sequence_t RemotePartyNumber_sequence[] = {
 
 static int
 dissect_gsm_ss_RemotePartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RemotePartyNumber_sequence, hf_index, ett_gsm_ss_RemotePartyNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RemotePartyNumber_sequence, hf_index, ett_gsm_ss_RemotePartyNumber);
 
   return offset;
 }
@@ -503,7 +503,7 @@ static const value_string gsm_ss_RDN_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RDN_choice[] = {
+static const ber_old_choice_t RDN_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddress_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -513,9 +513,9 @@ static const ber_choice_t RDN_choice[] = {
 
 static int
 dissect_gsm_ss_RDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RDN_choice, hf_index, ett_gsm_ss_RDN,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RDN_choice, hf_index, ett_gsm_ss_RDN,
+                                     NULL);
 
   return offset;
 }
@@ -524,7 +524,7 @@ static int dissect_rdn_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ECT_Indicator_sequence[] = {
+static const ber_old_sequence_t ECT_Indicator_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ect_CallState_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_rdn_impl },
   { 0, 0, 0, NULL }
@@ -532,8 +532,8 @@ static const ber_sequence_t ECT_Indicator_sequence[] = {
 
 static int
 dissect_gsm_ss_ECT_Indicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ECT_Indicator_sequence, hf_index, ett_gsm_ss_ECT_Indicator);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ECT_Indicator_sequence, hf_index, ett_gsm_ss_ECT_Indicator);
 
   return offset;
 }
@@ -555,7 +555,7 @@ static int dissect_lengthInCharacters_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t NameSet_sequence[] = {
+static const ber_old_sequence_t NameSet_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lengthInCharacters_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameString_impl },
@@ -564,8 +564,8 @@ static const ber_sequence_t NameSet_sequence[] = {
 
 static int
 dissect_gsm_ss_NameSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NameSet_sequence, hf_index, ett_gsm_ss_NameSet);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NameSet_sequence, hf_index, ett_gsm_ss_NameSet);
 
   return offset;
 }
@@ -585,7 +585,7 @@ static const value_string gsm_ss_Name_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Name_choice[] = {
+static const ber_old_choice_t Name_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowed_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameUnavailable_impl },
@@ -595,9 +595,9 @@ static const ber_choice_t Name_choice[] = {
 
 static int
 dissect_gsm_ss_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Name_choice, hf_index, ett_gsm_ss_Name,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Name_choice, hf_index, ett_gsm_ss_Name,
+                                     NULL);
 
   return offset;
 }
@@ -606,15 +606,15 @@ static int dissect_callingName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t NameIndicator_sequence[] = {
+static const ber_old_sequence_t NameIndicator_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_ss_NameIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NameIndicator_sequence, hf_index, ett_gsm_ss_NameIndicator);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NameIndicator_sequence, hf_index, ett_gsm_ss_NameIndicator);
 
   return offset;
 }
@@ -642,7 +642,7 @@ static int dissect_multicall_Indicator_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t NotifySS_Arg_sequence[] = {
+static const ber_old_sequence_t NotifySS_Arg_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Notification_impl },
@@ -661,8 +661,8 @@ static const ber_sequence_t NotifySS_Arg_sequence[] = {
 
 static int
 dissect_gsm_ss_NotifySS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NotifySS_Arg_sequence, hf_index, ett_gsm_ss_NotifySS_Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NotifySS_Arg_sequence, hf_index, ett_gsm_ss_NotifySS_Arg);
 
   return offset;
 }
@@ -685,7 +685,7 @@ static int dissect_processUnstructuredSS_Data(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ForwardCUG_InfoArg_sequence[] = {
+static const ber_old_sequence_t ForwardCUG_InfoArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_Index_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppressPrefCUG_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppressOA_impl },
@@ -694,8 +694,8 @@ static const ber_sequence_t ForwardCUG_InfoArg_sequence[] = {
 
 static int
 dissect_gsm_ss_ForwardCUG_InfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardCUG_InfoArg_sequence, hf_index, ett_gsm_ss_ForwardCUG_InfoArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardCUG_InfoArg_sequence, hf_index, ett_gsm_ss_ForwardCUG_InfoArg);
 
   return offset;
 }
@@ -704,14 +704,14 @@ static int dissect_forwardCUG_Info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AccessRegisterCCEntryArg_sequence[] = {
+static const ber_old_sequence_t AccessRegisterCCEntryArg_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_ss_AccessRegisterCCEntryArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AccessRegisterCCEntryArg_sequence, hf_index, ett_gsm_ss_AccessRegisterCCEntryArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AccessRegisterCCEntryArg_sequence, hf_index, ett_gsm_ss_AccessRegisterCCEntryArg);
 
   return offset;
 }
@@ -811,7 +811,7 @@ static int dissect_e7_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t ChargingInformation_sequence[] = {
+static const ber_old_sequence_t ChargingInformation_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e2_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_e3_impl },
@@ -824,8 +824,8 @@ static const ber_sequence_t ChargingInformation_sequence[] = {
 
 static int
 dissect_gsm_ss_ChargingInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChargingInformation_sequence, hf_index, ett_gsm_ss_ChargingInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChargingInformation_sequence, hf_index, ett_gsm_ss_ChargingInformation);
 
   return offset;
 }
@@ -834,7 +834,7 @@ static int dissect_chargingInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ForwardChargeAdviceArg_sequence[] = {
+static const ber_old_sequence_t ForwardChargeAdviceArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_chargingInformation_impl },
   { 0, 0, 0, NULL }
@@ -842,8 +842,8 @@ static const ber_sequence_t ForwardChargeAdviceArg_sequence[] = {
 
 static int
 dissect_gsm_ss_ForwardChargeAdviceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ForwardChargeAdviceArg_sequence, hf_index, ett_gsm_ss_ForwardChargeAdviceArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ForwardChargeAdviceArg_sequence, hf_index, ett_gsm_ss_ForwardChargeAdviceArg);
 
   return offset;
 }
@@ -852,7 +852,7 @@ static int dissect_forwardChargeAdvice(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CallDeflectionArg_sequence[] = {
+static const ber_old_sequence_t CallDeflectionArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_deflectedToNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deflectedToSubaddress_impl },
   { 0, 0, 0, NULL }
@@ -860,8 +860,8 @@ static const ber_sequence_t CallDeflectionArg_sequence[] = {
 
 static int
 dissect_gsm_ss_CallDeflectionArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallDeflectionArg_sequence, hf_index, ett_gsm_ss_CallDeflectionArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallDeflectionArg_sequence, hf_index, ett_gsm_ss_CallDeflectionArg);
 
   return offset;
 }
@@ -870,7 +870,7 @@ static int dissect_callDeflection(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t LocationNotificationArg_sequence[] = {
+static const ber_old_sequence_t LocationNotificationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_notificationType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_locationType_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientExternalID_impl },
@@ -883,8 +883,8 @@ static const ber_sequence_t LocationNotificationArg_sequence[] = {
 
 static int
 dissect_gsm_ss_LocationNotificationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationNotificationArg_sequence, hf_index, ett_gsm_ss_LocationNotificationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationNotificationArg_sequence, hf_index, ett_gsm_ss_LocationNotificationArg);
 
   return offset;
 }
@@ -947,7 +947,7 @@ static int dissect_gpsAssistanceData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t LCS_MOLRArg_sequence[] = {
+static const ber_old_sequence_t LCS_MOLRArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_molr_Type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationMethod_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_QoS_impl },
@@ -964,8 +964,8 @@ static const ber_sequence_t LCS_MOLRArg_sequence[] = {
 
 static int
 dissect_gsm_ss_LCS_MOLRArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_MOLRArg_sequence, hf_index, ett_gsm_ss_LCS_MOLRArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_MOLRArg_sequence, hf_index, ett_gsm_ss_LCS_MOLRArg);
 
   return offset;
 }
@@ -974,7 +974,7 @@ static int dissect_lcs_MOLR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t LCS_AreaEventRequestArg_sequence[] = {
+static const ber_old_sequence_t LCS_AreaEventRequestArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_deferredLocationEventType_impl },
@@ -984,8 +984,8 @@ static const ber_sequence_t LCS_AreaEventRequestArg_sequence[] = {
 
 static int
 dissect_gsm_ss_LCS_AreaEventRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_AreaEventRequestArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventRequestArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_AreaEventRequestArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventRequestArg);
 
   return offset;
 }
@@ -994,7 +994,7 @@ static int dissect_lcs_AreaEventRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LCS_AreaEventReportArg_sequence[] = {
+static const ber_old_sequence_t LCS_AreaEventReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
   { 0, 0, 0, NULL }
@@ -1002,8 +1002,8 @@ static const ber_sequence_t LCS_AreaEventReportArg_sequence[] = {
 
 static int
 dissect_gsm_ss_LCS_AreaEventReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_AreaEventReportArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_AreaEventReportArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventReportArg);
 
   return offset;
 }
@@ -1012,7 +1012,7 @@ static int dissect_lcs_AreaEventReport(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
+static const ber_old_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_referenceNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h_gmlc_address_impl },
   { 0, 0, 0, NULL }
@@ -1020,8 +1020,8 @@ static const ber_sequence_t LCS_AreaEventCancellationArg_sequence[] = {
 
 static int
 dissect_gsm_ss_LCS_AreaEventCancellationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_AreaEventCancellationArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventCancellationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_AreaEventCancellationArg_sequence, hf_index, ett_gsm_ss_LCS_AreaEventCancellationArg);
 
   return offset;
 }
@@ -1045,7 +1045,7 @@ static const value_string gsm_ss_DummySS_operationsArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DummySS_operationsArg_choice[] = {
+static const ber_old_choice_t DummySS_operationsArg_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_notifySS },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_processUnstructuredSS_Data },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardCUG_Info },
@@ -1062,9 +1062,9 @@ static const ber_choice_t DummySS_operationsArg_choice[] = {
 
 static int
 dissect_gsm_ss_DummySS_operationsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DummySS_operationsArg_choice, hf_index, ett_gsm_ss_DummySS_operationsArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DummySS_operationsArg_choice, hf_index, ett_gsm_ss_DummySS_operationsArg,
+                                     NULL);
 
   return offset;
 }
@@ -1131,7 +1131,7 @@ static const value_string gsm_ss_T_basicServiceGroup_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_basicServiceGroup_choice[] = {
+static const ber_old_choice_t T_basicServiceGroup_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_bearerService_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_teleservice_impl },
   { 0, 0, 0, 0, NULL }
@@ -1139,9 +1139,9 @@ static const ber_choice_t T_basicServiceGroup_choice[] = {
 
 static int
 dissect_gsm_ss_T_basicServiceGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_basicServiceGroup_choice, hf_index, ett_gsm_ss_T_basicServiceGroup,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_basicServiceGroup_choice, hf_index, ett_gsm_ss_T_basicServiceGroup,
+                                     NULL);
 
   return offset;
 }
@@ -1150,7 +1150,7 @@ static int dissect_basicServiceGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_ccbs_Feature_sequence[] = {
+static const ber_old_sequence_t T_ccbs_Feature_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberSubaddress_impl },
@@ -1160,8 +1160,8 @@ static const ber_sequence_t T_ccbs_Feature_sequence[] = {
 
 static int
 dissect_gsm_ss_T_ccbs_Feature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_ccbs_Feature_sequence, hf_index, ett_gsm_ss_T_ccbs_Feature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_ccbs_Feature_sequence, hf_index, ett_gsm_ss_T_ccbs_Feature);
 
   return offset;
 }
@@ -1170,15 +1170,15 @@ static int dissect_ccbs_Feature1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RegisterCC_EntryRes_sequence[] = {
+static const ber_old_sequence_t RegisterCC_EntryRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Feature1_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_ss_RegisterCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegisterCC_EntryRes_sequence, hf_index, ett_gsm_ss_RegisterCC_EntryRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegisterCC_EntryRes_sequence, hf_index, ett_gsm_ss_RegisterCC_EntryRes);
 
   return offset;
 }
@@ -1206,15 +1206,15 @@ static int dissect_verificationResponse_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LocationNotificationRes_sequence[] = {
+static const ber_old_sequence_t LocationNotificationRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_verificationResponse_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_gsm_ss_LocationNotificationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocationNotificationRes_sequence, hf_index, ett_gsm_ss_LocationNotificationRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocationNotificationRes_sequence, hf_index, ett_gsm_ss_LocationNotificationRes);
 
   return offset;
 }
@@ -1236,7 +1236,7 @@ static int dissect_decipheringKeys_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t LCS_MOLRRes_sequence[] = {
+static const ber_old_sequence_t LCS_MOLRRes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationEstimate_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_decipheringKeys_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_add_LocationEstimate_impl },
@@ -1245,8 +1245,8 @@ static const ber_sequence_t LCS_MOLRRes_sequence[] = {
 
 static int
 dissect_gsm_ss_LCS_MOLRRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LCS_MOLRRes_sequence, hf_index, ett_gsm_ss_LCS_MOLRRes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LCS_MOLRRes_sequence, hf_index, ett_gsm_ss_LCS_MOLRRes);
 
   return offset;
 }
@@ -1262,7 +1262,7 @@ static const value_string gsm_ss_DummySS_operationsRes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DummySS_operationsRes_choice[] = {
+static const ber_old_choice_t DummySS_operationsRes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_registerCC_EntryRes },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_LocationNotification_res },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_MOLR_res },
@@ -1271,9 +1271,9 @@ static const ber_choice_t DummySS_operationsRes_choice[] = {
 
 static int
 dissect_gsm_ss_DummySS_operationsRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DummySS_operationsRes_choice, hf_index, ett_gsm_ss_DummySS_operationsRes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DummySS_operationsRes_choice, hf_index, ett_gsm_ss_DummySS_operationsRes,
+                                     NULL);
 
   return offset;
 }
@@ -1311,7 +1311,7 @@ static int dissect_uUS_Required_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t UserUserServiceArg_sequence[] = {
+static const ber_old_sequence_t UserUserServiceArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_uUS_Service_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_uUS_Required_impl },
   { 0, 0, 0, NULL }
@@ -1319,8 +1319,8 @@ static const ber_sequence_t UserUserServiceArg_sequence[] = {
 
 static int
 dissect_gsm_ss_UserUserServiceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserUserServiceArg_sequence, hf_index, ett_gsm_ss_UserUserServiceArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserUserServiceArg_sequence, hf_index, ett_gsm_ss_UserUserServiceArg);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 187a56dc9b..049f37ddd1 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -1663,7 +1663,7 @@ static int dissect_ad_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t AuthenticationHeader_sequence[] = {
+static const ber_old_sequence_t AuthenticationHeader_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_secParmIndex_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqNum_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ad_impl },
@@ -1672,8 +1672,8 @@ static const ber_sequence_t AuthenticationHeader_sequence[] = {
 
 static int
 dissect_h248_AuthenticationHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthenticationHeader_sequence, hf_index, ett_h248_AuthenticationHeader);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthenticationHeader_sequence, hf_index, ett_h248_AuthenticationHeader);
 
   return offset;
 }
@@ -1754,7 +1754,7 @@ static int dissect_manufacturerCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t IP4Address_sequence[] = {
+static const ber_old_sequence_t IP4Address_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP4Address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -1762,8 +1762,8 @@ static const ber_sequence_t IP4Address_sequence[] = {
 
 static int
 dissect_h248_IP4Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IP4Address_sequence, hf_index, ett_h248_IP4Address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IP4Address_sequence, hf_index, ett_h248_IP4Address);
 
   return offset;
 }
@@ -1785,7 +1785,7 @@ static int dissect_iP6Address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t IP6Address_sequence[] = {
+static const ber_old_sequence_t IP6Address_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP6Address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -1793,8 +1793,8 @@ static const ber_sequence_t IP6Address_sequence[] = {
 
 static int
 dissect_h248_IP6Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IP6Address_sequence, hf_index, ett_h248_IP6Address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IP6Address_sequence, hf_index, ett_h248_IP6Address);
 
   return offset;
 }
@@ -1820,7 +1820,7 @@ static int dissect_digitMapBody_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t DomainName_sequence[] = {
+static const ber_old_sequence_t DomainName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   { 0, 0, 0, NULL }
@@ -1828,8 +1828,8 @@ static const ber_sequence_t DomainName_sequence[] = {
 
 static int
 dissect_h248_DomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DomainName_sequence, hf_index, ett_h248_DomainName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DomainName_sequence, hf_index, ett_h248_DomainName);
 
   return offset;
 }
@@ -1865,7 +1865,7 @@ static const value_string h248_MId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MId_choice[] = {
+static const ber_old_choice_t MId_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
@@ -1876,9 +1876,9 @@ static const ber_choice_t MId_choice[] = {
 
 static int
 dissect_h248_MId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MId_choice, hf_index, ett_h248_MId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MId_choice, hf_index, ett_h248_MId,
+                                     NULL);
 
   return offset;
 }
@@ -1928,7 +1928,7 @@ static int dissect_errorText_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ErrorDescriptor_sequence[] = {
+static const ber_old_sequence_t ErrorDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorCode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorText_impl },
   { 0, 0, 0, NULL }
@@ -1936,8 +1936,8 @@ static const ber_sequence_t ErrorDescriptor_sequence[] = {
 
 static int
 dissect_h248_ErrorDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ErrorDescriptor_sequence, hf_index, ett_h248_ErrorDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ErrorDescriptor_sequence, hf_index, ett_h248_ErrorDescriptor);
 
   return offset;
 }
@@ -2084,14 +2084,14 @@ static int dissect_wildcard_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_WildcardField_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_WildcardField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_wildcard_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_WildcardField_sequence_of, hf_index, ett_h248_SEQUENCE_OF_WildcardField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_WildcardField_sequence_of, hf_index, ett_h248_SEQUENCE_OF_WildcardField);
 
   return offset;
 }
@@ -2135,7 +2135,7 @@ static int dissect_terminationId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t TerminationID_sequence[] = {
+static const ber_old_sequence_t TerminationID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_wildcard_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationId_impl },
   { 0, 0, 0, NULL }
@@ -2147,8 +2147,8 @@ dissect_h248_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
     curr_info.term = ep_new0(gcp_term_t);
     wild_term = GCP_WILDCARD_NONE;
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TerminationID_sequence, hf_index, ett_h248_TerminationID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TerminationID_sequence, hf_index, ett_h248_TerminationID);
 
   return offset;
 }
@@ -2221,7 +2221,7 @@ static int dissect_topologyDirectionExtension_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t TopologyRequest_sequence[] = {
+static const ber_old_sequence_t TopologyRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationFrom_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationTo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_topologyDirection_impl },
@@ -2232,8 +2232,8 @@ static const ber_sequence_t TopologyRequest_sequence[] = {
 
 static int
 dissect_h248_TopologyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TopologyRequest_sequence, hf_index, ett_h248_TopologyRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TopologyRequest_sequence, hf_index, ett_h248_TopologyRequest);
 
   return offset;
 }
@@ -2242,7 +2242,7 @@ static int dissect_topologyReq_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_topologyReq_sequence_of[1] = {
+static const ber_old_sequence_t T_topologyReq_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_topologyReq_item },
 };
 
@@ -2252,8 +2252,8 @@ dissect_h248_T_topologyReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
       curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_TOPOLOGY_REQ,offset,keep_persistent_data);
       H248_TAP();
 
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_topologyReq_sequence_of, hf_index, ett_h248_T_topologyReq);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_topologyReq_sequence_of, hf_index, ett_h248_T_topologyReq);
 
 #line 185 "h248.cnf"
       curr_info.cmd = NULL;
@@ -2300,14 +2300,14 @@ static int dissect_propertyParamValue_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PropertyID_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PropertyID_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_propertyParamValue_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PropertyID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyID);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PropertyID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyID);
 
   return offset;
 }
@@ -2343,7 +2343,7 @@ static const value_string h248_T_extraInfo1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extraInfo1_choice[] = {
+static const ber_old_choice_t T_extraInfo1_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -2352,9 +2352,9 @@ static const ber_choice_t T_extraInfo1_choice[] = {
 
 static int
 dissect_h248_T_extraInfo1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extraInfo1_choice, hf_index, ett_h248_T_extraInfo1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extraInfo1_choice, hf_index, ett_h248_T_extraInfo1,
+                                     NULL);
 
   return offset;
 }
@@ -2363,7 +2363,7 @@ static int dissect_extraInfo1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PropertyParm_sequence[] = {
+static const ber_old_sequence_t PropertyParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_propertyParamValue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extraInfo1_impl },
@@ -2372,8 +2372,8 @@ static const ber_sequence_t PropertyParm_sequence[] = {
 
 static int
 dissect_h248_PropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PropertyParm_sequence, hf_index, ett_h248_PropertyParm);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PropertyParm_sequence, hf_index, ett_h248_PropertyParm);
 
   return offset;
 }
@@ -2394,14 +2394,14 @@ static int dissect_mpl_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PropertyParm_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PropertyParm_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextProp_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_PropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PropertyParm_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyParm);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PropertyParm_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyParm);
 
   return offset;
 }
@@ -2429,14 +2429,14 @@ static int dissect_contextList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ContextIDinList_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ContextIDinList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_contextList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_ContextIDinList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ContextIDinList_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ContextIDinList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ContextIDinList_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ContextIDinList);
 
   return offset;
 }
@@ -2445,7 +2445,7 @@ static int dissect_contextList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ContextRequest_sequence[] = {
+static const ber_old_sequence_t ContextRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_emergency_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topologyReq_impl },
@@ -2457,8 +2457,8 @@ static const ber_sequence_t ContextRequest_sequence[] = {
 
 static int
 dissect_h248_ContextRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContextRequest_sequence, hf_index, ett_h248_ContextRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContextRequest_sequence, hf_index, ett_h248_ContextRequest);
 
   return offset;
 }
@@ -2536,7 +2536,7 @@ static int dissect_serviceChangeIncompleteFlag_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t IndAudPropertyParm_sequence[] = {
+static const ber_old_sequence_t IndAudPropertyParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propertyParms_impl },
   { 0, 0, 0, NULL }
@@ -2544,8 +2544,8 @@ static const ber_sequence_t IndAudPropertyParm_sequence[] = {
 
 static int
 dissect_h248_IndAudPropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudPropertyParm_sequence, hf_index, ett_h248_IndAudPropertyParm);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudPropertyParm_sequence, hf_index, ett_h248_IndAudPropertyParm);
 
   return offset;
 }
@@ -2560,14 +2560,14 @@ static int dissect_IndAudPropertyGroup_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_IndAudPropertyParm_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_IndAudPropertyParm_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextPropAud_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_IndAudPropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_IndAudPropertyParm_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudPropertyParm);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_IndAudPropertyParm_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudPropertyParm);
 
   return offset;
 }
@@ -2585,7 +2585,7 @@ static const value_string h248_SelectLogic_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SelectLogic_choice[] = {
+static const ber_old_choice_t SelectLogic_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_andAUDITSelect_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_orAUDITSelect_impl },
   { 0, 0, 0, 0, NULL }
@@ -2593,9 +2593,9 @@ static const ber_choice_t SelectLogic_choice[] = {
 
 static int
 dissect_h248_SelectLogic(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SelectLogic_choice, hf_index, ett_h248_SelectLogic,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SelectLogic_choice, hf_index, ett_h248_SelectLogic,
+                                     NULL);
 
   return offset;
 }
@@ -2604,7 +2604,7 @@ static int dissect_selectLogic_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ContextAttrAuditRequest_sequence[] = {
+static const ber_old_sequence_t ContextAttrAuditRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topology_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAAREmergency_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAARPriority_impl },
@@ -2619,8 +2619,8 @@ static const ber_sequence_t ContextAttrAuditRequest_sequence[] = {
 
 static int
 dissect_h248_ContextAttrAuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContextAttrAuditRequest_sequence, hf_index, ett_h248_ContextAttrAuditRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContextAttrAuditRequest_sequence, hf_index, ett_h248_ContextAttrAuditRequest);
 
   return offset;
 }
@@ -2645,14 +2645,14 @@ static int dissect_contextAttrAuditReq_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t TerminationIDList_sequence_of[1] = {
+static const ber_old_sequence_t TerminationIDList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TerminationIDList_item },
 };
 
 static int
 dissect_h248_TerminationIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TerminationIDList_sequence_of, hf_index, ett_h248_TerminationIDList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TerminationIDList_sequence_of, hf_index, ett_h248_TerminationIDList);
 
   return offset;
 }
@@ -2706,7 +2706,7 @@ static int dissect_serviceState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t TerminationStateDescriptor_sequence[] = {
+static const ber_old_sequence_t TerminationStateDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tSEventBufferControl_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState_impl },
@@ -2715,8 +2715,8 @@ static const ber_sequence_t TerminationStateDescriptor_sequence[] = {
 
 static int
 dissect_h248_TerminationStateDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TerminationStateDescriptor_sequence, hf_index, ett_h248_TerminationStateDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TerminationStateDescriptor_sequence, hf_index, ett_h248_TerminationStateDescriptor);
 
   return offset;
 }
@@ -2750,7 +2750,7 @@ static int dissect_streamMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t LocalControlDescriptor_sequence[] = {
+static const ber_old_sequence_t LocalControlDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup_impl },
@@ -2760,8 +2760,8 @@ static const ber_sequence_t LocalControlDescriptor_sequence[] = {
 
 static int
 dissect_h248_LocalControlDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocalControlDescriptor_sequence, hf_index, ett_h248_LocalControlDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocalControlDescriptor_sequence, hf_index, ett_h248_LocalControlDescriptor);
 
   return offset;
 }
@@ -2770,14 +2770,14 @@ static int dissect_localControlDescriptor_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t PropertyGroup_sequence_of[1] = {
+static const ber_old_sequence_t PropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyGroup_item },
 };
 
 static int
 dissect_h248_PropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PropertyGroup_sequence_of, hf_index, ett_h248_PropertyGroup);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PropertyGroup_sequence_of, hf_index, ett_h248_PropertyGroup);
 
   return offset;
 }
@@ -2786,14 +2786,14 @@ static int dissect_propGrps_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PropertyGroup_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propGrps_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_PropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PropertyGroup_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyGroup);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PropertyGroup_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyGroup);
 
   return offset;
 }
@@ -2802,15 +2802,15 @@ static int dissect_propGrps_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t LocalRemoteDescriptor_sequence[] = {
+static const ber_old_sequence_t LocalRemoteDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propGrps_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_h248_LocalRemoteDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LocalRemoteDescriptor_sequence, hf_index, ett_h248_LocalRemoteDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LocalRemoteDescriptor_sequence, hf_index, ett_h248_LocalRemoteDescriptor);
 
   return offset;
 }
@@ -2850,14 +2850,14 @@ static int dissect_Value_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Value_sequence_of[1] = {
+static const ber_old_sequence_t Value_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Value_item },
 };
 
 static int
 dissect_h248_Value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Value_sequence_of, hf_index, ett_h248_Value);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Value_sequence_of, hf_index, ett_h248_Value);
 
   return offset;
 }
@@ -2875,7 +2875,7 @@ static int dissect_statValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t StatisticsParameter_sequence[] = {
+static const ber_old_sequence_t StatisticsParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_statName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_statValue_impl },
   { 0, 0, 0, NULL }
@@ -2883,8 +2883,8 @@ static const ber_sequence_t StatisticsParameter_sequence[] = {
 
 static int
 dissect_h248_StatisticsParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StatisticsParameter_sequence, hf_index, ett_h248_StatisticsParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StatisticsParameter_sequence, hf_index, ett_h248_StatisticsParameter);
 
   return offset;
 }
@@ -2893,14 +2893,14 @@ static int dissect_StatisticsDescriptor_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t StatisticsDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t StatisticsDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_StatisticsDescriptor_item },
 };
 
 static int
 dissect_h248_StatisticsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      StatisticsDescriptor_sequence_of, hf_index, ett_h248_StatisticsDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          StatisticsDescriptor_sequence_of, hf_index, ett_h248_StatisticsDescriptor);
 
   return offset;
 }
@@ -2909,7 +2909,7 @@ static int dissect_statisticsDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t StreamParms_sequence[] = {
+static const ber_old_sequence_t StreamParms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor_impl },
@@ -2919,8 +2919,8 @@ static const ber_sequence_t StreamParms_sequence[] = {
 
 static int
 dissect_h248_StreamParms(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StreamParms_sequence, hf_index, ett_h248_StreamParms);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StreamParms_sequence, hf_index, ett_h248_StreamParms);
 
   return offset;
 }
@@ -2932,7 +2932,7 @@ static int dissect_streamParms_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t StreamDescriptor_sequence[] = {
+static const ber_old_sequence_t StreamDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms_impl },
   { 0, 0, 0, NULL }
@@ -2940,8 +2940,8 @@ static const ber_sequence_t StreamDescriptor_sequence[] = {
 
 static int
 dissect_h248_StreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StreamDescriptor_sequence, hf_index, ett_h248_StreamDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StreamDescriptor_sequence, hf_index, ett_h248_StreamDescriptor);
 
   return offset;
 }
@@ -2950,14 +2950,14 @@ static int dissect_mediaDescriptorMultiStream_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_StreamDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_StreamDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mediaDescriptorMultiStream_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_StreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_StreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_StreamDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_StreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_StreamDescriptor);
 
   return offset;
 }
@@ -2972,7 +2972,7 @@ static const value_string h248_T_streams_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_streams_choice[] = {
+static const ber_old_choice_t T_streams_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorOneStream_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorMultiStream_impl },
   { 0, 0, 0, 0, NULL }
@@ -2980,9 +2980,9 @@ static const ber_choice_t T_streams_choice[] = {
 
 static int
 dissect_h248_T_streams(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_streams_choice, hf_index, ett_h248_T_streams,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_streams_choice, hf_index, ett_h248_T_streams,
+                                     NULL);
 
   return offset;
 }
@@ -2991,7 +2991,7 @@ static int dissect_streams_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t MediaDescriptor_sequence[] = {
+static const ber_old_sequence_t MediaDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streams_impl },
   { 0, 0, 0, NULL }
@@ -2999,8 +2999,8 @@ static const ber_sequence_t MediaDescriptor_sequence[] = {
 
 static int
 dissect_h248_MediaDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MediaDescriptor_sequence, hf_index, ett_h248_MediaDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MediaDescriptor_sequence, hf_index, ett_h248_MediaDescriptor);
 
   return offset;
 }
@@ -3035,14 +3035,14 @@ static int dissect_mtl_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ModemType_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ModemType_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_mtl_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_ModemType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ModemType_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ModemType);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ModemType_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ModemType);
 
   return offset;
 }
@@ -3082,7 +3082,7 @@ static int dissect_t35Extension_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t H221NonStandard_sequence[] = {
+static const ber_old_sequence_t H221NonStandard_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_t35CountryCode1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_t35CountryCode2_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_t35Extension_impl },
@@ -3092,8 +3092,8 @@ static const ber_sequence_t H221NonStandard_sequence[] = {
 
 static int
 dissect_h248_H221NonStandard(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   H221NonStandard_sequence, hf_index, ett_h248_H221NonStandard);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       H221NonStandard_sequence, hf_index, ett_h248_H221NonStandard);
 
   return offset;
 }
@@ -3129,7 +3129,7 @@ static const value_string h248_NonStandardIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NonStandardIdentifier_choice[] = {
+static const ber_old_choice_t NonStandardIdentifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_object_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h221NonStandard_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_experimental_impl },
@@ -3138,9 +3138,9 @@ static const ber_choice_t NonStandardIdentifier_choice[] = {
 
 static int
 dissect_h248_NonStandardIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NonStandardIdentifier_choice, hf_index, ett_h248_NonStandardIdentifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NonStandardIdentifier_choice, hf_index, ett_h248_NonStandardIdentifier,
+                                     NULL);
 
   return offset;
 }
@@ -3149,7 +3149,7 @@ static int dissect_nonStandardIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t NonStandardData_sequence[] = {
+static const ber_old_sequence_t NonStandardData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_nonStandardIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_data_impl },
   { 0, 0, 0, NULL }
@@ -3157,8 +3157,8 @@ static const ber_sequence_t NonStandardData_sequence[] = {
 
 static int
 dissect_h248_NonStandardData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NonStandardData_sequence, hf_index, ett_h248_NonStandardData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NonStandardData_sequence, hf_index, ett_h248_NonStandardData);
 
   return offset;
 }
@@ -3167,7 +3167,7 @@ static int dissect_nonStandardData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ModemDescriptor_sequence[] = {
+static const ber_old_sequence_t ModemDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mtl_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mpl_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl },
@@ -3176,8 +3176,8 @@ static const ber_sequence_t ModemDescriptor_sequence[] = {
 
 static int
 dissect_h248_ModemDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModemDescriptor_sequence, hf_index, ett_h248_ModemDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModemDescriptor_sequence, hf_index, ett_h248_ModemDescriptor);
 
   return offset;
 }
@@ -3208,14 +3208,14 @@ static int dissect_muxType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_TerminationID_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_TerminationID_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_termList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_TerminationID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TerminationID);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_TerminationID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TerminationID);
 
   return offset;
 }
@@ -3224,7 +3224,7 @@ static int dissect_termList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t MuxDescriptor_sequence[] = {
+static const ber_old_sequence_t MuxDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_muxType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_termList_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl },
@@ -3233,8 +3233,8 @@ static const ber_sequence_t MuxDescriptor_sequence[] = {
 
 static int
 dissect_h248_MuxDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MuxDescriptor_sequence, hf_index, ett_h248_MuxDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MuxDescriptor_sequence, hf_index, ett_h248_MuxDescriptor);
 
   return offset;
 }
@@ -3291,7 +3291,7 @@ static int dissect_digitMapName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t DigitMapValue_sequence[] = {
+static const ber_old_sequence_t DigitMapValue_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startTimer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_shortTimer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_longTimer_impl },
@@ -3302,8 +3302,8 @@ static const ber_sequence_t DigitMapValue_sequence[] = {
 
 static int
 dissect_h248_DigitMapValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DigitMapValue_sequence, hf_index, ett_h248_DigitMapValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DigitMapValue_sequence, hf_index, ett_h248_DigitMapValue);
 
   return offset;
 }
@@ -3318,7 +3318,7 @@ static const value_string h248_EventDM_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EventDM_choice[] = {
+static const ber_old_choice_t EventDM_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl },
   { 0, 0, 0, 0, NULL }
@@ -3326,9 +3326,9 @@ static const ber_choice_t EventDM_choice[] = {
 
 static int
 dissect_h248_EventDM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EventDM_choice, hf_index, ett_h248_EventDM,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EventDM_choice, hf_index, ett_h248_EventDM,
+                                     NULL);
 
   return offset;
 }
@@ -3391,14 +3391,14 @@ static int dissect_SigParamValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SigParamValues_sequence_of[1] = {
+static const ber_old_sequence_t SigParamValues_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SigParamValues_item },
 };
 
 static int
 dissect_h248_SigParamValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SigParamValues_sequence_of, hf_index, ett_h248_SigParamValues);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SigParamValues_sequence_of, hf_index, ett_h248_SigParamValues);
 
   return offset;
 }
@@ -3414,7 +3414,7 @@ static const value_string h248_T_extraInfo2_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extraInfo2_choice[] = {
+static const ber_old_choice_t T_extraInfo2_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -3423,9 +3423,9 @@ static const ber_choice_t T_extraInfo2_choice[] = {
 
 static int
 dissect_h248_T_extraInfo2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extraInfo2_choice, hf_index, ett_h248_T_extraInfo2,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extraInfo2_choice, hf_index, ett_h248_T_extraInfo2,
+                                     NULL);
 
   return offset;
 }
@@ -3434,7 +3434,7 @@ static int dissect_extraInfo2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SigParameter_sequence[] = {
+static const ber_old_sequence_t SigParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sigParameterName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extraInfo2_impl },
@@ -3443,8 +3443,8 @@ static const ber_sequence_t SigParameter_sequence[] = {
 
 static int
 dissect_h248_SigParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SigParameter_sequence, hf_index, ett_h248_SigParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SigParameter_sequence, hf_index, ett_h248_SigParameter);
 
   return offset;
 }
@@ -3453,14 +3453,14 @@ static int dissect_sigParList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SigParameter_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SigParameter_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sigParList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_SigParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SigParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SigParameter);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SigParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SigParameter);
 
   return offset;
 }
@@ -3489,7 +3489,7 @@ static int dissect_direction_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Signal_sequence[] = {
+static const ber_old_sequence_t Signal_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sigType_impl },
@@ -3505,8 +3505,8 @@ static const ber_sequence_t Signal_sequence[] = {
 
 static int
 dissect_h248_Signal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Signal_sequence, hf_index, ett_h248_Signal);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Signal_sequence, hf_index, ett_h248_Signal);
 
   return offset;
 }
@@ -3518,14 +3518,14 @@ static int dissect_signalList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Signal_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Signal_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signalList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_Signal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Signal_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Signal);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Signal_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Signal);
 
   return offset;
 }
@@ -3534,7 +3534,7 @@ static int dissect_signalList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SeqSigList_sequence[] = {
+static const ber_old_sequence_t SeqSigList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signalList_impl },
   { 0, 0, 0, NULL }
@@ -3542,8 +3542,8 @@ static const ber_sequence_t SeqSigList_sequence[] = {
 
 static int
 dissect_h248_SeqSigList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SeqSigList_sequence, hf_index, ett_h248_SeqSigList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SeqSigList_sequence, hf_index, ett_h248_SeqSigList);
 
   return offset;
 }
@@ -3558,7 +3558,7 @@ static const value_string h248_SignalRequest_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SignalRequest_choice[] = {
+static const ber_old_choice_t SignalRequest_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList_impl },
   { 0, 0, 0, 0, NULL }
@@ -3566,9 +3566,9 @@ static const ber_choice_t SignalRequest_choice[] = {
 
 static int
 dissect_h248_SignalRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SignalRequest_choice, hf_index, ett_h248_SignalRequest,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SignalRequest_choice, hf_index, ett_h248_SignalRequest,
+                                     NULL);
 
   return offset;
 }
@@ -3577,14 +3577,14 @@ static int dissect_SignalsDescriptor_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SignalsDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t SignalsDescriptor_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item },
 };
 
 static int
 dissect_h248_SignalsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SignalsDescriptor_sequence_of, hf_index, ett_h248_SignalsDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SignalsDescriptor_sequence_of, hf_index, ett_h248_SignalsDescriptor);
 
   return offset;
 }
@@ -3593,7 +3593,7 @@ static int dissect_signalsDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t RegulatedEmbeddedDescriptor_sequence[] = {
+static const ber_old_sequence_t RegulatedEmbeddedDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondEvent_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalsDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -3601,8 +3601,8 @@ static const ber_sequence_t RegulatedEmbeddedDescriptor_sequence[] = {
 
 static int
 dissect_h248_RegulatedEmbeddedDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegulatedEmbeddedDescriptor_sequence, hf_index, ett_h248_RegulatedEmbeddedDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegulatedEmbeddedDescriptor_sequence, hf_index, ett_h248_RegulatedEmbeddedDescriptor);
 
   return offset;
 }
@@ -3618,7 +3618,7 @@ static const value_string h248_NotifyBehaviour_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NotifyBehaviour_choice[] = {
+static const ber_old_choice_t NotifyBehaviour_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_notifyImmediate_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_notifyRegulated_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_neverNotify_impl },
@@ -3627,9 +3627,9 @@ static const ber_choice_t NotifyBehaviour_choice[] = {
 
 static int
 dissect_h248_NotifyBehaviour(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NotifyBehaviour_choice, hf_index, ett_h248_NotifyBehaviour,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NotifyBehaviour_choice, hf_index, ett_h248_NotifyBehaviour,
+                                     NULL);
 
   return offset;
 }
@@ -3638,7 +3638,7 @@ static int dissect_notifyBehaviour_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SecondRequestedActions_sequence[] = {
+static const ber_old_sequence_t SecondRequestedActions_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventDM_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalsDescriptor_impl },
@@ -3649,8 +3649,8 @@ static const ber_sequence_t SecondRequestedActions_sequence[] = {
 
 static int
 dissect_h248_SecondRequestedActions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecondRequestedActions_sequence, hf_index, ett_h248_SecondRequestedActions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecondRequestedActions_sequence, hf_index, ett_h248_SecondRequestedActions);
 
   return offset;
 }
@@ -3667,14 +3667,14 @@ static int dissect_EventParamValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t EventParamValues_sequence_of[1] = {
+static const ber_old_sequence_t EventParamValues_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_EventParamValues_item },
 };
 
 static int
 dissect_h248_EventParamValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      EventParamValues_sequence_of, hf_index, ett_h248_EventParamValues);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          EventParamValues_sequence_of, hf_index, ett_h248_EventParamValues);
 
   return offset;
 }
@@ -3690,7 +3690,7 @@ static const value_string h248_T_extraInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extraInfo_choice[] = {
+static const ber_old_choice_t T_extraInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl },
@@ -3699,9 +3699,9 @@ static const ber_choice_t T_extraInfo_choice[] = {
 
 static int
 dissect_h248_T_extraInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extraInfo_choice, hf_index, ett_h248_T_extraInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extraInfo_choice, hf_index, ett_h248_T_extraInfo,
+                                     NULL);
 
   return offset;
 }
@@ -3710,7 +3710,7 @@ static int dissect_extraInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t EventParameter_sequence[] = {
+static const ber_old_sequence_t EventParameter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventParameterName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventParamValue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extraInfo_impl },
@@ -3719,8 +3719,8 @@ static const ber_sequence_t EventParameter_sequence[] = {
 
 static int
 dissect_h248_EventParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventParameter_sequence, hf_index, ett_h248_EventParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventParameter_sequence, hf_index, ett_h248_EventParameter);
 
   return offset;
 }
@@ -3732,14 +3732,14 @@ static int dissect_evParList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_EventParameter_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_EventParameter_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventParList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_EventParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_EventParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_EventParameter);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_EventParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_EventParameter);
 
   return offset;
 }
@@ -3751,7 +3751,7 @@ static int dissect_evParList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SecondRequestedEvent_sequence[] = {
+static const ber_old_sequence_t SecondRequestedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondaryEventAction_impl },
@@ -3761,8 +3761,8 @@ static const ber_sequence_t SecondRequestedEvent_sequence[] = {
 
 static int
 dissect_h248_SecondRequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecondRequestedEvent_sequence, hf_index, ett_h248_SecondRequestedEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecondRequestedEvent_sequence, hf_index, ett_h248_SecondRequestedEvent);
 
   return offset;
 }
@@ -3771,14 +3771,14 @@ static int dissect_secondaryEventList_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SecondRequestedEvent_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SecondRequestedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_secondaryEventList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_SecondRequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SecondRequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SecondRequestedEvent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SecondRequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SecondRequestedEvent);
 
   return offset;
 }
@@ -3787,7 +3787,7 @@ static int dissect_secondaryEventList_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SecondEventsDescriptor_sequence[] = {
+static const ber_old_sequence_t SecondEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_secondaryEventList_impl },
   { 0, 0, 0, NULL }
@@ -3795,14 +3795,14 @@ static const ber_sequence_t SecondEventsDescriptor_sequence[] = {
 
 static int
 dissect_h248_SecondEventsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecondEventsDescriptor_sequence, hf_index, ett_h248_SecondEventsDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecondEventsDescriptor_sequence, hf_index, ett_h248_SecondEventsDescriptor);
 
   return offset;
 }
 
 
-static const ber_sequence_t RequestedActions_sequence[] = {
+static const ber_old_sequence_t RequestedActions_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventDM_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondEvent_impl },
@@ -3814,8 +3814,8 @@ static const ber_sequence_t RequestedActions_sequence[] = {
 
 static int
 dissect_h248_RequestedActions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedActions_sequence, hf_index, ett_h248_RequestedActions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedActions_sequence, hf_index, ett_h248_RequestedActions);
 
   return offset;
 }
@@ -3824,7 +3824,7 @@ static int dissect_eventAction_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RequestedEvent_sequence[] = {
+static const ber_old_sequence_t RequestedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction_impl },
@@ -3834,8 +3834,8 @@ static const ber_sequence_t RequestedEvent_sequence[] = {
 
 static int
 dissect_h248_RequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedEvent_sequence, hf_index, ett_h248_RequestedEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedEvent_sequence, hf_index, ett_h248_RequestedEvent);
 
   return offset;
 }
@@ -3844,14 +3844,14 @@ static int dissect_eventList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_RequestedEvent_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_RequestedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_RequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_RequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_RequestedEvent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_RequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_RequestedEvent);
 
   return offset;
 }
@@ -3860,7 +3860,7 @@ static int dissect_eventList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t EventsDescriptor_sequence[] = {
+static const ber_old_sequence_t EventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventList_impl },
   { 0, 0, 0, NULL }
@@ -3868,8 +3868,8 @@ static const ber_sequence_t EventsDescriptor_sequence[] = {
 
 static int
 dissect_h248_EventsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventsDescriptor_sequence, hf_index, ett_h248_EventsDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventsDescriptor_sequence, hf_index, ett_h248_EventsDescriptor);
 
   return offset;
 }
@@ -3878,7 +3878,7 @@ static int dissect_eventsDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t EventSpec_sequence[] = {
+static const ber_old_sequence_t EventSpec_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl },
@@ -3887,8 +3887,8 @@ static const ber_sequence_t EventSpec_sequence[] = {
 
 static int
 dissect_h248_EventSpec(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventSpec_sequence, hf_index, ett_h248_EventSpec);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventSpec_sequence, hf_index, ett_h248_EventSpec);
 
   return offset;
 }
@@ -3897,14 +3897,14 @@ static int dissect_EventBufferDescriptor_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t EventBufferDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t EventBufferDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventBufferDescriptor_item },
 };
 
 static int
 dissect_h248_EventBufferDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      EventBufferDescriptor_sequence_of, hf_index, ett_h248_EventBufferDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          EventBufferDescriptor_sequence_of, hf_index, ett_h248_EventBufferDescriptor);
 
   return offset;
 }
@@ -3913,7 +3913,7 @@ static int dissect_eventBufferDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t DigitMapDescriptor_sequence[] = {
+static const ber_old_sequence_t DigitMapDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl },
   { 0, 0, 0, NULL }
@@ -3921,8 +3921,8 @@ static const ber_sequence_t DigitMapDescriptor_sequence[] = {
 
 static int
 dissect_h248_DigitMapDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DigitMapDescriptor_sequence, hf_index, ett_h248_DigitMapDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DigitMapDescriptor_sequence, hf_index, ett_h248_DigitMapDescriptor);
 
   return offset;
 }
@@ -3958,7 +3958,7 @@ static int dissect_auditToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t IndAudTerminationStateDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudTerminationStateDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudPropertyParms_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iATSDServiceState_impl },
@@ -3968,8 +3968,8 @@ static const ber_sequence_t IndAudTerminationStateDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudTerminationStateDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudTerminationStateDescriptor_sequence, hf_index, ett_h248_IndAudTerminationStateDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudTerminationStateDescriptor_sequence, hf_index, ett_h248_IndAudTerminationStateDescriptor);
 
   return offset;
 }
@@ -3978,7 +3978,7 @@ static int dissect_indAudTerminationStateDescriptor_impl(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t IndAudLocalControlDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudLocalControlDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDStreamMode_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveValue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveGroup_impl },
@@ -3989,8 +3989,8 @@ static const ber_sequence_t IndAudLocalControlDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudLocalControlDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudLocalControlDescriptor_sequence, hf_index, ett_h248_IndAudLocalControlDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudLocalControlDescriptor_sequence, hf_index, ett_h248_IndAudLocalControlDescriptor);
 
   return offset;
 }
@@ -3999,14 +3999,14 @@ static int dissect_iASPLocalControlDescriptor_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t IndAudPropertyGroup_sequence_of[1] = {
+static const ber_old_sequence_t IndAudPropertyGroup_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyGroup_item },
 };
 
 static int
 dissect_h248_IndAudPropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      IndAudPropertyGroup_sequence_of, hf_index, ett_h248_IndAudPropertyGroup);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          IndAudPropertyGroup_sequence_of, hf_index, ett_h248_IndAudPropertyGroup);
 
   return offset;
 }
@@ -4015,7 +4015,7 @@ static int dissect_iAPropertyGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t IndAudLocalRemoteDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudLocalRemoteDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propGroupID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAPropertyGroup_impl },
   { 0, 0, 0, NULL }
@@ -4023,8 +4023,8 @@ static const ber_sequence_t IndAudLocalRemoteDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudLocalRemoteDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudLocalRemoteDescriptor_sequence, hf_index, ett_h248_IndAudLocalRemoteDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudLocalRemoteDescriptor_sequence, hf_index, ett_h248_IndAudLocalRemoteDescriptor);
 
   return offset;
 }
@@ -4036,15 +4036,15 @@ static int dissect_iASPRemoteDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t IndAudStatisticsDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudStatisticsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iAStatName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_h248_IndAudStatisticsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudStatisticsDescriptor_sequence, hf_index, ett_h248_IndAudStatisticsDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudStatisticsDescriptor_sequence, hf_index, ett_h248_IndAudStatisticsDescriptor);
 
   return offset;
 }
@@ -4056,7 +4056,7 @@ static int dissect_statisticsDescriptor1_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t IndAudStreamParms_sequence[] = {
+static const ber_old_sequence_t IndAudStreamParms_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalControlDescriptor_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPRemoteDescriptor_impl },
@@ -4066,8 +4066,8 @@ static const ber_sequence_t IndAudStreamParms_sequence[] = {
 
 static int
 dissect_h248_IndAudStreamParms(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudStreamParms_sequence, hf_index, ett_h248_IndAudStreamParms);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudStreamParms_sequence, hf_index, ett_h248_IndAudStreamParms);
 
   return offset;
 }
@@ -4079,7 +4079,7 @@ static int dissect_indAudStreamParms_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t IndAudStreamDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudStreamDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudStreamParms_impl },
   { 0, 0, 0, NULL }
@@ -4087,8 +4087,8 @@ static const ber_sequence_t IndAudStreamDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudStreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudStreamDescriptor_sequence, hf_index, ett_h248_IndAudStreamDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudStreamDescriptor_sequence, hf_index, ett_h248_IndAudStreamDescriptor);
 
   return offset;
 }
@@ -4097,14 +4097,14 @@ static int dissect_multiStream_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_IndAudStreamDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_IndAudStreamDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_IndAudStreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_IndAudStreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudStreamDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_IndAudStreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudStreamDescriptor);
 
   return offset;
 }
@@ -4119,7 +4119,7 @@ static const value_string h248_indAudMediaDescriptorStreams_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t indAudMediaDescriptorStreams_choice[] = {
+static const ber_old_choice_t indAudMediaDescriptorStreams_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream_impl },
   { 0, 0, 0, 0, NULL }
@@ -4127,9 +4127,9 @@ static const ber_choice_t indAudMediaDescriptorStreams_choice[] = {
 
 static int
 dissect_h248_indAudMediaDescriptorStreams(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams,
+                                     NULL);
 
   return offset;
 }
@@ -4138,7 +4138,7 @@ static int dissect_indAudMediaDescriptorStreams_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t IndAudMediaDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudMediaDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_indAudTerminationStateDescriptor_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_indAudMediaDescriptorStreams_impl },
   { 0, 0, 0, NULL }
@@ -4146,8 +4146,8 @@ static const ber_sequence_t IndAudMediaDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudMediaDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudMediaDescriptor_sequence, hf_index, ett_h248_IndAudMediaDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudMediaDescriptor_sequence, hf_index, ett_h248_IndAudMediaDescriptor);
 
   return offset;
 }
@@ -4156,7 +4156,7 @@ static int dissect_indaudmediaDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t IndAudEventsDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAEDPkgdName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
@@ -4165,8 +4165,8 @@ static const ber_sequence_t IndAudEventsDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudEventsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudEventsDescriptor_sequence, hf_index, ett_h248_IndAudEventsDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudEventsDescriptor_sequence, hf_index, ett_h248_IndAudEventsDescriptor);
 
   return offset;
 }
@@ -4175,7 +4175,7 @@ static int dissect_indaudeventsDescriptor_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t IndAudEventBufferDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudEventBufferDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iAEBDEventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { 0, 0, 0, NULL }
@@ -4183,8 +4183,8 @@ static const ber_sequence_t IndAudEventBufferDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudEventBufferDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudEventBufferDescriptor_sequence, hf_index, ett_h248_IndAudEventBufferDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudEventBufferDescriptor_sequence, hf_index, ett_h248_IndAudEventBufferDescriptor);
 
   return offset;
 }
@@ -4193,7 +4193,7 @@ static int dissect_indaudeventBufferDescriptor_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t IndAudSignal_sequence[] = {
+static const ber_old_sequence_t IndAudSignal_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iASignalName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalRequestID_impl },
@@ -4202,8 +4202,8 @@ static const ber_sequence_t IndAudSignal_sequence[] = {
 
 static int
 dissect_h248_IndAudSignal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudSignal_sequence, hf_index, ett_h248_IndAudSignal);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudSignal_sequence, hf_index, ett_h248_IndAudSignal);
 
   return offset;
 }
@@ -4215,7 +4215,7 @@ static int dissect_iASignalList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t IndAudSeqSigList_sequence[] = {
+static const ber_old_sequence_t IndAudSeqSigList_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASignalList_impl },
   { 0, 0, 0, NULL }
@@ -4223,8 +4223,8 @@ static const ber_sequence_t IndAudSeqSigList_sequence[] = {
 
 static int
 dissect_h248_IndAudSeqSigList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudSeqSigList_sequence, hf_index, ett_h248_IndAudSeqSigList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudSeqSigList_sequence, hf_index, ett_h248_IndAudSeqSigList);
 
   return offset;
 }
@@ -4239,7 +4239,7 @@ static const value_string h248_IndAudSignalsDescriptor_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t IndAudSignalsDescriptor_choice[] = {
+static const ber_old_choice_t IndAudSignalsDescriptor_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudSignal_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudSeqSigList_impl },
   { 0, 0, 0, 0, NULL }
@@ -4247,9 +4247,9 @@ static const ber_choice_t IndAudSignalsDescriptor_choice[] = {
 
 static int
 dissect_h248_IndAudSignalsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 IndAudSignalsDescriptor_choice, hf_index, ett_h248_IndAudSignalsDescriptor,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     IndAudSignalsDescriptor_choice, hf_index, ett_h248_IndAudSignalsDescriptor,
+                                     NULL);
 
   return offset;
 }
@@ -4258,15 +4258,15 @@ static int dissect_indaudsignalsDescriptor_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t IndAudDigitMapDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudDigitMapDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_h248_IndAudDigitMapDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudDigitMapDescriptor_sequence, hf_index, ett_h248_IndAudDigitMapDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudDigitMapDescriptor_sequence, hf_index, ett_h248_IndAudDigitMapDescriptor);
 
   return offset;
 }
@@ -4275,7 +4275,7 @@ static int dissect_indauddigitMapDescriptor_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t IndAudPackagesDescriptor_sequence[] = {
+static const ber_old_sequence_t IndAudPackagesDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl },
   { 0, 0, 0, NULL }
@@ -4283,8 +4283,8 @@ static const ber_sequence_t IndAudPackagesDescriptor_sequence[] = {
 
 static int
 dissect_h248_IndAudPackagesDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IndAudPackagesDescriptor_sequence, hf_index, ett_h248_IndAudPackagesDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IndAudPackagesDescriptor_sequence, hf_index, ett_h248_IndAudPackagesDescriptor);
 
   return offset;
 }
@@ -4304,7 +4304,7 @@ static const value_string h248_IndAuditParameter_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t IndAuditParameter_choice[] = {
+static const ber_old_choice_t IndAuditParameter_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indaudmediaDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indaudeventsDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_indaudeventBufferDescriptor_impl },
@@ -4317,9 +4317,9 @@ static const ber_choice_t IndAuditParameter_choice[] = {
 
 static int
 dissect_h248_IndAuditParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 IndAuditParameter_choice, hf_index, ett_h248_IndAuditParameter,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     IndAuditParameter_choice, hf_index, ett_h248_IndAuditParameter,
+                                     NULL);
 
   return offset;
 }
@@ -4328,14 +4328,14 @@ static int dissect_auditPropertyToken_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_IndAuditParameter_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_IndAuditParameter_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_IndAuditParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_IndAuditParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAuditParameter);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_IndAuditParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAuditParameter);
 
   return offset;
 }
@@ -4344,7 +4344,7 @@ static int dissect_auditPropertyToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AuditDescriptor_sequence[] = {
+static const ber_old_sequence_t AuditDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditToken_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditPropertyToken_impl },
   { 0, 0, 0, NULL }
@@ -4352,8 +4352,8 @@ static const ber_sequence_t AuditDescriptor_sequence[] = {
 
 static int
 dissect_h248_AuditDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuditDescriptor_sequence, hf_index, ett_h248_AuditDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuditDescriptor_sequence, hf_index, ett_h248_AuditDescriptor);
 
   return offset;
 }
@@ -4382,7 +4382,7 @@ static const value_string h248_AmmDescriptor_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AmmDescriptor_choice[] = {
+static const ber_old_choice_t AmmDescriptor_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_muxDescriptor_impl },
@@ -4399,9 +4399,9 @@ static const ber_choice_t AmmDescriptor_choice[] = {
 
 static int
 dissect_h248_AmmDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AmmDescriptor_choice, hf_index, ett_h248_AmmDescriptor,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AmmDescriptor_choice, hf_index, ett_h248_AmmDescriptor,
+                                     NULL);
 
   return offset;
 }
@@ -4410,14 +4410,14 @@ static int dissect_descriptors_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AmmDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AmmDescriptor_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_AmmDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AmmDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_AmmDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AmmDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_AmmDescriptor);
 
   return offset;
 }
@@ -4426,7 +4426,7 @@ static int dissect_descriptors_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AmmRequest_sequence[] = {
+static const ber_old_sequence_t AmmRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptors_impl },
   { 0, 0, 0, NULL }
@@ -4434,8 +4434,8 @@ static const ber_sequence_t AmmRequest_sequence[] = {
 
 static int
 dissect_h248_AmmRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AmmRequest_sequence, hf_index, ett_h248_AmmRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AmmRequest_sequence, hf_index, ett_h248_AmmRequest);
 
   return offset;
 }
@@ -4499,7 +4499,7 @@ static int dissect_modReq_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SubtractRequest_sequence[] = {
+static const ber_old_sequence_t SubtractRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -4507,8 +4507,8 @@ static const ber_sequence_t SubtractRequest_sequence[] = {
 
 static int
 dissect_h248_SubtractRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubtractRequest_sequence, hf_index, ett_h248_SubtractRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubtractRequest_sequence, hf_index, ett_h248_SubtractRequest);
 
   return offset;
 }
@@ -4533,7 +4533,7 @@ static int dissect_subtractReq_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AuditRequest_sequence[] = {
+static const ber_old_sequence_t AuditRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
@@ -4542,8 +4542,8 @@ static const ber_sequence_t AuditRequest_sequence[] = {
 
 static int
 dissect_h248_AuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuditRequest_sequence, hf_index, ett_h248_AuditRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuditRequest_sequence, hf_index, ett_h248_AuditRequest);
 
   return offset;
 }
@@ -4587,7 +4587,7 @@ static int dissect_auditValueRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t TimeNotation_sequence[] = {
+static const ber_old_sequence_t TimeNotation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_date_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_impl },
   { 0, 0, 0, NULL }
@@ -4595,8 +4595,8 @@ static const ber_sequence_t TimeNotation_sequence[] = {
 
 static int
 dissect_h248_TimeNotation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeNotation_sequence, hf_index, ett_h248_TimeNotation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeNotation_sequence, hf_index, ett_h248_TimeNotation);
 
   return offset;
 }
@@ -4611,7 +4611,7 @@ static int dissect_timestamp_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ObservedEvent_sequence[] = {
+static const ber_old_sequence_t ObservedEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl },
@@ -4621,8 +4621,8 @@ static const ber_sequence_t ObservedEvent_sequence[] = {
 
 static int
 dissect_h248_ObservedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ObservedEvent_sequence, hf_index, ett_h248_ObservedEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ObservedEvent_sequence, hf_index, ett_h248_ObservedEvent);
 
   return offset;
 }
@@ -4631,14 +4631,14 @@ static int dissect_observedEventLst_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ObservedEvent_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ObservedEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_observedEventLst_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_ObservedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ObservedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ObservedEvent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ObservedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ObservedEvent);
 
   return offset;
 }
@@ -4647,7 +4647,7 @@ static int dissect_observedEventLst_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ObservedEventsDescriptor_sequence[] = {
+static const ber_old_sequence_t ObservedEventsDescriptor_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventLst_impl },
   { 0, 0, 0, NULL }
@@ -4655,8 +4655,8 @@ static const ber_sequence_t ObservedEventsDescriptor_sequence[] = {
 
 static int
 dissect_h248_ObservedEventsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ObservedEventsDescriptor_sequence, hf_index, ett_h248_ObservedEventsDescriptor);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ObservedEventsDescriptor_sequence, hf_index, ett_h248_ObservedEventsDescriptor);
 
   return offset;
 }
@@ -4665,7 +4665,7 @@ static int dissect_observedEventsDescriptor_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t NotifyRequest_sequence[] = {
+static const ber_old_sequence_t NotifyRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventsDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
@@ -4674,8 +4674,8 @@ static const ber_sequence_t NotifyRequest_sequence[] = {
 
 static int
 dissect_h248_NotifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NotifyRequest_sequence, hf_index, ett_h248_NotifyRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NotifyRequest_sequence, hf_index, ett_h248_NotifyRequest);
 
   return offset;
 }
@@ -4733,7 +4733,7 @@ static const value_string h248_ServiceChangeAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ServiceChangeAddress_choice[] = {
+static const ber_old_choice_t ServiceChangeAddress_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_portNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl },
@@ -4745,9 +4745,9 @@ static const ber_choice_t ServiceChangeAddress_choice[] = {
 
 static int
 dissect_h248_ServiceChangeAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ServiceChangeAddress_choice, hf_index, ett_h248_ServiceChangeAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ServiceChangeAddress_choice, hf_index, ett_h248_ServiceChangeAddress,
+                                     NULL);
 
   return offset;
 }
@@ -4770,15 +4770,15 @@ static int dissect_profileName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ServiceChangeProfile_sequence[] = {
+static const ber_old_sequence_t ServiceChangeProfile_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_profileName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_h248_ServiceChangeProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceChangeProfile_sequence, hf_index, ett_h248_ServiceChangeProfile);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceChangeProfile_sequence, hf_index, ett_h248_ServiceChangeProfile);
 
   return offset;
 }
@@ -4811,14 +4811,14 @@ static int dissect_SCreasonValue_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SCreasonValue_sequence_of[1] = {
+static const ber_old_sequence_t SCreasonValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SCreasonValue_item },
 };
 
 static int
 dissect_h248_SCreasonValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SCreasonValue_sequence_of, hf_index, ett_h248_SCreasonValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SCreasonValue_sequence_of, hf_index, ett_h248_SCreasonValue);
 
   return offset;
 }
@@ -4840,7 +4840,7 @@ static int dissect_serviceChangeDelay_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ServiceChangeParm_sequence[] = {
+static const ber_old_sequence_t ServiceChangeParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceChangeMethod_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl },
@@ -4857,8 +4857,8 @@ static const ber_sequence_t ServiceChangeParm_sequence[] = {
 
 static int
 dissect_h248_ServiceChangeParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceChangeParm_sequence, hf_index, ett_h248_ServiceChangeParm);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceChangeParm_sequence, hf_index, ett_h248_ServiceChangeParm);
 
   return offset;
 }
@@ -4867,7 +4867,7 @@ static int dissect_serviceChangeParms_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ServiceChangeRequest_sequence[] = {
+static const ber_old_sequence_t ServiceChangeRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeParms_impl },
   { 0, 0, 0, NULL }
@@ -4879,8 +4879,8 @@ dissect_h248_ServiceChangeRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
       curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REQ,offset,keep_persistent_data);
       H248_TAP();
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceChangeRequest_sequence, hf_index, ett_h248_ServiceChangeRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceChangeRequest_sequence, hf_index, ett_h248_ServiceChangeRequest);
 
 #line 177 "h248.cnf"
       curr_info.cmd = NULL;
@@ -4904,7 +4904,7 @@ static const value_string h248_Command_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Command_choice[] = {
+static const ber_old_choice_t Command_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReq_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReq_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReq_impl },
@@ -4918,9 +4918,9 @@ static const ber_choice_t Command_choice[] = {
 
 static int
 dissect_h248_Command(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Command_choice, hf_index, ett_h248_Command,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Command_choice, hf_index, ett_h248_Command,
+                                     NULL);
 
   return offset;
 }
@@ -4929,7 +4929,7 @@ static int dissect_command_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t CommandRequest_sequence[] = {
+static const ber_old_sequence_t CommandRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_command_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_optional_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_wildcardReturn_impl },
@@ -4938,8 +4938,8 @@ static const ber_sequence_t CommandRequest_sequence[] = {
 
 static int
 dissect_h248_CommandRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CommandRequest_sequence, hf_index, ett_h248_CommandRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CommandRequest_sequence, hf_index, ett_h248_CommandRequest);
 
   return offset;
 }
@@ -4948,14 +4948,14 @@ static int dissect_commandRequests_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_CommandRequest_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_CommandRequest_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_commandRequests_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_CommandRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_CommandRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandRequest);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_CommandRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandRequest);
 
   return offset;
 }
@@ -4964,7 +4964,7 @@ static int dissect_commandRequests_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ActionRequest_sequence[] = {
+static const ber_old_sequence_t ActionRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextRequest_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextAttrAuditReq_impl },
@@ -4974,8 +4974,8 @@ static const ber_sequence_t ActionRequest_sequence[] = {
 
 static int
 dissect_h248_ActionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionRequest_sequence, hf_index, ett_h248_ActionRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionRequest_sequence, hf_index, ett_h248_ActionRequest);
 
   return offset;
 }
@@ -4984,14 +4984,14 @@ static int dissect_actions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ActionRequest_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ActionRequest_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actions_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_ActionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ActionRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionRequest);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ActionRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionRequest);
 
   return offset;
 }
@@ -5000,7 +5000,7 @@ static int dissect_actions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t TransactionRequest_sequence[] = {
+static const ber_old_sequence_t TransactionRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actions_impl },
   { 0, 0, 0, NULL }
@@ -5008,8 +5008,8 @@ static const ber_sequence_t TransactionRequest_sequence[] = {
 
 static int
 dissect_h248_TransactionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TransactionRequest_sequence, hf_index, ett_h248_TransactionRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionRequest_sequence, hf_index, ett_h248_TransactionRequest);
 
   return offset;
 }
@@ -5018,15 +5018,15 @@ static int dissect_transactionRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t TransactionPending_sequence[] = {
+static const ber_old_sequence_t TransactionPending_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_h248_TransactionPending(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TransactionPending_sequence, hf_index, ett_h248_TransactionPending);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionPending_sequence, hf_index, ett_h248_TransactionPending);
 
   return offset;
 }
@@ -5035,7 +5035,7 @@ static int dissect_transactionPending_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t PackagesItem_sequence[] = {
+static const ber_old_sequence_t PackagesItem_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl },
   { 0, 0, 0, NULL }
@@ -5043,8 +5043,8 @@ static const ber_sequence_t PackagesItem_sequence[] = {
 
 static int
 dissect_h248_PackagesItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PackagesItem_sequence, hf_index, ett_h248_PackagesItem);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PackagesItem_sequence, hf_index, ett_h248_PackagesItem);
 
   return offset;
 }
@@ -5053,14 +5053,14 @@ static int dissect_PackagesDescriptor_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t PackagesDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t PackagesDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PackagesDescriptor_item },
 };
 
 static int
 dissect_h248_PackagesDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PackagesDescriptor_sequence_of, hf_index, ett_h248_PackagesDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PackagesDescriptor_sequence_of, hf_index, ett_h248_PackagesDescriptor);
 
   return offset;
 }
@@ -5085,7 +5085,7 @@ static const value_string h248_AuditReturnParameter_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuditReturnParameter_choice[] = {
+static const ber_old_choice_t AuditReturnParameter_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl },
@@ -5103,9 +5103,9 @@ static const ber_choice_t AuditReturnParameter_choice[] = {
 
 static int
 dissect_h248_AuditReturnParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuditReturnParameter_choice, hf_index, ett_h248_AuditReturnParameter,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuditReturnParameter_choice, hf_index, ett_h248_AuditReturnParameter,
+                                     NULL);
 
   return offset;
 }
@@ -5114,14 +5114,14 @@ static int dissect_TerminationAudit_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t TerminationAudit_sequence_of[1] = {
+static const ber_old_sequence_t TerminationAudit_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item },
 };
 
 static int
 dissect_h248_TerminationAudit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TerminationAudit_sequence_of, hf_index, ett_h248_TerminationAudit);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TerminationAudit_sequence_of, hf_index, ett_h248_TerminationAudit);
 
   return offset;
 }
@@ -5133,7 +5133,7 @@ static int dissect_terminationAuditResult_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t AmmsReply_sequence[] = {
+static const ber_old_sequence_t AmmsReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationAudit_impl },
   { 0, 0, 0, NULL }
@@ -5141,8 +5141,8 @@ static const ber_sequence_t AmmsReply_sequence[] = {
 
 static int
 dissect_h248_AmmsReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AmmsReply_sequence, hf_index, ett_h248_AmmsReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AmmsReply_sequence, hf_index, ett_h248_AmmsReply);
 
   return offset;
 }
@@ -5212,7 +5212,7 @@ static int dissect_subtractReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t AuditResult_sequence[] = {
+static const ber_old_sequence_t AuditResult_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationAuditResult_impl },
   { 0, 0, 0, NULL }
@@ -5220,8 +5220,8 @@ static const ber_sequence_t AuditResult_sequence[] = {
 
 static int
 dissect_h248_AuditResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuditResult_sequence, hf_index, ett_h248_AuditResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuditResult_sequence, hf_index, ett_h248_AuditResult);
 
   return offset;
 }
@@ -5230,7 +5230,7 @@ static int dissect_auditResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TermListAuditResult_sequence[] = {
+static const ber_old_sequence_t TermListAuditResult_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationAuditResult_impl },
   { 0, 0, 0, NULL }
@@ -5238,8 +5238,8 @@ static const ber_sequence_t TermListAuditResult_sequence[] = {
 
 static int
 dissect_h248_TermListAuditResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TermListAuditResult_sequence, hf_index, ett_h248_TermListAuditResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TermListAuditResult_sequence, hf_index, ett_h248_TermListAuditResult);
 
   return offset;
 }
@@ -5257,7 +5257,7 @@ static const value_string h248_AuditReply_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuditReply_choice[] = {
+static const ber_old_choice_t AuditReply_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextAuditResult_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_auditResult_impl },
@@ -5269,9 +5269,9 @@ static const ber_choice_t AuditReply_choice[] = {
 
 static int
 dissect_h248_AuditReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuditReply_choice, hf_index, ett_h248_AuditReply,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuditReply_choice, hf_index, ett_h248_AuditReply,
+                                     NULL);
 
   return offset;
 }
@@ -5309,7 +5309,7 @@ static int dissect_auditValueReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t NotifyReply_sequence[] = {
+static const ber_old_sequence_t NotifyReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   { 0, 0, 0, NULL }
@@ -5317,8 +5317,8 @@ static const ber_sequence_t NotifyReply_sequence[] = {
 
 static int
 dissect_h248_NotifyReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NotifyReply_sequence, hf_index, ett_h248_NotifyReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NotifyReply_sequence, hf_index, ett_h248_NotifyReply);
 
   return offset;
 }
@@ -5340,7 +5340,7 @@ static int dissect_notifyReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ServiceChangeResParm_sequence[] = {
+static const ber_old_sequence_t ServiceChangeResParm_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeMgcId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl },
@@ -5351,8 +5351,8 @@ static const ber_sequence_t ServiceChangeResParm_sequence[] = {
 
 static int
 dissect_h248_ServiceChangeResParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceChangeResParm_sequence, hf_index, ett_h248_ServiceChangeResParm);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceChangeResParm_sequence, hf_index, ett_h248_ServiceChangeResParm);
 
   return offset;
 }
@@ -5367,7 +5367,7 @@ static const value_string h248_ServiceChangeResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ServiceChangeResult_choice[] = {
+static const ber_old_choice_t ServiceChangeResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeResParms_impl },
   { 0, 0, 0, 0, NULL }
@@ -5375,9 +5375,9 @@ static const ber_choice_t ServiceChangeResult_choice[] = {
 
 static int
 dissect_h248_ServiceChangeResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ServiceChangeResult_choice, hf_index, ett_h248_ServiceChangeResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ServiceChangeResult_choice, hf_index, ett_h248_ServiceChangeResult,
+                                     NULL);
 
   return offset;
 }
@@ -5386,7 +5386,7 @@ static int dissect_serviceChangeResult_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ServiceChangeReply_sequence[] = {
+static const ber_old_sequence_t ServiceChangeReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeResult_impl },
   { 0, 0, 0, NULL }
@@ -5398,8 +5398,8 @@ dissect_h248_ServiceChangeReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
       curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REPLY,offset,keep_persistent_data);
       H248_TAP();
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceChangeReply_sequence, hf_index, ett_h248_ServiceChangeReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceChangeReply_sequence, hf_index, ett_h248_ServiceChangeReply);
 
   return offset;
 }
@@ -5420,7 +5420,7 @@ static const value_string h248_CommandReply_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CommandReply_choice[] = {
+static const ber_old_choice_t CommandReply_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReply_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReply_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReply_impl },
@@ -5434,9 +5434,9 @@ static const ber_choice_t CommandReply_choice[] = {
 
 static int
 dissect_h248_CommandReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CommandReply_choice, hf_index, ett_h248_CommandReply,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CommandReply_choice, hf_index, ett_h248_CommandReply,
+                                     NULL);
 
   return offset;
 }
@@ -5445,14 +5445,14 @@ static int dissect_commandReply_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_CommandReply_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_CommandReply_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_CommandReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_CommandReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandReply);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_CommandReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandReply);
 
   return offset;
 }
@@ -5461,7 +5461,7 @@ static int dissect_commandReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ActionReply_sequence[] = {
+static const ber_old_sequence_t ActionReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextReply_impl },
@@ -5471,8 +5471,8 @@ static const ber_sequence_t ActionReply_sequence[] = {
 
 static int
 dissect_h248_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActionReply_sequence, hf_index, ett_h248_ActionReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActionReply_sequence, hf_index, ett_h248_ActionReply);
 
 #line 107 "h248.cnf"
     if (!curr_info.cmd) {
@@ -5487,14 +5487,14 @@ static int dissect_actionReplies_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ActionReply_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ActionReply_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actionReplies_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ActionReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionReply);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ActionReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionReply);
 
   return offset;
 }
@@ -5509,7 +5509,7 @@ static const value_string h248_T_transactionResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_transactionResult_choice[] = {
+static const ber_old_choice_t T_transactionResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actionReplies_impl },
   { 0, 0, 0, 0, NULL }
@@ -5517,9 +5517,9 @@ static const ber_choice_t T_transactionResult_choice[] = {
 
 static int
 dissect_h248_T_transactionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_transactionResult_choice, hf_index, ett_h248_T_transactionResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_transactionResult_choice, hf_index, ett_h248_T_transactionResult,
+                                     NULL);
 
   return offset;
 }
@@ -5541,7 +5541,7 @@ static int dissect_segmentNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t TransactionReply_sequence[] = {
+static const ber_old_sequence_t TransactionReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_immAckRequired_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_transactionResult_impl },
@@ -5552,8 +5552,8 @@ static const ber_sequence_t TransactionReply_sequence[] = {
 
 static int
 dissect_h248_TransactionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TransactionReply_sequence, hf_index, ett_h248_TransactionReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionReply_sequence, hf_index, ett_h248_TransactionReply);
 
   return offset;
 }
@@ -5562,7 +5562,7 @@ static int dissect_transactionReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t TransactionAck_sequence[] = {
+static const ber_old_sequence_t TransactionAck_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_firstAck_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastAck_impl },
   { 0, 0, 0, NULL }
@@ -5570,8 +5570,8 @@ static const ber_sequence_t TransactionAck_sequence[] = {
 
 static int
 dissect_h248_TransactionAck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TransactionAck_sequence, hf_index, ett_h248_TransactionAck);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionAck_sequence, hf_index, ett_h248_TransactionAck);
 
   return offset;
 }
@@ -5580,14 +5580,14 @@ static int dissect_TransactionResponseAck_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t TransactionResponseAck_sequence_of[1] = {
+static const ber_old_sequence_t TransactionResponseAck_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TransactionResponseAck_item },
 };
 
 static int
 dissect_h248_TransactionResponseAck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TransactionResponseAck_sequence_of, hf_index, ett_h248_TransactionResponseAck);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TransactionResponseAck_sequence_of, hf_index, ett_h248_TransactionResponseAck);
 
   return offset;
 }
@@ -5596,7 +5596,7 @@ static int dissect_transactionResponseAck_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SegmentReply_sequence[] = {
+static const ber_old_sequence_t SegmentReply_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_segmentNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_segmentationComplete_impl },
@@ -5605,8 +5605,8 @@ static const ber_sequence_t SegmentReply_sequence[] = {
 
 static int
 dissect_h248_SegmentReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SegmentReply_sequence, hf_index, ett_h248_SegmentReply);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SegmentReply_sequence, hf_index, ett_h248_SegmentReply);
 
   return offset;
 }
@@ -5625,7 +5625,7 @@ static const value_string h248_Transaction_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Transaction_choice[] = {
+static const ber_old_choice_t Transaction_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionRequest_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactionPending_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_transactionReply_impl },
@@ -5638,9 +5638,9 @@ static const ber_choice_t Transaction_choice[] = {
 
 static int
 dissect_h248_Transaction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Transaction_choice, hf_index, ett_h248_Transaction,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Transaction_choice, hf_index, ett_h248_Transaction,
+                                     NULL);
 
   return offset;
 }
@@ -5649,14 +5649,14 @@ static int dissect_transactions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Transaction_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Transaction_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item },
 };
 
 static int
 dissect_h248_SEQUENCE_OF_Transaction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Transaction_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Transaction);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Transaction_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Transaction);
 
   return offset;
 }
@@ -5671,7 +5671,7 @@ static const value_string h248_T_messageBody_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_messageBody_choice[] = {
+static const ber_old_choice_t T_messageBody_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageError_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactions_impl },
   { 0, 0, 0, 0, NULL }
@@ -5679,9 +5679,9 @@ static const ber_choice_t T_messageBody_choice[] = {
 
 static int
 dissect_h248_T_messageBody(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_messageBody_choice, hf_index, ett_h248_T_messageBody,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_messageBody_choice, hf_index, ett_h248_T_messageBody,
+                                     NULL);
 
   return offset;
 }
@@ -5690,7 +5690,7 @@ static int dissect_messageBody_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Message_sequence[] = {
+static const ber_old_sequence_t Message_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_version_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_mId_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_messageBody_impl },
@@ -5702,8 +5702,8 @@ dissect_h248_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 #line 80 "h248.cnf"
     curr_info.msg = gcp_msg(actx->pinfo,TVB_RAW_OFFSET(tvb),keep_persistent_data);
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Message_sequence, hf_index, ett_h248_Message);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Message_sequence, hf_index, ett_h248_Message);
 
 #line 84 "h248.cnf"
     if (check_col(actx->pinfo->cinfo, COL_INFO))
@@ -5719,7 +5719,7 @@ static int dissect_mess_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t MegacoMessage_sequence[] = {
+static const ber_old_sequence_t MegacoMessage_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authHeader_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mess_impl },
   { 0, 0, 0, NULL }
@@ -5727,8 +5727,8 @@ static const ber_sequence_t MegacoMessage_sequence[] = {
 
 static int
 dissect_h248_MegacoMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MegacoMessage_sequence, hf_index, ett_h248_MegacoMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MegacoMessage_sequence, hf_index, ett_h248_MegacoMessage);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 87a3cf3728..960b4ab602 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -672,7 +672,7 @@ static const value_string inap_OPERATION_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OPERATION_choice[] = {
+static const ber_old_choice_t OPERATION_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -680,9 +680,9 @@ static const ber_choice_t OPERATION_choice[] = {
 
 static int
 dissect_inap_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OPERATION_choice, hf_index, ett_inap_OPERATION,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OPERATION_choice, hf_index, ett_inap_OPERATION,
+                                     NULL);
 
   return offset;
 }
@@ -706,7 +706,7 @@ static int dissect_invokeparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@@ -716,8 +716,8 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_inap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_inap_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_inap_Invoke);
 
   return offset;
 }
@@ -741,7 +741,7 @@ static int dissect_returnparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_resultretres_sequence[] = {
+static const ber_old_sequence_t T_resultretres_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_returnparameter },
   { 0, 0, 0, NULL }
@@ -749,8 +749,8 @@ static const ber_sequence_t T_resultretres_sequence[] = {
 
 static int
 dissect_inap_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_resultretres_sequence, hf_index, ett_inap_T_resultretres);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_resultretres_sequence, hf_index, ett_inap_T_resultretres);
 
   return offset;
 }
@@ -759,7 +759,7 @@ static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
   { 0, 0, 0, NULL }
@@ -767,8 +767,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_inap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_inap_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_inap_ReturnResult);
 
   return offset;
 }
@@ -814,7 +814,7 @@ static const value_string inap_ERROR_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ERROR_choice[] = {
+static const ber_old_choice_t ERROR_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue1 },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -822,9 +822,9 @@ static const ber_choice_t ERROR_choice[] = {
 
 static int
 dissect_inap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ERROR_choice, hf_index, ett_inap_ERROR,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ERROR_choice, hf_index, ett_inap_ERROR,
+                                     NULL);
 
   return offset;
 }
@@ -848,7 +848,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -857,8 +857,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_inap_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_inap_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_inap_ReturnError);
 
   return offset;
 }
@@ -894,7 +894,7 @@ static const value_string inap_T_invokeIDRej_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_invokeIDRej_choice[] = {
+static const ber_old_choice_t T_invokeIDRej_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
   { 0, 0, 0, 0, NULL }
@@ -902,9 +902,9 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
 
 static int
 dissect_inap_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_invokeIDRej_choice, hf_index, ett_inap_T_invokeIDRej,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_invokeIDRej_choice, hf_index, ett_inap_T_invokeIDRej,
+                                     NULL);
 
   return offset;
 }
@@ -1008,7 +1008,7 @@ static const value_string inap_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -1018,9 +1018,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_inap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_inap_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_inap_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -1029,7 +1029,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -1037,8 +1037,8 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_inap_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_inap_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_inap_Reject);
 
   return offset;
 }
@@ -1056,7 +1056,7 @@ static const value_string inap_Component_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Component_choice[] = {
+static const ber_old_choice_t Component_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -1067,9 +1067,9 @@ static const ber_choice_t Component_choice[] = {
 
 static int
 dissect_inap_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Component_choice, hf_index, ett_inap_Component,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Component_choice, hf_index, ett_inap_Component,
+                                     NULL);
 
   return offset;
 }
@@ -1097,7 +1097,7 @@ static int dissect_targetCallID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AddPartyArg_sequence[] = {
+static const ber_old_sequence_t AddPartyArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCallID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationCallID_impl },
   { 0, 0, 0, NULL }
@@ -1105,8 +1105,8 @@ static const ber_sequence_t AddPartyArg_sequence[] = {
 
 static int
 dissect_inap_AddPartyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddPartyArg_sequence, hf_index, ett_inap_AddPartyArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddPartyArg_sequence, hf_index, ett_inap_AddPartyArg);
 
   return offset;
 }
@@ -1149,7 +1149,7 @@ static int dissect_RouteList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t AttachArg_sequence[] = {
+static const ber_old_sequence_t AttachArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_newLegID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationidentifier_impl },
   { 0, 0, 0, NULL }
@@ -1157,8 +1157,8 @@ static const ber_sequence_t AttachArg_sequence[] = {
 
 static int
 dissect_inap_AttachArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttachArg_sequence, hf_index, ett_inap_AttachArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttachArg_sequence, hf_index, ett_inap_AttachArg);
 
   return offset;
 }
@@ -1186,7 +1186,7 @@ static const value_string inap_LegID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LegID_choice[] = {
+static const ber_old_choice_t LegID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl },
   { 0, 0, 0, 0, NULL }
@@ -1194,9 +1194,9 @@ static const ber_choice_t LegID_choice[] = {
 
 static int
 dissect_inap_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LegID_choice, hf_index, ett_inap_LegID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LegID_choice, hf_index, ett_inap_LegID,
+                                     NULL);
 
   return offset;
 }
@@ -1235,7 +1235,7 @@ static int dissect_legStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t LegInformation_sequence[] = {
+static const ber_old_sequence_t LegInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legStatus_impl },
   { 0, 0, 0, NULL }
@@ -1243,8 +1243,8 @@ static const ber_sequence_t LegInformation_sequence[] = {
 
 static int
 dissect_inap_LegInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LegInformation_sequence, hf_index, ett_inap_LegInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LegInformation_sequence, hf_index, ett_inap_LegInformation);
 
   return offset;
 }
@@ -1253,20 +1253,20 @@ static int dissect_CallPartyHandlingResultsArg_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = {
+static const ber_old_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CallPartyHandlingResultsArg_item },
 };
 
 static int
 dissect_inap_CallPartyHandlingResultsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChangePartiesArg_sequence[] = {
+static const ber_old_sequence_t ChangePartiesArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_targetCallID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_legToBeConnectedID_impl },
@@ -1275,14 +1275,14 @@ static const ber_sequence_t ChangePartiesArg_sequence[] = {
 
 static int
 dissect_inap_ChangePartiesArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChangePartiesArg_sequence, hf_index, ett_inap_ChangePartiesArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChangePartiesArg_sequence, hf_index, ett_inap_ChangePartiesArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DetachArg_sequence[] = {
+static const ber_old_sequence_t DetachArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_legToBeDetached_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationidentifier_impl },
   { 0, 0, 0, NULL }
@@ -1290,14 +1290,14 @@ static const ber_sequence_t DetachArg_sequence[] = {
 
 static int
 dissect_inap_DetachArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DetachArg_sequence, hf_index, ett_inap_DetachArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DetachArg_sequence, hf_index, ett_inap_DetachArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t HoldCallPartyConnectionArg_sequence[] = {
+static const ber_old_sequence_t HoldCallPartyConnectionArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
   { 0, 0, 0, NULL }
@@ -1305,14 +1305,14 @@ static const ber_sequence_t HoldCallPartyConnectionArg_sequence[] = {
 
 static int
 dissect_inap_HoldCallPartyConnectionArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   HoldCallPartyConnectionArg_sequence, hf_index, ett_inap_HoldCallPartyConnectionArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       HoldCallPartyConnectionArg_sequence, hf_index, ett_inap_HoldCallPartyConnectionArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReconnectArg_sequence[] = {
+static const ber_old_sequence_t ReconnectArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_heldLegID_impl },
   { 0, 0, 0, NULL }
@@ -1320,8 +1320,8 @@ static const ber_sequence_t ReconnectArg_sequence[] = {
 
 static int
 dissect_inap_ReconnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReconnectArg_sequence, hf_index, ett_inap_ReconnectArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReconnectArg_sequence, hf_index, ett_inap_ReconnectArg);
 
   return offset;
 }
@@ -1352,7 +1352,7 @@ static int dissect_releaseCauseValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ReleaseCallPartyConnectionArg_sequence[] = {
+static const ber_old_sequence_t ReleaseCallPartyConnectionArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legToBeReleased_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
@@ -1361,8 +1361,8 @@ static const ber_sequence_t ReleaseCallPartyConnectionArg_sequence[] = {
 
 static int
 dissect_inap_ReleaseCallPartyConnectionArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReleaseCallPartyConnectionArg_sequence, hf_index, ett_inap_ReleaseCallPartyConnectionArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReleaseCallPartyConnectionArg_sequence, hf_index, ett_inap_ReleaseCallPartyConnectionArg);
 
   return offset;
 }
@@ -1409,7 +1409,7 @@ static int dissect_criticality(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Extensions_item_sequence[] = {
+static const ber_old_sequence_t Extensions_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_criticality },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
@@ -1418,8 +1418,8 @@ static const ber_sequence_t Extensions_item_sequence[] = {
 
 static int
 dissect_inap_Extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Extensions_item_sequence, hf_index, ett_inap_Extensions_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Extensions_item_sequence, hf_index, ett_inap_Extensions_item);
 
   return offset;
 }
@@ -1428,14 +1428,14 @@ static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Extensions_sequence_of[1] = {
+static const ber_old_sequence_t Extensions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
 };
 
 static int
 dissect_inap_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Extensions_sequence_of, hf_index, ett_inap_Extensions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Extensions_sequence_of, hf_index, ett_inap_Extensions);
 
   return offset;
 }
@@ -1521,7 +1521,7 @@ static int dissect_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_text_sequence[] = {
+static const ber_old_sequence_t T_text_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageContent_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attributes_impl },
   { 0, 0, 0, NULL }
@@ -1529,8 +1529,8 @@ static const ber_sequence_t T_text_sequence[] = {
 
 static int
 dissect_inap_T_text(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_text_sequence, hf_index, ett_inap_T_text);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_text_sequence, hf_index, ett_inap_T_text);
 
   return offset;
 }
@@ -1539,14 +1539,14 @@ static int dissect_text_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_elementaryMessageIDs_item },
 };
 
 static int
 dissect_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4);
 
   return offset;
 }
@@ -1637,7 +1637,7 @@ static const value_string inap_VariablePart_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t VariablePart_choice[] = {
+static const ber_old_choice_t VariablePart_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integer_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_number_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_time_impl },
@@ -1648,9 +1648,9 @@ static const ber_choice_t VariablePart_choice[] = {
 
 static int
 dissect_inap_VariablePart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 VariablePart_choice, hf_index, ett_inap_VariablePart,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     VariablePart_choice, hf_index, ett_inap_VariablePart,
+                                     NULL);
 
   return offset;
 }
@@ -1659,14 +1659,14 @@ static int dissect_variableParts_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableParts_item },
 };
 
 static int
 dissect_inap_SEQUENCE_SIZE_1_5_OF_VariablePart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_5_OF_VariablePart);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_5_OF_VariablePart);
 
   return offset;
 }
@@ -1675,7 +1675,7 @@ static int dissect_variableParts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_variableMessage_sequence[] = {
+static const ber_old_sequence_t T_variableMessage_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_variableParts_impl },
   { 0, 0, 0, NULL }
@@ -1683,8 +1683,8 @@ static const ber_sequence_t T_variableMessage_sequence[] = {
 
 static int
 dissect_inap_T_variableMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_variableMessage_sequence, hf_index, ett_inap_T_variableMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_variableMessage_sequence, hf_index, ett_inap_T_variableMessage);
 
   return offset;
 }
@@ -1701,7 +1701,7 @@ static const value_string inap_MessageID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MessageID_choice[] = {
+static const ber_old_choice_t MessageID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_text_impl },
   {  29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_elementaryMessageIDs_impl },
@@ -1711,9 +1711,9 @@ static const ber_choice_t MessageID_choice[] = {
 
 static int
 dissect_inap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MessageID_choice, hf_index, ett_inap_MessageID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MessageID_choice, hf_index, ett_inap_MessageID,
+                                     NULL);
 
   return offset;
 }
@@ -1763,7 +1763,7 @@ static int dissect_interval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t InbandInfo_sequence[] = {
+static const ber_old_sequence_t InbandInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_messageID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfRepetitions_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration3_impl },
@@ -1773,8 +1773,8 @@ static const ber_sequence_t InbandInfo_sequence[] = {
 
 static int
 dissect_inap_InbandInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InbandInfo_sequence, hf_index, ett_inap_InbandInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InbandInfo_sequence, hf_index, ett_inap_InbandInfo);
 
   return offset;
 }
@@ -1783,7 +1783,7 @@ static int dissect_inbandInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Tone_sequence[] = {
+static const ber_old_sequence_t Tone_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_toneID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tone_duration_impl },
   { 0, 0, 0, NULL }
@@ -1791,8 +1791,8 @@ static const ber_sequence_t Tone_sequence[] = {
 
 static int
 dissect_inap_Tone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Tone_sequence, hf_index, ett_inap_Tone);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Tone_sequence, hf_index, ett_inap_Tone);
 
   return offset;
 }
@@ -1822,7 +1822,7 @@ static const value_string inap_InformationToSend_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InformationToSend_choice[] = {
+static const ber_old_choice_t InformationToSend_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inbandInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tone_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_displayInformation_impl },
@@ -1831,9 +1831,9 @@ static const ber_choice_t InformationToSend_choice[] = {
 
 static int
 dissect_inap_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InformationToSend_choice, hf_index, ett_inap_InformationToSend,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InformationToSend_choice, hf_index, ett_inap_InformationToSend,
+                                     NULL);
 
   return offset;
 }
@@ -1855,7 +1855,7 @@ static int dissect_maximumNumberOfCounters_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t FilteredCallTreatment_sequence[] = {
+static const ber_old_sequence_t FilteredCallTreatment_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sFBillingChargingCharacteristics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximumNumberOfCounters_impl },
@@ -1865,8 +1865,8 @@ static const ber_sequence_t FilteredCallTreatment_sequence[] = {
 
 static int
 dissect_inap_FilteredCallTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FilteredCallTreatment_sequence, hf_index, ett_inap_FilteredCallTreatment);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FilteredCallTreatment_sequence, hf_index, ett_inap_FilteredCallTreatment);
 
   return offset;
 }
@@ -1894,7 +1894,7 @@ static const value_string inap_FilteringCharacteristics_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FilteringCharacteristics_choice[] = {
+static const ber_old_choice_t FilteringCharacteristics_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_interval1_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfCalls_impl },
   { 0, 0, 0, 0, NULL }
@@ -1902,9 +1902,9 @@ static const ber_choice_t FilteringCharacteristics_choice[] = {
 
 static int
 dissect_inap_FilteringCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FilteringCharacteristics_choice, hf_index, ett_inap_FilteringCharacteristics,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FilteringCharacteristics_choice, hf_index, ett_inap_FilteringCharacteristics,
+                                     NULL);
 
   return offset;
 }
@@ -1954,7 +1954,7 @@ static const value_string inap_FilteringTimeOut_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FilteringTimeOut_choice[] = {
+static const ber_old_choice_t FilteringTimeOut_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_duration_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_stopTime_impl },
   { 0, 0, 0, 0, NULL }
@@ -1962,9 +1962,9 @@ static const ber_choice_t FilteringTimeOut_choice[] = {
 
 static int
 dissect_inap_FilteringTimeOut(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FilteringTimeOut_choice, hf_index, ett_inap_FilteringTimeOut,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FilteringTimeOut_choice, hf_index, ett_inap_FilteringTimeOut,
+                                     NULL);
 
   return offset;
 }
@@ -1998,7 +1998,7 @@ static int dissect_locationNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_addressAndService_sequence[] = {
+static const ber_old_sequence_t T_addressAndService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingAddressValue_impl },
@@ -2008,8 +2008,8 @@ static const ber_sequence_t T_addressAndService_sequence[] = {
 
 static int
 dissect_inap_T_addressAndService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_addressAndService_sequence, hf_index, ett_inap_T_addressAndService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_addressAndService_sequence, hf_index, ett_inap_T_addressAndService);
 
   return offset;
 }
@@ -2026,7 +2026,7 @@ static const value_string inap_FilteringCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FilteringCriteria_choice[] = {
+static const ber_old_choice_t FilteringCriteria_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dialledNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callingLineID_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
@@ -2036,9 +2036,9 @@ static const ber_choice_t FilteringCriteria_choice[] = {
 
 static int
 dissect_inap_FilteringCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -2047,7 +2047,7 @@ static int dissect_filteringCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ActivateServiceFilteringArg_sequence[] = {
+static const ber_old_sequence_t ActivateServiceFilteringArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_filteredCallTreatment_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringCharacteristics_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringTimeOut_impl },
@@ -2059,8 +2059,8 @@ static const ber_sequence_t ActivateServiceFilteringArg_sequence[] = {
 
 static int
 dissect_inap_ActivateServiceFilteringArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActivateServiceFilteringArg_sequence, hf_index, ett_inap_ActivateServiceFilteringArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActivateServiceFilteringArg_sequence, hf_index, ett_inap_ActivateServiceFilteringArg);
 
   return offset;
 }
@@ -2105,7 +2105,7 @@ static int dissect_dpAssignment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t MiscCallInfo_sequence[] = {
+static const ber_old_sequence_t MiscCallInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dpAssignment_impl },
   { 0, 0, 0, NULL }
@@ -2113,8 +2113,8 @@ static const ber_sequence_t MiscCallInfo_sequence[] = {
 
 static int
 dissect_inap_MiscCallInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MiscCallInfo_sequence, hf_index, ett_inap_MiscCallInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MiscCallInfo_sequence, hf_index, ett_inap_MiscCallInfo);
 
   return offset;
 }
@@ -2159,7 +2159,7 @@ static int dissect_triggerType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ServiceAddressInformation_sequence[] = {
+static const ber_old_sequence_t ServiceAddressInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_miscCallInfo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerType_impl },
@@ -2168,8 +2168,8 @@ static const ber_sequence_t ServiceAddressInformation_sequence[] = {
 
 static int
 dissect_inap_ServiceAddressInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceAddressInformation_sequence, hf_index, ett_inap_ServiceAddressInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceAddressInformation_sequence, hf_index, ett_inap_ServiceAddressInformation);
 
   return offset;
 }
@@ -2222,7 +2222,7 @@ static const value_string inap_BearerCapability_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BearerCapability_choice[] = {
+static const ber_old_choice_t BearerCapability_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bearerCap_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tmr_impl },
   { 0, 0, 0, 0, NULL }
@@ -2230,9 +2230,9 @@ static const ber_choice_t BearerCapability_choice[] = {
 
 static int
 dissect_inap_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BearerCapability_choice, hf_index, ett_inap_BearerCapability,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BearerCapability_choice, hf_index, ett_inap_BearerCapability,
+                                     NULL);
 
   return offset;
 }
@@ -2434,7 +2434,7 @@ static int dissect_servingAreaID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t DpSpecificCommonParameters_sequence[] = {
+static const ber_old_sequence_t DpSpecificCommonParameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceAddressInformation_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_bearerCapability_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl },
@@ -2455,8 +2455,8 @@ static const ber_sequence_t DpSpecificCommonParameters_sequence[] = {
 
 static int
 dissect_inap_DpSpecificCommonParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DpSpecificCommonParameters_sequence, hf_index, ett_inap_DpSpecificCommonParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DpSpecificCommonParameters_sequence, hf_index, ett_inap_DpSpecificCommonParameters);
 
   return offset;
 }
@@ -2499,7 +2499,7 @@ static const value_string inap_FacilityGroup_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t FacilityGroup_choice[] = {
+static const ber_old_choice_t FacilityGroup_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_trunkGroupID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_privateFacilityID_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_huntGroup_impl },
@@ -2509,9 +2509,9 @@ static const ber_choice_t FacilityGroup_choice[] = {
 
 static int
 dissect_inap_FacilityGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 FacilityGroup_choice, hf_index, ett_inap_FacilityGroup,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     FacilityGroup_choice, hf_index, ett_inap_FacilityGroup,
+                                     NULL);
 
   return offset;
 }
@@ -2616,14 +2616,14 @@ static int dissect_redirectionInformation_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t RouteList_sequence_of[1] = {
+static const ber_old_sequence_t RouteList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_RouteList_item },
 };
 
 static int
 dissect_inap_RouteList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RouteList_sequence_of, hf_index, ett_inap_RouteList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RouteList_sequence_of, hf_index, ett_inap_RouteList);
 
   return offset;
 }
@@ -2681,7 +2681,7 @@ static int dissect_carrier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AnalysedInformationArg_sequence[] = {
+static const ber_old_sequence_t AnalysedInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
@@ -2703,21 +2703,21 @@ static const ber_sequence_t AnalysedInformationArg_sequence[] = {
 
 static int
 dissect_inap_AnalysedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnalysedInformationArg_sequence, hf_index, ett_inap_AnalysedInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnalysedInformationArg_sequence, hf_index, ett_inap_AnalysedInformationArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t DestinationRoutingAddress_sequence_of[1] = {
+static const ber_old_sequence_t DestinationRoutingAddress_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DestinationRoutingAddress_item },
 };
 
 static int
 dissect_inap_DestinationRoutingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DestinationRoutingAddress_sequence_of, hf_index, ett_inap_DestinationRoutingAddress);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DestinationRoutingAddress_sequence_of, hf_index, ett_inap_DestinationRoutingAddress);
 
   return offset;
 }
@@ -2739,7 +2739,7 @@ static int dissect_alertingPattern_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AnalyseInformationArg_sequence[] = {
+static const ber_old_sequence_t AnalyseInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl },
@@ -2756,8 +2756,8 @@ static const ber_sequence_t AnalyseInformationArg_sequence[] = {
 
 static int
 dissect_inap_AnalyseInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AnalyseInformationArg_sequence, hf_index, ett_inap_AnalyseInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AnalyseInformationArg_sequence, hf_index, ett_inap_AnalyseInformationArg);
 
   return offset;
 }
@@ -2776,7 +2776,7 @@ static int dissect_aChBillingChargingCharacteristics_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t ApplyChargingArg_sequence[] = {
+static const ber_old_sequence_t ApplyChargingArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aChBillingChargingCharacteristics_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -2785,8 +2785,8 @@ static const ber_sequence_t ApplyChargingArg_sequence[] = {
 
 static int
 dissect_inap_ApplyChargingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplyChargingArg_sequence, hf_index, ett_inap_ApplyChargingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplyChargingArg_sequence, hf_index, ett_inap_ApplyChargingArg);
 
   return offset;
 }
@@ -2826,7 +2826,7 @@ static int dissect_bcsmEventCorrelationID_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t AssistRequestInstructionsArg_sequence[] = {
+static const ber_old_sequence_t AssistRequestInstructionsArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPAvailable_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPSSPCapabilities_impl },
@@ -2836,8 +2836,8 @@ static const ber_sequence_t AssistRequestInstructionsArg_sequence[] = {
 
 static int
 dissect_inap_AssistRequestInstructionsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AssistRequestInstructionsArg_sequence, hf_index, ett_inap_AssistRequestInstructionsArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AssistRequestInstructionsArg_sequence, hf_index, ett_inap_AssistRequestInstructionsArg);
 
   return offset;
 }
@@ -2880,7 +2880,7 @@ static int dissect_dpCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t GapOnService_sequence[] = {
+static const ber_old_sequence_t GapOnService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dpCriteria_impl },
   { 0, 0, 0, NULL }
@@ -2888,8 +2888,8 @@ static const ber_sequence_t GapOnService_sequence[] = {
 
 static int
 dissect_inap_GapOnService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GapOnService_sequence, hf_index, ett_inap_GapOnService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GapOnService_sequence, hf_index, ett_inap_GapOnService);
 
   return offset;
 }
@@ -2898,7 +2898,7 @@ static int dissect_gapOnService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_calledAddressAndService_sequence[] = {
+static const ber_old_sequence_t T_calledAddressAndService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { 0, 0, 0, NULL }
@@ -2906,8 +2906,8 @@ static const ber_sequence_t T_calledAddressAndService_sequence[] = {
 
 static int
 dissect_inap_T_calledAddressAndService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_calledAddressAndService_sequence, hf_index, ett_inap_T_calledAddressAndService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_calledAddressAndService_sequence, hf_index, ett_inap_T_calledAddressAndService);
 
   return offset;
 }
@@ -2916,7 +2916,7 @@ static int dissect_calledAddressAndService_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_callingAddressAndService_sequence[] = {
+static const ber_old_sequence_t T_callingAddressAndService_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callingAddressValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationNumber_impl },
@@ -2925,8 +2925,8 @@ static const ber_sequence_t T_callingAddressAndService_sequence[] = {
 
 static int
 dissect_inap_T_callingAddressAndService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_callingAddressAndService_sequence, hf_index, ett_inap_T_callingAddressAndService);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_callingAddressAndService_sequence, hf_index, ett_inap_T_callingAddressAndService);
 
   return offset;
 }
@@ -2943,7 +2943,7 @@ static const value_string inap_GapCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GapCriteria_choice[] = {
+static const ber_old_choice_t GapCriteria_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gapOnService_impl },
   {  29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_calledAddressAndService_impl },
@@ -2953,9 +2953,9 @@ static const ber_choice_t GapCriteria_choice[] = {
 
 static int
 dissect_inap_GapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GapCriteria_choice, hf_index, ett_inap_GapCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GapCriteria_choice, hf_index, ett_inap_GapCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -2977,7 +2977,7 @@ static int dissect_gapInterval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t GapIndicators_sequence[] = {
+static const ber_old_sequence_t GapIndicators_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_duration_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapInterval_impl },
   { 0, 0, 0, NULL }
@@ -2985,8 +2985,8 @@ static const ber_sequence_t GapIndicators_sequence[] = {
 
 static int
 dissect_inap_GapIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GapIndicators_sequence, hf_index, ett_inap_GapIndicators);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GapIndicators_sequence, hf_index, ett_inap_GapIndicators);
 
   return offset;
 }
@@ -3015,7 +3015,7 @@ static int dissect_controlType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_both_sequence[] = {
+static const ber_old_sequence_t T_both_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { 0, 0, 0, NULL }
@@ -3023,8 +3023,8 @@ static const ber_sequence_t T_both_sequence[] = {
 
 static int
 dissect_inap_T_both(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_both_sequence, hf_index, ett_inap_T_both);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_both_sequence, hf_index, ett_inap_T_both);
 
   return offset;
 }
@@ -3040,7 +3040,7 @@ static const value_string inap_GapTreatment_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GapTreatment_choice[] = {
+static const ber_old_choice_t GapTreatment_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationToSend_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_both_impl },
@@ -3049,9 +3049,9 @@ static const ber_choice_t GapTreatment_choice[] = {
 
 static int
 dissect_inap_GapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GapTreatment_choice, hf_index, ett_inap_GapTreatment,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GapTreatment_choice, hf_index, ett_inap_GapTreatment,
+                                     NULL);
 
   return offset;
 }
@@ -3060,7 +3060,7 @@ static int dissect_gapTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CallGapArg_sequence[] = {
+static const ber_old_sequence_t CallGapArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gapCriteria_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapIndicators_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlType_impl },
@@ -3071,8 +3071,8 @@ static const ber_sequence_t CallGapArg_sequence[] = {
 
 static int
 dissect_inap_CallGapArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallGapArg_sequence, hf_index, ett_inap_CallGapArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallGapArg_sequence, hf_index, ett_inap_CallGapArg);
 
   return offset;
 }
@@ -3103,14 +3103,14 @@ static int dissect_requestedInformationType_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformationTypeList_sequence_of[1] = {
+static const ber_old_sequence_t RequestedInformationTypeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationTypeList_item },
 };
 
 static int
 dissect_inap_RequestedInformationTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestedInformationTypeList_sequence_of, hf_index, ett_inap_RequestedInformationTypeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestedInformationTypeList_sequence_of, hf_index, ett_inap_RequestedInformationTypeList);
 
   return offset;
 }
@@ -3119,7 +3119,7 @@ static int dissect_requestedInformationTypeList_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t CallInformationReportArg_sequence[] = {
+static const ber_old_sequence_t CallInformationReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationTypeList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -3128,14 +3128,14 @@ static const ber_sequence_t CallInformationReportArg_sequence[] = {
 
 static int
 dissect_inap_CallInformationReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallInformationReportArg_sequence, hf_index, ett_inap_CallInformationReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallInformationReportArg_sequence, hf_index, ett_inap_CallInformationReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CallInformationRequestArg_sequence[] = {
+static const ber_old_sequence_t CallInformationRequestArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationTypeList_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -3145,8 +3145,8 @@ static const ber_sequence_t CallInformationRequestArg_sequence[] = {
 
 static int
 dissect_inap_CallInformationRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallInformationRequestArg_sequence, hf_index, ett_inap_CallInformationRequestArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallInformationRequestArg_sequence, hf_index, ett_inap_CallInformationRequestArg);
 
   return offset;
 }
@@ -3171,7 +3171,7 @@ static const value_string inap_CancelArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CancelArg_choice[] = {
+static const ber_old_choice_t CancelArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID1_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_allRequests_impl },
   { 0, 0, 0, 0, NULL }
@@ -3179,9 +3179,9 @@ static const ber_choice_t CancelArg_choice[] = {
 
 static int
 dissect_inap_CancelArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CancelArg_choice, hf_index, ett_inap_CancelArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CancelArg_choice, hf_index, ett_inap_CancelArg,
+                                     NULL);
 
   return offset;
 }
@@ -3195,7 +3195,7 @@ static const value_string inap_ResourceID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ResourceID_choice[] = {
+static const ber_old_choice_t ResourceID_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lineID_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_facilityGroupID_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_facilityGroupMemberID_impl },
@@ -3205,9 +3205,9 @@ static const ber_choice_t ResourceID_choice[] = {
 
 static int
 dissect_inap_ResourceID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ResourceID_choice, hf_index, ett_inap_ResourceID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ResourceID_choice, hf_index, ett_inap_ResourceID,
+                                     NULL);
 
   return offset;
 }
@@ -3216,7 +3216,7 @@ static int dissect_resourceID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t CancelStatusReportRequestArg_sequence[] = {
+static const ber_old_sequence_t CancelStatusReportRequestArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -3224,14 +3224,14 @@ static const ber_sequence_t CancelStatusReportRequestArg_sequence[] = {
 
 static int
 dissect_inap_CancelStatusReportRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelStatusReportRequestArg_sequence, hf_index, ett_inap_CancelStatusReportRequestArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelStatusReportRequestArg_sequence, hf_index, ett_inap_CancelStatusReportRequestArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t CollectedInformationArg_sequence[] = {
+static const ber_old_sequence_t CollectedInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
@@ -3252,8 +3252,8 @@ static const ber_sequence_t CollectedInformationArg_sequence[] = {
 
 static int
 dissect_inap_CollectedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CollectedInformationArg_sequence, hf_index, ett_inap_CollectedInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CollectedInformationArg_sequence, hf_index, ett_inap_CollectedInformationArg);
 
   return offset;
 }
@@ -3272,7 +3272,7 @@ static int dissect_numberingPlan_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t CollectInformationArg_sequence[] = {
+static const ber_old_sequence_t CollectInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberingPlan_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl },
@@ -3285,8 +3285,8 @@ static const ber_sequence_t CollectInformationArg_sequence[] = {
 
 static int
 dissect_inap_CollectInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CollectInformationArg_sequence, hf_index, ett_inap_CollectInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CollectInformationArg_sequence, hf_index, ett_inap_CollectInformationArg);
 
   return offset;
 }
@@ -3351,7 +3351,7 @@ static int dissect_serviceInteractionIndicators_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t ConnectArg_sequence[] = {
+static const ber_old_sequence_t ConnectArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
@@ -3374,8 +3374,8 @@ static const ber_sequence_t ConnectArg_sequence[] = {
 
 static int
 dissect_inap_ConnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectArg_sequence, hf_index, ett_inap_ConnectArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectArg_sequence, hf_index, ett_inap_ConnectArg);
 
   return offset;
 }
@@ -3393,7 +3393,7 @@ static int dissect_ipRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_both2_sequence[] = {
+static const ber_old_sequence_t T_both2_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
   { 0, 0, 0, NULL }
@@ -3401,8 +3401,8 @@ static const ber_sequence_t T_both2_sequence[] = {
 
 static int
 dissect_inap_T_both2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_both2_sequence, hf_index, ett_inap_T_both2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_both2_sequence, hf_index, ett_inap_T_both2);
 
   return offset;
 }
@@ -3419,7 +3419,7 @@ static const value_string inap_T_resourceAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_resourceAddress_choice[] = {
+static const ber_old_choice_t T_resourceAddress_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legID_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_both2_impl },
@@ -3429,9 +3429,9 @@ static const ber_choice_t T_resourceAddress_choice[] = {
 
 static int
 dissect_inap_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress,
+                                     NULL);
 
   return offset;
 }
@@ -3440,7 +3440,7 @@ static int dissect_resourceAddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ConnectToResourceArg_sequence[] = {
+static const ber_old_sequence_t ConnectToResourceArg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceAddress },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl },
@@ -3449,8 +3449,8 @@ static const ber_sequence_t ConnectToResourceArg_sequence[] = {
 
 static int
 dissect_inap_ConnectToResourceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ConnectToResourceArg_sequence, hf_index, ett_inap_ConnectToResourceArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ConnectToResourceArg_sequence, hf_index, ett_inap_ConnectToResourceArg);
 
   return offset;
 }
@@ -3468,7 +3468,7 @@ static int dissect_assistingSSPIPRoutingAddress_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
+static const ber_old_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assistingSSPIPRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
@@ -3481,8 +3481,8 @@ static const ber_sequence_t EstablishTemporaryConnectionArg_sequence[] = {
 
 static int
 dissect_inap_EstablishTemporaryConnectionArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EstablishTemporaryConnectionArg_sequence, hf_index, ett_inap_EstablishTemporaryConnectionArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EstablishTemporaryConnectionArg_sequence, hf_index, ett_inap_EstablishTemporaryConnectionArg);
 
   return offset;
 }
@@ -3534,7 +3534,7 @@ static int dissect_monitorMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t EventNotificationChargingArg_sequence[] = {
+static const ber_old_sequence_t EventNotificationChargingArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventSpecificInformationCharging_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
@@ -3545,22 +3545,22 @@ static const ber_sequence_t EventNotificationChargingArg_sequence[] = {
 
 static int
 dissect_inap_EventNotificationChargingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventNotificationChargingArg_sequence, hf_index, ett_inap_EventNotificationChargingArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventNotificationChargingArg_sequence, hf_index, ett_inap_EventNotificationChargingArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_collectedInfoSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_collectedInfoSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledPartynumber_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_collectedInfoSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_collectedInfoSpecificInfo_sequence, hf_index, ett_inap_T_collectedInfoSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_collectedInfoSpecificInfo_sequence, hf_index, ett_inap_T_collectedInfoSpecificInfo);
 
   return offset;
 }
@@ -3569,15 +3569,15 @@ static int dissect_collectedInfoSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_analyzedInfoSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_analyzedInfoSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledPartynumber_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_analyzedInfoSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_analyzedInfoSpecificInfo_sequence, hf_index, ett_inap_T_analyzedInfoSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_analyzedInfoSpecificInfo_sequence, hf_index, ett_inap_T_analyzedInfoSpecificInfo);
 
   return offset;
 }
@@ -3586,15 +3586,15 @@ static int dissect_analyzedInfoSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_routeSelectFailureSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_routeSelectFailureSpecificInfo_sequence, hf_index, ett_inap_T_routeSelectFailureSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_routeSelectFailureSpecificInfo_sequence, hf_index, ett_inap_T_routeSelectFailureSpecificInfo);
 
   return offset;
 }
@@ -3603,15 +3603,15 @@ static int dissect_routeSelectFailureSpecificInfo_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_oCalledPartyBusySpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_inap_T_oCalledPartyBusySpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_inap_T_oCalledPartyBusySpecificInfo);
 
   return offset;
 }
@@ -3620,14 +3620,14 @@ static int dissect_oCalledPartyBusySpecificInfo_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t T_oNoAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oNoAnswerSpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_oNoAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oNoAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oNoAnswerSpecificInfo);
 
   return offset;
 }
@@ -3636,14 +3636,14 @@ static int dissect_oNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_oAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oAnswerSpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_oAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oAnswerSpecificInfo);
 
   return offset;
 }
@@ -3652,15 +3652,15 @@ static int dissect_oAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_oMidCallSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oMidCallSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_oMidCallSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oMidCallSpecificInfo_sequence, hf_index, ett_inap_T_oMidCallSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oMidCallSpecificInfo_sequence, hf_index, ett_inap_T_oMidCallSpecificInfo);
 
   return offset;
 }
@@ -3669,7 +3669,7 @@ static int dissect_oMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_oDisconnectSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_oDisconnectSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl },
   { 0, 0, 0, NULL }
@@ -3677,8 +3677,8 @@ static const ber_sequence_t T_oDisconnectSpecificInfo_sequence[] = {
 
 static int
 dissect_inap_T_oDisconnectSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_oDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_oDisconnectSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_oDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_oDisconnectSpecificInfo);
 
   return offset;
 }
@@ -3687,15 +3687,15 @@ static int dissect_oDisconnectSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_tBusySpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tBusySpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_tBusySpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tBusySpecificInfo_sequence, hf_index, ett_inap_T_tBusySpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tBusySpecificInfo_sequence, hf_index, ett_inap_T_tBusySpecificInfo);
 
   return offset;
 }
@@ -3704,14 +3704,14 @@ static int dissect_tBusySpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_tNoAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tNoAnswerSpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_tNoAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tNoAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tNoAnswerSpecificInfo);
 
   return offset;
 }
@@ -3720,14 +3720,14 @@ static int dissect_tNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_tAnswerSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tAnswerSpecificInfo_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_tAnswerSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tAnswerSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tAnswerSpecificInfo);
 
   return offset;
 }
@@ -3736,15 +3736,15 @@ static int dissect_tAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_tMidCallSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tMidCallSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_tMidCallSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tMidCallSpecificInfo_sequence, hf_index, ett_inap_T_tMidCallSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tMidCallSpecificInfo_sequence, hf_index, ett_inap_T_tMidCallSpecificInfo);
 
   return offset;
 }
@@ -3753,7 +3753,7 @@ static int dissect_tMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_tDisconnectSpecificInfo_sequence[] = {
+static const ber_old_sequence_t T_tDisconnectSpecificInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl },
   { 0, 0, 0, NULL }
@@ -3761,8 +3761,8 @@ static const ber_sequence_t T_tDisconnectSpecificInfo_sequence[] = {
 
 static int
 dissect_inap_T_tDisconnectSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_tDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_tDisconnectSpecificInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_tDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_tDisconnectSpecificInfo);
 
   return offset;
 }
@@ -3788,7 +3788,7 @@ static const value_string inap_EventSpecificInformationBCSM_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EventSpecificInformationBCSM_choice[] = {
+static const ber_old_choice_t EventSpecificInformationBCSM_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedInfoSpecificInfo_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_analyzedInfoSpecificInfo_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routeSelectFailureSpecificInfo_impl },
@@ -3807,9 +3807,9 @@ static const ber_choice_t EventSpecificInformationBCSM_choice[] = {
 
 static int
 dissect_inap_EventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EventSpecificInformationBCSM_choice, hf_index, ett_inap_EventSpecificInformationBCSM,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EventSpecificInformationBCSM_choice, hf_index, ett_inap_EventSpecificInformationBCSM,
+                                     NULL);
 
   return offset;
 }
@@ -3818,7 +3818,7 @@ static int dissect_eventSpecificInformationBCSM_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t EventReportBCSMArg_sequence[] = {
+static const ber_old_sequence_t EventReportBCSMArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bcsmEventCorrelationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventSpecificInformationBCSM_impl },
@@ -3830,8 +3830,8 @@ static const ber_sequence_t EventReportBCSMArg_sequence[] = {
 
 static int
 dissect_inap_EventReportBCSMArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventReportBCSMArg_sequence, hf_index, ett_inap_EventReportBCSMArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventReportBCSMArg_sequence, hf_index, ett_inap_EventReportBCSMArg);
 
   return offset;
 }
@@ -3875,7 +3875,7 @@ static const value_string inap_HoldCallInNetworkArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t HoldCallInNetworkArg_choice[] = {
+static const ber_old_choice_t HoldCallInNetworkArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_holdcause_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_empty_impl },
   { 0, 0, 0, 0, NULL }
@@ -3883,9 +3883,9 @@ static const ber_choice_t HoldCallInNetworkArg_choice[] = {
 
 static int
 dissect_inap_HoldCallInNetworkArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 HoldCallInNetworkArg_choice, hf_index, ett_inap_HoldCallInNetworkArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     HoldCallInNetworkArg_choice, hf_index, ett_inap_HoldCallInNetworkArg,
+                                     NULL);
 
   return offset;
 }
@@ -3929,7 +3929,7 @@ static int dissect_forwardCallIndicators_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t InitialDP_sequence[] = {
+static const ber_old_sequence_t InitialDP_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl },
@@ -3960,14 +3960,14 @@ static const ber_sequence_t InitialDP_sequence[] = {
 
 static int
 dissect_inap_InitialDP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialDP_sequence, hf_index, ett_inap_InitialDP);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialDP_sequence, hf_index, ett_inap_InitialDP);
 
   return offset;
 }
 
 
-static const ber_sequence_t InitiateCallAttemptArg_sequence[] = {
+static const ber_old_sequence_t InitiateCallAttemptArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl },
@@ -3980,8 +3980,8 @@ static const ber_sequence_t InitiateCallAttemptArg_sequence[] = {
 
 static int
 dissect_inap_InitiateCallAttemptArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitiateCallAttemptArg_sequence, hf_index, ett_inap_InitiateCallAttemptArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitiateCallAttemptArg_sequence, hf_index, ett_inap_InitiateCallAttemptArg);
 
   return offset;
 }
@@ -4035,7 +4035,7 @@ static int dissect_featureRequestIndicator_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t MidCallArg_sequence[] = {
+static const ber_old_sequence_t MidCallArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl },
@@ -4049,14 +4049,14 @@ static const ber_sequence_t MidCallArg_sequence[] = {
 
 static int
 dissect_inap_MidCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MidCallArg_sequence, hf_index, ett_inap_MidCallArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MidCallArg_sequence, hf_index, ett_inap_MidCallArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t OAnswerArg_sequence[] = {
+static const ber_old_sequence_t OAnswerArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl },
@@ -4073,14 +4073,14 @@ static const ber_sequence_t OAnswerArg_sequence[] = {
 
 static int
 dissect_inap_OAnswerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OAnswerArg_sequence, hf_index, ett_inap_OAnswerArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OAnswerArg_sequence, hf_index, ett_inap_OAnswerArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t OCalledPartyBusyArg_sequence[] = {
+static const ber_old_sequence_t OCalledPartyBusyArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
@@ -4100,14 +4100,14 @@ static const ber_sequence_t OCalledPartyBusyArg_sequence[] = {
 
 static int
 dissect_inap_OCalledPartyBusyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OCalledPartyBusyArg_sequence, hf_index, ett_inap_OCalledPartyBusyArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OCalledPartyBusyArg_sequence, hf_index, ett_inap_OCalledPartyBusyArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ODisconnectArg_sequence[] = {
+static const ber_old_sequence_t ODisconnectArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl },
@@ -4123,14 +4123,14 @@ static const ber_sequence_t ODisconnectArg_sequence[] = {
 
 static int
 dissect_inap_ODisconnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ODisconnectArg_sequence, hf_index, ett_inap_ODisconnectArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ODisconnectArg_sequence, hf_index, ett_inap_ODisconnectArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ONoAnswer_sequence[] = {
+static const ber_old_sequence_t ONoAnswer_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl },
@@ -4149,14 +4149,14 @@ static const ber_sequence_t ONoAnswer_sequence[] = {
 
 static int
 dissect_inap_ONoAnswer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ONoAnswer_sequence, hf_index, ett_inap_ONoAnswer);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ONoAnswer_sequence, hf_index, ett_inap_ONoAnswer);
 
   return offset;
 }
 
 
-static const ber_sequence_t OriginationAttemptAuthorizedArg_sequence[] = {
+static const ber_old_sequence_t OriginationAttemptAuthorizedArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
@@ -4171,8 +4171,8 @@ static const ber_sequence_t OriginationAttemptAuthorizedArg_sequence[] = {
 
 static int
 dissect_inap_OriginationAttemptAuthorizedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OriginationAttemptAuthorizedArg_sequence, hf_index, ett_inap_OriginationAttemptAuthorizedArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OriginationAttemptAuthorizedArg_sequence, hf_index, ett_inap_OriginationAttemptAuthorizedArg);
 
   return offset;
 }
@@ -4205,7 +4205,7 @@ static int dissect_iA5Information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PlayAnnouncementArg_sequence[] = {
+static const ber_old_sequence_t PlayAnnouncementArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestAnnouncementComplete_impl },
@@ -4215,8 +4215,8 @@ static const ber_sequence_t PlayAnnouncementArg_sequence[] = {
 
 static int
 dissect_inap_PlayAnnouncementArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PlayAnnouncementArg_sequence, hf_index, ett_inap_PlayAnnouncementArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PlayAnnouncementArg_sequence, hf_index, ett_inap_PlayAnnouncementArg);
 
   return offset;
 }
@@ -4261,7 +4261,7 @@ static int dissect_errorTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CollectedDigits_sequence[] = {
+static const ber_old_sequence_t CollectedDigits_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimumNbOfDigits_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_maximumNbOfDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endOfReplyDigit_impl },
@@ -4278,8 +4278,8 @@ static const ber_sequence_t CollectedDigits_sequence[] = {
 
 static int
 dissect_inap_CollectedDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CollectedDigits_sequence, hf_index, ett_inap_CollectedDigits);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CollectedDigits_sequence, hf_index, ett_inap_CollectedDigits);
 
   return offset;
 }
@@ -4294,7 +4294,7 @@ static const value_string inap_CollectedInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CollectedInfo_choice[] = {
+static const ber_old_choice_t CollectedInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedDigits_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iA5Information_impl },
   { 0, 0, 0, 0, NULL }
@@ -4302,9 +4302,9 @@ static const ber_choice_t CollectedInfo_choice[] = {
 
 static int
 dissect_inap_CollectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CollectedInfo_choice, hf_index, ett_inap_CollectedInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CollectedInfo_choice, hf_index, ett_inap_CollectedInfo,
+                                     NULL);
 
   return offset;
 }
@@ -4313,7 +4313,7 @@ static int dissect_collectedInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
+static const ber_old_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_collectedInfo_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl },
@@ -4323,8 +4323,8 @@ static const ber_sequence_t PromptAndCollectUserInformationArg_sequence[] = {
 
 static int
 dissect_inap_PromptAndCollectUserInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PromptAndCollectUserInformationArg_sequence, hf_index, ett_inap_PromptAndCollectUserInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PromptAndCollectUserInformationArg_sequence, hf_index, ett_inap_PromptAndCollectUserInformationArg);
 
   return offset;
 }
@@ -4350,7 +4350,7 @@ static const value_string inap_ReceivedInformationArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReceivedInformationArg_choice[] = {
+static const ber_old_choice_t ReceivedInformationArg_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitsResponse_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iA5Response_impl },
   { 0, 0, 0, 0, NULL }
@@ -4358,23 +4358,23 @@ static const ber_choice_t ReceivedInformationArg_choice[] = {
 
 static int
 dissect_inap_ReceivedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReceivedInformationArg_choice, hf_index, ett_inap_ReceivedInformationArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReceivedInformationArg_choice, hf_index, ett_inap_ReceivedInformationArg,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_allCallSegments_sequence[] = {
+static const ber_old_sequence_t T_allCallSegments_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_T_allCallSegments(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_allCallSegments_sequence, hf_index, ett_inap_T_allCallSegments);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_allCallSegments_sequence, hf_index, ett_inap_T_allCallSegments);
 
   return offset;
 }
@@ -4389,7 +4389,7 @@ static const value_string inap_ReleaseCallArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReleaseCallArg_choice[] = {
+static const ber_old_choice_t ReleaseCallArg_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_initialCallSegment },
   {   1, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_allCallSegments_impl },
   { 0, 0, 0, 0, NULL }
@@ -4397,9 +4397,9 @@ static const ber_choice_t ReleaseCallArg_choice[] = {
 
 static int
 dissect_inap_ReleaseCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg,
+                                     NULL);
 
   return offset;
 }
@@ -4433,7 +4433,7 @@ static int dissect_resourceStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RequestCurrentStatusReportResultArg_sequence[] = {
+static const ber_old_sequence_t RequestCurrentStatusReportResultArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4442,14 +4442,14 @@ static const ber_sequence_t RequestCurrentStatusReportResultArg_sequence[] = {
 
 static int
 dissect_inap_RequestCurrentStatusReportResultArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestCurrentStatusReportResultArg_sequence, hf_index, ett_inap_RequestCurrentStatusReportResultArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestCurrentStatusReportResultArg_sequence, hf_index, ett_inap_RequestCurrentStatusReportResultArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RequestEveryStatusChangeReportArg_sequence[] = {
+static const ber_old_sequence_t RequestEveryStatusChangeReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitorDuration_impl },
@@ -4459,14 +4459,14 @@ static const ber_sequence_t RequestEveryStatusChangeReportArg_sequence[] = {
 
 static int
 dissect_inap_RequestEveryStatusChangeReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestEveryStatusChangeReportArg_sequence, hf_index, ett_inap_RequestEveryStatusChangeReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestEveryStatusChangeReportArg_sequence, hf_index, ett_inap_RequestEveryStatusChangeReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RequestFirstStatusMatchReportArg_sequence[] = {
+static const ber_old_sequence_t RequestFirstStatusMatchReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
@@ -4478,14 +4478,14 @@ static const ber_sequence_t RequestFirstStatusMatchReportArg_sequence[] = {
 
 static int
 dissect_inap_RequestFirstStatusMatchReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestFirstStatusMatchReportArg_sequence, hf_index, ett_inap_RequestFirstStatusMatchReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestFirstStatusMatchReportArg_sequence, hf_index, ett_inap_RequestFirstStatusMatchReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RequestNotificationChargingEvent_item_sequence[] = {
+static const ber_old_sequence_t RequestNotificationChargingEvent_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging2_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
@@ -4494,8 +4494,8 @@ static const ber_sequence_t RequestNotificationChargingEvent_item_sequence[] = {
 
 static int
 dissect_inap_RequestNotificationChargingEvent_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestNotificationChargingEvent_item_sequence, hf_index, ett_inap_RequestNotificationChargingEvent_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestNotificationChargingEvent_item_sequence, hf_index, ett_inap_RequestNotificationChargingEvent_item);
 
   return offset;
 }
@@ -4504,14 +4504,14 @@ static int dissect_RequestNotificationChargingEvent_item(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t RequestNotificationChargingEvent_sequence_of[1] = {
+static const ber_old_sequence_t RequestNotificationChargingEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestNotificationChargingEvent_item },
 };
 
 static int
 dissect_inap_RequestNotificationChargingEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestNotificationChargingEvent_sequence_of, hf_index, ett_inap_RequestNotificationChargingEvent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestNotificationChargingEvent_sequence_of, hf_index, ett_inap_RequestNotificationChargingEvent);
 
   return offset;
 }
@@ -4549,7 +4549,7 @@ static const value_string inap_DpSpecificCriteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DpSpecificCriteria_choice[] = {
+static const ber_old_choice_t DpSpecificCriteria_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberOfDigits_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_applicationTimer_impl },
   { 0, 0, 0, 0, NULL }
@@ -4557,9 +4557,9 @@ static const ber_choice_t DpSpecificCriteria_choice[] = {
 
 static int
 dissect_inap_DpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DpSpecificCriteria_choice, hf_index, ett_inap_DpSpecificCriteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DpSpecificCriteria_choice, hf_index, ett_inap_DpSpecificCriteria,
+                                     NULL);
 
   return offset;
 }
@@ -4568,7 +4568,7 @@ static int dissect_dpSpecificCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t BCSMEvent_sequence[] = {
+static const ber_old_sequence_t BCSMEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
@@ -4578,8 +4578,8 @@ static const ber_sequence_t BCSMEvent_sequence[] = {
 
 static int
 dissect_inap_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BCSMEvent_sequence, hf_index, ett_inap_BCSMEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BCSMEvent_sequence, hf_index, ett_inap_BCSMEvent);
 
   return offset;
 }
@@ -4588,14 +4588,14 @@ static int dissect_bcsmEvents_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bcsmEvents_item },
 };
 
 static int
 dissect_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent);
 
   return offset;
 }
@@ -4604,7 +4604,7 @@ static int dissect_bcsmEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RequestReportBCSMEventArg_sequence[] = {
+static const ber_old_sequence_t RequestReportBCSMEventArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bcsmEvents_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bcsmEventCorrelationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4613,8 +4613,8 @@ static const ber_sequence_t RequestReportBCSMEventArg_sequence[] = {
 
 static int
 dissect_inap_RequestReportBCSMEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestReportBCSMEventArg_sequence, hf_index, ett_inap_RequestReportBCSMEventArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestReportBCSMEventArg_sequence, hf_index, ett_inap_RequestReportBCSMEventArg);
 
   return offset;
 }
@@ -4650,7 +4650,7 @@ static int dissect_timervalue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ResetTimerArg_sequence[] = {
+static const ber_old_sequence_t ResetTimerArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4659,14 +4659,14 @@ static const ber_sequence_t ResetTimerArg_sequence[] = {
 
 static int
 dissect_inap_ResetTimerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResetTimerArg_sequence, hf_index, ett_inap_ResetTimerArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResetTimerArg_sequence, hf_index, ett_inap_ResetTimerArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t RouteSelectFailureArg_sequence[] = {
+static const ber_old_sequence_t RouteSelectFailureArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl },
@@ -4687,14 +4687,14 @@ static const ber_sequence_t RouteSelectFailureArg_sequence[] = {
 
 static int
 dissect_inap_RouteSelectFailureArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RouteSelectFailureArg_sequence, hf_index, ett_inap_RouteSelectFailureArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RouteSelectFailureArg_sequence, hf_index, ett_inap_RouteSelectFailureArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SelectFacilityArg_sequence[] = {
+static const ber_old_sequence_t SelectFacilityArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberRoutingAddress_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl },
@@ -4707,14 +4707,14 @@ static const ber_sequence_t SelectFacilityArg_sequence[] = {
 
 static int
 dissect_inap_SelectFacilityArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SelectFacilityArg_sequence, hf_index, ett_inap_SelectFacilityArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SelectFacilityArg_sequence, hf_index, ett_inap_SelectFacilityArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t SelectRouteArg_sequence[] = {
+static const ber_old_sequence_t SelectRouteArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
@@ -4730,8 +4730,8 @@ static const ber_sequence_t SelectRouteArg_sequence[] = {
 
 static int
 dissect_inap_SelectRouteArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SelectRouteArg_sequence, hf_index, ett_inap_SelectRouteArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SelectRouteArg_sequence, hf_index, ett_inap_SelectRouteArg);
 
   return offset;
 }
@@ -4750,7 +4750,7 @@ static int dissect_sCIBillingChargingCharacteristics_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t SendChargingInformationArg_sequence[] = {
+static const ber_old_sequence_t SendChargingInformationArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sCIBillingChargingCharacteristics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4759,8 +4759,8 @@ static const ber_sequence_t SendChargingInformationArg_sequence[] = {
 
 static int
 dissect_inap_SendChargingInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SendChargingInformationArg_sequence, hf_index, ett_inap_SendChargingInformationArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SendChargingInformationArg_sequence, hf_index, ett_inap_SendChargingInformationArg);
 
   return offset;
 }
@@ -4779,7 +4779,7 @@ static int dissect_counterID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CounterAndValue_sequence[] = {
+static const ber_old_sequence_t CounterAndValue_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_counterID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_counterValue_impl },
   { 0, 0, 0, NULL }
@@ -4787,8 +4787,8 @@ static const ber_sequence_t CounterAndValue_sequence[] = {
 
 static int
 dissect_inap_CounterAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CounterAndValue_sequence, hf_index, ett_inap_CounterAndValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CounterAndValue_sequence, hf_index, ett_inap_CounterAndValue);
 
   return offset;
 }
@@ -4797,14 +4797,14 @@ static int dissect_CountersValue_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t CountersValue_sequence_of[1] = {
+static const ber_old_sequence_t CountersValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CountersValue_item },
 };
 
 static int
 dissect_inap_CountersValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CountersValue_sequence_of, hf_index, ett_inap_CountersValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CountersValue_sequence_of, hf_index, ett_inap_CountersValue);
 
   return offset;
 }
@@ -4832,7 +4832,7 @@ static int dissect_responseCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ServiceFilteringResponseArg_sequence[] = {
+static const ber_old_sequence_t ServiceFilteringResponseArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_countersValue_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringCriteria_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4842,8 +4842,8 @@ static const ber_sequence_t ServiceFilteringResponseArg_sequence[] = {
 
 static int
 dissect_inap_ServiceFilteringResponseArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceFilteringResponseArg_sequence, hf_index, ett_inap_ServiceFilteringResponseArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceFilteringResponseArg_sequence, hf_index, ett_inap_ServiceFilteringResponseArg);
 
   return offset;
 }
@@ -4878,7 +4878,7 @@ static int dissect_reportCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t StatusReportArg_sequence[] = {
+static const ber_old_sequence_t StatusReportArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl },
@@ -4889,14 +4889,14 @@ static const ber_sequence_t StatusReportArg_sequence[] = {
 
 static int
 dissect_inap_StatusReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StatusReportArg_sequence, hf_index, ett_inap_StatusReportArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StatusReportArg_sequence, hf_index, ett_inap_StatusReportArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t TAnswerArg_sequence[] = {
+static const ber_old_sequence_t TAnswerArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl },
@@ -4908,14 +4908,14 @@ static const ber_sequence_t TAnswerArg_sequence[] = {
 
 static int
 dissect_inap_TAnswerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TAnswerArg_sequence, hf_index, ett_inap_TAnswerArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TAnswerArg_sequence, hf_index, ett_inap_TAnswerArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t TBusyArg_sequence[] = {
+static const ber_old_sequence_t TBusyArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
@@ -4931,14 +4931,14 @@ static const ber_sequence_t TBusyArg_sequence[] = {
 
 static int
 dissect_inap_TBusyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TBusyArg_sequence, hf_index, ett_inap_TBusyArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TBusyArg_sequence, hf_index, ett_inap_TBusyArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t TDisconnectArg_sequence[] = {
+static const ber_old_sequence_t TDisconnectArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl },
@@ -4952,14 +4952,14 @@ static const ber_sequence_t TDisconnectArg_sequence[] = {
 
 static int
 dissect_inap_TDisconnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TDisconnectArg_sequence, hf_index, ett_inap_TDisconnectArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TDisconnectArg_sequence, hf_index, ett_inap_TDisconnectArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t TermAttemptAuthorizedArg_sequence[] = {
+static const ber_old_sequence_t TermAttemptAuthorizedArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl },
@@ -4975,14 +4975,14 @@ static const ber_sequence_t TermAttemptAuthorizedArg_sequence[] = {
 
 static int
 dissect_inap_TermAttemptAuthorizedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TermAttemptAuthorizedArg_sequence, hf_index, ett_inap_TermAttemptAuthorizedArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TermAttemptAuthorizedArg_sequence, hf_index, ett_inap_TermAttemptAuthorizedArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t TNoAnswerArg_sequence[] = {
+static const ber_old_sequence_t TNoAnswerArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl },
@@ -4998,14 +4998,14 @@ static const ber_sequence_t TNoAnswerArg_sequence[] = {
 
 static int
 dissect_inap_TNoAnswerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TNoAnswerArg_sequence, hf_index, ett_inap_TNoAnswerArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TNoAnswerArg_sequence, hf_index, ett_inap_TNoAnswerArg);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChargingEvent_sequence[] = {
+static const ber_old_sequence_t ChargingEvent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl },
@@ -5014,8 +5014,8 @@ static const ber_sequence_t ChargingEvent_sequence[] = {
 
 static int
 dissect_inap_ChargingEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChargingEvent_sequence, hf_index, ett_inap_ChargingEvent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChargingEvent_sequence, hf_index, ett_inap_ChargingEvent);
 
   return offset;
 }
@@ -5043,7 +5043,7 @@ static const value_string inap_RequestedInformationValue_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RequestedInformationValue_choice[] = {
+static const ber_old_choice_t RequestedInformationValue_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callAttemptElapsedTimeValue_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callStopTimeValue_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callConnectedElapsedTimeValue_impl },
@@ -5054,9 +5054,9 @@ static const ber_choice_t RequestedInformationValue_choice[] = {
 
 static int
 dissect_inap_RequestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RequestedInformationValue_choice, hf_index, ett_inap_RequestedInformationValue,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RequestedInformationValue_choice, hf_index, ett_inap_RequestedInformationValue,
+                                     NULL);
 
   return offset;
 }
@@ -5065,7 +5065,7 @@ static int dissect_requestedInformationValue_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformation_sequence[] = {
+static const ber_old_sequence_t RequestedInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationType_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_requestedInformationValue_impl },
   { 0, 0, 0, NULL }
@@ -5073,8 +5073,8 @@ static const ber_sequence_t RequestedInformation_sequence[] = {
 
 static int
 dissect_inap_RequestedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestedInformation_sequence, hf_index, ett_inap_RequestedInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestedInformation_sequence, hf_index, ett_inap_RequestedInformation);
 
   return offset;
 }
@@ -5083,14 +5083,14 @@ static int dissect_RequestedInformationList_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RequestedInformationList_sequence_of[1] = {
+static const ber_old_sequence_t RequestedInformationList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationList_item },
 };
 
 static int
 dissect_inap_RequestedInformationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestedInformationList_sequence_of, hf_index, ett_inap_RequestedInformationList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestedInformationList_sequence_of, hf_index, ett_inap_RequestedInformationList);
 
   return offset;
 }
@@ -5148,7 +5148,7 @@ static int dissect_operation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CancelFailed_sequence[] = {
+static const ber_old_sequence_t CancelFailed_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_problem1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_operation_impl },
   { 0, 0, 0, NULL }
@@ -5156,8 +5156,8 @@ static const ber_sequence_t CancelFailed_sequence[] = {
 
 static int
 dissect_inap_CancelFailed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CancelFailed_sequence, hf_index, ett_inap_CancelFailed);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CancelFailed_sequence, hf_index, ett_inap_CancelFailed);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 20abeb2025..5348daf9c7 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -1394,7 +1394,7 @@ static int dissect_krb5_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_c
 static int dissect_krb5_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_);
 static int dissect_krb5_ERROR(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_);
 
-static const ber_choice_t kerberos_applications_choice[] = {
+static const ber_old_choice_t kerberos_applications_choice[] = {
 	{ KRB5_MSG_TICKET, 	BER_CLASS_APP,	KRB5_MSG_TICKET,	0, dissect_krb5_Application_1 },
 	{ KRB5_MSG_AUTHENTICATOR, 	BER_CLASS_APP,	KRB5_MSG_AUTHENTICATOR,	0, dissect_krb5_Authenticator },
 	{ KRB5_MSG_ENC_TICKET_PART, BER_CLASS_APP,	KRB5_MSG_ENC_TICKET_PART, 0, dissect_krb5_EncTicketPart },
@@ -1420,7 +1420,7 @@ static const ber_choice_t kerberos_applications_choice[] = {
 static int
 dissect_krb5_application_choice(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+	offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
 	return offset;
 }
 
@@ -1619,13 +1619,13 @@ dissect_krb5_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 	}
 	return offset;
 }
-static ber_sequence_t etype_sequence_of[1] = {
+static ber_old_sequence_t etype_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_krb5_etype },
 };
 static int
 dissect_krb5_etype_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, etype_sequence_of, hf_krb_etypes, ett_krb_etypes);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, etype_sequence_of, hf_krb_etypes, ett_krb_etypes);
 
 	return offset;
 }
@@ -1737,7 +1737,7 @@ static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn
 	offset+=len;
 	return offset;
 }
-static ber_sequence_t HostAddress_sequence[] = {
+static ber_old_sequence_t HostAddress_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_addr_type },
 	{ BER_CLASS_CON, 1, 0, dissect_krb5_address },
 	{ 0, 0, 0, NULL }
@@ -1746,7 +1746,7 @@ static int
 dissect_krb5_HostAddress(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_HostAddress, ett_krb_HostAddress);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_HostAddress, ett_krb_HostAddress);
 
 	return offset;
 }
@@ -1754,7 +1754,7 @@ static int
 dissect_krb5_s_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_s_address, ett_krb_s_address);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_s_address, ett_krb_s_address);
 
 	return offset;
 }
@@ -1763,7 +1763,7 @@ static int
 dissect_krb5_r_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_r_address, ett_krb_r_address);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_r_address, ett_krb_r_address);
 
 	return offset;
 }
@@ -1775,26 +1775,26 @@ dissect_krb5_r_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *
  *  }
  *
  */
-static ber_sequence_t HostAddresses_sequence_of[1] = {
+static ber_old_sequence_t HostAddresses_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_HostAddress },
 };
 static int
 dissect_krb5_HostAddresses(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, HostAddresses_sequence_of, hf_krb_HostAddresses, ett_krb_HostAddresses);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, HostAddresses_sequence_of, hf_krb_HostAddresses, ett_krb_HostAddresses);
 
 	return offset;
 }
 
 
 /* sequence of tickets */
-static ber_sequence_t sequence_of_tickets[1] = {
+static ber_old_sequence_t sequence_of_tickets[1] = {
   { BER_CLASS_APP, 1, 0, dissect_krb5_Application_1},
 };
 static int
 dissect_krb5_sq_tickets(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, sequence_of_tickets, hf_krb_sq_tickets, ett_krb_sq_tickets);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, sequence_of_tickets, hf_krb_sq_tickets, ett_krb_sq_tickets);
 
 	return offset;
 }
@@ -1863,18 +1863,18 @@ dissect_krb5_name_string(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
 
 	return offset;
 }
-static ber_sequence_t name_stringe_sequence_of[1] = {
+static ber_old_sequence_t name_stringe_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_NOOWNTAG, dissect_krb5_name_string },
 };
 static int
 dissect_krb5_name_strings(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 	name_string_separator=' ';
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, name_stringe_sequence_of, -1, -1);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, name_stringe_sequence_of, -1, -1);
 
 	return offset;
 }
-static ber_sequence_t PrincipalName_sequence[] = {
+static ber_old_sequence_t PrincipalName_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_name_type },
 	{ BER_CLASS_CON, 1, 0, dissect_krb5_name_strings },
 	{ 0, 0, 0, NULL }
@@ -1883,7 +1883,7 @@ static int
 dissect_krb5_sname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_sname, ett_krb_sname);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_sname, ett_krb_sname);
 
 	return offset;
 }
@@ -1891,7 +1891,7 @@ static int
 dissect_krb5_pname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_pname, ett_krb_pname);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_pname, ett_krb_pname);
 
 	return offset;
 }
@@ -1899,7 +1899,7 @@ int
 dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_cname, ett_krb_cname);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_cname, ett_krb_cname);
 
 	return offset;
 }
@@ -1943,7 +1943,7 @@ dissect_krb5_PA_PAC_REQUEST_flag(proto_tree *tree, tvbuff_t *tvb, int offset, as
 }
 
 
-static ber_sequence_t PA_PAC_REQUEST_sequence[] = {
+static ber_old_sequence_t PA_PAC_REQUEST_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_PA_PAC_REQUEST_flag },
 	{ 0, 0, 0, NULL }
 };
@@ -1951,7 +1951,7 @@ static int
 dissect_krb5_PA_PAC_REQUEST(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PA_PAC_REQUEST_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_PAC_REQUEST_sequence, -1, -1);
 
 	return offset;
 }
@@ -2002,7 +2002,7 @@ dissect_krb5_pausec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 	offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pausec, NULL);
 	return offset;
 }
-static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = {
+static const ber_old_sequence_t PA_ENC_TS_ENC_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_patimestamp },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_pausec },
 	{ 0, 0, 0, NULL }
@@ -2036,7 +2036,7 @@ dissect_krb5_decrypt_PA_ENC_TIMESTAMP (proto_tree *tree, tvbuff_t *tvb, int offs
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-		offset=dissect_ber_sequence(FALSE, actx, tree, next_tvb, 0, PA_ENC_TS_ENC_sequence, -1, -1);
+		offset=dissect_ber_old_sequence(FALSE, actx, tree, next_tvb, 0, PA_ENC_TS_ENC_sequence, -1, -1);
 
 	}
 	return offset;
@@ -2048,13 +2048,13 @@ static int
 dissect_krb5_encrypted_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t PA_ENC_TIMESTAMP_sequence[] = {
+static ber_old_sequence_t PA_ENC_TIMESTAMP_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_PA_ENC_TIMESTAMP_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -2066,7 +2066,7 @@ static ber_sequence_t PA_ENC_TIMESTAMP_sequence[] = {
 static int
 dissect_krb5_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PA_ENC_TIMESTAMP_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENC_TIMESTAMP_sequence, -1, -1);
 
 	return offset;
 }
@@ -2094,7 +2094,7 @@ dissect_krb5_etype_info2_s2kparams(proto_tree *tree, tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static ber_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = {
+static ber_old_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -2104,23 +2104,23 @@ static ber_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = {
 static int
 dissect_krb5_PA_ENCTYPE_INFO_ENTRY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_ENTRY_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_ENTRY_sequence, -1, -1);
 
 	return offset;
 }
 
-static ber_sequence_t PA_ENCTYPE_INFO_sequence_of[1] = {
+static ber_old_sequence_t PA_ENCTYPE_INFO_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO_ENTRY },
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_sequence_of, -1, -1);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_sequence_of, -1, -1);
 
 	return offset;
 }
 
-static ber_sequence_t PA_ENCTYPE_INFO2_ENTRY_sequence[] = {
+static ber_old_sequence_t PA_ENCTYPE_INFO2_ENTRY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -2132,18 +2132,18 @@ static ber_sequence_t PA_ENCTYPE_INFO2_ENTRY_sequence[] = {
 static int
 dissect_krb5_PA_ENCTYPE_INFO2_ENTRY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_ENTRY_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_ENTRY_sequence, -1, -1);
 
 	return offset;
 }
 
-static ber_sequence_t PA_ENCTYPE_INFO2_sequence_of[1] = {
+static ber_old_sequence_t PA_ENCTYPE_INFO2_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO2_ENTRY },
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO2(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_sequence_of, -1, -1);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_sequence_of, -1, -1);
 
 	return offset;
 }
@@ -2217,40 +2217,40 @@ dissect_krb5_PA_DATA_value(proto_tree *parent_tree, tvbuff_t *tvb, int offset, a
 
 	switch(krb_PA_DATA_type){
 	case KRB5_PA_TGS_REQ:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
  		break;
 	case KRB5_PA_PK_AS_REQ:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
  		break;
 	case KRB5_PA_PK_AS_REP:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
  		break;
 	case KRB5_PA_PAC_REQUEST:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
  		break;
 	case KRB5_PA_PROV_SRV_LOCATION:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
  		break;
 	case KRB5_PA_ENC_TIMESTAMP:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
  		break;
 	case KRB5_PA_ENCTYPE_INFO:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
  		break;
 	case KRB5_PA_ENCTYPE_INFO2:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
  		break;
 	case KRB5_PA_PW_SALT:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
  		break;
 	default:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
 	}
 	return offset;
 /*qqq*/
 }
 
-static ber_sequence_t PA_DATA_sequence[] = {
+static ber_old_sequence_t PA_DATA_sequence[] = {
 	{ BER_CLASS_CON, 1, 0, dissect_krb5_PA_DATA_type },
 	{ BER_CLASS_CON, 2, 0, dissect_krb5_PA_DATA_value },
 	{ 0, 0, 0, NULL }
@@ -2258,7 +2258,7 @@ static ber_sequence_t PA_DATA_sequence[] = {
 static int
 dissect_krb5_PA_DATA(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PA_DATA_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_DATA_sequence, -1, -1);
 
 	return offset;
 }
@@ -2270,13 +2270,13 @@ dissect_krb5_PA_DATA(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
  * padata[3]             SEQUENCE OF PA-DATA OPTIONAL,
  *
  */
-static ber_sequence_t PA_DATA_sequence_of[1] = {
+static ber_old_sequence_t PA_DATA_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_DATA },
 };
 static int
 dissect_krb5_padata(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, PA_DATA_sequence_of, hf_krb_padata, ett_krb_padata);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_DATA_sequence_of, hf_krb_padata, ett_krb_padata);
 
 	return offset;
 }
@@ -2385,7 +2385,7 @@ store_keyvalue(proto_tree *tree _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 static int
 dissect_krb5_keyvalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
 	return offset;
 }
 
@@ -2395,7 +2395,7 @@ dissect_krb5_keyvalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
  *     keytype  [0] int32
  *     keyvalue [1] octet string
  */
-static ber_sequence_t EncryptionKey_sequence[] = {
+static ber_old_sequence_t EncryptionKey_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_keytype },
 	{ BER_CLASS_CON, 1, 0,
@@ -2405,7 +2405,7 @@ static ber_sequence_t EncryptionKey_sequence[] = {
 static int
 dissect_krb5_key(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_key, ett_krb_key);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_key, ett_krb_key);
 
 #ifdef HAVE_KERBEROS
 	add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "key");
@@ -2415,7 +2415,7 @@ dissect_krb5_key(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _
 static int
 dissect_krb5_subkey(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_subkey, ett_krb_subkey);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_subkey, ett_krb_subkey);
 #ifdef HAVE_KERBEROS
 	add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "subkey");
 #endif
@@ -2712,14 +2712,14 @@ dissect_krb5_IF_RELEVANT_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
 {
 	switch(IF_RELEVANT_type){
 	case KRB5_AD_WIN2K_PAC:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
 		break;
 	default:
 		offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_value, NULL);
 	}
 	return offset;
 }
-static ber_sequence_t IF_RELEVANT_item_sequence[] = {
+static ber_old_sequence_t IF_RELEVANT_item_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_IF_RELEVANT_type },
 	{ BER_CLASS_CON, 1, 0,
@@ -2729,19 +2729,19 @@ static ber_sequence_t IF_RELEVANT_item_sequence[] = {
 static int
 dissect_krb5_IF_RELEVANT_item(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, IF_RELEVANT_item_sequence, hf_krb_IF_RELEVANT, ett_krb_IF_RELEVANT);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, IF_RELEVANT_item_sequence, hf_krb_IF_RELEVANT, ett_krb_IF_RELEVANT);
 
 	return offset;
 }
 
-static ber_sequence_t IF_RELEVANT_sequence_of[1] = {
+static ber_old_sequence_t IF_RELEVANT_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_IF_RELEVANT_item },
 };
 
 static int
 dissect_krb5_IF_RELEVANT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, IF_RELEVANT_sequence_of, -1, -1);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, IF_RELEVANT_sequence_of, -1, -1);
 
 	return offset;
 }
@@ -2763,7 +2763,7 @@ dissect_krb5_advalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
 {
 	switch(adtype){
 	case KRB5_AD_IF_RELEVANT:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
 		break;
 	default:
 		offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_advalue, NULL);
@@ -2775,7 +2775,7 @@ dissect_krb5_advalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
  *     ad-type  [0] int32
  *     ad-data  [1] octet string
  */
-static ber_sequence_t AuthorizationData_item_sequence[] = {
+static ber_old_sequence_t AuthorizationData_item_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_adtype },
 	{ BER_CLASS_CON, 1, 0,
@@ -2785,18 +2785,18 @@ static ber_sequence_t AuthorizationData_item_sequence[] = {
 static int
 dissect_krb5_AuthorizationData_item(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, AuthorizationData_item_sequence, hf_krb_AuthorizationData, ett_krb_AuthorizationData);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AuthorizationData_item_sequence, hf_krb_AuthorizationData, ett_krb_AuthorizationData);
 
 	return offset;
 }
 
-static ber_sequence_t AuthorizationData_sequence_of[1] = {
+static ber_old_sequence_t AuthorizationData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_AuthorizationData_item },
 };
 static int
 dissect_krb5_AuthorizationData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, AuthorizationData_sequence_of, -1, -1);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, AuthorizationData_sequence_of, -1, -1);
 
 	return offset;
 }
@@ -2828,7 +2828,7 @@ dissect_krb5_transited_contents(proto_tree *tree, tvbuff_t *tvb, int offset, asn
  *     tr-type  [0] int32
  *     contents [1] octet string
  */
-static ber_sequence_t TransitedEncoding_sequence[] = {
+static ber_old_sequence_t TransitedEncoding_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_transited_type },
 	{ BER_CLASS_CON, 1, 0,
@@ -2838,7 +2838,7 @@ static ber_sequence_t TransitedEncoding_sequence[] = {
 static int
 dissect_krb5_transited(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, TransitedEncoding_sequence, hf_krb_TransitedEncoding, ett_krb_TransitedEncoding);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, TransitedEncoding_sequence, hf_krb_TransitedEncoding, ett_krb_TransitedEncoding);
 
 	return offset;
 }
@@ -2884,7 +2884,7 @@ dissect_krb5_renew_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
  *      authorization-data      [10] AuthorizationData OPTIONAL
  * }
  */
-static ber_sequence_t EncTicketPart_sequence[] = {
+static ber_old_sequence_t EncTicketPart_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_TicketFlags },
 	{ BER_CLASS_CON, 1, 0,
@@ -2912,7 +2912,7 @@ static ber_sequence_t EncTicketPart_sequence[] = {
 static int
 dissect_krb5_EncTicketPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncTicketPart_sequence, hf_krb_EncTicketPart, ett_krb_EncTicketPart);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncTicketPart_sequence, hf_krb_EncTicketPart, ett_krb_EncTicketPart);
 
 	return offset;
 }
@@ -2930,7 +2930,7 @@ dissect_krb5_EncTicketPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx
  *     seq-number               [3] uint32 OPTIONAL
  * }
  */
-static ber_sequence_t EncAPRepPart_sequence[] = {
+static ber_old_sequence_t EncAPRepPart_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_ctime },
 	{ BER_CLASS_CON, 1, 0,
@@ -2944,7 +2944,7 @@ static ber_sequence_t EncAPRepPart_sequence[] = {
 static int
 dissect_krb5_EncAPRepPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncAPRepPart_sequence, hf_krb_EncAPRepPart, ett_krb_EncAPRepPart);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncAPRepPart_sequence, hf_krb_EncAPRepPart, ett_krb_EncAPRepPart);
 
 	return offset;
 }
@@ -2978,7 +2978,7 @@ dissect_krb5_lr_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
 	return offset;
 }
 
-static ber_sequence_t LastReq_sequence[] = {
+static ber_old_sequence_t LastReq_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_lr_type },
 	{ BER_CLASS_CON, 1, 0,
@@ -2988,17 +2988,17 @@ static ber_sequence_t LastReq_sequence[] = {
 static int
 dissect_krb5_LastReq(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, LastReq_sequence, hf_krb_LastReq, ett_krb_LastReq);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, LastReq_sequence, hf_krb_LastReq, ett_krb_LastReq);
 
 	return offset;
 }
-static ber_sequence_t LastReq_sequence_of[1] = {
+static ber_old_sequence_t LastReq_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_LastReq },
 };
 static int
 dissect_krb5_LastReq_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, LastReq_sequence_of, hf_krb_LastReqs, ett_krb_LastReqs);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, LastReq_sequence_of, hf_krb_LastReqs, ett_krb_LastReqs);
 
 	return offset;
 }
@@ -3010,7 +3010,7 @@ dissect_krb5_key_expiration(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
 	return offset;
 }
 
-static ber_sequence_t EncKDCRepPart_sequence[] = {
+static ber_old_sequence_t EncKDCRepPart_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_key },
 	{ BER_CLASS_CON, 1, 0,
@@ -3040,7 +3040,7 @@ static ber_sequence_t EncKDCRepPart_sequence[] = {
 static int
 dissect_krb5_EncKDCRepPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncKDCRepPart_sequence, hf_krb_EncKDCRepPart, ett_krb_EncKDCRepPart);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKDCRepPart_sequence, hf_krb_EncKDCRepPart, ett_krb_EncKDCRepPart);
 
 	return offset;
 }
@@ -3144,7 +3144,7 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t *
 	}
 
 	/* this should now be a KRB_CRED message */
-	offset=dissect_ber_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+	offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
 
 
 	return offset;
@@ -3180,7 +3180,7 @@ dissect_krb5_checksum_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
  * Checksum ::=        SEQUENCE {
  * }
  */
-static ber_sequence_t Checksum_sequence[] = {
+static ber_old_sequence_t Checksum_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_checksum_type },
 	{ BER_CLASS_CON, 1, 0,
@@ -3190,7 +3190,7 @@ static ber_sequence_t Checksum_sequence[] = {
 int
 dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_Checksum, ett_krb_Checksum);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_Checksum, ett_krb_Checksum);
 
 	return offset;
 }
@@ -3208,7 +3208,7 @@ dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
  *     authorization-data       [8] AuthorizationData OPTIONAL
  * }
  */
-static ber_sequence_t Authenticator_sequence[] = {
+static ber_old_sequence_t Authenticator_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_authenticator_vno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3232,7 +3232,7 @@ static ber_sequence_t Authenticator_sequence[] = {
 static int
 dissect_krb5_Authenticator(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, Authenticator_sequence, hf_krb_Authenticator, ett_krb_Authenticator);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Authenticator_sequence, hf_krb_Authenticator, ett_krb_Authenticator);
 
 	return offset;
 }
@@ -3250,7 +3250,7 @@ dissect_krb5_PRIV_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, as
 	return offset;
 }
 
-static ber_sequence_t EncKrbPrivPart_sequence[] = {
+static ber_old_sequence_t EncKrbPrivPart_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_PRIV_BODY_user_data },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3268,7 +3268,7 @@ static ber_sequence_t EncKrbPrivPart_sequence[] = {
 static int
 dissect_krb5_EncKrbPrivPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncKrbPrivPart_sequence, hf_krb_EncKrbPrivPart, ett_krb_EncKrbPrivPart);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbPrivPart_sequence, hf_krb_EncKrbPrivPart, ett_krb_EncKrbPrivPart);
 
 	return offset;
 }
@@ -3310,7 +3310,7 @@ dissect_krb5_decrypt_PRIV (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx
 		/* Add the decrypted data to the data source list. */
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
 	}
 	return offset;
@@ -3329,13 +3329,13 @@ static int
 dissect_krb5_encrypted_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t ENC_PRIV_sequence[] = {
+static ber_old_sequence_t ENC_PRIV_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_PRIV_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3347,10 +3347,10 @@ static ber_sequence_t ENC_PRIV_sequence[] = {
 static int
 dissect_krb5_ENC_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc);
 	return offset;
 }
-static ber_sequence_t PRIV_BODY_sequence[] = {
+static ber_old_sequence_t PRIV_BODY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3363,7 +3363,7 @@ static int
 dissect_krb5_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, PRIV_BODY_sequence, hf_krb_PRIV_BODY, ett_krb_PRIV);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PRIV_BODY_sequence, hf_krb_PRIV_BODY, ett_krb_PRIV);
 
 	return offset;
 }
@@ -3385,7 +3385,7 @@ dissect_krb5_EncKrbCredPart_etype(proto_tree *tree, tvbuff_t *tvb, int offset, a
 
 
 
-static ber_sequence_t KrbCredInfo_sequence[] = {
+static ber_old_sequence_t KrbCredInfo_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_key },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_prealm },
 	{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_pname },
@@ -3403,22 +3403,22 @@ static int
 dissect_krb5_KrbCredInfo(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence, hf_krb_KrbCredInfo, ett_krb_KrbCredInfo);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence, hf_krb_KrbCredInfo, ett_krb_KrbCredInfo);
 
 	return offset;
 }
 
-static ber_sequence_t KrbCredInfo_sequence_of[1] = {
+static ber_old_sequence_t KrbCredInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_KrbCredInfo },
 };
 static int
 dissect_krb5_KrbCredInfo_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence_of(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence_of, hf_krb_KrbCredInfos, ett_krb_KrbCredInfos);
+	offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence_of, hf_krb_KrbCredInfos, ett_krb_KrbCredInfos);
 
 	return offset;
 }
-static const ber_sequence_t EncKrbCredPart_sequence[] = {
+static const ber_old_sequence_t EncKrbCredPart_sequence[] = {
 	{ BER_CLASS_CON, 0, 0, dissect_krb5_KrbCredInfo_sequence_of },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_nonce },
 	{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_ctime },
@@ -3431,7 +3431,7 @@ static const ber_sequence_t EncKrbCredPart_sequence[] = {
 static int
 dissect_krb5_EncKrbCredPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, EncKrbCredPart_sequence, hf_krb_EncKrbCredPart, ett_krb_EncKrbCredPart);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbCredPart_sequence, hf_krb_EncKrbCredPart, ett_krb_EncKrbCredPart);
 
 	return offset;
 }
@@ -3464,7 +3464,7 @@ dissect_krb5_decrypt_EncKrbCredPart (proto_tree *tree, tvbuff_t *tvb, int offset
 		/* Add the decrypted data to the data source list. */
 		add_new_data_source(actx->pinfo, next_tvb, "EncKrbCredPart");
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 	}
 	return offset;
 }
@@ -3474,14 +3474,14 @@ static int
 dissect_krb5_encrypted_CRED_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
 #endif
 	return offset;
 }
 
-static ber_sequence_t encrypted_CRED_sequence[] = {
+static ber_old_sequence_t encrypted_CRED_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_EncKrbCredPart_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3493,12 +3493,12 @@ static ber_sequence_t encrypted_CRED_sequence[] = {
 static int
 dissect_krb5_encrypted_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, encrypted_CRED_sequence, hf_krb_CRED_enc, ett_krb_CRED_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_CRED_sequence, hf_krb_CRED_enc, ett_krb_CRED_enc);
 
 	return offset;
 }
 
-static ber_sequence_t CRED_BODY_sequence[] = {
+static ber_old_sequence_t CRED_BODY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3513,7 +3513,7 @@ static int
 dissect_krb5_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, CRED_BODY_sequence, hf_krb_CRED_BODY, ett_krb_CRED);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, CRED_BODY_sequence, hf_krb_CRED_BODY, ett_krb_CRED);
 
 	return offset;
 }
@@ -3542,7 +3542,7 @@ dissect_krb5_SAFE_BODY_usec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
 	return offset;
 }
 
-static ber_sequence_t SAFE_BODY_sequence[] = {
+static ber_old_sequence_t SAFE_BODY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_SAFE_BODY_user_data },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3562,14 +3562,14 @@ static int
 dissect_krb5_SAFE_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, SAFE_BODY_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_BODY_sequence, -1, -1);
 
 	return offset;
 }
 
 
 
-static ber_sequence_t SAFE_sequence[] = {
+static ber_old_sequence_t SAFE_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3584,7 +3584,7 @@ static int
 dissect_krb5_SAFE(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, SAFE_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_sequence, -1, -1);
 
 	return offset;
 }
@@ -3611,7 +3611,7 @@ dissect_krb5_SAFE(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
  * }
  *
  */
-static ber_sequence_t KDC_REQ_BODY_sequence[] = {
+static ber_old_sequence_t KDC_REQ_BODY_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_KDCOptions },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3665,7 +3665,7 @@ dissect_krb5_KDC_REQ_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_
 		}
 	}
 
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_BODY_sequence, hf_krb_KDC_REQ_BODY, ett_krb_request);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_BODY_sequence, hf_krb_KDC_REQ_BODY, ett_krb_request);
 
 	return offset;
 }
@@ -3680,7 +3680,7 @@ dissect_krb5_KDC_REQ_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_
  *          req-body[4]           KDC-REQ-BODY
  * }
  */
-static ber_sequence_t KDC_REQ_sequence[] = {
+static ber_old_sequence_t KDC_REQ_sequence[] = {
 	{ BER_CLASS_CON, 1, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 2, 0,
@@ -3694,7 +3694,7 @@ static ber_sequence_t KDC_REQ_sequence[] = {
 static int
 dissect_krb5_KDC_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_sequence, -1, -1);
 
 	return offset;
 }
@@ -3734,7 +3734,7 @@ dissect_krb5_decrypt_authenticator_data (proto_tree *tree, tvbuff_t *tvb, int of
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
 	}
 	return offset;
@@ -3753,13 +3753,13 @@ static int
 dissect_krb5_encrypted_authenticator_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t encrypted_authenticator_sequence[] = {
+static ber_old_sequence_t encrypted_authenticator_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_authenticator_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3771,7 +3771,7 @@ static ber_sequence_t encrypted_authenticator_sequence[] = {
 static int
 dissect_krb5_encrypted_authenticator(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, encrypted_authenticator_sequence, hf_krb_authenticator_enc, ett_krb_authenticator_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_authenticator_sequence, hf_krb_authenticator_enc, ett_krb_authenticator_enc);
 
 	return offset;
 }
@@ -3812,7 +3812,7 @@ dissect_krb5_decrypt_Ticket_data (proto_tree *tree, tvbuff_t *tvb, int offset, a
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
 	}
 	return offset;
@@ -3823,13 +3823,13 @@ static int
 dissect_krb5_encrypted_Ticket_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t encrypted_Ticket_sequence[] = {
+static ber_old_sequence_t encrypted_Ticket_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_Ticket_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3841,12 +3841,12 @@ static ber_sequence_t encrypted_Ticket_sequence[] = {
 static int
 dissect_krb5_Ticket_encrypted(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, encrypted_Ticket_sequence, hf_krb_ticket_enc, ett_krb_ticket_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_Ticket_sequence, hf_krb_ticket_enc, ett_krb_ticket_enc);
 
 	return offset;
 }
 
-static ber_sequence_t Application_1_sequence[] = {
+static ber_old_sequence_t Application_1_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_tkt_vno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3860,14 +3860,14 @@ static ber_sequence_t Application_1_sequence[] = {
 static int
 dissect_krb5_Application_1(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, Application_1_sequence, hf_krb_ticket, ett_krb_ticket);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Application_1_sequence, hf_krb_ticket, ett_krb_ticket);
 
 	return offset;
 }
 
 
 
-static const ber_choice_t Ticket_choice[] = {
+static const ber_old_choice_t Ticket_choice[] = {
 	{ 1, BER_CLASS_APP, 1,  0,
 		dissect_krb5_Application_1 },
 	{ 0, 0, 0, 0, NULL }
@@ -3875,7 +3875,7 @@ static const ber_choice_t Ticket_choice[] = {
 static int
 dissect_krb5_Ticket(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_choice(actx, tree, tvb, offset, Ticket_choice, -1, -1, NULL);
+	offset=dissect_ber_old_choice(actx, tree, tvb, offset, Ticket_choice, -1, -1, NULL);
 
 	return offset;
 }
@@ -3892,7 +3892,7 @@ dissect_krb5_Ticket(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
  *                  authenticator[4]              EncryptedData
  *  }
  */
-static ber_sequence_t AP_REQ_sequence[] = {
+static ber_old_sequence_t AP_REQ_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -3908,7 +3908,7 @@ static ber_sequence_t AP_REQ_sequence[] = {
 static int
 dissect_krb5_AP_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, AP_REQ_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REQ_sequence, -1, -1);
 
 	return offset;
 }
@@ -3947,7 +3947,7 @@ dissect_krb5_decrypt_AP_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, as
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
 	}
 	return offset;
@@ -3959,13 +3959,13 @@ static int
 dissect_krb5_encrypted_AP_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t encrypted_AP_REP_sequence[] = {
+static ber_old_sequence_t encrypted_AP_REP_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_AP_REP_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -3977,7 +3977,7 @@ static ber_sequence_t encrypted_AP_REP_sequence[] = {
 static int
 dissect_krb5_encrypted_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, encrypted_AP_REP_sequence, hf_krb_AP_REP_enc, ett_krb_AP_REP_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_AP_REP_sequence, hf_krb_AP_REP_enc, ett_krb_AP_REP_enc);
 
 	return offset;
 }
@@ -3989,7 +3989,7 @@ dissect_krb5_encrypted_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
  *             enc-part[2]               EncryptedData
  *  }
  */
-static ber_sequence_t AP_REP_sequence[] = {
+static ber_old_sequence_t AP_REP_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -4001,7 +4001,7 @@ static ber_sequence_t AP_REP_sequence[] = {
 static int
 dissect_krb5_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, AP_REP_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REP_sequence, -1, -1);
 
 	return offset;
 }
@@ -4061,7 +4061,7 @@ dissect_krb5_decrypt_KDC_REP_data (proto_tree *tree, tvbuff_t *tvb, int offset,
 		add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-		offset=dissect_ber_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+		offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
 	}
 	return offset;
@@ -4073,13 +4073,13 @@ static int
 dissect_krb5_encrypted_KDC_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
 #else
-	offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
+	offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
 #endif
 	return offset;
 }
-static ber_sequence_t encrypted_KDC_REP_sequence[] = {
+static ber_old_sequence_t encrypted_KDC_REP_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_KDC_REP_etype },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
@@ -4091,7 +4091,7 @@ static ber_sequence_t encrypted_KDC_REP_sequence[] = {
 static int
 dissect_krb5_encrypted_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, encrypted_KDC_REP_sequence, hf_krb_KDC_REP_enc, ett_krb_KDC_REP_enc);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_KDC_REP_sequence, hf_krb_KDC_REP_enc, ett_krb_KDC_REP_enc);
 
 	return offset;
 }
@@ -4107,7 +4107,7 @@ dissect_krb5_encrypted_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
  *                enc-part[6]                EncryptedData
  *  }
  */
-static ber_sequence_t KDC_REP_sequence[] = {
+static ber_old_sequence_t KDC_REP_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -4127,7 +4127,7 @@ static ber_sequence_t KDC_REP_sequence[] = {
 static int
 dissect_krb5_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, KDC_REP_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REP_sequence, -1, -1);
 
 	return offset;
 }
@@ -4153,12 +4153,12 @@ dissect_krb5_e_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 		/* ms windows kdc sends e-data of this type containing a "salt"
 		 * that contains the nt_status code for these error codes.
 		 */
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
 		break;
 	case KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED:
 	case KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED:
 	case KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP:
-		offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
+		offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
 
 		break;
 	default:
@@ -4174,7 +4174,7 @@ dissect_krb5_e_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 static int
 dissect_krb5_e_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_e_checksum, ett_krb_e_checksum);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_e_checksum, ett_krb_e_checksum);
 
 	return offset;
 }
@@ -4205,7 +4205,7 @@ dissect_krb5_e_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
  *            authentication method and optionally containing data for
  *            the method:
  */
-static ber_sequence_t ERROR_sequence[] = {
+static ber_old_sequence_t ERROR_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_krb5_pvno },
 	{ BER_CLASS_CON, 1, 0,
@@ -4239,7 +4239,7 @@ static ber_sequence_t ERROR_sequence[] = {
 int
 dissect_krb5_ERROR(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-	offset=dissect_ber_sequence(FALSE, actx, tree, tvb, offset, ERROR_sequence, -1, -1);
+	offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ERROR_sequence, -1, -1);
 
 	return offset;
 }
@@ -4456,7 +4456,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
     TRY {
-	offset=dissect_ber_choice(&asn1_ctx, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+	offset=dissect_ber_old_choice(&asn1_ctx, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
     } CATCH_ALL {
 	pinfo->private_data=saved_private_data;
 	RETHROW;
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 641b54c7c6..633e1da05d 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -90,7 +90,7 @@ static int dissect_kpasswd_newpassword(proto_tree *tree, tvbuff_t *tvb, int offs
 	return offset;
 }
 
-static ber_sequence_t ChangePasswdData_sequence[] = {
+static ber_old_sequence_t ChangePasswdData_sequence[] = {
 	{ BER_CLASS_CON, 0, 0,
 		dissect_kpasswd_newpassword },
 	{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, 
@@ -107,7 +107,7 @@ dissect_kpasswd_user_data_request(packet_info *pinfo, tvbuff_t *tvb, proto_tree
 	asn1_ctx_t asn1_ctx;
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
-    offset=dissect_ber_sequence(FALSE, &asn1_ctx, tree, tvb, offset, ChangePasswdData_sequence, hf_kpasswd_ChangePasswdData, ett_ChangePasswdData);
+    offset=dissect_ber_old_sequence(FALSE, &asn1_ctx, tree, tvb, offset, ChangePasswdData_sequence, hf_kpasswd_ChangePasswdData, ett_ChangePasswdData);
 
     return offset;
 }
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index ed69d88604..d2e87dfa9e 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -1007,7 +1007,7 @@ static int dissect_credentials(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SaslCredentials_sequence[] = {
+static const ber_old_sequence_t SaslCredentials_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mechanism },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_credentials },
   { 0, 0, 0, NULL }
@@ -1015,8 +1015,8 @@ static const ber_sequence_t SaslCredentials_sequence[] = {
 
 static int
 dissect_ldap_SaslCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SaslCredentials_sequence, hf_index, ett_ldap_SaslCredentials);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SaslCredentials_sequence, hf_index, ett_ldap_SaslCredentials);
 
   return offset;
 }
@@ -1071,7 +1071,7 @@ static const value_string ldap_AuthenticationChoice_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AuthenticationChoice_choice[] = {
+static const ber_old_choice_t AuthenticationChoice_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_simple_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_sasl_impl },
   {  10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_ntlmsspNegotiate_impl },
@@ -1086,9 +1086,9 @@ dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
   gint auth = -1;
   const gchar *valstr;
   
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AuthenticationChoice_choice, hf_index, ett_ldap_AuthenticationChoice,
-                                 &branch);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AuthenticationChoice_choice, hf_index, ett_ldap_AuthenticationChoice,
+                                     &branch);
 
   
   ldap_do_protocolop(actx->pinfo);
@@ -1115,7 +1115,7 @@ static int dissect_authentication(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t BindRequest_sequence[] = {
+static const ber_old_sequence_t BindRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authentication },
@@ -1124,8 +1124,8 @@ static const ber_sequence_t BindRequest_sequence[] = {
 
 static int
 dissect_ldap_BindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BindRequest_sequence, hf_index, ett_ldap_BindRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BindRequest_sequence, hf_index, ett_ldap_BindRequest);
 
   return offset;
 }
@@ -1272,14 +1272,14 @@ static int dissect_SearchResultReference_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Referral_sequence_of[1] = {
+static const ber_old_sequence_t Referral_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Referral_item },
 };
 
 static int
 dissect_ldap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Referral_sequence_of, hf_index, ett_ldap_Referral);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Referral_sequence_of, hf_index, ett_ldap_Referral);
 
   return offset;
 }
@@ -1363,7 +1363,7 @@ static int dissect_serverSaslCreds_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t BindResponse_sequence[] = {
+static const ber_old_sequence_t BindResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_bindResponse_resultCode },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN1 },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@@ -1374,8 +1374,8 @@ static const ber_sequence_t BindResponse_sequence[] = {
 
 static int
 dissect_ldap_BindResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BindResponse_sequence, hf_index, ett_ldap_BindResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BindResponse_sequence, hf_index, ett_ldap_BindResponse);
 
   return offset;
 }
@@ -1537,14 +1537,14 @@ static int dissect_and_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_and_set_of[1] = {
+static const ber_old_sequence_t T_and_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 
 static int
 dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 502 "ldap.cnf"
-	const ber_sequence_t and_set_of[1] = {  { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
+	const ber_old_sequence_t and_set_of[1] = {  { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 	proto_tree *tr=NULL;
 	proto_item *it=NULL;
@@ -1555,7 +1555,7 @@ dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 		it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "and: ");
 		tr=proto_item_add_subtree(it, ett_ldap_T_and);
 	} 
-	offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
+	offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
                                  and_set_of, -1, ett_ldap_T_and);
 
 	proto_item_append_text(it, "%s", and_filter_string);
@@ -1592,14 +1592,14 @@ static int dissect_or_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_or_set_of[1] = {
+static const ber_old_sequence_t T_or_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
 };
 
 static int
 dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 529 "ldap.cnf"
-	const ber_sequence_t or_set_of[1] = {  { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
+	const ber_old_sequence_t or_set_of[1] = {  { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_or_item },
 };
 	proto_tree *tr=NULL;
 	proto_item *it=NULL;
@@ -1610,7 +1610,7 @@ dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 		it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "or: ");
 		tr=proto_item_add_subtree(it, ett_ldap_T_or);
 	} 
-	offset = dissect_ber_set_of(implicit_tag, actx, tr, tvb, offset,
+	offset = dissect_ber_old_set_of(implicit_tag, actx, tr, tvb, offset,
                                  or_set_of, -1, ett_ldap_T_or);
 
 	proto_item_append_text(it, "%s", or_filter_string);
@@ -1676,7 +1676,7 @@ static int dissect_matchValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AttributeValueAssertion_sequence[] = {
+static const ber_old_sequence_t AttributeValueAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeDesc },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_assertionValue },
   { 0, 0, 0, NULL }
@@ -1684,8 +1684,8 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = {
 
 static int
 dissect_ldap_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeValueAssertion_sequence, hf_index, ett_ldap_AttributeValueAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeValueAssertion_sequence, hf_index, ett_ldap_AttributeValueAssertion);
 
   return offset;
 }
@@ -1718,7 +1718,7 @@ static const value_string ldap_T_substringFilter_substrings_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_substringFilter_substrings_item_choice[] = {
+static const ber_old_choice_t T_substringFilter_substrings_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initial_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_any_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_final_impl },
@@ -1727,9 +1727,9 @@ static const ber_choice_t T_substringFilter_substrings_item_choice[] = {
 
 static int
 dissect_ldap_T_substringFilter_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
+                                     NULL);
 
 #line 577 "ldap.cnf"
 	if (substring_item_final) {
@@ -1753,14 +1753,14 @@ static int dissect_substringFilter_substrings_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t T_substringFilter_substrings_sequence_of[1] = {
+static const ber_old_sequence_t T_substringFilter_substrings_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substringFilter_substrings_item },
 };
 
 static int
 dissect_ldap_T_substringFilter_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_substringFilter_substrings_sequence_of, hf_index, ett_ldap_T_substringFilter_substrings);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_substringFilter_substrings_sequence_of, hf_index, ett_ldap_T_substringFilter_substrings);
 
   return offset;
 }
@@ -1769,7 +1769,7 @@ static int dissect_substringFilter_substrings(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t SubstringFilter_sequence[] = {
+static const ber_old_sequence_t SubstringFilter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substringFilter_substrings },
   { 0, 0, 0, NULL }
@@ -1790,7 +1790,7 @@ dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 		it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "substring: ");
 		tr=proto_item_add_subtree(it, ett_ldap_SubstringFilter);
 	}
-	offset = dissect_ber_sequence(implicit_tag, actx, tr, tvb, offset,
+	offset = dissect_ber_old_sequence(implicit_tag, actx, tr, tvb, offset,
 				      SubstringFilter_sequence, hf_index,
 				      ett_ldap_SubstringFilter);
 
@@ -1888,7 +1888,7 @@ static int dissect_orderingRule_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
+static const ber_old_sequence_t MatchingRuleAssertion_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_matchingRule_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_matchValue_impl },
@@ -1898,8 +1898,8 @@ static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
 
 static int
 dissect_ldap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MatchingRuleAssertion_sequence, hf_index, ett_ldap_MatchingRuleAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MatchingRuleAssertion_sequence, hf_index, ett_ldap_MatchingRuleAssertion);
 
   return offset;
 }
@@ -1947,7 +1947,7 @@ static const value_string ldap_Filter_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Filter_choice[] = {
+static const ber_old_choice_t Filter_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_and_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_or_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_not_impl },
@@ -1971,7 +1971,7 @@ dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 		it=proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), "Filter: ");
 		tr=proto_item_add_subtree(it, ett_ldap_Filter);
 	}
-	offset = dissect_ber_choice(actx, tr, tvb, offset,
+	offset = dissect_ber_old_choice(actx, tr, tvb, offset,
                                  Filter_choice, -1, ett_ldap_Filter,
                                  NULL);
 
@@ -2004,14 +2004,14 @@ static int dissect_filter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t AttributeDescriptionList_sequence_of[1] = {
+static const ber_old_sequence_t AttributeDescriptionList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_AttributeDescriptionList_item },
 };
 
 static int
 dissect_ldap_AttributeDescriptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AttributeDescriptionList_sequence_of, hf_index, ett_ldap_AttributeDescriptionList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AttributeDescriptionList_sequence_of, hf_index, ett_ldap_AttributeDescriptionList);
 
   return offset;
 }
@@ -2020,7 +2020,7 @@ static int dissect_searchRequest_attributes(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SearchRequest_sequence[] = {
+static const ber_old_sequence_t SearchRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_baseObject },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_scope },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_derefAliases },
@@ -2034,8 +2034,8 @@ static const ber_sequence_t SearchRequest_sequence[] = {
 
 static int
 dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchRequest_sequence, hf_index, ett_ldap_SearchRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchRequest_sequence, hf_index, ett_ldap_SearchRequest);
 
   return offset;
 }
@@ -2093,14 +2093,14 @@ static int dissect_vals_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeValue_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_vals_item },
 };
 
 static int
 dissect_ldap_SET_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeValue_set_of, hf_index, ett_ldap_SET_OF_AttributeValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeValue_set_of, hf_index, ett_ldap_SET_OF_AttributeValue);
 
   return offset;
 }
@@ -2109,7 +2109,7 @@ static int dissect_vals(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t PartialAttributeList_item_sequence[] = {
+static const ber_old_sequence_t PartialAttributeList_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
   { 0, 0, 0, NULL }
@@ -2117,8 +2117,8 @@ static const ber_sequence_t PartialAttributeList_item_sequence[] = {
 
 static int
 dissect_ldap_PartialAttributeList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PartialAttributeList_item_sequence, hf_index, ett_ldap_PartialAttributeList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PartialAttributeList_item_sequence, hf_index, ett_ldap_PartialAttributeList_item);
 
   return offset;
 }
@@ -2127,14 +2127,14 @@ static int dissect_PartialAttributeList_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PartialAttributeList_sequence_of[1] = {
+static const ber_old_sequence_t PartialAttributeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PartialAttributeList_item },
 };
 
 static int
 dissect_ldap_PartialAttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PartialAttributeList_sequence_of, hf_index, ett_ldap_PartialAttributeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PartialAttributeList_sequence_of, hf_index, ett_ldap_PartialAttributeList);
 
   return offset;
 }
@@ -2143,7 +2143,7 @@ static int dissect_searchResultEntry_attributes(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t SearchResultEntry_sequence[] = {
+static const ber_old_sequence_t SearchResultEntry_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_objectName },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_searchResultEntry_attributes },
   { 0, 0, 0, NULL }
@@ -2151,8 +2151,8 @@ static const ber_sequence_t SearchResultEntry_sequence[] = {
 
 static int
 dissect_ldap_SearchResultEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchResultEntry_sequence, hf_index, ett_ldap_SearchResultEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchResultEntry_sequence, hf_index, ett_ldap_SearchResultEntry);
 
   return offset;
 }
@@ -2238,7 +2238,7 @@ static int dissect_resultCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t LDAPResult_sequence[] = {
+static const ber_old_sequence_t LDAPResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_resultCode },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@@ -2248,8 +2248,8 @@ static const ber_sequence_t LDAPResult_sequence[] = {
 
 static int
 dissect_ldap_LDAPResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LDAPResult_sequence, hf_index, ett_ldap_LDAPResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LDAPResult_sequence, hf_index, ett_ldap_LDAPResult);
 
   return offset;
 }
@@ -2267,14 +2267,14 @@ static int dissect_searchResDone(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SearchResultReference_sequence_of[1] = {
+static const ber_old_sequence_t SearchResultReference_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SearchResultReference_item },
 };
 
 static int
 dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SearchResultReference_sequence_of, hf_index, ett_ldap_SearchResultReference);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SearchResultReference_sequence_of, hf_index, ett_ldap_SearchResultReference);
 
   return offset;
 }
@@ -2303,7 +2303,7 @@ static int dissect_operation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t AttributeTypeAndValues_sequence[] = {
+static const ber_old_sequence_t AttributeTypeAndValues_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
   { 0, 0, 0, NULL }
@@ -2311,8 +2311,8 @@ static const ber_sequence_t AttributeTypeAndValues_sequence[] = {
 
 static int
 dissect_ldap_AttributeTypeAndValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeTypeAndValues_sequence, hf_index, ett_ldap_AttributeTypeAndValues);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeTypeAndValues_sequence, hf_index, ett_ldap_AttributeTypeAndValues);
 
   return offset;
 }
@@ -2321,7 +2321,7 @@ static int dissect_modification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = {
+static const ber_old_sequence_t T_modifyRequest_modification_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_operation },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modification },
   { 0, 0, 0, NULL }
@@ -2329,8 +2329,8 @@ static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = {
 
 static int
 dissect_ldap_T_modifyRequest_modification_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item);
 
   return offset;
 }
@@ -2339,14 +2339,14 @@ static int dissect_modifyRequest_modification_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ModifyRequest_modification_sequence_of[1] = {
+static const ber_old_sequence_t ModifyRequest_modification_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyRequest_modification_item },
 };
 
 static int
 dissect_ldap_ModifyRequest_modification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification);
 
   return offset;
 }
@@ -2355,7 +2355,7 @@ static int dissect_modifyRequest_modification(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ModifyRequest_sequence[] = {
+static const ber_old_sequence_t ModifyRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_object },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modifyRequest_modification },
   { 0, 0, 0, NULL }
@@ -2363,8 +2363,8 @@ static const ber_sequence_t ModifyRequest_sequence[] = {
 
 static int
 dissect_ldap_ModifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyRequest_sequence, hf_index, ett_ldap_ModifyRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyRequest_sequence, hf_index, ett_ldap_ModifyRequest);
 
   return offset;
 }
@@ -2385,7 +2385,7 @@ static int dissect_modifyResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t AttributeList_item_sequence[] = {
+static const ber_old_sequence_t AttributeList_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_vals },
   { 0, 0, 0, NULL }
@@ -2393,8 +2393,8 @@ static const ber_sequence_t AttributeList_item_sequence[] = {
 
 static int
 dissect_ldap_AttributeList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeList_item_sequence, hf_index, ett_ldap_AttributeList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeList_item_sequence, hf_index, ett_ldap_AttributeList_item);
 
   return offset;
 }
@@ -2403,14 +2403,14 @@ static int dissect_AttributeList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t AttributeList_sequence_of[1] = {
+static const ber_old_sequence_t AttributeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributeList_item },
 };
 
 static int
 dissect_ldap_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AttributeList_sequence_of, hf_index, ett_ldap_AttributeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AttributeList_sequence_of, hf_index, ett_ldap_AttributeList);
 
   return offset;
 }
@@ -2419,7 +2419,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t AddRequest_sequence[] = {
+static const ber_old_sequence_t AddRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes },
   { 0, 0, 0, NULL }
@@ -2427,8 +2427,8 @@ static const ber_sequence_t AddRequest_sequence[] = {
 
 static int
 dissect_ldap_AddRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddRequest_sequence, hf_index, ett_ldap_AddRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddRequest_sequence, hf_index, ett_ldap_AddRequest);
 
   return offset;
 }
@@ -2485,7 +2485,7 @@ static int dissect_newrdn(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ModifyDNRequest_sequence[] = {
+static const ber_old_sequence_t ModifyDNRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_newrdn },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_deleteoldrdn },
@@ -2495,8 +2495,8 @@ static const ber_sequence_t ModifyDNRequest_sequence[] = {
 
 static int
 dissect_ldap_ModifyDNRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ModifyDNRequest_sequence, hf_index, ett_ldap_ModifyDNRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ModifyDNRequest_sequence, hf_index, ett_ldap_ModifyDNRequest);
 
   return offset;
 }
@@ -2517,7 +2517,7 @@ static int dissect_modDNResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CompareRequest_sequence[] = {
+static const ber_old_sequence_t CompareRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_entry },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ava },
   { 0, 0, 0, NULL }
@@ -2525,8 +2525,8 @@ static const ber_sequence_t CompareRequest_sequence[] = {
 
 static int
 dissect_ldap_CompareRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CompareRequest_sequence, hf_index, ett_ldap_CompareRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CompareRequest_sequence, hf_index, ett_ldap_CompareRequest);
 
   return offset;
 }
@@ -2617,7 +2617,7 @@ static int dissect_cookie(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ExtendedRequest_sequence[] = {
+static const ber_old_sequence_t ExtendedRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestValue_impl },
   { 0, 0, 0, NULL }
@@ -2625,8 +2625,8 @@ static const ber_sequence_t ExtendedRequest_sequence[] = {
 
 static int
 dissect_ldap_ExtendedRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtendedRequest_sequence, hf_index, ett_ldap_ExtendedRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtendedRequest_sequence, hf_index, ett_ldap_ExtendedRequest);
 
   return offset;
 }
@@ -2703,7 +2703,7 @@ static int dissect_responseName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ExtendedResponse_sequence[] = {
+static const ber_old_sequence_t ExtendedResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_extendedResponse_resultCode },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_matchedDN },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_errorMessage },
@@ -2715,8 +2715,8 @@ static const ber_sequence_t ExtendedResponse_sequence[] = {
 
 static int
 dissect_ldap_ExtendedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtendedResponse_sequence, hf_index, ett_ldap_ExtendedResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtendedResponse_sequence, hf_index, ett_ldap_ExtendedResponse);
 
   return offset;
 }
@@ -2749,7 +2749,7 @@ static const value_string ldap_ProtocolOp_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ProtocolOp_choice[] = {
+static const ber_old_choice_t ProtocolOp_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_bindRequest },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_bindResponse },
   {   2, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_unbindRequest },
@@ -2782,9 +2782,9 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
   do_protocolop = TRUE;
 
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
-                                 &ProtocolOp);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
+                                     &ProtocolOp);
 
 #line 82 "ldap.cnf"
 
@@ -2874,7 +2874,7 @@ static int dissect_controlValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t Control_sequence[] = {
+static const ber_old_sequence_t Control_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_controlType },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_criticality },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_controlValue },
@@ -2883,8 +2883,8 @@ static const ber_sequence_t Control_sequence[] = {
 
 static int
 dissect_ldap_Control(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Control_sequence, hf_index, ett_ldap_Control);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Control_sequence, hf_index, ett_ldap_Control);
 
   return offset;
 }
@@ -2893,14 +2893,14 @@ static int dissect_Controls_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t Controls_sequence_of[1] = {
+static const ber_old_sequence_t Controls_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Controls_item },
 };
 
 static int
 dissect_ldap_Controls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Controls_sequence_of, hf_index, ett_ldap_Controls);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Controls_sequence_of, hf_index, ett_ldap_Controls);
 
   return offset;
 }
@@ -2909,7 +2909,7 @@ static int dissect_controls_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t LDAPMessage_sequence[] = {
+static const ber_old_sequence_t LDAPMessage_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_messageID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_protocolOp },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controls_impl },
@@ -2918,8 +2918,8 @@ static const ber_sequence_t LDAPMessage_sequence[] = {
 
 static int
 dissect_ldap_LDAPMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LDAPMessage_sequence, hf_index, ett_ldap_LDAPMessage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LDAPMessage_sequence, hf_index, ett_ldap_LDAPMessage);
 
   return offset;
 }
@@ -2946,7 +2946,7 @@ static int dissect_maxReturnLength(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SearchControlValue_sequence[] = {
+static const ber_old_sequence_t SearchControlValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_size },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cookie },
   { 0, 0, 0, NULL }
@@ -2954,14 +2954,14 @@ static const ber_sequence_t SearchControlValue_sequence[] = {
 
 static int
 dissect_ldap_SearchControlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchControlValue_sequence, hf_index, ett_ldap_SearchControlValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchControlValue_sequence, hf_index, ett_ldap_SearchControlValue);
 
   return offset;
 }
 
 
-static const ber_sequence_t SortKeyList_item_sequence[] = {
+static const ber_old_sequence_t SortKeyList_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_orderingRule_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reverseOrder_impl },
@@ -2970,8 +2970,8 @@ static const ber_sequence_t SortKeyList_item_sequence[] = {
 
 static int
 dissect_ldap_SortKeyList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SortKeyList_item_sequence, hf_index, ett_ldap_SortKeyList_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SortKeyList_item_sequence, hf_index, ett_ldap_SortKeyList_item);
 
   return offset;
 }
@@ -2980,14 +2980,14 @@ static int dissect_SortKeyList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SortKeyList_sequence_of[1] = {
+static const ber_old_sequence_t SortKeyList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SortKeyList_item },
 };
 
 static int
 dissect_ldap_SortKeyList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SortKeyList_sequence_of, hf_index, ett_ldap_SortKeyList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SortKeyList_sequence_of, hf_index, ett_ldap_SortKeyList);
 
   return offset;
 }
@@ -3021,7 +3021,7 @@ static int dissect_sortResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SortResult_sequence[] = {
+static const ber_old_sequence_t SortResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sortResult },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attributeType_impl },
   { 0, 0, 0, NULL }
@@ -3029,14 +3029,14 @@ static const ber_sequence_t SortResult_sequence[] = {
 
 static int
 dissect_ldap_SortResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SortResult_sequence, hf_index, ett_ldap_SortResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SortResult_sequence, hf_index, ett_ldap_SortResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReplControlValue_sequence[] = {
+static const ber_old_sequence_t ReplControlValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_parentsFirst },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_maxReturnLength },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cookie },
@@ -3045,8 +3045,8 @@ static const ber_sequence_t ReplControlValue_sequence[] = {
 
 static int
 dissect_ldap_ReplControlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReplControlValue_sequence, hf_index, ett_ldap_ReplControlValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReplControlValue_sequence, hf_index, ett_ldap_ReplControlValue);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 6528e0d826..b3fc18f2c0 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -179,7 +179,7 @@ static int dissect_hashValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t HashAlgAndValue_sequence[] = {
+static const ber_old_sequence_t HashAlgAndValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlg },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashValue },
   { 0, 0, 0, NULL }
@@ -187,8 +187,8 @@ static const ber_sequence_t HashAlgAndValue_sequence[] = {
 
 static int
 dissect_logotypecertextn_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
 
   return offset;
 }
@@ -200,14 +200,14 @@ static int dissect_refStructHash_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item },
 };
 
 static int
 dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue);
 
   return offset;
 }
@@ -219,14 +219,14 @@ static int dissect_refStructHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_logotypeURI_sequence_of[1] = {
+static const ber_old_sequence_t T_logotypeURI_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item },
 };
 
 static int
 dissect_logotypecertextn_T_logotypeURI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI);
 
   return offset;
 }
@@ -235,7 +235,7 @@ static int dissect_logotypeURI(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t LogotypeDetails_sequence[] = {
+static const ber_old_sequence_t LogotypeDetails_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mediaType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeURI },
@@ -244,8 +244,8 @@ static const ber_sequence_t LogotypeDetails_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeDetails(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
 
   return offset;
 }
@@ -316,7 +316,7 @@ static const value_string logotypecertextn_LogotypeImageResolution_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LogotypeImageResolution_choice[] = {
+static const ber_old_choice_t LogotypeImageResolution_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numBits_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_tableSize_impl },
   { 0, 0, 0, 0, NULL }
@@ -324,9 +324,9 @@ static const ber_choice_t LogotypeImageResolution_choice[] = {
 
 static int
 dissect_logotypecertextn_LogotypeImageResolution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution,
+                                     NULL);
 
   return offset;
 }
@@ -335,7 +335,7 @@ static int dissect_resolution(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t LogotypeImageInfo_sequence[] = {
+static const ber_old_sequence_t LogotypeImageInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_xSize },
@@ -347,8 +347,8 @@ static const ber_sequence_t LogotypeImageInfo_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeImageInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
 
   return offset;
 }
@@ -357,7 +357,7 @@ static int dissect_imageInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t LogotypeImage_sequence[] = {
+static const ber_old_sequence_t LogotypeImage_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imageDetails },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imageInfo },
   { 0, 0, 0, NULL }
@@ -365,8 +365,8 @@ static const ber_sequence_t LogotypeImage_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
 
   return offset;
 }
@@ -375,14 +375,14 @@ static int dissect_image_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item },
 };
 
 static int
 dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage);
 
   return offset;
 }
@@ -391,7 +391,7 @@ static int dissect_image(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
+static const ber_old_sequence_t LogotypeAudioInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_playTime },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_channels },
@@ -402,8 +402,8 @@ static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeAudioInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
 
   return offset;
 }
@@ -412,7 +412,7 @@ static int dissect_audioInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t LogotypeAudio_sequence[] = {
+static const ber_old_sequence_t LogotypeAudio_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audioDetails },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_audioInfo },
   { 0, 0, 0, NULL }
@@ -420,8 +420,8 @@ static const ber_sequence_t LogotypeAudio_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
 
   return offset;
 }
@@ -430,14 +430,14 @@ static int dissect_audio_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item },
 };
 
 static int
 dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio);
 
   return offset;
 }
@@ -446,7 +446,7 @@ static int dissect_audio_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t LogotypeData_sequence[] = {
+static const ber_old_sequence_t LogotypeData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_image },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_audio_impl },
   { 0, 0, 0, NULL }
@@ -454,8 +454,8 @@ static const ber_sequence_t LogotypeData_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
 
   return offset;
 }
@@ -464,14 +464,14 @@ static int dissect_direct_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_refStructURI_sequence_of[1] = {
+static const ber_old_sequence_t T_refStructURI_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_refStructURI_item },
 };
 
 static int
 dissect_logotypecertextn_T_refStructURI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI);
 
   return offset;
 }
@@ -480,7 +480,7 @@ static int dissect_refStructURI(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t LogotypeReference_sequence[] = {
+static const ber_old_sequence_t LogotypeReference_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI },
   { 0, 0, 0, NULL }
@@ -488,8 +488,8 @@ static const ber_sequence_t LogotypeReference_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
 
   return offset;
 }
@@ -504,7 +504,7 @@ static const value_string logotypecertextn_LogotypeInfo_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LogotypeInfo_choice[] = {
+static const ber_old_choice_t LogotypeInfo_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_direct_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indirect_impl },
   { 0, 0, 0, 0, NULL }
@@ -512,9 +512,9 @@ static const ber_choice_t LogotypeInfo_choice[] = {
 
 static int
 dissect_logotypecertextn_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo,
+                                     NULL);
 
   return offset;
 }
@@ -532,14 +532,14 @@ static int dissect_info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item },
 };
 
 static int
 dissect_logotypecertextn_SEQUENCE_OF_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo);
 
   return offset;
 }
@@ -560,7 +560,7 @@ static int dissect_logotypeType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
+static const ber_old_sequence_t OtherLogotypeInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info },
   { 0, 0, 0, NULL }
@@ -568,8 +568,8 @@ static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
 
 static int
 dissect_logotypecertextn_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
 
   return offset;
 }
@@ -578,14 +578,14 @@ static int dissect_otherLogos_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item },
 };
 
 static int
 dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo);
 
   return offset;
 }
@@ -594,7 +594,7 @@ static int dissect_otherLogos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t LogotypeExtn_sequence[] = {
+static const ber_old_sequence_t LogotypeExtn_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_communityLogos },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_issuerLogo },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_subjectLogo },
@@ -604,8 +604,8 @@ static const ber_sequence_t LogotypeExtn_sequence[] = {
 
 static int
 dissect_logotypecertextn_LogotypeExtn(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index d9cc077e8b..ccf61eae5b 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -1143,7 +1143,7 @@ static int dissect_domain_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_domain_specific_sequence[] = {
+static const ber_old_sequence_t T_domain_specific_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_domainId },
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_itemId },
   { 0, 0, 0, NULL }
@@ -1151,8 +1151,8 @@ static const ber_sequence_t T_domain_specific_sequence[] = {
 
 static int
 dissect_mms_T_domain_specific(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific);
 
   return offset;
 }
@@ -1168,7 +1168,7 @@ static const value_string mms_ObjectName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ObjectName_choice[] = {
+static const ber_old_choice_t ObjectName_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmd_specific_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_domain_specific_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aa_specific_impl },
@@ -1177,9 +1177,9 @@ static const ber_choice_t ObjectName_choice[] = {
 
 static int
 dissect_mms_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ObjectName_choice, hf_index, ett_mms_ObjectName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ObjectName_choice, hf_index, ett_mms_ObjectName,
+                                     NULL);
 
   return offset;
 }
@@ -1281,7 +1281,7 @@ static int dissect_causingTransitions_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t AttachToEventCondition_sequence[] = {
+static const ber_old_sequence_t AttachToEventCondition_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_causingTransitions_impl },
@@ -1291,8 +1291,8 @@ static const ber_sequence_t AttachToEventCondition_sequence[] = {
 
 static int
 dissect_mms_AttachToEventCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition);
 
   return offset;
 }
@@ -1407,7 +1407,7 @@ static int dissect_activeAlarmsOnly_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AttachToSemaphore_sequence[] = {
+static const ber_old_sequence_t AttachToSemaphore_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
@@ -1420,8 +1420,8 @@ static const ber_sequence_t AttachToSemaphore_sequence[] = {
 
 static int
 dissect_mms_AttachToSemaphore(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore);
 
   return offset;
 }
@@ -1436,7 +1436,7 @@ static const value_string mms_Modifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Modifier_choice[] = {
+static const ber_old_choice_t Modifier_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attach_To_Event_Condition_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attach_To_Semaphore_impl },
   { 0, 0, 0, 0, NULL }
@@ -1444,9 +1444,9 @@ static const ber_choice_t Modifier_choice[] = {
 
 static int
 dissect_mms_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Modifier_choice, hf_index, ett_mms_Modifier,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Modifier_choice, hf_index, ett_mms_Modifier,
+                                     NULL);
 
   return offset;
 }
@@ -1455,14 +1455,14 @@ static int dissect_listOfModifier_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfModifier_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier);
 
   return offset;
 }
@@ -1520,16 +1520,16 @@ static const value_string mms_T_extendedObjectClass_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extendedObjectClass_choice[] = {
+static const ber_old_choice_t T_extendedObjectClass_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_objectClass_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_T_extendedObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass,
+                                     NULL);
 
   return offset;
 }
@@ -1590,7 +1590,7 @@ static const value_string mms_T_objectScope_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_objectScope_choice[] = {
+static const ber_old_choice_t T_objectScope_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmdSpecific_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_domainSpecific_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aaSpecific_impl },
@@ -1599,9 +1599,9 @@ static const ber_choice_t T_objectScope_choice[] = {
 
 static int
 dissect_mms_T_objectScope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_objectScope_choice, hf_index, ett_mms_T_objectScope,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_objectScope_choice, hf_index, ett_mms_T_objectScope,
+                                     NULL);
 
   return offset;
 }
@@ -1610,7 +1610,7 @@ static int dissect_objectScope(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t GetNameList_Request_sequence[] = {
+static const ber_old_sequence_t GetNameList_Request_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass },
   { BER_CLASS_CON, 1, 0, dissect_objectScope },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_continueAfter_impl },
@@ -1619,8 +1619,8 @@ static const ber_sequence_t GetNameList_Request_sequence[] = {
 
 static int
 dissect_mms_GetNameList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request);
 
   return offset;
 }
@@ -1675,16 +1675,16 @@ static const value_string mms_T_extendedObjectClass1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_extendedObjectClass1_choice[] = {
+static const ber_old_choice_t T_extendedObjectClass1_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_objectClass1_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_T_extendedObjectClass1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_extendedObjectClass1_choice, hf_index, ett_mms_T_extendedObjectClass1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_extendedObjectClass1_choice, hf_index, ett_mms_T_extendedObjectClass1,
+                                     NULL);
 
   return offset;
 }
@@ -1693,7 +1693,7 @@ static int dissect_extendedObjectClass1(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Rename_Request_sequence[] = {
+static const ber_old_sequence_t Rename_Request_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass1 },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_currentName },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_newIdentifier_impl },
@@ -1702,8 +1702,8 @@ static const ber_sequence_t Rename_Request_sequence[] = {
 
 static int
 dissect_mms_Rename_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Rename_Request_sequence, hf_index, ett_mms_Rename_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Rename_Request_sequence, hf_index, ett_mms_Rename_Request);
 
   return offset;
 }
@@ -1815,7 +1815,7 @@ static const value_string mms_Address_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Address_choice[] = {
+static const ber_old_choice_t Address_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numericAddress_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_symbolicAddress_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_unconstrainedAddress_impl },
@@ -1824,9 +1824,9 @@ static const ber_choice_t Address_choice[] = {
 
 static int
 dissect_mms_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Address_choice, hf_index, ett_mms_Address,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Address_choice, hf_index, ett_mms_Address,
+                                     NULL);
 
   return offset;
 }
@@ -1835,7 +1835,7 @@ static int dissect_address(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_array_sequence[] = {
+static const ber_old_sequence_t T_array_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_elementType },
@@ -1844,8 +1844,8 @@ static const ber_sequence_t T_array_sequence[] = {
 
 static int
 dissect_mms_T_array(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_array_sequence, hf_index, ett_mms_T_array);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_array_sequence, hf_index, ett_mms_T_array);
 
   return offset;
 }
@@ -1854,7 +1854,7 @@ static int dissect_array_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_components_item_sequence[] = {
+static const ber_old_sequence_t T_components_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_componentType },
   { 0, 0, 0, NULL }
@@ -1862,8 +1862,8 @@ static const ber_sequence_t T_components_item_sequence[] = {
 
 static int
 dissect_mms_T_components_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_components_item_sequence, hf_index, ett_mms_T_components_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_components_item_sequence, hf_index, ett_mms_T_components_item);
 
   return offset;
 }
@@ -1872,14 +1872,14 @@ static int dissect_components_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_components_sequence_of[1] = {
+static const ber_old_sequence_t T_components_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_components_item },
 };
 
 static int
 dissect_mms_T_components(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_components_sequence_of, hf_index, ett_mms_T_components);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_components_sequence_of, hf_index, ett_mms_T_components);
 
   return offset;
 }
@@ -1888,7 +1888,7 @@ static int dissect_components_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_structure_sequence[] = {
+static const ber_old_sequence_t T_structure_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_components_impl },
   { 0, 0, 0, NULL }
@@ -1896,8 +1896,8 @@ static const ber_sequence_t T_structure_sequence[] = {
 
 static int
 dissect_mms_T_structure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_structure_sequence, hf_index, ett_mms_T_structure);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_structure_sequence, hf_index, ett_mms_T_structure);
 
   return offset;
 }
@@ -1957,7 +1957,7 @@ static const value_string mms_TypeSpecification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TypeSpecification_choice[] = {
+static const ber_old_choice_t TypeSpecification_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_typeName },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure_impl },
@@ -1976,15 +1976,15 @@ static const ber_choice_t TypeSpecification_choice[] = {
 
 static int
 dissect_mms_TypeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TypeSpecification_choice, hf_index, ett_mms_TypeSpecification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TypeSpecification_choice, hf_index, ett_mms_TypeSpecification,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_variableDescription_sequence[] = {
+static const ber_old_sequence_t T_variableDescription_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification },
   { 0, 0, 0, NULL }
@@ -1992,8 +1992,8 @@ static const ber_sequence_t T_variableDescription_sequence[] = {
 
 static int
 dissect_mms_T_variableDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription);
 
   return offset;
 }
@@ -2002,7 +2002,7 @@ static int dissect_variableDescription_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_indexRange_sequence[] = {
+static const ber_old_sequence_t T_indexRange_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lowIndex_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl },
   { 0, 0, 0, NULL }
@@ -2010,8 +2010,8 @@ static const ber_sequence_t T_indexRange_sequence[] = {
 
 static int
 dissect_mms_T_indexRange(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_indexRange_sequence, hf_index, ett_mms_T_indexRange);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_indexRange_sequence, hf_index, ett_mms_T_indexRange);
 
   return offset;
 }
@@ -2028,7 +2028,7 @@ static const value_string mms_T_selectAccess_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_selectAccess_choice[] = {
+static const ber_old_choice_t T_selectAccess_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_component_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_index_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_indexRange_impl },
@@ -2038,9 +2038,9 @@ static const ber_choice_t T_selectAccess_choice[] = {
 
 static int
 dissect_mms_T_selectAccess(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_selectAccess_choice, hf_index, ett_mms_T_selectAccess,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_selectAccess_choice, hf_index, ett_mms_T_selectAccess,
+                                     NULL);
 
   return offset;
 }
@@ -2054,16 +2054,16 @@ static const value_string mms_AlternateAccessSelection_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AlternateAccessSelection_choice[] = {
+static const ber_old_choice_t AlternateAccessSelection_choice[] = {
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_selectAccess },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_AlternateAccessSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection,
+                                     NULL);
 
   return offset;
 }
@@ -2075,7 +2075,7 @@ static int dissect_accesst(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_named_sequence[] = {
+static const ber_old_sequence_t T_named_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_componentName_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_accesst },
   { 0, 0, 0, NULL }
@@ -2083,8 +2083,8 @@ static const ber_sequence_t T_named_sequence[] = {
 
 static int
 dissect_mms_T_named(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_named_sequence, hf_index, ett_mms_T_named);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_named_sequence, hf_index, ett_mms_T_named);
 
   return offset;
 }
@@ -2099,7 +2099,7 @@ static const value_string mms_AlternateAccess_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AlternateAccess_item_choice[] = {
+static const ber_old_choice_t AlternateAccess_item_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unnamed },
   {   1, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_named_impl },
   { 0, 0, 0, 0, NULL }
@@ -2107,9 +2107,9 @@ static const ber_choice_t AlternateAccess_item_choice[] = {
 
 static int
 dissect_mms_AlternateAccess_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item,
+                                     NULL);
 
   return offset;
 }
@@ -2118,14 +2118,14 @@ static int dissect_AlternateAccess_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AlternateAccess_sequence_of[1] = {
+static const ber_old_sequence_t AlternateAccess_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AlternateAccess_item },
 };
 
 static int
 dissect_mms_AlternateAccess(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess);
 
   return offset;
 }
@@ -2134,7 +2134,7 @@ static int dissect_alternateAccess_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ScatteredAccessDescription_item_sequence[] = {
+static const ber_old_sequence_t ScatteredAccessDescription_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableSpecification },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl },
@@ -2143,8 +2143,8 @@ static const ber_sequence_t ScatteredAccessDescription_item_sequence[] = {
 
 static int
 dissect_mms_ScatteredAccessDescription_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item);
 
   return offset;
 }
@@ -2153,14 +2153,14 @@ static int dissect_ScatteredAccessDescription_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ScatteredAccessDescription_sequence_of[1] = {
+static const ber_old_sequence_t ScatteredAccessDescription_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ScatteredAccessDescription_item },
 };
 
 static int
 dissect_mms_ScatteredAccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription);
 
   return offset;
 }
@@ -2178,7 +2178,7 @@ static const value_string mms_VariableSpecification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t VariableSpecification_choice[] = {
+static const ber_old_choice_t VariableSpecification_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_name },
   {   1, BER_CLASS_CON, 1, 0, dissect_address },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_variableDescription_impl },
@@ -2189,15 +2189,15 @@ static const ber_choice_t VariableSpecification_choice[] = {
 
 static int
 dissect_mms_VariableSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 VariableSpecification_choice, hf_index, ett_mms_VariableSpecification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     VariableSpecification_choice, hf_index, ett_mms_VariableSpecification,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_listOfVariable_item2_sequence[] = {
+static const ber_old_sequence_t T_listOfVariable_item2_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl },
   { 0, 0, 0, NULL }
@@ -2205,8 +2205,8 @@ static const ber_sequence_t T_listOfVariable_item2_sequence[] = {
 
 static int
 dissect_mms_T_listOfVariable_item2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_listOfVariable_item2_sequence, hf_index, ett_mms_T_listOfVariable_item2);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_listOfVariable_item2_sequence, hf_index, ett_mms_T_listOfVariable_item2);
 
   return offset;
 }
@@ -2215,14 +2215,14 @@ static int dissect_listOfVariable_item2(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_listOfVariable2_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfVariable2_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item2 },
 };
 
 static int
 dissect_mms_T_listOfVariable2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfVariable2_sequence_of, hf_index, ett_mms_T_listOfVariable2);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfVariable2_sequence_of, hf_index, ett_mms_T_listOfVariable2);
 
   return offset;
 }
@@ -2237,7 +2237,7 @@ static const value_string mms_VariableAccessSpecification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t VariableAccessSpecification_choice[] = {
+static const ber_old_choice_t VariableAccessSpecification_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfVariable2_impl },
   {   1, BER_CLASS_CON, 1, 0, dissect_variableListName },
   { 0, 0, 0, 0, NULL }
@@ -2245,9 +2245,9 @@ static const ber_choice_t VariableAccessSpecification_choice[] = {
 
 static int
 dissect_mms_VariableAccessSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification,
+                                     NULL);
 
   return offset;
 }
@@ -2259,7 +2259,7 @@ static int dissect_variableAccessSpecification(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Read_Request_sequence[] = {
+static const ber_old_sequence_t Read_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_specificationWithResult_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn },
   { 0, 0, 0, NULL }
@@ -2267,8 +2267,8 @@ static const ber_sequence_t Read_Request_sequence[] = {
 
 static int
 dissect_mms_Read_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Read_Request_sequence, hf_index, ett_mms_Read_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Read_Request_sequence, hf_index, ett_mms_Read_Request);
 
   return offset;
 }
@@ -2277,14 +2277,14 @@ static int dissect_read_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Data_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Data_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfData_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data);
 
   return offset;
 }
@@ -2404,7 +2404,7 @@ static const value_string mms_Data_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Data_choice[] = {
+static const ber_old_choice_t Data_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array1_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure1_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_boolean1_impl },
@@ -2422,15 +2422,15 @@ static const ber_choice_t Data_choice[] = {
 
 static int
 dissect_mms_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Data_choice, hf_index, ett_mms_Data,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Data_choice, hf_index, ett_mms_Data,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t Write_Request_sequence[] = {
+static const ber_old_sequence_t Write_Request_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfData_impl },
   { 0, 0, 0, NULL }
@@ -2438,8 +2438,8 @@ static const ber_sequence_t Write_Request_sequence[] = {
 
 static int
 dissect_mms_Write_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Write_Request_sequence, hf_index, ett_mms_Write_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Write_Request_sequence, hf_index, ett_mms_Write_Request);
 
   return offset;
 }
@@ -2454,7 +2454,7 @@ static const value_string mms_GetVariableAccessAttributes_Request_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GetVariableAccessAttributes_Request_choice[] = {
+static const ber_old_choice_t GetVariableAccessAttributes_Request_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_name },
   {   1, BER_CLASS_CON, 1, 0, dissect_address },
   { 0, 0, 0, 0, NULL }
@@ -2462,9 +2462,9 @@ static const ber_choice_t GetVariableAccessAttributes_Request_choice[] = {
 
 static int
 dissect_mms_GetVariableAccessAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request,
+                                     NULL);
 
   return offset;
 }
@@ -2473,7 +2473,7 @@ static int dissect_getVariableAccessAttributes(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t DefineNamedVariable_Request_sequence[] = {
+static const ber_old_sequence_t DefineNamedVariable_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_variableName },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification },
@@ -2482,8 +2482,8 @@ static const ber_sequence_t DefineNamedVariable_Request_sequence[] = {
 
 static int
 dissect_mms_DefineNamedVariable_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request);
 
   return offset;
 }
@@ -2492,7 +2492,7 @@ static int dissect_defineNamedVariable_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t DefineScatteredAccess_Request_sequence[] = {
+static const ber_old_sequence_t DefineScatteredAccess_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_scatteredAccessName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl },
   { 0, 0, 0, NULL }
@@ -2500,8 +2500,8 @@ static const ber_sequence_t DefineScatteredAccess_Request_sequence[] = {
 
 static int
 dissect_mms_DefineScatteredAccess_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request);
 
   return offset;
 }
@@ -2543,14 +2543,14 @@ static int dissect_scopeOfDelete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfName_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName);
 
   return offset;
 }
@@ -2571,7 +2571,7 @@ static int dissect_eventEnrollmentNames_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t DeleteVariableAccess_Request_sequence[] = {
+static const ber_old_sequence_t DeleteVariableAccess_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl },
@@ -2580,8 +2580,8 @@ static const ber_sequence_t DeleteVariableAccess_Request_sequence[] = {
 
 static int
 dissect_mms_DeleteVariableAccess_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request);
 
   return offset;
 }
@@ -2590,7 +2590,7 @@ static int dissect_deleteVariableAccess_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_listOfVariable_item_sequence[] = {
+static const ber_old_sequence_t T_listOfVariable_item_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl },
   { 0, 0, 0, NULL }
@@ -2598,8 +2598,8 @@ static const ber_sequence_t T_listOfVariable_item_sequence[] = {
 
 static int
 dissect_mms_T_listOfVariable_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item);
 
   return offset;
 }
@@ -2608,14 +2608,14 @@ static int dissect_listOfVariable_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_listOfVariable_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfVariable_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item },
 };
 
 static int
 dissect_mms_T_listOfVariable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable);
 
   return offset;
 }
@@ -2624,7 +2624,7 @@ static int dissect_listOfVariable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DefineNamedVariableList_Request_sequence[] = {
+static const ber_old_sequence_t DefineNamedVariableList_Request_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableListName },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfVariable_impl },
   { 0, 0, 0, NULL }
@@ -2632,8 +2632,8 @@ static const ber_sequence_t DefineNamedVariableList_Request_sequence[] = {
 
 static int
 dissect_mms_DefineNamedVariableList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request);
 
   return offset;
 }
@@ -2675,7 +2675,7 @@ static int dissect_scopeOfDelete1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DeleteNamedVariableList_Request_sequence[] = {
+static const ber_old_sequence_t DeleteNamedVariableList_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariableListName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl },
@@ -2684,8 +2684,8 @@ static const ber_sequence_t DeleteNamedVariableList_Request_sequence[] = {
 
 static int
 dissect_mms_DeleteNamedVariableList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request);
 
   return offset;
 }
@@ -2694,7 +2694,7 @@ static int dissect_deleteNamedVariableList_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t DefineNamedType_Request_sequence[] = {
+static const ber_old_sequence_t DefineNamedType_Request_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeName },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification },
   { 0, 0, 0, NULL }
@@ -2702,8 +2702,8 @@ static const ber_sequence_t DefineNamedType_Request_sequence[] = {
 
 static int
 dissect_mms_DefineNamedType_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request);
 
   return offset;
 }
@@ -2745,7 +2745,7 @@ static int dissect_scopeOfDelete2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DeleteNamedType_Request_sequence[] = {
+static const ber_old_sequence_t DeleteNamedType_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete2_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfTypeName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl },
@@ -2754,8 +2754,8 @@ static const ber_sequence_t DeleteNamedType_Request_sequence[] = {
 
 static int
 dissect_mms_DeleteNamedType_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request);
 
   return offset;
 }
@@ -2764,14 +2764,14 @@ static int dissect_deleteNamedType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_listOfPromptData_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfPromptData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfPromptData_item },
 };
 
 static int
 dissect_mms_T_listOfPromptData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData);
 
   return offset;
 }
@@ -2780,7 +2780,7 @@ static int dissect_listOfPromptData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Input_Request_sequence[] = {
+static const ber_old_sequence_t Input_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_echo_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfPromptData_impl },
@@ -2790,8 +2790,8 @@ static const ber_sequence_t Input_Request_sequence[] = {
 
 static int
 dissect_mms_Input_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Input_Request_sequence, hf_index, ett_mms_Input_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Input_Request_sequence, hf_index, ett_mms_Input_Request);
 
   return offset;
 }
@@ -2800,14 +2800,14 @@ static int dissect_input_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_listOfOutputData_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfOutputData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfOutputData_item },
 };
 
 static int
 dissect_mms_T_listOfOutputData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData);
 
   return offset;
 }
@@ -2816,7 +2816,7 @@ static int dissect_listOfOutputData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Output_Request_sequence[] = {
+static const ber_old_sequence_t Output_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfOutputData_impl },
   { 0, 0, 0, NULL }
@@ -2824,8 +2824,8 @@ static const ber_sequence_t Output_Request_sequence[] = {
 
 static int
 dissect_mms_Output_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Output_Request_sequence, hf_index, ett_mms_Output_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Output_Request_sequence, hf_index, ett_mms_Output_Request);
 
   return offset;
 }
@@ -2894,7 +2894,7 @@ static int dissect_ae_invocation_id(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ApplicationReference_sequence[] = {
+static const ber_old_sequence_t ApplicationReference_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_ap_title },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ap_invocation_id },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_ae_qualifier },
@@ -2904,8 +2904,8 @@ static const ber_sequence_t ApplicationReference_sequence[] = {
 
 static int
 dissect_mms_ApplicationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference);
 
   return offset;
 }
@@ -2929,7 +2929,7 @@ static int dissect_sourceFileServer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t TakeControl_Request_sequence[] = {
+static const ber_old_sequence_t TakeControl_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
@@ -2943,8 +2943,8 @@ static const ber_sequence_t TakeControl_Request_sequence[] = {
 
 static int
 dissect_mms_TakeControl_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request);
 
   return offset;
 }
@@ -2953,7 +2953,7 @@ static int dissect_takeControl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RelinquishControl_Request_sequence[] = {
+static const ber_old_sequence_t RelinquishControl_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl },
   { 0, 0, 0, NULL }
@@ -2961,8 +2961,8 @@ static const ber_sequence_t RelinquishControl_Request_sequence[] = {
 
 static int
 dissect_mms_RelinquishControl_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request);
 
   return offset;
 }
@@ -2993,7 +2993,7 @@ static int dissect_numberOfHungTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t DefineSemaphore_Request_sequence[] = {
+static const ber_old_sequence_t DefineSemaphore_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numbersOfTokens_impl },
   { 0, 0, 0, NULL }
@@ -3001,8 +3001,8 @@ static const ber_sequence_t DefineSemaphore_Request_sequence[] = {
 
 static int
 dissect_mms_DefineSemaphore_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request);
 
   return offset;
 }
@@ -3035,7 +3035,7 @@ static int dissect_reportSemaphoreStatus_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = {
+static const ber_old_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameToStartAfter_impl },
   { 0, 0, 0, NULL }
@@ -3043,8 +3043,8 @@ static const ber_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = {
 
 static int
 dissect_mms_ReportPoolSemaphoreStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request);
 
   return offset;
 }
@@ -3073,7 +3073,7 @@ static int dissect_state2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = {
+static const ber_old_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state2_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_entryIdToStartAfter_impl },
@@ -3082,8 +3082,8 @@ static const ber_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = {
 
 static int
 dissect_mms_ReportSemaphoreEntryStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request);
 
   return offset;
 }
@@ -3092,14 +3092,14 @@ static int dissect_reportSemaphoreEntryStatus_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t T_listOfCapabilities1_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities1_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities1_sequence_of, hf_index, ett_mms_T_listOfCapabilities1);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities1_sequence_of, hf_index, ett_mms_T_listOfCapabilities1);
 
   return offset;
 }
@@ -3108,7 +3108,7 @@ static int dissect_listOfCapabilities1_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t InitiateDownloadSequence_Request_sequence[] = {
+static const ber_old_sequence_t InitiateDownloadSequence_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl },
@@ -3117,8 +3117,8 @@ static const ber_sequence_t InitiateDownloadSequence_Request_sequence[] = {
 
 static int
 dissect_mms_InitiateDownloadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request);
 
   return offset;
 }
@@ -3423,7 +3423,7 @@ static const value_string mms_T_errorClass_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_errorClass_choice[] = {
+static const ber_old_choice_t T_errorClass_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmd_state_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_application_reference_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_definition_impl },
@@ -3442,9 +3442,9 @@ static const ber_choice_t T_errorClass_choice[] = {
 
 static int
 dissect_mms_T_errorClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_errorClass_choice, hf_index, ett_mms_T_errorClass,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_errorClass_choice, hf_index, ett_mms_T_errorClass,
+                                     NULL);
 
   return offset;
 }
@@ -3627,7 +3627,7 @@ static const value_string mms_T_serviceSpecificInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_serviceSpecificInformation_choice[] = {
+static const ber_old_choice_t T_serviceSpecificInformation_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_obtainFile2_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_start2_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_stop2_impl },
@@ -3643,9 +3643,9 @@ static const ber_choice_t T_serviceSpecificInformation_choice[] = {
 
 static int
 dissect_mms_T_serviceSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation,
+                                     NULL);
 
   return offset;
 }
@@ -3654,7 +3654,7 @@ static int dissect_serviceSpecificInformation(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ServiceError_sequence[] = {
+static const ber_old_sequence_t ServiceError_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_errorClass },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalCode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalDescription_impl },
@@ -3664,8 +3664,8 @@ static const ber_sequence_t ServiceError_sequence[] = {
 
 static int
 dissect_mms_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceError_sequence, hf_index, ett_mms_ServiceError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceError_sequence, hf_index, ett_mms_ServiceError);
 
   return offset;
 }
@@ -3680,7 +3680,7 @@ static int dissect_failure1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t TerminateDownloadSequence_Request_sequence[] = {
+static const ber_old_sequence_t TerminateDownloadSequence_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_discard_impl },
   { 0, 0, 0, NULL }
@@ -3688,8 +3688,8 @@ static const ber_sequence_t TerminateDownloadSequence_Request_sequence[] = {
 
 static int
 dissect_mms_TerminateDownloadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request);
 
   return offset;
 }
@@ -3734,14 +3734,14 @@ static int dissect_terminateUploadSequence_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t T_listOfCapabilities3_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities3_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities3_sequence_of, hf_index, ett_mms_T_listOfCapabilities3);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities3_sequence_of, hf_index, ett_mms_T_listOfCapabilities3);
 
   return offset;
 }
@@ -3764,14 +3764,14 @@ static int dissect_FileName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t FileName_sequence_of[1] = {
+static const ber_old_sequence_t FileName_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_FileName_item },
 };
 
 static int
 dissect_mms_FileName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      FileName_sequence_of, hf_index, ett_mms_FileName);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          FileName_sequence_of, hf_index, ett_mms_FileName);
 
   return offset;
 }
@@ -3804,7 +3804,7 @@ static int dissect_filename_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t RequestDomainDownload_Request_sequence[] = {
+static const ber_old_sequence_t RequestDomainDownload_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities3_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl },
@@ -3814,8 +3814,8 @@ static const ber_sequence_t RequestDomainDownload_Request_sequence[] = {
 
 static int
 dissect_mms_RequestDomainDownload_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request);
 
   return offset;
 }
@@ -3824,7 +3824,7 @@ static int dissect_requestDomainDownload_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t RequestDomainUpload_Request_sequence[] = {
+static const ber_old_sequence_t RequestDomainUpload_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileName_impl },
   { 0, 0, 0, NULL }
@@ -3832,8 +3832,8 @@ static const ber_sequence_t RequestDomainUpload_Request_sequence[] = {
 
 static int
 dissect_mms_RequestDomainUpload_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request);
 
   return offset;
 }
@@ -3842,14 +3842,14 @@ static int dissect_requestDomainUpload_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_listOfCapabilities4_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities4_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities4_sequence_of, hf_index, ett_mms_T_listOfCapabilities4);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities4_sequence_of, hf_index, ett_mms_T_listOfCapabilities4);
 
   return offset;
 }
@@ -3858,7 +3858,7 @@ static int dissect_listOfCapabilities4_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LoadDomainContent_Request_sequence[] = {
+static const ber_old_sequence_t LoadDomainContent_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities4_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl },
@@ -3869,8 +3869,8 @@ static const ber_sequence_t LoadDomainContent_Request_sequence[] = {
 
 static int
 dissect_mms_LoadDomainContent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request);
 
   return offset;
 }
@@ -3879,7 +3879,7 @@ static int dissect_loadDomainContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t StoreDomainContent_Request_sequence[] = {
+static const ber_old_sequence_t StoreDomainContent_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_filenName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_thirdParty_impl },
@@ -3888,8 +3888,8 @@ static const ber_sequence_t StoreDomainContent_Request_sequence[] = {
 
 static int
 dissect_mms_StoreDomainContent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request);
 
   return offset;
 }
@@ -3922,14 +3922,14 @@ static int dissect_getDomainAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfIdentifier_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier);
 
   return offset;
 }
@@ -3947,7 +3947,7 @@ static int dissect_listOfDomainNames_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t CreateProgramInvocation_Request_sequence[] = {
+static const ber_old_sequence_t CreateProgramInvocation_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reusable_impl },
@@ -3957,8 +3957,8 @@ static const ber_sequence_t CreateProgramInvocation_Request_sequence[] = {
 
 static int
 dissect_mms_CreateProgramInvocation_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request);
 
   return offset;
 }
@@ -3985,7 +3985,7 @@ static const value_string mms_T_executionArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_executionArgument_choice[] = {
+static const ber_old_choice_t T_executionArgument_choice[] = {
   {   0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString },
   { 0, 0, 0, 0, NULL }
@@ -3993,9 +3993,9 @@ static const ber_choice_t T_executionArgument_choice[] = {
 
 static int
 dissect_mms_T_executionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_executionArgument_choice, hf_index, ett_mms_T_executionArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_executionArgument_choice, hf_index, ett_mms_T_executionArgument,
+                                     NULL);
 
   return offset;
 }
@@ -4004,7 +4004,7 @@ static int dissect_executionArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Start_Request_sequence[] = {
+static const ber_old_sequence_t Start_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument },
   { 0, 0, 0, NULL }
@@ -4012,8 +4012,8 @@ static const ber_sequence_t Start_Request_sequence[] = {
 
 static int
 dissect_mms_Start_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Start_Request_sequence, hf_index, ett_mms_Start_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Start_Request_sequence, hf_index, ett_mms_Start_Request);
 
   return offset;
 }
@@ -4022,15 +4022,15 @@ static int dissect_start_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Stop_Request_sequence[] = {
+static const ber_old_sequence_t Stop_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_Stop_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Stop_Request_sequence, hf_index, ett_mms_Stop_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Stop_Request_sequence, hf_index, ett_mms_Stop_Request);
 
   return offset;
 }
@@ -4045,7 +4045,7 @@ static const value_string mms_T_executionArgument1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_executionArgument1_choice[] = {
+static const ber_old_choice_t T_executionArgument1_choice[] = {
   {   0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString },
   { 0, 0, 0, 0, NULL }
@@ -4053,9 +4053,9 @@ static const ber_choice_t T_executionArgument1_choice[] = {
 
 static int
 dissect_mms_T_executionArgument1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_executionArgument1_choice, hf_index, ett_mms_T_executionArgument1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_executionArgument1_choice, hf_index, ett_mms_T_executionArgument1,
+                                     NULL);
 
   return offset;
 }
@@ -4064,7 +4064,7 @@ static int dissect_executionArgument1(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t Resume_Request_sequence[] = {
+static const ber_old_sequence_t Resume_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument1 },
   { 0, 0, 0, NULL }
@@ -4072,8 +4072,8 @@ static const ber_sequence_t Resume_Request_sequence[] = {
 
 static int
 dissect_mms_Resume_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Resume_Request_sequence, hf_index, ett_mms_Resume_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Resume_Request_sequence, hf_index, ett_mms_Resume_Request);
 
   return offset;
 }
@@ -4082,15 +4082,15 @@ static int dissect_resume_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Reset_Request_sequence[] = {
+static const ber_old_sequence_t Reset_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_Reset_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reset_Request_sequence, hf_index, ett_mms_Reset_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reset_Request_sequence, hf_index, ett_mms_Reset_Request);
 
   return offset;
 }
@@ -4099,15 +4099,15 @@ static int dissect_reset_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Kill_Request_sequence[] = {
+static const ber_old_sequence_t Kill_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_Kill_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Kill_Request_sequence, hf_index, ett_mms_Kill_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Kill_Request_sequence, hf_index, ett_mms_Kill_Request);
 
   return offset;
 }
@@ -4128,7 +4128,7 @@ static int dissect_getProgramInvocationAttributes_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t ObtainFile_Request_sequence[] = {
+static const ber_old_sequence_t ObtainFile_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sourceFileServer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sourceFile_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_destinationFile_impl },
@@ -4137,8 +4137,8 @@ static const ber_sequence_t ObtainFile_Request_sequence[] = {
 
 static int
 dissect_mms_ObtainFile_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request);
 
   return offset;
 }
@@ -4166,7 +4166,7 @@ static int dissect_class1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t DefineEventCondition_Request_sequence[] = {
+static const ber_old_sequence_t DefineEventCondition_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prio_rity_impl },
@@ -4179,8 +4179,8 @@ static const ber_sequence_t DefineEventCondition_Request_sequence[] = {
 
 static int
 dissect_mms_DefineEventCondition_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request);
 
   return offset;
 }
@@ -4197,7 +4197,7 @@ static const value_string mms_DeleteEventCondition_Request_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DeleteEventCondition_Request_choice[] = {
+static const ber_old_choice_t DeleteEventCondition_Request_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aa_specific1_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_domain_impl },
@@ -4207,9 +4207,9 @@ static const ber_choice_t DeleteEventCondition_Request_choice[] = {
 
 static int
 dissect_mms_DeleteEventCondition_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request,
+                                     NULL);
 
   return offset;
 }
@@ -4242,7 +4242,7 @@ static int dissect_reportEventConditionStatus(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AlterEventConditionMonitoring_Request_sequence[] = {
+static const ber_old_sequence_t AlterEventConditionMonitoring_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enabled_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
@@ -4253,8 +4253,8 @@ static const ber_sequence_t AlterEventConditionMonitoring_Request_sequence[] = {
 
 static int
 dissect_mms_AlterEventConditionMonitoring_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request);
 
   return offset;
 }
@@ -4263,7 +4263,7 @@ static int dissect_alterEventConditionMonitoring_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t TriggerEvent_Request_sequence[] = {
+static const ber_old_sequence_t TriggerEvent_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl },
   { 0, 0, 0, NULL }
@@ -4271,8 +4271,8 @@ static const ber_sequence_t TriggerEvent_Request_sequence[] = {
 
 static int
 dissect_mms_TriggerEvent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request);
 
   return offset;
 }
@@ -4281,7 +4281,7 @@ static int dissect_triggerEvent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t DefineEventAction_Request_sequence[] = {
+static const ber_old_sequence_t DefineEventAction_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventActionName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl },
   { 0, 0, 0, NULL }
@@ -4289,8 +4289,8 @@ static const ber_sequence_t DefineEventAction_Request_sequence[] = {
 
 static int
 dissect_mms_DefineEventAction_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request);
 
   return offset;
 }
@@ -4307,7 +4307,7 @@ static const value_string mms_DeleteEventAction_Request_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DeleteEventAction_Request_choice[] = {
+static const ber_old_choice_t DeleteEventAction_Request_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aa_specific1_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_domain_impl },
@@ -4317,9 +4317,9 @@ static const ber_choice_t DeleteEventAction_Request_choice[] = {
 
 static int
 dissect_mms_DeleteEventAction_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request,
+                                     NULL);
 
   return offset;
 }
@@ -4376,7 +4376,7 @@ static int dissect_alarmAcknowledgmentRule_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t DefineEventEnrollment_Request_sequence[] = {
+static const ber_old_sequence_t DefineEventEnrollment_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventConditionTransition_impl },
@@ -4388,8 +4388,8 @@ static const ber_sequence_t DefineEventEnrollment_Request_sequence[] = {
 
 static int
 dissect_mms_DefineEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request);
 
   return offset;
 }
@@ -4405,7 +4405,7 @@ static const value_string mms_DeleteEventEnrollment_Request_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DeleteEventEnrollment_Request_choice[] = {
+static const ber_old_choice_t DeleteEventEnrollment_Request_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl },
   {   1, BER_CLASS_CON, 1, 0, dissect_ec },
   {   2, BER_CLASS_CON, 2, 0, dissect_ea },
@@ -4414,9 +4414,9 @@ static const ber_choice_t DeleteEventEnrollment_Request_choice[] = {
 
 static int
 dissect_mms_DeleteEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request,
+                                     NULL);
 
   return offset;
 }
@@ -4425,7 +4425,7 @@ static int dissect_deleteEventEnrollment(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AlterEventEnrollment_Request_sequence[] = {
+static const ber_old_sequence_t AlterEventEnrollment_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgmentRule_impl },
@@ -4434,8 +4434,8 @@ static const ber_sequence_t AlterEventEnrollment_Request_sequence[] = {
 
 static int
 dissect_mms_AlterEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request);
 
   return offset;
 }
@@ -4477,7 +4477,7 @@ static int dissect_scopeOfRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = {
+static const ber_old_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfRequest_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventEnrollmentNames_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_clientApplication },
@@ -4489,8 +4489,8 @@ static const ber_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = {
 
 static int
 dissect_mms_GetEventEnrollmentAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request);
 
   return offset;
 }
@@ -4528,7 +4528,7 @@ static const value_string mms_EventTime_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t EventTime_choice[] = {
+static const ber_old_choice_t EventTime_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeOfDayT_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeSequenceIdentifier_impl },
   { 0, 0, 0, 0, NULL }
@@ -4536,9 +4536,9 @@ static const ber_choice_t EventTime_choice[] = {
 
 static int
 dissect_mms_EventTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 EventTime_choice, hf_index, ett_mms_EventTime,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     EventTime_choice, hf_index, ett_mms_EventTime,
+                                     NULL);
 
   return offset;
 }
@@ -4562,7 +4562,7 @@ static int dissect_timeIdleAcknowledged(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AcknowledgeEventNotification_Request_sequence[] = {
+static const ber_old_sequence_t AcknowledgeEventNotification_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_acknowledgedState_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_timeOfAcknowledgedTransition },
@@ -4571,8 +4571,8 @@ static const ber_sequence_t AcknowledgeEventNotification_Request_sequence[] = {
 
 static int
 dissect_mms_AcknowledgeEventNotification_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request);
 
   return offset;
 }
@@ -4601,7 +4601,7 @@ static int dissect_acknowledgmentFilter_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_severityFilter_sequence[] = {
+static const ber_old_sequence_t T_severityFilter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl },
   { 0, 0, 0, NULL }
@@ -4609,8 +4609,8 @@ static const ber_sequence_t T_severityFilter_sequence[] = {
 
 static int
 dissect_mms_T_severityFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter);
 
   return offset;
 }
@@ -4619,7 +4619,7 @@ static int dissect_severityFilter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GetAlarmSummary_Request_sequence[] = {
+static const ber_old_sequence_t GetAlarmSummary_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acknowledgmentFilter_impl },
@@ -4630,8 +4630,8 @@ static const ber_sequence_t GetAlarmSummary_Request_sequence[] = {
 
 static int
 dissect_mms_GetAlarmSummary_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request);
 
   return offset;
 }
@@ -4660,7 +4660,7 @@ static int dissect_acknowledgmentFilter1_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t T_severityFilter1_sequence[] = {
+static const ber_old_sequence_t T_severityFilter1_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl },
   { 0, 0, 0, NULL }
@@ -4668,8 +4668,8 @@ static const ber_sequence_t T_severityFilter1_sequence[] = {
 
 static int
 dissect_mms_T_severityFilter1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_severityFilter1_sequence, hf_index, ett_mms_T_severityFilter1);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_severityFilter1_sequence, hf_index, ett_mms_T_severityFilter1);
 
   return offset;
 }
@@ -4678,7 +4678,7 @@ static int dissect_severityFilter1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = {
+static const ber_old_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acknowledgmentFilter1_impl },
@@ -4689,8 +4689,8 @@ static const ber_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = {
 
 static int
 dissect_mms_GetAlarmEnrollmentSummary_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request);
 
   return offset;
 }
@@ -4705,7 +4705,7 @@ static const value_string mms_T_rangeStartSpecification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_rangeStartSpecification_choice[] = {
+static const ber_old_choice_t T_rangeStartSpecification_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_startingTime_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_startingEntry_impl },
   { 0, 0, 0, 0, NULL }
@@ -4713,9 +4713,9 @@ static const ber_choice_t T_rangeStartSpecification_choice[] = {
 
 static int
 dissect_mms_T_rangeStartSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification,
+                                     NULL);
 
   return offset;
 }
@@ -4730,7 +4730,7 @@ static const value_string mms_T_rangeStopSpecification_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_rangeStopSpecification_choice[] = {
+static const ber_old_choice_t T_rangeStopSpecification_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_endingTime_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfEntries_impl },
   { 0, 0, 0, 0, NULL }
@@ -4738,9 +4738,9 @@ static const ber_choice_t T_rangeStopSpecification_choice[] = {
 
 static int
 dissect_mms_T_rangeStopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification,
+                                     NULL);
 
   return offset;
 }
@@ -4749,14 +4749,14 @@ static int dissect_rangeStopSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_listOfVariables_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfVariables_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item },
 };
 
 static int
 dissect_mms_T_listOfVariables(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables);
 
   return offset;
 }
@@ -4765,7 +4765,7 @@ static int dissect_listOfVariables_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_entryToStartAfter_sequence[] = {
+static const ber_old_sequence_t T_entryToStartAfter_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeSpecification_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entrySpecification_impl },
   { 0, 0, 0, NULL }
@@ -4773,8 +4773,8 @@ static const ber_sequence_t T_entryToStartAfter_sequence[] = {
 
 static int
 dissect_mms_T_entryToStartAfter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter);
 
   return offset;
 }
@@ -4783,7 +4783,7 @@ static int dissect_entryToStartAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ReadJournal_Request_sequence[] = {
+static const ber_old_sequence_t ReadJournal_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_rangeStartSpecification },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_rangeStopSpecification },
@@ -4794,8 +4794,8 @@ static const ber_sequence_t ReadJournal_Request_sequence[] = {
 
 static int
 dissect_mms_ReadJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request);
 
   return offset;
 }
@@ -4816,7 +4816,7 @@ static int dissect_additionalDetail(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_event_sequence[] = {
+static const ber_old_sequence_t T_event_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_currentState_impl },
   { 0, 0, 0, NULL }
@@ -4824,8 +4824,8 @@ static const ber_sequence_t T_event_sequence[] = {
 
 static int
 dissect_mms_T_event(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_event_sequence, hf_index, ett_mms_T_event);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_event_sequence, hf_index, ett_mms_T_event);
 
   return offset;
 }
@@ -4834,7 +4834,7 @@ static int dissect_event_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_listOfVariables_item_sequence[] = {
+static const ber_old_sequence_t T_listOfVariables_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_variableTag_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_valueSpecification },
   { 0, 0, 0, NULL }
@@ -4842,8 +4842,8 @@ static const ber_sequence_t T_listOfVariables_item_sequence[] = {
 
 static int
 dissect_mms_T_listOfVariables_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item);
 
   return offset;
 }
@@ -4852,14 +4852,14 @@ static int dissect_listOfVariables_item1(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_listOfVariables1_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfVariables1_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item1 },
 };
 
 static int
 dissect_mms_T_listOfVariables1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfVariables1_sequence_of, hf_index, ett_mms_T_listOfVariables1);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfVariables1_sequence_of, hf_index, ett_mms_T_listOfVariables1);
 
   return offset;
 }
@@ -4868,7 +4868,7 @@ static int dissect_listOfVariables1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t T_data_sequence[] = {
+static const ber_old_sequence_t T_data_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_event_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariables1_impl },
   { 0, 0, 0, NULL }
@@ -4876,8 +4876,8 @@ static const ber_sequence_t T_data_sequence[] = {
 
 static int
 dissect_mms_T_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_data_sequence, hf_index, ett_mms_T_data);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_data_sequence, hf_index, ett_mms_T_data);
 
   return offset;
 }
@@ -4892,7 +4892,7 @@ static const value_string mms_T_entryForm_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_entryForm_choice[] = {
+static const ber_old_choice_t T_entryForm_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_data_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_annotation_impl },
   { 0, 0, 0, 0, NULL }
@@ -4900,9 +4900,9 @@ static const ber_choice_t T_entryForm_choice[] = {
 
 static int
 dissect_mms_T_entryForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_entryForm_choice, hf_index, ett_mms_T_entryForm,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_entryForm_choice, hf_index, ett_mms_T_entryForm,
+                                     NULL);
 
   return offset;
 }
@@ -4911,7 +4911,7 @@ static int dissect_entryForm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t EntryContent_sequence[] = {
+static const ber_old_sequence_t EntryContent_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_occurenceTime_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_additionalDetail },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entryForm },
@@ -4920,8 +4920,8 @@ static const ber_sequence_t EntryContent_sequence[] = {
 
 static int
 dissect_mms_EntryContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EntryContent_sequence, hf_index, ett_mms_EntryContent);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EntryContent_sequence, hf_index, ett_mms_EntryContent);
 
   return offset;
 }
@@ -4933,14 +4933,14 @@ static int dissect_listOfJournalEntry_item1(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item1 },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_EntryContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent);
 
   return offset;
 }
@@ -4949,7 +4949,7 @@ static int dissect_listOfJournalEntry1_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t WriteJournal_Request_sequence[] = {
+static const ber_old_sequence_t WriteJournal_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry1_impl },
   { 0, 0, 0, NULL }
@@ -4957,8 +4957,8 @@ static const ber_sequence_t WriteJournal_Request_sequence[] = {
 
 static int
 dissect_mms_WriteJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request);
 
   return offset;
 }
@@ -4967,7 +4967,7 @@ static int dissect_writeJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_limitSpecification_sequence[] = {
+static const ber_old_sequence_t T_limitSpecification_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_limitingTime_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitingEntry_impl },
   { 0, 0, 0, NULL }
@@ -4975,8 +4975,8 @@ static const ber_sequence_t T_limitSpecification_sequence[] = {
 
 static int
 dissect_mms_T_limitSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification);
 
   return offset;
 }
@@ -4985,7 +4985,7 @@ static int dissect_limitSpecification_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t InitializeJournal_Request_sequence[] = {
+static const ber_old_sequence_t InitializeJournal_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitSpecification_impl },
   { 0, 0, 0, NULL }
@@ -4993,8 +4993,8 @@ static const ber_sequence_t InitializeJournal_Request_sequence[] = {
 
 static int
 dissect_mms_InitializeJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request);
 
   return offset;
 }
@@ -5015,15 +5015,15 @@ static int dissect_reportJournalStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CreateJournal_Request_sequence[] = {
+static const ber_old_sequence_t CreateJournal_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_CreateJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request);
 
   return offset;
 }
@@ -5032,15 +5032,15 @@ static int dissect_createJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t DeleteJournal_Request_sequence[] = {
+static const ber_old_sequence_t DeleteJournal_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_DeleteJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request);
 
   return offset;
 }
@@ -5049,15 +5049,15 @@ static int dissect_deleteJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t GetCapabilityList_Request_sequence[] = {
+static const ber_old_sequence_t GetCapabilityList_Request_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_continueAfter1 },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_GetCapabilityList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request);
 
   return offset;
 }
@@ -5066,7 +5066,7 @@ static int dissect_getCapabilityList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t FileOpen_Request_sequence[] = {
+static const ber_old_sequence_t FileOpen_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_initialPosition_impl },
   { 0, 0, 0, NULL }
@@ -5074,8 +5074,8 @@ static const ber_sequence_t FileOpen_Request_sequence[] = {
 
 static int
 dissect_mms_FileOpen_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request);
 
   return offset;
 }
@@ -5108,7 +5108,7 @@ static int dissect_fileClose_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t FileRename_Request_sequence[] = {
+static const ber_old_sequence_t FileRename_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentFileName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_newFileName_impl },
   { 0, 0, 0, NULL }
@@ -5116,8 +5116,8 @@ static const ber_sequence_t FileRename_Request_sequence[] = {
 
 static int
 dissect_mms_FileRename_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request);
 
   return offset;
 }
@@ -5138,7 +5138,7 @@ static int dissect_fileDelete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t FileDirectory_Request_sequence[] = {
+static const ber_old_sequence_t FileDirectory_Request_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_fileSpecification_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_continueAfter3_impl },
   { 0, 0, 0, NULL }
@@ -5146,8 +5146,8 @@ static const ber_sequence_t FileDirectory_Request_sequence[] = {
 
 static int
 dissect_mms_FileDirectory_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request);
 
   return offset;
 }
@@ -5238,7 +5238,7 @@ static const value_string mms_ConfirmedServiceRequest_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConfirmedServiceRequest_choice[] = {
+static const ber_old_choice_t ConfirmedServiceRequest_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_status_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getNameList_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_identify_impl },
@@ -5322,9 +5322,9 @@ static const ber_choice_t ConfirmedServiceRequest_choice[] = {
 
 static int
 dissect_mms_ConfirmedServiceRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest,
+                                     NULL);
 
   return offset;
 }
@@ -5338,16 +5338,16 @@ static const value_string mms_CS_Request_Detail_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CS_Request_Detail_choice[] = {
+static const ber_old_choice_t CS_Request_Detail_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_foo },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_mms_CS_Request_Detail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail,
+                                     NULL);
 
   return offset;
 }
@@ -5356,7 +5356,7 @@ static int dissect_cs_request_detail(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Confirmed_RequestPDU_sequence[] = {
+static const ber_old_sequence_t Confirmed_RequestPDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_listOfModifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceRequest },
@@ -5366,8 +5366,8 @@ static const ber_sequence_t Confirmed_RequestPDU_sequence[] = {
 
 static int
 dissect_mms_Confirmed_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU);
 
   return offset;
 }
@@ -5432,7 +5432,7 @@ static int dissect_localDetail_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Status_Response_sequence[] = {
+static const ber_old_sequence_t Status_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmdLogicalStatus_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_vmdPhysicalStatus_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetail_impl },
@@ -5441,8 +5441,8 @@ static const ber_sequence_t Status_Response_sequence[] = {
 
 static int
 dissect_mms_Status_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Status_Response_sequence, hf_index, ett_mms_Status_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Status_Response_sequence, hf_index, ett_mms_Status_Response);
 
   return offset;
 }
@@ -5451,7 +5451,7 @@ static int dissect_status1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t GetNameList_Response_sequence[] = {
+static const ber_old_sequence_t GetNameList_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -5459,8 +5459,8 @@ static const ber_sequence_t GetNameList_Response_sequence[] = {
 
 static int
 dissect_mms_GetNameList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response);
 
   return offset;
 }
@@ -5481,14 +5481,14 @@ static int dissect_listOfAbstractSyntaxes_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_listOfAbstractSyntaxes_item },
 };
 
 static int
 dissect_mms_T_listOfAbstractSyntaxes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes);
 
   return offset;
 }
@@ -5497,7 +5497,7 @@ static int dissect_listOfAbstractSyntaxes_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t Identify_Response_sequence[] = {
+static const ber_old_sequence_t Identify_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vendorName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modelName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_revision_impl },
@@ -5507,8 +5507,8 @@ static const ber_sequence_t Identify_Response_sequence[] = {
 
 static int
 dissect_mms_Identify_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Identify_Response_sequence, hf_index, ett_mms_Identify_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Identify_Response_sequence, hf_index, ett_mms_Identify_Response);
 
   return offset;
 }
@@ -5574,7 +5574,7 @@ static const value_string mms_AccessResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AccessResult_choice[] = {
+static const ber_old_choice_t AccessResult_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failure_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array1_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure1_impl },
@@ -5593,9 +5593,9 @@ static const ber_choice_t AccessResult_choice[] = {
 
 static int
 dissect_mms_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AccessResult_choice, hf_index, ett_mms_AccessResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AccessResult_choice, hf_index, ett_mms_AccessResult,
+                                     NULL);
 
   return offset;
 }
@@ -5604,14 +5604,14 @@ static int dissect_listOfAccessResult_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfAccessResult_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult);
 
   return offset;
 }
@@ -5620,7 +5620,7 @@ static int dissect_listOfAccessResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Read_Response_sequence[] = {
+static const ber_old_sequence_t Read_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl },
   { 0, 0, 0, NULL }
@@ -5628,8 +5628,8 @@ static const ber_sequence_t Read_Response_sequence[] = {
 
 static int
 dissect_mms_Read_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Read_Response_sequence, hf_index, ett_mms_Read_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Read_Response_sequence, hf_index, ett_mms_Read_Response);
 
   return offset;
 }
@@ -5644,7 +5644,7 @@ static const value_string mms_Write_Response_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Write_Response_item_choice[] = {
+static const ber_old_choice_t Write_Response_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failure_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_success_impl },
   { 0, 0, 0, 0, NULL }
@@ -5652,9 +5652,9 @@ static const ber_choice_t Write_Response_item_choice[] = {
 
 static int
 dissect_mms_Write_Response_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Write_Response_item_choice, hf_index, ett_mms_Write_Response_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Write_Response_item_choice, hf_index, ett_mms_Write_Response_item,
+                                     NULL);
 
   return offset;
 }
@@ -5663,14 +5663,14 @@ static int dissect_Write_Response_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Write_Response_sequence_of[1] = {
+static const ber_old_sequence_t Write_Response_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Write_Response_item },
 };
 
 static int
 dissect_mms_Write_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Write_Response_sequence_of, hf_index, ett_mms_Write_Response);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Write_Response_sequence_of, hf_index, ett_mms_Write_Response);
 
   return offset;
 }
@@ -5679,7 +5679,7 @@ static int dissect_write1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t GetVariableAccessAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetVariableAccessAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_address },
   { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_typeSpecification },
@@ -5688,8 +5688,8 @@ static const ber_sequence_t GetVariableAccessAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetVariableAccessAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response);
 
   return offset;
 }
@@ -5722,7 +5722,7 @@ static int dissect_defineScatteredAccess1_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t GetScatteredAccessAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetScatteredAccessAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl },
   { 0, 0, 0, NULL }
@@ -5730,8 +5730,8 @@ static const ber_sequence_t GetScatteredAccessAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetScatteredAccessAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response);
 
   return offset;
 }
@@ -5740,7 +5740,7 @@ static int dissect_getScatteredAccessAttributes1_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_sequence_t DeleteVariableAccess_Response_sequence[] = {
+static const ber_old_sequence_t DeleteVariableAccess_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl },
   { 0, 0, 0, NULL }
@@ -5748,8 +5748,8 @@ static const ber_sequence_t DeleteVariableAccess_Response_sequence[] = {
 
 static int
 dissect_mms_DeleteVariableAccess_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response);
 
   return offset;
 }
@@ -5770,7 +5770,7 @@ static int dissect_defineNamedVariableList1_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_listOfVariable_item1_sequence[] = {
+static const ber_old_sequence_t T_listOfVariable_item1_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl },
   { 0, 0, 0, NULL }
@@ -5778,8 +5778,8 @@ static const ber_sequence_t T_listOfVariable_item1_sequence[] = {
 
 static int
 dissect_mms_T_listOfVariable_item1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_listOfVariable_item1_sequence, hf_index, ett_mms_T_listOfVariable_item1);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_listOfVariable_item1_sequence, hf_index, ett_mms_T_listOfVariable_item1);
 
   return offset;
 }
@@ -5788,14 +5788,14 @@ static int dissect_listOfVariable_item1(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_listOfVariable1_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfVariable1_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item1 },
 };
 
 static int
 dissect_mms_T_listOfVariable1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfVariable1_sequence_of, hf_index, ett_mms_T_listOfVariable1);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfVariable1_sequence_of, hf_index, ett_mms_T_listOfVariable1);
 
   return offset;
 }
@@ -5804,7 +5804,7 @@ static int dissect_listOfVariable1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GetNamedVariableListAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetNamedVariableListAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfVariable1_impl },
   { 0, 0, 0, NULL }
@@ -5812,8 +5812,8 @@ static const ber_sequence_t GetNamedVariableListAttributes_Response_sequence[] =
 
 static int
 dissect_mms_GetNamedVariableListAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response);
 
   return offset;
 }
@@ -5822,7 +5822,7 @@ static int dissect_getNamedVariableListAttributes1_impl(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t DeleteNamedVariableList_Response_sequence[] = {
+static const ber_old_sequence_t DeleteNamedVariableList_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl },
   { 0, 0, 0, NULL }
@@ -5830,8 +5830,8 @@ static const ber_sequence_t DeleteNamedVariableList_Response_sequence[] = {
 
 static int
 dissect_mms_DeleteNamedVariableList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response);
 
   return offset;
 }
@@ -5852,7 +5852,7 @@ static int dissect_defineNamedType1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t GetNamedTypeAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetNamedTypeAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification },
   { 0, 0, 0, NULL }
@@ -5860,8 +5860,8 @@ static const ber_sequence_t GetNamedTypeAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetNamedTypeAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response);
 
   return offset;
 }
@@ -5870,7 +5870,7 @@ static int dissect_getNamedTypeAttributes1_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t DeleteNamedType_Response_sequence[] = {
+static const ber_old_sequence_t DeleteNamedType_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl },
   { 0, 0, 0, NULL }
@@ -5878,8 +5878,8 @@ static const ber_sequence_t DeleteNamedType_Response_sequence[] = {
 
 static int
 dissect_mms_DeleteNamedType_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response);
 
   return offset;
 }
@@ -5920,7 +5920,7 @@ static const value_string mms_TakeControl_Response_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TakeControl_Response_choice[] = {
+static const ber_old_choice_t TakeControl_Response_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_noResult_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_namedToken_impl },
   { 0, 0, 0, 0, NULL }
@@ -5928,9 +5928,9 @@ static const ber_choice_t TakeControl_Response_choice[] = {
 
 static int
 dissect_mms_TakeControl_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response,
+                                     NULL);
 
   return offset;
 }
@@ -5994,7 +5994,7 @@ static int dissect_class_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ReportSemaphoreStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportSemaphoreStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberOfTokens_impl },
@@ -6005,8 +6005,8 @@ static const ber_sequence_t ReportSemaphoreStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportSemaphoreStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response);
 
   return offset;
 }
@@ -6022,7 +6022,7 @@ static const value_string mms_T_listOfNamedTokens_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_listOfNamedTokens_item_choice[] = {
+static const ber_old_choice_t T_listOfNamedTokens_item_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_freeNamedToken_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ownedNamedToken_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_hungNamedToken_impl },
@@ -6031,9 +6031,9 @@ static const ber_choice_t T_listOfNamedTokens_item_choice[] = {
 
 static int
 dissect_mms_T_listOfNamedTokens_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item,
+                                     NULL);
 
   return offset;
 }
@@ -6042,14 +6042,14 @@ static int dissect_listOfNamedTokens_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_listOfNamedTokens_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfNamedTokens_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfNamedTokens_item },
 };
 
 static int
 dissect_mms_T_listOfNamedTokens(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens);
 
   return offset;
 }
@@ -6058,7 +6058,7 @@ static int dissect_listOfNamedTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfNamedTokens_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -6066,8 +6066,8 @@ static const ber_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportPoolSemaphoreStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response);
 
   return offset;
 }
@@ -6095,7 +6095,7 @@ static int dissect_entryClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SemaphoreEntry_sequence[] = {
+static const ber_old_sequence_t SemaphoreEntry_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryId_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entryClass_impl },
   { BER_CLASS_CON, 2, 0, dissect_applicationReference },
@@ -6109,8 +6109,8 @@ static const ber_sequence_t SemaphoreEntry_sequence[] = {
 
 static int
 dissect_mms_SemaphoreEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry);
 
   return offset;
 }
@@ -6119,14 +6119,14 @@ static int dissect_listOfSemaphoreEntry_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfSemaphoreEntry_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_SemaphoreEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry);
 
   return offset;
 }
@@ -6135,7 +6135,7 @@ static int dissect_listOfSemaphoreEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfSemaphoreEntry_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -6143,8 +6143,8 @@ static const ber_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportSemaphoreEntryStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response);
 
   return offset;
 }
@@ -6171,7 +6171,7 @@ static const value_string mms_T_loadData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_loadData_choice[] = {
+static const ber_old_choice_t T_loadData_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_coded_impl },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_coded },
   { 0, 0, 0, 0, NULL }
@@ -6179,9 +6179,9 @@ static const ber_choice_t T_loadData_choice[] = {
 
 static int
 dissect_mms_T_loadData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_loadData_choice, hf_index, ett_mms_T_loadData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_loadData_choice, hf_index, ett_mms_T_loadData,
+                                     NULL);
 
   return offset;
 }
@@ -6190,7 +6190,7 @@ static int dissect_loadData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t DownloadSegment_Response_sequence[] = {
+static const ber_old_sequence_t DownloadSegment_Response_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -6198,8 +6198,8 @@ static const ber_sequence_t DownloadSegment_Response_sequence[] = {
 
 static int
 dissect_mms_DownloadSegment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response);
 
   return offset;
 }
@@ -6220,14 +6220,14 @@ static int dissect_terminateDownloadSequence1_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t T_listOfCapabilities2_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities2_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities2_sequence_of, hf_index, ett_mms_T_listOfCapabilities2);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities2_sequence_of, hf_index, ett_mms_T_listOfCapabilities2);
 
   return offset;
 }
@@ -6236,7 +6236,7 @@ static int dissect_listOfCapabilities2_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t InitiateUploadSequence_Response_sequence[] = {
+static const ber_old_sequence_t InitiateUploadSequence_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ulsmID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities2_impl },
   { 0, 0, 0, NULL }
@@ -6244,8 +6244,8 @@ static const ber_sequence_t InitiateUploadSequence_Response_sequence[] = {
 
 static int
 dissect_mms_InitiateUploadSequence_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response);
 
   return offset;
 }
@@ -6260,7 +6260,7 @@ static const value_string mms_T_loadData1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_loadData1_choice[] = {
+static const ber_old_choice_t T_loadData1_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_coded_impl },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_coded },
   { 0, 0, 0, 0, NULL }
@@ -6268,9 +6268,9 @@ static const ber_choice_t T_loadData1_choice[] = {
 
 static int
 dissect_mms_T_loadData1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_loadData1_choice, hf_index, ett_mms_T_loadData1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_loadData1_choice, hf_index, ett_mms_T_loadData1,
+                                     NULL);
 
   return offset;
 }
@@ -6279,7 +6279,7 @@ static int dissect_loadData1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t UploadSegment_Response_sequence[] = {
+static const ber_old_sequence_t UploadSegment_Response_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData1 },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -6287,8 +6287,8 @@ static const ber_sequence_t UploadSegment_Response_sequence[] = {
 
 static int
 dissect_mms_UploadSegment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response);
 
   return offset;
 }
@@ -6369,14 +6369,14 @@ static int dissect_deleteDomain1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_listOfCapabilities5_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities5_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities5_sequence_of, hf_index, ett_mms_T_listOfCapabilities5);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities5_sequence_of, hf_index, ett_mms_T_listOfCapabilities5);
 
   return offset;
 }
@@ -6436,7 +6436,7 @@ static int dissect_uploadInProgress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t GetDomainAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetDomainAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities5_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
@@ -6448,8 +6448,8 @@ static const ber_sequence_t GetDomainAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetDomainAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response);
 
   return offset;
 }
@@ -6548,7 +6548,7 @@ static const value_string mms_T_executionArgument2_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_executionArgument2_choice[] = {
+static const ber_old_choice_t T_executionArgument2_choice[] = {
   {   0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString },
   { 0, 0, 0, 0, NULL }
@@ -6556,9 +6556,9 @@ static const ber_choice_t T_executionArgument2_choice[] = {
 
 static int
 dissect_mms_T_executionArgument2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_executionArgument2_choice, hf_index, ett_mms_T_executionArgument2,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_executionArgument2_choice, hf_index, ett_mms_T_executionArgument2,
+                                     NULL);
 
   return offset;
 }
@@ -6567,7 +6567,7 @@ static int dissect_executionArgument2(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t GetProgramInvocationAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetProgramInvocationAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_state1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainNames_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
@@ -6580,8 +6580,8 @@ static const ber_sequence_t GetProgramInvocationAttributes_Response_sequence[] =
 
 static int
 dissect_mms_GetProgramInvocationAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response);
 
   return offset;
 }
@@ -6614,7 +6614,7 @@ static int dissect_lastModified_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t FileAttributes_sequence[] = {
+static const ber_old_sequence_t FileAttributes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sizeOfFile_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastModified_impl },
   { 0, 0, 0, NULL }
@@ -6622,8 +6622,8 @@ static const ber_sequence_t FileAttributes_sequence[] = {
 
 static int
 dissect_mms_FileAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileAttributes_sequence, hf_index, ett_mms_FileAttributes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileAttributes_sequence, hf_index, ett_mms_FileAttributes);
 
   return offset;
 }
@@ -6632,7 +6632,7 @@ static int dissect_fileAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FileOpen_Response_sequence[] = {
+static const ber_old_sequence_t FileOpen_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_frsmID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl },
   { 0, 0, 0, NULL }
@@ -6640,8 +6640,8 @@ static const ber_sequence_t FileOpen_Response_sequence[] = {
 
 static int
 dissect_mms_FileOpen_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response);
 
   return offset;
 }
@@ -6680,7 +6680,7 @@ static const value_string mms_T_monitoredVariable_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_monitoredVariable_choice[] = {
+static const ber_old_choice_t T_monitoredVariable_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_variableReference },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl },
   { 0, 0, 0, 0, NULL }
@@ -6688,9 +6688,9 @@ static const ber_choice_t T_monitoredVariable_choice[] = {
 
 static int
 dissect_mms_T_monitoredVariable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable,
+                                     NULL);
 
   return offset;
 }
@@ -6699,7 +6699,7 @@ static int dissect_monitoredVariable1(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t GetEventConditionAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetEventConditionAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class1_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prio_rity_impl },
@@ -6712,8 +6712,8 @@ static const ber_sequence_t GetEventConditionAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetEventConditionAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response);
 
   return offset;
 }
@@ -6722,7 +6722,7 @@ static int dissect_getEventConditionAttributes1_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t ReportEventConditionStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportEventConditionStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentState_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfEventEnrollments_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enabled_impl },
@@ -6733,8 +6733,8 @@ static const ber_sequence_t ReportEventConditionStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportEventConditionStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response);
 
   return offset;
 }
@@ -6791,7 +6791,7 @@ static int dissect_deleteEventAction1_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t GetEventActionAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetEventActionAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl },
   { 0, 0, 0, NULL }
@@ -6799,8 +6799,8 @@ static const ber_sequence_t GetEventActionAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetEventActionAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response);
 
   return offset;
 }
@@ -6882,7 +6882,7 @@ static const value_string mms_T_currentState_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_currentState_choice[] = {
+static const ber_old_choice_t T_currentState_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_state3_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl },
   { 0, 0, 0, 0, NULL }
@@ -6890,9 +6890,9 @@ static const ber_choice_t T_currentState_choice[] = {
 
 static int
 dissect_mms_T_currentState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_currentState_choice, hf_index, ett_mms_T_currentState,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_currentState_choice, hf_index, ett_mms_T_currentState,
+                                     NULL);
 
   return offset;
 }
@@ -6901,7 +6901,7 @@ static int dissect_currentState2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t AlterEventEnrollment_Response_sequence[] = {
+static const ber_old_sequence_t AlterEventEnrollment_Response_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_currentState2 },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_transitionTime },
   { 0, 0, 0, NULL }
@@ -6909,8 +6909,8 @@ static const ber_sequence_t AlterEventEnrollment_Response_sequence[] = {
 
 static int
 dissect_mms_AlterEventEnrollment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response);
 
   return offset;
 }
@@ -6938,7 +6938,7 @@ static int dissect_duration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationLost_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_duration_impl },
@@ -6949,8 +6949,8 @@ static const ber_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportEventEnrollmentStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response);
 
   return offset;
 }
@@ -6965,7 +6965,7 @@ static const value_string mms_T_eventConditionName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_eventConditionName_choice[] = {
+static const ber_old_choice_t T_eventConditionName_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_eventCondition },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl },
   { 0, 0, 0, 0, NULL }
@@ -6973,9 +6973,9 @@ static const ber_choice_t T_eventConditionName_choice[] = {
 
 static int
 dissect_mms_T_eventConditionName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName,
+                                     NULL);
 
   return offset;
 }
@@ -6990,7 +6990,7 @@ static const value_string mms_T_eventActionName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_eventActionName_choice[] = {
+static const ber_old_choice_t T_eventActionName_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_eventAction },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl },
   { 0, 0, 0, 0, NULL }
@@ -6998,9 +6998,9 @@ static const ber_choice_t T_eventActionName_choice[] = {
 
 static int
 dissect_mms_T_eventActionName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_eventActionName_choice, hf_index, ett_mms_T_eventActionName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_eventActionName_choice, hf_index, ett_mms_T_eventActionName,
+                                     NULL);
 
   return offset;
 }
@@ -7028,7 +7028,7 @@ static int dissect_enrollmentClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t EventEnrollment_sequence[] = {
+static const ber_old_sequence_t EventEnrollment_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 1, 0, dissect_eventConditionName1 },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_eventActionName1 },
@@ -7043,8 +7043,8 @@ static const ber_sequence_t EventEnrollment_sequence[] = {
 
 static int
 dissect_mms_EventEnrollment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment);
 
   return offset;
 }
@@ -7053,14 +7053,14 @@ static int dissect_listOfEventEnrollment_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfEventEnrollment_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_EventEnrollment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment);
 
   return offset;
 }
@@ -7069,7 +7069,7 @@ static int dissect_listOfEventEnrollment_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = {
+static const ber_old_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfEventEnrollment_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7077,8 +7077,8 @@ static const ber_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = {
 
 static int
 dissect_mms_GetEventEnrollmentAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response);
 
   return offset;
 }
@@ -7120,7 +7120,7 @@ static int dissect_unacknowledgedState_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AlarmSummary_sequence[] = {
+static const ber_old_sequence_t AlarmSummary_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_severity_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_currentState_impl },
@@ -7132,8 +7132,8 @@ static const ber_sequence_t AlarmSummary_sequence[] = {
 
 static int
 dissect_mms_AlarmSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary);
 
   return offset;
 }
@@ -7142,14 +7142,14 @@ static int dissect_listOfAlarmSummary_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmSummary_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_AlarmSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary);
 
   return offset;
 }
@@ -7158,7 +7158,7 @@ static int dissect_listOfAlarmSummary_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t GetAlarmSummary_Response_sequence[] = {
+static const ber_old_sequence_t GetAlarmSummary_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmSummary_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7166,8 +7166,8 @@ static const ber_sequence_t GetAlarmSummary_Response_sequence[] = {
 
 static int
 dissect_mms_GetAlarmSummary_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response);
 
   return offset;
 }
@@ -7176,7 +7176,7 @@ static int dissect_getAlarmSummary1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AlarmEnrollmentSummary_sequence[] = {
+static const ber_old_sequence_t AlarmEnrollmentSummary_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_clientApplication },
   { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_severity_impl },
@@ -7193,8 +7193,8 @@ static const ber_sequence_t AlarmEnrollmentSummary_sequence[] = {
 
 static int
 dissect_mms_AlarmEnrollmentSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary);
 
   return offset;
 }
@@ -7203,14 +7203,14 @@ static int dissect_listOfAlarmEnrollmentSummary_item(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmEnrollmentSummary_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary);
 
   return offset;
 }
@@ -7219,7 +7219,7 @@ static int dissect_listOfAlarmEnrollmentSummary_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = {
+static const ber_old_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmEnrollmentSummary_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7227,8 +7227,8 @@ static const ber_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = {
 
 static int
 dissect_mms_GetAlarmEnrollmentSummary_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response);
 
   return offset;
 }
@@ -7237,7 +7237,7 @@ static int dissect_getAlarmEnrollmentSummary1_impl(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t JournalEntry_sequence[] = {
+static const ber_old_sequence_t JournalEntry_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryIdentifier_impl },
   { BER_CLASS_CON, 1, 0, dissect_originatingApplication },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_entryContent_impl },
@@ -7246,8 +7246,8 @@ static const ber_sequence_t JournalEntry_sequence[] = {
 
 static int
 dissect_mms_JournalEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   JournalEntry_sequence, hf_index, ett_mms_JournalEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       JournalEntry_sequence, hf_index, ett_mms_JournalEntry);
 
   return offset;
 }
@@ -7256,14 +7256,14 @@ static int dissect_listOfJournalEntry_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_JournalEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry);
 
   return offset;
 }
@@ -7272,7 +7272,7 @@ static int dissect_listOfJournalEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ReadJournal_Response_sequence[] = {
+static const ber_old_sequence_t ReadJournal_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7280,8 +7280,8 @@ static const ber_sequence_t ReadJournal_Response_sequence[] = {
 
 static int
 dissect_mms_ReadJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response);
 
   return offset;
 }
@@ -7314,7 +7314,7 @@ static int dissect_initializeJournal1_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ReportJournalStatus_Response_sequence[] = {
+static const ber_old_sequence_t ReportJournalStatus_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentEntries_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl },
   { 0, 0, 0, NULL }
@@ -7322,8 +7322,8 @@ static const ber_sequence_t ReportJournalStatus_Response_sequence[] = {
 
 static int
 dissect_mms_ReportJournalStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response);
 
   return offset;
 }
@@ -7356,14 +7356,14 @@ static int dissect_deleteJournal1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_listOfCapabilities_sequence_of[1] = {
+static const ber_old_sequence_t T_listOfCapabilities_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item },
 };
 
 static int
 dissect_mms_T_listOfCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities);
 
   return offset;
 }
@@ -7372,7 +7372,7 @@ static int dissect_listOfCapabilities_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t GetCapabilityList_Response_sequence[] = {
+static const ber_old_sequence_t GetCapabilityList_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7380,8 +7380,8 @@ static const ber_sequence_t GetCapabilityList_Response_sequence[] = {
 
 static int
 dissect_mms_GetCapabilityList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response);
 
   return offset;
 }
@@ -7390,7 +7390,7 @@ static int dissect_getCapabilityList1_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t FileRead_Response_sequence[] = {
+static const ber_old_sequence_t FileRead_Response_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileData_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7398,8 +7398,8 @@ static const ber_sequence_t FileRead_Response_sequence[] = {
 
 static int
 dissect_mms_FileRead_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response);
 
   return offset;
 }
@@ -7444,7 +7444,7 @@ static int dissect_fileDelete1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DirectoryEntry_sequence[] = {
+static const ber_old_sequence_t DirectoryEntry_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_filename_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl },
   { 0, 0, 0, NULL }
@@ -7452,8 +7452,8 @@ static const ber_sequence_t DirectoryEntry_sequence[] = {
 
 static int
 dissect_mms_DirectoryEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry);
 
   return offset;
 }
@@ -7462,14 +7462,14 @@ static int dissect_listOfDirectoryEntry_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfDirectoryEntry_item },
 };
 
 static int
 dissect_mms_SEQUENCE_OF_DirectoryEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry);
 
   return offset;
 }
@@ -7478,7 +7478,7 @@ static int dissect_listOfDirectoryEntry(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t FileDirectory_Response_sequence[] = {
+static const ber_old_sequence_t FileDirectory_Response_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_listOfDirectoryEntry },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl },
   { 0, 0, 0, NULL }
@@ -7486,8 +7486,8 @@ static const ber_sequence_t FileDirectory_Response_sequence[] = {
 
 static int
 dissect_mms_FileDirectory_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response);
 
   return offset;
 }
@@ -7578,7 +7578,7 @@ static const value_string mms_ConfirmedServiceResponse_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConfirmedServiceResponse_choice[] = {
+static const ber_old_choice_t ConfirmedServiceResponse_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_status1_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getNameList1_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_identify1_impl },
@@ -7662,9 +7662,9 @@ static const ber_choice_t ConfirmedServiceResponse_choice[] = {
 
 static int
 dissect_mms_ConfirmedServiceResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse,
+                                     NULL);
 
   return offset;
 }
@@ -7676,7 +7676,7 @@ static int dissect_success1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Confirmed_ResponsePDU_sequence[] = {
+static const ber_old_sequence_t Confirmed_ResponsePDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceResponse },
   { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail },
@@ -7685,8 +7685,8 @@ static const ber_sequence_t Confirmed_ResponsePDU_sequence[] = {
 
 static int
 dissect_mms_Confirmed_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU);
 
   return offset;
 }
@@ -7695,7 +7695,7 @@ static int dissect_confirmed_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Confirmed_ErrorPDU_sequence[] = {
+static const ber_old_sequence_t Confirmed_ErrorPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifierPosition_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceError_impl },
@@ -7704,8 +7704,8 @@ static const ber_sequence_t Confirmed_ErrorPDU_sequence[] = {
 
 static int
 dissect_mms_Confirmed_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU);
 
   return offset;
 }
@@ -7714,7 +7714,7 @@ static int dissect_confirmed_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t InformationReport_sequence[] = {
+static const ber_old_sequence_t InformationReport_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecification },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl },
   { 0, 0, 0, NULL }
@@ -7722,8 +7722,8 @@ static const ber_sequence_t InformationReport_sequence[] = {
 
 static int
 dissect_mms_InformationReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformationReport_sequence, hf_index, ett_mms_InformationReport);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformationReport_sequence, hf_index, ett_mms_InformationReport);
 
   return offset;
 }
@@ -7750,7 +7750,7 @@ static const value_string mms_T_eventConditionName1_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_eventConditionName1_choice[] = {
+static const ber_old_choice_t T_eventConditionName1_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_eventCondition },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl },
   { 0, 0, 0, 0, NULL }
@@ -7758,9 +7758,9 @@ static const ber_choice_t T_eventConditionName1_choice[] = {
 
 static int
 dissect_mms_T_eventConditionName1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_eventConditionName1_choice, hf_index, ett_mms_T_eventConditionName1,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_eventConditionName1_choice, hf_index, ett_mms_T_eventConditionName1,
+                                     NULL);
 
   return offset;
 }
@@ -7775,7 +7775,7 @@ static const value_string mms_T_eventActionResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_eventActionResult_choice[] = {
+static const ber_old_choice_t T_eventActionResult_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_success1 },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_failure1_impl },
   { 0, 0, 0, 0, NULL }
@@ -7783,9 +7783,9 @@ static const ber_choice_t T_eventActionResult_choice[] = {
 
 static int
 dissect_mms_T_eventActionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult,
+                                     NULL);
 
   return offset;
 }
@@ -7794,7 +7794,7 @@ static int dissect_eventActionResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_actionResult_sequence[] = {
+static const ber_old_sequence_t T_actionResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActioName },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActionResult },
   { 0, 0, 0, NULL }
@@ -7802,8 +7802,8 @@ static const ber_sequence_t T_actionResult_sequence[] = {
 
 static int
 dissect_mms_T_actionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_actionResult_sequence, hf_index, ett_mms_T_actionResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_actionResult_sequence, hf_index, ett_mms_T_actionResult);
 
   return offset;
 }
@@ -7812,7 +7812,7 @@ static int dissect_actionResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t EventNotification_sequence[] = {
+static const ber_old_sequence_t EventNotification_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName },
   { BER_CLASS_CON, 1, 0, dissect_eventConditionName2 },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_severity_impl },
@@ -7826,8 +7826,8 @@ static const ber_sequence_t EventNotification_sequence[] = {
 
 static int
 dissect_mms_EventNotification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EventNotification_sequence, hf_index, ett_mms_EventNotification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EventNotification_sequence, hf_index, ett_mms_EventNotification);
 
   return offset;
 }
@@ -7843,7 +7843,7 @@ static const value_string mms_UnconfirmedService_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UnconfirmedService_choice[] = {
+static const ber_old_choice_t UnconfirmedService_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationReport_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_unsolicitedStatus_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventNotification_impl },
@@ -7852,9 +7852,9 @@ static const ber_choice_t UnconfirmedService_choice[] = {
 
 static int
 dissect_mms_UnconfirmedService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService,
+                                     NULL);
 
   return offset;
 }
@@ -7863,7 +7863,7 @@ static int dissect_unconfirmedService(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t Unconfirmed_PDU_sequence[] = {
+static const ber_old_sequence_t Unconfirmed_PDU_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_unconfirmedService },
   { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail },
   { 0, 0, 0, NULL }
@@ -7871,8 +7871,8 @@ static const ber_sequence_t Unconfirmed_PDU_sequence[] = {
 
 static int
 dissect_mms_Unconfirmed_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU);
 
   return offset;
 }
@@ -8126,7 +8126,7 @@ static const value_string mms_T_rejectReason_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_rejectReason_choice[] = {
+static const ber_old_choice_t T_rejectReason_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_confirmed_requestPDU_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_confirmed_responsePDU_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_confirmed_errorPDU_impl },
@@ -8143,9 +8143,9 @@ static const ber_choice_t T_rejectReason_choice[] = {
 
 static int
 dissect_mms_T_rejectReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_rejectReason_choice, hf_index, ett_mms_T_rejectReason,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_rejectReason_choice, hf_index, ett_mms_T_rejectReason,
+                                     NULL);
 
   return offset;
 }
@@ -8154,7 +8154,7 @@ static int dissect_rejectReason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t RejectPDU_sequence[] = {
+static const ber_old_sequence_t RejectPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectReason },
   { 0, 0, 0, NULL }
@@ -8162,8 +8162,8 @@ static const ber_sequence_t RejectPDU_sequence[] = {
 
 static int
 dissect_mms_RejectPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RejectPDU_sequence, hf_index, ett_mms_RejectPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RejectPDU_sequence, hf_index, ett_mms_RejectPDU);
 
   return offset;
 }
@@ -8196,7 +8196,7 @@ static int dissect_cancel_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Cancel_ErrorPDU_sequence[] = {
+static const ber_old_sequence_t Cancel_ErrorPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceError_impl },
   { 0, 0, 0, NULL }
@@ -8204,8 +8204,8 @@ static const ber_sequence_t Cancel_ErrorPDU_sequence[] = {
 
 static int
 dissect_mms_Cancel_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU);
 
   return offset;
 }
@@ -8377,7 +8377,7 @@ static int dissect_servicesSupportedCalled_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t InitRequestDetail_sequence[] = {
+static const ber_old_sequence_t InitRequestDetail_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_proposedVersionNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedParameterCBB_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servicesSupportedCalling_impl },
@@ -8386,8 +8386,8 @@ static const ber_sequence_t InitRequestDetail_sequence[] = {
 
 static int
 dissect_mms_InitRequestDetail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail);
 
   return offset;
 }
@@ -8396,7 +8396,7 @@ static int dissect_mmsInitRequestDetail_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Initiate_RequestPDU_sequence[] = {
+static const ber_old_sequence_t Initiate_RequestPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalling_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedMaxServOutstandingCalling_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_proposedMaxServOutstandingCalled_impl },
@@ -8407,8 +8407,8 @@ static const ber_sequence_t Initiate_RequestPDU_sequence[] = {
 
 static int
 dissect_mms_Initiate_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU);
 
   return offset;
 }
@@ -8417,7 +8417,7 @@ static int dissect_initiate_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t InitResponseDetail_sequence[] = {
+static const ber_old_sequence_t InitResponseDetail_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_negociatedVersionNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedParameterCBB_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servicesSupportedCalled_impl },
@@ -8426,8 +8426,8 @@ static const ber_sequence_t InitResponseDetail_sequence[] = {
 
 static int
 dissect_mms_InitResponseDetail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail);
 
   return offset;
 }
@@ -8436,7 +8436,7 @@ static int dissect_mmsInitResponseDetail_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Initiate_ResponsePDU_sequence[] = {
+static const ber_old_sequence_t Initiate_ResponsePDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalled_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedMaxServOutstandingCalling_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_negociatedMaxServOutstandingCalled_impl },
@@ -8447,8 +8447,8 @@ static const ber_sequence_t Initiate_ResponsePDU_sequence[] = {
 
 static int
 dissect_mms_Initiate_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU);
 
   return offset;
 }
@@ -8523,7 +8523,7 @@ const value_string mms_MMSpdu_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MMSpdu_choice[] = {
+static const ber_old_choice_t MMSpdu_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_confirmed_RequestPDU_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_confirmed_ResponsePDU_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_confirmed_ErrorPDU_impl },
@@ -8546,9 +8546,10 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 #line 35 "mms.cnf"
   gint branch_taken;
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MMSpdu_choice, hf_index, ett_mms_MMSpdu,
-                                 &branch_taken);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MMSpdu_choice, hf_index, ett_mms_MMSpdu,
+                                     &branch_taken);
+
 
   if(check_col(actx->pinfo->cinfo, COL_INFO))
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(branch_taken, mms_MMSpdu_vals, "Unknown"));
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 59cf94ead5..926b54dfe7 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -224,7 +224,7 @@ static int dissect_issuerKeyHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t CertID_sequence[] = {
+static const ber_old_sequence_t CertID_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerNameHash },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerKeyHash },
@@ -234,8 +234,8 @@ static const ber_sequence_t CertID_sequence[] = {
 
 static int
 dissect_ocsp_CertID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertID_sequence, hf_index, ett_ocsp_CertID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertID_sequence, hf_index, ett_ocsp_CertID);
 
   return offset;
 }
@@ -247,7 +247,7 @@ static int dissect_certID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t Request_sequence[] = {
+static const ber_old_sequence_t Request_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_reqCert },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_singleRequestExtensions },
   { 0, 0, 0, NULL }
@@ -255,8 +255,8 @@ static const ber_sequence_t Request_sequence[] = {
 
 static int
 dissect_ocsp_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Request_sequence, hf_index, ett_ocsp_Request);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Request_sequence, hf_index, ett_ocsp_Request);
 
   return offset;
 }
@@ -265,14 +265,14 @@ static int dissect_requestList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Request_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Request_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item },
 };
 
 static int
 dissect_ocsp_SEQUENCE_OF_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request);
 
   return offset;
 }
@@ -281,7 +281,7 @@ static int dissect_requestList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t TBSRequest_sequence[] = {
+static const ber_old_sequence_t TBSRequest_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_requestorName },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList },
@@ -291,8 +291,8 @@ static const ber_sequence_t TBSRequest_sequence[] = {
 
 static int
 dissect_ocsp_TBSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
 
   return offset;
 }
@@ -315,14 +315,14 @@ static int dissect_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
 };
 
 static int
 dissect_ocsp_SEQUENCE_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate);
 
   return offset;
 }
@@ -331,7 +331,7 @@ static int dissect_certs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t Signature_sequence[] = {
+static const ber_old_sequence_t Signature_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certs },
@@ -340,8 +340,8 @@ static const ber_sequence_t Signature_sequence[] = {
 
 static int
 dissect_ocsp_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Signature_sequence, hf_index, ett_ocsp_Signature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Signature_sequence, hf_index, ett_ocsp_Signature);
 
   return offset;
 }
@@ -350,7 +350,7 @@ static int dissect_optionalSignature(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t OCSPRequest_sequence[] = {
+static const ber_old_sequence_t OCSPRequest_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsRequest },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_optionalSignature },
   { 0, 0, 0, NULL }
@@ -358,8 +358,8 @@ static const ber_sequence_t OCSPRequest_sequence[] = {
 
 static int
 dissect_ocsp_OCSPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
 
   return offset;
 }
@@ -422,7 +422,7 @@ static int dissect_response(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ResponseBytes_sequence[] = {
+static const ber_old_sequence_t ResponseBytes_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_responseType },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_response },
   { 0, 0, 0, NULL }
@@ -430,8 +430,8 @@ static const ber_sequence_t ResponseBytes_sequence[] = {
 
 static int
 dissect_ocsp_ResponseBytes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
 
   return offset;
 }
@@ -440,7 +440,7 @@ static int dissect_responseBytes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t OCSPResponse_sequence[] = {
+static const ber_old_sequence_t OCSPResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseStatus },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_responseBytes },
   { 0, 0, 0, NULL }
@@ -448,8 +448,8 @@ static const ber_sequence_t OCSPResponse_sequence[] = {
 
 static int
 dissect_ocsp_OCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
 
   return offset;
 }
@@ -474,7 +474,7 @@ static const value_string ocsp_ResponderID_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ResponderID_choice[] = {
+static const ber_old_choice_t ResponderID_choice[] = {
   {   1, BER_CLASS_CON, 1, 0, dissect_byName },
   {   2, BER_CLASS_CON, 2, 0, dissect_byKey },
   { 0, 0, 0, 0, NULL }
@@ -482,9 +482,9 @@ static const ber_choice_t ResponderID_choice[] = {
 
 static int
 dissect_ocsp_ResponderID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ResponderID_choice, hf_index, ett_ocsp_ResponderID,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ResponderID_choice, hf_index, ett_ocsp_ResponderID,
+                                     NULL);
 
   return offset;
 }
@@ -529,7 +529,7 @@ static int dissect_good_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t RevokedInfo_sequence[] = {
+static const ber_old_sequence_t RevokedInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_revocationTime },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revocationReason },
   { 0, 0, 0, NULL }
@@ -537,8 +537,8 @@ static const ber_sequence_t RevokedInfo_sequence[] = {
 
 static int
 dissect_ocsp_RevokedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
 
   return offset;
 }
@@ -566,7 +566,7 @@ static const value_string ocsp_CertStatus_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CertStatus_choice[] = {
+static const ber_old_choice_t CertStatus_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_good_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_revoked_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_unknown_impl },
@@ -575,9 +575,9 @@ static const ber_choice_t CertStatus_choice[] = {
 
 static int
 dissect_ocsp_CertStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CertStatus_choice, hf_index, ett_ocsp_CertStatus,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CertStatus_choice, hf_index, ett_ocsp_CertStatus,
+                                     NULL);
 
   return offset;
 }
@@ -586,7 +586,7 @@ static int dissect_certStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SingleResponse_sequence[] = {
+static const ber_old_sequence_t SingleResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate },
@@ -597,8 +597,8 @@ static const ber_sequence_t SingleResponse_sequence[] = {
 
 static int
 dissect_ocsp_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
 
   return offset;
 }
@@ -607,14 +607,14 @@ static int dissect_responses_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item },
 };
 
 static int
 dissect_ocsp_SEQUENCE_OF_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse);
 
   return offset;
 }
@@ -623,7 +623,7 @@ static int dissect_responses(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ResponseData_sequence[] = {
+static const ber_old_sequence_t ResponseData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt },
@@ -634,8 +634,8 @@ static const ber_sequence_t ResponseData_sequence[] = {
 
 static int
 dissect_ocsp_ResponseData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
 
   return offset;
 }
@@ -644,7 +644,7 @@ static int dissect_tbsResponseData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t BasicOCSPResponse_sequence[] = {
+static const ber_old_sequence_t BasicOCSPResponse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsResponseData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
@@ -654,8 +654,8 @@ static const ber_sequence_t BasicOCSPResponse_sequence[] = {
 
 static int
 dissect_ocsp_BasicOCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
 
   return offset;
 }
@@ -682,20 +682,20 @@ static int dissect_AcceptableResponses_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AcceptableResponses_sequence_of[1] = {
+static const ber_old_sequence_t AcceptableResponses_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AcceptableResponses_item },
 };
 
 static int
 dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses);
 
   return offset;
 }
 
 
-static const ber_sequence_t ServiceLocator_sequence[] = {
+static const ber_old_sequence_t ServiceLocator_sequence[] = {
   { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locator },
   { 0, 0, 0, NULL }
@@ -703,8 +703,8 @@ static const ber_sequence_t ServiceLocator_sequence[] = {
 
 static int
 dissect_ocsp_ServiceLocator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
 
   return offset;
 }
@@ -737,7 +737,7 @@ static int dissect_crlNum(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t CrlID_sequence[] = {
+static const ber_old_sequence_t CrlID_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlUrl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crlNum },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_crlTime },
@@ -746,8 +746,8 @@ static const ber_sequence_t CrlID_sequence[] = {
 
 static int
 dissect_ocsp_CrlID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CrlID_sequence, hf_index, ett_ocsp_CrlID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CrlID_sequence, hf_index, ett_ocsp_CrlID);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index ce3333d555..c256012511 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -123,7 +123,7 @@ static int dissect_coefficient(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t RSAPublicKey_sequence[] = {
+static const ber_old_sequence_t RSAPublicKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
   { 0, 0, 0, NULL }
@@ -131,8 +131,8 @@ static const ber_sequence_t RSAPublicKey_sequence[] = {
 
 int
 dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
 
   return offset;
 }
@@ -151,7 +151,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t RSAPrivateKey_sequence[] = {
+static const ber_old_sequence_t RSAPrivateKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
@@ -166,8 +166,8 @@ static const ber_sequence_t RSAPrivateKey_sequence[] = {
 
 int
 dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
 
   return offset;
 }
@@ -198,7 +198,7 @@ static int dissect_digest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t DigestInfo_sequence[] = {
+static const ber_old_sequence_t DigestInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
   { 0, 0, 0, NULL }
@@ -206,8 +206,8 @@ static const ber_sequence_t DigestInfo_sequence[] = {
 
 int
 dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index ab52290f51..6a25341508 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -212,7 +212,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t DigestInfo_sequence[] = {
+static const ber_old_sequence_t DigestInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
   { 0, 0, 0, NULL }
@@ -220,8 +220,8 @@ static const ber_sequence_t DigestInfo_sequence[] = {
 
 static int
 dissect_pkcs12_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DigestInfo_sequence, hf_index, ett_pkcs12_DigestInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DigestInfo_sequence, hf_index, ett_pkcs12_DigestInfo);
 
   return offset;
 }
@@ -265,7 +265,7 @@ static int dissect_iterationCount(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t MacData_sequence[] = {
+static const ber_old_sequence_t MacData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_macSalt },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_iterations },
@@ -274,8 +274,8 @@ static const ber_sequence_t MacData_sequence[] = {
 
 static int
 dissect_pkcs12_MacData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MacData_sequence, hf_index, ett_pkcs12_MacData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MacData_sequence, hf_index, ett_pkcs12_MacData);
 
   return offset;
 }
@@ -284,7 +284,7 @@ static int dissect_macData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t PFX_sequence[] = {
+static const ber_old_sequence_t PFX_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_authSafe },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_macData },
@@ -301,8 +301,8 @@ dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 	dissector_handle=create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
 	dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PFX_sequence, hf_index, ett_pkcs12_PFX);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PFX_sequence, hf_index, ett_pkcs12_PFX);
 
 
 	/* restore the original dissector */
@@ -314,7 +314,7 @@ dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t AuthenticatedSafe_sequence_of[1] = {
+static const ber_old_sequence_t AuthenticatedSafe_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthenticatedSafe_item },
 };
 
@@ -327,8 +327,8 @@ dissect_pkcs12_AuthenticatedSafe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 	dissector_handle=create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
 	dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
 
-	  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AuthenticatedSafe_sequence_of, hf_index, ett_pkcs12_AuthenticatedSafe);
+	  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AuthenticatedSafe_sequence_of, hf_index, ett_pkcs12_AuthenticatedSafe);
 
 
 	/* restore the original dissector */
@@ -405,14 +405,14 @@ static int dissect_attrValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_attrValues_set_of[1] = {
+static const ber_old_sequence_t T_attrValues_set_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_attrValues_item },
 };
 
 static int
 dissect_pkcs12_T_attrValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_attrValues_set_of, hf_index, ett_pkcs12_T_attrValues);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_attrValues_set_of, hf_index, ett_pkcs12_T_attrValues);
 
   return offset;
 }
@@ -421,7 +421,7 @@ static int dissect_attrValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t PKCS12Attribute_sequence[] = {
+static const ber_old_sequence_t PKCS12Attribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrId },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attrValues },
   { 0, 0, 0, NULL }
@@ -429,8 +429,8 @@ static const ber_sequence_t PKCS12Attribute_sequence[] = {
 
 static int
 dissect_pkcs12_PKCS12Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKCS12Attribute_sequence, hf_index, ett_pkcs12_PKCS12Attribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKCS12Attribute_sequence, hf_index, ett_pkcs12_PKCS12Attribute);
 
   return offset;
 }
@@ -439,14 +439,14 @@ static int dissect_bagAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t SET_OF_PKCS12Attribute_set_of[1] = {
+static const ber_old_sequence_t SET_OF_PKCS12Attribute_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bagAttributes_item },
 };
 
 static int
 dissect_pkcs12_SET_OF_PKCS12Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_PKCS12Attribute_set_of, hf_index, ett_pkcs12_SET_OF_PKCS12Attribute);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_PKCS12Attribute_set_of, hf_index, ett_pkcs12_SET_OF_PKCS12Attribute);
 
   return offset;
 }
@@ -455,7 +455,7 @@ static int dissect_bagAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SafeBag_sequence[] = {
+static const ber_old_sequence_t SafeBag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_bagId },
   { BER_CLASS_CON, 0, 0, dissect_bagValue },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bagAttributes },
@@ -464,8 +464,8 @@ static const ber_sequence_t SafeBag_sequence[] = {
 
 static int
 dissect_pkcs12_SafeBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SafeBag_sequence, hf_index, ett_pkcs12_SafeBag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SafeBag_sequence, hf_index, ett_pkcs12_SafeBag);
 
   return offset;
 }
@@ -474,14 +474,14 @@ static int dissect_SafeContents_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SafeContents_sequence_of[1] = {
+static const ber_old_sequence_t SafeContents_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SafeContents_item },
 };
 
 static int
 dissect_pkcs12_SafeContents(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SafeContents_sequence_of, hf_index, ett_pkcs12_SafeContents);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SafeContents_sequence_of, hf_index, ett_pkcs12_SafeContents);
 
   return offset;
 }
@@ -518,14 +518,14 @@ static int dissect_privateKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Attributes_set_of[1] = {
+static const ber_old_sequence_t Attributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attributes_item },
 };
 
 static int
 dissect_pkcs12_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 Attributes_set_of, hf_index, ett_pkcs12_Attributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     Attributes_set_of, hf_index, ett_pkcs12_Attributes);
 
   return offset;
 }
@@ -534,7 +534,7 @@ static int dissect_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PrivateKeyInfo_sequence[] = {
+static const ber_old_sequence_t PrivateKeyInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_privateKeyVersion },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_privateKeyAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_privateKey },
@@ -544,8 +544,8 @@ static const ber_sequence_t PrivateKeyInfo_sequence[] = {
 
 static int
 dissect_pkcs12_PrivateKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivateKeyInfo_sequence, hf_index, ett_pkcs12_PrivateKeyInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivateKeyInfo_sequence, hf_index, ett_pkcs12_PrivateKeyInfo);
 
   return offset;
 }
@@ -573,7 +573,7 @@ static int dissect_encryptedData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
+static const ber_old_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptionAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedData },
   { 0, 0, 0, NULL }
@@ -581,8 +581,8 @@ static const ber_sequence_t EncryptedPrivateKeyInfo_sequence[] = {
 
 static int
 dissect_pkcs12_EncryptedPrivateKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncryptedPrivateKeyInfo_sequence, hf_index, ett_pkcs12_EncryptedPrivateKeyInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncryptedPrivateKeyInfo_sequence, hf_index, ett_pkcs12_EncryptedPrivateKeyInfo);
 
   return offset;
 }
@@ -613,7 +613,7 @@ static int dissect_certValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t CertBag_sequence[] = {
+static const ber_old_sequence_t CertBag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_certId },
   { BER_CLASS_CON, 0, 0, dissect_certValue },
   { 0, 0, 0, NULL }
@@ -621,8 +621,8 @@ static const ber_sequence_t CertBag_sequence[] = {
 
 static int
 dissect_pkcs12_CertBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertBag_sequence, hf_index, ett_pkcs12_CertBag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertBag_sequence, hf_index, ett_pkcs12_CertBag);
 
   return offset;
 }
@@ -644,7 +644,7 @@ static int dissect_crlValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t CRLBag_sequence[] = {
+static const ber_old_sequence_t CRLBag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_crlId },
   { BER_CLASS_CON, 0, 0, dissect_crlValue },
   { 0, 0, 0, NULL }
@@ -652,8 +652,8 @@ static const ber_sequence_t CRLBag_sequence[] = {
 
 static int
 dissect_pkcs12_CRLBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CRLBag_sequence, hf_index, ett_pkcs12_CRLBag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CRLBag_sequence, hf_index, ett_pkcs12_CRLBag);
 
   return offset;
 }
@@ -675,7 +675,7 @@ static int dissect_secretValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SecretBag_sequence[] = {
+static const ber_old_sequence_t SecretBag_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_secretTypeId },
   { BER_CLASS_CON, 0, 0, dissect_secretValue },
   { 0, 0, 0, NULL }
@@ -683,14 +683,14 @@ static const ber_sequence_t SecretBag_sequence[] = {
 
 static int
 dissect_pkcs12_SecretBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecretBag_sequence, hf_index, ett_pkcs12_SecretBag);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecretBag_sequence, hf_index, ett_pkcs12_SecretBag);
 
   return offset;
 }
 
 
-static const ber_sequence_t PBEParameter_sequence[] = {
+static const ber_old_sequence_t PBEParameter_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
   { 0, 0, 0, NULL }
@@ -698,8 +698,8 @@ static const ber_sequence_t PBEParameter_sequence[] = {
 
 static int
 dissect_pkcs12_PBEParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBEParameter_sequence, hf_index, ett_pkcs12_PBEParameter);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBEParameter_sequence, hf_index, ett_pkcs12_PBEParameter);
 
   return offset;
 }
@@ -711,7 +711,7 @@ static const value_string pkcs12_T_saltChoice_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_saltChoice_choice[] = {
+static const ber_old_choice_t T_saltChoice_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_specified },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherSource },
   { 0, 0, 0, 0, NULL }
@@ -719,9 +719,9 @@ static const ber_choice_t T_saltChoice_choice[] = {
 
 static int
 dissect_pkcs12_T_saltChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_saltChoice_choice, hf_index, ett_pkcs12_T_saltChoice,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_saltChoice_choice, hf_index, ett_pkcs12_T_saltChoice,
+                                     NULL);
 
   return offset;
 }
@@ -743,7 +743,7 @@ static int dissect_keyLength(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PBKDF2Params_sequence[] = {
+static const ber_old_sequence_t PBKDF2Params_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_saltChoice },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_iterationCount },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyLength },
@@ -753,14 +753,14 @@ static const ber_sequence_t PBKDF2Params_sequence[] = {
 
 static int
 dissect_pkcs12_PBKDF2Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBKDF2Params_sequence, hf_index, ett_pkcs12_PBKDF2Params);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBKDF2Params_sequence, hf_index, ett_pkcs12_PBKDF2Params);
 
   return offset;
 }
 
 
-static const ber_sequence_t PBES2Params_sequence[] = {
+static const ber_old_sequence_t PBES2Params_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyDerivationFunc },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptionScheme },
   { 0, 0, 0, NULL }
@@ -768,14 +768,14 @@ static const ber_sequence_t PBES2Params_sequence[] = {
 
 static int
 dissect_pkcs12_PBES2Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBES2Params_sequence, hf_index, ett_pkcs12_PBES2Params);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBES2Params_sequence, hf_index, ett_pkcs12_PBES2Params);
 
   return offset;
 }
 
 
-static const ber_sequence_t PBMAC1Params_sequence[] = {
+static const ber_old_sequence_t PBMAC1Params_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyDerivationFunc },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageAuthScheme },
   { 0, 0, 0, NULL }
@@ -783,8 +783,8 @@ static const ber_sequence_t PBMAC1Params_sequence[] = {
 
 static int
 dissect_pkcs12_PBMAC1Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PBMAC1Params_sequence, hf_index, ett_pkcs12_PBMAC1Params);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PBMAC1Params_sequence, hf_index, ett_pkcs12_PBMAC1Params);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index acaea53503..ebcc16f96a 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -148,7 +148,7 @@ static const value_string pkinit_TrustedCA_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TrustedCA_choice[] = {
+static const ber_old_choice_t TrustedCA_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_caName },
   {   2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial },
   { 0, 0, 0, 0, NULL }
@@ -156,9 +156,9 @@ static const ber_choice_t TrustedCA_choice[] = {
 
 static int
 dissect_pkinit_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TrustedCA_choice, hf_index, ett_pkinit_TrustedCA,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TrustedCA_choice, hf_index, ett_pkinit_TrustedCA,
+                                     NULL);
 
   return offset;
 }
@@ -167,14 +167,14 @@ static int dissect_trustedCertifiers_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
 };
 
 static int
 dissect_pkinit_SEQUENCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA);
 
   return offset;
 }
@@ -183,7 +183,7 @@ static int dissect_trustedCertifiers(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t PaPkAsReq_sequence[] = {
+static const ber_old_sequence_t PaPkAsReq_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_signedAuthPack },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert },
@@ -192,8 +192,8 @@ static const ber_sequence_t PaPkAsReq_sequence[] = {
 
 static int
 dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
 
   return offset;
 }
@@ -228,7 +228,7 @@ static int dissect_paNonce(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t PKAuthenticator_sequence[] = {
+static const ber_old_sequence_t PKAuthenticator_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_cusec },
   { BER_CLASS_CON, 1, 0, dissect_ctime },
   { BER_CLASS_CON, 2, 0, dissect_paNonce },
@@ -238,8 +238,8 @@ static const ber_sequence_t PKAuthenticator_sequence[] = {
 
 static int
 dissect_pkinit_PKAuthenticator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
 
   return offset;
 }
@@ -248,14 +248,14 @@ static int dissect_pkAuthenticator(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item },
 };
 
 static int
 dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier);
 
   return offset;
 }
@@ -264,7 +264,7 @@ static int dissect_supportedCMSTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AuthPack_sequence[] = {
+static const ber_old_sequence_t AuthPack_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_pkAuthenticator },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_clientPublicValue },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_supportedCMSTypes },
@@ -273,8 +273,8 @@ static const ber_sequence_t AuthPack_sequence[] = {
 
 static int
 dissect_pkinit_AuthPack(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
 
   return offset;
 }
@@ -286,7 +286,7 @@ static const value_string pkinit_PaPkAsRep_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PaPkAsRep_choice[] = {
+static const ber_old_choice_t PaPkAsRep_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_dhSignedData },
   {   1, BER_CLASS_CON, 1, 0, dissect_encKeyPack },
   { 0, 0, 0, 0, NULL }
@@ -294,9 +294,9 @@ static const ber_choice_t PaPkAsRep_choice[] = {
 
 static int
 dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep,
+                                     NULL);
 
   return offset;
 }
@@ -316,7 +316,7 @@ static int dissect_subjectPublicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
+static const ber_old_sequence_t KDCDHKeyInfo_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_subjectPublicKey },
   { BER_CLASS_CON, 1, 0, dissect_dhNonce },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_dhKeyExpiration },
@@ -325,8 +325,8 @@ static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
 
 static int
 dissect_pkinit_KDCDHKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 097ef76c13..18c18ec72e 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -205,7 +205,7 @@ static int dissect_extnValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Extension_sequence[] = {
+static const ber_old_sequence_t Extension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue },
@@ -214,8 +214,8 @@ static const ber_sequence_t Extension_sequence[] = {
 
 int
 dissect_pkix1explicit_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Extension_sequence, hf_index, ett_pkix1explicit_Extension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Extension_sequence, hf_index, ett_pkix1explicit_Extension);
 
   return offset;
 }
@@ -224,14 +224,14 @@ static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Extensions_sequence_of[1] = {
+static const ber_old_sequence_t Extensions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
 };
 
 int
 dissect_pkix1explicit_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
 
   return offset;
 }
@@ -276,7 +276,7 @@ static int dissect_seed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t ValidationParms_sequence[] = {
+static const ber_old_sequence_t ValidationParms_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_seed },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pgenCounter },
   { 0, 0, 0, NULL }
@@ -284,8 +284,8 @@ static const ber_sequence_t ValidationParms_sequence[] = {
 
 static int
 dissect_pkix1explicit_ValidationParms(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
 
   return offset;
 }
@@ -294,7 +294,7 @@ static int dissect_validationParms(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DomainParameters_sequence[] = {
+static const ber_old_sequence_t DomainParameters_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_q },
@@ -305,8 +305,8 @@ static const ber_sequence_t DomainParameters_sequence[] = {
 
 static int
 dissect_pkix1explicit_DomainParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
 
   return offset;
 }
@@ -339,7 +339,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
+static const ber_old_sequence_t AttributeTypeAndValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
   { 0, 0, 0, NULL }
@@ -347,8 +347,8 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
 
 int
 dissect_pkix1explicit_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
 
   return offset;
 }
@@ -357,14 +357,14 @@ static int dissect_RelativeDistinguishedName_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
+static const ber_old_sequence_t RelativeDistinguishedName_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
 };
 
 int
 dissect_pkix1explicit_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
 
   return offset;
 }
@@ -373,14 +373,14 @@ static int dissect_RDNSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RDNSequence_sequence_of[1] = {
+static const ber_old_sequence_t RDNSequence_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
 };
 
 int
 dissect_pkix1explicit_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
 
   return offset;
 }
@@ -435,7 +435,7 @@ static int dissect_value1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
+static const ber_old_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type1 },
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value1 },
   { 0, 0, 0, NULL }
@@ -443,8 +443,8 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
 
 int
 dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 3ae089e989..4c69ccfae5 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -129,7 +129,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t EDIPartyName_sequence[] = {
+static const ber_old_sequence_t EDIPartyName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
   { 0, 0, 0, NULL }
@@ -137,8 +137,8 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
 
 static int
 dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
 
   return offset;
 }
@@ -156,7 +156,7 @@ static int dissect_accessMethod(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AccessDescription_sequence[] = {
+static const ber_old_sequence_t AccessDescription_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_accessMethod },
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_accessLocation },
   { 0, 0, 0, NULL }
@@ -164,8 +164,8 @@ static const ber_sequence_t AccessDescription_sequence[] = {
 
 static int
 dissect_pkix1implicit_AccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
 
   return offset;
 }
@@ -174,14 +174,14 @@ static int dissect_AuthorityInfoAccessSyntax_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = {
+static const ber_old_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthorityInfoAccessSyntax_item },
 };
 
 int
 dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax);
 
   return offset;
 }
@@ -236,7 +236,7 @@ static const value_string pkix1implicit_DisplayText_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DisplayText_choice[] = {
+static const ber_old_choice_t DisplayText_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
@@ -245,9 +245,9 @@ static const ber_choice_t DisplayText_choice[] = {
 
 static int
 dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText,
+                                     NULL);
 
   return offset;
 }
@@ -272,14 +272,14 @@ static int dissect_noticeNumbers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_noticeNumbers_sequence_of[1] = {
+static const ber_old_sequence_t T_noticeNumbers_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item },
 };
 
 static int
 dissect_pkix1implicit_T_noticeNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers);
 
   return offset;
 }
@@ -288,7 +288,7 @@ static int dissect_noticeNumbers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t NoticeReference_sequence[] = {
+static const ber_old_sequence_t NoticeReference_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers },
   { 0, 0, 0, NULL }
@@ -296,8 +296,8 @@ static const ber_sequence_t NoticeReference_sequence[] = {
 
 static int
 dissect_pkix1implicit_NoticeReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
 
   return offset;
 }
@@ -306,7 +306,7 @@ static int dissect_noticeRef(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t UserNotice_sequence[] = {
+static const ber_old_sequence_t UserNotice_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
   { 0, 0, 0, NULL }
@@ -314,8 +314,8 @@ static const ber_sequence_t UserNotice_sequence[] = {
 
 int
 dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index 5210332232..51e6de2208 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -119,7 +119,7 @@ static int dissect_policy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ProxyPolicy_sequence[] = {
+static const ber_old_sequence_t ProxyPolicy_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyLanguage },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policy },
   { 0, 0, 0, NULL }
@@ -127,8 +127,8 @@ static const ber_sequence_t ProxyPolicy_sequence[] = {
 
 static int
 dissect_pkixproxy_ProxyPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
 
   return offset;
 }
@@ -137,7 +137,7 @@ static int dissect_proxyPolicy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
+static const ber_old_sequence_t ProxyCertInfoExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pCPathLenConstraint },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_proxyPolicy },
   { 0, 0, 0, NULL }
@@ -145,8 +145,8 @@ static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
 
 static int
 dissect_pkixproxy_ProxyCertInfoExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index 3f23b54b73..a8ca3b5373 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -180,7 +180,7 @@ static const value_string pkixqualified_TypeOfBiometricData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TypeOfBiometricData_choice[] = {
+static const ber_old_choice_t TypeOfBiometricData_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_predefinedBiometricType },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_biometricDataOid },
   { 0, 0, 0, 0, NULL }
@@ -188,9 +188,9 @@ static const ber_choice_t TypeOfBiometricData_choice[] = {
 
 static int
 dissect_pkixqualified_TypeOfBiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData,
+                                     NULL);
 
   return offset;
 }
@@ -226,7 +226,7 @@ static int dissect_sourceDataUri(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t BiometricData_sequence[] = {
+static const ber_old_sequence_t BiometricData_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash },
@@ -236,8 +236,8 @@ static const ber_sequence_t BiometricData_sequence[] = {
 
 static int
 dissect_pkixqualified_BiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
 
   return offset;
 }
@@ -246,14 +246,14 @@ static int dissect_BiometricSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t BiometricSyntax_sequence_of[1] = {
+static const ber_old_sequence_t BiometricSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item },
 };
 
 static int
 dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax);
 
   return offset;
 }
@@ -286,7 +286,7 @@ static int dissect_statementInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t QCStatement_sequence[] = {
+static const ber_old_sequence_t QCStatement_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo },
   { 0, 0, 0, NULL }
@@ -294,8 +294,8 @@ static const ber_sequence_t QCStatement_sequence[] = {
 
 static int
 dissect_pkixqualified_QCStatement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
 
   return offset;
 }
@@ -304,27 +304,27 @@ static int dissect_QCStatements_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t QCStatements_sequence_of[1] = {
+static const ber_old_sequence_t QCStatements_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item },
 };
 
 static int
 dissect_pkixqualified_QCStatements(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements);
 
   return offset;
 }
 
 
-static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = {
+static const ber_old_sequence_t NameRegistrationAuthorities_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item },
 };
 
 static int
 dissect_pkixqualified_NameRegistrationAuthorities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities);
 
   return offset;
 }
@@ -333,7 +333,7 @@ static int dissect_nameRegistrationAuthorities(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SemanticsInformation_sequence[] = {
+static const ber_old_sequence_t SemanticsInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities },
   { 0, 0, 0, NULL }
@@ -341,8 +341,8 @@ static const ber_sequence_t SemanticsInformation_sequence[] = {
 
 static int
 dissect_pkixqualified_SemanticsInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index b56924e52a..724364e89d 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -156,7 +156,7 @@ static int dissect_hashedMessage(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t MessageImprint_sequence[] = {
+static const ber_old_sequence_t MessageImprint_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage },
   { 0, 0, 0, NULL }
@@ -164,8 +164,8 @@ static const ber_sequence_t MessageImprint_sequence[] = {
 
 static int
 dissect_pkixtsp_MessageImprint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
 
   return offset;
 }
@@ -223,7 +223,7 @@ static int dissect_ordering(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TimeStampReq_sequence[] = {
+static const ber_old_sequence_t TimeStampReq_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_reqPolicy },
@@ -235,8 +235,8 @@ static const ber_sequence_t TimeStampReq_sequence[] = {
 
 static int
 dissect_pkixtsp_TimeStampReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
 
   return offset;
 }
@@ -290,7 +290,7 @@ static int dissect_failInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PKIStatusInfo_sequence[] = {
+static const ber_old_sequence_t PKIStatusInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
   { 0, 0, 0, NULL }
@@ -298,8 +298,8 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
 
 static int
 dissect_pkixtsp_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
 
   return offset;
 }
@@ -320,7 +320,7 @@ static int dissect_timeStampToken(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t TimeStampResp_sequence[] = {
+static const ber_old_sequence_t TimeStampResp_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken },
   { 0, 0, 0, NULL }
@@ -328,8 +328,8 @@ static const ber_sequence_t TimeStampResp_sequence[] = {
 
 static int
 dissect_pkixtsp_TimeStampResp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
 
   return offset;
 }
@@ -381,7 +381,7 @@ static int dissect_micros_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Accuracy_sequence[] = {
+static const ber_old_sequence_t Accuracy_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_micros_impl },
@@ -390,8 +390,8 @@ static const ber_sequence_t Accuracy_sequence[] = {
 
 static int
 dissect_pkixtsp_Accuracy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
 
   return offset;
 }
@@ -400,7 +400,7 @@ static int dissect_accuracy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TSTInfo_sequence[] = {
+static const ber_old_sequence_t TSTInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
@@ -416,8 +416,8 @@ static const ber_sequence_t TSTInfo_sequence[] = {
 
 static int
 dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 560beae548..a0f8fc2fb7 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -315,15 +315,15 @@ static int dissect_mode_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Mode_selector_set[] = {
+static const ber_old_sequence_t Mode_selector_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_value_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_pres_Mode_selector(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Mode_selector_set, hf_index, ett_pres_Mode_selector);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Mode_selector_set, hf_index, ett_pres_Mode_selector);
 
   return offset;
 }
@@ -447,14 +447,14 @@ static int dissect_transfer_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Transfer_syntax_name_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Transfer_syntax_name_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name_list_item },
 };
 
 static int
 dissect_pres_SEQUENCE_OF_Transfer_syntax_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Transfer_syntax_name_sequence_of, hf_index, ett_pres_SEQUENCE_OF_Transfer_syntax_name);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Transfer_syntax_name_sequence_of, hf_index, ett_pres_SEQUENCE_OF_Transfer_syntax_name);
 
   return offset;
 }
@@ -463,7 +463,7 @@ static int dissect_transfer_syntax_name_list(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t Context_list_item_sequence[] = {
+static const ber_old_sequence_t Context_list_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax_name },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name_list },
@@ -475,8 +475,8 @@ dissect_pres_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 #line 76 "pres.cnf"
 	abstract_syntax_name_oid=NULL;
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Context_list_item_sequence, hf_index, ett_pres_Context_list_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Context_list_item_sequence, hf_index, ett_pres_Context_list_item);
 
 #line 79 "pres.cnf"
 	register_ctx_id_and_oid(actx->pinfo, presentation_context_identifier, abstract_syntax_name_oid);
@@ -488,14 +488,14 @@ static int dissect_Context_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Context_list_sequence_of[1] = {
+static const ber_old_sequence_t Context_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item },
 };
 
 static int
 dissect_pres_Context_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Context_list_sequence_of, hf_index, ett_pres_Context_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Context_list_sequence_of, hf_index, ett_pres_Context_list);
 
   return offset;
 }
@@ -513,7 +513,7 @@ static int dissect_presentation_context_definition_list_impl(proto_tree *tree _U
 }
 
 
-static const ber_sequence_t Default_context_name_sequence[] = {
+static const ber_old_sequence_t Default_context_name_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abstract_syntax_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
   { 0, 0, 0, NULL }
@@ -521,8 +521,8 @@ static const ber_sequence_t Default_context_name_sequence[] = {
 
 static int
 dissect_pres_Default_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Default_context_name_sequence, hf_index, ett_pres_Default_context_name);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Default_context_name_sequence, hf_index, ett_pres_Default_context_name);
 
   return offset;
 }
@@ -600,14 +600,14 @@ static int dissect_protocol_options(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_extensions_sequence[] = {
+static const ber_old_sequence_t T_extensions_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_pres_T_extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_extensions_sequence, hf_index, ett_pres_T_extensions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_extensions_sequence, hf_index, ett_pres_T_extensions);
 
   return offset;
 }
@@ -706,7 +706,7 @@ static const value_string pres_T_presentation_data_values_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_presentation_data_values_choice[] = {
+static const ber_old_choice_t T_presentation_data_values_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_single_ASN1_type_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@@ -715,9 +715,9 @@ static const ber_choice_t T_presentation_data_values_choice[] = {
 
 static int
 dissect_pres_T_presentation_data_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_presentation_data_values_choice, hf_index, ett_pres_T_presentation_data_values,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_presentation_data_values_choice, hf_index, ett_pres_T_presentation_data_values,
+                                     NULL);
 
   return offset;
 }
@@ -726,7 +726,7 @@ static int dissect_presentation_data_values(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PDV_list_sequence[] = {
+static const ber_old_sequence_t PDV_list_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_presentation_data_values },
@@ -735,8 +735,8 @@ static const ber_sequence_t PDV_list_sequence[] = {
 
 static int
 dissect_pres_PDV_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDV_list_sequence, hf_index, ett_pres_PDV_list);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDV_list_sequence, hf_index, ett_pres_PDV_list);
 
   return offset;
 }
@@ -745,14 +745,14 @@ static int dissect_Fully_encoded_data_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t Fully_encoded_data_sequence_of[1] = {
+static const ber_old_sequence_t Fully_encoded_data_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Fully_encoded_data_item },
 };
 
 static int
 dissect_pres_Fully_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Fully_encoded_data_sequence_of, hf_index, ett_pres_Fully_encoded_data);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Fully_encoded_data_sequence_of, hf_index, ett_pres_Fully_encoded_data);
 
   return offset;
 }
@@ -767,7 +767,7 @@ static const value_string pres_User_data_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t User_data_choice[] = {
+static const ber_old_choice_t User_data_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_IMPLTAG, dissect_simply_encoded_data_impl },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_fully_encoded_data_impl },
   { 0, 0, 0, 0, NULL }
@@ -775,9 +775,9 @@ static const ber_choice_t User_data_choice[] = {
 
 static int
 dissect_pres_User_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 User_data_choice, hf_index, ett_pres_User_data,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     User_data_choice, hf_index, ett_pres_User_data,
+                                     NULL);
 
   return offset;
 }
@@ -789,7 +789,7 @@ static int dissect_ttdPPDU(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t T_normal_mode_parameters_sequence[] = {
+static const ber_old_sequence_t T_normal_mode_parameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calling_presentation_selector_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_called_presentation_selector_impl },
@@ -806,8 +806,8 @@ static const ber_sequence_t T_normal_mode_parameters_sequence[] = {
 
 static int
 dissect_pres_T_normal_mode_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_normal_mode_parameters_sequence, hf_index, ett_pres_T_normal_mode_parameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_normal_mode_parameters_sequence, hf_index, ett_pres_T_normal_mode_parameters);
 
   return offset;
 }
@@ -816,7 +816,7 @@ static int dissect_normal_mode_parameters_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t CP_type_set[] = {
+static const ber_old_sequence_t CP_type_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_selector_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x410_mode_parameters_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_normal_mode_parameters_impl },
@@ -825,8 +825,8 @@ static const ber_sequence_t CP_type_set[] = {
 
 static int
 dissect_pres_CP_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CP_type_set, hf_index, ett_pres_CP_type);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CP_type_set, hf_index, ett_pres_CP_type);
 
   return offset;
 }
@@ -894,7 +894,7 @@ static int dissect_provider_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Result_list_item_sequence[] = {
+static const ber_old_sequence_t Result_list_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_result_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_provider_reason_impl },
@@ -903,8 +903,8 @@ static const ber_sequence_t Result_list_item_sequence[] = {
 
 static int
 dissect_pres_Result_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Result_list_item_sequence, hf_index, ett_pres_Result_list_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Result_list_item_sequence, hf_index, ett_pres_Result_list_item);
 
   return offset;
 }
@@ -913,14 +913,14 @@ static int dissect_Result_list_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Result_list_sequence_of[1] = {
+static const ber_old_sequence_t Result_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Result_list_item },
 };
 
 static int
 dissect_pres_Result_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Result_list_sequence_of, hf_index, ett_pres_Result_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Result_list_sequence_of, hf_index, ett_pres_Result_list);
 
   return offset;
 }
@@ -938,7 +938,7 @@ static int dissect_presentation_context_definition_result_list_impl(proto_tree *
 }
 
 
-static const ber_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
+static const ber_old_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responding_presentation_selector_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_definition_result_list_impl },
@@ -952,8 +952,8 @@ static const ber_sequence_t T_CPA_PPDU_normal_mode_parameters_sequence[] = {
 
 static int
 dissect_pres_T_CPA_PPDU_normal_mode_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_CPA_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPA_PPDU_normal_mode_parameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_CPA_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPA_PPDU_normal_mode_parameters);
 
   return offset;
 }
@@ -962,7 +962,7 @@ static int dissect_cPU_PPDU_normal_mode_parameters_impl(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t CPA_PPDU_set[] = {
+static const ber_old_sequence_t CPA_PPDU_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mode_selector_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cPR_PPDU_x400_mode_parameters_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cPU_PPDU_normal_mode_parameters_impl },
@@ -971,8 +971,8 @@ static const ber_sequence_t CPA_PPDU_set[] = {
 
 static int
 dissect_pres_CPA_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CPA_PPDU_set, hf_index, ett_pres_CPA_PPDU);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CPA_PPDU_set, hf_index, ett_pres_CPA_PPDU);
 
   return offset;
 }
@@ -1015,7 +1015,7 @@ static int dissect_cPR_PPDU__provider_reason_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
+static const ber_old_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responding_presentation_selector_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_definition_result_list_impl },
@@ -1027,8 +1027,8 @@ static const ber_sequence_t T_CPR_PPDU_normal_mode_parameters_sequence[] = {
 
 static int
 dissect_pres_T_CPR_PPDU_normal_mode_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_CPR_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPR_PPDU_normal_mode_parameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_CPR_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_CPR_PPDU_normal_mode_parameters);
 
   return offset;
 }
@@ -1043,7 +1043,7 @@ static const value_string pres_CPR_PPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CPR_PPDU_choice[] = {
+static const ber_old_choice_t CPR_PPDU_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_cPU_PPDU_x400_mode_parameters },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cPR_PPDU_normal_mode_parameters },
   { 0, 0, 0, 0, NULL }
@@ -1051,15 +1051,15 @@ static const ber_choice_t CPR_PPDU_choice[] = {
 
 static int
 dissect_pres_CPR_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CPR_PPDU_choice, hf_index, ett_pres_CPR_PPDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CPR_PPDU_choice, hf_index, ett_pres_CPR_PPDU,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t Presentation_context_identifier_list_item_sequence[] = {
+static const ber_old_sequence_t Presentation_context_identifier_list_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
   { 0, 0, 0, NULL }
@@ -1067,8 +1067,8 @@ static const ber_sequence_t Presentation_context_identifier_list_item_sequence[]
 
 static int
 dissect_pres_Presentation_context_identifier_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Presentation_context_identifier_list_item_sequence, hf_index, ett_pres_Presentation_context_identifier_list_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Presentation_context_identifier_list_item_sequence, hf_index, ett_pres_Presentation_context_identifier_list_item);
 
   return offset;
 }
@@ -1077,14 +1077,14 @@ static int dissect_Presentation_context_identifier_list_item(proto_tree *tree _U
 }
 
 
-static const ber_sequence_t Presentation_context_identifier_list_sequence_of[1] = {
+static const ber_old_sequence_t Presentation_context_identifier_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_identifier_list_item },
 };
 
 static int
 dissect_pres_Presentation_context_identifier_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Presentation_context_identifier_list_sequence_of, hf_index, ett_pres_Presentation_context_identifier_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Presentation_context_identifier_list_sequence_of, hf_index, ett_pres_Presentation_context_identifier_list);
 
   return offset;
 }
@@ -1093,7 +1093,7 @@ static int dissect_presentation_context_identifier_list_impl(proto_tree *tree _U
 }
 
 
-static const ber_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
+static const ber_old_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
   { 0, 0, 0, NULL }
@@ -1101,8 +1101,8 @@ static const ber_sequence_t T_ARU_PPDU_normal_mode_parameters_sequence[] = {
 
 static int
 dissect_pres_T_ARU_PPDU_normal_mode_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_ARU_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_ARU_PPDU_normal_mode_parameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_ARU_PPDU_normal_mode_parameters_sequence, hf_index, ett_pres_T_ARU_PPDU_normal_mode_parameters);
 
   return offset;
 }
@@ -1117,7 +1117,7 @@ static const value_string pres_ARU_PPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ARU_PPDU_choice[] = {
+static const ber_old_choice_t ARU_PPDU_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_aRU_PPDU_x400_mode_parameters },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aRU_PPDU_normal_mode_parameters_impl },
   { 0, 0, 0, 0, NULL }
@@ -1125,9 +1125,9 @@ static const ber_choice_t ARU_PPDU_choice[] = {
 
 static int
 dissect_pres_ARU_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ARU_PPDU_choice, hf_index, ett_pres_ARU_PPDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ARU_PPDU_choice, hf_index, ett_pres_ARU_PPDU,
+                                     NULL);
 
   return offset;
 }
@@ -1210,7 +1210,7 @@ static int dissect_event_identifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ARP_PPDU_sequence[] = {
+static const ber_old_sequence_t ARP_PPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aRU_PPDU_provider_reason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_event_identifier_impl },
   { 0, 0, 0, NULL }
@@ -1218,8 +1218,8 @@ static const ber_sequence_t ARP_PPDU_sequence[] = {
 
 static int
 dissect_pres_ARP_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ARP_PPDU_sequence, hf_index, ett_pres_ARP_PPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ARP_PPDU_sequence, hf_index, ett_pres_ARP_PPDU);
 
   return offset;
 }
@@ -1234,7 +1234,7 @@ static const value_string pres_Abort_type_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Abort_type_choice[] = {
+static const ber_old_choice_t Abort_type_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_aru_ppdu },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_arp_ppdu },
   { 0, 0, 0, 0, NULL }
@@ -1242,9 +1242,9 @@ static const ber_choice_t Abort_type_choice[] = {
 
 static int
 dissect_pres_Abort_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Abort_type_choice, hf_index, ett_pres_Abort_type,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Abort_type_choice, hf_index, ett_pres_Abort_type,
+                                     NULL);
 
   return offset;
 }
@@ -1262,14 +1262,14 @@ static int dissect_presentation_context_addition_list_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t Presentation_context_deletion_list_sequence_of[1] = {
+static const ber_old_sequence_t Presentation_context_deletion_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_deletion_list_item },
 };
 
 static int
 dissect_pres_Presentation_context_deletion_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Presentation_context_deletion_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Presentation_context_deletion_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_list);
 
   return offset;
 }
@@ -1278,7 +1278,7 @@ static int dissect_presentation_context_deletion_list_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t AC_PPDU_sequence[] = {
+static const ber_old_sequence_t AC_PPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_addition_list_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_deletion_list_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
@@ -1287,8 +1287,8 @@ static const ber_sequence_t AC_PPDU_sequence[] = {
 
 static int
 dissect_pres_AC_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AC_PPDU_sequence, hf_index, ett_pres_AC_PPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AC_PPDU_sequence, hf_index, ett_pres_AC_PPDU);
 
   return offset;
 }
@@ -1328,14 +1328,14 @@ static int dissect_Presentation_context_deletion_result_list_item(proto_tree *tr
 }
 
 
-static const ber_sequence_t Presentation_context_deletion_result_list_sequence_of[1] = {
+static const ber_old_sequence_t Presentation_context_deletion_result_list_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_Presentation_context_deletion_result_list_item },
 };
 
 static int
 dissect_pres_Presentation_context_deletion_result_list(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Presentation_context_deletion_result_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_result_list);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Presentation_context_deletion_result_list_sequence_of, hf_index, ett_pres_Presentation_context_deletion_result_list);
 
   return offset;
 }
@@ -1344,7 +1344,7 @@ static int dissect_presentation_context_deletion_result_list_impl(proto_tree *tr
 }
 
 
-static const ber_sequence_t ACA_PPDU_sequence[] = {
+static const ber_old_sequence_t ACA_PPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_addition_result_list_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_deletion_result_list_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
@@ -1353,8 +1353,8 @@ static const ber_sequence_t ACA_PPDU_sequence[] = {
 
 static int
 dissect_pres_ACA_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ACA_PPDU_sequence, hf_index, ett_pres_ACA_PPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ACA_PPDU_sequence, hf_index, ett_pres_ACA_PPDU);
 
   return offset;
 }
@@ -1370,7 +1370,7 @@ static const value_string pres_Typed_data_type_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Typed_data_type_choice[] = {
+static const ber_old_choice_t Typed_data_type_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_acPPDU_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_acaPPDU_impl },
   {   2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ttdPPDU },
@@ -1379,15 +1379,15 @@ static const ber_choice_t Typed_data_type_choice[] = {
 
 static int
 dissect_pres_Typed_data_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Typed_data_type_choice, hf_index, ett_pres_Typed_data_type,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Typed_data_type_choice, hf_index, ett_pres_Typed_data_type,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t RS_PPDU_sequence[] = {
+static const ber_old_sequence_t RS_PPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
   { 0, 0, 0, NULL }
@@ -1395,14 +1395,14 @@ static const ber_sequence_t RS_PPDU_sequence[] = {
 
 static int
 dissect_pres_RS_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RS_PPDU_sequence, hf_index, ett_pres_RS_PPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RS_PPDU_sequence, hf_index, ett_pres_RS_PPDU);
 
   return offset;
 }
 
 
-static const ber_sequence_t RSA_PPDU_sequence[] = {
+static const ber_old_sequence_t RSA_PPDU_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_presentation_context_identifier_list_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_user_data },
   { 0, 0, 0, NULL }
@@ -1410,8 +1410,8 @@ static const ber_sequence_t RSA_PPDU_sequence[] = {
 
 static int
 dissect_pres_RSA_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RSA_PPDU_sequence, hf_index, ett_pres_RSA_PPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RSA_PPDU_sequence, hf_index, ett_pres_RSA_PPDU);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 41916ccb36..d55a0e0f5b 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -160,7 +160,7 @@ static const value_string q932_ros_Code_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Code_choice[] = {
+static const ber_old_choice_t Code_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global },
   { 0, 0, 0, 0, NULL }
@@ -173,9 +173,9 @@ dissect_q932_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
   code_local = -1;
   code_global = "";
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Code_choice, hf_index, ett_q932_ros_Code,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Code_choice, hf_index, ett_q932_ros_Code,
+                                     NULL);
 
   return offset;
 }
@@ -221,7 +221,7 @@ static const value_string q932_ros_InvokeId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InvokeId_choice[] = {
+static const ber_old_choice_t InvokeId_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
   { 0, 0, 0, 0, NULL }
@@ -229,9 +229,9 @@ static const ber_choice_t InvokeId_choice[] = {
 
 static int
 dissect_q932_ros_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InvokeId_choice, hf_index, ett_q932_ros_InvokeId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InvokeId_choice, hf_index, ett_q932_ros_InvokeId,
+                                     NULL);
 
   return offset;
 }
@@ -249,7 +249,7 @@ static const value_string q932_ros_T_linkedId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_linkedId_choice[] = {
+static const ber_old_choice_t T_linkedId_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_linkedIdPresent_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_absent_impl },
   { 0, 0, 0, 0, NULL }
@@ -257,9 +257,9 @@ static const ber_choice_t T_linkedId_choice[] = {
 
 static int
 dissect_q932_ros_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_linkedId_choice, hf_index, ett_q932_ros_T_linkedId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_linkedId_choice, hf_index, ett_q932_ros_T_linkedId,
+                                     NULL);
 
   return offset;
 }
@@ -290,7 +290,7 @@ static int dissect_argument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_linkedId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode },
@@ -305,8 +305,8 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
   arg_next_tvb = NULL;
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_q932_ros_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_q932_ros_Invoke);
 
 #line 73 "q932-ros.cnf"
   if (code_choice == 0) {
@@ -359,7 +359,7 @@ static int dissect_resultArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t T_result_sequence[] = {
+static const ber_old_sequence_t T_result_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultArgument },
   { 0, 0, 0, NULL }
@@ -367,8 +367,8 @@ static const ber_sequence_t T_result_sequence[] = {
 
 static int
 dissect_q932_ros_T_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_result_sequence, hf_index, ett_q932_ros_T_result);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_result_sequence, hf_index, ett_q932_ros_T_result);
 
   return offset;
 }
@@ -377,7 +377,7 @@ static int dissect_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_result },
   { 0, 0, 0, NULL }
@@ -390,8 +390,8 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
   res_next_tvb = NULL;
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult);
 
 #line 116 "q932-ros.cnf"
   if (code_choice == 0) {
@@ -445,7 +445,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errcode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -459,8 +459,8 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
   err_next_tvb = NULL;
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_q932_ros_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_q932_ros_ReturnError);
 
 #line 159 "q932-ros.cnf"
   if (code_choice == 0) {
@@ -598,7 +598,7 @@ static const value_string q932_ros_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_general_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -608,9 +608,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_q932_ros_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_q932_ros_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_q932_ros_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -619,7 +619,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -630,8 +630,8 @@ dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 #line 184 "q932-ros.cnf"
   problem_str[0] = '\0';
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_q932_ros_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_q932_ros_Reject);
 
 #line 186 "q932-ros.cnf"
   proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), "  REJ: %s", problem_str);
@@ -651,7 +651,7 @@ static const value_string q932_ros_RoseAPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RoseAPDU_choice[] = {
+static const ber_old_choice_t RoseAPDU_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -661,9 +661,9 @@ static const ber_choice_t RoseAPDU_choice[] = {
 
 static int
 dissect_q932_ros_RoseAPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index f2c17a8e64..2fdf48ea96 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -253,7 +253,7 @@ static int dissect_publicTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t PublicPartyNumber_sequence[] = {
+static const ber_old_sequence_t PublicPartyNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_publicTypeOfNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_publicNumberDigits },
   { 0, 0, 0, NULL }
@@ -261,8 +261,8 @@ static const ber_sequence_t PublicPartyNumber_sequence[] = {
 
 static int
 dissect_q932_PublicPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PublicPartyNumber_sequence, hf_index, ett_q932_PublicPartyNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PublicPartyNumber_sequence, hf_index, ett_q932_PublicPartyNumber);
 
   return offset;
 }
@@ -307,7 +307,7 @@ static int dissect_privateTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PrivatePartyNumber_sequence[] = {
+static const ber_old_sequence_t PrivatePartyNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_privateTypeOfNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_privateNumberDigits },
   { 0, 0, 0, NULL }
@@ -315,8 +315,8 @@ static const ber_sequence_t PrivatePartyNumber_sequence[] = {
 
 static int
 dissect_q932_PrivatePartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivatePartyNumber_sequence, hf_index, ett_q932_PrivatePartyNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivatePartyNumber_sequence, hf_index, ett_q932_PrivatePartyNumber);
 
   return offset;
 }
@@ -325,7 +325,7 @@ static int dissect_privatePartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_choice_t PartyNumber_choice[] = {
+static const ber_old_choice_t PartyNumber_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknownPartyNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_publicPartyNumber_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nsapEncodedNumber_impl },
@@ -338,9 +338,9 @@ static const ber_choice_t PartyNumber_choice[] = {
 
 int
 dissect_q932_PartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PartyNumber_choice, hf_index, ett_q932_PartyNumber,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PartyNumber_choice, hf_index, ett_q932_PartyNumber,
+                                     NULL);
 
   return offset;
 }
@@ -396,7 +396,7 @@ static int dissect_oddCountIndicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
+static const ber_old_sequence_t UserSpecifiedSubaddress_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subaddressInformation },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_oddCountIndicator },
   { 0, 0, 0, NULL }
@@ -404,8 +404,8 @@ static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
 
 static int
 dissect_q932_UserSpecifiedSubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserSpecifiedSubaddress_sequence, hf_index, ett_q932_UserSpecifiedSubaddress);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserSpecifiedSubaddress_sequence, hf_index, ett_q932_UserSpecifiedSubaddress);
 
   return offset;
 }
@@ -427,7 +427,7 @@ static int dissect_nSAPSubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_choice_t PartySubaddress_choice[] = {
+static const ber_old_choice_t PartySubaddress_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userSpecifiedSubaddress },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nSAPSubaddress },
   { 0, 0, 0, 0, NULL }
@@ -435,9 +435,9 @@ static const ber_choice_t PartySubaddress_choice[] = {
 
 int
 dissect_q932_PartySubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PartySubaddress_choice, hf_index, ett_q932_PartySubaddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PartySubaddress_choice, hf_index, ett_q932_PartySubaddress,
+                                     NULL);
 
   return offset;
 }
@@ -446,7 +446,7 @@ static int dissect_partySubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AddressScreened_sequence[] = {
+static const ber_old_sequence_t AddressScreened_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeninglndicator },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
@@ -455,8 +455,8 @@ static const ber_sequence_t AddressScreened_sequence[] = {
 
 static int
 dissect_q932_AddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddressScreened_sequence, hf_index, ett_q932_AddressScreened);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddressScreened_sequence, hf_index, ett_q932_AddressScreened);
 
   return offset;
 }
@@ -486,7 +486,7 @@ static int dissect_numberNotAvailableDueToInterworking_impl(proto_tree *tree _U_
 }
 
 
-static const ber_choice_t PresentedAddressScreened_choice[] = {
+static const ber_old_choice_t PresentedAddressScreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAlIowedAddress_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueTolnterworking_impl },
@@ -496,15 +496,15 @@ static const ber_choice_t PresentedAddressScreened_choice[] = {
 
 int
 dissect_q932_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedAddressScreened_choice, hf_index, ett_q932_PresentedAddressScreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedAddressScreened_choice, hf_index, ett_q932_PresentedAddressScreened,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t Address_sequence[] = {
+static const ber_old_sequence_t Address_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
   { 0, 0, 0, NULL }
@@ -512,8 +512,8 @@ static const ber_sequence_t Address_sequence[] = {
 
 int
 dissect_q932_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Address_sequence, hf_index, ett_q932_Address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Address_sequence, hf_index, ett_q932_Address);
 
   return offset;
 }
@@ -525,7 +525,7 @@ static int dissect_presentationRestrictedAddress_impl(proto_tree *tree _U_, tvbu
 }
 
 
-static const ber_choice_t PresentedAddressUnscreened_choice[] = {
+static const ber_old_choice_t PresentedAddressUnscreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddress_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueTolnterworking_impl },
@@ -535,15 +535,15 @@ static const ber_choice_t PresentedAddressUnscreened_choice[] = {
 
 int
 dissect_q932_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedAddressUnscreened_choice, hf_index, ett_q932_PresentedAddressUnscreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedAddressUnscreened_choice, hf_index, ett_q932_PresentedAddressUnscreened,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t NumberScreened_sequence[] = {
+static const ber_old_sequence_t NumberScreened_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
   { 0, 0, 0, NULL }
@@ -551,8 +551,8 @@ static const ber_sequence_t NumberScreened_sequence[] = {
 
 static int
 dissect_q932_NumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NumberScreened_sequence, hf_index, ett_q932_NumberScreened);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NumberScreened_sequence, hf_index, ett_q932_NumberScreened);
 
   return offset;
 }
@@ -564,7 +564,7 @@ static int dissect_presentationRestrictedNumberScreened_impl(proto_tree *tree _U
 }
 
 
-static const ber_choice_t PresentedNumberScreened_choice[] = {
+static const ber_old_choice_t PresentedNumberScreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedNumberScreened_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -574,15 +574,15 @@ static const ber_choice_t PresentedNumberScreened_choice[] = {
 
 int
 dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedNumberScreened_choice, hf_index, ett_q932_PresentedNumberScreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedNumberScreened_choice, hf_index, ett_q932_PresentedNumberScreened,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_choice_t PresentedNumberUnscreened_choice[] = {
+static const ber_old_choice_t PresentedNumberUnscreened_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_presentationAllowedNumber },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -592,9 +592,9 @@ static const ber_choice_t PresentedNumberUnscreened_choice[] = {
 
 int
 dissect_q932_PresentedNumberUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedNumberUnscreened_choice, hf_index, ett_q932_PresentedNumberUnscreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedNumberUnscreened_choice, hf_index, ett_q932_PresentedNumberUnscreened,
+                                     NULL);
 
   return offset;
 }
@@ -646,7 +646,7 @@ static int dissect_destinationEntityAddress(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t NetworkFacilityExtension_U_sequence[] = {
+static const ber_old_sequence_t NetworkFacilityExtension_U_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sourceEntity_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_sourceEntityAddress },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_destinationEntity_impl },
@@ -656,8 +656,8 @@ static const ber_sequence_t NetworkFacilityExtension_U_sequence[] = {
 
 static int
 dissect_q932_NetworkFacilityExtension_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NetworkFacilityExtension_U_sequence, hf_index, ett_q932_NetworkFacilityExtension_U);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NetworkFacilityExtension_U_sequence, hf_index, ett_q932_NetworkFacilityExtension_U);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 607cd1f1f5..8007d81325 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -674,7 +674,7 @@ static int dissect_extensionArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Extension_sequence[] = {
+static const ber_old_sequence_t Extension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extensionId },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extensionArgument },
   { 0, 0, 0, NULL }
@@ -682,8 +682,8 @@ static const ber_sequence_t Extension_sequence[] = {
 
 static int
 dissect_qsig_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Extension_sequence, hf_index, ett_qsig_Extension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Extension_sequence, hf_index, ett_qsig_Extension);
 
   return offset;
 }
@@ -770,7 +770,7 @@ static int dissect_publicTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t PublicPartyNumber_sequence[] = {
+static const ber_old_sequence_t PublicPartyNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_publicTypeOfNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_publicNumberDigits },
   { 0, 0, 0, NULL }
@@ -778,8 +778,8 @@ static const ber_sequence_t PublicPartyNumber_sequence[] = {
 
 static int
 dissect_qsig_PublicPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PublicPartyNumber_sequence, hf_index, ett_qsig_PublicPartyNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PublicPartyNumber_sequence, hf_index, ett_qsig_PublicPartyNumber);
 
   return offset;
 }
@@ -811,7 +811,7 @@ static int dissect_privateTypeOfNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PrivatePartyNumber_sequence[] = {
+static const ber_old_sequence_t PrivatePartyNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_privateTypeOfNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_privateNumberDigits },
   { 0, 0, 0, NULL }
@@ -819,8 +819,8 @@ static const ber_sequence_t PrivatePartyNumber_sequence[] = {
 
 static int
 dissect_qsig_PrivatePartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivatePartyNumber_sequence, hf_index, ett_qsig_PrivatePartyNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivatePartyNumber_sequence, hf_index, ett_qsig_PrivatePartyNumber);
 
   return offset;
 }
@@ -839,7 +839,7 @@ static const value_string qsig_PartyNumber_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PartyNumber_choice[] = {
+static const ber_old_choice_t PartyNumber_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknownPartyNumber_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_publicPartyNumber_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dataPartyNumber_impl },
@@ -851,9 +851,9 @@ static const ber_choice_t PartyNumber_choice[] = {
 
 static int
 dissect_qsig_PartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PartyNumber_choice, hf_index, ett_qsig_PartyNumber,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PartyNumber_choice, hf_index, ett_qsig_PartyNumber,
+                                     NULL);
 
   return offset;
 }
@@ -935,7 +935,7 @@ static int dissect_remoteEnabled(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
+static const ber_old_sequence_t UserSpecifiedSubaddress_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subaddressInformation },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_oddCountIndicator },
   { 0, 0, 0, NULL }
@@ -943,8 +943,8 @@ static const ber_sequence_t UserSpecifiedSubaddress_sequence[] = {
 
 static int
 dissect_qsig_UserSpecifiedSubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserSpecifiedSubaddress_sequence, hf_index, ett_qsig_UserSpecifiedSubaddress);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserSpecifiedSubaddress_sequence, hf_index, ett_qsig_UserSpecifiedSubaddress);
 
   return offset;
 }
@@ -972,7 +972,7 @@ static const value_string qsig_PartySubaddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PartySubaddress_choice[] = {
+static const ber_old_choice_t PartySubaddress_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userSpecifiedSubaddress },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nSAPSubaddress },
   { 0, 0, 0, 0, NULL }
@@ -980,9 +980,9 @@ static const ber_choice_t PartySubaddress_choice[] = {
 
 static int
 dissect_qsig_PartySubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PartySubaddress_choice, hf_index, ett_qsig_PartySubaddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PartySubaddress_choice, hf_index, ett_qsig_PartySubaddress,
+                                     NULL);
 
   return offset;
 }
@@ -994,7 +994,7 @@ static int dissect_callingPartySubaddress(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AddressScreened_sequence[] = {
+static const ber_old_sequence_t AddressScreened_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
@@ -1003,8 +1003,8 @@ static const ber_sequence_t AddressScreened_sequence[] = {
 
 static int
 dissect_qsig_AddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AddressScreened_sequence, hf_index, ett_qsig_AddressScreened);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AddressScreened_sequence, hf_index, ett_qsig_AddressScreened);
 
   return offset;
 }
@@ -1045,7 +1045,7 @@ static const value_string qsig_PresentedAddressScreened_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PresentedAddressScreened_choice[] = {
+static const ber_old_choice_t PresentedAddressScreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressS_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -1055,15 +1055,15 @@ static const ber_choice_t PresentedAddressScreened_choice[] = {
 
 static int
 dissect_qsig_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedAddressScreened_choice, hf_index, ett_qsig_PresentedAddressScreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedAddressScreened_choice, hf_index, ett_qsig_PresentedAddressScreened,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t Address_sequence[] = {
+static const ber_old_sequence_t Address_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partySubaddress },
   { 0, 0, 0, NULL }
@@ -1071,8 +1071,8 @@ static const ber_sequence_t Address_sequence[] = {
 
 static int
 dissect_qsig_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Address_sequence, hf_index, ett_qsig_Address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Address_sequence, hf_index, ett_qsig_Address);
 
   return offset;
 }
@@ -1098,7 +1098,7 @@ static const value_string qsig_PresentedAddressUnscreened_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PresentedAddressUnscreened_choice[] = {
+static const ber_old_choice_t PresentedAddressUnscreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressU_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -1108,15 +1108,15 @@ static const ber_choice_t PresentedAddressUnscreened_choice[] = {
 
 static int
 dissect_qsig_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedAddressUnscreened_choice, hf_index, ett_qsig_PresentedAddressUnscreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedAddressUnscreened_choice, hf_index, ett_qsig_PresentedAddressUnscreened,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t NumberScreened_sequence[] = {
+static const ber_old_sequence_t NumberScreened_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_partyNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_screeningIndicator },
   { 0, 0, 0, NULL }
@@ -1124,8 +1124,8 @@ static const ber_sequence_t NumberScreened_sequence[] = {
 
 static int
 dissect_qsig_NumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NumberScreened_sequence, hf_index, ett_qsig_NumberScreened);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NumberScreened_sequence, hf_index, ett_qsig_NumberScreened);
 
   return offset;
 }
@@ -1145,7 +1145,7 @@ static const value_string qsig_PresentedNumberScreened_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PresentedNumberScreened_choice[] = {
+static const ber_old_choice_t PresentedNumberScreened_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddressNS_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -1155,9 +1155,9 @@ static const ber_choice_t PresentedNumberScreened_choice[] = {
 
 static int
 dissect_qsig_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedNumberScreened_choice, hf_index, ett_qsig_PresentedNumberScreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedNumberScreened_choice, hf_index, ett_qsig_PresentedNumberScreened,
+                                     NULL);
 
   return offset;
 }
@@ -1174,7 +1174,7 @@ static const value_string qsig_PresentedNumberUnscreened_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PresentedNumberUnscreened_choice[] = {
+static const ber_old_choice_t PresentedNumberUnscreened_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_presentationAllowedAddressNU },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
@@ -1184,9 +1184,9 @@ static const ber_choice_t PresentedNumberUnscreened_choice[] = {
 
 static int
 dissect_qsig_PresentedNumberUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PresentedNumberUnscreened_choice, hf_index, ett_qsig_PresentedNumberUnscreened,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PresentedNumberUnscreened_choice, hf_index, ett_qsig_PresentedNumberUnscreened,
+                                     NULL);
 
   return offset;
 }
@@ -1258,7 +1258,7 @@ static int dissect_characterSet(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t NameSet_sequence[] = {
+static const ber_old_sequence_t NameSet_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nameData },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_characterSet },
   { 0, 0, 0, NULL }
@@ -1266,8 +1266,8 @@ static const ber_sequence_t NameSet_sequence[] = {
 
 static int
 dissect_qsig_NameSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NameSet_sequence, hf_index, ett_qsig_NameSet);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NameSet_sequence, hf_index, ett_qsig_NameSet);
 
   return offset;
 }
@@ -1285,7 +1285,7 @@ static const value_string qsig_NamePresentationAllowed_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NamePresentationAllowed_choice[] = {
+static const ber_old_choice_t NamePresentationAllowed_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowedSimple_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowedExtended_impl },
   { 0, 0, 0, 0, NULL }
@@ -1293,9 +1293,9 @@ static const ber_choice_t NamePresentationAllowed_choice[] = {
 
 static int
 dissect_qsig_NamePresentationAllowed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NamePresentationAllowed_choice, hf_index, ett_qsig_NamePresentationAllowed,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NamePresentationAllowed_choice, hf_index, ett_qsig_NamePresentationAllowed,
+                                     NULL);
 
   return offset;
 }
@@ -1311,7 +1311,7 @@ static const value_string qsig_NamePresentationRestricted_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NamePresentationRestricted_choice[] = {
+static const ber_old_choice_t NamePresentationRestricted_choice[] = {
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedSimple_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedExtended_impl },
   {   7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_namePresentationRestrictedNull_impl },
@@ -1320,9 +1320,9 @@ static const ber_choice_t NamePresentationRestricted_choice[] = {
 
 static int
 dissect_qsig_NamePresentationRestricted(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NamePresentationRestricted_choice, hf_index, ett_qsig_NamePresentationRestricted,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NamePresentationRestricted_choice, hf_index, ett_qsig_NamePresentationRestricted,
+                                     NULL);
 
   return offset;
 }
@@ -1344,7 +1344,7 @@ static int dissect_nameNotAvailable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_choice_t Name_choice[] = {
+static const ber_old_choice_t Name_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_namePresentationAllowed },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_namePresentationRestricted },
   {   2, BER_CLASS_CON, 4, BER_FLAGS_NOOWNTAG, dissect_nameNotAvailable },
@@ -1353,9 +1353,9 @@ static const ber_choice_t Name_choice[] = {
 
 int
 dissect_qsig_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Name_choice, hf_index, ett_qsig_Name,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Name_choice, hf_index, ett_qsig_Name,
+                                     NULL);
 
   return offset;
 }
@@ -1376,14 +1376,14 @@ static int dissect_redirectionName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Extension_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Extension_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiple_item },
 };
 
 static int
 dissect_qsig_SEQUENCE_OF_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Extension_sequence_of, hf_index, ett_qsig_SEQUENCE_OF_Extension);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Extension_sequence_of, hf_index, ett_qsig_SEQUENCE_OF_Extension);
 
   return offset;
 }
@@ -1398,7 +1398,7 @@ static const value_string qsig_NameExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NameExtension_choice[] = {
+static const ber_old_choice_t NameExtension_choice[] = {
   {   5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1406,9 +1406,9 @@ static const ber_choice_t NameExtension_choice[] = {
 
 static int
 dissect_qsig_NameExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NameExtension_choice, hf_index, ett_qsig_NameExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NameExtension_choice, hf_index, ett_qsig_NameExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1417,7 +1417,7 @@ static int dissect_extensionNA(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_nameSequence_sequence[] = {
+static const ber_old_sequence_t T_nameSequence_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extensionNA },
   { 0, 0, 0, NULL }
@@ -1425,8 +1425,8 @@ static const ber_sequence_t T_nameSequence_sequence[] = {
 
 static int
 dissect_qsig_T_nameSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_nameSequence_sequence, hf_index, ett_qsig_T_nameSequence);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_nameSequence_sequence, hf_index, ett_qsig_T_nameSequence);
 
   return offset;
 }
@@ -1441,7 +1441,7 @@ static const value_string qsig_NameArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NameArg_choice[] = {
+static const ber_old_choice_t NameArg_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_name },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_nameSequence },
   { 0, 0, 0, 0, NULL }
@@ -1449,9 +1449,9 @@ static const ber_choice_t NameArg_choice[] = {
 
 static int
 dissect_qsig_NameArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NameArg_choice, hf_index, ett_qsig_NameArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NameArg_choice, hf_index, ett_qsig_NameArg,
+                                     NULL);
 
   return offset;
 }
@@ -1509,7 +1509,7 @@ static const value_string qsig_ADExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ADExtension_choice[] = {
+static const ber_old_choice_t ADExtension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1517,9 +1517,9 @@ static const ber_choice_t ADExtension_choice[] = {
 
 static int
 dissect_qsig_ADExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ADExtension_choice, hf_index, ett_qsig_ADExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ADExtension_choice, hf_index, ett_qsig_ADExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1528,7 +1528,7 @@ static int dissect_extensionAD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ActivateDivArg_sequence[] = {
+static const ber_old_sequence_t ActivateDivArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_divertedToAddress },
@@ -1540,8 +1540,8 @@ static const ber_sequence_t ActivateDivArg_sequence[] = {
 
 static int
 dissect_qsig_ActivateDivArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ActivateDivArg_sequence, hf_index, ett_qsig_ActivateDivArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ActivateDivArg_sequence, hf_index, ett_qsig_ActivateDivArg);
 
   return offset;
 }
@@ -1554,7 +1554,7 @@ static const value_string qsig_ActivateDivRes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ActivateDivRes_choice[] = {
+static const ber_old_choice_t ActivateDivRes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@@ -1563,9 +1563,9 @@ static const ber_choice_t ActivateDivRes_choice[] = {
 
 static int
 dissect_qsig_ActivateDivRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ActivateDivRes_choice, hf_index, ett_qsig_ActivateDivRes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ActivateDivRes_choice, hf_index, ett_qsig_ActivateDivRes,
+                                     NULL);
 
   return offset;
 }
@@ -1577,7 +1577,7 @@ static const value_string qsig_DDExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DDExtension_choice[] = {
+static const ber_old_choice_t DDExtension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1585,9 +1585,9 @@ static const ber_choice_t DDExtension_choice[] = {
 
 static int
 dissect_qsig_DDExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DDExtension_choice, hf_index, ett_qsig_DDExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DDExtension_choice, hf_index, ett_qsig_DDExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1596,7 +1596,7 @@ static int dissect_extensionDD(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t DeactivateDivArg_sequence[] = {
+static const ber_old_sequence_t DeactivateDivArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
@@ -1607,8 +1607,8 @@ static const ber_sequence_t DeactivateDivArg_sequence[] = {
 
 static int
 dissect_qsig_DeactivateDivArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeactivateDivArg_sequence, hf_index, ett_qsig_DeactivateDivArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeactivateDivArg_sequence, hf_index, ett_qsig_DeactivateDivArg);
 
   return offset;
 }
@@ -1621,7 +1621,7 @@ static const value_string qsig_DeactivateDivRes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DeactivateDivRes_choice[] = {
+static const ber_old_choice_t DeactivateDivRes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@@ -1630,9 +1630,9 @@ static const ber_choice_t DeactivateDivRes_choice[] = {
 
 static int
 dissect_qsig_DeactivateDivRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DeactivateDivRes_choice, hf_index, ett_qsig_DeactivateDivRes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DeactivateDivRes_choice, hf_index, ett_qsig_DeactivateDivRes,
+                                     NULL);
 
   return offset;
 }
@@ -1644,7 +1644,7 @@ static const value_string qsig_IDExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t IDExtension_choice[] = {
+static const ber_old_choice_t IDExtension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1652,9 +1652,9 @@ static const ber_choice_t IDExtension_choice[] = {
 
 static int
 dissect_qsig_IDExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 IDExtension_choice, hf_index, ett_qsig_IDExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     IDExtension_choice, hf_index, ett_qsig_IDExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1663,7 +1663,7 @@ static int dissect_extensionID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t InterrDivArg_sequence[] = {
+static const ber_old_sequence_t InterrDivArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_basicService },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
@@ -1674,8 +1674,8 @@ static const ber_sequence_t InterrDivArg_sequence[] = {
 
 static int
 dissect_qsig_InterrDivArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InterrDivArg_sequence, hf_index, ett_qsig_InterrDivArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InterrDivArg_sequence, hf_index, ett_qsig_InterrDivArg);
 
   return offset;
 }
@@ -1687,7 +1687,7 @@ static const value_string qsig_CHRExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CHRExtension_choice[] = {
+static const ber_old_choice_t CHRExtension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1695,9 +1695,9 @@ static const ber_choice_t CHRExtension_choice[] = {
 
 static int
 dissect_qsig_CHRExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CHRExtension_choice, hf_index, ett_qsig_CHRExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CHRExtension_choice, hf_index, ett_qsig_CHRExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1706,7 +1706,7 @@ static int dissect_extensionCHR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ChkResArg_sequence[] = {
+static const ber_old_sequence_t ChkResArg_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_divertedToNr },
@@ -1716,8 +1716,8 @@ static const ber_sequence_t ChkResArg_sequence[] = {
 
 static int
 dissect_qsig_ChkResArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChkResArg_sequence, hf_index, ett_qsig_ChkResArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChkResArg_sequence, hf_index, ett_qsig_ChkResArg);
 
   return offset;
 }
@@ -1730,7 +1730,7 @@ static const value_string qsig_ChkResRes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ChkResRes_choice[] = {
+static const ber_old_choice_t ChkResRes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@@ -1739,9 +1739,9 @@ static const ber_choice_t ChkResRes_choice[] = {
 
 static int
 dissect_qsig_ChkResRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ChkResRes_choice, hf_index, ett_qsig_ChkResRes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ChkResRes_choice, hf_index, ett_qsig_ChkResRes,
+                                     NULL);
 
   return offset;
 }
@@ -1819,7 +1819,7 @@ static const value_string qsig_CRRExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CRRExtension_choice[] = {
+static const ber_old_choice_t CRRExtension_choice[] = {
   {   9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {  10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1827,9 +1827,9 @@ static const ber_choice_t CRRExtension_choice[] = {
 
 static int
 dissect_qsig_CRRExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CRRExtension_choice, hf_index, ett_qsig_CRRExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CRRExtension_choice, hf_index, ett_qsig_CRRExtension,
+                                     NULL);
 
   return offset;
 }
@@ -1838,7 +1838,7 @@ static int dissect_extensionCRR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t CallRrArg_sequence[] = {
+static const ber_old_sequence_t CallRrArg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_rerouteingReason },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalRerouteingReason_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_calledAddress },
@@ -1858,8 +1858,8 @@ static const ber_sequence_t CallRrArg_sequence[] = {
 
 static int
 dissect_qsig_CallRrArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CallRrArg_sequence, hf_index, ett_qsig_CallRrArg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CallRrArg_sequence, hf_index, ett_qsig_CallRrArg);
 
   return offset;
 }
@@ -1872,7 +1872,7 @@ static const value_string qsig_CallRrRes_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CallRrRes_choice[] = {
+static const ber_old_choice_t CallRrRes_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@@ -1881,9 +1881,9 @@ static const ber_choice_t CallRrRes_choice[] = {
 
 static int
 dissect_qsig_CallRrRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CallRrRes_choice, hf_index, ett_qsig_CallRrRes,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CallRrRes_choice, hf_index, ett_qsig_CallRrRes,
+                                     NULL);
 
   return offset;
 }
@@ -1895,7 +1895,7 @@ static const value_string qsig_DLI1Extension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DLI1Extension_choice[] = {
+static const ber_old_choice_t DLI1Extension_choice[] = {
   {   9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {  10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1903,9 +1903,9 @@ static const ber_choice_t DLI1Extension_choice[] = {
 
 static int
 dissect_qsig_DLI1Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DLI1Extension_choice, hf_index, ett_qsig_DLI1Extension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DLI1Extension_choice, hf_index, ett_qsig_DLI1Extension,
+                                     NULL);
 
   return offset;
 }
@@ -1914,7 +1914,7 @@ static int dissect_extensionDLI1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t DivLegInf1Arg_sequence[] = {
+static const ber_old_sequence_t DivLegInf1Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_diversionReason },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_subscriptionOption },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nominatedNr },
@@ -1924,8 +1924,8 @@ static const ber_sequence_t DivLegInf1Arg_sequence[] = {
 
 static int
 dissect_qsig_DivLegInf1Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DivLegInf1Arg_sequence, hf_index, ett_qsig_DivLegInf1Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DivLegInf1Arg_sequence, hf_index, ett_qsig_DivLegInf1Arg);
 
   return offset;
 }
@@ -1937,7 +1937,7 @@ static const value_string qsig_DLI2Extension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DLI2Extension_choice[] = {
+static const ber_old_choice_t DLI2Extension_choice[] = {
   {   5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1945,9 +1945,9 @@ static const ber_choice_t DLI2Extension_choice[] = {
 
 static int
 dissect_qsig_DLI2Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DLI2Extension_choice, hf_index, ett_qsig_DLI2Extension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DLI2Extension_choice, hf_index, ett_qsig_DLI2Extension,
+                                     NULL);
 
   return offset;
 }
@@ -1956,7 +1956,7 @@ static int dissect_extensionDLI2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t DivLegInf2Arg_sequence[] = {
+static const ber_old_sequence_t DivLegInf2Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_diversionCounter },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_diversionReason },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalDiversionReason_impl },
@@ -1970,8 +1970,8 @@ static const ber_sequence_t DivLegInf2Arg_sequence[] = {
 
 static int
 dissect_qsig_DivLegInf2Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DivLegInf2Arg_sequence, hf_index, ett_qsig_DivLegInf2Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DivLegInf2Arg_sequence, hf_index, ett_qsig_DivLegInf2Arg);
 
   return offset;
 }
@@ -1983,7 +1983,7 @@ static const value_string qsig_DLI3Extension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DLI3Extension_choice[] = {
+static const ber_old_choice_t DLI3Extension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -1991,9 +1991,9 @@ static const ber_choice_t DLI3Extension_choice[] = {
 
 static int
 dissect_qsig_DLI3Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DLI3Extension_choice, hf_index, ett_qsig_DLI3Extension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DLI3Extension_choice, hf_index, ett_qsig_DLI3Extension,
+                                     NULL);
 
   return offset;
 }
@@ -2002,7 +2002,7 @@ static int dissect_extensionDLI3(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t DivLegInf3Arg_sequence[] = {
+static const ber_old_sequence_t DivLegInf3Arg_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_presentationAllowedIndicator },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_redirectionName },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extensionDLI3 },
@@ -2011,8 +2011,8 @@ static const ber_sequence_t DivLegInf3Arg_sequence[] = {
 
 static int
 dissect_qsig_DivLegInf3Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DivLegInf3Arg_sequence, hf_index, ett_qsig_DivLegInf3Arg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DivLegInf3Arg_sequence, hf_index, ett_qsig_DivLegInf3Arg);
 
   return offset;
 }
@@ -2025,7 +2025,7 @@ static const value_string qsig_DivLegFailArg_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DivLegFailArg_choice[] = {
+static const ber_old_choice_t DivLegFailArg_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_null },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
@@ -2034,9 +2034,9 @@ static const ber_choice_t DivLegFailArg_choice[] = {
 
 static int
 dissect_qsig_DivLegFailArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DivLegFailArg_choice, hf_index, ett_qsig_DivLegFailArg,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DivLegFailArg_choice, hf_index, ett_qsig_DivLegFailArg,
+                                     NULL);
 
   return offset;
 }
@@ -2048,7 +2048,7 @@ static const value_string qsig_IRExtension_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t IRExtension_choice[] = {
+static const ber_old_choice_t IRExtension_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_single_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_multiple_impl },
   { 0, 0, 0, 0, NULL }
@@ -2056,9 +2056,9 @@ static const ber_choice_t IRExtension_choice[] = {
 
 static int
 dissect_qsig_IRExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 IRExtension_choice, hf_index, ett_qsig_IRExtension,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     IRExtension_choice, hf_index, ett_qsig_IRExtension,
+                                     NULL);
 
   return offset;
 }
@@ -2067,7 +2067,7 @@ static int dissect_extensionIR(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t IntResult_sequence[] = {
+static const ber_old_sequence_t IntResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_servedUserNr },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_basicService },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_procedure },
@@ -2079,8 +2079,8 @@ static const ber_sequence_t IntResult_sequence[] = {
 
 static int
 dissect_qsig_IntResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IntResult_sequence, hf_index, ett_qsig_IntResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IntResult_sequence, hf_index, ett_qsig_IntResult);
 
   return offset;
 }
@@ -2089,14 +2089,14 @@ static int dissect_IntResultList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t IntResultList_set_of[1] = {
+static const ber_old_sequence_t IntResultList_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IntResultList_item },
 };
 
 static int
 dissect_qsig_IntResultList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 IntResultList_set_of, hf_index, ett_qsig_IntResultList);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     IntResultList_set_of, hf_index, ett_qsig_IntResultList);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index c9ff86526e..147b01ef85 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -354,7 +354,7 @@ const value_string ros_InvokeId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InvokeId_choice[] = {
+static const ber_old_choice_t InvokeId_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
   { 0, 0, 0, 0, NULL }
@@ -362,9 +362,9 @@ static const ber_choice_t InvokeId_choice[] = {
 
 int
 dissect_ros_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InvokeId_choice, hf_index, ett_ros_InvokeId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InvokeId_choice, hf_index, ett_ros_InvokeId,
+                                     NULL);
 
   return offset;
 }
@@ -413,7 +413,7 @@ static int dissect_argument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedId_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
@@ -423,8 +423,8 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_ros_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_ros_Invoke);
 
   return offset;
 }
@@ -460,7 +460,7 @@ static int dissect_operationResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_result_sequence[] = {
+static const ber_old_sequence_t T_result_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_operationResult },
   { 0, 0, 0, NULL }
@@ -468,8 +468,8 @@ static const ber_sequence_t T_result_sequence[] = {
 
 static int
 dissect_ros_T_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_result_sequence, hf_index, ett_ros_T_result);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_result_sequence, hf_index, ett_ros_T_result);
 
   return offset;
 }
@@ -478,7 +478,7 @@ static int dissect_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_result },
   { 0, 0, 0, NULL }
@@ -486,8 +486,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_ros_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_ros_ReturnResult);
 
   return offset;
 }
@@ -537,7 +537,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_errcode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -546,8 +546,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_ros_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_ros_ReturnError);
 
   return offset;
 }
@@ -651,7 +651,7 @@ static const value_string ros_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_general_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_rejectResult_impl },
@@ -661,9 +661,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_ros_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_ros_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_ros_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -672,7 +672,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -680,8 +680,8 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_ros_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_ros_Reject);
 
   return offset;
 }
@@ -843,7 +843,7 @@ static const value_string ros_ROS_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ROS_choice[] = {
+static const ber_old_choice_t ROS_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -859,9 +859,9 @@ static const ber_choice_t ROS_choice[] = {
 
 static int
 dissect_ros_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ROS_choice, hf_index, ett_ros_ROS,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ROS_choice, hf_index, ett_ros_ROS,
+                                     NULL);
 
   return offset;
 }
@@ -885,7 +885,7 @@ const value_string ros_Code_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Code_choice[] = {
+static const ber_old_choice_t Code_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global },
   { 0, 0, 0, 0, NULL }
@@ -893,9 +893,9 @@ static const ber_choice_t Code_choice[] = {
 
 int
 dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Code_choice, hf_index, ett_ros_Code,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Code_choice, hf_index, ett_ros_Code,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 8893645456..066a4f7f95 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -312,7 +312,7 @@ static const value_string rtse_CallingSSuserReference_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CallingSSuserReference_choice[] = {
+static const ber_old_choice_t CallingSSuserReference_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_t61String },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octetString },
   { 0, 0, 0, 0, NULL }
@@ -320,9 +320,9 @@ static const ber_choice_t CallingSSuserReference_choice[] = {
 
 static int
 dissect_rtse_CallingSSuserReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CallingSSuserReference_choice, hf_index, ett_rtse_CallingSSuserReference,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CallingSSuserReference_choice, hf_index, ett_rtse_CallingSSuserReference,
+                                     NULL);
 
   return offset;
 }
@@ -366,7 +366,7 @@ static int dissect_additionalReferenceInformation_impl(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t SessionConnectionIdentifier_sequence[] = {
+static const ber_old_sequence_t SessionConnectionIdentifier_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_callingSSuserReference },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_commonReference },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalReferenceInformation_impl },
@@ -378,8 +378,8 @@ dissect_rtse_SessionConnectionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tv
 #line 136 "rtse.cnf"
   if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Recover");
-    offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SessionConnectionIdentifier_sequence, hf_index, ett_rtse_SessionConnectionIdentifier);
+    offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SessionConnectionIdentifier_sequence, hf_index, ett_rtse_SessionConnectionIdentifier);
 
 
 
@@ -397,7 +397,7 @@ static const value_string rtse_ConnectionData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ConnectionData_choice[] = {
+static const ber_old_choice_t ConnectionData_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_open },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_recover_impl },
   { 0, 0, 0, 0, NULL }
@@ -405,9 +405,9 @@ static const ber_choice_t ConnectionData_choice[] = {
 
 static int
 dissect_rtse_ConnectionData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ConnectionData_choice, hf_index, ett_rtse_ConnectionData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ConnectionData_choice, hf_index, ett_rtse_ConnectionData,
+                                     NULL);
 
   return offset;
 }
@@ -441,7 +441,7 @@ static int dissect_applicationProtocol_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t RTORQapdu_set[] = {
+static const ber_old_sequence_t RTORQapdu_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_checkpointSize_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_windowSize_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialogueMode_impl },
@@ -457,8 +457,8 @@ dissect_rtse_RTORQapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
   if((session = (struct SESSION_DATA_STRUCTURE*)(actx->pinfo->private_data)) != NULL)
 	session->ros_op = (ROS_OP_BIND | ROS_OP_ARGUMENT);
   open_request=TRUE;
-    offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RTORQapdu_set, hf_index, ett_rtse_RTORQapdu);
+    offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RTORQapdu_set, hf_index, ett_rtse_RTORQapdu);
 
   open_request=FALSE;
 
@@ -471,7 +471,7 @@ static int dissect_rtorq_apdu_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RTOACapdu_set[] = {
+static const ber_old_sequence_t RTOACapdu_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_checkpointSize_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_windowSize_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_connectionDataAC },
@@ -485,8 +485,8 @@ dissect_rtse_RTOACapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
   if((session = (struct SESSION_DATA_STRUCTURE*)(actx->pinfo->private_data)) != NULL)
 	session->ros_op = (ROS_OP_BIND | ROS_OP_RESULT);
 
-    offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RTOACapdu_set, hf_index, ett_rtse_RTOACapdu);
+    offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RTOACapdu_set, hf_index, ett_rtse_RTOACapdu);
 
 
 
@@ -557,7 +557,7 @@ static int dissect_userDataRJ(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t RTORJapdu_set[] = {
+static const ber_old_sequence_t RTORJapdu_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_refuseReason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_userDataRJ },
   { 0, 0, 0, NULL }
@@ -565,8 +565,8 @@ static const ber_sequence_t RTORJapdu_set[] = {
 
 int
 dissect_rtse_RTORJapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RTORJapdu_set, hf_index, ett_rtse_RTORJapdu);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RTORJapdu_set, hf_index, ett_rtse_RTORJapdu);
 
   return offset;
 }
@@ -674,7 +674,7 @@ static int dissect_userdataAB(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t RTABapdu_set[] = {
+static const ber_old_sequence_t RTABapdu_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abortReason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reflectedParameter_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_userdataAB },
@@ -683,8 +683,8 @@ static const ber_sequence_t RTABapdu_set[] = {
 
 int
 dissect_rtse_RTABapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RTABapdu_set, hf_index, ett_rtse_RTABapdu);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RTABapdu_set, hf_index, ett_rtse_RTABapdu);
 
   return offset;
 }
@@ -703,7 +703,7 @@ static const value_string rtse_RTSE_apdus_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RTSE_apdus_choice[] = {
+static const ber_old_choice_t RTSE_apdus_choice[] = {
   {   0, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_rtorq_apdu_impl },
   {   1, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_rtoac_apdu_impl },
   {   2, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_rtorj_apdu_impl },
@@ -715,9 +715,9 @@ static const ber_choice_t RTSE_apdus_choice[] = {
 
 static int
 dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RTSE_apdus_choice, hf_index, ett_rtse_RTSE_apdus,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RTSE_apdus_choice, hf_index, ett_rtse_RTSE_apdus,
+                                     NULL);
 
   return offset;
 }
@@ -797,7 +797,7 @@ static const value_string rtse_T_encoding_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_encoding_choice[] = {
+static const ber_old_choice_t T_encoding_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
@@ -806,9 +806,9 @@ static const ber_choice_t T_encoding_choice[] = {
 
 static int
 dissect_rtse_T_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_encoding_choice, hf_index, ett_rtse_T_encoding,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_encoding_choice, hf_index, ett_rtse_T_encoding,
+                                     NULL);
 
   return offset;
 }
@@ -817,7 +817,7 @@ static int dissect_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t EXTERNALt_sequence[] = {
+static const ber_old_sequence_t EXTERNALt_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
@@ -842,7 +842,7 @@ dissect_rtse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
      offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
    }
 
-   offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
+   offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
                                 EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt);
 
 
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index 3ecdc3922a..16d392578b 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -193,7 +193,7 @@ static const value_string s4406_InformationObject_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InformationObject_choice[] = {
+static const ber_old_choice_t InformationObject_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mn_impl },
   { 0, 0, 0, 0, NULL }
@@ -201,9 +201,9 @@ static const ber_choice_t InformationObject_choice[] = {
 
 static int
 dissect_s4406_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InformationObject_choice, hf_index, ett_s4406_InformationObject,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InformationObject_choice, hf_index, ett_s4406_InformationObject,
+                                     NULL);
 
   return offset;
 }
@@ -270,14 +270,14 @@ static int dissect_sics_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Sic_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Sic_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_sics_item },
 };
 
 static int
 dissect_s4406_SEQUENCE_OF_Sic(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Sic_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_Sic);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Sic_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_Sic);
 
   return offset;
 }
@@ -313,7 +313,7 @@ static int dissect_dist_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t DistributionExtensionField_sequence[] = {
+static const ber_old_sequence_t DistributionExtensionField_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_dist_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_dist_value },
   { 0, 0, 0, NULL }
@@ -321,8 +321,8 @@ static const ber_sequence_t DistributionExtensionField_sequence[] = {
 
 static int
 dissect_s4406_DistributionExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DistributionExtensionField_sequence, hf_index, ett_s4406_DistributionExtensionField);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DistributionExtensionField_sequence, hf_index, ett_s4406_DistributionExtensionField);
 
   return offset;
 }
@@ -331,14 +331,14 @@ static int dissect_dist_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_DistributionExtensionField_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_DistributionExtensionField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dist_Extensions_item },
 };
 
 static int
 dissect_s4406_SEQUENCE_OF_DistributionExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_DistributionExtensionField_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_DistributionExtensionField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_DistributionExtensionField_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_DistributionExtensionField);
 
   return offset;
 }
@@ -347,7 +347,7 @@ static int dissect_dist_Extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DistributionCodes_set[] = {
+static const ber_old_sequence_t DistributionCodes_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dist_Extensions_impl },
   { 0, 0, 0, NULL }
@@ -355,8 +355,8 @@ static const ber_sequence_t DistributionCodes_set[] = {
 
 static int
 dissect_s4406_DistributionCodes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DistributionCodes_set, hf_index, ett_s4406_DistributionCodes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DistributionCodes_set, hf_index, ett_s4406_DistributionCodes);
 
   return offset;
 }
@@ -385,27 +385,27 @@ static int dissect_pilotHandling_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t HandlingInstructions_sequence_of[1] = {
+static const ber_old_sequence_t HandlingInstructions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_HandlingInstructions_item },
 };
 
 static int
 dissect_s4406_HandlingInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      HandlingInstructions_sequence_of, hf_index, ett_s4406_HandlingInstructions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          HandlingInstructions_sequence_of, hf_index, ett_s4406_HandlingInstructions);
 
   return offset;
 }
 
 
-static const ber_sequence_t MessageInstructions_sequence_of[1] = {
+static const ber_old_sequence_t MessageInstructions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_MessageInstructions_item },
 };
 
 static int
 dissect_s4406_MessageInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MessageInstructions_sequence_of, hf_index, ett_s4406_MessageInstructions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MessageInstructions_sequence_of, hf_index, ett_s4406_MessageInstructions);
 
   return offset;
 }
@@ -522,7 +522,7 @@ static int dissect_identifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MessageType_set[] = {
+static const ber_old_sequence_t MessageType_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_type_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_identifier_impl },
   { 0, 0, 0, NULL }
@@ -530,8 +530,8 @@ static const ber_sequence_t MessageType_set[] = {
 
 static int
 dissect_s4406_MessageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageType_set, hf_index, ett_s4406_MessageType);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageType_set, hf_index, ett_s4406_MessageType);
 
   return offset;
 }
@@ -579,7 +579,7 @@ static int dissect_replyRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AddressListDesignator_set[] = {
+static const ber_old_sequence_t AddressListDesignator_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_address_list_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listName_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationRequest_impl },
@@ -589,8 +589,8 @@ static const ber_sequence_t AddressListDesignator_set[] = {
 
 static int
 dissect_s4406_AddressListDesignator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AddressListDesignator_set, hf_index, ett_s4406_AddressListDesignator);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AddressListDesignator_set, hf_index, ett_s4406_AddressListDesignator);
 
   return offset;
 }
@@ -599,14 +599,14 @@ static int dissect_AddressListDesignatorSeq_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t AddressListDesignatorSeq_sequence_of[1] = {
+static const ber_old_sequence_t AddressListDesignatorSeq_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_AddressListDesignatorSeq_item },
 };
 
 static int
 dissect_s4406_AddressListDesignatorSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AddressListDesignatorSeq_sequence_of, hf_index, ett_s4406_AddressListDesignatorSeq);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AddressListDesignatorSeq_sequence_of, hf_index, ett_s4406_AddressListDesignatorSeq);
 
   return offset;
 }
@@ -631,7 +631,7 @@ static int dissect_other_recipient_type_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t OtherRecipientDesignator_set[] = {
+static const ber_old_sequence_t OtherRecipientDesignator_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_other_recipient_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_designator_impl },
   { 0, 0, 0, NULL }
@@ -639,8 +639,8 @@ static const ber_sequence_t OtherRecipientDesignator_set[] = {
 
 static int
 dissect_s4406_OtherRecipientDesignator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OtherRecipientDesignator_set, hf_index, ett_s4406_OtherRecipientDesignator);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OtherRecipientDesignator_set, hf_index, ett_s4406_OtherRecipientDesignator);
 
   return offset;
 }
@@ -649,14 +649,14 @@ static int dissect_OtherRecipientDesignatorSeq_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t OtherRecipientDesignatorSeq_sequence_of[1] = {
+static const ber_old_sequence_t OtherRecipientDesignatorSeq_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_OtherRecipientDesignatorSeq_item },
 };
 
 static int
 dissect_s4406_OtherRecipientDesignatorSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OtherRecipientDesignatorSeq_sequence_of, hf_index, ett_s4406_OtherRecipientDesignatorSeq);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OtherRecipientDesignatorSeq_sequence_of, hf_index, ett_s4406_OtherRecipientDesignatorSeq);
 
   return offset;
 }
@@ -688,14 +688,14 @@ static int dissect_pilotPrecedence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ORDescriptor_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ORDescriptor_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_pilotRecipient_item },
 };
 
 static int
 dissect_s4406_SEQUENCE_OF_ORDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ORDescriptor_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_ORDescriptor);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ORDescriptor_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_ORDescriptor);
 
   return offset;
 }
@@ -704,14 +704,14 @@ static int dissect_pilotRecipient_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_MilitaryString_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_MilitaryString_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_pilotHandling_item },
 };
 
 static int
 dissect_s4406_SEQUENCE_OF_MilitaryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_MilitaryString_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_MilitaryString);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_MilitaryString_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_MilitaryString);
 
   return offset;
 }
@@ -720,7 +720,7 @@ static int dissect_pilotHandling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t PilotInformation_sequence[] = {
+static const ber_old_sequence_t PilotInformation_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotPrecedence_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotRecipient_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pilotSecurity_impl },
@@ -730,8 +730,8 @@ static const ber_sequence_t PilotInformation_sequence[] = {
 
 static int
 dissect_s4406_PilotInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PilotInformation_sequence, hf_index, ett_s4406_PilotInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PilotInformation_sequence, hf_index, ett_s4406_PilotInformation);
 
   return offset;
 }
@@ -740,14 +740,14 @@ static int dissect_PilotInformationSeq_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PilotInformationSeq_sequence_of[1] = {
+static const ber_old_sequence_t PilotInformationSeq_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PilotInformationSeq_item },
 };
 
 static int
 dissect_s4406_PilotInformationSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PilotInformationSeq_sequence_of, hf_index, ett_s4406_PilotInformationSeq);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PilotInformationSeq_sequence_of, hf_index, ett_s4406_PilotInformationSeq);
 
   return offset;
 }
@@ -801,7 +801,7 @@ static int dissect_body_part_sequence_number_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t BodyPartSecurityLabel_set[] = {
+static const ber_old_sequence_t BodyPartSecurityLabel_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_body_part_security_label_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_sequence_number_impl },
   { 0, 0, 0, NULL }
@@ -809,8 +809,8 @@ static const ber_sequence_t BodyPartSecurityLabel_set[] = {
 
 static int
 dissect_s4406_BodyPartSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BodyPartSecurityLabel_set, hf_index, ett_s4406_BodyPartSecurityLabel);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BodyPartSecurityLabel_set, hf_index, ett_s4406_BodyPartSecurityLabel);
 
   return offset;
 }
@@ -819,14 +819,14 @@ static int dissect_body_part_security_labels_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_body_part_security_labels_item },
 };
 
 static int
 dissect_s4406_SEQUENCE_OF_BodyPartSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_BodyPartSecurityLabel_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_BodyPartSecurityLabel_sequence_of, hf_index, ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel);
 
   return offset;
 }
@@ -835,7 +835,7 @@ static int dissect_body_part_security_labels_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SecurityInformationLabels_sequence[] = {
+static const ber_old_sequence_t SecurityInformationLabels_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_content_security_label_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_heading_security_label_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_security_labels_impl },
@@ -844,8 +844,8 @@ static const ber_sequence_t SecurityInformationLabels_sequence[] = {
 
 static int
 dissect_s4406_SecurityInformationLabels(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecurityInformationLabels_sequence, hf_index, ett_s4406_SecurityInformationLabels);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecurityInformationLabels_sequence, hf_index, ett_s4406_SecurityInformationLabels);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 1b27374694..cec69e21be 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -220,16 +220,16 @@ static const value_string smrse_T_address_value_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_address_value_choice[] = {
+static const ber_old_choice_t T_address_value_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_format },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_smrse_T_address_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_address_value_choice, hf_index, ett_smrse_T_address_value,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_address_value_choice, hf_index, ett_smrse_T_address_value,
+                                     NULL);
 
   return offset;
 }
@@ -238,7 +238,7 @@ static int dissect_address_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SMS_Address_sequence[] = {
+static const ber_old_sequence_t SMS_Address_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_address_type },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numbering_plan },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value },
@@ -247,8 +247,8 @@ static const ber_sequence_t SMS_Address_sequence[] = {
 
 static int
 dissect_smrse_SMS_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
 
   return offset;
 }
@@ -292,7 +292,7 @@ static int dissect_password(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SMR_Bind_sequence[] = {
+static const ber_old_sequence_t SMR_Bind_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sc_address },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_password },
   { 0, 0, 0, NULL }
@@ -300,8 +300,8 @@ static const ber_sequence_t SMR_Bind_sequence[] = {
 
 static int
 dissect_smrse_SMR_Bind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
 
   return offset;
 }
@@ -320,14 +320,14 @@ static int dissect_moimsi_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SMR_Bind_Confirm_sequence[] = {
+static const ber_old_sequence_t SMR_Bind_Confirm_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_smrse_SMR_Bind_Confirm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
 
   return offset;
 }
@@ -356,28 +356,28 @@ static int dissect_connect_fail_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SMR_Bind_Failure_sequence[] = {
+static const ber_old_sequence_t SMR_Bind_Failure_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_smrse_SMR_Bind_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
 
   return offset;
 }
 
 
-static const ber_sequence_t SMR_Unbind_sequence[] = {
+static const ber_old_sequence_t SMR_Unbind_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
 
   return offset;
 }
@@ -452,7 +452,7 @@ static int dissect_mt_tariffClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RPDataMT_sequence[] = {
+static const ber_old_sequence_t RPDataMT_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_priority_request },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_mms },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mt_message_reference },
@@ -466,14 +466,14 @@ static const ber_sequence_t RPDataMT_sequence[] = {
 
 static int
 dissect_smrse_RPDataMT(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
 
   return offset;
 }
 
 
-static const ber_sequence_t RPDataMO_sequence[] = {
+static const ber_old_sequence_t RPDataMO_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mo_message_reference },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mo_originating_address },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mo_user_data },
@@ -484,22 +484,22 @@ static const ber_sequence_t RPDataMO_sequence[] = {
 
 static int
 dissect_smrse_RPDataMO(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
 
   return offset;
 }
 
 
-static const ber_sequence_t RPAck_sequence[] = {
+static const ber_old_sequence_t RPAck_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_smrse_RPAck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RPAck_sequence, hf_index, ett_smrse_RPAck);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RPAck_sequence, hf_index, ett_smrse_RPAck);
 
   return offset;
 }
@@ -541,7 +541,7 @@ static int dissect_error_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t RPError_sequence[] = {
+static const ber_old_sequence_t RPError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_reason },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_msg_waiting_set },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
@@ -552,14 +552,14 @@ static const ber_sequence_t RPError_sequence[] = {
 
 static int
 dissect_smrse_RPError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RPError_sequence, hf_index, ett_smrse_RPError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RPError_sequence, hf_index, ett_smrse_RPError);
 
   return offset;
 }
 
 
-static const ber_sequence_t RPAlertSC_sequence[] = {
+static const ber_old_sequence_t RPAlertSC_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ms_address },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
   { 0, 0, 0, NULL }
@@ -567,8 +567,8 @@ static const ber_sequence_t RPAlertSC_sequence[] = {
 
 static int
 dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 788250a985..0d9992d543 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1737,7 +1737,7 @@ static const value_string snmp_SimpleSyntax_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SimpleSyntax_choice[] = {
+static const ber_old_choice_t SimpleSyntax_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_integer_value },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_string_value },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_objectID_value },
@@ -1747,9 +1747,9 @@ static const ber_choice_t SimpleSyntax_choice[] = {
 
 static int
 dissect_snmp_SimpleSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SimpleSyntax_choice, hf_index, ett_snmp_SimpleSyntax,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SimpleSyntax_choice, hf_index, ett_snmp_SimpleSyntax,
+                                     NULL);
 
   return offset;
 }
@@ -1849,7 +1849,7 @@ static const value_string snmp_ApplicationSyntax_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ApplicationSyntax_choice[] = {
+static const ber_old_choice_t ApplicationSyntax_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_ipAddress_value },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_counter_value },
   {   3, BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_timeticks_value },
@@ -1861,9 +1861,9 @@ static const ber_choice_t ApplicationSyntax_choice[] = {
 
 static int
 dissect_snmp_ApplicationSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ApplicationSyntax_choice, hf_index, ett_snmp_ApplicationSyntax,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ApplicationSyntax_choice, hf_index, ett_snmp_ApplicationSyntax,
+                                     NULL);
 
   return offset;
 }
@@ -1878,7 +1878,7 @@ static const value_string snmp_ObjectSyntax_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ObjectSyntax_choice[] = {
+static const ber_old_choice_t ObjectSyntax_choice[] = {
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_simple },
   { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_application_wide },
   { 0, 0, 0, 0, NULL }
@@ -1886,9 +1886,9 @@ static const ber_choice_t ObjectSyntax_choice[] = {
 
 static int
 dissect_snmp_ObjectSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ObjectSyntax_choice, hf_index, ett_snmp_ObjectSyntax,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ObjectSyntax_choice, hf_index, ett_snmp_ObjectSyntax,
+                                     NULL);
 
   return offset;
 }
@@ -1959,16 +1959,16 @@ static const value_string snmp_NetworkAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NetworkAddress_choice[] = {
+static const ber_old_choice_t NetworkAddress_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_internet },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_snmp_NetworkAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NetworkAddress_choice, hf_index, ett_snmp_NetworkAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NetworkAddress_choice, hf_index, ett_snmp_NetworkAddress,
+                                     NULL);
 
   return offset;
 }
@@ -2135,7 +2135,7 @@ static const value_string snmp_ValueType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ValueType_choice[] = {
+static const ber_old_choice_t ValueType_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_value },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unSpecified },
   {   2, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_noSuchObject_impl },
@@ -2146,9 +2146,9 @@ static const ber_choice_t ValueType_choice[] = {
 
 static int
 dissect_snmp_ValueType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ValueType_choice, hf_index, ett_snmp_ValueType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ValueType_choice, hf_index, ett_snmp_ValueType,
+                                     NULL);
 
   return offset;
 }
@@ -2157,7 +2157,7 @@ static int dissect_valueType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t VarBind_sequence[] = {
+static const ber_old_sequence_t VarBind_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_valueType },
   { 0, 0, 0, NULL }
@@ -2168,8 +2168,8 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 #line 323 "snmp.cnf"
 	oid_tvb = NULL;
 	value_tvb = NULL;
-   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VarBind_sequence, hf_index, ett_snmp_VarBind);
+   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VarBind_sequence, hf_index, ett_snmp_VarBind);
 
 	if (oid_tvb && value_tvb) {
 		next_tvb_add_string(&var_list, value_tvb, (snmp_var_in_tree) ? tree : NULL, 
@@ -2186,14 +2186,14 @@ static int dissect_VarBindList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t VarBindList_sequence_of[1] = {
+static const ber_old_sequence_t VarBindList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_VarBindList_item },
 };
 
 static int
 dissect_snmp_VarBindList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      VarBindList_sequence_of, hf_index, ett_snmp_VarBindList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          VarBindList_sequence_of, hf_index, ett_snmp_VarBindList);
 
   return offset;
 }
@@ -2202,7 +2202,7 @@ static int dissect_variable_bindings(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t PDU_sequence[] = {
+static const ber_old_sequence_t PDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_request_id },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_status },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_index },
@@ -2212,8 +2212,8 @@ static const ber_sequence_t PDU_sequence[] = {
 
 static int
 dissect_snmp_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PDU_sequence, hf_index, ett_snmp_PDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PDU_sequence, hf_index, ett_snmp_PDU);
 
   return offset;
 }
@@ -2371,7 +2371,7 @@ static int dissect_generic_trap(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t Trap_PDU_sequence[] = {
+static const ber_old_sequence_t Trap_PDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_enterprise },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_agent_addr },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_generic_trap },
@@ -2383,8 +2383,8 @@ static const ber_sequence_t Trap_PDU_sequence[] = {
 
 static int
 dissect_snmp_Trap_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Trap_PDU_sequence, hf_index, ett_snmp_Trap_PDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Trap_PDU_sequence, hf_index, ett_snmp_Trap_PDU);
 
   return offset;
 }
@@ -2436,7 +2436,7 @@ static int dissect_max_repetitions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t BulkPDU_sequence[] = {
+static const ber_old_sequence_t BulkPDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_bulkPDU_request_id },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_non_repeaters },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max_repetitions },
@@ -2446,8 +2446,8 @@ static const ber_sequence_t BulkPDU_sequence[] = {
 
 static int
 dissect_snmp_BulkPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BulkPDU_sequence, hf_index, ett_snmp_BulkPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BulkPDU_sequence, hf_index, ett_snmp_BulkPDU);
 
   return offset;
 }
@@ -2610,7 +2610,7 @@ static const value_string snmp_PDUs_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PDUs_choice[] = {
+static const ber_old_choice_t PDUs_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_NOOWNTAG, dissect_get_request },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_NOOWNTAG, dissect_get_next_request },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_NOOWNTAG, dissect_get_response },
@@ -2628,9 +2628,9 @@ dissect_snmp_PDUs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 #line 30 "snmp.cnf"
 gint pdu_type;
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PDUs_choice, hf_index, ett_snmp_PDUs,
-                                 &pdu_type);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PDUs_choice, hf_index, ett_snmp_PDUs,
+                                     &pdu_type);
 
 	if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str(pdu_type, snmp_PDUs_vals,"Unknown PDU type (%u)"));
@@ -2650,7 +2650,7 @@ static int dissect_pDUs(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t Message_sequence[] = {
+static const ber_old_sequence_t Message_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_community },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_data },
@@ -2659,8 +2659,8 @@ static const ber_sequence_t Message_sequence[] = {
 
 static int
 dissect_snmp_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Message_sequence, hf_index, ett_snmp_Message);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Message_sequence, hf_index, ett_snmp_Message);
 
   return offset;
 }
@@ -2672,7 +2672,7 @@ static const value_string snmp_T_datav2u_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_datav2u_choice[] = {
+static const ber_old_choice_t T_datav2u_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_v2u_plaintext },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
   { 0, 0, 0, 0, NULL }
@@ -2680,9 +2680,9 @@ static const ber_choice_t T_datav2u_choice[] = {
 
 static int
 dissect_snmp_T_datav2u(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_datav2u_choice, hf_index, ett_snmp_T_datav2u,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_datav2u_choice, hf_index, ett_snmp_T_datav2u,
+                                     NULL);
 
   return offset;
 }
@@ -2691,7 +2691,7 @@ static int dissect_datav2u(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Messagev2u_sequence[] = {
+static const ber_old_sequence_t Messagev2u_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_parameters },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_datav2u },
@@ -2700,8 +2700,8 @@ static const ber_sequence_t Messagev2u_sequence[] = {
 
 static int
 dissect_snmp_Messagev2u(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Messagev2u_sequence, hf_index, ett_snmp_Messagev2u);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Messagev2u_sequence, hf_index, ett_snmp_Messagev2u);
 
   return offset;
 }
@@ -2800,7 +2800,7 @@ static int dissect_msgPrivacyParameters(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UsmSecurityParameters_sequence[] = {
+static const ber_old_sequence_t UsmSecurityParameters_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineID },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineBoots },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgAuthoritativeEngineTime },
@@ -2812,8 +2812,8 @@ static const ber_sequence_t UsmSecurityParameters_sequence[] = {
 
 static int
 dissect_snmp_UsmSecurityParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UsmSecurityParameters_sequence, hf_index, ett_snmp_UsmSecurityParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UsmSecurityParameters_sequence, hf_index, ett_snmp_UsmSecurityParameters);
 
   return offset;
 }
@@ -2875,7 +2875,7 @@ static int dissect_msgSecurityModel(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t HeaderData_sequence[] = {
+static const ber_old_sequence_t HeaderData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgID },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgMaxSize },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgFlags },
@@ -2885,8 +2885,8 @@ static const ber_sequence_t HeaderData_sequence[] = {
 
 static int
 dissect_snmp_HeaderData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   HeaderData_sequence, hf_index, ett_snmp_HeaderData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       HeaderData_sequence, hf_index, ett_snmp_HeaderData);
 
   return offset;
 }
@@ -2924,7 +2924,7 @@ static int dissect_msgSecurityParameters(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ScopedPDU_sequence[] = {
+static const ber_old_sequence_t ScopedPDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_contextEngineID },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_contextName },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_data },
@@ -2933,8 +2933,8 @@ static const ber_sequence_t ScopedPDU_sequence[] = {
 
 static int
 dissect_snmp_ScopedPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ScopedPDU_sequence, hf_index, ett_snmp_ScopedPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ScopedPDU_sequence, hf_index, ett_snmp_ScopedPDU);
 
   return offset;
 }
@@ -3004,7 +3004,7 @@ static const value_string snmp_ScopedPduData_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ScopedPduData_choice[] = {
+static const ber_old_choice_t ScopedPduData_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_plaintext },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedPDU },
   { 0, 0, 0, 0, NULL }
@@ -3012,9 +3012,9 @@ static const ber_choice_t ScopedPduData_choice[] = {
 
 static int
 dissect_snmp_ScopedPduData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ScopedPduData_choice, hf_index, ett_snmp_ScopedPduData,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ScopedPduData_choice, hf_index, ett_snmp_ScopedPduData,
+                                     NULL);
 
   return offset;
 }
@@ -3023,7 +3023,7 @@ static int dissect_msgData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t SNMPv3Message_sequence[] = {
+static const ber_old_sequence_t SNMPv3Message_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_msgVersion },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_msgGlobalData },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msgSecurityParameters },
@@ -3033,8 +3033,8 @@ static const ber_sequence_t SNMPv3Message_sequence[] = {
 
 static int
 dissect_snmp_SNMPv3Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SNMPv3Message_sequence, hf_index, ett_snmp_SNMPv3Message);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SNMPv3Message_sequence, hf_index, ett_snmp_SNMPv3Message);
 
 #line 265 "snmp.cnf"
 
@@ -3110,7 +3110,7 @@ static int dissect_description(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SimpleOpen_sequence[] = {
+static const ber_old_sequence_t SimpleOpen_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_smux_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_identity },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_description },
@@ -3120,8 +3120,8 @@ static const ber_sequence_t SimpleOpen_sequence[] = {
 
 static int
 dissect_snmp_SimpleOpen(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SimpleOpen_sequence, hf_index, ett_snmp_SimpleOpen);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SimpleOpen_sequence, hf_index, ett_snmp_SimpleOpen);
 
   return offset;
 }
@@ -3135,16 +3135,16 @@ static const value_string snmp_OpenPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OpenPDU_choice[] = {
+static const ber_old_choice_t OpenPDU_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_smux_simple },
   { 0, 0, 0, 0, NULL }
 };
 
 static int
 dissect_snmp_OpenPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OpenPDU_choice, hf_index, ett_snmp_OpenPDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OpenPDU_choice, hf_index, ett_snmp_OpenPDU,
+                                     NULL);
 
   return offset;
 }
@@ -3209,7 +3209,7 @@ static int dissect_operation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t RReqPDU_sequence[] = {
+static const ber_old_sequence_t RReqPDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subtree },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_priority },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_operation },
@@ -3218,8 +3218,8 @@ static const ber_sequence_t RReqPDU_sequence[] = {
 
 static int
 dissect_snmp_RReqPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RReqPDU_sequence, hf_index, ett_snmp_RReqPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RReqPDU_sequence, hf_index, ett_snmp_RReqPDU);
 
   return offset;
 }
@@ -3252,7 +3252,7 @@ static const value_string snmp_RegisterResponse_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RegisterResponse_choice[] = {
+static const ber_old_choice_t RegisterResponse_choice[] = {
   {   0, BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_rRspPDU },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_pDUs },
   { 0, 0, 0, 0, NULL }
@@ -3260,9 +3260,9 @@ static const ber_choice_t RegisterResponse_choice[] = {
 
 static int
 dissect_snmp_RegisterResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RegisterResponse_choice, hf_index, ett_snmp_RegisterResponse,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RegisterResponse_choice, hf_index, ett_snmp_RegisterResponse,
+                                     NULL);
 
   return offset;
 }
@@ -3299,7 +3299,7 @@ static const value_string snmp_SMUX_PDUs_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SMUX_PDUs_choice[] = {
+static const ber_old_choice_t SMUX_PDUs_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_open },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_close },
   {   2, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_registerRequest },
@@ -3310,9 +3310,9 @@ static const ber_choice_t SMUX_PDUs_choice[] = {
 
 static int
 dissect_snmp_SMUX_PDUs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SMUX_PDUs_choice, hf_index, ett_snmp_SMUX_PDUs,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SMUX_PDUs_choice, hf_index, ett_snmp_SMUX_PDUs,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index b4c8e31c35..3d5ce7f017 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -193,7 +193,7 @@ static int dissect_thisMech(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t MechTypeList_sequence_of[1] = {
+static const ber_old_sequence_t MechTypeList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_MechTypeList_item },
 };
 
@@ -205,8 +205,8 @@ dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
   saw_mechanism = FALSE;
 
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MechTypeList_sequence_of, hf_index, ett_spnego_MechTypeList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MechTypeList_sequence_of, hf_index, ett_spnego_MechTypeList);
 
 
   /* 
@@ -338,7 +338,7 @@ static int dissect_negTokenInit_mechListMIC(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t NegTokenInit_sequence[] = {
+static const ber_old_sequence_t NegTokenInit_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mechTypes },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_reqFlags },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mechToken },
@@ -348,8 +348,8 @@ static const ber_sequence_t NegTokenInit_sequence[] = {
 
 static int
 dissect_spnego_NegTokenInit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NegTokenInit_sequence, hf_index, ett_spnego_NegTokenInit);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NegTokenInit_sequence, hf_index, ett_spnego_NegTokenInit);
 
   return offset;
 }
@@ -491,7 +491,7 @@ static int dissect_mechListMIC(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t NegTokenTarg_sequence[] = {
+static const ber_old_sequence_t NegTokenTarg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_negResult },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_supportedMech },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_responseToken },
@@ -501,8 +501,8 @@ static const ber_sequence_t NegTokenTarg_sequence[] = {
 
 static int
 dissect_spnego_NegTokenTarg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NegTokenTarg_sequence, hf_index, ett_spnego_NegTokenTarg);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NegTokenTarg_sequence, hf_index, ett_spnego_NegTokenTarg);
 
   return offset;
 }
@@ -517,7 +517,7 @@ static const value_string spnego_NegotiationToken_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NegotiationToken_choice[] = {
+static const ber_old_choice_t NegotiationToken_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_negTokenInit },
   {   1, BER_CLASS_CON, 1, 0, dissect_negTokenTarg },
   { 0, 0, 0, 0, NULL }
@@ -525,9 +525,9 @@ static const ber_choice_t NegotiationToken_choice[] = {
 
 static int
 dissect_spnego_NegotiationToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NegotiationToken_choice, hf_index, ett_spnego_NegotiationToken,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NegotiationToken_choice, hf_index, ett_spnego_NegotiationToken,
+                                     NULL);
 
   return offset;
 }
@@ -547,15 +547,15 @@ static int dissect_principal(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PrincipalSeq_sequence[] = {
+static const ber_old_sequence_t PrincipalSeq_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_principal },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_spnego_PrincipalSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrincipalSeq_sequence, hf_index, ett_spnego_PrincipalSeq);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrincipalSeq_sequence, hf_index, ett_spnego_PrincipalSeq);
 
   return offset;
 }
@@ -616,7 +616,7 @@ static int dissect_innerContextToken(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t InitialContextToken_sequence[] = {
+static const ber_old_sequence_t InitialContextToken_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_thisMech },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_innerContextToken },
   { 0, 0, 0, NULL }
@@ -624,8 +624,8 @@ static const ber_sequence_t InitialContextToken_sequence[] = {
 
 static int
 dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InitialContextToken_sequence, hf_index, ett_spnego_InitialContextToken);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InitialContextToken_sequence, hf_index, ett_spnego_InitialContextToken);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 4b69ddf01d..e8aa839319 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -407,7 +407,7 @@ static int dissect_user_information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AARQ_apdu_sequence[] = {
+static const ber_old_sequence_t AARQ_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_versionrq_impl },
   { BER_CLASS_CON, 1, 0, dissect_application_context_name },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
@@ -416,8 +416,8 @@ static const ber_sequence_t AARQ_apdu_sequence[] = {
 
 static int
 dissect_tcap_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AARQ_apdu_sequence, hf_index, ett_tcap_AARQ_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AARQ_apdu_sequence, hf_index, ett_tcap_AARQ_apdu);
 
   return offset;
 }
@@ -509,7 +509,7 @@ static const value_string tcap_Associate_source_diagnostic_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Associate_source_diagnostic_choice[] = {
+static const ber_old_choice_t Associate_source_diagnostic_choice[] = {
   {   1, BER_CLASS_CON, 1, 0, dissect_dialogue_service_user },
   {   2, BER_CLASS_CON, 2, 0, dissect_dialogue_service_provider },
   { 0, 0, 0, 0, NULL }
@@ -517,9 +517,9 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = {
 
 static int
 dissect_tcap_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic,
+                                     NULL);
 
   return offset;
 }
@@ -528,7 +528,7 @@ static int dissect_result_source_diagnostic(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t AARE_apdu_sequence[] = {
+static const ber_old_sequence_t AARE_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_versionre_impl },
   { BER_CLASS_CON, 1, 0, dissect_application_context_name },
   { BER_CLASS_CON, 2, 0, dissect_result },
@@ -539,8 +539,8 @@ static const ber_sequence_t AARE_apdu_sequence[] = {
 
 static int
 dissect_tcap_AARE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AARE_apdu_sequence, hf_index, ett_tcap_AARE_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AARE_apdu_sequence, hf_index, ett_tcap_AARE_apdu);
 
   return offset;
 }
@@ -568,7 +568,7 @@ static int dissect_abort_source_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t ABRT_apdu_sequence[] = {
+static const ber_old_sequence_t ABRT_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abort_source_impl },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
   { 0, 0, 0, NULL }
@@ -576,8 +576,8 @@ static const ber_sequence_t ABRT_apdu_sequence[] = {
 
 static int
 dissect_tcap_ABRT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ABRT_apdu_sequence, hf_index, ett_tcap_ABRT_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ABRT_apdu_sequence, hf_index, ett_tcap_ABRT_apdu);
 
   return offset;
 }
@@ -593,7 +593,7 @@ const value_string tcap_DialoguePDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DialoguePDU_choice[] = {
+static const ber_old_choice_t DialoguePDU_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_dialogueRequest },
   {   1, BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_dialogueResponse },
   {   4, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_dialogueAbort },
@@ -602,9 +602,9 @@ static const ber_choice_t DialoguePDU_choice[] = {
 
 int
 dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU,
+                                     NULL);
 
   return offset;
 }
@@ -658,7 +658,7 @@ static int dissect_dialog_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ExternalPDU_sequence[] = {
+static const ber_old_sequence_t ExternalPDU_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_oid },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dialog_impl },
   { 0, 0, 0, NULL }
@@ -675,8 +675,8 @@ gint8 class;
 	/* Workaround for tagged fields */
 offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
 offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind_field);
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExternalPDU_sequence, hf_index, ett_tcap_ExternalPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExternalPDU_sequence, hf_index, ett_tcap_ExternalPDU);
 
 
 
@@ -712,7 +712,7 @@ static int dissect_externuserinfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t UserInformation_sequence[] = {
+static const ber_old_sequence_t UserInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_useroid },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_externuserinfo_impl },
   { 0, 0, 0, NULL }
@@ -720,8 +720,8 @@ static const ber_sequence_t UserInformation_sequence[] = {
 
 static int
 dissect_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UserInformation_sequence, hf_index, ett_tcap_UserInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UserInformation_sequence, hf_index, ett_tcap_UserInformation);
 
   return offset;
 }
@@ -750,7 +750,7 @@ static int dissect_reasonrq_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t RLRQ_apdu_sequence[] = {
+static const ber_old_sequence_t RLRQ_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasonrq_impl },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
   { 0, 0, 0, NULL }
@@ -758,8 +758,8 @@ static const ber_sequence_t RLRQ_apdu_sequence[] = {
 
 static int
 dissect_tcap_RLRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RLRQ_apdu_sequence, hf_index, ett_tcap_RLRQ_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RLRQ_apdu_sequence, hf_index, ett_tcap_RLRQ_apdu);
 
   return offset;
 }
@@ -785,7 +785,7 @@ static int dissect_reasonre_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t RLRE_apdu_sequence[] = {
+static const ber_old_sequence_t RLRE_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasonre_impl },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
   { 0, 0, 0, NULL }
@@ -793,8 +793,8 @@ static const ber_sequence_t RLRE_apdu_sequence[] = {
 
 static int
 dissect_tcap_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RLRE_apdu_sequence, hf_index, ett_tcap_RLRE_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RLRE_apdu_sequence, hf_index, ett_tcap_RLRE_apdu);
 
   return offset;
 }
@@ -818,7 +818,7 @@ static int dissect_protocol_version3_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t AUDT_apdu_sequence[] = {
+static const ber_old_sequence_t AUDT_apdu_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocol_version3_impl },
   { BER_CLASS_CON, 1, 0, dissect_application_context_name },
   { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
@@ -827,8 +827,8 @@ static const ber_sequence_t AUDT_apdu_sequence[] = {
 
 static int
 dissect_tcap_AUDT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AUDT_apdu_sequence, hf_index, ett_tcap_AUDT_apdu);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AUDT_apdu_sequence, hf_index, ett_tcap_AUDT_apdu);
 
   return offset;
 }
@@ -842,16 +842,16 @@ const value_string tcap_UniDialoguePDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UniDialoguePDU_choice[] = {
+static const ber_old_choice_t UniDialoguePDU_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_unidialoguePDU },
   { 0, 0, 0, 0, NULL }
 };
 
 int
 dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU,
+                                     NULL);
 
   return offset;
 }
@@ -953,7 +953,7 @@ static const value_string tcap_OPERATION_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OPERATION_choice[] = {
+static const ber_old_choice_t OPERATION_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -961,9 +961,9 @@ static const ber_choice_t OPERATION_choice[] = {
 
 static int
 dissect_tcap_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OPERATION_choice, hf_index, ett_tcap_OPERATION,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OPERATION_choice, hf_index, ett_tcap_OPERATION,
+                                     NULL);
 
   return offset;
 }
@@ -1004,7 +1004,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Invoke_sequence[] = {
+static const ber_old_sequence_t Invoke_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
@@ -1014,8 +1014,8 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_tcap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Invoke_sequence, hf_index, ett_tcap_Invoke);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Invoke_sequence, hf_index, ett_tcap_Invoke);
 
   return offset;
 }
@@ -1024,7 +1024,7 @@ static int dissect_invoke_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_resultretres_sequence[] = {
+static const ber_old_sequence_t T_resultretres_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
   { 0, 0, 0, NULL }
@@ -1032,8 +1032,8 @@ static const ber_sequence_t T_resultretres_sequence[] = {
 
 static int
 dissect_tcap_T_resultretres(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_resultretres_sequence, hf_index, ett_tcap_T_resultretres);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_resultretres_sequence, hf_index, ett_tcap_T_resultretres);
 
   return offset;
 }
@@ -1042,7 +1042,7 @@ static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ReturnResult_sequence[] = {
+static const ber_old_sequence_t ReturnResult_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultretres },
   { 0, 0, 0, NULL }
@@ -1050,8 +1050,8 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_tcap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResult_sequence, hf_index, ett_tcap_ReturnResult);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResult_sequence, hf_index, ett_tcap_ReturnResult);
 
   return offset;
 }
@@ -1085,7 +1085,7 @@ static const value_string tcap_ErrorCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ErrorCode_choice[] = {
+static const ber_old_choice_t ErrorCode_choice[] = {
   {  19, BER_CLASS_PRI, 19, BER_FLAGS_IMPLTAG, dissect_nationaler_impl },
   {  20, BER_CLASS_PRI, 20, BER_FLAGS_IMPLTAG, dissect_privateer_impl },
   { 0, 0, 0, 0, NULL }
@@ -1093,9 +1093,9 @@ static const ber_choice_t ErrorCode_choice[] = {
 
 static int
 dissect_tcap_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ErrorCode_choice, hf_index, ett_tcap_ErrorCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ErrorCode_choice, hf_index, ett_tcap_ErrorCode,
+                                     NULL);
 
   return offset;
 }
@@ -1104,7 +1104,7 @@ static int dissect_errorCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ReturnError_sequence[] = {
+static const ber_old_sequence_t ReturnError_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter },
@@ -1113,8 +1113,8 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_tcap_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnError_sequence, hf_index, ett_tcap_ReturnError);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnError_sequence, hf_index, ett_tcap_ReturnError);
 
   return offset;
 }
@@ -1141,7 +1141,7 @@ static const value_string tcap_T_invokeIDRej_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_invokeIDRej_choice[] = {
+static const ber_old_choice_t T_invokeIDRej_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable },
   { 0, 0, 0, 0, NULL }
@@ -1149,9 +1149,9 @@ static const ber_choice_t T_invokeIDRej_choice[] = {
 
 static int
 dissect_tcap_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej,
+                                     NULL);
 
   return offset;
 }
@@ -1255,7 +1255,7 @@ static const value_string tcap_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_old_choice_t T_problem_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl },
@@ -1265,9 +1265,9 @@ static const ber_choice_t T_problem_choice[] = {
 
 static int
 dissect_tcap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_tcap_T_problem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_problem_choice, hf_index, ett_tcap_T_problem,
+                                     NULL);
 
   return offset;
 }
@@ -1276,7 +1276,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t Reject_sequence[] = {
+static const ber_old_sequence_t Reject_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem },
   { 0, 0, 0, NULL }
@@ -1284,8 +1284,8 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_tcap_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Reject_sequence, hf_index, ett_tcap_Reject);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Reject_sequence, hf_index, ett_tcap_Reject);
 
   return offset;
 }
@@ -1303,7 +1303,7 @@ static const value_string tcap_Component_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Component_choice[] = {
+static const ber_old_choice_t Component_choice[] = {
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
@@ -1326,14 +1326,14 @@ static int dissect_ComponentPortion_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ComponentPortion_sequence_of[1] = {
+static const ber_old_sequence_t ComponentPortion_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ComponentPortion_item },
 };
 
 static int
 dissect_tcap_ComponentPortion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ComponentPortion_sequence_of, hf_index, ett_tcap_ComponentPortion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ComponentPortion_sequence_of, hf_index, ett_tcap_ComponentPortion);
 
   return offset;
 }
@@ -1342,7 +1342,7 @@ static int dissect_components(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Unidirectional_sequence[] = {
+static const ber_old_sequence_t Unidirectional_sequence[] = {
   { BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
   { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_components },
   { 0, 0, 0, NULL }
@@ -1350,8 +1350,8 @@ static const ber_sequence_t Unidirectional_sequence[] = {
 
 static int
 dissect_tcap_Unidirectional(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Unidirectional_sequence, hf_index, ett_tcap_Unidirectional);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Unidirectional_sequence, hf_index, ett_tcap_Unidirectional);
 
   return offset;
 }
@@ -1410,7 +1410,7 @@ static int dissect_otid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t Begin_sequence[] = {
+static const ber_old_sequence_t Begin_sequence[] = {
   { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_otid },
   { BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
   { BER_CLASS_APP, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_components },
@@ -1425,8 +1425,8 @@ gp_tcapsrt_info->ope=TC_BEGIN;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Begin ");
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Begin_sequence, hf_index, ett_tcap_Begin);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Begin_sequence, hf_index, ett_tcap_Begin);
 
 
 
@@ -1485,7 +1485,7 @@ static int dissect_dtid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t End_sequence[] = {
+static const ber_old_sequence_t End_sequence[] = {
   { BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
   { BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
   { BER_CLASS_APP, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_components },
@@ -1500,8 +1500,8 @@ gp_tcapsrt_info->ope=TC_END;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " End ");
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   End_sequence, hf_index, ett_tcap_End);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       End_sequence, hf_index, ett_tcap_End);
 
 
 
@@ -1513,7 +1513,7 @@ static int dissect_end_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Continue_sequence[] = {
+static const ber_old_sequence_t Continue_sequence[] = {
   { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_otid },
   { BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
   { BER_CLASS_APP, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion },
@@ -1529,8 +1529,8 @@ gp_tcapsrt_info->ope=TC_CONT;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Continue ");
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Continue_sequence, hf_index, ett_tcap_Continue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Continue_sequence, hf_index, ett_tcap_Continue);
 
 
 
@@ -1570,7 +1570,7 @@ static const value_string tcap_Reason_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Reason_choice[] = {
+static const ber_old_choice_t Reason_choice[] = {
   {  10, BER_CLASS_APP, 10, BER_FLAGS_NOOWNTAG, dissect_p_abortCause },
   {  11, BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_u_abortCause },
   { 0, 0, 0, 0, NULL }
@@ -1578,9 +1578,9 @@ static const ber_choice_t Reason_choice[] = {
 
 static int
 dissect_tcap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Reason_choice, hf_index, ett_tcap_Reason,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Reason_choice, hf_index, ett_tcap_Reason,
+                                     NULL);
 
   return offset;
 }
@@ -1589,7 +1589,7 @@ static int dissect_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t Abort_sequence[] = {
+static const ber_old_sequence_t Abort_sequence[] = {
   { BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_dtid },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_reason },
   { 0, 0, 0, NULL }
@@ -1603,8 +1603,8 @@ gp_tcapsrt_info->ope=TC_ABORT;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Abort ");
  
-   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Abort_sequence, hf_index, ett_tcap_Abort);
+   offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Abort_sequence, hf_index, ett_tcap_Abort);
 
   
 
@@ -1683,7 +1683,7 @@ static const value_string tcap_T_applicationContext_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_applicationContext_choice[] = {
+static const ber_old_choice_t T_applicationContext_choice[] = {
   {  27, BER_CLASS_PRI, 27, BER_FLAGS_NOOWNTAG, dissect_integerApplicationId },
   {  28, BER_CLASS_PRI, 28, BER_FLAGS_NOOWNTAG, dissect_objectApplicationId },
   { 0, 0, 0, 0, NULL }
@@ -1691,9 +1691,9 @@ static const ber_choice_t T_applicationContext_choice[] = {
 
 static int
 dissect_tcap_T_applicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext,
+                                     NULL);
 
   return offset;
 }
@@ -1708,7 +1708,7 @@ static const value_string tcap_T_securityContext_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_securityContext_choice[] = {
+static const ber_old_choice_t T_securityContext_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerSecurityId_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectSecurityId_impl },
   { 0, 0, 0, 0, NULL }
@@ -1716,9 +1716,9 @@ static const ber_choice_t T_securityContext_choice[] = {
 
 static int
 dissect_tcap_T_securityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_securityContext_choice, hf_index, ett_tcap_T_securityContext,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_securityContext_choice, hf_index, ett_tcap_T_securityContext,
+                                     NULL);
 
   return offset;
 }
@@ -1733,7 +1733,7 @@ static const value_string tcap_T_confidentialityId_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_confidentialityId_choice[] = {
+static const ber_old_choice_t T_confidentialityId_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerConfidentialityId_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectConfidentialityId_impl },
   { 0, 0, 0, 0, NULL }
@@ -1741,9 +1741,9 @@ static const ber_choice_t T_confidentialityId_choice[] = {
 
 static int
 dissect_tcap_T_confidentialityId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId,
+                                     NULL);
 
   return offset;
 }
@@ -1752,15 +1752,15 @@ static int dissect_confidentialityId(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Confidentiality_sequence[] = {
+static const ber_old_sequence_t Confidentiality_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confidentialityId },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_tcap_Confidentiality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Confidentiality_sequence, hf_index, ett_tcap_Confidentiality);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Confidentiality_sequence, hf_index, ett_tcap_Confidentiality);
 
   return offset;
 }
@@ -1769,7 +1769,7 @@ static int dissect_confidentiality_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t DialoguePortionANSI_sequence[] = {
+static const ber_old_sequence_t DialoguePortionANSI_sequence[] = {
   { BER_CLASS_PRI, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_applicationContext },
   { BER_CLASS_UNI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_userInformation },
@@ -1780,8 +1780,8 @@ static const ber_sequence_t DialoguePortionANSI_sequence[] = {
 
 static int
 dissect_tcap_DialoguePortionANSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DialoguePortionANSI_sequence, hf_index, ett_tcap_DialoguePortionANSI);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DialoguePortionANSI_sequence, hf_index, ett_tcap_DialoguePortionANSI);
 
   return offset;
 }
@@ -1809,7 +1809,7 @@ static const value_string tcap_OperationCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OperationCode_choice[] = {
+static const ber_old_choice_t OperationCode_choice[] = {
   {  16, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_national_impl },
   {  17, BER_CLASS_PRI, 17, BER_FLAGS_IMPLTAG, dissect_private_impl },
   { 0, 0, 0, 0, NULL }
@@ -1817,9 +1817,9 @@ static const ber_choice_t OperationCode_choice[] = {
 
 static int
 dissect_tcap_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OperationCode_choice, hf_index, ett_tcap_OperationCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OperationCode_choice, hf_index, ett_tcap_OperationCode,
+                                     NULL);
 
   return offset;
 }
@@ -1914,7 +1914,7 @@ static int dissect_ansiparams21(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ANSIparamch_sequence[] = {
+static const ber_old_sequence_t ANSIparamch_sequence[] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams1 },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansiparams2 },
@@ -1942,8 +1942,8 @@ static const ber_sequence_t ANSIparamch_sequence[] = {
 
 static int
 dissect_tcap_ANSIparamch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ANSIparamch_sequence, hf_index, ett_tcap_ANSIparamch);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ANSIparamch_sequence, hf_index, ett_tcap_ANSIparamch);
 
   return offset;
 }
@@ -1961,7 +1961,7 @@ static int dissect_parameterrj(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t InvokePDU_sequence[] = {
+static const ber_old_sequence_t InvokePDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentIDs_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_operationCode },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterinv },
@@ -1970,8 +1970,8 @@ static const ber_sequence_t InvokePDU_sequence[] = {
 
 static int
 dissect_tcap_InvokePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InvokePDU_sequence, hf_index, ett_tcap_InvokePDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InvokePDU_sequence, hf_index, ett_tcap_InvokePDU);
 
   return offset;
 }
@@ -1996,7 +1996,7 @@ static int dissect_componentID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t ReturnResultPDU_sequence[] = {
+static const ber_old_sequence_t ReturnResultPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterrr },
   { 0, 0, 0, NULL }
@@ -2004,8 +2004,8 @@ static const ber_sequence_t ReturnResultPDU_sequence[] = {
 
 static int
 dissect_tcap_ReturnResultPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnResultPDU_sequence, hf_index, ett_tcap_ReturnResultPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnResultPDU_sequence, hf_index, ett_tcap_ReturnResultPDU);
 
   return offset;
 }
@@ -2017,7 +2017,7 @@ static int dissect_returnResultNotLastansi_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t ReturnErrorPDU_sequence[] = {
+static const ber_old_sequence_t ReturnErrorPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterre },
@@ -2026,8 +2026,8 @@ static const ber_sequence_t ReturnErrorPDU_sequence[] = {
 
 static int
 dissect_tcap_ReturnErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReturnErrorPDU_sequence, hf_index, ett_tcap_ReturnErrorPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReturnErrorPDU_sequence, hf_index, ett_tcap_ReturnErrorPDU);
 
   return offset;
 }
@@ -2056,7 +2056,7 @@ static int dissect_rejectProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t RejectPDU_sequence[] = {
+static const ber_old_sequence_t RejectPDU_sequence[] = {
   { BER_CLASS_PRI, 15, BER_FLAGS_NOOWNTAG, dissect_componentID },
   { BER_CLASS_PRI, 21, BER_FLAGS_IMPLTAG, dissect_rejectProblem_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_parameterrj },
@@ -2065,8 +2065,8 @@ static const ber_sequence_t RejectPDU_sequence[] = {
 
 static int
 dissect_tcap_RejectPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RejectPDU_sequence, hf_index, ett_tcap_RejectPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RejectPDU_sequence, hf_index, ett_tcap_RejectPDU);
 
   return offset;
 }
@@ -2085,7 +2085,7 @@ static const value_string tcap_ComponentPDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ComponentPDU_choice[] = {
+static const ber_old_choice_t ComponentPDU_choice[] = {
   {   9, BER_CLASS_PRI, 9, BER_FLAGS_IMPLTAG, dissect_invokeLastansi_impl },
   {  10, BER_CLASS_PRI, 10, BER_FLAGS_IMPLTAG, dissect_returnResultLastansi_impl },
   {  11, BER_CLASS_PRI, 11, BER_FLAGS_IMPLTAG, dissect_returnErroransi_impl },
@@ -2111,7 +2111,7 @@ if (! (subdissector_handle = get_ansi_tcap_subdissector(actx->pinfo->match_port)
 
 call_dissector(subdissector_handle, next_tvb, actx->pinfo, tcap_top_tree);
     
-offset = dissect_ber_choice(actx, tree, tvb, offset,
+offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU,NULL);
 	
 
@@ -2123,14 +2123,14 @@ static int dissect_ComponentSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ComponentSequence_sequence_of[1] = {
+static const ber_old_sequence_t ComponentSequence_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ComponentSequence_item },
 };
 
 static int
 dissect_tcap_ComponentSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ComponentSequence_sequence_of, hf_index, ett_tcap_ComponentSequence);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ComponentSequence_sequence_of, hf_index, ett_tcap_ComponentSequence);
 
   return offset;
 }
@@ -2139,7 +2139,7 @@ static int dissect_componentPortion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t UniTransactionPDU_sequence[] = {
+static const ber_old_sequence_t UniTransactionPDU_sequence[] = {
   { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
   { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
   { BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_componentPortion },
@@ -2148,8 +2148,8 @@ static const ber_sequence_t UniTransactionPDU_sequence[] = {
 
 static int
 dissect_tcap_UniTransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UniTransactionPDU_sequence, hf_index, ett_tcap_UniTransactionPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UniTransactionPDU_sequence, hf_index, ett_tcap_UniTransactionPDU);
 
   return offset;
 }
@@ -2158,7 +2158,7 @@ static int dissect_ansiunidirectional_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t TransactionPDU_sequence[] = {
+static const ber_old_sequence_t TransactionPDU_sequence[] = {
   { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
   { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
   { BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_componentPortion },
@@ -2183,8 +2183,8 @@ if ((hf_index == hf_tcap_ansiconversationWithPerm)&&(check_col(actx->pinfo->cinf
 if ((hf_index == hf_tcap_ansiconversationWithoutPerm)&&(check_col(actx->pinfo->cinfo, COL_INFO)))
 				col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ConversationWithoutPerm");		
 				
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);
   
 
 
@@ -2241,7 +2241,7 @@ static const value_string tcap_T_causeInformation_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_causeInformation_choice[] = {
+static const ber_old_choice_t T_causeInformation_choice[] = {
   {   0, BER_CLASS_PRI, 23, BER_FLAGS_NOOWNTAG, dissect_abortCause },
   {   1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_userInformation },
   { 0, 0, 0, 0, NULL }
@@ -2249,9 +2249,9 @@ static const ber_choice_t T_causeInformation_choice[] = {
 
 static int
 dissect_tcap_T_causeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation,
+                                     NULL);
 
   return offset;
 }
@@ -2260,7 +2260,7 @@ static int dissect_causeInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AbortPDU_sequence[] = {
+static const ber_old_sequence_t AbortPDU_sequence[] = {
   { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier },
   { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortionansi },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_causeInformation },
@@ -2273,8 +2273,8 @@ dissect_tcap_AbortPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 if (check_col(actx->pinfo->cinfo, COL_INFO))
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Abort ");
 
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
 
 
 
@@ -2302,7 +2302,7 @@ static const value_string tcap_TCMessage_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TCMessage_choice[] = {
+static const ber_old_choice_t TCMessage_choice[] = {
   {   0, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_unidirectional_impl },
   {   1, BER_CLASS_APP, 2, BER_FLAGS_IMPLTAG, dissect_begin_impl },
   {   2, BER_CLASS_APP, 4, BER_FLAGS_IMPLTAG, dissect_end_impl },
@@ -2320,9 +2320,9 @@ static const ber_choice_t TCMessage_choice[] = {
 
 static int
 dissect_tcap_TCMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TCMessage_choice, hf_index, ett_tcap_TCMessage,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TCMessage_choice, hf_index, ett_tcap_TCMessage,
+                                     NULL);
 
   return offset;
 }
@@ -2334,7 +2334,7 @@ static const value_string tcap_ERROR_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ERROR_choice[] = {
+static const ber_old_choice_t ERROR_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue },
   { 0, 0, 0, 0, NULL }
@@ -2342,9 +2342,9 @@ static const ber_choice_t ERROR_choice[] = {
 
 static int
 dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ERROR_choice, hf_index, ett_tcap_ERROR,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ERROR_choice, hf_index, ett_tcap_ERROR,
+                                     NULL);
 
   return offset;
 }
@@ -3291,7 +3291,7 @@ dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   if (!next_tvb)
     return offset+len;
 
-  dissect_ber_choice(actx, tree, next_tvb, 0,
+  dissect_ber_old_choice(actx, tree, next_tvb, 0,
 		     Component_choice, hf_index, ett_tcap_Component,NULL);
 
 
diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index 68fbcffee2..442e593105 100644
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -94,14 +94,14 @@ static int dissect_SSIDList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SSIDList_sequence_of[1] = {
+static const ber_old_sequence_t SSIDList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SSIDList_item },
 };
 
 static int
 dissect_wlancertextn_SSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 58c27510fb..195195a04f 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -900,7 +900,7 @@ static const value_string x411_Password_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Password_choice[] = {
+static const ber_old_choice_t Password_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_ia5_string },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_string },
   { 0, 0, 0, 0, NULL }
@@ -908,9 +908,9 @@ static const ber_choice_t Password_choice[] = {
 
 static int
 dissect_x411_Password(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Password_choice, hf_index, ett_x411_Password,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Password_choice, hf_index, ett_x411_Password,
+                                     NULL);
 
   return offset;
 }
@@ -948,7 +948,7 @@ static int dissect_token_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t Token_sequence[] = {
+static const ber_old_sequence_t Token_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_token_type_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_token_impl },
   { 0, 0, 0, NULL }
@@ -956,8 +956,8 @@ static const ber_sequence_t Token_sequence[] = {
 
 static int
 dissect_x411_Token(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Token_sequence, hf_index, ett_x411_Token);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Token_sequence, hf_index, ett_x411_Token);
 
   return offset;
 }
@@ -966,7 +966,7 @@ static int dissect_bind_token_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t StrongCredentials_set[] = {
+static const ber_old_sequence_t StrongCredentials_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bind_token_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certificate_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certificate_selector_impl },
@@ -975,8 +975,8 @@ static const ber_sequence_t StrongCredentials_set[] = {
 
 static int
 dissect_x411_StrongCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              StrongCredentials_set, hf_index, ett_x411_StrongCredentials);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  StrongCredentials_set, hf_index, ett_x411_StrongCredentials);
 
   return offset;
 }
@@ -1008,7 +1008,7 @@ static int dissect_encrypted_data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t Signature_sequence[] = {
+static const ber_old_sequence_t Signature_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
   { 0, 0, 0, NULL }
@@ -1016,8 +1016,8 @@ static const ber_sequence_t Signature_sequence[] = {
 
 static int
 dissect_x411_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Signature_sequence, hf_index, ett_x411_Signature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Signature_sequence, hf_index, ett_x411_Signature);
 
   return offset;
 }
@@ -1043,7 +1043,7 @@ static int dissect_time2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t ProtectedPassword_set[] = {
+static const ber_old_sequence_t ProtectedPassword_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_time1_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_time2_impl },
@@ -1054,8 +1054,8 @@ static const ber_sequence_t ProtectedPassword_set[] = {
 
 static int
 dissect_x411_ProtectedPassword(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ProtectedPassword_set, hf_index, ett_x411_ProtectedPassword);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ProtectedPassword_set, hf_index, ett_x411_ProtectedPassword);
 
   return offset;
 }
@@ -1071,7 +1071,7 @@ static const value_string x411_Credentials_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Credentials_choice[] = {
+static const ber_old_choice_t Credentials_choice[] = {
   {   0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_simple },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_strong_impl },
   {   2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_protected_impl },
@@ -1083,9 +1083,9 @@ dissect_x411_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 #line 700 "x411.cnf"
   guint32 credentials;
 
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Credentials_choice, hf_index, ett_x411_Credentials,
-                                 &credentials);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Credentials_choice, hf_index, ett_x411_Credentials,
+                                     &credentials);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -1203,7 +1203,7 @@ static int dissect_category_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SecurityCategory_sequence[] = {
+static const ber_old_sequence_t SecurityCategory_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_category_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_category_value_impl },
   { 0, 0, 0, NULL }
@@ -1211,8 +1211,8 @@ static const ber_sequence_t SecurityCategory_sequence[] = {
 
 static int
 dissect_x411_SecurityCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SecurityCategory_sequence, hf_index, ett_x411_SecurityCategory);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SecurityCategory_sequence, hf_index, ett_x411_SecurityCategory);
 
   return offset;
 }
@@ -1221,14 +1221,14 @@ static int dissect_SecurityCategories_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SecurityCategories_set_of[1] = {
+static const ber_old_sequence_t SecurityCategories_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item },
 };
 
 static int
 dissect_x411_SecurityCategories(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SecurityCategories_set_of, hf_index, ett_x411_SecurityCategories);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SecurityCategories_set_of, hf_index, ett_x411_SecurityCategories);
 
   return offset;
 }
@@ -1237,7 +1237,7 @@ static int dissect_security_categories(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SecurityLabel_set[] = {
+static const ber_old_sequence_t SecurityLabel_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_security_policy_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_security_classification },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_privacy_mark },
@@ -1247,8 +1247,8 @@ static const ber_sequence_t SecurityLabel_set[] = {
 
 int
 dissect_x411_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SecurityLabel_set, hf_index, ett_x411_SecurityLabel);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SecurityLabel_set, hf_index, ett_x411_SecurityLabel);
 
   return offset;
 }
@@ -1257,14 +1257,14 @@ static int dissect_SecurityContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SecurityContext_set_of[1] = {
+static const ber_old_sequence_t SecurityContext_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_SecurityContext_item },
 };
 
 int
 dissect_x411_SecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SecurityContext_set_of, hf_index, ett_x411_SecurityContext);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SecurityContext_set_of, hf_index, ett_x411_SecurityContext);
 
   return offset;
 }
@@ -1279,7 +1279,7 @@ static int dissect_security_labels_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AuthenticatedArgument_set[] = {
+static const ber_old_sequence_t AuthenticatedArgument_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_authenticated_initiator_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_initiator_credentials_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_security_context_impl },
@@ -1288,8 +1288,8 @@ static const ber_sequence_t AuthenticatedArgument_set[] = {
 
 static int
 dissect_x411_AuthenticatedArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticatedArgument_set, hf_index, ett_x411_AuthenticatedArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticatedArgument_set, hf_index, ett_x411_AuthenticatedArgument);
 
   return offset;
 }
@@ -1304,7 +1304,7 @@ static const value_string x411_MTABindArgument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MTABindArgument_choice[] = {
+static const ber_old_choice_t MTABindArgument_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unauthenticated },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_authenticated_argument_impl },
   { 0, 0, 0, 0, NULL }
@@ -1312,9 +1312,9 @@ static const ber_choice_t MTABindArgument_choice[] = {
 
 static int
 dissect_x411_MTABindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MTABindArgument_choice, hf_index, ett_x411_MTABindArgument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MTABindArgument_choice, hf_index, ett_x411_MTABindArgument,
+                                     NULL);
 
   return offset;
 }
@@ -1332,7 +1332,7 @@ static int dissect_responder_credentials_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AuthenticatedResult_set[] = {
+static const ber_old_sequence_t AuthenticatedResult_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_authenticated_responder_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_responder_credentials_impl },
   { 0, 0, 0, NULL }
@@ -1340,8 +1340,8 @@ static const ber_sequence_t AuthenticatedResult_set[] = {
 
 static int
 dissect_x411_AuthenticatedResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              AuthenticatedResult_set, hf_index, ett_x411_AuthenticatedResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  AuthenticatedResult_set, hf_index, ett_x411_AuthenticatedResult);
 
   return offset;
 }
@@ -1356,7 +1356,7 @@ static const value_string x411_MTABindResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MTABindResult_choice[] = {
+static const ber_old_choice_t MTABindResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unauthenticated },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_authenticated_result_impl },
   { 0, 0, 0, 0, NULL }
@@ -1364,9 +1364,9 @@ static const ber_choice_t MTABindResult_choice[] = {
 
 static int
 dissect_x411_MTABindResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MTABindResult_choice, hf_index, ett_x411_MTABindResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MTABindResult_choice, hf_index, ett_x411_MTABindResult,
+                                     NULL);
 
   return offset;
 }
@@ -1514,7 +1514,7 @@ static const value_string x411_CountryName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CountryName_choice[] = {
+static const ber_old_choice_t CountryName_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_x121_dcc_code },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_iso_3166_alpha2_code },
   { 0, 0, 0, 0, NULL }
@@ -1539,7 +1539,7 @@ dissect_x411_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
  if(doing_address)
     g_strlcat(oraddress, "/C=", MAX_ORA_STR_LEN);
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               CountryName_choice, hf_index, ett_x411_CountryName, NULL);
 
 
@@ -1559,7 +1559,7 @@ static const value_string x411_AdministrationDomainName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AdministrationDomainName_choice[] = {
+static const ber_old_choice_t AdministrationDomainName_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_numeric },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable },
   { 0, 0, 0, 0, NULL }
@@ -1584,7 +1584,7 @@ dissect_x411_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _
   if(doing_address)
     g_strlcat(oraddress, "/A=", MAX_ORA_STR_LEN);
 
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
                               AdministrationDomainName_choice, hf_index, ett_x411_AdministrationDomainName, NULL);
 
 
@@ -1605,7 +1605,7 @@ static const value_string x411_PrivateDomainIdentifier_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PrivateDomainIdentifier_choice[] = {
+static const ber_old_choice_t PrivateDomainIdentifier_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_numeric },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable },
   { 0, 0, 0, 0, NULL }
@@ -1618,9 +1618,9 @@ dissect_x411_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 	if(doing_address)
 		g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
 
-	  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PrivateDomainIdentifier_choice, hf_index, ett_x411_PrivateDomainIdentifier,
-                                 NULL);
+	  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PrivateDomainIdentifier_choice, hf_index, ett_x411_PrivateDomainIdentifier,
+                                     NULL);
 
 
 
@@ -1635,7 +1635,7 @@ static int dissect_private_domain_identifier_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t GlobalDomainIdentifier_sequence[] = {
+static const ber_old_sequence_t GlobalDomainIdentifier_sequence[] = {
   { BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_country_name },
   { BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_administration_domain_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_private_domain_identifier },
@@ -1649,8 +1649,8 @@ dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 	oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';	
 	address_item = tree;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GlobalDomainIdentifier_sequence, hf_index, ett_x411_GlobalDomainIdentifier);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GlobalDomainIdentifier_sequence, hf_index, ett_x411_GlobalDomainIdentifier);
 
 
 	if(*oraddress) {
@@ -1705,7 +1705,7 @@ static int dissect_local_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MTSIdentifier_sequence[] = {
+static const ber_old_sequence_t MTSIdentifier_sequence[] = {
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_global_domain_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_local_identifier },
   { 0, 0, 0, NULL }
@@ -1720,8 +1720,8 @@ dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 	if(hf_index == hf_x411_subject_identifier)
 		doing_subjectid = TRUE;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MTSIdentifier_sequence, hf_index, ett_x411_MTSIdentifier);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MTSIdentifier_sequence, hf_index, ett_x411_MTSIdentifier);
 
 
 	doing_address = FALSE;
@@ -1814,7 +1814,7 @@ static const value_string x411_PrivateDomainName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PrivateDomainName_choice[] = {
+static const ber_old_choice_t PrivateDomainName_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_numeric },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable },
   { 0, 0, 0, 0, NULL }
@@ -1827,9 +1827,9 @@ dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 	if(doing_address)
 		g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
 
-	  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PrivateDomainName_choice, hf_index, ett_x411_PrivateDomainName,
-                                 NULL);
+	  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PrivateDomainName_choice, hf_index, ett_x411_PrivateDomainName,
+                                     NULL);
 
 
 
@@ -1880,7 +1880,7 @@ static int dissect_numeric_user_identifier_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t PersonalName_set[] = {
+static const ber_old_sequence_t PersonalName_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_printable_surname_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_printable_given_name_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_printable_initials_impl },
@@ -1890,8 +1890,8 @@ static const ber_sequence_t PersonalName_set[] = {
 
 static int
 dissect_x411_PersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PersonalName_set, hf_index, ett_x411_PersonalName);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PersonalName_set, hf_index, ett_x411_PersonalName);
 
   return offset;
 }
@@ -1914,14 +1914,14 @@ static int dissect_OrganizationalUnitNames_item(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t OrganizationalUnitNames_sequence_of[1] = {
+static const ber_old_sequence_t OrganizationalUnitNames_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_OrganizationalUnitNames_item },
 };
 
 static int
 dissect_x411_OrganizationalUnitNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OrganizationalUnitNames_sequence_of, hf_index, ett_x411_OrganizationalUnitNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OrganizationalUnitNames_sequence_of, hf_index, ett_x411_OrganizationalUnitNames);
 
   return offset;
 }
@@ -1930,7 +1930,7 @@ static int dissect_organizational_unit_names_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t BuiltInStandardAttributes_sequence[] = {
+static const ber_old_sequence_t BuiltInStandardAttributes_sequence[] = {
   { BER_CLASS_APP, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_country_name },
   { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_administration_domain_name },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_network_address_impl },
@@ -1949,8 +1949,8 @@ dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 	address_item = tree;	
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BuiltInStandardAttributes_sequence, hf_index, ett_x411_BuiltInStandardAttributes);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BuiltInStandardAttributes_sequence, hf_index, ett_x411_BuiltInStandardAttributes);
 
 
 
@@ -1962,7 +1962,7 @@ static int dissect_built_in_standard_attributes(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t BuiltInDomainDefinedAttribute_sequence[] = {
+static const ber_old_sequence_t BuiltInDomainDefinedAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable_type },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable_value },
   { 0, 0, 0, NULL }
@@ -1970,8 +1970,8 @@ static const ber_sequence_t BuiltInDomainDefinedAttribute_sequence[] = {
 
 static int
 dissect_x411_BuiltInDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BuiltInDomainDefinedAttribute_sequence, hf_index, ett_x411_BuiltInDomainDefinedAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BuiltInDomainDefinedAttribute_sequence, hf_index, ett_x411_BuiltInDomainDefinedAttribute);
 
   return offset;
 }
@@ -1980,14 +1980,14 @@ static int dissect_BuiltInDomainDefinedAttributes_item(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t BuiltInDomainDefinedAttributes_sequence_of[1] = {
+static const ber_old_sequence_t BuiltInDomainDefinedAttributes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BuiltInDomainDefinedAttributes_item },
 };
 
 static int
 dissect_x411_BuiltInDomainDefinedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BuiltInDomainDefinedAttributes_sequence_of, hf_index, ett_x411_BuiltInDomainDefinedAttributes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BuiltInDomainDefinedAttributes_sequence_of, hf_index, ett_x411_BuiltInDomainDefinedAttributes);
 
   return offset;
 }
@@ -2040,7 +2040,7 @@ static int dissect_extension_attribute_value_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t ExtensionAttribute_sequence[] = {
+static const ber_old_sequence_t ExtensionAttribute_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_attribute_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_extension_attribute_value_impl },
   { 0, 0, 0, NULL }
@@ -2048,8 +2048,8 @@ static const ber_sequence_t ExtensionAttribute_sequence[] = {
 
 static int
 dissect_x411_ExtensionAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensionAttribute_sequence, hf_index, ett_x411_ExtensionAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensionAttribute_sequence, hf_index, ett_x411_ExtensionAttribute);
 
   return offset;
 }
@@ -2058,14 +2058,14 @@ static int dissect_ExtensionAttributes_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ExtensionAttributes_set_of[1] = {
+static const ber_old_sequence_t ExtensionAttributes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ExtensionAttributes_item },
 };
 
 static int
 dissect_x411_ExtensionAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ExtensionAttributes_set_of, hf_index, ett_x411_ExtensionAttributes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ExtensionAttributes_set_of, hf_index, ett_x411_ExtensionAttributes);
 
   return offset;
 }
@@ -2074,7 +2074,7 @@ static int dissect_extension_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ORName_sequence[] = {
+static const ber_old_sequence_t ORName_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_built_in_standard_attributes },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_built_in_domain_defined_attributes },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extension_attributes },
@@ -2090,8 +2090,8 @@ dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 	address_item = NULL;
 	doing_address = TRUE;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ORName_sequence, hf_index, ett_x411_ORName);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ORName_sequence, hf_index, ett_x411_ORName);
 
 
 	if(*oraddress && address_item)
@@ -2265,7 +2265,7 @@ static int dissect_miscellaneous_terminal_capabilities_impl(proto_tree *tree _U_
 }
 
 
-static const ber_sequence_t TeletexNonBasicParameters_set[] = {
+static const ber_old_sequence_t TeletexNonBasicParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_graphic_character_sets_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_control_character_sets_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_page_formats_impl },
@@ -2276,8 +2276,8 @@ static const ber_sequence_t TeletexNonBasicParameters_set[] = {
 
 int
 dissect_x411_TeletexNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TeletexNonBasicParameters_set, hf_index, ett_x411_TeletexNonBasicParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TeletexNonBasicParameters_set, hf_index, ett_x411_TeletexNonBasicParameters);
 
   return offset;
 }
@@ -2298,14 +2298,14 @@ static int dissect_ExtendedEncodedInformationTypes_item(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t ExtendedEncodedInformationTypes_set_of[1] = {
+static const ber_old_sequence_t ExtendedEncodedInformationTypes_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ExtendedEncodedInformationTypes_item },
 };
 
 static int
 dissect_x411_ExtendedEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ExtendedEncodedInformationTypes_set_of, hf_index, ett_x411_ExtendedEncodedInformationTypes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ExtendedEncodedInformationTypes_set_of, hf_index, ett_x411_ExtendedEncodedInformationTypes);
 
   return offset;
 }
@@ -2323,7 +2323,7 @@ static int dissect_extended_encoded_information_types_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t EncodedInformationTypes_set[] = {
+static const ber_old_sequence_t EncodedInformationTypes_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_built_in_encoded_information_types_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_g3_facsimile_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teletex_impl },
@@ -2333,8 +2333,8 @@ static const ber_sequence_t EncodedInformationTypes_set[] = {
 
 int
 dissect_x411_EncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              EncodedInformationTypes_set, hf_index, ett_x411_EncodedInformationTypes);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  EncodedInformationTypes_set, hf_index, ett_x411_EncodedInformationTypes);
 
   return offset;
 }
@@ -2435,7 +2435,7 @@ static const value_string x411_ContentType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ContentType_choice[] = {
+static const ber_old_choice_t ContentType_choice[] = {
   {   0, BER_CLASS_APP, 6, BER_FLAGS_NOOWNTAG, dissect_built_in },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extended },
   { 0, 0, 0, 0, NULL }
@@ -2443,9 +2443,9 @@ static const ber_choice_t ContentType_choice[] = {
 
 static int
 dissect_x411_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ContentType_choice, hf_index, ett_x411_ContentType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ContentType_choice, hf_index, ett_x411_ContentType,
+                                     NULL);
 
   return offset;
 }
@@ -2590,7 +2590,7 @@ static int dissect_deferred_delivery_time_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_private_domain_sequence[] = {
+static const ber_old_sequence_t T_private_domain_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_administration_domain_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_private_domain_identifier_impl },
   { 0, 0, 0, NULL }
@@ -2598,8 +2598,8 @@ static const ber_sequence_t T_private_domain_sequence[] = {
 
 static int
 dissect_x411_T_private_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_private_domain_sequence, hf_index, ett_x411_T_private_domain);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_private_domain_sequence, hf_index, ett_x411_T_private_domain);
 
   return offset;
 }
@@ -2614,7 +2614,7 @@ static const value_string x411_T_bilateral_domain_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_bilateral_domain_choice[] = {
+static const ber_old_choice_t T_bilateral_domain_choice[] = {
   {   0, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_administration_domain_name },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_private_domain },
   { 0, 0, 0, 0, NULL }
@@ -2622,9 +2622,9 @@ static const ber_choice_t T_bilateral_domain_choice[] = {
 
 static int
 dissect_x411_T_bilateral_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_bilateral_domain_choice, hf_index, ett_x411_T_bilateral_domain,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_bilateral_domain_choice, hf_index, ett_x411_T_bilateral_domain,
+                                     NULL);
 
   return offset;
 }
@@ -2660,7 +2660,7 @@ static int dissect_bilateral_information(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t PerDomainBilateralInformation_sequence[] = {
+static const ber_old_sequence_t PerDomainBilateralInformation_sequence[] = {
   { BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_country_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_bilateral_domain },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_bilateral_information },
@@ -2669,8 +2669,8 @@ static const ber_sequence_t PerDomainBilateralInformation_sequence[] = {
 
 static int
 dissect_x411_PerDomainBilateralInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PerDomainBilateralInformation_sequence, hf_index, ett_x411_PerDomainBilateralInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PerDomainBilateralInformation_sequence, hf_index, ett_x411_PerDomainBilateralInformation);
 
   return offset;
 }
@@ -2679,14 +2679,14 @@ static int dissect_per_domain_bilateral_information_item(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerDomainBilateralInformation_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerDomainBilateralInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_per_domain_bilateral_information_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerDomainBilateralInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerDomainBilateralInformation_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerDomainBilateralInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerDomainBilateralInformation_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerDomainBilateralInformation);
 
   return offset;
 }
@@ -2780,7 +2780,7 @@ static int dissect_other_actions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t DomainSuppliedInformation_set[] = {
+static const ber_old_sequence_t DomainSuppliedInformation_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_arrival_time_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routing_action_impl },
   { BER_CLASS_APP, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attempted_domain },
@@ -2796,8 +2796,8 @@ dissect_x411_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 	doing_address = FALSE;
 
-	  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DomainSuppliedInformation_set, hf_index, ett_x411_DomainSuppliedInformation);
+	  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DomainSuppliedInformation_set, hf_index, ett_x411_DomainSuppliedInformation);
 
 
 	doing_address = TRUE;
@@ -2812,7 +2812,7 @@ static int dissect_domain_supplied_information(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t TraceInformationElement_sequence[] = {
+static const ber_old_sequence_t TraceInformationElement_sequence[] = {
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_global_domain_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_domain_supplied_information },
   { 0, 0, 0, NULL }
@@ -2824,8 +2824,8 @@ dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 	doing_address = TRUE;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TraceInformationElement_sequence, hf_index, ett_x411_TraceInformationElement);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TraceInformationElement_sequence, hf_index, ett_x411_TraceInformationElement);
 
 
 	doing_address = FALSE;
@@ -2839,14 +2839,14 @@ static int dissect_TraceInformation_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t TraceInformation_sequence_of[1] = {
+static const ber_old_sequence_t TraceInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TraceInformation_item },
 };
 
 static int
 dissect_x411_TraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TraceInformation_sequence_of, hf_index, ett_x411_TraceInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TraceInformation_sequence_of, hf_index, ett_x411_TraceInformation);
 
   return offset;
 }
@@ -2861,7 +2861,7 @@ static const value_string x411_ExtensionType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExtensionType_choice[] = {
+static const ber_old_choice_t ExtensionType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_standard_extension_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_private_extension_impl },
   { 0, 0, 0, 0, NULL }
@@ -2869,9 +2869,9 @@ static const ber_choice_t ExtensionType_choice[] = {
 
 static int
 dissect_x411_ExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExtensionType_choice, hf_index, ett_x411_ExtensionType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExtensionType_choice, hf_index, ett_x411_ExtensionType,
+                                     NULL);
 
   return offset;
 }
@@ -2924,7 +2924,7 @@ static int dissect_extension_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ExtensionField_sequence[] = {
+static const ber_old_sequence_t ExtensionField_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extension_type },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_criticality_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_extension_value_impl },
@@ -2933,8 +2933,8 @@ static const ber_sequence_t ExtensionField_sequence[] = {
 
 static int
 dissect_x411_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtensionField_sequence, hf_index, ett_x411_ExtensionField);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtensionField_sequence, hf_index, ett_x411_ExtensionField);
 
   return offset;
 }
@@ -2943,14 +2943,14 @@ static int dissect_extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_ExtensionField_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ExtensionField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extensions_item },
 };
 
 static int
 dissect_x411_SET_OF_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ExtensionField_set_of, hf_index, ett_x411_SET_OF_ExtensionField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ExtensionField_set_of, hf_index, ett_x411_SET_OF_ExtensionField);
 
   return offset;
 }
@@ -3039,7 +3039,7 @@ static int dissect_explicit_conversion_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PerRecipientMessageTransferFields_set[] = {
+static const ber_old_sequence_t PerRecipientMessageTransferFields_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_recipient_name },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originally_specified_recipient_number_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_per_recipient_indicators_impl },
@@ -3050,8 +3050,8 @@ static const ber_sequence_t PerRecipientMessageTransferFields_set[] = {
 
 static int
 dissect_x411_PerRecipientMessageTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientMessageTransferFields_set, hf_index, ett_x411_PerRecipientMessageTransferFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientMessageTransferFields_set, hf_index, ett_x411_PerRecipientMessageTransferFields);
 
   return offset;
 }
@@ -3060,14 +3060,14 @@ static int dissect_per_recipient_message_fields_item(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_message_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientMessageTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientMessageTransferFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientMessageTransferFields);
 
   return offset;
 }
@@ -3076,7 +3076,7 @@ static int dissect_per_recipient_message_fields_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t MessageTransferEnvelope_set[] = {
+static const ber_old_sequence_t MessageTransferEnvelope_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_message_identifier },
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_mta_originator_name },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_original_encoded_information_types },
@@ -3094,8 +3094,8 @@ static const ber_sequence_t MessageTransferEnvelope_set[] = {
 
 static int
 dissect_x411_MessageTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageTransferEnvelope_set, hf_index, ett_x411_MessageTransferEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageTransferEnvelope_set, hf_index, ett_x411_MessageTransferEnvelope);
 
   return offset;
 }
@@ -3140,7 +3140,7 @@ static int dissect_returned_content_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t Message_sequence[] = {
+static const ber_old_sequence_t Message_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_message_envelope },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_content },
   { 0, 0, 0, NULL }
@@ -3148,8 +3148,8 @@ static const ber_sequence_t Message_sequence[] = {
 
 static int
 dissect_x411_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Message_sequence, hf_index, ett_x411_Message);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Message_sequence, hf_index, ett_x411_Message);
 
   return offset;
 }
@@ -3182,7 +3182,7 @@ static int dissect_report_destination_name(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ReportTransferEnvelope_set[] = {
+static const ber_old_sequence_t ReportTransferEnvelope_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_report_identifier },
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_report_destination_name },
   { BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_trace_information },
@@ -3192,8 +3192,8 @@ static const ber_sequence_t ReportTransferEnvelope_set[] = {
 
 static int
 dissect_x411_ReportTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReportTransferEnvelope_set, hf_index, ett_x411_ReportTransferEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReportTransferEnvelope_set, hf_index, ett_x411_ReportTransferEnvelope);
 
   return offset;
 }
@@ -3316,7 +3316,7 @@ static int dissect_type_of_MTS_user_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t DeliveryReport_set[] = {
+static const ber_old_sequence_t DeliveryReport_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_delivery_time_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_of_MTS_user_impl },
   { 0, 0, 0, NULL }
@@ -3324,8 +3324,8 @@ static const ber_sequence_t DeliveryReport_set[] = {
 
 static int
 dissect_x411_DeliveryReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DeliveryReport_set, hf_index, ett_x411_DeliveryReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DeliveryReport_set, hf_index, ett_x411_DeliveryReport);
 
   return offset;
 }
@@ -3462,7 +3462,7 @@ static int dissect_non_delivery_diagnostic_code_impl(proto_tree *tree _U_, tvbuf
 }
 
 
-static const ber_sequence_t NonDeliveryReport_set[] = {
+static const ber_old_sequence_t NonDeliveryReport_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_delivery_reason_code_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_non_delivery_diagnostic_code_impl },
   { 0, 0, 0, NULL }
@@ -3470,8 +3470,8 @@ static const ber_sequence_t NonDeliveryReport_set[] = {
 
 static int
 dissect_x411_NonDeliveryReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              NonDeliveryReport_set, hf_index, ett_x411_NonDeliveryReport);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  NonDeliveryReport_set, hf_index, ett_x411_NonDeliveryReport);
 
   return offset;
 }
@@ -3486,7 +3486,7 @@ static const value_string x411_ReportType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReportType_choice[] = {
+static const ber_old_choice_t ReportType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_delivery_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_non_delivery_impl },
   { 0, 0, 0, 0, NULL }
@@ -3497,9 +3497,9 @@ dissect_x411_ReportType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 #line 744 "x411.cnf"
 	int report = -1;
 
-  	  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReportType_choice, hf_index, ett_x411_ReportType,
-                                 &report);
+  	  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReportType_choice, hf_index, ett_x411_ReportType,
+                                     &report);
 
 	
 	if(check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -3518,7 +3518,7 @@ static int dissect_delivery_report_type_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t LastTraceInformation_set[] = {
+static const ber_old_sequence_t LastTraceInformation_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_arrival_time_impl },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_converted_encoded_information_types },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_trace_report_type_impl },
@@ -3527,8 +3527,8 @@ static const ber_sequence_t LastTraceInformation_set[] = {
 
 static int
 dissect_x411_LastTraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              LastTraceInformation_set, hf_index, ett_x411_LastTraceInformation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  LastTraceInformation_set, hf_index, ett_x411_LastTraceInformation);
 
   return offset;
 }
@@ -3563,7 +3563,7 @@ static int dissect_supplementary_information_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t PerRecipientReportTransferFields_set[] = {
+static const ber_old_sequence_t PerRecipientReportTransferFields_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mta_actual_recipient_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originally_specified_recipient_number_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_per_recipient_indicators_impl },
@@ -3576,8 +3576,8 @@ static const ber_sequence_t PerRecipientReportTransferFields_set[] = {
 
 static int
 dissect_x411_PerRecipientReportTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientReportTransferFields_set, hf_index, ett_x411_PerRecipientReportTransferFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientReportTransferFields_set, hf_index, ett_x411_PerRecipientReportTransferFields);
 
   return offset;
 }
@@ -3586,14 +3586,14 @@ static int dissect_per_recipient_report_fields_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_report_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientReportTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientReportTransferFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientReportTransferFields);
 
   return offset;
 }
@@ -3602,7 +3602,7 @@ static int dissect_per_recipient_report_fields_impl(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t ReportTransferContent_set[] = {
+static const ber_old_sequence_t ReportTransferContent_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_subject_identifier },
   { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_subject_intermediate_trace_information },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_original_encoded_information_types },
@@ -3617,8 +3617,8 @@ static const ber_sequence_t ReportTransferContent_set[] = {
 
 static int
 dissect_x411_ReportTransferContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReportTransferContent_set, hf_index, ett_x411_ReportTransferContent);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReportTransferContent_set, hf_index, ett_x411_ReportTransferContent);
 
   return offset;
 }
@@ -3627,7 +3627,7 @@ static int dissect_report_content(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Report_sequence[] = {
+static const ber_old_sequence_t Report_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_report_envelope },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_report_content },
   { 0, 0, 0, NULL }
@@ -3635,8 +3635,8 @@ static const ber_sequence_t Report_sequence[] = {
 
 static int
 dissect_x411_Report(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Report_sequence, hf_index, ett_x411_Report);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Report_sequence, hf_index, ett_x411_Report);
 
   return offset;
 }
@@ -3676,7 +3676,7 @@ static int dissect_maximum_content_length_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t PerRecipientProbeTransferFields_set[] = {
+static const ber_old_sequence_t PerRecipientProbeTransferFields_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_recipient_name },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originally_specified_recipient_number_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_per_recipient_indicators_impl },
@@ -3687,8 +3687,8 @@ static const ber_sequence_t PerRecipientProbeTransferFields_set[] = {
 
 static int
 dissect_x411_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientProbeTransferFields_set, hf_index, ett_x411_PerRecipientProbeTransferFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientProbeTransferFields_set, hf_index, ett_x411_PerRecipientProbeTransferFields);
 
   return offset;
 }
@@ -3697,14 +3697,14 @@ static int dissect_per_recipient_probe_transfer_fields_item(proto_tree *tree _U_
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_probe_transfer_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientProbeTransferFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientProbeTransferFields);
 
   return offset;
 }
@@ -3713,7 +3713,7 @@ static int dissect_per_recipient_probe_transfer_fields_impl(proto_tree *tree _U_
 }
 
 
-static const ber_sequence_t ProbeTransferEnvelope_set[] = {
+static const ber_old_sequence_t ProbeTransferEnvelope_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_probe_identifier },
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_mta_originator_name },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_original_encoded_information_types },
@@ -3730,8 +3730,8 @@ static const ber_sequence_t ProbeTransferEnvelope_set[] = {
 
 static int
 dissect_x411_ProbeTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ProbeTransferEnvelope_set, hf_index, ett_x411_ProbeTransferEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ProbeTransferEnvelope_set, hf_index, ett_x411_ProbeTransferEnvelope);
 
   return offset;
 }
@@ -3756,7 +3756,7 @@ static const value_string x411_MTS_APDU_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t MTS_APDU_choice[] = {
+static const ber_old_choice_t MTS_APDU_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_report_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_probe_impl },
@@ -3768,9 +3768,9 @@ dissect_x411_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 #line 732 "x411.cnf"
 	int apdu = -1;
 
-  	  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 MTS_APDU_choice, hf_index, ett_x411_MTS_APDU,
-                                 &apdu);
+  	  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     MTS_APDU_choice, hf_index, ett_x411_MTS_APDU,
+                                     &apdu);
 
 	
 	if(check_col(actx->pinfo->cinfo, COL_INFO) && (apdu != 0)) { /* we don't show "message" - sub-dissectors have better idea */
@@ -3798,7 +3798,7 @@ static const value_string x411_T_attempted_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_attempted_choice[] = {
+static const ber_old_choice_t T_attempted_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mta },
   {   1, BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_domain },
   { 0, 0, 0, 0, NULL }
@@ -3806,9 +3806,9 @@ static const ber_choice_t T_attempted_choice[] = {
 
 static int
 dissect_x411_T_attempted(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_attempted_choice, hf_index, ett_x411_T_attempted,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_attempted_choice, hf_index, ett_x411_T_attempted,
+                                     NULL);
 
   return offset;
 }
@@ -3817,7 +3817,7 @@ static int dissect_attempted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t MTASuppliedInformation_set[] = {
+static const ber_old_sequence_t MTASuppliedInformation_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_arrival_time_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routing_action_impl },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attempted },
@@ -3833,8 +3833,8 @@ dissect_x411_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 	doing_address = FALSE;
 
-	  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MTASuppliedInformation_set, hf_index, ett_x411_MTASuppliedInformation);
+	  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MTASuppliedInformation_set, hf_index, ett_x411_MTASuppliedInformation);
 
 
 	doing_address = TRUE;
@@ -3849,7 +3849,7 @@ static int dissect_mta_supplied_information(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t InternalTraceInformationElement_sequence[] = {
+static const ber_old_sequence_t InternalTraceInformationElement_sequence[] = {
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_global_domain_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mta_name },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_mta_supplied_information },
@@ -3862,8 +3862,8 @@ dissect_x411_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t
 
 	doing_address = TRUE;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InternalTraceInformationElement_sequence, hf_index, ett_x411_InternalTraceInformationElement);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InternalTraceInformationElement_sequence, hf_index, ett_x411_InternalTraceInformationElement);
 
 
 	doing_address = FALSE;
@@ -3877,14 +3877,14 @@ static int dissect_InternalTraceInformation_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t InternalTraceInformation_sequence_of[1] = {
+static const ber_old_sequence_t InternalTraceInformation_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_InternalTraceInformation_item },
 };
 
 static int
 dissect_x411_InternalTraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      InternalTraceInformation_sequence_of, hf_index, ett_x411_InternalTraceInformation);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          InternalTraceInformation_sequence_of, hf_index, ett_x411_InternalTraceInformation);
 
   return offset;
 }
@@ -3897,7 +3897,7 @@ static const value_string x411_ObjectName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ObjectName_choice[] = {
+static const ber_old_choice_t ObjectName_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_user_agent },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mTA_impl },
   {   2, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_message_store_impl },
@@ -3906,9 +3906,9 @@ static const ber_choice_t ObjectName_choice[] = {
 
 static int
 dissect_x411_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ObjectName_choice, hf_index, ett_x411_ObjectName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ObjectName_choice, hf_index, ett_x411_ObjectName,
+                                     NULL);
 
   return offset;
 }
@@ -3920,7 +3920,7 @@ static int dissect_responder_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t DeliveryQueue_set[] = {
+static const ber_old_sequence_t DeliveryQueue_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messages_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delivery_queue_octets_impl },
   { 0, 0, 0, NULL }
@@ -3928,8 +3928,8 @@ static const ber_sequence_t DeliveryQueue_set[] = {
 
 static int
 dissect_x411_DeliveryQueue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DeliveryQueue_set, hf_index, ett_x411_DeliveryQueue);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DeliveryQueue_set, hf_index, ett_x411_DeliveryQueue);
 
   return offset;
 }
@@ -3944,7 +3944,7 @@ static int dissect_non_urgent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MessagesWaiting_set[] = {
+static const ber_old_sequence_t MessagesWaiting_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_urgent_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_normal_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_non_urgent_impl },
@@ -3953,8 +3953,8 @@ static const ber_sequence_t MessagesWaiting_set[] = {
 
 static int
 dissect_x411_MessagesWaiting(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessagesWaiting_set, hf_index, ett_x411_MessagesWaiting);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessagesWaiting_set, hf_index, ett_x411_MessagesWaiting);
 
   return offset;
 }
@@ -3963,7 +3963,7 @@ static int dissect_messages_waiting(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t MTSBindArgument_set[] = {
+static const ber_old_sequence_t MTSBindArgument_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_initiator_name },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_messages_waiting },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_initiator_credentials_impl },
@@ -3974,14 +3974,14 @@ static const ber_sequence_t MTSBindArgument_set[] = {
 
 static int
 dissect_x411_MTSBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MTSBindArgument_set, hf_index, ett_x411_MTSBindArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MTSBindArgument_set, hf_index, ett_x411_MTSBindArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t MTSBindResult_set[] = {
+static const ber_old_sequence_t MTSBindResult_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responder_name },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_messages_waiting },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_responder_credentials_impl },
@@ -3991,8 +3991,8 @@ static const ber_sequence_t MTSBindResult_set[] = {
 
 static int
 dissect_x411_MTSBindResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MTSBindResult_set, hf_index, ett_x411_MTSBindResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MTSBindResult_set, hf_index, ett_x411_MTSBindResult);
 
   return offset;
 }
@@ -4081,7 +4081,7 @@ static int dissect_originator_report_request_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t PerRecipientMessageSubmissionFields_set[] = {
+static const ber_old_sequence_t PerRecipientMessageSubmissionFields_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_submission_recipient_name },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originator_report_request_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_explicit_conversion_impl },
@@ -4091,8 +4091,8 @@ static const ber_sequence_t PerRecipientMessageSubmissionFields_set[] = {
 
 static int
 dissect_x411_PerRecipientMessageSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientMessageSubmissionFields_set, hf_index, ett_x411_PerRecipientMessageSubmissionFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientMessageSubmissionFields_set, hf_index, ett_x411_PerRecipientMessageSubmissionFields);
 
   return offset;
 }
@@ -4101,14 +4101,14 @@ static int dissect_per_recipient_message_submission_fields_item(proto_tree *tree
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientMessageSubmissionFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientMessageSubmissionFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_message_submission_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientMessageSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientMessageSubmissionFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientMessageSubmissionFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientMessageSubmissionFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientMessageSubmissionFields);
 
   return offset;
 }
@@ -4117,7 +4117,7 @@ static int dissect_per_recipient_message_submission_fields_impl(proto_tree *tree
 }
 
 
-static const ber_sequence_t MessageSubmissionEnvelope_set[] = {
+static const ber_old_sequence_t MessageSubmissionEnvelope_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_mts_originator_name },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_original_encoded_information_types },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_content_type },
@@ -4132,8 +4132,8 @@ static const ber_sequence_t MessageSubmissionEnvelope_set[] = {
 
 int
 dissect_x411_MessageSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageSubmissionEnvelope_set, hf_index, ett_x411_MessageSubmissionEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageSubmissionEnvelope_set, hf_index, ett_x411_MessageSubmissionEnvelope);
 
   return offset;
 }
@@ -4142,7 +4142,7 @@ static int dissect_message_submission_envelope(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t MessageSubmissionArgument_sequence[] = {
+static const ber_old_sequence_t MessageSubmissionArgument_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_message_submission_envelope },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_content },
   { 0, 0, 0, NULL }
@@ -4150,8 +4150,8 @@ static const ber_sequence_t MessageSubmissionArgument_sequence[] = {
 
 static int
 dissect_x411_MessageSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageSubmissionArgument_sequence, hf_index, ett_x411_MessageSubmissionArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageSubmissionArgument_sequence, hf_index, ett_x411_MessageSubmissionArgument);
 
   return offset;
 }
@@ -4181,7 +4181,7 @@ static int dissect_message_submission_time_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t MessageSubmissionResult_set[] = {
+static const ber_old_sequence_t MessageSubmissionResult_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_message_submission_identifier },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_submission_time_impl },
   { BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_content_identifier },
@@ -4191,14 +4191,14 @@ static const ber_sequence_t MessageSubmissionResult_set[] = {
 
 static int
 dissect_x411_MessageSubmissionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageSubmissionResult_set, hf_index, ett_x411_MessageSubmissionResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageSubmissionResult_set, hf_index, ett_x411_MessageSubmissionResult);
 
   return offset;
 }
 
 
-static const ber_sequence_t PerRecipientProbeSubmissionFields_set[] = {
+static const ber_old_sequence_t PerRecipientProbeSubmissionFields_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_probe_recipient_name },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originator_report_request_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_explicit_conversion_impl },
@@ -4208,8 +4208,8 @@ static const ber_sequence_t PerRecipientProbeSubmissionFields_set[] = {
 
 static int
 dissect_x411_PerRecipientProbeSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientProbeSubmissionFields_set, hf_index, ett_x411_PerRecipientProbeSubmissionFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientProbeSubmissionFields_set, hf_index, ett_x411_PerRecipientProbeSubmissionFields);
 
   return offset;
 }
@@ -4218,14 +4218,14 @@ static int dissect_per_recipient_probe_submission_fields_item(proto_tree *tree _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_probe_submission_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientProbeSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientProbeSubmissionFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientProbeSubmissionFields);
 
   return offset;
 }
@@ -4234,7 +4234,7 @@ static int dissect_per_recipient_probe_submission_fields_impl(proto_tree *tree _
 }
 
 
-static const ber_sequence_t ProbeSubmissionEnvelope_set[] = {
+static const ber_old_sequence_t ProbeSubmissionEnvelope_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_mts_originator_name },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_original_encoded_information_types },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_content_type },
@@ -4248,8 +4248,8 @@ static const ber_sequence_t ProbeSubmissionEnvelope_set[] = {
 
 static int
 dissect_x411_ProbeSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ProbeSubmissionEnvelope_set, hf_index, ett_x411_ProbeSubmissionEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ProbeSubmissionEnvelope_set, hf_index, ett_x411_ProbeSubmissionEnvelope);
 
   return offset;
 }
@@ -4288,7 +4288,7 @@ static int dissect_probe_submission_time_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ProbeSubmissionResult_set[] = {
+static const ber_old_sequence_t ProbeSubmissionResult_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_probe_submission_identifier },
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_probe_submission_time_impl },
   { BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_content_identifier },
@@ -4298,8 +4298,8 @@ static const ber_sequence_t ProbeSubmissionResult_set[] = {
 
 static int
 dissect_x411_ProbeSubmissionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ProbeSubmissionResult_set, hf_index, ett_x411_ProbeSubmissionResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ProbeSubmissionResult_set, hf_index, ett_x411_ProbeSubmissionResult);
 
   return offset;
 }
@@ -4360,14 +4360,14 @@ static int dissect_permissible_operations_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t ContentTypes_set_of[1] = {
+static const ber_old_sequence_t ContentTypes_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ContentTypes_item },
 };
 
 static int
 dissect_x411_ContentTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ContentTypes_set_of, hf_index, ett_x411_ContentTypes);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ContentTypes_set_of, hf_index, ett_x411_ContentTypes);
 
   return offset;
 }
@@ -4379,7 +4379,7 @@ static int dissect_content_types_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t EncodedInformationTypesConstraints_sequence[] = {
+static const ber_old_sequence_t EncodedInformationTypesConstraints_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unacceptable_eits_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acceptable_eits_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_exclusively_acceptable_eits_impl },
@@ -4388,8 +4388,8 @@ static const ber_sequence_t EncodedInformationTypesConstraints_sequence[] = {
 
 int
 dissect_x411_EncodedInformationTypesConstraints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncodedInformationTypesConstraints_sequence, hf_index, ett_x411_EncodedInformationTypesConstraints);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncodedInformationTypesConstraints_sequence, hf_index, ett_x411_EncodedInformationTypesConstraints);
 
   return offset;
 }
@@ -4410,7 +4410,7 @@ static int dissect_permissible_encoded_information_types(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t Controls_set[] = {
+static const ber_old_sequence_t Controls_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_restrict_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permissible_operations_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permissible_maximum_content_length_impl },
@@ -4423,8 +4423,8 @@ static const ber_sequence_t Controls_set[] = {
 
 static int
 dissect_x411_Controls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Controls_set, hf_index, ett_x411_Controls);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Controls_set, hf_index, ett_x411_Controls);
 
   return offset;
 }
@@ -4468,14 +4468,14 @@ static int dissect_waiting_messages_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SET_OF_ContentType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContentType_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_waiting_content_types_item },
 };
 
 static int
 dissect_x411_SET_OF_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContentType_set_of, hf_index, ett_x411_SET_OF_ContentType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContentType_set_of, hf_index, ett_x411_SET_OF_ContentType);
 
   return offset;
 }
@@ -4484,7 +4484,7 @@ static int dissect_waiting_content_types_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t Waiting_set[] = {
+static const ber_old_sequence_t Waiting_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_operations_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_messages_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_content_types_impl },
@@ -4494,8 +4494,8 @@ static const ber_sequence_t Waiting_set[] = {
 
 static int
 dissect_x411_Waiting(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Waiting_set, hf_index, ett_x411_Waiting);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Waiting_set, hf_index, ett_x411_Waiting);
 
   return offset;
 }
@@ -4510,14 +4510,14 @@ dissect_x411_SubmissionControlResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ImproperlySpecifiedRecipients_sequence_of[1] = {
+static const ber_old_sequence_t ImproperlySpecifiedRecipients_sequence_of[1] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_ImproperlySpecifiedRecipients_item },
 };
 
 static int
 dissect_x411_ImproperlySpecifiedRecipients(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ImproperlySpecifiedRecipients_sequence_of, hf_index, ett_x411_ImproperlySpecifiedRecipients);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ImproperlySpecifiedRecipients_sequence_of, hf_index, ett_x411_ImproperlySpecifiedRecipients);
 
   return offset;
 }
@@ -4591,7 +4591,7 @@ static const value_string x411_DeliveredContentType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DeliveredContentType_choice[] = {
+static const ber_old_choice_t DeliveredContentType_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_built_in_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extended },
   { 0, 0, 0, 0, NULL }
@@ -4599,9 +4599,9 @@ static const ber_choice_t DeliveredContentType_choice[] = {
 
 static int
 dissect_x411_DeliveredContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DeliveredContentType_choice, hf_index, ett_x411_DeliveredContentType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DeliveredContentType_choice, hf_index, ett_x411_DeliveredContentType,
+                                     NULL);
 
   return offset;
 }
@@ -4652,14 +4652,14 @@ static int dissect_OtherRecipientNames_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t OtherRecipientNames_sequence_of[1] = {
+static const ber_old_sequence_t OtherRecipientNames_sequence_of[1] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_OtherRecipientNames_item },
 };
 
 static int
 dissect_x411_OtherRecipientNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OtherRecipientNames_sequence_of, hf_index, ett_x411_OtherRecipientNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OtherRecipientNames_sequence_of, hf_index, ett_x411_OtherRecipientNames);
 
   return offset;
 }
@@ -4695,7 +4695,7 @@ static int dissect_originally_intended_recipient_name_impl(proto_tree *tree _U_,
 }
 
 
-static const ber_sequence_t OtherMessageDeliveryFields_set[] = {
+static const ber_old_sequence_t OtherMessageDeliveryFields_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_delivered_content_type },
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_originator_name },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_original_encoded_information_types_impl },
@@ -4713,8 +4713,8 @@ static const ber_sequence_t OtherMessageDeliveryFields_set[] = {
 
 int
 dissect_x411_OtherMessageDeliveryFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              OtherMessageDeliveryFields_set, hf_index, ett_x411_OtherMessageDeliveryFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  OtherMessageDeliveryFields_set, hf_index, ett_x411_OtherMessageDeliveryFields);
 
   return offset;
 }
@@ -4723,7 +4723,7 @@ static int dissect_other_fields(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t MessageDeliveryArgument_sequence[] = {
+static const ber_old_sequence_t MessageDeliveryArgument_sequence[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_message_delivery_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_message_delivery_time },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_other_fields },
@@ -4733,8 +4733,8 @@ static const ber_sequence_t MessageDeliveryArgument_sequence[] = {
 
 static int
 dissect_x411_MessageDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageDeliveryArgument_sequence, hf_index, ett_x411_MessageDeliveryArgument);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageDeliveryArgument_sequence, hf_index, ett_x411_MessageDeliveryArgument);
 
   return offset;
 }
@@ -4764,7 +4764,7 @@ static int dissect_proof_of_delivery_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t MessageDeliveryResult_set[] = {
+static const ber_old_sequence_t MessageDeliveryResult_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_recipient_certificate_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_proof_of_delivery_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
@@ -4773,8 +4773,8 @@ static const ber_sequence_t MessageDeliveryResult_set[] = {
 
 static int
 dissect_x411_MessageDeliveryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageDeliveryResult_set, hf_index, ett_x411_MessageDeliveryResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageDeliveryResult_set, hf_index, ett_x411_MessageDeliveryResult);
 
   return offset;
 }
@@ -4807,7 +4807,7 @@ static int dissect_actual_recipient_name_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t PerRecipientReportDeliveryFields_set[] = {
+static const ber_old_sequence_t PerRecipientReportDeliveryFields_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actual_recipient_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_delivery_report_type_impl },
   { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_converted_encoded_information_types },
@@ -4819,8 +4819,8 @@ static const ber_sequence_t PerRecipientReportDeliveryFields_set[] = {
 
 static int
 dissect_x411_PerRecipientReportDeliveryFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PerRecipientReportDeliveryFields_set, hf_index, ett_x411_PerRecipientReportDeliveryFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PerRecipientReportDeliveryFields_set, hf_index, ett_x411_PerRecipientReportDeliveryFields);
 
   return offset;
 }
@@ -4829,14 +4829,14 @@ static int dissect_per_recipient_report_delivery_fields_item(proto_tree *tree _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_PerRecipientReportDeliveryFields_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_PerRecipientReportDeliveryFields_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_per_recipient_report_delivery_fields_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_PerRecipientReportDeliveryFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_PerRecipientReportDeliveryFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientReportDeliveryFields);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_PerRecipientReportDeliveryFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientReportDeliveryFields);
 
   return offset;
 }
@@ -4845,7 +4845,7 @@ static int dissect_per_recipient_report_delivery_fields(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t ReportDeliveryArgument_set[] = {
+static const ber_old_sequence_t ReportDeliveryArgument_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_subject_submission_identifier },
   { BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_content_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_content_type },
@@ -4858,8 +4858,8 @@ static const ber_sequence_t ReportDeliveryArgument_set[] = {
 
 static int
 dissect_x411_ReportDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReportDeliveryArgument_set, hf_index, ett_x411_ReportDeliveryArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReportDeliveryArgument_set, hf_index, ett_x411_ReportDeliveryArgument);
 
   return offset;
 }
@@ -4872,7 +4872,7 @@ static const value_string x411_ReportDeliveryResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ReportDeliveryResult_choice[] = {
+static const ber_old_choice_t ReportDeliveryResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_empty_result },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_extensions },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_extensions },
@@ -4882,15 +4882,15 @@ static const ber_choice_t ReportDeliveryResult_choice[] = {
 
 static int
 dissect_x411_ReportDeliveryResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ReportDeliveryResult_choice, hf_index, ett_x411_ReportDeliveryResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ReportDeliveryResult_choice, hf_index, ett_x411_ReportDeliveryResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeliveryControlArgument_set[] = {
+static const ber_old_sequence_t DeliveryControlArgument_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_restrict_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permissible_operations_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permissible_maximum_content_length_impl },
@@ -4904,14 +4904,14 @@ static const ber_sequence_t DeliveryControlArgument_set[] = {
 
 static int
 dissect_x411_DeliveryControlArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DeliveryControlArgument_set, hf_index, ett_x411_DeliveryControlArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DeliveryControlArgument_set, hf_index, ett_x411_DeliveryControlArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t DeliveryControlResult_set[] = {
+static const ber_old_sequence_t DeliveryControlResult_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_operations_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_messages_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_waiting_content_types_impl },
@@ -4922,8 +4922,8 @@ static const ber_sequence_t DeliveryControlResult_set[] = {
 
 static int
 dissect_x411_DeliveryControlResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              DeliveryControlResult_set, hf_index, ett_x411_DeliveryControlResult);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  DeliveryControlResult_set, hf_index, ett_x411_DeliveryControlResult);
 
   return offset;
 }
@@ -4983,7 +4983,7 @@ static const value_string x411_T_refused_argument_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_refused_argument_choice[] = {
+static const ber_old_choice_t T_refused_argument_choice[] = {
   {   0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_built_in_argument_impl },
   {   1, BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_refused_extension },
   { 0, 0, 0, 0, NULL }
@@ -4991,9 +4991,9 @@ static const ber_choice_t T_refused_argument_choice[] = {
 
 static int
 dissect_x411_T_refused_argument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_refused_argument_choice, hf_index, ett_x411_T_refused_argument,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_refused_argument_choice, hf_index, ett_x411_T_refused_argument,
+                                     NULL);
 
   return offset;
 }
@@ -5022,7 +5022,7 @@ static int dissect_refusal_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RefusedOperation_set[] = {
+static const ber_old_sequence_t RefusedOperation_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refused_argument },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_refusal_reason_impl },
   { 0, 0, 0, NULL }
@@ -5030,8 +5030,8 @@ static const ber_sequence_t RefusedOperation_set[] = {
 
 static int
 dissect_x411_RefusedOperation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RefusedOperation_set, hf_index, ett_x411_RefusedOperation);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RefusedOperation_set, hf_index, ett_x411_RefusedOperation);
 
   return offset;
 }
@@ -5067,7 +5067,7 @@ static int dissect_user_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_x121_sequence[] = {
+static const ber_old_sequence_t T_x121_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x121_address },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_tsap_id },
   { 0, 0, 0, NULL }
@@ -5075,8 +5075,8 @@ static const ber_sequence_t T_x121_sequence[] = {
 
 static int
 dissect_x411_T_x121(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_x121_sequence, hf_index, ett_x411_T_x121);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_x121_sequence, hf_index, ett_x411_T_x121);
 
   return offset;
 }
@@ -5103,7 +5103,7 @@ static const value_string x411_UserAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t UserAddress_choice[] = {
+static const ber_old_choice_t UserAddress_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x121_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentation_impl },
   { 0, 0, 0, 0, NULL }
@@ -5111,9 +5111,9 @@ static const ber_choice_t UserAddress_choice[] = {
 
 static int
 dissect_x411_UserAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 UserAddress_choice, hf_index, ett_x411_UserAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     UserAddress_choice, hf_index, ett_x411_UserAddress,
+                                     NULL);
 
   return offset;
 }
@@ -5122,14 +5122,14 @@ static int dissect_user_address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_Priority_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Priority_set_of[1] = {
   { BER_CLASS_APP, 7, BER_FLAGS_NOOWNTAG, dissect_class_priority_item },
 };
 
 static int
 dissect_x411_SET_OF_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Priority_set_of, hf_index, ett_x411_SET_OF_Priority);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Priority_set_of, hf_index, ett_x411_SET_OF_Priority);
 
   return offset;
 }
@@ -5184,7 +5184,7 @@ static const value_string x411_ExactOrPattern_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExactOrPattern_choice[] = {
+static const ber_old_choice_t ExactOrPattern_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_exact_match_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pattern_match_impl },
   { 0, 0, 0, 0, NULL }
@@ -5192,9 +5192,9 @@ static const ber_choice_t ExactOrPattern_choice[] = {
 
 static int
 dissect_x411_ExactOrPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExactOrPattern_choice, hf_index, ett_x411_ExactOrPattern,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExactOrPattern_choice, hf_index, ett_x411_ExactOrPattern,
+                                     NULL);
 
   return offset;
 }
@@ -5203,7 +5203,7 @@ static int dissect_source_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t Restriction_set[] = {
+static const ber_old_sequence_t Restriction_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_permitted },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_source_type },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_source_name },
@@ -5212,8 +5212,8 @@ static const ber_sequence_t Restriction_set[] = {
 
 static int
 dissect_x411_Restriction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Restriction_set, hf_index, ett_x411_Restriction);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Restriction_set, hf_index, ett_x411_Restriction);
 
   return offset;
 }
@@ -5225,14 +5225,14 @@ static int dissect_RestrictedDelivery_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Restriction_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Restriction_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_applies_only_to_item },
 };
 
 static int
 dissect_x411_SEQUENCE_OF_Restriction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Restriction_sequence_of, hf_index, ett_x411_SEQUENCE_OF_Restriction);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Restriction_sequence_of, hf_index, ett_x411_SEQUENCE_OF_Restriction);
 
   return offset;
 }
@@ -5241,7 +5241,7 @@ static int dissect_applies_only_to_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t MessageClass_set[] = {
+static const ber_old_sequence_t MessageClass_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_content_types_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_content_length_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encoded_information_types_constraints_impl },
@@ -5255,8 +5255,8 @@ static const ber_sequence_t MessageClass_set[] = {
 
 static int
 dissect_x411_MessageClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageClass_set, hf_index, ett_x411_MessageClass);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageClass_set, hf_index, ett_x411_MessageClass);
 
   return offset;
 }
@@ -5274,14 +5274,14 @@ static int dissect_deliverable_class_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SET_OF_DeliverableClass_set_of[1] = {
+static const ber_old_sequence_t SET_OF_DeliverableClass_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_deliverable_class_item },
 };
 
 static int
 dissect_x411_SET_OF_DeliverableClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_DeliverableClass_set_of, hf_index, ett_x411_SET_OF_DeliverableClass);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_DeliverableClass_set_of, hf_index, ett_x411_SET_OF_DeliverableClass);
 
   return offset;
 }
@@ -5314,14 +5314,14 @@ static int dissect_redirection_classes_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SET_OF_RedirectionClass_set_of[1] = {
+static const ber_old_sequence_t SET_OF_RedirectionClass_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_redirection_classes_item },
 };
 
 static int
 dissect_x411_SET_OF_RedirectionClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_RedirectionClass_set_of, hf_index, ett_x411_SET_OF_RedirectionClass);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_RedirectionClass_set_of, hf_index, ett_x411_SET_OF_RedirectionClass);
 
   return offset;
 }
@@ -5342,7 +5342,7 @@ static int dissect_recipient_assigned_alternate_recipient_impl(proto_tree *tree
 }
 
 
-static const ber_sequence_t RecipientRedirection_set[] = {
+static const ber_old_sequence_t RecipientRedirection_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirection_classes_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_recipient_assigned_alternate_recipient_impl },
   { 0, 0, 0, NULL }
@@ -5350,8 +5350,8 @@ static const ber_sequence_t RecipientRedirection_set[] = {
 
 static int
 dissect_x411_RecipientRedirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RecipientRedirection_set, hf_index, ett_x411_RecipientRedirection);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RecipientRedirection_set, hf_index, ett_x411_RecipientRedirection);
 
   return offset;
 }
@@ -5360,14 +5360,14 @@ static int dissect_Redirections_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Redirections_sequence_of[1] = {
+static const ber_old_sequence_t Redirections_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_Redirections_item },
 };
 
 static int
 dissect_x411_Redirections(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Redirections_sequence_of, hf_index, ett_x411_Redirections);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Redirections_sequence_of, hf_index, ett_x411_Redirections);
 
   return offset;
 }
@@ -5376,14 +5376,14 @@ static int dissect_redirections_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t RestrictedDelivery_sequence_of[1] = {
+static const ber_old_sequence_t RestrictedDelivery_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RestrictedDelivery_item },
 };
 
 static int
 dissect_x411_RestrictedDelivery(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RestrictedDelivery_sequence_of, hf_index, ett_x411_RestrictedDelivery);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RestrictedDelivery_sequence_of, hf_index, ett_x411_RestrictedDelivery);
 
   return offset;
 }
@@ -5430,14 +5430,14 @@ static int dissect_type_extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_type_extensions_set_of[1] = {
+static const ber_old_sequence_t T_type_extensions_set_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_type_extensions_item },
 };
 
 static int
 dissect_x411_T_type_extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_type_extensions_set_of, hf_index, ett_x411_T_type_extensions);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_type_extensions_set_of, hf_index, ett_x411_T_type_extensions);
 
   return offset;
 }
@@ -5446,7 +5446,7 @@ static int dissect_type_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t RegistrationTypes_sequence[] = {
+static const ber_old_sequence_t RegistrationTypes_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_standard_parameters_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_extensions_impl },
   { 0, 0, 0, NULL }
@@ -5454,8 +5454,8 @@ static const ber_sequence_t RegistrationTypes_sequence[] = {
 
 static int
 dissect_x411_RegistrationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RegistrationTypes_sequence, hf_index, ett_x411_RegistrationTypes);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RegistrationTypes_sequence, hf_index, ett_x411_RegistrationTypes);
 
   return offset;
 }
@@ -5464,7 +5464,7 @@ static int dissect_retrieve_registrations_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t RegisterArgument_set[] = {
+static const ber_old_sequence_t RegisterArgument_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_user_name },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_user_address_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_deliverable_class },
@@ -5478,8 +5478,8 @@ static const ber_sequence_t RegisterArgument_set[] = {
 
 static int
 dissect_x411_RegisterArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RegisterArgument_set, hf_index, ett_x411_RegisterArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RegisterArgument_set, hf_index, ett_x411_RegisterArgument);
 
   return offset;
 }
@@ -5488,7 +5488,7 @@ static int dissect_registered_information_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_non_empty_result_set[] = {
+static const ber_old_sequence_t T_non_empty_result_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_registered_information_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
   { 0, 0, 0, NULL }
@@ -5496,8 +5496,8 @@ static const ber_sequence_t T_non_empty_result_set[] = {
 
 static int
 dissect_x411_T_non_empty_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              T_non_empty_result_set, hf_index, ett_x411_T_non_empty_result);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  T_non_empty_result_set, hf_index, ett_x411_T_non_empty_result);
 
   return offset;
 }
@@ -5512,7 +5512,7 @@ static const value_string x411_RegisterResult_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t RegisterResult_choice[] = {
+static const ber_old_choice_t RegisterResult_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_empty_result },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_non_empty_result },
   { 0, 0, 0, 0, NULL }
@@ -5520,15 +5520,15 @@ static const ber_choice_t RegisterResult_choice[] = {
 
 static int
 dissect_x411_RegisterResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 RegisterResult_choice, hf_index, ett_x411_RegisterResult,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     RegisterResult_choice, hf_index, ett_x411_RegisterResult,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChangeCredentialsArgument_set[] = {
+static const ber_old_sequence_t ChangeCredentialsArgument_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_old_credentials_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_new_credentials_impl },
   { 0, 0, 0, NULL }
@@ -5536,14 +5536,14 @@ static const ber_sequence_t ChangeCredentialsArgument_set[] = {
 
 static int
 dissect_x411_ChangeCredentialsArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ChangeCredentialsArgument_set, hf_index, ett_x411_ChangeCredentialsArgument);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ChangeCredentialsArgument_set, hf_index, ett_x411_ChangeCredentialsArgument);
 
   return offset;
 }
 
 
-static const ber_sequence_t MessageDeliveryEnvelope_sequence[] = {
+static const ber_old_sequence_t MessageDeliveryEnvelope_sequence[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_message_delivery_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_message_delivery_time },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_other_fields },
@@ -5552,14 +5552,14 @@ static const ber_sequence_t MessageDeliveryEnvelope_sequence[] = {
 
 static int
 dissect_x411_MessageDeliveryEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageDeliveryEnvelope_sequence, hf_index, ett_x411_MessageDeliveryEnvelope);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageDeliveryEnvelope_sequence, hf_index, ett_x411_MessageDeliveryEnvelope);
 
   return offset;
 }
 
 
-static const ber_sequence_t ReportDeliveryEnvelope_set[] = {
+static const ber_old_sequence_t ReportDeliveryEnvelope_set[] = {
   { BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_subject_submission_identifier },
   { BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_content_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_content_type },
@@ -5571,8 +5571,8 @@ static const ber_sequence_t ReportDeliveryEnvelope_set[] = {
 
 static int
 dissect_x411_ReportDeliveryEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReportDeliveryEnvelope_set, hf_index, ett_x411_ReportDeliveryEnvelope);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReportDeliveryEnvelope_set, hf_index, ett_x411_ReportDeliveryEnvelope);
 
   return offset;
 }
@@ -5671,14 +5671,14 @@ static int dissect_RequestedDeliveryMethod_item(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t RequestedDeliveryMethod_sequence_of[1] = {
+static const ber_old_sequence_t RequestedDeliveryMethod_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_RequestedDeliveryMethod_item },
 };
 
 int
 dissect_x411_RequestedDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RequestedDeliveryMethod_sequence_of, hf_index, ett_x411_RequestedDeliveryMethod);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RequestedDeliveryMethod_sequence_of, hf_index, ett_x411_RequestedDeliveryMethod);
 
   return offset;
 }
@@ -5775,7 +5775,7 @@ dissect_x411_PhysicalRenditionAttributes(gboolean implicit_tag _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t ORAddress_sequence[] = {
+static const ber_old_sequence_t ORAddress_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_built_in_standard_attributes },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_built_in_domain_defined_attributes },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extension_attributes },
@@ -5790,8 +5790,8 @@ dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 	doing_address = TRUE;
 	address_item = NULL;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ORAddress_sequence, hf_index, ett_x411_ORAddress);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ORAddress_sequence, hf_index, ett_x411_ORAddress);
 
 
 	if(*oraddress && address_item)
@@ -5954,7 +5954,7 @@ static const value_string x411_ContentCorrelator_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ContentCorrelator_choice[] = {
+static const ber_old_choice_t ContentCorrelator_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_ia5text },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octets },
   { 0, 0, 0, 0, NULL }
@@ -5962,9 +5962,9 @@ static const ber_choice_t ContentCorrelator_choice[] = {
 
 static int
 dissect_x411_ContentCorrelator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ContentCorrelator_choice, hf_index, ett_x411_ContentCorrelator,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ContentCorrelator_choice, hf_index, ett_x411_ContentCorrelator,
+                                     NULL);
 
   return offset;
 }
@@ -5988,7 +5988,7 @@ dissect_x411_ProbeOriginAuthenticationAlgorithmIdentifier(gboolean implicit_tag
 }
 
 
-static const ber_sequence_t IntendedRecipientName_sequence[] = {
+static const ber_old_sequence_t IntendedRecipientName_sequence[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_intended_recipient },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_redirection_time },
   { 0, 0, 0, NULL }
@@ -5996,8 +5996,8 @@ static const ber_sequence_t IntendedRecipientName_sequence[] = {
 
 static int
 dissect_x411_IntendedRecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IntendedRecipientName_sequence, hf_index, ett_x411_IntendedRecipientName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IntendedRecipientName_sequence, hf_index, ett_x411_IntendedRecipientName);
 
   return offset;
 }
@@ -6028,7 +6028,7 @@ static int dissect_redirection_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t Redirection_sequence[] = {
+static const ber_old_sequence_t Redirection_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_intended_recipient_name },
   { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_redirection_reason },
   { 0, 0, 0, NULL }
@@ -6036,8 +6036,8 @@ static const ber_sequence_t Redirection_sequence[] = {
 
 static int
 dissect_x411_Redirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Redirection_sequence, hf_index, ett_x411_Redirection);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Redirection_sequence, hf_index, ett_x411_Redirection);
 
   return offset;
 }
@@ -6046,20 +6046,20 @@ static int dissect_RedirectionHistory_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t RedirectionHistory_sequence_of[1] = {
+static const ber_old_sequence_t RedirectionHistory_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RedirectionHistory_item },
 };
 
 static int
 dissect_x411_RedirectionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RedirectionHistory_sequence_of, hf_index, ett_x411_RedirectionHistory);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RedirectionHistory_sequence_of, hf_index, ett_x411_RedirectionHistory);
 
   return offset;
 }
 
 
-static const ber_sequence_t DLExpansion_sequence[] = {
+static const ber_old_sequence_t DLExpansion_sequence[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_dl },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_dl_expansion_time },
   { 0, 0, 0, NULL }
@@ -6067,8 +6067,8 @@ static const ber_sequence_t DLExpansion_sequence[] = {
 
 static int
 dissect_x411_DLExpansion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DLExpansion_sequence, hf_index, ett_x411_DLExpansion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DLExpansion_sequence, hf_index, ett_x411_DLExpansion);
 
   return offset;
 }
@@ -6077,14 +6077,14 @@ static int dissect_DLExpansionHistory_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t DLExpansionHistory_sequence_of[1] = {
+static const ber_old_sequence_t DLExpansionHistory_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DLExpansionHistory_item },
 };
 
 static int
 dissect_x411_DLExpansionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DLExpansionHistory_sequence_of, hf_index, ett_x411_DLExpansionHistory);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DLExpansionHistory_sequence_of, hf_index, ett_x411_DLExpansionHistory);
 
   return offset;
 }
@@ -6099,7 +6099,7 @@ dissect_x411_PhysicalForwardingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t OriginatorAndDLExpansion_sequence[] = {
+static const ber_old_sequence_t OriginatorAndDLExpansion_sequence[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_originator_or_dl_name },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_origination_or_expansion_time },
   { 0, 0, 0, NULL }
@@ -6107,8 +6107,8 @@ static const ber_sequence_t OriginatorAndDLExpansion_sequence[] = {
 
 static int
 dissect_x411_OriginatorAndDLExpansion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OriginatorAndDLExpansion_sequence, hf_index, ett_x411_OriginatorAndDLExpansion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OriginatorAndDLExpansion_sequence, hf_index, ett_x411_OriginatorAndDLExpansion);
 
   return offset;
 }
@@ -6117,14 +6117,14 @@ static int dissect_OriginatorAndDLExpansionHistory_item(proto_tree *tree _U_, tv
 }
 
 
-static const ber_sequence_t OriginatorAndDLExpansionHistory_sequence_of[1] = {
+static const ber_old_sequence_t OriginatorAndDLExpansionHistory_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_OriginatorAndDLExpansionHistory_item },
 };
 
 static int
 dissect_x411_OriginatorAndDLExpansionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OriginatorAndDLExpansionHistory_sequence_of, hf_index, ett_x411_OriginatorAndDLExpansionHistory);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OriginatorAndDLExpansionHistory_sequence_of, hf_index, ett_x411_OriginatorAndDLExpansionHistory);
 
   return offset;
 }
@@ -6166,7 +6166,7 @@ dissect_x411_ReportOriginAuthenticationAlgorithmIdentifier(gboolean implicit_tag
 }
 
 
-static const ber_sequence_t PerRecipientDeliveryReportFields_sequence[] = {
+static const ber_old_sequence_t PerRecipientDeliveryReportFields_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_message_delivery_time },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_type_of_MTS_user },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_recipient_certificate_impl },
@@ -6175,8 +6175,8 @@ static const ber_sequence_t PerRecipientDeliveryReportFields_sequence[] = {
 
 static int
 dissect_x411_PerRecipientDeliveryReportFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PerRecipientDeliveryReportFields_sequence, hf_index, ett_x411_PerRecipientDeliveryReportFields);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PerRecipientDeliveryReportFields_sequence, hf_index, ett_x411_PerRecipientDeliveryReportFields);
 
   return offset;
 }
@@ -6185,7 +6185,7 @@ static int dissect_report_type_delivery_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PerRecipientNonDeliveryReportFields_sequence[] = {
+static const ber_old_sequence_t PerRecipientNonDeliveryReportFields_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_non_delivery_reason_code },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_non_delivery_diagnostic_code },
   { 0, 0, 0, NULL }
@@ -6193,8 +6193,8 @@ static const ber_sequence_t PerRecipientNonDeliveryReportFields_sequence[] = {
 
 static int
 dissect_x411_PerRecipientNonDeliveryReportFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PerRecipientNonDeliveryReportFields_sequence, hf_index, ett_x411_PerRecipientNonDeliveryReportFields);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PerRecipientNonDeliveryReportFields_sequence, hf_index, ett_x411_PerRecipientNonDeliveryReportFields);
 
   return offset;
 }
@@ -6209,7 +6209,7 @@ static const value_string x411_T_report_type_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_report_type_choice[] = {
+static const ber_old_choice_t T_report_type_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_report_type_delivery_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_non_delivery_report_impl },
   { 0, 0, 0, 0, NULL }
@@ -6217,9 +6217,9 @@ static const ber_choice_t T_report_type_choice[] = {
 
 static int
 dissect_x411_T_report_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_report_type_choice, hf_index, ett_x411_T_report_type,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_report_type_choice, hf_index, ett_x411_T_report_type,
+                                     NULL);
 
   return offset;
 }
@@ -6228,7 +6228,7 @@ static int dissect_report_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t PerRecipientReportFields_sequence[] = {
+static const ber_old_sequence_t PerRecipientReportFields_sequence[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_actual_recipient_name },
   { BER_CLASS_APP, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_originally_intended_recipient_name },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_report_type },
@@ -6237,8 +6237,8 @@ static const ber_sequence_t PerRecipientReportFields_sequence[] = {
 
 static int
 dissect_x411_PerRecipientReportFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PerRecipientReportFields_sequence, hf_index, ett_x411_PerRecipientReportFields);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PerRecipientReportFields_sequence, hf_index, ett_x411_PerRecipientReportFields);
 
   return offset;
 }
@@ -6262,7 +6262,7 @@ dissect_x411_ProofOfSubmission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ReportingMTAName_sequence[] = {
+static const ber_old_sequence_t ReportingMTAName_sequence[] = {
   { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_domain },
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mta_name },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mta_directory_name_impl },
@@ -6271,8 +6271,8 @@ static const ber_sequence_t ReportingMTAName_sequence[] = {
 
 static int
 dissect_x411_ReportingMTAName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ReportingMTAName_sequence, hf_index, ett_x411_ReportingMTAName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ReportingMTAName_sequence, hf_index, ett_x411_ReportingMTAName);
 
   return offset;
 }
@@ -6284,7 +6284,7 @@ static const value_string x411_ExtendedCertificate_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExtendedCertificate_choice[] = {
+static const ber_old_choice_t ExtendedCertificate_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_directory_entry_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_certificate_impl },
   { 0, 0, 0, 0, NULL }
@@ -6292,9 +6292,9 @@ static const ber_choice_t ExtendedCertificate_choice[] = {
 
 static int
 dissect_x411_ExtendedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExtendedCertificate_choice, hf_index, ett_x411_ExtendedCertificate,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExtendedCertificate_choice, hf_index, ett_x411_ExtendedCertificate,
+                                     NULL);
 
   return offset;
 }
@@ -6303,33 +6303,33 @@ static int dissect_ExtendedCertificates_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ExtendedCertificates_set_of[1] = {
+static const ber_old_sequence_t ExtendedCertificates_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ExtendedCertificates_item },
 };
 
 int
 dissect_x411_ExtendedCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ExtendedCertificates_set_of, hf_index, ett_x411_ExtendedCertificates);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ExtendedCertificates_set_of, hf_index, ett_x411_ExtendedCertificates);
 
   return offset;
 }
 
 
-static const ber_sequence_t DLExemptedRecipients_set_of[1] = {
+static const ber_old_sequence_t DLExemptedRecipients_set_of[1] = {
   { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_DLExemptedRecipients_item },
 };
 
 static int
 dissect_x411_DLExemptedRecipients(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 DLExemptedRecipients_set_of, hf_index, ett_x411_DLExemptedRecipients);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     DLExemptedRecipients_set_of, hf_index, ett_x411_DLExemptedRecipients);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificateSelectors_set[] = {
+static const ber_old_sequence_t CertificateSelectors_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryption_recipient_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryption_originator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_selectors_content_integrity_check_impl },
@@ -6340,8 +6340,8 @@ static const ber_sequence_t CertificateSelectors_set[] = {
 
 static int
 dissect_x411_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CertificateSelectors_set, hf_index, ett_x411_CertificateSelectors);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CertificateSelectors_set, hf_index, ett_x411_CertificateSelectors);
 
   return offset;
 }
@@ -6416,7 +6416,7 @@ static const value_string x411_T_character_encoding_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_character_encoding_choice[] = {
+static const ber_old_choice_t T_character_encoding_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_two_octets },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_UniversalString, BER_FLAGS_NOOWNTAG, dissect_four_octets },
   { 0, 0, 0, 0, NULL }
@@ -6424,9 +6424,9 @@ static const ber_choice_t T_character_encoding_choice[] = {
 
 static int
 dissect_x411_T_character_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_character_encoding_choice, hf_index, ett_x411_T_character_encoding,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_character_encoding_choice, hf_index, ett_x411_T_character_encoding,
+                                     NULL);
 
   return offset;
 }
@@ -6435,7 +6435,7 @@ static int dissect_character_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t UniversalOrBMPString_set[] = {
+static const ber_old_sequence_t UniversalOrBMPString_set[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_character_encoding },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_iso_639_language_code },
   { 0, 0, 0, NULL }
@@ -6443,8 +6443,8 @@ static const ber_sequence_t UniversalOrBMPString_set[] = {
 
 int
 dissect_x411_UniversalOrBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UniversalOrBMPString_set, hf_index, ett_x411_UniversalOrBMPString);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UniversalOrBMPString_set, hf_index, ett_x411_UniversalOrBMPString);
 
   return offset;
 }
@@ -6497,7 +6497,7 @@ dissect_x411_UniversalOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t TeletexPersonalName_set[] = {
+static const ber_old_sequence_t TeletexPersonalName_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_teletex_surname_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teletex_given_name_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teletex_initials_impl },
@@ -6507,14 +6507,14 @@ static const ber_sequence_t TeletexPersonalName_set[] = {
 
 static int
 dissect_x411_TeletexPersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TeletexPersonalName_set, hf_index, ett_x411_TeletexPersonalName);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TeletexPersonalName_set, hf_index, ett_x411_TeletexPersonalName);
 
   return offset;
 }
 
 
-static const ber_sequence_t UniversalPersonalName_set[] = {
+static const ber_old_sequence_t UniversalPersonalName_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_universal_surname_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_universal_given_name_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_universal_initials_impl },
@@ -6524,8 +6524,8 @@ static const ber_sequence_t UniversalPersonalName_set[] = {
 
 static int
 dissect_x411_UniversalPersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UniversalPersonalName_set, hf_index, ett_x411_UniversalPersonalName);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UniversalPersonalName_set, hf_index, ett_x411_UniversalPersonalName);
 
   return offset;
 }
@@ -6545,14 +6545,14 @@ static int dissect_TeletexOrganizationalUnitNames_item(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t TeletexOrganizationalUnitNames_sequence_of[1] = {
+static const ber_old_sequence_t TeletexOrganizationalUnitNames_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_TeletexOrganizationalUnitNames_item },
 };
 
 static int
 dissect_x411_TeletexOrganizationalUnitNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TeletexOrganizationalUnitNames_sequence_of, hf_index, ett_x411_TeletexOrganizationalUnitNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TeletexOrganizationalUnitNames_sequence_of, hf_index, ett_x411_TeletexOrganizationalUnitNames);
 
   return offset;
 }
@@ -6570,14 +6570,14 @@ static int dissect_UniversalOrganizationalUnitNames_item(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t UniversalOrganizationalUnitNames_sequence_of[1] = {
+static const ber_old_sequence_t UniversalOrganizationalUnitNames_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_UniversalOrganizationalUnitNames_item },
 };
 
 static int
 dissect_x411_UniversalOrganizationalUnitNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      UniversalOrganizationalUnitNames_sequence_of, hf_index, ett_x411_UniversalOrganizationalUnitNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          UniversalOrganizationalUnitNames_sequence_of, hf_index, ett_x411_UniversalOrganizationalUnitNames);
 
   return offset;
 }
@@ -6600,7 +6600,7 @@ static const value_string x411_PhysicalDeliveryCountryName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PhysicalDeliveryCountryName_choice[] = {
+static const ber_old_choice_t PhysicalDeliveryCountryName_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_x121_dcc_code },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_iso_3166_alpha2_code },
   { 0, 0, 0, 0, NULL }
@@ -6608,9 +6608,9 @@ static const ber_choice_t PhysicalDeliveryCountryName_choice[] = {
 
 static int
 dissect_x411_PhysicalDeliveryCountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PhysicalDeliveryCountryName_choice, hf_index, ett_x411_PhysicalDeliveryCountryName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PhysicalDeliveryCountryName_choice, hf_index, ett_x411_PhysicalDeliveryCountryName,
+                                     NULL);
 
   return offset;
 }
@@ -6622,7 +6622,7 @@ static const value_string x411_PostalCode_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t PostalCode_choice[] = {
+static const ber_old_choice_t PostalCode_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_numeric_code },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable_code },
   { 0, 0, 0, 0, NULL }
@@ -6630,15 +6630,15 @@ static const ber_choice_t PostalCode_choice[] = {
 
 static int
 dissect_x411_PostalCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 PostalCode_choice, hf_index, ett_x411_PostalCode,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     PostalCode_choice, hf_index, ett_x411_PostalCode,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t PDSParameter_set[] = {
+static const ber_old_sequence_t PDSParameter_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_printable_string },
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_teletex_string },
   { 0, 0, 0, NULL }
@@ -6646,8 +6646,8 @@ static const ber_sequence_t PDSParameter_set[] = {
 
 static int
 dissect_x411_PDSParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              PDSParameter_set, hf_index, ett_x411_PDSParameter);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  PDSParameter_set, hf_index, ett_x411_PDSParameter);
 
   return offset;
 }
@@ -6770,14 +6770,14 @@ dissect_x411_UniversalExtensionPhysicalDeliveryAddressComponents(gboolean implic
 }
 
 
-static const ber_sequence_t T_printable_address_sequence_of[1] = {
+static const ber_old_sequence_t T_printable_address_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printable_address_item },
 };
 
 static int
 dissect_x411_T_printable_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_printable_address_sequence_of, hf_index, ett_x411_T_printable_address);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_printable_address_sequence_of, hf_index, ett_x411_T_printable_address);
 
   return offset;
 }
@@ -6786,7 +6786,7 @@ static int dissect_printable_address(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t UnformattedPostalAddress_set[] = {
+static const ber_old_sequence_t UnformattedPostalAddress_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_printable_address },
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_teletex_string },
   { 0, 0, 0, NULL }
@@ -6794,8 +6794,8 @@ static const ber_sequence_t UnformattedPostalAddress_set[] = {
 
 static int
 dissect_x411_UnformattedPostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              UnformattedPostalAddress_set, hf_index, ett_x411_UnformattedPostalAddress);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  UnformattedPostalAddress_set, hf_index, ett_x411_UnformattedPostalAddress);
 
   return offset;
 }
@@ -6891,7 +6891,7 @@ dissect_x411_UniversalLocalPostalAttributes(gboolean implicit_tag _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t T_e163_4_address_sequence[] = {
+static const ber_old_sequence_t T_e163_4_address_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_number_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sub_address_impl },
   { 0, 0, 0, NULL }
@@ -6899,8 +6899,8 @@ static const ber_sequence_t T_e163_4_address_sequence[] = {
 
 static int
 dissect_x411_T_e163_4_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_e163_4_address_sequence, hf_index, ett_x411_T_e163_4_address);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_e163_4_address_sequence, hf_index, ett_x411_T_e163_4_address);
 
   return offset;
 }
@@ -6915,7 +6915,7 @@ static const value_string x411_ExtendedNetworkAddress_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ExtendedNetworkAddress_choice[] = {
+static const ber_old_choice_t ExtendedNetworkAddress_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_e163_4_address },
   {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_psap_address_impl },
   { 0, 0, 0, 0, NULL }
@@ -6923,9 +6923,9 @@ static const ber_choice_t ExtendedNetworkAddress_choice[] = {
 
 static int
 dissect_x411_ExtendedNetworkAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ExtendedNetworkAddress_choice, hf_index, ett_x411_ExtendedNetworkAddress,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ExtendedNetworkAddress_choice, hf_index, ett_x411_ExtendedNetworkAddress,
+                                     NULL);
 
   return offset;
 }
@@ -6951,7 +6951,7 @@ dissect_x411_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
+static const ber_old_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_teletex_value },
   { 0, 0, 0, NULL }
@@ -6959,8 +6959,8 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
 
 static int
 dissect_x411_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TeletexDomainDefinedAttribute_sequence, hf_index, ett_x411_TeletexDomainDefinedAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TeletexDomainDefinedAttribute_sequence, hf_index, ett_x411_TeletexDomainDefinedAttribute);
 
   return offset;
 }
@@ -6969,20 +6969,20 @@ static int dissect_TeletexDomainDefinedAttributes_item(proto_tree *tree _U_, tvb
 }
 
 
-static const ber_sequence_t TeletexDomainDefinedAttributes_sequence_of[1] = {
+static const ber_old_sequence_t TeletexDomainDefinedAttributes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TeletexDomainDefinedAttributes_item },
 };
 
 static int
 dissect_x411_TeletexDomainDefinedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TeletexDomainDefinedAttributes_sequence_of, hf_index, ett_x411_TeletexDomainDefinedAttributes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TeletexDomainDefinedAttributes_sequence_of, hf_index, ett_x411_TeletexDomainDefinedAttributes);
 
   return offset;
 }
 
 
-static const ber_sequence_t UniversalDomainDefinedAttribute_sequence[] = {
+static const ber_old_sequence_t UniversalDomainDefinedAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_universal_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_universal_value },
   { 0, 0, 0, NULL }
@@ -6990,8 +6990,8 @@ static const ber_sequence_t UniversalDomainDefinedAttribute_sequence[] = {
 
 static int
 dissect_x411_UniversalDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   UniversalDomainDefinedAttribute_sequence, hf_index, ett_x411_UniversalDomainDefinedAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       UniversalDomainDefinedAttribute_sequence, hf_index, ett_x411_UniversalDomainDefinedAttribute);
 
   return offset;
 }
@@ -7000,20 +7000,20 @@ static int dissect_UniversalDomainDefinedAttributes_item(proto_tree *tree _U_, t
 }
 
 
-static const ber_sequence_t UniversalDomainDefinedAttributes_sequence_of[1] = {
+static const ber_old_sequence_t UniversalDomainDefinedAttributes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UniversalDomainDefinedAttributes_item },
 };
 
 static int
 dissect_x411_UniversalDomainDefinedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      UniversalDomainDefinedAttributes_sequence_of, hf_index, ett_x411_UniversalDomainDefinedAttributes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          UniversalDomainDefinedAttributes_sequence_of, hf_index, ett_x411_UniversalDomainDefinedAttributes);
 
   return offset;
 }
 
 
-static const ber_sequence_t NonBasicParameters_set[] = {
+static const ber_old_sequence_t NonBasicParameters_set[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_g3_facsimile_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teletex_impl },
   { 0, 0, 0, NULL }
@@ -7021,14 +7021,14 @@ static const ber_sequence_t NonBasicParameters_set[] = {
 
 static int
 dissect_x411_NonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              NonBasicParameters_set, hf_index, ett_x411_NonBasicParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  NonBasicParameters_set, hf_index, ett_x411_NonBasicParameters);
 
   return offset;
 }
 
 
-static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = {
+static const ber_old_sequence_t MTANameAndOptionalGDI_sequence[] = {
   { BER_CLASS_APP, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_global_domain_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mta_name },
   { 0, 0, 0, NULL }
@@ -7040,8 +7040,8 @@ dissect_x411_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 	doing_address = TRUE;
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MTANameAndOptionalGDI_sequence, hf_index, ett_x411_MTANameAndOptionalGDI);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MTANameAndOptionalGDI_sequence, hf_index, ett_x411_MTANameAndOptionalGDI);
 
 
 	doing_address = FALSE;
@@ -7062,7 +7062,7 @@ static const value_string x411_T_name_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_name_choice[] = {
+static const ber_old_choice_t T_name_choice[] = {
   {   0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_token_recipient_name },
   {   1, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_token_mta_impl },
   { 0, 0, 0, 0, NULL }
@@ -7070,9 +7070,9 @@ static const ber_choice_t T_name_choice[] = {
 
 static int
 dissect_x411_T_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_name_choice, hf_index, ett_x411_T_name,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_name_choice, hf_index, ett_x411_T_name,
+                                     NULL);
 
   return offset;
 }
@@ -7097,7 +7097,7 @@ static int dissect_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t TokenData_sequence[] = {
+static const ber_old_sequence_t TokenData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_token_data_type_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
   { 0, 0, 0, NULL }
@@ -7105,8 +7105,8 @@ static const ber_sequence_t TokenData_sequence[] = {
 
 static int
 dissect_x411_TokenData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TokenData_sequence, hf_index, ett_x411_TokenData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TokenData_sequence, hf_index, ett_x411_TokenData);
 
   return offset;
 }
@@ -7115,7 +7115,7 @@ static int dissect_signed_data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AsymmetricTokenData_sequence[] = {
+static const ber_old_sequence_t AsymmetricTokenData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature_algorithm_identifier },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_name },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_time },
@@ -7127,8 +7127,8 @@ static const ber_sequence_t AsymmetricTokenData_sequence[] = {
 
 static int
 dissect_x411_AsymmetricTokenData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AsymmetricTokenData_sequence, hf_index, ett_x411_AsymmetricTokenData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AsymmetricTokenData_sequence, hf_index, ett_x411_AsymmetricTokenData);
 
   return offset;
 }
@@ -7137,7 +7137,7 @@ static int dissect_asymmetric_token_data(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t AsymmetricToken_sequence[] = {
+static const ber_old_sequence_t AsymmetricToken_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_asymmetric_token_data },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -7146,8 +7146,8 @@ static const ber_sequence_t AsymmetricToken_sequence[] = {
 
 static int
 dissect_x411_AsymmetricToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AsymmetricToken_sequence, hf_index, ett_x411_AsymmetricToken);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AsymmetricToken_sequence, hf_index, ett_x411_AsymmetricToken);
 
   return offset;
 }
@@ -7173,7 +7173,7 @@ dissect_x411_BindTokenSignedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t MessageTokenSignedData_sequence[] = {
+static const ber_old_sequence_t MessageTokenSignedData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_content_confidentiality_algorithm_identifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_content_integrity_check_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_message_security_label_impl },
@@ -7184,8 +7184,8 @@ static const ber_sequence_t MessageTokenSignedData_sequence[] = {
 
 static int
 dissect_x411_MessageTokenSignedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageTokenSignedData_sequence, hf_index, ett_x411_MessageTokenSignedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageTokenSignedData_sequence, hf_index, ett_x411_MessageTokenSignedData);
 
   return offset;
 }
@@ -7208,7 +7208,7 @@ static int dissect_content_integrity_key_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t MessageTokenEncryptedData_sequence[] = {
+static const ber_old_sequence_t MessageTokenEncryptedData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_content_confidentiality_key_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_content_integrity_check_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_message_security_label_impl },
@@ -7219,8 +7219,8 @@ static const ber_sequence_t MessageTokenEncryptedData_sequence[] = {
 
 static int
 dissect_x411_MessageTokenEncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageTokenEncryptedData_sequence, hf_index, ett_x411_MessageTokenEncryptedData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageTokenEncryptedData_sequence, hf_index, ett_x411_MessageTokenEncryptedData);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 57db696815..71b4664025 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -487,7 +487,7 @@ static int dissect_user_relative_identifier(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t IPMIdentifier_set[] = {
+static const ber_old_sequence_t IPMIdentifier_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_user },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_user_relative_identifier },
   { 0, 0, 0, NULL }
@@ -495,8 +495,8 @@ static const ber_sequence_t IPMIdentifier_set[] = {
 
 static int
 dissect_x420_IPMIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              IPMIdentifier_set, hf_index, ett_x420_IPMIdentifier);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  IPMIdentifier_set, hf_index, ett_x420_IPMIdentifier);
 
   return offset;
 }
@@ -542,7 +542,7 @@ static int dissect_telephone_number_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ORDescriptor_set[] = {
+static const ber_old_sequence_t ORDescriptor_set[] = {
   { BER_CLASS_APP, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_formal_name },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_free_form_name_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_telephone_number_impl },
@@ -551,8 +551,8 @@ static const ber_sequence_t ORDescriptor_set[] = {
 
 int
 dissect_x420_ORDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ORDescriptor_set, hf_index, ett_x420_ORDescriptor);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ORDescriptor_set, hf_index, ett_x420_ORDescriptor);
 
   return offset;
 }
@@ -591,14 +591,14 @@ static int dissect_AuthorizingUsersField_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t AuthorizingUsersField_sequence_of[1] = {
+static const ber_old_sequence_t AuthorizingUsersField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_AuthorizingUsersField_item },
 };
 
 static int
 dissect_x420_AuthorizingUsersField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AuthorizingUsersField_sequence_of, hf_index, ett_x420_AuthorizingUsersField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AuthorizingUsersField_sequence_of, hf_index, ett_x420_AuthorizingUsersField);
 
   return offset;
 }
@@ -681,7 +681,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t IPMSExtension_sequence[] = {
+static const ber_old_sequence_t IPMSExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
   { 0, 0, 0, NULL }
@@ -689,8 +689,8 @@ static const ber_sequence_t IPMSExtension_sequence[] = {
 
 static int
 dissect_x420_IPMSExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IPMSExtension_sequence, hf_index, ett_x420_IPMSExtension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IPMSExtension_sequence, hf_index, ett_x420_IPMSExtension);
 
   return offset;
 }
@@ -714,14 +714,14 @@ static int dissect_OtherNotificationTypeFields_item(proto_tree *tree _U_, tvbuff
 }
 
 
-static const ber_sequence_t RecipientExtensionsField_set_of[1] = {
+static const ber_old_sequence_t RecipientExtensionsField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientExtensionsField_item },
 };
 
 static int
 dissect_x420_RecipientExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RecipientExtensionsField_set_of, hf_index, ett_x420_RecipientExtensionsField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RecipientExtensionsField_set_of, hf_index, ett_x420_RecipientExtensionsField);
 
   return offset;
 }
@@ -730,7 +730,7 @@ static int dissect_recipient_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t RecipientSpecifier_set[] = {
+static const ber_old_sequence_t RecipientSpecifier_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_recipient_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notification_requests_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reply_requested_impl },
@@ -740,8 +740,8 @@ static const ber_sequence_t RecipientSpecifier_set[] = {
 
 static int
 dissect_x420_RecipientSpecifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RecipientSpecifier_set, hf_index, ett_x420_RecipientSpecifier);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  RecipientSpecifier_set, hf_index, ett_x420_RecipientSpecifier);
 
   return offset;
 }
@@ -762,14 +762,14 @@ static int dissect_PrimaryRecipientsField_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t PrimaryRecipientsField_sequence_of[1] = {
+static const ber_old_sequence_t PrimaryRecipientsField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_PrimaryRecipientsField_item },
 };
 
 static int
 dissect_x420_PrimaryRecipientsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PrimaryRecipientsField_sequence_of, hf_index, ett_x420_PrimaryRecipientsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PrimaryRecipientsField_sequence_of, hf_index, ett_x420_PrimaryRecipientsField);
 
   return offset;
 }
@@ -790,14 +790,14 @@ static int dissect_CopyRecipientsField_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CopyRecipientsField_sequence_of[1] = {
+static const ber_old_sequence_t CopyRecipientsField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_CopyRecipientsField_item },
 };
 
 static int
 dissect_x420_CopyRecipientsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CopyRecipientsField_sequence_of, hf_index, ett_x420_CopyRecipientsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CopyRecipientsField_sequence_of, hf_index, ett_x420_CopyRecipientsField);
 
   return offset;
 }
@@ -818,14 +818,14 @@ static int dissect_BlindCopyRecipientsField_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t BlindCopyRecipientsField_sequence_of[1] = {
+static const ber_old_sequence_t BlindCopyRecipientsField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_BlindCopyRecipientsField_item },
 };
 
 static int
 dissect_x420_BlindCopyRecipientsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BlindCopyRecipientsField_sequence_of, hf_index, ett_x420_BlindCopyRecipientsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BlindCopyRecipientsField_sequence_of, hf_index, ett_x420_BlindCopyRecipientsField);
 
   return offset;
 }
@@ -858,14 +858,14 @@ static int dissect_ObsoletedIPMsField_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ObsoletedIPMsField_sequence_of[1] = {
+static const ber_old_sequence_t ObsoletedIPMsField_sequence_of[1] = {
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_ObsoletedIPMsField_item },
 };
 
 static int
 dissect_x420_ObsoletedIPMsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ObsoletedIPMsField_sequence_of, hf_index, ett_x420_ObsoletedIPMsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ObsoletedIPMsField_sequence_of, hf_index, ett_x420_ObsoletedIPMsField);
 
   return offset;
 }
@@ -886,14 +886,14 @@ static int dissect_RelatedIPMsField_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t RelatedIPMsField_sequence_of[1] = {
+static const ber_old_sequence_t RelatedIPMsField_sequence_of[1] = {
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_RelatedIPMsField_item },
 };
 
 static int
 dissect_x420_RelatedIPMsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RelatedIPMsField_sequence_of, hf_index, ett_x420_RelatedIPMsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RelatedIPMsField_sequence_of, hf_index, ett_x420_RelatedIPMsField);
 
   return offset;
 }
@@ -961,14 +961,14 @@ static int dissect_ReplyRecipientsField_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t ReplyRecipientsField_sequence_of[1] = {
+static const ber_old_sequence_t ReplyRecipientsField_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ReplyRecipientsField_item },
 };
 
 static int
 dissect_x420_ReplyRecipientsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ReplyRecipientsField_sequence_of, hf_index, ett_x420_ReplyRecipientsField);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ReplyRecipientsField_sequence_of, hf_index, ett_x420_ReplyRecipientsField);
 
   return offset;
 }
@@ -1029,14 +1029,14 @@ static int dissect_auto_forwarded_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ExtensionsField_set_of[1] = {
+static const ber_old_sequence_t ExtensionsField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ExtensionsField_item },
 };
 
 int
 dissect_x420_ExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 ExtensionsField_set_of, hf_index, ett_x420_ExtensionsField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     ExtensionsField_set_of, hf_index, ett_x420_ExtensionsField);
 
   return offset;
 }
@@ -1045,7 +1045,7 @@ static int dissect_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Heading_set[] = {
+static const ber_old_sequence_t Heading_set[] = {
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_this_IPM },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originator_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorizing_users_impl },
@@ -1068,8 +1068,8 @@ static const ber_sequence_t Heading_set[] = {
 
 static int
 dissect_x420_Heading(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Heading_set, hf_index, ett_x420_Heading);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Heading_set, hf_index, ett_x420_Heading);
 
   return offset;
 }
@@ -1097,15 +1097,15 @@ static int dissect_repertoire_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t IA5TextParameters_set[] = {
+static const ber_old_sequence_t IA5TextParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_repertoire_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_x420_IA5TextParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              IA5TextParameters_set, hf_index, ett_x420_IA5TextParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  IA5TextParameters_set, hf_index, ett_x420_IA5TextParameters);
 
   return offset;
 }
@@ -1128,7 +1128,7 @@ static int dissect_ia5text_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t IA5TextBodyPart_sequence[] = {
+static const ber_old_sequence_t IA5TextBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ia5text_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_ia5text_data },
   { 0, 0, 0, NULL }
@@ -1136,8 +1136,8 @@ static const ber_sequence_t IA5TextBodyPart_sequence[] = {
 
 static int
 dissect_x420_IA5TextBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IA5TextBodyPart_sequence, hf_index, ett_x420_IA5TextBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IA5TextBodyPart_sequence, hf_index, ett_x420_IA5TextBodyPart);
 
   return offset;
 }
@@ -1165,7 +1165,7 @@ static int dissect_voice_message_duration_impl(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t G3FacsimileParameters_set[] = {
+static const ber_old_sequence_t G3FacsimileParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_number_of_pages_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_g3facsimile_non_basic_parameters_impl },
   { 0, 0, 0, NULL }
@@ -1173,8 +1173,8 @@ static const ber_sequence_t G3FacsimileParameters_set[] = {
 
 static int
 dissect_x420_G3FacsimileParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              G3FacsimileParameters_set, hf_index, ett_x420_G3FacsimileParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  G3FacsimileParameters_set, hf_index, ett_x420_G3FacsimileParameters);
 
   return offset;
 }
@@ -1200,14 +1200,14 @@ static int dissect_encrypted(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t G3FacsimileData_sequence_of[1] = {
+static const ber_old_sequence_t G3FacsimileData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_G3FacsimileData_item },
 };
 
 static int
 dissect_x420_G3FacsimileData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      G3FacsimileData_sequence_of, hf_index, ett_x420_G3FacsimileData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          G3FacsimileData_sequence_of, hf_index, ett_x420_G3FacsimileData);
 
   return offset;
 }
@@ -1216,7 +1216,7 @@ static int dissect_g3facsimile_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t G3FacsimileBodyPart_sequence[] = {
+static const ber_old_sequence_t G3FacsimileBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_g3facsimile_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_g3facsimile_data },
   { 0, 0, 0, NULL }
@@ -1224,8 +1224,8 @@ static const ber_sequence_t G3FacsimileBodyPart_sequence[] = {
 
 static int
 dissect_x420_G3FacsimileBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   G3FacsimileBodyPart_sequence, hf_index, ett_x420_G3FacsimileBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       G3FacsimileBodyPart_sequence, hf_index, ett_x420_G3FacsimileBodyPart);
 
   return offset;
 }
@@ -1252,14 +1252,14 @@ static int dissect_MixedModeData_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t G4Class1Data_sequence_of[1] = {
+static const ber_old_sequence_t G4Class1Data_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_G4Class1Data_item },
 };
 
 static int
 dissect_x420_G4Class1Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      G4Class1Data_sequence_of, hf_index, ett_x420_G4Class1Data);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          G4Class1Data_sequence_of, hf_index, ett_x420_G4Class1Data);
 
   return offset;
 }
@@ -1277,7 +1277,7 @@ static int dissect_g4_class1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t TeletexParameters_set[] = {
+static const ber_old_sequence_t TeletexParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_number_of_pages_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_telex_compatible_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teletex_non_basic_parameters_impl },
@@ -1286,8 +1286,8 @@ static const ber_sequence_t TeletexParameters_set[] = {
 
 static int
 dissect_x420_TeletexParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              TeletexParameters_set, hf_index, ett_x420_TeletexParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  TeletexParameters_set, hf_index, ett_x420_TeletexParameters);
 
   return offset;
 }
@@ -1310,14 +1310,14 @@ static int dissect_TeletexData_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TeletexData_sequence_of[1] = {
+static const ber_old_sequence_t TeletexData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_TeletexData_item },
 };
 
 static int
 dissect_x420_TeletexData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      TeletexData_sequence_of, hf_index, ett_x420_TeletexData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          TeletexData_sequence_of, hf_index, ett_x420_TeletexData);
 
   return offset;
 }
@@ -1326,7 +1326,7 @@ static int dissect_teletex_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t TeletexBodyPart_sequence[] = {
+static const ber_old_sequence_t TeletexBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_teletex_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_teletex_data },
   { 0, 0, 0, NULL }
@@ -1334,8 +1334,8 @@ static const ber_sequence_t TeletexBodyPart_sequence[] = {
 
 static int
 dissect_x420_TeletexBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TeletexBodyPart_sequence, hf_index, ett_x420_TeletexBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TeletexBodyPart_sequence, hf_index, ett_x420_TeletexBodyPart);
 
   return offset;
 }
@@ -1365,15 +1365,15 @@ static int dissect_syntax_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t VideotexParameters_set[] = {
+static const ber_old_sequence_t VideotexParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_syntax_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_x420_VideotexParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              VideotexParameters_set, hf_index, ett_x420_VideotexParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  VideotexParameters_set, hf_index, ett_x420_VideotexParameters);
 
   return offset;
 }
@@ -1396,7 +1396,7 @@ static int dissect_videotex_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t VideotexBodyPart_sequence[] = {
+static const ber_old_sequence_t VideotexBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_videotex_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_VideotexString, BER_FLAGS_NOOWNTAG, dissect_videotex_data },
   { 0, 0, 0, NULL }
@@ -1404,8 +1404,8 @@ static const ber_sequence_t VideotexBodyPart_sequence[] = {
 
 static int
 dissect_x420_VideotexBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VideotexBodyPart_sequence, hf_index, ett_x420_VideotexBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VideotexBodyPart_sequence, hf_index, ett_x420_VideotexBodyPart);
 
   return offset;
 }
@@ -1414,7 +1414,7 @@ static int dissect_videotex_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t EncryptedParameters_set[] = {
+static const ber_old_sequence_t EncryptedParameters_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_originator_certificates },
   { 0, 0, 0, NULL }
@@ -1422,8 +1422,8 @@ static const ber_sequence_t EncryptedParameters_set[] = {
 
 static int
 dissect_x420_EncryptedParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              EncryptedParameters_set, hf_index, ett_x420_EncryptedParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  EncryptedParameters_set, hf_index, ett_x420_EncryptedParameters);
 
   return offset;
 }
@@ -1446,7 +1446,7 @@ static int dissect_encrypted_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t EncryptedBodyPart_sequence[] = {
+static const ber_old_sequence_t EncryptedBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_encrypted_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted_data },
   { 0, 0, 0, NULL }
@@ -1454,8 +1454,8 @@ static const ber_sequence_t EncryptedBodyPart_sequence[] = {
 
 static int
 dissect_x420_EncryptedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EncryptedBodyPart_sequence, hf_index, ett_x420_EncryptedBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EncryptedBodyPart_sequence, hf_index, ett_x420_EncryptedBodyPart);
 
   return offset;
 }
@@ -1464,7 +1464,7 @@ static int dissect_encrypted_bp_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t MessageParameters_set[] = {
+static const ber_old_sequence_t MessageParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delivery_time_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delivery_envelope_impl },
   { 0, 0, 0, NULL }
@@ -1472,8 +1472,8 @@ static const ber_sequence_t MessageParameters_set[] = {
 
 int
 dissect_x420_MessageParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              MessageParameters_set, hf_index, ett_x420_MessageParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  MessageParameters_set, hf_index, ett_x420_MessageParameters);
 
   return offset;
 }
@@ -1494,7 +1494,7 @@ static int dissect_message_data(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t MessageBodyPart_sequence[] = {
+static const ber_old_sequence_t MessageBodyPart_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_message_parameters },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_message_data },
   { 0, 0, 0, NULL }
@@ -1502,8 +1502,8 @@ static const ber_sequence_t MessageBodyPart_sequence[] = {
 
 static int
 dissect_x420_MessageBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MessageBodyPart_sequence, hf_index, ett_x420_MessageBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MessageBodyPart_sequence, hf_index, ett_x420_MessageBodyPart);
 
   return offset;
 }
@@ -1512,14 +1512,14 @@ static int dissect_message_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t MixedModeData_sequence_of[1] = {
+static const ber_old_sequence_t MixedModeData_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_MixedModeData_item },
 };
 
 static int
 dissect_x420_MixedModeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      MixedModeData_sequence_of, hf_index, ett_x420_MixedModeData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          MixedModeData_sequence_of, hf_index, ett_x420_MixedModeData);
 
   return offset;
 }
@@ -1566,7 +1566,7 @@ static int dissect_nationally_defined_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t ExtendedBodyPart_sequence[] = {
+static const ber_old_sequence_t ExtendedBodyPart_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extended_parameters_impl },
   { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_extended_data },
   { 0, 0, 0, NULL }
@@ -1574,8 +1574,8 @@ static const ber_sequence_t ExtendedBodyPart_sequence[] = {
 
 static int
 dissect_x420_ExtendedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ExtendedBodyPart_sequence, hf_index, ett_x420_ExtendedBodyPart);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ExtendedBodyPart_sequence, hf_index, ett_x420_ExtendedBodyPart);
 
   return offset;
 }
@@ -1599,7 +1599,7 @@ static const value_string x420_BodyPart_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BodyPart_choice[] = {
+static const ber_old_choice_t BodyPart_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ia5_text_impl },
   {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_g3_facsimile_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_g4_class1_impl },
@@ -1616,9 +1616,9 @@ static const ber_choice_t BodyPart_choice[] = {
 
 static int
 dissect_x420_BodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BodyPart_choice, hf_index, ett_x420_BodyPart,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BodyPart_choice, hf_index, ett_x420_BodyPart,
+                                     NULL);
 
   return offset;
 }
@@ -1630,14 +1630,14 @@ static int dissect_advice(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t Body_sequence_of[1] = {
+static const ber_old_sequence_t Body_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Body_item },
 };
 
 static int
 dissect_x420_Body(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Body_sequence_of, hf_index, ett_x420_Body);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Body_sequence_of, hf_index, ett_x420_Body);
 
   return offset;
 }
@@ -1646,7 +1646,7 @@ static int dissect_body(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t IPM_sequence[] = {
+static const ber_old_sequence_t IPM_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_heading },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_body },
   { 0, 0, 0, NULL }
@@ -1659,8 +1659,8 @@ dissect_x420_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
  if((hf_index == hf_x420_ipm) && check_col(actx->pinfo->cinfo, COL_INFO))
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Message");
 
-    offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IPM_sequence, hf_index, ett_x420_IPM);
+    offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IPM_sequence, hf_index, ett_x420_IPM);
 
 
 
@@ -1718,14 +1718,14 @@ static int dissect_conversion_eits(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t NotificationExtensionsField_set_of[1] = {
+static const ber_old_sequence_t NotificationExtensionsField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_NotificationExtensionsField_item },
 };
 
 static int
 dissect_x420_NotificationExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 NotificationExtensionsField_set_of, hf_index, ett_x420_NotificationExtensionsField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     NotificationExtensionsField_set_of, hf_index, ett_x420_NotificationExtensionsField);
 
   return offset;
 }
@@ -1809,14 +1809,14 @@ static int dissect_returned_ipm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t NRNExtensionsField_set_of[1] = {
+static const ber_old_sequence_t NRNExtensionsField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_NRNExtensionsField_item },
 };
 
 static int
 dissect_x420_NRNExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 NRNExtensionsField_set_of, hf_index, ett_x420_NRNExtensionsField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     NRNExtensionsField_set_of, hf_index, ett_x420_NRNExtensionsField);
 
   return offset;
 }
@@ -1825,7 +1825,7 @@ static int dissect_nrn_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t NonReceiptFields_set[] = {
+static const ber_old_sequence_t NonReceiptFields_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_receipt_reason_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_discard_reason_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auto_forward_comment_impl },
@@ -1836,8 +1836,8 @@ static const ber_sequence_t NonReceiptFields_set[] = {
 
 static int
 dissect_x420_NonReceiptFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              NonReceiptFields_set, hf_index, ett_x420_NonReceiptFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  NonReceiptFields_set, hf_index, ett_x420_NonReceiptFields);
 
   return offset;
 }
@@ -1889,14 +1889,14 @@ static int dissect_suppl_receipt_info_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t RNExtensionsField_set_of[1] = {
+static const ber_old_sequence_t RNExtensionsField_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RNExtensionsField_item },
 };
 
 static int
 dissect_x420_RNExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RNExtensionsField_set_of, hf_index, ett_x420_RNExtensionsField);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RNExtensionsField_set_of, hf_index, ett_x420_RNExtensionsField);
 
   return offset;
 }
@@ -1905,7 +1905,7 @@ static int dissect_rn_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t ReceiptFields_set[] = {
+static const ber_old_sequence_t ReceiptFields_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_receipt_time_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acknowledgment_mode_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_suppl_receipt_info_impl },
@@ -1915,8 +1915,8 @@ static const ber_sequence_t ReceiptFields_set[] = {
 
 static int
 dissect_x420_ReceiptFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ReceiptFields_set, hf_index, ett_x420_ReceiptFields);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ReceiptFields_set, hf_index, ett_x420_ReceiptFields);
 
   return offset;
 }
@@ -1925,14 +1925,14 @@ static int dissect_receipt_fields_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t OtherNotificationTypeFields_set_of[1] = {
+static const ber_old_sequence_t OtherNotificationTypeFields_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_OtherNotificationTypeFields_item },
 };
 
 static int
 dissect_x420_OtherNotificationTypeFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 OtherNotificationTypeFields_set_of, hf_index, ett_x420_OtherNotificationTypeFields);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     OtherNotificationTypeFields_set_of, hf_index, ett_x420_OtherNotificationTypeFields);
 
   return offset;
 }
@@ -1948,7 +1948,7 @@ static const value_string x420_T_choice_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_choice_choice[] = {
+static const ber_old_choice_t T_choice_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_receipt_fields_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receipt_fields_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_other_notification_type_fields_impl },
@@ -1957,9 +1957,9 @@ static const ber_choice_t T_choice_choice[] = {
 
 static int
 dissect_x420_T_choice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_choice_choice, hf_index, ett_x420_T_choice,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_choice_choice, hf_index, ett_x420_T_choice,
+                                     NULL);
 
   return offset;
 }
@@ -1968,7 +1968,7 @@ static int dissect_choice_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t IPN_set[] = {
+static const ber_old_sequence_t IPN_set[] = {
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_subject_ipm },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ipn_originator_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ipm_intended_recipient_impl },
@@ -1985,8 +1985,8 @@ dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
  if((hf_index == hf_x420_ipn) && check_col(actx->pinfo->cinfo, COL_INFO))
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Notification");
 
-    offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              IPN_set, hf_index, ett_x420_IPN);
+    offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  IPN_set, hf_index, ett_x420_IPN);
 
 
 
@@ -2004,7 +2004,7 @@ const value_string x420_InformationObject_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InformationObject_choice[] = {
+static const ber_old_choice_t InformationObject_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipm_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ipn_impl },
   { 0, 0, 0, 0, NULL }
@@ -2012,15 +2012,15 @@ static const ber_choice_t InformationObject_choice[] = {
 
 int
 dissect_x420_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InformationObject_choice, hf_index, ett_x420_InformationObject,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InformationObject_choice, hf_index, ett_x420_InformationObject,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t AbsenceAdvice_sequence[] = {
+static const ber_old_sequence_t AbsenceAdvice_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_advice },
   { BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_next_available },
   { 0, 0, 0, NULL }
@@ -2028,14 +2028,14 @@ static const ber_sequence_t AbsenceAdvice_sequence[] = {
 
 static int
 dissect_x420_AbsenceAdvice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AbsenceAdvice_sequence, hf_index, ett_x420_AbsenceAdvice);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AbsenceAdvice_sequence, hf_index, ett_x420_AbsenceAdvice);
 
   return offset;
 }
 
 
-static const ber_sequence_t ChangeOfAddressAdvice_sequence[] = {
+static const ber_old_sequence_t ChangeOfAddressAdvice_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_new_address_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_effective_from_impl },
   { 0, 0, 0, NULL }
@@ -2043,8 +2043,8 @@ static const ber_sequence_t ChangeOfAddressAdvice_sequence[] = {
 
 static int
 dissect_x420_ChangeOfAddressAdvice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChangeOfAddressAdvice_sequence, hf_index, ett_x420_ChangeOfAddressAdvice);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChangeOfAddressAdvice_sequence, hf_index, ett_x420_ChangeOfAddressAdvice);
 
   return offset;
 }
@@ -2082,7 +2082,7 @@ static int dissect_body_part_number(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_stored_body_part_sequence[] = {
+static const ber_old_sequence_t T_stored_body_part_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_entry },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_body_part_number },
   { 0, 0, 0, NULL }
@@ -2090,8 +2090,8 @@ static const ber_sequence_t T_stored_body_part_sequence[] = {
 
 static int
 dissect_x420_T_stored_body_part(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_stored_body_part_sequence, hf_index, ett_x420_T_stored_body_part);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_stored_body_part_sequence, hf_index, ett_x420_T_stored_body_part);
 
   return offset;
 }
@@ -2108,7 +2108,7 @@ static const value_string x420_BodyPartReference_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BodyPartReference_choice[] = {
+static const ber_old_choice_t BodyPartReference_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_stored_entry_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_stored_content_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_submitted_body_part_impl },
@@ -2118,9 +2118,9 @@ static const ber_choice_t BodyPartReference_choice[] = {
 
 static int
 dissect_x420_BodyPartReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BodyPartReference_choice, hf_index, ett_x420_BodyPartReference,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BodyPartReference_choice, hf_index, ett_x420_BodyPartReference,
+                                     NULL);
 
   return offset;
 }
@@ -2129,14 +2129,14 @@ static int dissect_BodyPartReferences_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t BodyPartReferences_sequence_of[1] = {
+static const ber_old_sequence_t BodyPartReferences_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_BodyPartReferences_item },
 };
 
 static int
 dissect_x420_BodyPartReferences(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      BodyPartReferences_sequence_of, hf_index, ett_x420_BodyPartReferences);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          BodyPartReferences_sequence_of, hf_index, ett_x420_BodyPartReferences);
 
   return offset;
 }
@@ -2145,15 +2145,15 @@ static int dissect_assembly_instructions_impl(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t IPMAssemblyInstructions_set[] = {
+static const ber_old_sequence_t IPMAssemblyInstructions_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assembly_instructions_impl },
   { 0, 0, 0, NULL }
 };
 
 static int
 dissect_x420_IPMAssemblyInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              IPMAssemblyInstructions_set, hf_index, ett_x420_IPMAssemblyInstructions);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  IPMAssemblyInstructions_set, hf_index, ett_x420_IPMAssemblyInstructions);
 
   return offset;
 }
@@ -2193,14 +2193,14 @@ static int dissect_Languages_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Languages_set_of[1] = {
+static const ber_old_sequence_t Languages_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_Languages_item },
 };
 
 static int
 dissect_x420_Languages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 Languages_set_of, hf_index, ett_x420_Languages);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     Languages_set_of, hf_index, ett_x420_Languages);
 
   return offset;
 }
@@ -2223,7 +2223,7 @@ dissect_x420_AutoSubmitted(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t Signature_sequence[] = {
+static const ber_old_sequence_t Signature_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
   { 0, 0, 0, NULL }
@@ -2231,8 +2231,8 @@ static const ber_sequence_t Signature_sequence[] = {
 
 static int
 dissect_x420_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Signature_sequence, hf_index, ett_x420_Signature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Signature_sequence, hf_index, ett_x420_Signature);
 
   return offset;
 }
@@ -2250,7 +2250,7 @@ static int dissect_body_part_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t BodyPartSignatures_item_set[] = {
+static const ber_old_sequence_t BodyPartSignatures_item_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_body_part_number },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_body_part_signature },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originator_certificate_selector_impl },
@@ -2260,8 +2260,8 @@ static const ber_sequence_t BodyPartSignatures_item_set[] = {
 
 static int
 dissect_x420_BodyPartSignatures_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              BodyPartSignatures_item_set, hf_index, ett_x420_BodyPartSignatures_item);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  BodyPartSignatures_item_set, hf_index, ett_x420_BodyPartSignatures_item);
 
   return offset;
 }
@@ -2270,14 +2270,14 @@ static int dissect_BodyPartSignatures_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t BodyPartSignatures_set_of[1] = {
+static const ber_old_sequence_t BodyPartSignatures_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_BodyPartSignatures_item },
 };
 
 static int
 dissect_x420_BodyPartSignatures(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 BodyPartSignatures_set_of, hf_index, ett_x420_BodyPartSignatures);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     BodyPartSignatures_set_of, hf_index, ett_x420_BodyPartSignatures);
 
   return offset;
 }
@@ -2304,7 +2304,7 @@ static const value_string x420_BodyPartSecurityLabel_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t BodyPartSecurityLabel_choice[] = {
+static const ber_old_choice_t BodyPartSecurityLabel_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_body_part_unlabelled_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_body_part_security_label_impl },
   { 0, 0, 0, 0, NULL }
@@ -2312,9 +2312,9 @@ static const ber_choice_t BodyPartSecurityLabel_choice[] = {
 
 static int
 dissect_x420_BodyPartSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 BodyPartSecurityLabel_choice, hf_index, ett_x420_BodyPartSecurityLabel,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     BodyPartSecurityLabel_choice, hf_index, ett_x420_BodyPartSecurityLabel,
+                                     NULL);
 
   return offset;
 }
@@ -2323,14 +2323,14 @@ static int dissect_body_part_security_labels_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_BodyPartSecurityLabel_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body_part_security_labels_item },
 };
 
 static int
 dissect_x420_SEQUENCE_OF_BodyPartSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_BodyPartSecurityLabel_sequence_of, hf_index, ett_x420_SEQUENCE_OF_BodyPartSecurityLabel);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_BodyPartSecurityLabel_sequence_of, hf_index, ett_x420_SEQUENCE_OF_BodyPartSecurityLabel);
 
   return offset;
 }
@@ -2339,7 +2339,7 @@ static int dissect_body_part_security_labels_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t IPMSecurityLabel_sequence[] = {
+static const ber_old_sequence_t IPMSecurityLabel_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_content_security_label_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_heading_security_label_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_body_part_security_labels_impl },
@@ -2348,8 +2348,8 @@ static const ber_sequence_t IPMSecurityLabel_sequence[] = {
 
 static int
 dissect_x420_IPMSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IPMSecurityLabel_sequence, hf_index, ett_x420_IPMSecurityLabel);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IPMSecurityLabel_sequence, hf_index, ett_x420_IPMSecurityLabel);
 
   return offset;
 }
@@ -2391,7 +2391,7 @@ static int dissect_circulation_signature_algorithm_identifier(proto_tree *tree _
 }
 
 
-static const ber_sequence_t CirculationSignatureData_sequence[] = {
+static const ber_old_sequence_t CirculationSignatureData_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_circulation_signature_algorithm_identifier },
   { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_this_IPM },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_timestamp },
@@ -2400,8 +2400,8 @@ static const ber_sequence_t CirculationSignatureData_sequence[] = {
 
 static int
 dissect_x420_CirculationSignatureData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CirculationSignatureData_sequence, hf_index, ett_x420_CirculationSignatureData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CirculationSignatureData_sequence, hf_index, ett_x420_CirculationSignatureData);
 
   return offset;
 }
@@ -2410,7 +2410,7 @@ static int dissect_circulation_signature_data(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t CirculationSignature_sequence[] = {
+static const ber_old_sequence_t CirculationSignature_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_circulation_signature_data },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm_identifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -2419,8 +2419,8 @@ static const ber_sequence_t CirculationSignature_sequence[] = {
 
 static int
 dissect_x420_CirculationSignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CirculationSignature_sequence, hf_index, ett_x420_CirculationSignature);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CirculationSignature_sequence, hf_index, ett_x420_CirculationSignature);
 
   return offset;
 }
@@ -2436,7 +2436,7 @@ static const value_string x420_Checkmark_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Checkmark_choice[] = {
+static const ber_old_choice_t Checkmark_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_simple },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_timestamped },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signed },
@@ -2445,9 +2445,9 @@ static const ber_choice_t Checkmark_choice[] = {
 
 static int
 dissect_x420_Checkmark(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Checkmark_choice, hf_index, ett_x420_Checkmark,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Checkmark_choice, hf_index, ett_x420_Checkmark,
+                                     NULL);
 
   return offset;
 }
@@ -2456,7 +2456,7 @@ static int dissect_checked(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t CirculationMember_set[] = {
+static const ber_old_sequence_t CirculationMember_set[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_circulation_recipient },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_checked },
   { 0, 0, 0, NULL }
@@ -2464,8 +2464,8 @@ static const ber_sequence_t CirculationMember_set[] = {
 
 static int
 dissect_x420_CirculationMember(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              CirculationMember_set, hf_index, ett_x420_CirculationMember);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  CirculationMember_set, hf_index, ett_x420_CirculationMember);
 
   return offset;
 }
@@ -2474,14 +2474,14 @@ static int dissect_CirculationList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CirculationList_sequence_of[1] = {
+static const ber_old_sequence_t CirculationList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_CirculationList_item },
 };
 
 static int
 dissect_x420_CirculationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CirculationList_sequence_of, hf_index, ett_x420_CirculationList);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CirculationList_sequence_of, hf_index, ett_x420_CirculationList);
 
   return offset;
 }
@@ -2526,7 +2526,7 @@ static int dissect_alphanumeric_code(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t DistributionCode_sequence[] = {
+static const ber_old_sequence_t DistributionCode_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_oid_code },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alphanumeric_code },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_or_descriptor_impl },
@@ -2535,8 +2535,8 @@ static const ber_sequence_t DistributionCode_sequence[] = {
 
 static int
 dissect_x420_DistributionCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DistributionCode_sequence, hf_index, ett_x420_DistributionCode);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DistributionCode_sequence, hf_index, ett_x420_DistributionCode);
 
   return offset;
 }
@@ -2545,14 +2545,14 @@ static int dissect_DistributionCodes_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t DistributionCodes_sequence_of[1] = {
+static const ber_old_sequence_t DistributionCodes_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DistributionCodes_item },
 };
 
 static int
 dissect_x420_DistributionCodes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      DistributionCodes_sequence_of, hf_index, ett_x420_DistributionCodes);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          DistributionCodes_sequence_of, hf_index, ett_x420_DistributionCodes);
 
   return offset;
 }
@@ -2579,7 +2579,7 @@ static int dissect_description_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t InformationCategory_sequence[] = {
+static const ber_old_sequence_t InformationCategory_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reference_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_description_impl },
   { 0, 0, 0, NULL }
@@ -2587,8 +2587,8 @@ static const ber_sequence_t InformationCategory_sequence[] = {
 
 static int
 dissect_x420_InformationCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   InformationCategory_sequence, hf_index, ett_x420_InformationCategory);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       InformationCategory_sequence, hf_index, ett_x420_InformationCategory);
 
   return offset;
 }
@@ -2597,14 +2597,14 @@ static int dissect_InformationCategories_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t InformationCategories_sequence_of[1] = {
+static const ber_old_sequence_t InformationCategories_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_InformationCategories_item },
 };
 
 static int
 dissect_x420_InformationCategories(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      InformationCategories_sequence_of, hf_index, ett_x420_InformationCategories);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          InformationCategories_sequence_of, hf_index, ett_x420_InformationCategories);
 
   return offset;
 }
@@ -2622,14 +2622,14 @@ static int dissect_ManualHandlingInstructions_item(proto_tree *tree _U_, tvbuff_
 }
 
 
-static const ber_sequence_t ManualHandlingInstructions_sequence_of[1] = {
+static const ber_old_sequence_t ManualHandlingInstructions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ManualHandlingInstructions_item },
 };
 
 static int
 dissect_x420_ManualHandlingInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ManualHandlingInstructions_sequence_of, hf_index, ett_x420_ManualHandlingInstructions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ManualHandlingInstructions_sequence_of, hf_index, ett_x420_ManualHandlingInstructions);
 
   return offset;
 }
@@ -2685,14 +2685,14 @@ static int dissect_GeneralTextParameters_item(proto_tree *tree _U_, tvbuff_t *tv
 }
 
 
-static const ber_sequence_t GeneralTextParameters_set_of[1] = {
+static const ber_old_sequence_t GeneralTextParameters_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_GeneralTextParameters_item },
 };
 
 static int
 dissect_x420_GeneralTextParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 GeneralTextParameters_set_of, hf_index, ett_x420_GeneralTextParameters);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     GeneralTextParameters_set_of, hf_index, ett_x420_GeneralTextParameters);
 
   return offset;
 }
@@ -2723,7 +2723,7 @@ static int dissect_supplementary_information_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t VoiceParameters_sequence[] = {
+static const ber_old_sequence_t VoiceParameters_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_voice_message_duration_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_voice_encoding_type_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_supplementary_information_impl },
@@ -2732,8 +2732,8 @@ static const ber_sequence_t VoiceParameters_sequence[] = {
 
 static int
 dissect_x420_VoiceParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   VoiceParameters_sequence, hf_index, ett_x420_VoiceParameters);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       VoiceParameters_sequence, hf_index, ett_x420_VoiceParameters);
 
   return offset;
 }
@@ -2749,7 +2749,7 @@ dissect_x420_VoiceData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SubmissionProof_set[] = {
+static const ber_old_sequence_t SubmissionProof_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_proof_of_submission_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originating_MTA_certificate_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_message_submission_envelope },
@@ -2758,8 +2758,8 @@ static const ber_sequence_t SubmissionProof_set[] = {
 
 static int
 dissect_x420_SubmissionProof(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              SubmissionProof_set, hf_index, ett_x420_SubmissionProof);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  SubmissionProof_set, hf_index, ett_x420_SubmissionProof);
 
   return offset;
 }
@@ -2768,7 +2768,7 @@ static int dissect_submission_proof_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t ForwardedContentParameters_set[] = {
+static const ber_old_sequence_t ForwardedContentParameters_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delivery_time_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delivery_envelope_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mts_identifier_impl },
@@ -2778,8 +2778,8 @@ static const ber_sequence_t ForwardedContentParameters_set[] = {
 
 static int
 dissect_x420_ForwardedContentParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              ForwardedContentParameters_set, hf_index, ett_x420_ForwardedContentParameters);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  ForwardedContentParameters_set, hf_index, ett_x420_ForwardedContentParameters);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 43c5ed6162..f8213056a3 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -302,7 +302,7 @@ static int dissect_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
+static const ber_old_sequence_t AlgorithmIdentifier_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_algorithmId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters },
   { 0, 0, 0, NULL }
@@ -310,8 +310,8 @@ static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
 
 int
 dissect_x509af_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
 
   return offset;
 }
@@ -367,7 +367,7 @@ const value_string x509af_Time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Time_choice[] = {
+static const ber_old_choice_t Time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
   { 0, 0, 0, 0, NULL }
@@ -375,9 +375,9 @@ static const ber_choice_t Time_choice[] = {
 
 int
 dissect_x509af_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Time_choice, hf_index, ett_x509af_Time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Time_choice, hf_index, ett_x509af_Time,
+                                     NULL);
 
   return offset;
 }
@@ -398,7 +398,7 @@ static int dissect_revocationDate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t Validity_sequence[] = {
+static const ber_old_sequence_t Validity_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
   { 0, 0, 0, NULL }
@@ -406,8 +406,8 @@ static const ber_sequence_t Validity_sequence[] = {
 
 int
 dissect_x509af_Validity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Validity_sequence, hf_index, ett_x509af_Validity);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Validity_sequence, hf_index, ett_x509af_Validity);
 
   return offset;
 }
@@ -421,7 +421,7 @@ static const value_string x509af_SubjectName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubjectName_choice[] = {
+static const ber_old_choice_t SubjectName_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
   { 0, 0, 0, 0, NULL }
 };
@@ -431,9 +431,9 @@ dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 #line 107 "x509af.cnf"
 
   const char* str;
-    offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubjectName_choice, hf_index, ett_x509af_SubjectName,
-                                 NULL);
+    offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubjectName_choice, hf_index, ett_x509af_SubjectName,
+                                     NULL);
 
 
   str = x509if_get_last_dn();
@@ -468,7 +468,7 @@ static int dissect_subjectPublicKey(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = {
+static const ber_old_sequence_t SubjectPublicKeyInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey },
   { 0, 0, 0, NULL }
@@ -476,8 +476,8 @@ static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = {
 
 int
 dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
 
   return offset;
 }
@@ -544,7 +544,7 @@ static int dissect_extnValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t Extension_sequence[] = {
+static const ber_old_sequence_t Extension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue },
@@ -553,8 +553,8 @@ static const ber_sequence_t Extension_sequence[] = {
 
 int
 dissect_x509af_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Extension_sequence, hf_index, ett_x509af_Extension);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Extension_sequence, hf_index, ett_x509af_Extension);
 
   return offset;
 }
@@ -563,14 +563,14 @@ static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Extensions_sequence_of[1] = {
+static const ber_old_sequence_t Extensions_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
 };
 
 int
 dissect_x509af_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      Extensions_sequence_of, hf_index, ett_x509af_Extensions);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          Extensions_sequence_of, hf_index, ett_x509af_Extensions);
 
   return offset;
 }
@@ -585,7 +585,7 @@ static int dissect_crlExtensions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_signedCertificate_sequence[] = {
+static const ber_old_sequence_t T_signedCertificate_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
@@ -601,8 +601,8 @@ static const ber_sequence_t T_signedCertificate_sequence[] = {
 
 static int
 dissect_x509af_T_signedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
 
   return offset;
 }
@@ -611,7 +611,7 @@ static int dissect_signedCertificate(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Certificate_sequence[] = {
+static const ber_old_sequence_t Certificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -620,8 +620,8 @@ static const ber_sequence_t Certificate_sequence[] = {
 
 int
 dissect_x509af_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Certificate_sequence, hf_index, ett_x509af_Certificate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Certificate_sequence, hf_index, ett_x509af_Certificate);
 
   return offset;
 }
@@ -642,14 +642,14 @@ static int dissect_certificate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t CrossCertificates_set_of[1] = {
+static const ber_old_sequence_t CrossCertificates_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
 };
 
 int
 dissect_x509af_CrossCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates);
 
   return offset;
 }
@@ -658,14 +658,14 @@ static int dissect_ForwardCertificationPath_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = {
+static const ber_old_sequence_t ForwardCertificationPath_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
 };
 
 int
 dissect_x509af_ForwardCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath);
 
   return offset;
 }
@@ -674,7 +674,7 @@ static int dissect_certificationPath(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Certificates_sequence[] = {
+static const ber_old_sequence_t Certificates_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath },
   { 0, 0, 0, NULL }
@@ -682,14 +682,14 @@ static const ber_sequence_t Certificates_sequence[] = {
 
 int
 dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Certificates_sequence, hf_index, ett_x509af_Certificates);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Certificates_sequence, hf_index, ett_x509af_Certificates);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificatePair_sequence[] = {
+static const ber_old_sequence_t CertificatePair_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA },
   { 0, 0, 0, NULL }
@@ -697,8 +697,8 @@ static const ber_sequence_t CertificatePair_sequence[] = {
 
 int
 dissect_x509af_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
 
   return offset;
 }
@@ -707,14 +707,14 @@ static int dissect_theCACertificates_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
 };
 
 static int
 dissect_x509af_SEQUENCE_OF_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair);
 
   return offset;
 }
@@ -723,7 +723,7 @@ static int dissect_theCACertificates(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CertificationPath_sequence[] = {
+static const ber_old_sequence_t CertificationPath_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates },
   { 0, 0, 0, NULL }
@@ -731,14 +731,14 @@ static const ber_sequence_t CertificationPath_sequence[] = {
 
 int
 dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
+static const ber_old_sequence_t T_revokedCertificates_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions },
@@ -747,8 +747,8 @@ static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
 
 static int
 dissect_x509af_T_revokedCertificates_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
 
   return offset;
 }
@@ -757,14 +757,14 @@ static int dissect_revokedCertificates_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t T_revokedCertificates_sequence_of[1] = {
+static const ber_old_sequence_t T_revokedCertificates_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item },
 };
 
 static int
 dissect_x509af_T_revokedCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates);
 
   return offset;
 }
@@ -773,7 +773,7 @@ static int dissect_revokedCertificates(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t T_signedCertificateList_sequence[] = {
+static const ber_old_sequence_t T_signedCertificateList_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
@@ -786,8 +786,8 @@ static const ber_sequence_t T_signedCertificateList_sequence[] = {
 
 static int
 dissect_x509af_T_signedCertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
 
   return offset;
 }
@@ -796,7 +796,7 @@ static int dissect_signedCertificateList(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t CertificateList_sequence[] = {
+static const ber_old_sequence_t CertificateList_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -805,14 +805,14 @@ static const ber_sequence_t CertificateList_sequence[] = {
 
 int
 dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateList_sequence, hf_index, ett_x509af_CertificateList);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateList_sequence, hf_index, ett_x509af_CertificateList);
 
   return offset;
 }
 
 
-static const ber_sequence_t IssuerSerial_sequence[] = {
+static const ber_old_sequence_t IssuerSerial_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID },
@@ -821,8 +821,8 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
 
 int
 dissect_x509af_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
 
   return offset;
 }
@@ -837,7 +837,7 @@ static const value_string x509af_InfoSubject_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t InfoSubject_choice[] = {
+static const ber_old_choice_t InfoSubject_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
   {   1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName },
   { 0, 0, 0, 0, NULL }
@@ -845,9 +845,9 @@ static const ber_choice_t InfoSubject_choice[] = {
 
 static int
 dissect_x509af_InfoSubject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 InfoSubject_choice, hf_index, ett_x509af_InfoSubject,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     InfoSubject_choice, hf_index, ett_x509af_InfoSubject,
+                                     NULL);
 
   return offset;
 }
@@ -856,7 +856,7 @@ static int dissect_info_subject(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t AttCertValidityPeriod_sequence[] = {
+static const ber_old_sequence_t AttCertValidityPeriod_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime },
   { 0, 0, 0, NULL }
@@ -864,8 +864,8 @@ static const ber_sequence_t AttCertValidityPeriod_sequence[] = {
 
 int
 dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
 
   return offset;
 }
@@ -874,14 +874,14 @@ static int dissect_attCertValidityPeriod(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
 };
 
 static int
 dissect_x509af_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute);
 
   return offset;
 }
@@ -890,7 +890,7 @@ static int dissect_attributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
+static const ber_old_sequence_t AttributeCertificateInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
@@ -905,8 +905,8 @@ static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
 
 int
 dissect_x509af_AttributeCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
 
   return offset;
 }
@@ -915,7 +915,7 @@ static int dissect_signedAttributeCertificateInfo(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t AttributeCertificate_sequence[] = {
+static const ber_old_sequence_t AttributeCertificate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@@ -924,8 +924,8 @@ static const ber_sequence_t AttributeCertificate_sequence[] = {
 
 int
 dissect_x509af_AttributeCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
 
   return offset;
 }
@@ -934,7 +934,7 @@ static int dissect_attributeCertificate(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ACPathData_sequence[] = {
+static const ber_old_sequence_t ACPathData_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate },
   { 0, 0, 0, NULL }
@@ -942,8 +942,8 @@ static const ber_sequence_t ACPathData_sequence[] = {
 
 int
 dissect_x509af_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ACPathData_sequence, hf_index, ett_x509af_ACPathData);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ACPathData_sequence, hf_index, ett_x509af_ACPathData);
 
   return offset;
 }
@@ -952,14 +952,14 @@ static int dissect_acPath_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
 };
 
 static int
 dissect_x509af_SEQUENCE_OF_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData);
 
   return offset;
 }
@@ -968,7 +968,7 @@ static int dissect_acPath(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t AttributeCertificationPath_sequence[] = {
+static const ber_old_sequence_t AttributeCertificationPath_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath },
   { 0, 0, 0, NULL }
@@ -976,8 +976,8 @@ static const ber_sequence_t AttributeCertificationPath_sequence[] = {
 
 int
 dissect_x509af_AttributeCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
 
   return offset;
 }
@@ -989,7 +989,7 @@ static const value_string x509af_AssertionSubject_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AssertionSubject_choice[] = {
+static const ber_old_choice_t AssertionSubject_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
   {   1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName },
   { 0, 0, 0, 0, NULL }
@@ -997,9 +997,9 @@ static const ber_choice_t AssertionSubject_choice[] = {
 
 static int
 dissect_x509af_AssertionSubject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject,
+                                     NULL);
 
   return offset;
 }
@@ -1008,14 +1008,14 @@ static int dissect_assertion_subject(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SET_OF_AttributeType_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeType_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
 };
 
 static int
 dissect_x509af_SET_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType);
 
   return offset;
 }
@@ -1024,7 +1024,7 @@ static int dissect_attType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
+static const ber_old_sequence_t AttributeCertificateAssertion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity },
@@ -1034,8 +1034,8 @@ static const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
 
 int
 dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
 
   return offset;
 }
@@ -1060,7 +1060,7 @@ static int dissect_g(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, as
 }
 
 
-static const ber_sequence_t DSS_Params_sequence[] = {
+static const ber_old_sequence_t DSS_Params_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_q },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g },
@@ -1069,8 +1069,8 @@ static const ber_sequence_t DSS_Params_sequence[] = {
 
 static int
 dissect_x509af_DSS_Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DSS_Params_sequence, hf_index, ett_x509af_DSS_Params);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DSS_Params_sequence, hf_index, ett_x509af_DSS_Params);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index e7ffb53ccc..b617815157 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -367,7 +367,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t OtherName_sequence[] = {
+static const ber_old_sequence_t OtherName_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type_id },
   { BER_CLASS_CON, 0, 0, dissect_value },
   { 0, 0, 0, NULL }
@@ -375,8 +375,8 @@ static const ber_sequence_t OtherName_sequence[] = {
 
 static int
 dissect_x509ce_OtherName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   OtherName_sequence, hf_index, ett_x509ce_OtherName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       OtherName_sequence, hf_index, ett_x509ce_OtherName);
 
   return offset;
 }
@@ -410,7 +410,7 @@ static int dissect_uniformResourceIdentifier_impl(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t EDIPartyName_sequence[] = {
+static const ber_old_sequence_t EDIPartyName_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
   { 0, 0, 0, NULL }
@@ -418,8 +418,8 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
 
 int
 dissect_x509ce_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
 
   return offset;
 }
@@ -478,7 +478,7 @@ const value_string x509ce_GeneralName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t GeneralName_choice[] = {
+static const ber_old_choice_t GeneralName_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_otherName_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl },
@@ -493,9 +493,9 @@ static const ber_choice_t GeneralName_choice[] = {
 
 int
 dissect_x509ce_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 GeneralName_choice, hf_index, ett_x509ce_GeneralName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     GeneralName_choice, hf_index, ett_x509ce_GeneralName,
+                                     NULL);
 
   return offset;
 }
@@ -519,14 +519,14 @@ static int dissect_deltaLocation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t GeneralNames_sequence_of[1] = {
+static const ber_old_sequence_t GeneralNames_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
 };
 
 int
 dissect_x509ce_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames);
 
   return offset;
 }
@@ -544,7 +544,7 @@ static int dissect_fullName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = {
+static const ber_old_sequence_t AuthorityKeyIdentifier_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertSerialNumber_impl },
@@ -553,8 +553,8 @@ static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = {
 
 int
 dissect_x509ce_AuthorityKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
 
   return offset;
 }
@@ -613,14 +613,14 @@ static int dissect_KeyPurposeIDs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = {
+static const ber_old_sequence_t KeyPurposeIDs_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item },
 };
 
 int
 dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs);
 
   return offset;
 }
@@ -659,7 +659,7 @@ static int dissect_privateKeyValid_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = {
+static const ber_old_sequence_t PrivateKeyUsagePeriod_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl },
   { 0, 0, 0, NULL }
@@ -667,8 +667,8 @@ static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = {
 
 int
 dissect_x509ce_PrivateKeyUsagePeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
 
   return offset;
 }
@@ -722,7 +722,7 @@ static int dissect_qualifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
+static const ber_old_sequence_t PolicyQualifierInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyQualifierId },
   { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_qualifier },
   { 0, 0, 0, NULL }
@@ -730,8 +730,8 @@ static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
 
 int
 dissect_x509ce_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
 
   return offset;
 }
@@ -740,14 +740,14 @@ static int dissect_policyQualifiers_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
 };
 
 static int
 dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
 
   return offset;
 }
@@ -756,7 +756,7 @@ static int dissect_policyQualifiers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t PolicyInformation_sequence[] = {
+static const ber_old_sequence_t PolicyInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers },
   { 0, 0, 0, NULL }
@@ -764,8 +764,8 @@ static const ber_sequence_t PolicyInformation_sequence[] = {
 
 int
 dissect_x509ce_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
 
   return offset;
 }
@@ -774,20 +774,20 @@ static int dissect_CertificatePoliciesSyntax_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = {
+static const ber_old_sequence_t CertificatePoliciesSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item },
 };
 
 int
 dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax);
 
   return offset;
 }
 
 
-static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = {
+static const ber_old_sequence_t PolicyMappingsSyntax_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy },
   { 0, 0, 0, NULL }
@@ -795,8 +795,8 @@ static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = {
 
 static int
 dissect_x509ce_PolicyMappingsSyntax_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
 
   return offset;
 }
@@ -805,27 +805,27 @@ static int dissect_PolicyMappingsSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = {
+static const ber_old_sequence_t PolicyMappingsSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item },
 };
 
 int
 dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax);
 
   return offset;
 }
 
 
-static const ber_sequence_t AttributesSyntax_sequence_of[1] = {
+static const ber_old_sequence_t AttributesSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item },
 };
 
 int
 dissect_x509ce_AttributesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax);
 
   return offset;
 }
@@ -889,7 +889,7 @@ static int dissect_templateMinorVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t BasicConstraintsSyntax_sequence[] = {
+static const ber_old_sequence_t BasicConstraintsSyntax_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint },
   { 0, 0, 0, NULL }
@@ -897,8 +897,8 @@ static const ber_sequence_t BasicConstraintsSyntax_sequence[] = {
 
 int
 dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
 
   return offset;
 }
@@ -920,7 +920,7 @@ static int dissect_maximum_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t GeneralSubtree_sequence[] = {
+static const ber_old_sequence_t GeneralSubtree_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl },
@@ -929,8 +929,8 @@ static const ber_sequence_t GeneralSubtree_sequence[] = {
 
 int
 dissect_x509ce_GeneralSubtree(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
 
   return offset;
 }
@@ -939,14 +939,14 @@ static int dissect_GeneralSubtrees_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t GeneralSubtrees_sequence_of[1] = {
+static const ber_old_sequence_t GeneralSubtrees_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item },
 };
 
 int
 dissect_x509ce_GeneralSubtrees(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees);
 
   return offset;
 }
@@ -958,7 +958,7 @@ static int dissect_excludedSubtrees_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t NameConstraintsSyntax_sequence[] = {
+static const ber_old_sequence_t NameConstraintsSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl },
   { 0, 0, 0, NULL }
@@ -966,8 +966,8 @@ static const ber_sequence_t NameConstraintsSyntax_sequence[] = {
 
 int
 dissect_x509ce_NameConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
 
   return offset;
 }
@@ -992,7 +992,7 @@ static int dissect_inhibitPolicyMapping_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = {
+static const ber_old_sequence_t PolicyConstraintsSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl },
   { 0, 0, 0, NULL }
@@ -1000,8 +1000,8 @@ static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = {
 
 int
 dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
 
   return offset;
 }
@@ -1065,7 +1065,7 @@ const value_string x509ce_DistributionPointName_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DistributionPointName_choice[] = {
+static const ber_old_choice_t DistributionPointName_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fullName_impl },
   {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_nameRelativeToCRLIssuer_impl },
   { 0, 0, 0, 0, NULL }
@@ -1073,9 +1073,9 @@ static const ber_choice_t DistributionPointName_choice[] = {
 
 int
 dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName,
+                                     NULL);
 
   return offset;
 }
@@ -1141,7 +1141,7 @@ static int dissect_reasonFlags(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t NumberRange_sequence[] = {
+static const ber_old_sequence_t NumberRange_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_modulus },
@@ -1150,8 +1150,8 @@ static const ber_sequence_t NumberRange_sequence[] = {
 
 int
 dissect_x509ce_NumberRange(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
 
   return offset;
 }
@@ -1176,7 +1176,7 @@ static int dissect_cRLStreamIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t BaseRevocationInfo_sequence[] = {
+static const ber_old_sequence_t BaseRevocationInfo_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseThisUpdate_impl },
@@ -1185,8 +1185,8 @@ static const ber_sequence_t BaseRevocationInfo_sequence[] = {
 
 int
 dissect_x509ce_BaseRevocationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
 
   return offset;
 }
@@ -1195,7 +1195,7 @@ static int dissect_baseRevocationInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t PerAuthorityScope_sequence[] = {
+static const ber_old_sequence_t PerAuthorityScope_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_onlyContains_impl },
@@ -1209,8 +1209,8 @@ static const ber_sequence_t PerAuthorityScope_sequence[] = {
 
 int
 dissect_x509ce_PerAuthorityScope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
 
   return offset;
 }
@@ -1219,14 +1219,14 @@ static int dissect_CRLScopeSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = {
+static const ber_old_sequence_t CRLScopeSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item },
 };
 
 int
 dissect_x509ce_CRLScopeSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax);
 
   return offset;
 }
@@ -1235,7 +1235,7 @@ static int dissect_cRLScope(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t DeltaRefInfo_sequence[] = {
+static const ber_old_sequence_t DeltaRefInfo_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta },
   { 0, 0, 0, NULL }
@@ -1243,8 +1243,8 @@ static const ber_sequence_t DeltaRefInfo_sequence[] = {
 
 int
 dissect_x509ce_DeltaRefInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
 
   return offset;
 }
@@ -1253,7 +1253,7 @@ static int dissect_deltaRefInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t CRLReferral_sequence[] = {
+static const ber_old_sequence_t CRLReferral_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_crlr_issuer_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deltaRefInfo_impl },
@@ -1265,8 +1265,8 @@ static const ber_sequence_t CRLReferral_sequence[] = {
 
 int
 dissect_x509ce_CRLReferral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
 
   return offset;
 }
@@ -1280,16 +1280,16 @@ const value_string x509ce_StatusReferral_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t StatusReferral_choice[] = {
+static const ber_old_choice_t StatusReferral_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl },
   { 0, 0, 0, 0, NULL }
 };
 
 int
 dissect_x509ce_StatusReferral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 StatusReferral_choice, hf_index, ett_x509ce_StatusReferral,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     StatusReferral_choice, hf_index, ett_x509ce_StatusReferral,
+                                     NULL);
 
   return offset;
 }
@@ -1298,14 +1298,14 @@ static int dissect_StatusReferrals_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t StatusReferrals_sequence_of[1] = {
+static const ber_old_sequence_t StatusReferrals_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
 };
 
 int
 dissect_x509ce_StatusReferrals(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals);
 
   return offset;
 }
@@ -1327,7 +1327,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t DeltaInformation_sequence[] = {
+static const ber_old_sequence_t DeltaInformation_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
   { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta },
   { 0, 0, 0, NULL }
@@ -1335,14 +1335,14 @@ static const ber_sequence_t DeltaInformation_sequence[] = {
 
 int
 dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t DistributionPoint_sequence[] = {
+static const ber_old_sequence_t DistributionPoint_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLIssuer_impl },
@@ -1351,8 +1351,8 @@ static const ber_sequence_t DistributionPoint_sequence[] = {
 
 int
 dissect_x509ce_DistributionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
 
   return offset;
 }
@@ -1361,20 +1361,20 @@ static int dissect_CRLDistPointsSyntax_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = {
+static const ber_old_sequence_t CRLDistPointsSyntax_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item },
 };
 
 int
 dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax);
 
   return offset;
 }
 
 
-static const ber_sequence_t IssuingDistPointSyntax_sequence[] = {
+static const ber_old_sequence_t IssuingDistPointSyntax_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsCACerts_impl },
@@ -1388,8 +1388,8 @@ static const ber_sequence_t IssuingDistPointSyntax_sequence[] = {
 
 int
 dissect_x509ce_IssuingDistPointSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
 
   return offset;
 }
@@ -1404,7 +1404,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t CertificateExactAssertion_sequence[] = {
+static const ber_old_sequence_t CertificateExactAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { 0, 0, 0, NULL }
@@ -1412,8 +1412,8 @@ static const ber_sequence_t CertificateExactAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificateExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
 
   return offset;
 }
@@ -1456,7 +1456,7 @@ const value_string x509ce_AltNameType_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AltNameType_choice[] = {
+static const ber_old_choice_t AltNameType_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_builtinNameForm },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_otherNameForm },
   { 0, 0, 0, 0, NULL }
@@ -1464,9 +1464,9 @@ static const ber_choice_t AltNameType_choice[] = {
 
 int
 dissect_x509ce_AltNameType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AltNameType_choice, hf_index, ett_x509ce_AltNameType,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AltNameType_choice, hf_index, ett_x509ce_AltNameType,
+                                     NULL);
 
   return offset;
 }
@@ -1475,14 +1475,14 @@ static int dissect_subjectAltName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t CertPolicySet_sequence_of[1] = {
+static const ber_old_sequence_t CertPolicySet_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_CertPolicySet_item },
 };
 
 int
 dissect_x509ce_CertPolicySet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet);
 
   return offset;
 }
@@ -1491,7 +1491,7 @@ static int dissect_policy_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t CertificateAssertion_sequence[] = {
+static const ber_old_sequence_t CertificateAssertion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuer_impl },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl },
@@ -1509,8 +1509,8 @@ static const ber_sequence_t CertificateAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
 
   return offset;
 }
@@ -1522,7 +1522,7 @@ static int dissect_issuedByThisCAAssertion_impl(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
+static const ber_old_sequence_t CertificatePairExactAssertion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedToThisCAAssertion_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedByThisCAAssertion_impl },
   { 0, 0, 0, NULL }
@@ -1530,14 +1530,14 @@ static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificatePairExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificatePairAssertion_sequence[] = {
+static const ber_old_sequence_t CertificatePairAssertion_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion_impl },
   { 0, 0, 0, NULL }
@@ -1545,14 +1545,14 @@ static const ber_sequence_t CertificatePairAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificatePairAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
+static const ber_old_sequence_t CertificateListExactAssertion_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint },
   { 0, 0, 0, NULL }
@@ -1560,14 +1560,14 @@ static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificateListExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificateListAssertion_sequence[] = {
+static const ber_old_sequence_t CertificateListAssertion_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minCRLNumber_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maxCRLNumber_impl },
@@ -1579,14 +1579,14 @@ static const ber_sequence_t CertificateListAssertion_sequence[] = {
 
 int
 dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
+static const ber_old_sequence_t PkiPathMatchSyntax_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject },
   { 0, 0, 0, NULL }
@@ -1594,14 +1594,14 @@ static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
 
 int
 dissect_x509ce_PkiPathMatchSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
 
   return offset;
 }
 
 
-static const ber_sequence_t CertificateTemplate_sequence[] = {
+static const ber_old_sequence_t CertificateTemplate_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_templateID },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_templateMajorVersion },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_templateMinorVersion },
@@ -1610,8 +1610,8 @@ static const ber_sequence_t CertificateTemplate_sequence[] = {
 
 static int
 dissect_x509ce_CertificateTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CertificateTemplate_sequence, hf_index, ett_x509ce_CertificateTemplate);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       CertificateTemplate_sequence, hf_index, ett_x509ce_CertificateTemplate);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 32727e5106..7ecba42d90 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -523,14 +523,14 @@ static int dissect_distingAttrValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_AttributeValue_set_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item },
 };
 
 static int
 dissect_x509if_SET_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue);
 
   return offset;
 }
@@ -563,7 +563,7 @@ static int dissect_includeSubtypes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t Context_sequence[] = {
+static const ber_old_sequence_t Context_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fallback },
@@ -572,8 +572,8 @@ static const ber_sequence_t Context_sequence[] = {
 
 int
 dissect_x509if_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Context_sequence, hf_index, ett_x509if_Context);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Context_sequence, hf_index, ett_x509if_Context);
 
   return offset;
 }
@@ -582,14 +582,14 @@ static int dissect_contextList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_Context_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Context_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextList_item },
 };
 
 static int
 dissect_x509if_SET_OF_Context(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context);
 
   return offset;
 }
@@ -598,7 +598,7 @@ static int dissect_contextList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t T_valuesWithContext_item_sequence[] = {
+static const ber_old_sequence_t T_valuesWithContext_item_sequence[] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
   { 0, 0, 0, NULL }
@@ -606,8 +606,8 @@ static const ber_sequence_t T_valuesWithContext_item_sequence[] = {
 
 static int
 dissect_x509if_T_valuesWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item);
 
   return offset;
 }
@@ -616,14 +616,14 @@ static int dissect_valuesWithContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_valuesWithContext_set_of[1] = {
+static const ber_old_sequence_t T_valuesWithContext_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item },
 };
 
 static int
 dissect_x509if_T_valuesWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext);
 
   return offset;
 }
@@ -632,7 +632,7 @@ static int dissect_valuesWithContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t Attribute_sequence[] = {
+static const ber_old_sequence_t Attribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_valuesWithContext },
@@ -641,8 +641,8 @@ static const ber_sequence_t Attribute_sequence[] = {
 
 int
 dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Attribute_sequence, hf_index, ett_x509if_Attribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Attribute_sequence, hf_index, ett_x509if_Attribute);
 
   return offset;
 }
@@ -705,14 +705,14 @@ static int dissect_ca_contextValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t SET_OF_ContextValue_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContextValue_set_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues_item },
 };
 
 static int
 dissect_x509if_SET_OF_ContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue);
 
   return offset;
 }
@@ -721,7 +721,7 @@ static int dissect_ca_contextValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t ContextAssertion_sequence[] = {
+static const ber_old_sequence_t ContextAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ca_contextType },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues },
   { 0, 0, 0, NULL }
@@ -729,8 +729,8 @@ static const ber_sequence_t ContextAssertion_sequence[] = {
 
 int
 dissect_x509if_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion);
 
   return offset;
 }
@@ -742,14 +742,14 @@ static int dissect_ata_assertedContexts_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = {
+static const ber_old_sequence_t SET_OF_ContextAssertion_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item },
 };
 
 static int
 dissect_x509if_SET_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion);
 
   return offset;
 }
@@ -764,7 +764,7 @@ static const value_string x509if_T_assertedContexts_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_assertedContexts_choice[] = {
+static const ber_old_choice_t T_assertedContexts_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_allContexts },
   {   1, BER_CLASS_CON, 1, 0, dissect_selectedContexts },
   { 0, 0, 0, 0, NULL }
@@ -772,9 +772,9 @@ static const ber_choice_t T_assertedContexts_choice[] = {
 
 static int
 dissect_x509if_T_assertedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts,
+                                     NULL);
 
   return offset;
 }
@@ -783,7 +783,7 @@ static int dissect_assertedContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t AttributeValueAssertion_sequence[] = {
+static const ber_old_sequence_t AttributeValueAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts },
@@ -797,8 +797,8 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb
 	ava_hf_index = hf_index;
 	last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0';
 
-	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion);
+	  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion);
 
 
 	ava_hf_index=-1;
@@ -809,14 +809,14 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion);
 
   return offset;
 }
@@ -825,7 +825,7 @@ static int dissect_ata_assertedContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
+static const ber_old_sequence_t AttributeTypeAssertion_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts },
   { 0, 0, 0, NULL }
@@ -833,14 +833,14 @@ static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
 
 int
 dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_valWithContext_item_sequence[] = {
+static const ber_old_sequence_t T_valWithContext_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
   { 0, 0, 0, NULL }
@@ -848,8 +848,8 @@ static const ber_sequence_t T_valWithContext_item_sequence[] = {
 
 static int
 dissect_x509if_T_valWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item);
 
   return offset;
 }
@@ -858,14 +858,14 @@ static int dissect_valueswithContext_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t T_valWithContext_set_of[1] = {
+static const ber_old_sequence_t T_valWithContext_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valueswithContext_item },
 };
 
 static int
 dissect_x509if_T_valWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext);
 
   return offset;
 }
@@ -874,7 +874,7 @@ static int dissect_valueswithContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
+static const ber_old_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_atadv_value },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_primaryDistinguished },
@@ -884,8 +884,8 @@ static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
 
 int
 dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue);
 
   return offset;
 }
@@ -919,7 +919,7 @@ static int dissect_RelativeDistinguishedName_item(proto_tree *tree _U_, tvbuff_t
 }
 
 
-static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
+static const ber_old_sequence_t RelativeDistinguishedName_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
 };
 
@@ -933,8 +933,8 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv
   last_rdn = ep_alloc(MAX_DN_STR_LEN); *last_rdn = '\0';
   doing_dn = TRUE;
 
-    offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName);
+    offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName);
 
 
   /* we've finished - close the bracket */
@@ -985,7 +985,7 @@ static int dissect_RDNSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t RDNSequence_sequence_of[1] = {
+static const ber_old_sequence_t RDNSequence_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
 };
 
@@ -998,8 +998,8 @@ dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
   last_dn = ep_alloc(MAX_DN_STR_LEN); *last_dn = '\0';
   top_of_dn = NULL;
 
-    offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence);
+    offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence);
 
 
   /* we've finished - append the dn */
@@ -1027,16 +1027,16 @@ const value_string x509if_Name_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Name_choice[] = {
+static const ber_old_choice_t Name_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
   { 0, 0, 0, 0, NULL }
 };
 
 int
 dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Name_choice, hf_index, ett_x509if_Name,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Name_choice, hf_index, ett_x509if_Name,
+                                     NULL);
 
   return offset;
 }
@@ -1075,7 +1075,7 @@ static const value_string x509if_T_specificExclusions_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_specificExclusions_item_choice[] = {
+static const ber_old_choice_t T_specificExclusions_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_chopBefore },
   {   1, BER_CLASS_CON, 1, 0, dissect_chopAfter },
   { 0, 0, 0, 0, NULL }
@@ -1083,9 +1083,9 @@ static const ber_choice_t T_specificExclusions_item_choice[] = {
 
 static int
 dissect_x509if_T_specificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item,
+                                     NULL);
 
   return offset;
 }
@@ -1094,14 +1094,14 @@ static int dissect_specificExclusions_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t T_specificExclusions_set_of[1] = {
+static const ber_old_sequence_t T_specificExclusions_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item },
 };
 
 static int
 dissect_x509if_T_specificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions);
 
   return offset;
 }
@@ -1171,14 +1171,14 @@ static int dissect_newMatchingRule(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_Refinement_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Refinement_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item },
 };
 
 static int
 dissect_x509if_SET_OF_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement);
 
   return offset;
 }
@@ -1198,7 +1198,7 @@ const value_string x509if_Refinement_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Refinement_choice[] = {
+static const ber_old_choice_t Refinement_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_item },
   {   1, BER_CLASS_CON, 1, 0, dissect_refinement_and },
   {   2, BER_CLASS_CON, 2, 0, dissect_refinement_or },
@@ -1208,15 +1208,15 @@ static const ber_choice_t Refinement_choice[] = {
 
 int
 dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Refinement_choice, hf_index, ett_x509if_Refinement,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Refinement_choice, hf_index, ett_x509if_Refinement,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t SubtreeSpecification_sequence[] = {
+static const ber_old_sequence_t SubtreeSpecification_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum },
@@ -1227,8 +1227,8 @@ static const ber_sequence_t SubtreeSpecification_sequence[] = {
 
 int
 dissect_x509if_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification);
 
   return offset;
 }
@@ -1240,7 +1240,7 @@ static const value_string x509if_T_chopSpecificExclusions_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_chopSpecificExclusions_item_choice[] = {
+static const ber_old_choice_t T_chopSpecificExclusions_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_chopBefore },
   {   1, BER_CLASS_CON, 1, 0, dissect_chopAfter },
   { 0, 0, 0, 0, NULL }
@@ -1248,9 +1248,9 @@ static const ber_choice_t T_chopSpecificExclusions_item_choice[] = {
 
 static int
 dissect_x509if_T_chopSpecificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item,
+                                     NULL);
 
   return offset;
 }
@@ -1259,14 +1259,14 @@ static int dissect_chopSpecificExclusions_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = {
+static const ber_old_sequence_t T_chopSpecificExclusions_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item },
 };
 
 static int
 dissect_x509if_T_chopSpecificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions);
 
   return offset;
 }
@@ -1275,7 +1275,7 @@ static int dissect_chopSpecificExclusions(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t ChopSpecification_sequence[] = {
+static const ber_old_sequence_t ChopSpecification_sequence[] = {
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_chopSpecificExclusions },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_maximum },
@@ -1284,8 +1284,8 @@ static const ber_sequence_t ChopSpecification_sequence[] = {
 
 int
 dissect_x509if_ChopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification);
 
   return offset;
 }
@@ -1342,14 +1342,14 @@ static int dissect_superiorStructureRules_item(proto_tree *tree _U_, tvbuff_t *t
 }
 
 
-static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = {
+static const ber_old_sequence_t SET_OF_RuleIdentifier_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules_item },
 };
 
 static int
 dissect_x509if_SET_OF_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier);
 
   return offset;
 }
@@ -1358,7 +1358,7 @@ static int dissect_superiorStructureRules(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t DITStructureRule_sequence[] = {
+static const ber_old_sequence_t DITStructureRule_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules },
@@ -1367,21 +1367,21 @@ static const ber_sequence_t DITStructureRule_sequence[] = {
 
 int
 dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_auxiliaries_set_of[1] = {
+static const ber_old_sequence_t T_auxiliaries_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item },
 };
 
 static int
 dissect_x509if_T_auxiliaries(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries);
 
   return offset;
 }
@@ -1390,14 +1390,14 @@ static int dissect_auxiliaries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
+static const ber_old_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item },
 };
 
 static int
 dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId);
 
   return offset;
 }
@@ -1412,7 +1412,7 @@ static int dissect_precluded(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t DITContentRule_sequence[] = {
+static const ber_old_sequence_t DITContentRule_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatory },
@@ -1423,21 +1423,21 @@ static const ber_sequence_t DITContentRule_sequence[] = {
 
 int
 dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DITContentRule_sequence, hf_index, ett_x509if_DITContentRule);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DITContentRule_sequence, hf_index, ett_x509if_DITContentRule);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_mandatoryContexts_set_of[1] = {
+static const ber_old_sequence_t T_mandatoryContexts_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatoryContexts_item },
 };
 
 static int
 dissect_x509if_T_mandatoryContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts);
 
   return offset;
 }
@@ -1446,14 +1446,14 @@ static int dissect_mandatoryContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t T_optionalContexts_set_of[1] = {
+static const ber_old_sequence_t T_optionalContexts_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_optionalContexts_item },
 };
 
 static int
 dissect_x509if_T_optionalContexts(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts);
 
   return offset;
 }
@@ -1462,7 +1462,7 @@ static int dissect_optionalContexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t DITContextUse_sequence[] = {
+static const ber_old_sequence_t DITContextUse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_optionalContexts },
@@ -1471,8 +1471,8 @@ static const ber_sequence_t DITContextUse_sequence[] = {
 
 int
 dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DITContextUse_sequence, hf_index, ett_x509if_DITContextUse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DITContextUse_sequence, hf_index, ett_x509if_DITContextUse);
 
   return offset;
 }
@@ -1524,14 +1524,14 @@ static int dissect_ra_selectedValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_selectedValues_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues);
 
   return offset;
 }
@@ -1567,14 +1567,14 @@ static int dissect_ra_values_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_values_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues);
 
   return offset;
 }
@@ -1583,7 +1583,7 @@ static int dissect_ra_values(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t T_defaultValues_item_sequence[] = {
+static const ber_old_sequence_t T_defaultValues_item_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ra_values },
   { 0, 0, 0, NULL }
@@ -1591,8 +1591,8 @@ static const ber_sequence_t T_defaultValues_item_sequence[] = {
 
 static int
 dissect_x509if_T_defaultValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item);
 
   return offset;
 }
@@ -1601,14 +1601,14 @@ static int dissect_defaultValues_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t T_defaultValues_sequence_of[1] = {
+static const ber_old_sequence_t T_defaultValues_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_defaultValues_item },
 };
 
 static int
 dissect_x509if_T_defaultValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues);
 
   return offset;
 }
@@ -1617,14 +1617,14 @@ static int dissect_defaultValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue);
 
   return offset;
 }
@@ -1636,7 +1636,7 @@ static int dissect_selectedValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
 }
 
 
-static const ber_sequence_t ContextProfile_sequence[] = {
+static const ber_old_sequence_t ContextProfile_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue },
   { 0, 0, 0, NULL }
@@ -1644,8 +1644,8 @@ static const ber_sequence_t ContextProfile_sequence[] = {
 
 int
 dissect_x509if_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ContextProfile_sequence, hf_index, ett_x509if_ContextProfile);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ContextProfile_sequence, hf_index, ett_x509if_ContextProfile);
 
   return offset;
 }
@@ -1654,14 +1654,14 @@ static int dissect_contexts_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile);
 
   return offset;
 }
@@ -1670,14 +1670,14 @@ static int dissect_contexts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination);
 
   return offset;
 }
@@ -1697,7 +1697,7 @@ const value_string x509if_ContextCombination_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t ContextCombination_choice[] = {
+static const ber_old_choice_t ContextCombination_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_context },
   {   1, BER_CLASS_CON, 1, 0, dissect_contextcombination_and },
   {   2, BER_CLASS_CON, 2, 0, dissect_contextcombination_or },
@@ -1707,15 +1707,15 @@ static const ber_choice_t ContextCombination_choice[] = {
 
 int
 dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 ContextCombination_choice, hf_index, ett_x509if_ContextCombination,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     ContextCombination_choice, hf_index, ett_x509if_ContextCombination,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t MatchingUse_sequence[] = {
+static const ber_old_sequence_t MatchingUse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType },
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue },
   { 0, 0, 0, NULL }
@@ -1723,8 +1723,8 @@ static const ber_sequence_t MatchingUse_sequence[] = {
 
 int
 dissect_x509if_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MatchingUse_sequence, hf_index, ett_x509if_MatchingUse);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MatchingUse_sequence, hf_index, ett_x509if_MatchingUse);
 
   return offset;
 }
@@ -1733,14 +1733,14 @@ static int dissect_matchingUse_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse);
 
   return offset;
 }
@@ -1749,7 +1749,7 @@ static int dissect_matchingUse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t RequestAttribute_sequence[] = {
+static const ber_old_sequence_t RequestAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ra_selectedValues },
@@ -1762,8 +1762,8 @@ static const ber_sequence_t RequestAttribute_sequence[] = {
 
 int
 dissect_x509if_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute);
 
   return offset;
 }
@@ -1772,14 +1772,14 @@ static int dissect_inputAttributeTypes_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute);
 
   return offset;
 }
@@ -1788,14 +1788,14 @@ static int dissect_inputAttributeTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination);
 
   return offset;
 }
@@ -1815,7 +1815,7 @@ const value_string x509if_AttributeCombination_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t AttributeCombination_choice[] = {
+static const ber_old_choice_t AttributeCombination_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_attribute },
   {   1, BER_CLASS_CON, 1, 0, dissect_and },
   {   2, BER_CLASS_CON, 2, 0, dissect_or },
@@ -1825,9 +1825,9 @@ static const ber_choice_t AttributeCombination_choice[] = {
 
 int
 dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination,
+                                     NULL);
 
   return offset;
 }
@@ -1839,7 +1839,7 @@ static const value_string x509if_T_outputValues_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_outputValues_choice[] = {
+static const ber_old_choice_t T_outputValues_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly },
   { 0, 0, 0, 0, NULL }
@@ -1847,9 +1847,9 @@ static const ber_choice_t T_outputValues_choice[] = {
 
 static int
 dissect_x509if_T_outputValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_outputValues_choice, hf_index, ett_x509if_T_outputValues,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_outputValues_choice, hf_index, ett_x509if_T_outputValues,
+                                     NULL);
 
   return offset;
 }
@@ -1858,7 +1858,7 @@ static int dissect_outputValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t ResultAttribute_sequence[] = {
+static const ber_old_sequence_t ResultAttribute_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts },
@@ -1867,8 +1867,8 @@ static const ber_sequence_t ResultAttribute_sequence[] = {
 
 int
 dissect_x509if_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute);
 
   return offset;
 }
@@ -1877,14 +1877,14 @@ static int dissect_outputAttributeTypes_item(proto_tree *tree _U_, tvbuff_t *tvb
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute);
 
   return offset;
 }
@@ -1893,14 +1893,14 @@ static int dissect_outputAttributeTypes(proto_tree *tree _U_, tvbuff_t *tvb _U_,
 }
 
 
-static const ber_sequence_t ControlOptions_sequence[] = {
+static const ber_old_sequence_t ControlOptions_sequence[] = {
   { 0, 0, 0, NULL }
 };
 
 int
 dissect_x509if_ControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ControlOptions_sequence, hf_index, ett_x509if_ControlOptions);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ControlOptions_sequence, hf_index, ett_x509if_ControlOptions);
 
   return offset;
 }
@@ -1915,7 +1915,7 @@ static int dissect_searchRuleControls(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
 }
 
 
-static const ber_sequence_t Mapping_sequence[] = {
+static const ber_old_sequence_t Mapping_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level },
   { 0, 0, 0, NULL }
@@ -1923,8 +1923,8 @@ static const ber_sequence_t Mapping_sequence[] = {
 
 int
 dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Mapping_sequence, hf_index, ett_x509if_Mapping);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Mapping_sequence, hf_index, ett_x509if_Mapping);
 
   return offset;
 }
@@ -1933,14 +1933,14 @@ static int dissect_mapping_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping);
 
   return offset;
 }
@@ -1949,7 +1949,7 @@ static int dissect_mapping(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const ber_sequence_t MRSubstitution_sequence[] = {
+static const ber_old_sequence_t MRSubstitution_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_newMatchingRule },
@@ -1958,8 +1958,8 @@ static const ber_sequence_t MRSubstitution_sequence[] = {
 
 int
 dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution);
 
   return offset;
 }
@@ -1968,14 +1968,14 @@ static int dissect_substitution_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution);
 
   return offset;
 }
@@ -1984,7 +1984,7 @@ static int dissect_substitution(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const ber_sequence_t MRMapping_sequence[] = {
+static const ber_old_sequence_t MRMapping_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution },
   { 0, 0, 0, NULL }
@@ -1992,8 +1992,8 @@ static const ber_sequence_t MRMapping_sequence[] = {
 
 int
 dissect_x509if_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MRMapping_sequence, hf_index, ett_x509if_MRMapping);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MRMapping_sequence, hf_index, ett_x509if_MRMapping);
 
   return offset;
 }
@@ -2008,14 +2008,14 @@ static int dissect_relaxations_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping);
 
   return offset;
 }
@@ -2027,7 +2027,7 @@ static int dissect_relaxations(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
 }
 
 
-static const ber_sequence_t RelaxationPolicy_sequence[] = {
+static const ber_old_sequence_t RelaxationPolicy_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_relaxations },
@@ -2038,8 +2038,8 @@ static const ber_sequence_t RelaxationPolicy_sequence[] = {
 
 int
 dissect_x509if_RelaxationPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy);
 
   return offset;
 }
@@ -2048,14 +2048,14 @@ static int dissect_relaxation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item },
 };
 
 static int
 dissect_x509if_SEQUENCE_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType);
 
   return offset;
 }
@@ -2104,7 +2104,7 @@ static int dissect_imposedSubset(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t EntryLimit_sequence[] = {
+static const ber_old_sequence_t EntryLimit_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max },
   { 0, 0, 0, NULL }
@@ -2112,8 +2112,8 @@ static const ber_sequence_t EntryLimit_sequence[] = {
 
 int
 dissect_x509if_EntryLimit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EntryLimit_sequence, hf_index, ett_x509if_EntryLimit);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EntryLimit_sequence, hf_index, ett_x509if_EntryLimit);
 
   return offset;
 }
@@ -2122,14 +2122,14 @@ static int dissect_entryLimit(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = {
+static const ber_old_sequence_t SET_OF_DirectoryString_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_name_item },
 };
 
 static int
 dissect_x509if_SET_OF_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString);
 
   return offset;
 }
@@ -2138,7 +2138,7 @@ static int dissect_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SearchRuleDescription_sequence[] = {
+static const ber_old_sequence_t SearchRuleDescription_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
   { BER_CLASS_CON, 0, 0, dissect_dmdId },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType },
@@ -2162,14 +2162,14 @@ static const ber_sequence_t SearchRuleDescription_sequence[] = {
 
 int
 dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription);
 
   return offset;
 }
 
 
-static const ber_sequence_t SearchRule_sequence[] = {
+static const ber_old_sequence_t SearchRule_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
   { BER_CLASS_CON, 0, 0, dissect_dmdId },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType },
@@ -2190,14 +2190,14 @@ static const ber_sequence_t SearchRule_sequence[] = {
 
 int
 dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchRule_sequence, hf_index, ett_x509if_SearchRule);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchRule_sequence, hf_index, ett_x509if_SearchRule);
 
   return offset;
 }
 
 
-static const ber_sequence_t SearchRuleId_sequence[] = {
+static const ber_old_sequence_t SearchRuleId_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
   { BER_CLASS_CON, 0, 0, dissect_dmdId },
   { 0, 0, 0, NULL }
@@ -2205,8 +2205,8 @@ static const ber_sequence_t SearchRuleId_sequence[] = {
 
 int
 dissect_x509if_SearchRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId);
 
   return offset;
 }
@@ -2218,7 +2218,7 @@ const value_string x509if_OutputValues_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OutputValues_choice[] = {
+static const ber_old_choice_t OutputValues_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly },
   { 0, 0, 0, 0, NULL }
@@ -2226,9 +2226,9 @@ static const ber_choice_t OutputValues_choice[] = {
 
 int
 dissect_x509if_OutputValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OutputValues_choice, hf_index, ett_x509if_OutputValues,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OutputValues_choice, hf_index, ett_x509if_OutputValues,
+                                     NULL);
 
   return offset;
 }
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 60ec74f5db..be4f336ffb 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -424,7 +424,7 @@ const value_string x509sat_DirectoryString_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t DirectoryString_choice[] = {
+static const ber_old_choice_t DirectoryString_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_teletexString },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_printableString },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_UniversalString, BER_FLAGS_NOOWNTAG, dissect_universalString },
@@ -435,9 +435,9 @@ static const ber_choice_t DirectoryString_choice[] = {
 
 int
 dissect_x509sat_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 DirectoryString_choice, hf_index, ett_x509sat_DirectoryString,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     DirectoryString_choice, hf_index, ett_x509sat_DirectoryString,
+                                     NULL);
 
   return offset;
 }
@@ -516,7 +516,7 @@ static const value_string x509sat_CriteriaItem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t CriteriaItem_choice[] = {
+static const ber_old_choice_t CriteriaItem_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_equality },
   {   1, BER_CLASS_CON, 1, 0, dissect_substrings },
   {   2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
@@ -527,9 +527,9 @@ static const ber_choice_t CriteriaItem_choice[] = {
 
 static int
 dissect_x509sat_CriteriaItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem,
+                                     NULL);
 
   return offset;
 }
@@ -538,14 +538,14 @@ static int dissect_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t SET_OF_Criteria_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Criteria_set_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 
 static int
 dissect_x509sat_SET_OF_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria);
 
   return offset;
 }
@@ -565,7 +565,7 @@ const value_string x509sat_Criteria_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t Criteria_choice[] = {
+static const ber_old_choice_t Criteria_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_type },
   {   1, BER_CLASS_CON, 1, 0, dissect_and },
   {   2, BER_CLASS_CON, 2, 0, dissect_or },
@@ -575,15 +575,15 @@ static const ber_choice_t Criteria_choice[] = {
 
 int
 dissect_x509sat_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 Criteria_choice, hf_index, ett_x509sat_Criteria,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     Criteria_choice, hf_index, ett_x509sat_Criteria,
+                                     NULL);
 
   return offset;
 }
 
 
-static const ber_sequence_t Guide_set[] = {
+static const ber_old_sequence_t Guide_set[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_objectClass },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
   { 0, 0, 0, NULL }
@@ -591,8 +591,8 @@ static const ber_sequence_t Guide_set[] = {
 
 static int
 dissect_x509sat_Guide(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              Guide_set, hf_index, ett_x509sat_Guide);
+  offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset,
+                                  Guide_set, hf_index, ett_x509sat_Guide);
 
   return offset;
 }
@@ -618,7 +618,7 @@ static int dissect_subset(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t EnhancedGuide_sequence[] = {
+static const ber_old_sequence_t EnhancedGuide_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_objectClass },
   { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_subset },
@@ -627,21 +627,21 @@ static const ber_sequence_t EnhancedGuide_sequence[] = {
 
 int
 dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
 
   return offset;
 }
 
 
-static const ber_sequence_t PostalAddress_sequence_of[1] = {
+static const ber_old_sequence_t PostalAddress_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_PostalAddress_item },
 };
 
 int
 dissect_x509sat_PostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress);
 
   return offset;
 }
@@ -661,7 +661,7 @@ static int dissect_telephoneNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t TelexNumber_sequence[] = {
+static const ber_old_sequence_t TelexNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode },
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback },
@@ -670,22 +670,22 @@ static const ber_sequence_t TelexNumber_sequence[] = {
 
 static int
 dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
 
   return offset;
 }
 
 
-static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
+static const ber_old_sequence_t FacsimileTelephoneNumber_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber },
   { 0, 0, 0, NULL }
 };
 
 int
 dissect_x509sat_FacsimileTelephoneNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
 
   return offset;
 }
@@ -751,14 +751,14 @@ static int dissect_PreferredDeliveryMethod_item(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
+static const ber_old_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item },
 };
 
 int
 dissect_x509sat_PreferredDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod);
 
   return offset;
 }
@@ -798,14 +798,14 @@ static int dissect_finall_substring(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t T_nAddresses_set_of[1] = {
+static const ber_old_sequence_t T_nAddresses_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item },
 };
 
 static int
 dissect_x509sat_T_nAddresses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
 
   return offset;
 }
@@ -814,7 +814,7 @@ static int dissect_nAddresses(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t PresentationAddress_sequence[] = {
+static const ber_old_sequence_t PresentationAddress_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_tSelector },
@@ -824,21 +824,21 @@ static const ber_sequence_t PresentationAddress_sequence[] = {
 
 int
 dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_profiles_set_of[1] = {
+static const ber_old_sequence_t T_profiles_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item },
 };
 
 static int
 dissect_x509sat_T_profiles(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_profiles_set_of, hf_index, ett_x509sat_T_profiles);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_profiles_set_of, hf_index, ett_x509sat_T_profiles);
 
   return offset;
 }
@@ -847,7 +847,7 @@ static int dissect_profiles(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t ProtocolInformation_sequence[] = {
+static const ber_old_sequence_t ProtocolInformation_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress },
   { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles },
   { 0, 0, 0, NULL }
@@ -855,14 +855,14 @@ static const ber_sequence_t ProtocolInformation_sequence[] = {
 
 int
 dissect_x509sat_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
 
   return offset;
 }
 
 
-static const ber_sequence_t NameAndOptionalUID_sequence[] = {
+static const ber_old_sequence_t NameAndOptionalUID_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid },
   { 0, 0, 0, NULL }
@@ -870,21 +870,21 @@ static const ber_sequence_t NameAndOptionalUID_sequence[] = {
 
 int
 dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
 
   return offset;
 }
 
 
-static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
+static const ber_old_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
 };
 
 static int
 dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
 
   return offset;
 }
@@ -893,7 +893,7 @@ static int dissect_attributeList(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
+static const ber_old_sequence_t MultipleMatchingLocalities_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList },
   { 0, 0, 0, NULL }
@@ -901,8 +901,8 @@ static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
 
 int
 dissect_x509sat_MultipleMatchingLocalities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
 
   return offset;
 }
@@ -916,7 +916,7 @@ static const value_string x509sat_SubstringAssertion_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t SubstringAssertion_item_choice[] = {
+static const ber_old_choice_t SubstringAssertion_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_initial },
   {   1, BER_CLASS_CON, 1, 0, dissect_any },
   {   2, BER_CLASS_CON, 2, 0, dissect_final },
@@ -926,9 +926,9 @@ static const ber_choice_t SubstringAssertion_item_choice[] = {
 
 static int
 dissect_x509sat_SubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item,
+                                     NULL);
 
   return offset;
 }
@@ -937,27 +937,27 @@ static int dissect_SubstringAssertion_item(proto_tree *tree _U_, tvbuff_t *tvb _
 }
 
 
-static const ber_sequence_t SubstringAssertion_sequence_of[1] = {
+static const ber_old_sequence_t SubstringAssertion_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
 };
 
 int
 dissect_x509sat_SubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
+static const ber_old_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CaseIgnoreListMatch_item },
 };
 
 int
 dissect_x509sat_CaseIgnoreListMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch);
 
   return offset;
 }
@@ -970,7 +970,7 @@ static const value_string x509sat_OctetSubstringAssertion_item_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
+static const ber_old_choice_t OctetSubstringAssertion_item_choice[] = {
   {   0, BER_CLASS_CON, 0, 0, dissect_initial_substring },
   {   1, BER_CLASS_CON, 1, 0, dissect_any_substring },
   {   2, BER_CLASS_CON, 2, 0, dissect_finall_substring },
@@ -979,9 +979,9 @@ static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
 
 static int
 dissect_x509sat_OctetSubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item,
+                                     NULL);
 
   return offset;
 }
@@ -990,27 +990,27 @@ static int dissect_OctetSubstringAssertion_item(proto_tree *tree _U_, tvbuff_t *
 }
 
 
-static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = {
+static const ber_old_sequence_t OctetSubstringAssertion_sequence_of[1] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
 };
 
 int
 dissect_x509sat_OctetSubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion);
 
   return offset;
 }
 
 
-static const ber_sequence_t ZonalSelect_sequence_of[1] = {
+static const ber_old_sequence_t ZonalSelect_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item },
 };
 
 int
 dissect_x509sat_ZonalSelect(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect);
+  offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset,
+                                          ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect);
 
   return offset;
 }
@@ -1062,7 +1062,7 @@ static int dissect_at(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const ber_sequence_t T_absolute_sequence[] = {
+static const ber_old_sequence_t T_absolute_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
   { 0, 0, 0, NULL }
@@ -1070,8 +1070,8 @@ static const ber_sequence_t T_absolute_sequence[] = {
 
 static int
 dissect_x509sat_T_absolute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_absolute_sequence, hf_index, ett_x509sat_T_absolute);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_absolute_sequence, hf_index, ett_x509sat_T_absolute);
 
   return offset;
 }
@@ -1111,7 +1111,7 @@ static int dissect_second(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t DayTime_sequence[] = {
+static const ber_old_sequence_t DayTime_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_hour },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_second },
@@ -1120,8 +1120,8 @@ static const ber_sequence_t DayTime_sequence[] = {
 
 int
 dissect_x509sat_DayTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DayTime_sequence, hf_index, ett_x509sat_DayTime);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DayTime_sequence, hf_index, ett_x509sat_DayTime);
 
   return offset;
 }
@@ -1133,7 +1133,7 @@ static int dissect_endDayTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t DayTimeBand_sequence[] = {
+static const ber_old_sequence_t DayTimeBand_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime },
   { 0, 0, 0, NULL }
@@ -1141,8 +1141,8 @@ static const ber_sequence_t DayTimeBand_sequence[] = {
 
 int
 dissect_x509sat_DayTimeBand(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
 
   return offset;
 }
@@ -1151,14 +1151,14 @@ static int dissect_timesOfDay_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
 }
 
 
-static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = {
+static const ber_old_sequence_t SET_OF_DayTimeBand_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item },
 };
 
 static int
 dissect_x509sat_SET_OF_DayTimeBand(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand);
 
   return offset;
 }
@@ -1167,14 +1167,14 @@ static int dissect_timesOfDay(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
-static const ber_sequence_t T_intDay_set_of[1] = {
+static const ber_old_sequence_t T_intDay_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item },
 };
 
 static int
 dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_intDay_set_of, hf_index, ett_x509sat_T_intDay);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_intDay_set_of, hf_index, ett_x509sat_T_intDay);
 
   return offset;
 }
@@ -1261,7 +1261,7 @@ const value_string x509sat_NamedDay_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t NamedDay_choice[] = {
+static const ber_old_choice_t NamedDay_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intNamedDays },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitNamedDays },
   { 0, 0, 0, 0, NULL }
@@ -1269,9 +1269,9 @@ static const ber_choice_t NamedDay_choice[] = {
 
 int
 dissect_x509sat_NamedDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 NamedDay_choice, hf_index, ett_x509sat_NamedDay,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     NamedDay_choice, hf_index, ett_x509sat_NamedDay,
+                                     NULL);
 
   return offset;
 }
@@ -1301,7 +1301,7 @@ const value_string x509sat_XDayOf_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t XDayOf_choice[] = {
+static const ber_old_choice_t XDayOf_choice[] = {
   {   1, BER_CLASS_CON, 1, 0, dissect_first_dayof },
   {   2, BER_CLASS_CON, 2, 0, dissect_second_dayof },
   {   3, BER_CLASS_CON, 3, 0, dissect_third_dayof },
@@ -1312,9 +1312,9 @@ static const ber_choice_t XDayOf_choice[] = {
 
 int
 dissect_x509sat_XDayOf(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 XDayOf_choice, hf_index, ett_x509sat_XDayOf,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     XDayOf_choice, hf_index, ett_x509sat_XDayOf,
+                                     NULL);
 
   return offset;
 }
@@ -1330,7 +1330,7 @@ static const value_string x509sat_T_days_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_days_choice[] = {
+static const ber_old_choice_t T_days_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay },
   {   2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
@@ -1339,9 +1339,9 @@ static const ber_choice_t T_days_choice[] = {
 
 static int
 dissect_x509sat_T_days(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_days_choice, hf_index, ett_x509sat_T_days,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_days_choice, hf_index, ett_x509sat_T_days,
+                                     NULL);
 
   return offset;
 }
@@ -1368,14 +1368,14 @@ static int dissect_now(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const ber_sequence_t T_intWeek_set_of[1] = {
+static const ber_old_sequence_t T_intWeek_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intWeek_item },
 };
 
 static int
 dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
 
   return offset;
 }
@@ -1413,7 +1413,7 @@ static const value_string x509sat_T_weeks_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_weeks_choice[] = {
+static const ber_old_choice_t T_weeks_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allWeeks },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intWeek },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitWeek },
@@ -1422,9 +1422,9 @@ static const ber_choice_t T_weeks_choice[] = {
 
 static int
 dissect_x509sat_T_weeks(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_weeks_choice, hf_index, ett_x509sat_T_weeks,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_weeks_choice, hf_index, ett_x509sat_T_weeks,
+                                     NULL);
 
   return offset;
 }
@@ -1433,14 +1433,14 @@ static int dissect_weeks(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t T_intMonth_set_of[1] = {
+static const ber_old_sequence_t T_intMonth_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intMonth_item },
 };
 
 static int
 dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
 
   return offset;
 }
@@ -1485,7 +1485,7 @@ static const value_string x509sat_T_months_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_months_choice[] = {
+static const ber_old_choice_t T_months_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allMonths },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intMonth },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitMonth },
@@ -1494,9 +1494,9 @@ static const ber_choice_t T_months_choice[] = {
 
 static int
 dissect_x509sat_T_months(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_months_choice, hf_index, ett_x509sat_T_months,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_months_choice, hf_index, ett_x509sat_T_months,
+                                     NULL);
 
   return offset;
 }
@@ -1505,14 +1505,14 @@ static int dissect_months(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const ber_sequence_t T_years_set_of[1] = {
+static const ber_old_sequence_t T_years_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_years_item },
 };
 
 static int
 dissect_x509sat_T_years(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 T_years_set_of, hf_index, ett_x509sat_T_years);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     T_years_set_of, hf_index, ett_x509sat_T_years);
 
   return offset;
 }
@@ -1521,7 +1521,7 @@ static int dissect_years(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
 }
 
 
-static const ber_sequence_t Period_sequence[] = {
+static const ber_old_sequence_t Period_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days },
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_weeks },
@@ -1532,8 +1532,8 @@ static const ber_sequence_t Period_sequence[] = {
 
 int
 dissect_x509sat_Period(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   Period_sequence, hf_index, ett_x509sat_Period);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       Period_sequence, hf_index, ett_x509sat_Period);
 
   return offset;
 }
@@ -1542,14 +1542,14 @@ static int dissect_periodic_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t SET_OF_Period_set_of[1] = {
+static const ber_old_sequence_t SET_OF_Period_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item },
 };
 
 static int
 dissect_x509sat_SET_OF_Period(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
-                                 SET_OF_Period_set_of, hf_index, ett_x509sat_SET_OF_Period);
+  offset = dissect_ber_old_set_of(implicit_tag, actx, tree, tvb, offset,
+                                     SET_OF_Period_set_of, hf_index, ett_x509sat_SET_OF_Period);
 
   return offset;
 }
@@ -1564,7 +1564,7 @@ static const value_string x509sat_T_time_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_time_choice[] = {
+static const ber_old_choice_t T_time_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_absolute },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_periodic },
   { 0, 0, 0, 0, NULL }
@@ -1572,9 +1572,9 @@ static const ber_choice_t T_time_choice[] = {
 
 static int
 dissect_x509sat_T_time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_time_choice, hf_index, ett_x509sat_T_time,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     T_time_choice, hf_index, ett_x509sat_T_time,
+                                     NULL);
 
   return offset;
 }
@@ -1611,7 +1611,7 @@ static int dissect_timeZone(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t TimeSpecification_sequence[] = {
+static const ber_old_sequence_t TimeSpecification_sequence[] = {
   { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone },
@@ -1620,14 +1620,14 @@ static const ber_sequence_t TimeSpecification_sequence[] = {
 
 int
 dissect_x509sat_TimeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
 
   return offset;
 }
 
 
-static const ber_sequence_t T_between_sequence[] = {
+static const ber_old_sequence_t T_between_sequence[] = {
   { BER_CLASS_CON, 0, 0, dissect_startTime },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
   { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entirely },
@@ -1636,8 +1636,8 @@ static const ber_sequence_t T_between_sequence[] = {
 
 static int
 dissect_x509sat_T_between(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   T_between_sequence, hf_index, ett_x509sat_T_between);
+  offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
+                                       T_between_sequence, hf_index, ett_x509sat_T_between);
 
   return offset;
 }
@@ -1653,7 +1653,7 @@ const value_string x509sat_TimeAssertion_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t TimeAssertion_choice[] = {
+static const ber_old_choice_t TimeAssertion_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_now },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_at },
   {   2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_between },
@@ -1662,9 +1662,9 @@ static const ber_choice_t TimeAssertion_choice[] = {
 
 int
 dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion,
+                                     NULL);
 
   return offset;
 }
@@ -1676,7 +1676,7 @@ const value_string x509sat_LocaleContextSyntax_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t LocaleContextSyntax_choice[] = {
+static const ber_old_choice_t LocaleContextSyntax_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_localeID1 },
   {   1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_localeID2 },
   { 0, 0, 0, 0, NULL }
@@ -1684,9 +1684,9 @@ static const ber_choice_t LocaleContextSyntax_choice[] = {
 
 int
 dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax,
-                                 NULL);
+  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
+                                     LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax,
+                                     NULL);
 
   return offset;
 }