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, 137 insertions, 137 deletions

diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index 2029766c53..7115e20418 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -2555,7 +2555,7 @@ void proto_register_h501(void) {
 /*--- Included file: packet-h501-hfarr.c ---*/
 #line 1 "../../asn1/h501/packet-h501-hfarr.c"
     { &hf_h501_Message_PDU,
-      { "Message", "h501.Message",
+      { "Message", "h501.Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_body,
@@ -2563,135 +2563,135 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_MessageBody_vals), 0,
         "MessageBody", HFILL }},
     { &hf_h501_common,
-      { "common", "h501.common",
+      { "common", "h501.common_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageCommonInfo", HFILL }},
     { &hf_h501_serviceRequest,
-      { "serviceRequest", "h501.serviceRequest",
+      { "serviceRequest", "h501.serviceRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceConfirmation,
-      { "serviceConfirmation", "h501.serviceConfirmation",
+      { "serviceConfirmation", "h501.serviceConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRejection,
-      { "serviceRejection", "h501.serviceRejection",
+      { "serviceRejection", "h501.serviceRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRelease,
-      { "serviceRelease", "h501.serviceRelease",
+      { "serviceRelease", "h501.serviceRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorRequest,
-      { "descriptorRequest", "h501.descriptorRequest",
+      { "descriptorRequest", "h501.descriptorRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorConfirmation,
-      { "descriptorConfirmation", "h501.descriptorConfirmation",
+      { "descriptorConfirmation", "h501.descriptorConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorRejection,
-      { "descriptorRejection", "h501.descriptorRejection",
+      { "descriptorRejection", "h501.descriptorRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDRequest,
-      { "descriptorIDRequest", "h501.descriptorIDRequest",
+      { "descriptorIDRequest", "h501.descriptorIDRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDConfirmation,
-      { "descriptorIDConfirmation", "h501.descriptorIDConfirmation",
+      { "descriptorIDConfirmation", "h501.descriptorIDConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDRejection,
-      { "descriptorIDRejection", "h501.descriptorIDRejection",
+      { "descriptorIDRejection", "h501.descriptorIDRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorUpdate,
-      { "descriptorUpdate", "h501.descriptorUpdate",
+      { "descriptorUpdate", "h501.descriptorUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorUpdateAck,
-      { "descriptorUpdateAck", "h501.descriptorUpdateAck",
+      { "descriptorUpdateAck", "h501.descriptorUpdateAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessRequest,
-      { "accessRequest", "h501.accessRequest",
+      { "accessRequest", "h501.accessRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessConfirmation,
-      { "accessConfirmation", "h501.accessConfirmation",
+      { "accessConfirmation", "h501.accessConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessRejection,
-      { "accessRejection", "h501.accessRejection",
+      { "accessRejection", "h501.accessRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_requestInProgress,
-      { "requestInProgress", "h501.requestInProgress",
+      { "requestInProgress", "h501.requestInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardRequest,
-      { "nonStandardRequest", "h501.nonStandardRequest",
+      { "nonStandardRequest", "h501.nonStandardRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardConfirmation,
-      { "nonStandardConfirmation", "h501.nonStandardConfirmation",
+      { "nonStandardConfirmation", "h501.nonStandardConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardRejection,
-      { "nonStandardRejection", "h501.nonStandardRejection",
+      { "nonStandardRejection", "h501.nonStandardRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownMessageResponse,
-      { "unknownMessageResponse", "h501.unknownMessageResponse",
+      { "unknownMessageResponse", "h501.unknownMessageResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageRequest,
-      { "usageRequest", "h501.usageRequest",
+      { "usageRequest", "h501.usageRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageConfirmation,
-      { "usageConfirmation", "h501.usageConfirmation",
+      { "usageConfirmation", "h501.usageConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndication,
-      { "usageIndication", "h501.usageIndication",
+      { "usageIndication", "h501.usageIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndicationConfirmation,
-      { "usageIndicationConfirmation", "h501.usageIndicationConfirmation",
+      { "usageIndicationConfirmation", "h501.usageIndicationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndicationRejection,
-      { "usageIndicationRejection", "h501.usageIndicationRejection",
+      { "usageIndicationRejection", "h501.usageIndicationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageRejection,
-      { "usageRejection", "h501.usageRejection",
+      { "usageRejection", "h501.usageRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationRequest,
-      { "validationRequest", "h501.validationRequest",
+      { "validationRequest", "h501.validationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationConfirmation,
-      { "validationConfirmation", "h501.validationConfirmation",
+      { "validationConfirmation", "h501.validationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationRejection,
-      { "validationRejection", "h501.validationRejection",
+      { "validationRejection", "h501.validationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationRequest,
-      { "authenticationRequest", "h501.authenticationRequest",
+      { "authenticationRequest", "h501.authenticationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationConfirmation,
-      { "authenticationConfirmation", "h501.authenticationConfirmation",
+      { "authenticationConfirmation", "h501.authenticationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationRejection,
-      { "authenticationRejection", "h501.authenticationRejection",
+      { "authenticationRejection", "h501.authenticationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sequenceNumber,
@@ -2715,7 +2715,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h501_integrityCheckValue,
-      { "integrityCheckValue", "h501.integrityCheckValue",
+      { "integrityCheckValue", "h501.integrityCheckValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ICV", HFILL }},
     { &hf_h501_tokens,
@@ -2723,7 +2723,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ClearToken", HFILL }},
     { &hf_h501_tokens_item,
-      { "ClearToken", "h501.ClearToken",
+      { "ClearToken", "h501.ClearToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_cryptoTokens,
@@ -2739,7 +2739,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h501_nonStandard_item,
-      { "NonStandardParameter", "h501.NonStandardParameter",
+      { "NonStandardParameter", "h501.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceID,
@@ -2751,11 +2751,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericData", HFILL }},
     { &hf_h501_genericData_item,
-      { "GenericData", "h501.GenericData",
+      { "GenericData", "h501.GenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_featureSet,
-      { "featureSet", "h501.featureSet",
+      { "featureSet", "h501.featureSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_version,
@@ -2775,7 +2775,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SecurityMode", HFILL }},
     { &hf_h501_securityMode_item,
-      { "SecurityMode", "h501.SecurityMode",
+      { "SecurityMode", "h501.SecurityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_timeToLive,
@@ -2783,7 +2783,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4294967295", HFILL }},
     { &hf_h501_usageSpec,
-      { "usageSpec", "h501.usageSpec",
+      { "usageSpec", "h501.usageSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UsageSpecification", HFILL }},
     { &hf_h501_authentication,
@@ -2803,11 +2803,11 @@ void proto_register_h501(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h501_alternates,
-      { "alternates", "h501.alternates",
+      { "alternates", "h501.alternates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlternatePEInfo", HFILL }},
     { &hf_h501_securityMode_01,
-      { "securityMode", "h501.securityMode",
+      { "securityMode", "h501.securityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason,
@@ -2815,47 +2815,47 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ServiceRejectionReason_vals), 0,
         "ServiceRejectionReason", HFILL }},
     { &hf_h501_serviceUnavailable,
-      { "serviceUnavailable", "h501.serviceUnavailable",
+      { "serviceUnavailable", "h501.serviceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRedirected,
-      { "serviceRedirected", "h501.serviceRedirected",
+      { "serviceRedirected", "h501.serviceRedirected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_security,
-      { "security", "h501.security",
+      { "security", "h501.security_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_continue,
-      { "continue", "h501.continue",
+      { "continue", "h501.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_undefined,
-      { "undefined", "h501.undefined",
+      { "undefined", "h501.undefined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownServiceID,
-      { "unknownServiceID", "h501.unknownServiceID",
+      { "unknownServiceID", "h501.unknownServiceID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_cannotSupportUsageSpec,
-      { "cannotSupportUsageSpec", "h501.cannotSupportUsageSpec",
+      { "cannotSupportUsageSpec", "h501.cannotSupportUsageSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_neededFeature,
-      { "neededFeature", "h501.neededFeature",
+      { "neededFeature", "h501.neededFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_genericDataReason,
-      { "genericDataReason", "h501.genericDataReason",
+      { "genericDataReason", "h501.genericDataReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageUnavailable,
-      { "usageUnavailable", "h501.usageUnavailable",
+      { "usageUnavailable", "h501.usageUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownUsageSendTo,
-      { "unknownUsageSendTo", "h501.unknownUsageSendTo",
+      { "unknownUsageSendTo", "h501.unknownUsageSendTo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_01,
@@ -2863,19 +2863,19 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ServiceReleaseReason_vals), 0,
         "ServiceReleaseReason", HFILL }},
     { &hf_h501_outOfService,
-      { "outOfService", "h501.outOfService",
+      { "outOfService", "h501.outOfService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_maintenance,
-      { "maintenance", "h501.maintenance",
+      { "maintenance", "h501.maintenance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_terminated,
-      { "terminated", "h501.terminated",
+      { "terminated", "h501.terminated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_expired,
-      { "expired", "h501.expired",
+      { "expired", "h501.expired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorID,
@@ -2891,7 +2891,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Descriptor", HFILL }},
     { &hf_h501_descriptor_item,
-      { "Descriptor", "h501.Descriptor",
+      { "Descriptor", "h501.Descriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_02,
@@ -2903,19 +2903,19 @@ void proto_register_h501(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_packetSizeExceeded,
-      { "packetSizeExceeded", "h501.packetSizeExceeded",
+      { "packetSizeExceeded", "h501.packetSizeExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_illegalID,
-      { "illegalID", "h501.illegalID",
+      { "illegalID", "h501.illegalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_hopCountExceeded,
-      { "hopCountExceeded", "h501.hopCountExceeded",
+      { "hopCountExceeded", "h501.hopCountExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_noServiceRelationship,
-      { "noServiceRelationship", "h501.noServiceRelationship",
+      { "noServiceRelationship", "h501.noServiceRelationship_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo,
@@ -2923,7 +2923,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DescriptorInfo", HFILL }},
     { &hf_h501_descriptorInfo_item,
-      { "DescriptorInfo", "h501.DescriptorInfo",
+      { "DescriptorInfo", "h501.DescriptorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_03,
@@ -2931,7 +2931,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_DescriptorIDRejectionReason_vals), 0,
         "DescriptorIDRejectionReason", HFILL }},
     { &hf_h501_noDescriptors,
-      { "noDescriptors", "h501.noDescriptors",
+      { "noDescriptors", "h501.noDescriptors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sender,
@@ -2943,7 +2943,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_UpdateInformation", HFILL }},
     { &hf_h501_updateInfo_item,
-      { "UpdateInformation", "h501.UpdateInformation",
+      { "UpdateInformation", "h501.UpdateInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo_01,
@@ -2951,7 +2951,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_descriptorInfo_vals), 0,
         NULL, HFILL }},
     { &hf_h501_descriptor_01,
-      { "descriptor", "h501.descriptor",
+      { "descriptor", "h501.descriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_updateType,
@@ -2959,27 +2959,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_updateType_vals), 0,
         NULL, HFILL }},
     { &hf_h501_added,
-      { "added", "h501.added",
+      { "added", "h501.added_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_deleted,
-      { "deleted", "h501.deleted",
+      { "deleted", "h501.deleted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_changed,
-      { "changed", "h501.changed",
+      { "changed", "h501.changed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destinationInfo,
-      { "destinationInfo", "h501.destinationInfo",
+      { "destinationInfo", "h501.destinationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_sourceInfo,
-      { "sourceInfo", "h501.sourceInfo",
+      { "sourceInfo", "h501.sourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_callInfo,
-      { "callInfo", "h501.callInfo",
+      { "callInfo", "h501.callInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallInformation", HFILL }},
     { &hf_h501_desiredProtocols,
@@ -2995,7 +2995,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AddressTemplate", HFILL }},
     { &hf_h501_templates_item,
-      { "AddressTemplate", "h501.AddressTemplate",
+      { "AddressTemplate", "h501.AddressTemplate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_partialResponse,
@@ -3015,7 +3015,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ServiceControlSession", HFILL }},
     { &hf_h501_serviceControl_item,
-      { "ServiceControlSession", "h501.ServiceControlSession",
+      { "ServiceControlSession", "h501.ServiceControlSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_04,
@@ -3023,27 +3023,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_AccessRejectionReason_vals), 0,
         "AccessRejectionReason", HFILL }},
     { &hf_h501_noMatch,
-      { "noMatch", "h501.noMatch",
+      { "noMatch", "h501.noMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_needCallInformation,
-      { "needCallInformation", "h501.needCallInformation",
+      { "needCallInformation", "h501.needCallInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destinationUnavailable,
-      { "destinationUnavailable", "h501.destinationUnavailable",
+      { "destinationUnavailable", "h501.destinationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_aliasesInconsistent,
-      { "aliasesInconsistent", "h501.aliasesInconsistent",
+      { "aliasesInconsistent", "h501.aliasesInconsistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_resourceUnavailable,
-      { "resourceUnavailable", "h501.resourceUnavailable",
+      { "resourceUnavailable", "h501.resourceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_incompleteAddress,
-      { "incompleteAddress", "h501.incompleteAddress",
+      { "incompleteAddress", "h501.incompleteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_05,
@@ -3067,11 +3067,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UsageCallStatus_vals), 0,
         NULL, HFILL }},
     { &hf_h501_srcInfo,
-      { "srcInfo", "h501.srcInfo",
+      { "srcInfo", "h501.srcInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_destAddress,
-      { "destAddress", "h501.destAddress",
+      { "destAddress", "h501.destAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_startTime,
@@ -3083,7 +3083,7 @@ void proto_register_h501(void) {
         FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0,
         "TimeStamp", HFILL }},
     { &hf_h501_terminationCause,
-      { "terminationCause", "h501.terminationCause",
+      { "terminationCause", "h501.terminationCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageFields,
@@ -3091,7 +3091,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_UsageField", HFILL }},
     { &hf_h501_usageFields_item,
-      { "UsageField", "h501.UsageField",
+      { "UsageField", "h501.UsageField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_id,
@@ -3103,11 +3103,11 @@ void proto_register_h501(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h501_invalidCall,
-      { "invalidCall", "h501.invalidCall",
+      { "invalidCall", "h501.invalidCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unavailable,
-      { "unavailable", "h501.unavailable",
+      { "unavailable", "h501.unavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_06,
@@ -3115,11 +3115,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UsageIndicationRejectionReason_vals), 0,
         "UsageIndicationRejectionReason", HFILL }},
     { &hf_h501_unknownCall,
-      { "unknownCall", "h501.unknownCall",
+      { "unknownCall", "h501.unknownCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_incomplete,
-      { "incomplete", "h501.incomplete",
+      { "incomplete", "h501.incomplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessToken,
@@ -3135,15 +3135,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ValidationRejectionReason_vals), 0,
         "ValidationRejectionReason", HFILL }},
     { &hf_h501_tokenNotValid,
-      { "tokenNotValid", "h501.tokenNotValid",
+      { "tokenNotValid", "h501.tokenNotValid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_missingSourceInfo,
-      { "missingSourceInfo", "h501.missingSourceInfo",
+      { "missingSourceInfo", "h501.missingSourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_missingDestInfo,
-      { "missingDestInfo", "h501.missingDestInfo",
+      { "missingDestInfo", "h501.missingDestInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_delay,
@@ -3155,7 +3155,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_NonStandardRejectionReason_vals), 0,
         "NonStandardRejectionReason", HFILL }},
     { &hf_h501_notSupported,
-      { "notSupported", "h501.notSupported",
+      { "notSupported", "h501.notSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownMessage,
@@ -3167,7 +3167,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UnknownMessageReason_vals), 0,
         "UnknownMessageReason", HFILL }},
     { &hf_h501_notUnderstood,
-      { "notUnderstood", "h501.notUnderstood",
+      { "notUnderstood", "h501.notUnderstood_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_applicationMessage,
@@ -3179,27 +3179,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_AuthenticationRejectionReason_vals), 0,
         "AuthenticationRejectionReason", HFILL }},
     { &hf_h501_securityWrongSyncTime,
-      { "securityWrongSyncTime", "h501.securityWrongSyncTime",
+      { "securityWrongSyncTime", "h501.securityWrongSyncTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityReplay,
-      { "securityReplay", "h501.securityReplay",
+      { "securityReplay", "h501.securityReplay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongGeneralID,
-      { "securityWrongGeneralID", "h501.securityWrongGeneralID",
+      { "securityWrongGeneralID", "h501.securityWrongGeneralID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongSendersID,
-      { "securityWrongSendersID", "h501.securityWrongSendersID",
+      { "securityWrongSendersID", "h501.securityWrongSendersID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityIntegrityFailed,
-      { "securityIntegrityFailed", "h501.securityIntegrityFailed",
+      { "securityIntegrityFailed", "h501.securityIntegrityFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongOID,
-      { "securityWrongOID", "h501.securityWrongOID",
+      { "securityWrongOID", "h501.securityWrongOID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_pattern,
@@ -3215,7 +3215,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RouteInformation", HFILL }},
     { &hf_h501_routeInfo_item,
-      { "RouteInformation", "h501.RouteInformation",
+      { "RouteInformation", "h501.RouteInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_specific,
@@ -3227,7 +3227,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AliasAddress", HFILL }},
     { &hf_h501_range,
-      { "range", "h501.range",
+      { "range", "h501.range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_startOfRange,
@@ -3243,15 +3243,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_messageType_vals), 0,
         NULL, HFILL }},
     { &hf_h501_sendAccessRequest,
-      { "sendAccessRequest", "h501.sendAccessRequest",
+      { "sendAccessRequest", "h501.sendAccessRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sendSetup,
-      { "sendSetup", "h501.sendSetup",
+      { "sendSetup", "h501.sendSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonExistent,
-      { "nonExistent", "h501.nonExistent",
+      { "nonExistent", "h501.nonExistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callSpecific,
@@ -3263,7 +3263,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PriceInfoSpec", HFILL }},
     { &hf_h501_priceInfo_item,
-      { "PriceInfoSpec", "h501.PriceInfoSpec",
+      { "PriceInfoSpec", "h501.PriceInfoSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_contacts,
@@ -3271,15 +3271,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ContactInformation", HFILL }},
     { &hf_h501_contacts_item,
-      { "ContactInformation", "h501.ContactInformation",
+      { "ContactInformation", "h501.ContactInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_type,
-      { "type", "h501.type",
+      { "type", "h501.type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h501_circuitID,
-      { "circuitID", "h501.circuitID",
+      { "circuitID", "h501.circuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CircuitInfo", HFILL }},
     { &hf_h501_supportedCircuits,
@@ -3287,7 +3287,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CircuitIdentifier", HFILL }},
     { &hf_h501_supportedCircuits_item,
-      { "CircuitIdentifier", "h501.CircuitIdentifier",
+      { "CircuitIdentifier", "h501.CircuitIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_transportAddress,
@@ -3307,7 +3307,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SecurityMode", HFILL }},
     { &hf_h501_security_item,
-      { "SecurityMode", "h501.SecurityMode",
+      { "SecurityMode", "h501.SecurityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_multipleCalls,
@@ -3343,7 +3343,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PriceElement", HFILL }},
     { &hf_h501_priceElement_item,
-      { "PriceElement", "h501.PriceElement",
+      { "PriceElement", "h501.PriceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_priceFormula,
@@ -3363,31 +3363,31 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_units_vals), 0,
         NULL, HFILL }},
     { &hf_h501_seconds,
-      { "seconds", "h501.seconds",
+      { "seconds", "h501.seconds_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_packets,
-      { "packets", "h501.packets",
+      { "packets", "h501.packets_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_bytes,
-      { "bytes", "h501.bytes",
+      { "bytes", "h501.bytes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_initial,
-      { "initial", "h501.initial",
+      { "initial", "h501.initial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_minimum,
-      { "minimum", "h501.minimum",
+      { "minimum", "h501.minimum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_maximum,
-      { "maximum", "h501.maximum",
+      { "maximum", "h501.maximum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo_02,
-      { "descriptorInfo", "h501.descriptorInfo",
+      { "descriptorInfo", "h501.descriptorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_gatekeeperID,
@@ -3403,7 +3403,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlternatePE", HFILL }},
     { &hf_h501_alternatePE_item,
-      { "AlternatePE", "h501.AlternatePE",
+      { "AlternatePE", "h501.AlternatePE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_alternateIsPermanent,
@@ -3419,7 +3419,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_127", HFILL }},
     { &hf_h501_token,
-      { "token", "h501.token",
+      { "token", "h501.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ClearToken", HFILL }},
     { &hf_h501_cryptoToken,
@@ -3427,11 +3427,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h225_CryptoH323Token_vals), 0,
         "CryptoH323Token", HFILL }},
     { &hf_h501_genericData_01,
-      { "genericData", "h501.genericData",
+      { "genericData", "h501.genericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callIdentifier,
-      { "callIdentifier", "h501.callIdentifier",
+      { "callIdentifier", "h501.callIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_conferenceID,
@@ -3439,19 +3439,19 @@ void proto_register_h501(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         "ConferenceIdentifier", HFILL }},
     { &hf_h501_preConnect,
-      { "preConnect", "h501.preConnect",
+      { "preConnect", "h501.preConnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callInProgress,
-      { "callInProgress", "h501.callInProgress",
+      { "callInProgress", "h501.callInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callEnded,
-      { "callEnded", "h501.callEnded",
+      { "callEnded", "h501.callEnded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_registrationLost,
-      { "registrationLost", "h501.registrationLost",
+      { "registrationLost", "h501.registrationLost_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_userIdentifier,
@@ -3471,19 +3471,19 @@ void proto_register_h501(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ElementIdentifier", HFILL }},
     { &hf_h501_when,
-      { "when", "h501.when",
+      { "when", "h501.when_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_never,
-      { "never", "h501.never",
+      { "never", "h501.never_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_start,
-      { "start", "h501.start",
+      { "start", "h501.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_end,
-      { "end", "h501.end",
+      { "end", "h501.end_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_period,
@@ -3491,7 +3491,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h501_failures,
-      { "failures", "h501.failures",
+      { "failures", "h501.failures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_required,
@@ -3523,11 +3523,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h501_endpointType,
-      { "endpointType", "h501.endpointType",
+      { "endpointType", "h501.endpointType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_userInfo,
-      { "userInfo", "h501.userInfo",
+      { "userInfo", "h501.userInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UserInformation", HFILL }},
     { &hf_h501_timeZone,
@@ -3535,15 +3535,15 @@ void proto_register_h501(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_originator,
-      { "originator", "h501.originator",
+      { "originator", "h501.originator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destination,
-      { "destination", "h501.destination",
+      { "destination", "h501.destination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardData,
-      { "nonStandardData", "h501.nonStandardData",
+      { "nonStandardData", "h501.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h501_releaseCompleteReason,