Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599

1 files changed, 81 insertions, 81 deletions

diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 8f389d5b16..ffc3fe1290 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2205,47 +2205,47 @@ void proto_register_dop(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SupplierInformation_PDU,
-      { "SupplierInformation", "dop.SupplierInformation",
+      { "SupplierInformation", "dop.SupplierInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ConsumerInformation_PDU,
-      { "ConsumerInformation", "dop.ConsumerInformation",
+      { "ConsumerInformation", "dop.ConsumerInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SupplierAndConsumers_PDU,
-      { "SupplierAndConsumers", "dop.SupplierAndConsumers",
+      { "SupplierAndConsumers", "dop.SupplierAndConsumers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_HierarchicalAgreement_PDU,
-      { "HierarchicalAgreement", "dop.HierarchicalAgreement",
+      { "HierarchicalAgreement", "dop.HierarchicalAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinate_PDU,
-      { "SuperiorToSubordinate", "dop.SuperiorToSubordinate",
+      { "SuperiorToSubordinate", "dop.SuperiorToSubordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SubordinateToSuperior_PDU,
-      { "SubordinateToSuperior", "dop.SubordinateToSuperior",
+      { "SubordinateToSuperior", "dop.SubordinateToSuperior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinateModification_PDU,
-      { "SuperiorToSubordinateModification", "dop.SuperiorToSubordinateModification",
+      { "SuperiorToSubordinateModification", "dop.SuperiorToSubordinateModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NonSpecificHierarchicalAgreement_PDU,
-      { "NonSpecificHierarchicalAgreement", "dop.NonSpecificHierarchicalAgreement",
+      { "NonSpecificHierarchicalAgreement", "dop.NonSpecificHierarchicalAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NHOBSuperiorToSubordinate_PDU,
-      { "NHOBSuperiorToSubordinate", "dop.NHOBSuperiorToSubordinate",
+      { "NHOBSuperiorToSubordinate", "dop.NHOBSuperiorToSubordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NHOBSubordinateToSuperior_PDU,
-      { "NHOBSubordinateToSuperior", "dop.NHOBSubordinateToSuperior",
+      { "NHOBSubordinateToSuperior", "dop.NHOBSubordinateToSuperior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ACIItem_PDU,
-      { "ACIItem", "dop.ACIItem",
+      { "ACIItem", "dop.ACIItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ae_title,
@@ -2253,7 +2253,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dop_address,
-      { "address", "dop.address",
+      { "address", "dop.address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PresentationAddress", HFILL }},
     { &hf_dop_protocolInformation,
@@ -2261,11 +2261,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ProtocolInformation", HFILL }},
     { &hf_dop_protocolInformation_item,
-      { "ProtocolInformation", "dop.ProtocolInformation",
+      { "ProtocolInformation", "dop.ProtocolInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_agreementID,
-      { "agreementID", "dop.agreementID",
+      { "agreementID", "dop.agreementID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_supplier_is_master,
@@ -2273,7 +2273,7 @@ void proto_register_dop(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dop_non_supplying_master,
-      { "non-supplying-master", "dop.non_supplying_master",
+      { "non-supplying-master", "dop.non_supplying_master_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPoint", HFILL }},
     { &hf_dop_consumers,
@@ -2281,7 +2281,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AccessPoint", HFILL }},
     { &hf_dop_consumers_item,
-      { "AccessPoint", "dop.AccessPoint",
+      { "AccessPoint", "dop.AccessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_bindingType,
@@ -2289,11 +2289,11 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_bindingID,
-      { "bindingID", "dop.bindingID",
+      { "bindingID", "dop.bindingID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_accessPoint,
-      { "accessPoint", "dop.accessPoint",
+      { "accessPoint", "dop.accessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_establishInitiator,
@@ -2301,43 +2301,43 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_EstablishArgumentInitiator_vals), 0,
         "EstablishArgumentInitiator", HFILL }},
     { &hf_dop_establishSymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishSymmetric", HFILL }},
     { &hf_dop_establishRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishRoleAInitiates", HFILL }},
     { &hf_dop_establishRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishRoleBInitiates", HFILL }},
     { &hf_dop_agreement,
-      { "agreement", "dop.agreement",
+      { "agreement", "dop.agreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_valid,
-      { "valid", "dop.valid",
+      { "valid", "dop.valid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Validity", HFILL }},
     { &hf_dop_securityParameters,
-      { "securityParameters", "dop.securityParameters",
+      { "securityParameters", "dop.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_unsignedEstablishOperationalBindingArgument,
-      { "unsignedEstablishOperationalBindingArgument", "dop.unsignedEstablishOperationalBindingArgument",
+      { "unsignedEstablishOperationalBindingArgument", "dop.unsignedEstablishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedEstablishOperationalBindingArgument,
-      { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument",
+      { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_establishOperationalBindingArgument,
-      { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument",
+      { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_algorithmIdentifier,
-      { "algorithmIdentifier", "dop.algorithmIdentifier",
+      { "algorithmIdentifier", "dop.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_encrypted,
@@ -2357,7 +2357,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_validFrom_vals), 0,
         NULL, HFILL }},
     { &hf_dop_now,
-      { "now", "dop.now",
+      { "now", "dop.now_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_time,
@@ -2369,7 +2369,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_validUntil_vals), 0,
         NULL, HFILL }},
     { &hf_dop_explicitTermination,
-      { "explicitTermination", "dop.explicitTermination",
+      { "explicitTermination", "dop.explicitTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_utcTime,
@@ -2385,15 +2385,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_initiator_vals), 0,
         NULL, HFILL }},
     { &hf_dop_symmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_roleA_replies,
-      { "roleA-replies", "dop.roleA_replies",
+      { "roleA-replies", "dop.roleA_replies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_roleB_replies,
-      { "roleB-replies", "dop.roleB_replies",
+      { "roleB-replies", "dop.roleB_replies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_performer,
@@ -2409,7 +2409,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
     { &hf_dop_notification_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_modifyInitiator,
@@ -2417,51 +2417,51 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_ModifyArgumentInitiator_vals), 0,
         "ModifyArgumentInitiator", HFILL }},
     { &hf_dop_modifySymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifySymmetric", HFILL }},
     { &hf_dop_modifyRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyRoleAInitiates", HFILL }},
     { &hf_dop_modifyRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyRoleBInitiates", HFILL }},
     { &hf_dop_newBindingID,
-      { "newBindingID", "dop.newBindingID",
+      { "newBindingID", "dop.newBindingID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_argumentNewAgreement,
-      { "newAgreement", "dop.newAgreement",
+      { "newAgreement", "dop.newAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ArgumentNewAgreement", HFILL }},
     { &hf_dop_unsignedModifyOperationalBindingArgument,
-      { "unsignedModifyOperationalBindingArgument", "dop.unsignedModifyOperationalBindingArgument",
+      { "unsignedModifyOperationalBindingArgument", "dop.unsignedModifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedModifyOperationalBindingArgument,
-      { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument",
+      { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_modifyOperationalBindingArgument,
-      { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument",
+      { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_null,
-      { "null", "dop.null",
+      { "null", "dop.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_protectedModifyResult,
-      { "protected", "dop.protected",
+      { "protected", "dop.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtectedModifyResult", HFILL }},
     { &hf_dop_modifyOperationalBindingResultData,
-      { "modifyOperationalBindingResultData", "dop.modifyOperationalBindingResultData",
+      { "modifyOperationalBindingResultData", "dop.modifyOperationalBindingResultData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_resultNewAgreement,
-      { "newAgreement", "dop.newAgreement",
+      { "newAgreement", "dop.newAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultNewAgreement", HFILL }},
     { &hf_dop_terminateInitiator,
@@ -2469,15 +2469,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_TerminateArgumentInitiator_vals), 0,
         "TerminateArgumentInitiator", HFILL }},
     { &hf_dop_terminateSymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateSymmetric", HFILL }},
     { &hf_dop_terminateRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateRoleAInitiates", HFILL }},
     { &hf_dop_terminateRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateRoleBInitiates", HFILL }},
     { &hf_dop_terminateAtTime,
@@ -2485,23 +2485,23 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
         "Time", HFILL }},
     { &hf_dop_unsignedTerminateOperationalBindingArgument,
-      { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument",
+      { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedTerminateOperationalBindingArgument,
-      { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument",
+      { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_terminateOperationalBindingArgument,
-      { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument",
+      { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_protectedTerminateResult,
-      { "protected", "dop.protected",
+      { "protected", "dop.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtectedTerminateResult", HFILL }},
     { &hf_dop_terminateOperationalBindingResultData,
-      { "terminateOperationalBindingResultData", "dop.terminateOperationalBindingResultData",
+      { "terminateOperationalBindingResultData", "dop.terminateOperationalBindingResultData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_terminateAtGeneralizedTime,
@@ -2513,7 +2513,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_problem_vals), 0,
         NULL, HFILL }},
     { &hf_dop_agreementProposal,
-      { "agreementProposal", "dop.agreementProposal",
+      { "agreementProposal", "dop.agreementProposal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_retryAt,
@@ -2537,7 +2537,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_entryInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_immediateSuperiorInfo,
@@ -2545,11 +2545,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_immediateSuperiorInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_DITcontext_item,
-      { "Vertex", "dop.Vertex",
+      { "Vertex", "dop.Vertex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_admPointInfo,
@@ -2557,7 +2557,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_admPointInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_subentries,
@@ -2565,7 +2565,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SubentryInfo", HFILL }},
     { &hf_dop_subentries_item,
-      { "SubentryInfo", "dop.SubentryInfo",
+      { "SubentryInfo", "dop.SubentryInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_accessPoints,
@@ -2577,7 +2577,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_info_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_alias,
@@ -2601,11 +2601,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_itemOrUserFirst_vals), 0,
         NULL, HFILL }},
     { &hf_dop_itemFirst,
-      { "itemFirst", "dop.itemFirst",
+      { "itemFirst", "dop.itemFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_protectedItems,
-      { "protectedItems", "dop.protectedItems",
+      { "protectedItems", "dop.protectedItems_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_itemPermissions,
@@ -2613,15 +2613,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ItemPermission", HFILL }},
     { &hf_dop_itemPermissions_item,
-      { "ItemPermission", "dop.ItemPermission",
+      { "ItemPermission", "dop.ItemPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userFirst,
-      { "userFirst", "dop.userFirst",
+      { "userFirst", "dop.userFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userClasses,
-      { "userClasses", "dop.userClasses",
+      { "userClasses", "dop.userClasses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userPermissions,
@@ -2629,15 +2629,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_UserPermission", HFILL }},
     { &hf_dop_userPermissions_item,
-      { "UserPermission", "dop.UserPermission",
+      { "UserPermission", "dop.UserPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_entry,
-      { "entry", "dop.entry",
+      { "entry", "dop.entry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_allUserAttributeTypes,
-      { "allUserAttributeTypes", "dop.allUserAttributeTypes",
+      { "allUserAttributeTypes", "dop.allUserAttributeTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_attributeType,
@@ -2657,7 +2657,7 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_allUserAttributeTypesAndValues,
-      { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues",
+      { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_attributeValue,
@@ -2665,7 +2665,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AttributeTypeAndValue", HFILL }},
     { &hf_dop_attributeValue_item,
-      { "AttributeTypeAndValue", "dop.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "dop.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_selfValue,
@@ -2685,7 +2685,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_MaxValueCount", HFILL }},
     { &hf_dop_maxValueCount_item,
-      { "MaxValueCount", "dop.MaxValueCount",
+      { "MaxValueCount", "dop.MaxValueCount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_maxImmSub,
@@ -2697,7 +2697,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_RestrictedValue", HFILL }},
     { &hf_dop_restrictedBy_item,
-      { "RestrictedValue", "dop.RestrictedValue",
+      { "RestrictedValue", "dop.RestrictedValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_contexts,
@@ -2705,7 +2705,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ContextAssertion", HFILL }},
     { &hf_dop_contexts_item,
-      { "ContextAssertion", "dop.ContextAssertion",
+      { "ContextAssertion", "dop.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_classes,
@@ -2725,11 +2725,11 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dop_allUsers,
-      { "allUsers", "dop.allUsers",
+      { "allUsers", "dop.allUsers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_thisEntry,
-      { "thisEntry", "dop.thisEntry",
+      { "thisEntry", "dop.thisEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_name,
@@ -2737,7 +2737,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_name_item,
-      { "NameAndOptionalUID", "dop.NameAndOptionalUID",
+      { "NameAndOptionalUID", "dop.NameAndOptionalUID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userGroup,
@@ -2745,7 +2745,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_userGroup_item,
-      { "NameAndOptionalUID", "dop.NameAndOptionalUID",
+      { "NameAndOptionalUID", "dop.NameAndOptionalUID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_subtree,
@@ -2753,7 +2753,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SubtreeSpecification", HFILL }},
     { &hf_dop_subtree_item,
-      { "SubtreeSpecification", "dop.SubtreeSpecification",
+      { "SubtreeSpecification", "dop.SubtreeSpecification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_grantsAndDenials,
@@ -2761,7 +2761,7 @@ void proto_register_dop(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_basicLevels,
-      { "basicLevels", "dop.basicLevels",
+      { "basicLevels", "dop.basicLevels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_level,
@@ -2777,7 +2777,7 @@ void proto_register_dop(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dop_other,
-      { "other", "dop.other",
+      { "other", "dop.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_dop_DSEType_root,