Regenerate a few more of the ASN.1 dissectors
[obnox/wireshark/wip.git] / epan / dissectors / packet-x420.c
index 5b98fde8ffb94455db841f35ae90a9be9e5170f2..f6ecbb56d6db68b1e3863d455b5229af3e8beac8 100644 (file)
@@ -4566,1443 +4566,1443 @@ void proto_register_x420(void) {
     { &hf_x420_InformationObject_PDU,
       { "InformationObject", "x420.InformationObject",
         FT_UINT32, BASE_DEC, VALS(x420_InformationObject_vals), 0,
-        "x420.InformationObject", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Heading_PDU,
       { "Heading", "x420.Heading",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Heading", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ORDescriptor_PDU,
       { "ORDescriptor", "x420.ORDescriptor",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ORDescriptor", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ThisIPMField_PDU,
       { "ThisIPMField", "x420.ThisIPMField",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ThisIPMField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_OriginatorField_PDU,
       { "OriginatorField", "x420.OriginatorField",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginatorField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AuthorizingUsersSubfield_PDU,
       { "AuthorizingUsersSubfield", "x420.AuthorizingUsersSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.AuthorizingUsersSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_PrimaryRecipientsSubfield_PDU,
       { "PrimaryRecipientsSubfield", "x420.PrimaryRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.PrimaryRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CopyRecipientsSubfield_PDU,
       { "CopyRecipientsSubfield", "x420.CopyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CopyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BlindCopyRecipientsSubfield_PDU,
       { "BlindCopyRecipientsSubfield", "x420.BlindCopyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BlindCopyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RepliedToIPMField_PDU,
       { "RepliedToIPMField", "x420.RepliedToIPMField",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RepliedToIPMField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ObsoletedIPMsSubfield_PDU,
       { "ObsoletedIPMsSubfield", "x420.ObsoletedIPMsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ObsoletedIPMsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RelatedIPMsSubfield_PDU,
       { "RelatedIPMsSubfield", "x420.RelatedIPMsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RelatedIPMsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_SubjectField_PDU,
       { "SubjectField", "x420.SubjectField",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.SubjectField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ExpiryTimeField_PDU,
       { "ExpiryTimeField", "x420.ExpiryTimeField",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.ExpiryTimeField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ReplyTimeField_PDU,
       { "ReplyTimeField", "x420.ReplyTimeField",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.ReplyTimeField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ReplyRecipientsSubfield_PDU,
       { "ReplyRecipientsSubfield", "x420.ReplyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ReplyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ImportanceField_PDU,
       { "ImportanceField", "x420.ImportanceField",
         FT_UINT32, BASE_DEC, VALS(x420_ImportanceField_vals), 0,
-        "x420.ImportanceField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_SensitivityField_PDU,
       { "SensitivityField", "x420.SensitivityField",
         FT_UINT32, BASE_DEC, VALS(x420_SensitivityField_vals), 0,
-        "x420.SensitivityField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AutoForwardedField_PDU,
       { "AutoForwardedField", "x420.AutoForwardedField",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "x420.AutoForwardedField", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Body_PDU,
       { "Body", "x420.Body",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.Body", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IA5TextParameters_PDU,
       { "IA5TextParameters", "x420.IA5TextParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IA5TextParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IA5TextData_PDU,
       { "IA5TextData", "x420.IA5TextData",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.IA5TextData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_G3FacsimileParameters_PDU,
       { "G3FacsimileParameters", "x420.G3FacsimileParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.G3FacsimileParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_G3FacsimileData_PDU,
       { "G3FacsimileData", "x420.G3FacsimileData",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.G3FacsimileData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_G4Class1BodyPart_PDU,
       { "G4Class1BodyPart", "x420.G4Class1BodyPart",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.G4Class1BodyPart", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_MixedModeBodyPart_PDU,
       { "MixedModeBodyPart", "x420.MixedModeBodyPart",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.MixedModeBodyPart", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_TeletexParameters_PDU,
       { "TeletexParameters", "x420.TeletexParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.TeletexParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_TeletexData_PDU,
       { "TeletexData", "x420.TeletexData",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.TeletexData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_VideotexParameters_PDU,
       { "VideotexParameters", "x420.VideotexParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.VideotexParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_VideotexData_PDU,
       { "VideotexData", "x420.VideotexData",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.VideotexData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_EncryptedParameters_PDU,
       { "EncryptedParameters", "x420.EncryptedParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EncryptedParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_EncryptedData_PDU,
       { "EncryptedData", "x420.EncryptedData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.EncryptedData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_MessageParameters_PDU,
       { "MessageParameters", "x420.MessageParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_MessageData_PDU,
       { "MessageData", "x420.MessageData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BilaterallyDefinedBodyPart_PDU,
       { "BilaterallyDefinedBodyPart", "x420.BilaterallyDefinedBodyPart",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.BilaterallyDefinedBodyPart", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPN_PDU,
       { "IPN", "x420.IPN",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPN", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AbsenceAdvice_PDU,
       { "AbsenceAdvice", "x420.AbsenceAdvice",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.AbsenceAdvice", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ChangeOfAddressAdvice_PDU,
       { "ChangeOfAddressAdvice", "x420.ChangeOfAddressAdvice",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ChangeOfAddressAdvice", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPMAssemblyInstructions_PDU,
       { "IPMAssemblyInstructions", "x420.IPMAssemblyInstructions",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMAssemblyInstructions", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IncompleteCopy_PDU,
       { "IncompleteCopy", "x420.IncompleteCopy",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IncompleteCopy", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Languages_PDU,
       { "Languages", "x420.Languages",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.Languages", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Language_PDU,
       { "Language", "x420.Language",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.Language", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AutoSubmitted_PDU,
       { "AutoSubmitted", "x420.AutoSubmitted",
         FT_UINT32, BASE_DEC, VALS(x420_AutoSubmitted_vals), 0,
-        "x420.AutoSubmitted", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartSignatures_PDU,
       { "BodyPartSignatures", "x420.BodyPartSignatures",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartSignatures", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPMSecurityLabel_PDU,
       { "IPMSecurityLabel", "x420.IPMSecurityLabel",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSecurityLabel", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartSecurityLabel_PDU,
       { "BodyPartSecurityLabel", "x420.BodyPartSecurityLabel",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPartSecurityLabel_vals), 0,
-        "x420.BodyPartSecurityLabel", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AuthorizationTime_PDU,
       { "AuthorizationTime", "x420.AuthorizationTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.AuthorizationTime", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CirculationList_PDU,
       { "CirculationList", "x420.CirculationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.CirculationList", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CirculationMember_PDU,
       { "CirculationMember", "x420.CirculationMember",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationMember", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CirculationListIndicator_PDU,
       { "CirculationListIndicator", "x420.CirculationListIndicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationListIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_DistributionCodes_PDU,
       { "DistributionCodes", "x420.DistributionCodes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.DistributionCodes", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_DistributionCode_PDU,
       { "DistributionCode", "x420.DistributionCode",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.DistributionCode", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ExtendedSubject_PDU,
       { "ExtendedSubject", "x420.ExtendedSubject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ExtendedSubject", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_InformationCategories_PDU,
       { "InformationCategories", "x420.InformationCategories",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.InformationCategories", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_InformationCategory_PDU,
       { "InformationCategory", "x420.InformationCategory",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.InformationCategory", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ManualHandlingInstructions_PDU,
       { "ManualHandlingInstructions", "x420.ManualHandlingInstructions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ManualHandlingInstructions", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ManualHandlingInstruction_PDU,
       { "ManualHandlingInstruction", "x420.ManualHandlingInstruction",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ManualHandlingInstruction", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_OriginatorsReference_PDU,
       { "OriginatorsReference", "x420.OriginatorsReference",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginatorsReference", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_PrecedencePolicyIdentifier_PDU,
       { "PrecedencePolicyIdentifier", "x420.PrecedencePolicyIdentifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.PrecedencePolicyIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Precedence_PDU,
       { "Precedence", "x420.Precedence",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.Precedence", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_GeneralTextParameters_PDU,
       { "GeneralTextParameters", "x420.GeneralTextParameters",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.GeneralTextParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_GeneralTextData_PDU,
       { "GeneralTextData", "x420.GeneralTextData",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GeneralTextData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_FileTransferParameters_PDU,
       { "FileTransferParameters", "x420.FileTransferParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.FileTransferParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_FileTransferData_PDU,
       { "FileTransferData", "x420.FileTransferData",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.FileTransferData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_VoiceParameters_PDU,
       { "VoiceParameters", "x420.VoiceParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.VoiceParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_VoiceData_PDU,
       { "VoiceData", "x420.VoiceData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.VoiceData", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ForwardedContentParameters_PDU,
       { "ForwardedContentParameters", "x420.ForwardedContentParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ForwardedContentParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPMEntryType_PDU,
       { "IPMEntryType", "x420.IPMEntryType",
         FT_UINT32, BASE_DEC, VALS(x420_IPMEntryType_vals), 0,
-        "x420.IPMEntryType", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPMSynopsis_PDU,
       { "IPMSynopsis", "x420.IPMSynopsis",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.IPMSynopsis", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartDescriptor_PDU,
       { "BodyPartDescriptor", "x420.BodyPartDescriptor",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BodyPartDescriptor", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartSignatureVerification_PDU,
       { "BodyPartSignatureVerification", "x420.BodyPartSignatureVerification",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartSignatureVerification", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IPMLocation_PDU,
       { "IPMLocation", "x420.IPMLocation",
         FT_UINT32, BASE_DEC, VALS(x420_IPMLocation_vals), 0,
-        "x420.IPMLocation", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_DeliveredReplyStatus_PDU,
       { "DeliveredReplyStatus", "x420.DeliveredReplyStatus",
         FT_INT32, BASE_DEC, VALS(x420_DeliveredReplyStatus_vals), 0,
-        "x420.DeliveredReplyStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CorrelatedDeliveredReplies_PDU,
       { "CorrelatedDeliveredReplies", "x420.CorrelatedDeliveredReplies",
         FT_UINT32, BASE_DEC, VALS(x420_CorrelatedDeliveredReplies_vals), 0,
-        "x420.CorrelatedDeliveredReplies", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_DeliveredIPNStatus_PDU,
       { "DeliveredIPNStatus", "x420.DeliveredIPNStatus",
         FT_INT32, BASE_DEC, VALS(x420_DeliveredIPNStatus_vals), 0,
-        "x420.DeliveredIPNStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CorrelatedDeliveredIPNs_PDU,
       { "CorrelatedDeliveredIPNs", "x420.CorrelatedDeliveredIPNs",
         FT_UINT32, BASE_DEC, VALS(x420_CorrelatedDeliveredIPNs_vals), 0,
-        "x420.CorrelatedDeliveredIPNs", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_SubmittedReplyStatus_PDU,
       { "SubmittedReplyStatus", "x420.SubmittedReplyStatus",
         FT_INT32, BASE_DEC, VALS(x420_SubmittedReplyStatus_vals), 0,
-        "x420.SubmittedReplyStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_SubmittedIPNStatus_PDU,
       { "SubmittedIPNStatus", "x420.SubmittedIPNStatus",
         FT_INT32, BASE_DEC, VALS(x420_SubmittedIPNStatus_vals), 0,
-        "x420.SubmittedIPNStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientCategory_PDU,
       { "RecipientCategory", "x420.RecipientCategory",
         FT_INT32, BASE_DEC, VALS(x420_RecipientCategory_vals), 0,
-        "x420.RecipientCategory", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_PDU,
       { "RecipientSecurityRequest", "x420.RecipientSecurityRequest",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.RecipientSecurityRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_IpnSecurityResponse_PDU,
       { "IpnSecurityResponse", "x420.IpnSecurityResponse",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IpnSecurityResponse", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartTokens_PDU,
       { "BodyPartTokens", "x420.BodyPartTokens",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartTokens", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ForwardedContentToken_PDU,
       { "ForwardedContentToken", "x420.ForwardedContentToken",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ForwardedContentToken", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ipm,
       { "ipm", "x420.ipm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPM", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ipn,
       { "ipn", "x420.ipn",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPN", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_heading,
       { "heading", "x420.heading",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Heading", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body,
       { "body", "x420.body",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.Body", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_type,
       { "type", "x420.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.T_type", HFILL }},
+        "T_type", HFILL }},
     { &hf_x420_value,
       { "value", "x420.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_value", HFILL }},
+        "T_value", HFILL }},
     { &hf_x420_this_IPM,
       { "this-IPM", "x420.this_IPM",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ThisIPMField", HFILL }},
+        "ThisIPMField", HFILL }},
     { &hf_x420_originator,
       { "originator", "x420.originator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginatorField", HFILL }},
+        "OriginatorField", HFILL }},
     { &hf_x420_authorizing_users,
       { "authorizing-users", "x420.authorizing_users",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.AuthorizingUsersField", HFILL }},
+        "AuthorizingUsersField", HFILL }},
     { &hf_x420_primary_recipients,
       { "primary-recipients", "x420.primary_recipients",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.PrimaryRecipientsField", HFILL }},
+        "PrimaryRecipientsField", HFILL }},
     { &hf_x420_copy_recipients,
       { "copy-recipients", "x420.copy_recipients",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.CopyRecipientsField", HFILL }},
+        "CopyRecipientsField", HFILL }},
     { &hf_x420_blind_copy_recipients,
       { "blind-copy-recipients", "x420.blind_copy_recipients",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BlindCopyRecipientsField", HFILL }},
+        "BlindCopyRecipientsField", HFILL }},
     { &hf_x420_replied_to_IPM,
       { "replied-to-IPM", "x420.replied_to_IPM",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RepliedToIPMField", HFILL }},
+        "RepliedToIPMField", HFILL }},
     { &hf_x420_obsoleted_IPMs,
       { "obsoleted-IPMs", "x420.obsoleted_IPMs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ObsoletedIPMsField", HFILL }},
+        "ObsoletedIPMsField", HFILL }},
     { &hf_x420_related_IPMs,
       { "related-IPMs", "x420.related_IPMs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.RelatedIPMsField", HFILL }},
+        "RelatedIPMsField", HFILL }},
     { &hf_x420_subject,
       { "subject", "x420.subject",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.SubjectField", HFILL }},
+        "SubjectField", HFILL }},
     { &hf_x420_expiry_time,
       { "expiry-time", "x420.expiry_time",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.ExpiryTimeField", HFILL }},
+        "ExpiryTimeField", HFILL }},
     { &hf_x420_reply_time,
       { "reply-time", "x420.reply_time",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.ReplyTimeField", HFILL }},
+        "ReplyTimeField", HFILL }},
     { &hf_x420_reply_recipients,
       { "reply-recipients", "x420.reply_recipients",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ReplyRecipientsField", HFILL }},
+        "ReplyRecipientsField", HFILL }},
     { &hf_x420_importance,
       { "importance", "x420.importance",
         FT_UINT32, BASE_DEC, VALS(x420_ImportanceField_vals), 0,
-        "x420.ImportanceField", HFILL }},
+        "ImportanceField", HFILL }},
     { &hf_x420_sensitivity,
       { "sensitivity", "x420.sensitivity",
         FT_UINT32, BASE_DEC, VALS(x420_SensitivityField_vals), 0,
-        "x420.SensitivityField", HFILL }},
+        "SensitivityField", HFILL }},
     { &hf_x420_auto_forwarded,
       { "auto-forwarded", "x420.auto_forwarded",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "x420.AutoForwardedField", HFILL }},
+        "AutoForwardedField", HFILL }},
     { &hf_x420_extensions,
       { "extensions", "x420.extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ExtensionsField", HFILL }},
+        "ExtensionsField", HFILL }},
     { &hf_x420_user,
       { "user", "x420.user",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.ORName", HFILL }},
+        "ORName", HFILL }},
     { &hf_x420_user_relative_identifier,
       { "user-relative-identifier", "x420.user_relative_identifier",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.LocalIPMIdentifier", HFILL }},
+        "LocalIPMIdentifier", HFILL }},
     { &hf_x420_recipient,
       { "recipient", "x420.recipient",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ORDescriptor", HFILL }},
+        "ORDescriptor", HFILL }},
     { &hf_x420_notification_requests,
       { "notification-requests", "x420.notification_requests",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.NotificationRequests", HFILL }},
+        "NotificationRequests", HFILL }},
     { &hf_x420_reply_requested,
       { "reply-requested", "x420.reply_requested",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "x420.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_x420_recipient_extensions,
       { "recipient-extensions", "x420.recipient_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.RecipientExtensionsField", HFILL }},
+        "RecipientExtensionsField", HFILL }},
     { &hf_x420_formal_name,
       { "formal-name", "x420.formal_name",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.ORName", HFILL }},
+        "ORName", HFILL }},
     { &hf_x420_free_form_name,
       { "free-form-name", "x420.free_form_name",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.FreeFormName", HFILL }},
+        "FreeFormName", HFILL }},
     { &hf_x420_telephone_number,
       { "telephone-number", "x420.telephone_number",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.TelephoneNumber", HFILL }},
+        "TelephoneNumber", HFILL }},
     { &hf_x420_RecipientExtensionsField_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_AuthorizingUsersField_item,
       { "AuthorizingUsersSubfield", "x420.AuthorizingUsersSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.AuthorizingUsersSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_PrimaryRecipientsField_item,
       { "PrimaryRecipientsSubfield", "x420.PrimaryRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.PrimaryRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_CopyRecipientsField_item,
       { "CopyRecipientsSubfield", "x420.CopyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CopyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BlindCopyRecipientsField_item,
       { "BlindCopyRecipientsSubfield", "x420.BlindCopyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BlindCopyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ObsoletedIPMsField_item,
       { "ObsoletedIPMsSubfield", "x420.ObsoletedIPMsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ObsoletedIPMsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RelatedIPMsField_item,
       { "RelatedIPMsSubfield", "x420.RelatedIPMsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RelatedIPMsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ReplyRecipientsField_item,
       { "ReplyRecipientsSubfield", "x420.ReplyRecipientsSubfield",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ReplyRecipientsSubfield", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ExtensionsField_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Body_item,
       { "BodyPart", "x420.BodyPart",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPart_vals), 0,
-        "x420.BodyPart", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_basic,
       { "basic", "x420.basic",
         FT_UINT32, BASE_DEC, VALS(x420_T_basic_vals), 0,
-        "x420.T_basic", HFILL }},
+        "T_basic", HFILL }},
     { &hf_x420_ia5_text,
       { "ia5-text", "x420.ia5_text",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IA5TextBodyPart", HFILL }},
+        "IA5TextBodyPart", HFILL }},
     { &hf_x420_g3_facsimile,
       { "g3-facsimile", "x420.g3_facsimile",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.G3FacsimileBodyPart", HFILL }},
+        "G3FacsimileBodyPart", HFILL }},
     { &hf_x420_g4_class1,
       { "g4-class1", "x420.g4_class1",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.G4Class1BodyPart", HFILL }},
+        "G4Class1BodyPart", HFILL }},
     { &hf_x420_teletex,
       { "teletex", "x420.teletex",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.TeletexBodyPart", HFILL }},
+        "TeletexBodyPart", HFILL }},
     { &hf_x420_videotex,
       { "videotex", "x420.videotex",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.VideotexBodyPart", HFILL }},
+        "VideotexBodyPart", HFILL }},
     { &hf_x420_encrypted_bp,
       { "encrypted", "x420.encrypted",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EncryptedBodyPart", HFILL }},
+        "EncryptedBodyPart", HFILL }},
     { &hf_x420_message,
       { "message", "x420.message",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageBodyPart", HFILL }},
+        "MessageBodyPart", HFILL }},
     { &hf_x420_mixed_mode,
       { "mixed-mode", "x420.mixed_mode",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.MixedModeBodyPart", HFILL }},
+        "MixedModeBodyPart", HFILL }},
     { &hf_x420_bilaterally_defined,
       { "bilaterally-defined", "x420.bilaterally_defined",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.BilaterallyDefinedBodyPart", HFILL }},
+        "BilaterallyDefinedBodyPart", HFILL }},
     { &hf_x420_nationally_defined,
       { "nationally-defined", "x420.nationally_defined",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NationallyDefinedBodyPart", HFILL }},
+        "NationallyDefinedBodyPart", HFILL }},
     { &hf_x420_extended,
       { "extended", "x420.extended",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ExtendedBodyPart", HFILL }},
+        "ExtendedBodyPart", HFILL }},
     { &hf_x420_extended_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.INSTANCE_OF", HFILL }},
+        "INSTANCE_OF", HFILL }},
     { &hf_x420_extended_data,
       { "data", "x420.data",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.INSTANCE_OF", HFILL }},
+        "INSTANCE_OF", HFILL }},
     { &hf_x420_ia5text_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IA5TextParameters", HFILL }},
+        "IA5TextParameters", HFILL }},
     { &hf_x420_ia5text_data,
       { "data", "x420.data",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.IA5TextData", HFILL }},
+        "IA5TextData", HFILL }},
     { &hf_x420_repertoire,
       { "repertoire", "x420.repertoire",
         FT_UINT32, BASE_DEC, VALS(x420_Repertoire_vals), 0,
-        "x420.Repertoire", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_g3facsimile_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.G3FacsimileParameters", HFILL }},
+        "G3FacsimileParameters", HFILL }},
     { &hf_x420_g3facsimile_data,
       { "data", "x420.data",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.G3FacsimileData", HFILL }},
+        "G3FacsimileData", HFILL }},
     { &hf_x420_number_of_pages,
       { "number-of-pages", "x420.number_of_pages",
         FT_INT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_x420_g3facsimile_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x411.G3FacsimileNonBasicParameters", HFILL }},
+        "G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x420_G3FacsimileData_item,
       { "G3FacsimileData item", "x420.G3FacsimileData_item",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.BIT_STRING", HFILL }},
+        "BIT_STRING", HFILL }},
     { &hf_x420_G4Class1BodyPart_item,
       { "Interchange-Data-Element", "x420.Interchange_Data_Element",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Interchange_Data_Element", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_MixedModeBodyPart_item,
       { "Interchange-Data-Element", "x420.Interchange_Data_Element",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Interchange_Data_Element", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_teletex_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.TeletexParameters", HFILL }},
+        "TeletexParameters", HFILL }},
     { &hf_x420_teletex_data,
       { "data", "x420.data",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.TeletexData", HFILL }},
+        "TeletexData", HFILL }},
     { &hf_x420_telex_compatible,
       { "telex-compatible", "x420.telex_compatible",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "x420.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_x420_teletex_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.TeletexNonBasicParameters", HFILL }},
+        "TeletexNonBasicParameters", HFILL }},
     { &hf_x420_TeletexData_item,
       { "TeletexData item", "x420.TeletexData_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.TeletexString", HFILL }},
+        "TeletexString", HFILL }},
     { &hf_x420_videotex_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.VideotexParameters", HFILL }},
+        "VideotexParameters", HFILL }},
     { &hf_x420_videotex_data,
       { "data", "x420.data",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.VideotexData", HFILL }},
+        "VideotexData", HFILL }},
     { &hf_x420_syntax,
       { "syntax", "x420.syntax",
         FT_INT32, BASE_DEC, VALS(x420_VideotexSyntax_vals), 0,
-        "x420.VideotexSyntax", HFILL }},
+        "VideotexSyntax", HFILL }},
     { &hf_x420_encrypted_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EncryptedParameters", HFILL }},
+        "EncryptedParameters", HFILL }},
     { &hf_x420_encrypted_data,
       { "data", "x420.data",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.EncryptedData", HFILL }},
+        "EncryptedData", HFILL }},
     { &hf_x420_algorithm_identifier,
       { "algorithm-identifier", "x420.algorithm_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_x420_originator_certificates,
       { "originator-certificates", "x420.originator_certificates",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x411.ExtendedCertificates", HFILL }},
+        "ExtendedCertificates", HFILL }},
     { &hf_x420_message_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageParameters", HFILL }},
+        "MessageParameters", HFILL }},
     { &hf_x420_message_data,
       { "data", "x420.data",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageData", HFILL }},
+        "MessageData", HFILL }},
     { &hf_x420_delivery_time,
       { "delivery-time", "x420.delivery_time",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x411.MessageDeliveryTime", HFILL }},
+        "MessageDeliveryTime", HFILL }},
     { &hf_x420_delivery_envelope,
       { "delivery-envelope", "x420.delivery_envelope",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.OtherMessageDeliveryFields", HFILL }},
+        "OtherMessageDeliveryFields", HFILL }},
     { &hf_x420_subject_ipm,
       { "subject-ipm", "x420.subject_ipm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.SubjectIPMField", HFILL }},
+        "SubjectIPMField", HFILL }},
     { &hf_x420_ipn_originator,
       { "ipn-originator", "x420.ipn_originator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPNOriginatorField", HFILL }},
+        "IPNOriginatorField", HFILL }},
     { &hf_x420_ipm_intended_recipient,
       { "ipm-intended-recipient", "x420.ipm_intended_recipient",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMIntendedRecipientField", HFILL }},
+        "IPMIntendedRecipientField", HFILL }},
     { &hf_x420_conversion_eits,
       { "conversion-eits", "x420.conversion_eits",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ConversionEITsField", HFILL }},
+        "ConversionEITsField", HFILL }},
     { &hf_x420_notification_extensions,
       { "notification-extensions", "x420.notification_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.NotificationExtensionsField", HFILL }},
+        "NotificationExtensionsField", HFILL }},
     { &hf_x420_non_receipt_reason,
       { "non-receipt-reason", "x420.non_receipt_reason",
         FT_UINT32, BASE_DEC, VALS(x420_NonReceiptReasonField_vals), 0,
-        "x420.NonReceiptReasonField", HFILL }},
+        "NonReceiptReasonField", HFILL }},
     { &hf_x420_discard_reason,
       { "discard-reason", "x420.discard_reason",
         FT_UINT32, BASE_DEC, VALS(x420_DiscardReasonField_vals), 0,
-        "x420.DiscardReasonField", HFILL }},
+        "DiscardReasonField", HFILL }},
     { &hf_x420_auto_forward_comment,
       { "auto-forward-comment", "x420.auto_forward_comment",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.AutoForwardCommentField", HFILL }},
+        "AutoForwardCommentField", HFILL }},
     { &hf_x420_returned_ipm,
       { "returned-ipm", "x420.returned_ipm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ReturnedIPMField", HFILL }},
+        "ReturnedIPMField", HFILL }},
     { &hf_x420_nrn_extensions,
       { "nrn-extensions", "x420.nrn_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.NRNExtensionsField", HFILL }},
+        "NRNExtensionsField", HFILL }},
     { &hf_x420_receipt_time,
       { "receipt-time", "x420.receipt_time",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.ReceiptTimeField", HFILL }},
+        "ReceiptTimeField", HFILL }},
     { &hf_x420_acknowledgment_mode,
       { "acknowledgment-mode", "x420.acknowledgment_mode",
         FT_UINT32, BASE_DEC, VALS(x420_AcknowledgmentModeField_vals), 0,
-        "x420.AcknowledgmentModeField", HFILL }},
+        "AcknowledgmentModeField", HFILL }},
     { &hf_x420_suppl_receipt_info,
       { "suppl-receipt-info", "x420.suppl_receipt_info",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.SupplReceiptInfoField", HFILL }},
+        "SupplReceiptInfoField", HFILL }},
     { &hf_x420_rn_extensions,
       { "rn-extensions", "x420.rn_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.RNExtensionsField", HFILL }},
+        "RNExtensionsField", HFILL }},
     { &hf_x420_NotificationExtensionsField_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NRNExtensionsField_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RNExtensionsField_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_OtherNotificationTypeFields_item,
       { "IPMSExtension", "x420.IPMSExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.IPMSExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_advice,
       { "advice", "x420.advice",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPart_vals), 0,
-        "x420.BodyPart", HFILL }},
+        "BodyPart", HFILL }},
     { &hf_x420_next_available,
       { "next-available", "x420.next_available",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.Time", HFILL }},
+        "Time", HFILL }},
     { &hf_x420_new_address,
       { "new-address", "x420.new_address",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ORDescriptor", HFILL }},
+        "ORDescriptor", HFILL }},
     { &hf_x420_effective_from,
       { "effective-from", "x420.effective_from",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.Time", HFILL }},
+        "Time", HFILL }},
     { &hf_x420_assembly_instructions,
       { "assembly-instructions", "x420.assembly_instructions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartReferences", HFILL }},
+        "BodyPartReferences", HFILL }},
     { &hf_x420_BodyPartReferences_item,
       { "BodyPartReference", "x420.BodyPartReference",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPartReference_vals), 0,
-        "x420.BodyPartReference", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_stored_entry,
       { "stored-entry", "x420.stored_entry",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        "SequenceNumber", HFILL }},
     { &hf_x420_stored_content,
       { "stored-content", "x420.stored_content",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        "SequenceNumber", HFILL }},
     { &hf_x420_submitted_body_part,
       { "submitted-body-part", "x420.submitted_body_part",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER_1_MAX", HFILL }},
+        "INTEGER_1_MAX", HFILL }},
     { &hf_x420_stored_body_part,
       { "stored-body-part", "x420.stored_body_part",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_stored_body_part", HFILL }},
+        "T_stored_body_part", HFILL }},
     { &hf_x420_message_entry,
       { "message-entry", "x420.message_entry",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        "SequenceNumber", HFILL }},
     { &hf_x420_body_part_number,
       { "body-part-number", "x420.body_part_number",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartNumber", HFILL }},
+        "BodyPartNumber", HFILL }},
     { &hf_x420_Languages_item,
       { "Language", "x420.Language",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.Language", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_BodyPartSignatures_item,
       { "BodyPartSignatures item", "x420.BodyPartSignatures_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BodyPartSignatures_item", HFILL }},
+        "BodyPartSignatures_item", HFILL }},
     { &hf_x420_body_part_signature,
       { "body-part-signature", "x420.body_part_signature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BodyPartSignature", HFILL }},
+        "BodyPartSignature", HFILL }},
     { &hf_x420_originator_certificate_selector,
       { "originator-certificate-selector", "x420.originator_certificate_selector",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509ce.CertificateAssertion", HFILL }},
+        "CertificateAssertion", HFILL }},
     { &hf_x420_algorithmIdentifier,
       { "algorithmIdentifier", "x420.algorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_encrypted,
       { "encrypted", "x420.encrypted",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.BIT_STRING", HFILL }},
+        "BIT_STRING", HFILL }},
     { &hf_x420_content_security_label,
       { "content-security-label", "x420.content_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.SecurityLabel", HFILL }},
+        "SecurityLabel", HFILL }},
     { &hf_x420_heading_security_label,
       { "heading-security-label", "x420.heading_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.SecurityLabel", HFILL }},
+        "SecurityLabel", HFILL }},
     { &hf_x420_body_part_security_labels,
       { "body-part-security-labels", "x420.body_part_security_labels",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.SEQUENCE_OF_BodyPartSecurityLabel", HFILL }},
+        "SEQUENCE_OF_BodyPartSecurityLabel", HFILL }},
     { &hf_x420_body_part_security_labels_item,
       { "BodyPartSecurityLabel", "x420.BodyPartSecurityLabel",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPartSecurityLabel_vals), 0,
-        "x420.BodyPartSecurityLabel", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_body_part_unlabelled,
       { "body-part-unlabelled", "x420.body_part_unlabelled",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_body_part_security_label,
       { "body-part-security-label", "x420.body_part_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.SecurityLabel", HFILL }},
+        "SecurityLabel", HFILL }},
     { &hf_x420_CirculationList_item,
       { "CirculationMember", "x420.CirculationMember",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationMember", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_circulation_recipient,
       { "circulation-recipient", "x420.circulation_recipient",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RecipientSpecifier", HFILL }},
+        "RecipientSpecifier", HFILL }},
     { &hf_x420_checked,
       { "checked", "x420.checked",
         FT_UINT32, BASE_DEC, VALS(x420_Checkmark_vals), 0,
-        "x420.Checkmark", HFILL }},
+        "Checkmark", HFILL }},
     { &hf_x420_simple,
       { "simple", "x420.simple",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_timestamped,
       { "timestamped", "x420.timestamped",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.CirculationTime", HFILL }},
+        "CirculationTime", HFILL }},
     { &hf_x420_signed,
       { "signed", "x420.signed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationSignature", HFILL }},
+        "CirculationSignature", HFILL }},
     { &hf_x420_circulation_signature_algorithm_identifier,
       { "algorithm-identifier", "x420.algorithm_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationSignatureAlgorithmIdentifier", HFILL }},
+        "CirculationSignatureAlgorithmIdentifier", HFILL }},
     { &hf_x420_timestamp,
       { "timestamp", "x420.timestamp",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.CirculationTime", HFILL }},
+        "CirculationTime", HFILL }},
     { &hf_x420_circulation_signature_data,
       { "circulation-signature-data", "x420.circulation_signature_data",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CirculationSignatureData", HFILL }},
+        "CirculationSignatureData", HFILL }},
     { &hf_x420_DistributionCodes_item,
       { "DistributionCode", "x420.DistributionCode",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.DistributionCode", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_oid_code,
       { "oid-code", "x420.oid_code",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_alphanumeric_code,
       { "alphanumeric-code", "x420.alphanumeric_code",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.AlphaCode", HFILL }},
+        "AlphaCode", HFILL }},
     { &hf_x420_or_descriptor,
       { "or-descriptor", "x420.or_descriptor",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ORDescriptor", HFILL }},
+        "ORDescriptor", HFILL }},
     { &hf_x420_InformationCategories_item,
       { "InformationCategory", "x420.InformationCategory",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.InformationCategory", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_reference,
       { "reference", "x420.reference",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_description,
       { "description", "x420.description",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.DescriptionString", HFILL }},
+        "DescriptionString", HFILL }},
     { &hf_x420_ManualHandlingInstructions_item,
       { "ManualHandlingInstruction", "x420.ManualHandlingInstruction",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ManualHandlingInstruction", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_GeneralTextParameters_item,
       { "CharacterSetRegistration", "x420.CharacterSetRegistration",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.CharacterSetRegistration", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_related_stored_file,
       { "related-stored-file", "x420.related_stored_file",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.RelatedStoredFile", HFILL }},
+        "RelatedStoredFile", HFILL }},
     { &hf_x420_contents_type,
       { "contents-type", "x420.contents_type",
         FT_UINT32, BASE_DEC, VALS(x420_Contents_Type_Attribute_vals), 0,
-        "x420.ContentsTypeParameter", HFILL }},
+        "ContentsTypeParameter", HFILL }},
     { &hf_x420_environment,
       { "environment", "x420.environment",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EnvironmentParameter", HFILL }},
+        "EnvironmentParameter", HFILL }},
     { &hf_x420_compression,
       { "compression", "x420.compression",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CompressionParameter", HFILL }},
+        "CompressionParameter", HFILL }},
     { &hf_x420_file_attributes,
       { "file-attributes", "x420.file_attributes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.FileAttributes", HFILL }},
+        "FileAttributes", HFILL }},
     { &hf_x420_FileTransferData_item,
       { "FileTransferData item", "x420.FileTransferData_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_x420_RelatedStoredFile_item,
       { "RelatedStoredFile item", "x420.RelatedStoredFile_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.RelatedStoredFile_item", HFILL }},
+        "RelatedStoredFile_item", HFILL }},
     { &hf_x420_file_identifier,
       { "file-identifier", "x420.file_identifier",
         FT_UINT32, BASE_DEC, VALS(x420_FileIdentifier_vals), 0,
-        "x420.FileIdentifier", HFILL }},
+        "FileIdentifier", HFILL }},
     { &hf_x420_relationship,
       { "relationship", "x420.relationship",
         FT_UINT32, BASE_DEC, VALS(x420_Relationship_vals), 0,
-        "x420.Relationship", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_pathname_and_version,
       { "pathname-and-version", "x420.pathname_and_version",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.PathnameandVersion", HFILL }},
+        "PathnameandVersion", HFILL }},
     { &hf_x420_cross_reference,
       { "cross-reference", "x420.cross_reference",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.CrossReference", HFILL }},
+        "CrossReference", HFILL }},
     { &hf_x420_pathname,
       { "pathname", "x420.pathname",
         FT_UINT32, BASE_DEC, VALS(x420_Pathname_Attribute_vals), 0,
-        "x420.Pathname_Attribute", HFILL }},
+        "Pathname_Attribute", HFILL }},
     { &hf_x420_file_version,
       { "file-version", "x420.file_version",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_x420_application_cross_reference,
       { "application-cross-reference", "x420.application_cross_reference",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_x420_message_reference,
       { "message-reference", "x420.message_reference",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageReference", HFILL }},
+        "MessageReference", HFILL }},
     { &hf_x420_body_part_reference,
       { "body-part-reference", "x420.body_part_reference",
         FT_INT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_x420_user_relative_identifier_ref,
       { "user-relative-identifier", "x420.user_relative_identifier",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.PrintableString", HFILL }},
+        "PrintableString", HFILL }},
     { &hf_x420_explicit_relationship,
       { "explicit-relationship", "x420.explicit_relationship",
         FT_INT32, BASE_DEC, VALS(x420_ExplicitRelationship_vals), 0,
-        "x420.ExplicitRelationship", HFILL }},
+        "ExplicitRelationship", HFILL }},
     { &hf_x420_descriptive_relationship,
       { "descriptive-relationship", "x420.descriptive_relationship",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_x420_document_type,
       { "document-type", "x420.document_type",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_document_type", HFILL }},
+        "T_document_type", HFILL }},
     { &hf_x420_document_type_name,
       { "document-type-name", "x420.document_type_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.Document_Type_Name", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_parameter,
       { "parameter", "x420.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_parameter", HFILL }},
+        "T_parameter", HFILL }},
     { &hf_x420_constraint_set_and_abstract_syntax,
       { "constraint-set-and-abstract-syntax", "x420.constraint_set_and_abstract_syntax",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_constraint_set_and_abstract_syntax", HFILL }},
+        "T_constraint_set_and_abstract_syntax", HFILL }},
     { &hf_x420_constraint_set_name,
       { "constraint-set-name", "x420.constraint_set_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.Constraint_Set_Name", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_abstract_syntax_name,
       { "abstract-syntax-name", "x420.abstract_syntax_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.Abstract_Syntax_Name", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_application_reference,
       { "application-reference", "x420.application_reference",
         FT_UINT32, BASE_DEC, VALS(x420_GeneralIdentifier_vals), 0,
-        "x420.GeneralIdentifier", HFILL }},
+        "GeneralIdentifier", HFILL }},
     { &hf_x420_machine,
       { "machine", "x420.machine",
         FT_UINT32, BASE_DEC, VALS(x420_GeneralIdentifier_vals), 0,
-        "x420.GeneralIdentifier", HFILL }},
+        "GeneralIdentifier", HFILL }},
     { &hf_x420_operating_system,
       { "operating-system", "x420.operating_system",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_user_visible_string,
       { "user-visible-string", "x420.user_visible_string",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.T_user_visible_string", HFILL }},
+        "T_user_visible_string", HFILL }},
     { &hf_x420_user_visible_string_item,
       { "user-visible-string item", "x420.user_visible_string_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_x420_registered_identifier,
       { "registered-identifier", "x420.registered_identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_descriptive_identifier,
       { "descriptive-identifier", "x420.descriptive_identifier",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.T_descriptive_identifier", HFILL }},
+        "T_descriptive_identifier", HFILL }},
     { &hf_x420_descriptive_identifier_item,
       { "descriptive-identifier item", "x420.descriptive_identifier_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_x420_compression_algorithm_id,
       { "compression-algorithm-id", "x420.compression_algorithm_id",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_compression_algorithm_id", HFILL }},
+        "T_compression_algorithm_id", HFILL }},
     { &hf_x420_compression_algorithm_param,
       { "compression-algorithm-param", "x420.compression_algorithm_param",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_compression_algorithm_param", HFILL }},
+        "T_compression_algorithm_param", HFILL }},
     { &hf_x420_permitted_actions,
       { "permitted-actions", "x420.permitted_actions",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ftam.Permitted_Actions_Attribute", HFILL }},
+        "Permitted_Actions_Attribute", HFILL }},
     { &hf_x420_storage_account,
       { "storage-account", "x420.storage_account",
         FT_UINT32, BASE_DEC, VALS(x420_Account_Attribute_vals), 0,
-        "x420.Account_Attribute", HFILL }},
+        "Account_Attribute", HFILL }},
     { &hf_x420_date_and_time_of_creation,
       { "date-and-time-of-creation", "x420.date_and_time_of_creation",
         FT_UINT32, BASE_DEC, VALS(ftam_Date_and_Time_Attribute_vals), 0,
-        "ftam.Date_and_Time_Attribute", HFILL }},
+        "Date_and_Time_Attribute", HFILL }},
     { &hf_x420_date_and_time_of_last_modification,
       { "date-and-time-of-last-modification", "x420.date_and_time_of_last_modification",
         FT_UINT32, BASE_DEC, VALS(ftam_Date_and_Time_Attribute_vals), 0,
-        "ftam.Date_and_Time_Attribute", HFILL }},
+        "Date_and_Time_Attribute", HFILL }},
     { &hf_x420_date_and_time_of_last_read_access,
       { "date-and-time-of-last-read-access", "x420.date_and_time_of_last_read_access",
         FT_UINT32, BASE_DEC, VALS(ftam_Date_and_Time_Attribute_vals), 0,
-        "ftam.Date_and_Time_Attribute", HFILL }},
+        "Date_and_Time_Attribute", HFILL }},
     { &hf_x420_date_and_time_of_last_attribute_modification,
       { "date-and-time-of-last-attribute-modification", "x420.date_and_time_of_last_attribute_modification",
         FT_UINT32, BASE_DEC, VALS(ftam_Date_and_Time_Attribute_vals), 0,
-        "ftam.Date_and_Time_Attribute", HFILL }},
+        "Date_and_Time_Attribute", HFILL }},
     { &hf_x420_identity_of_creator,
       { "identity-of-creator", "x420.identity_of_creator",
         FT_UINT32, BASE_DEC, VALS(x420_User_Identity_Attribute_vals), 0,
-        "x420.User_Identity_Attribute", HFILL }},
+        "User_Identity_Attribute", HFILL }},
     { &hf_x420_identity_of_last_modifier,
       { "identity-of-last-modifier", "x420.identity_of_last_modifier",
         FT_UINT32, BASE_DEC, VALS(x420_User_Identity_Attribute_vals), 0,
-        "x420.User_Identity_Attribute", HFILL }},
+        "User_Identity_Attribute", HFILL }},
     { &hf_x420_identity_of_last_reader,
       { "identity-of-last-reader", "x420.identity_of_last_reader",
         FT_UINT32, BASE_DEC, VALS(x420_User_Identity_Attribute_vals), 0,
-        "x420.User_Identity_Attribute", HFILL }},
+        "User_Identity_Attribute", HFILL }},
     { &hf_x420_identity_of_last_attribute_modifier,
       { "identity-of-last-attribute-modifier", "x420.identity_of_last_attribute_modifier",
         FT_UINT32, BASE_DEC, VALS(x420_User_Identity_Attribute_vals), 0,
-        "x420.User_Identity_Attribute", HFILL }},
+        "User_Identity_Attribute", HFILL }},
     { &hf_x420_object_availability,
       { "object-availability", "x420.object_availability",
         FT_UINT32, BASE_DEC, VALS(ftam_Object_Availability_Attribute_vals), 0,
-        "ftam.Object_Availability_Attribute", HFILL }},
+        "Object_Availability_Attribute", HFILL }},
     { &hf_x420_object_size,
       { "object-size", "x420.object_size",
         FT_UINT32, BASE_DEC, VALS(ftam_Object_Size_Attribute_vals), 0,
-        "ftam.Object_Size_Attribute", HFILL }},
+        "Object_Size_Attribute", HFILL }},
     { &hf_x420_future_object_size,
       { "future-object-size", "x420.future_object_size",
         FT_UINT32, BASE_DEC, VALS(ftam_Object_Size_Attribute_vals), 0,
-        "ftam.Object_Size_Attribute", HFILL }},
+        "Object_Size_Attribute", HFILL }},
     { &hf_x420_access_control,
       { "access-control", "x420.access_control",
         FT_UINT32, BASE_DEC, VALS(x420_Access_Control_Attribute_vals), 0,
-        "x420.Access_Control_Attribute", HFILL }},
+        "Access_Control_Attribute", HFILL }},
     { &hf_x420_legal_qualifications,
       { "legal-qualifications", "x420.legal_qualifications",
         FT_UINT32, BASE_DEC, VALS(ftam_Legal_Qualification_Attribute_vals), 0,
-        "ftam.Legal_Qualification_Attribute", HFILL }},
+        "Legal_Qualification_Attribute", HFILL }},
     { &hf_x420_private_use,
       { "private-use", "x420.private_use",
         FT_UINT32, BASE_DEC, VALS(ftam_Private_Use_Attribute_vals), 0,
-        "ftam.Private_Use_Attribute", HFILL }},
+        "Private_Use_Attribute", HFILL }},
     { &hf_x420_attribute_extensions,
       { "attribute-extensions", "x420.attribute_extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ftam.Attribute_Extensions", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_incomplete_pathname,
       { "incomplete-pathname", "x420.incomplete_pathname",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ftam.Pathname", HFILL }},
+        "Pathname", HFILL }},
     { &hf_x420_complete_pathname,
       { "complete-pathname", "x420.complete_pathname",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ftam.Pathname", HFILL }},
+        "Pathname", HFILL }},
     { &hf_x420_no_value_available,
       { "no-value-available", "x420.no_value_available",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_account_actual_values,
       { "actual-values", "x420.actual_values",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.Account", HFILL }},
+        "Account", HFILL }},
     { &hf_x420_identity_actual_values,
       { "actual-values", "x420.actual_values",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.User_Identity", HFILL }},
+        "User_Identity", HFILL }},
     { &hf_x420_actual_values,
       { "actual-values", "x420.actual_values",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.SET_OF_Access_Control_Element", HFILL }},
+        "SET_OF_Access_Control_Element", HFILL }},
     { &hf_x420_actual_values_item,
       { "Access-Control-Element", "x420.Access_Control_Element",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Access_Control_Element", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_action_list,
       { "action-list", "x420.action_list",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.Access_Request", HFILL }},
+        "Access_Request", HFILL }},
     { &hf_x420_concurrency_access,
       { "concurrency-access", "x420.concurrency_access",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ftam.Concurrency_Access", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_identity,
       { "identity", "x420.identity",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.User_Identity", HFILL }},
+        "User_Identity", HFILL }},
     { &hf_x420_passwords,
       { "passwords", "x420.passwords",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Access_Passwords", HFILL }},
+        "Access_Passwords", HFILL }},
     { &hf_x420_location,
       { "location", "x420.location",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.Application_Entity_Title", HFILL }},
+        "Application_Entity_Title", HFILL }},
     { &hf_x420_read_password,
       { "read-password", "x420.read_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_insert_password,
       { "insert-password", "x420.insert_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_replace_password,
       { "replace-password", "x420.replace_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_extend_password,
       { "extend-password", "x420.extend_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_erase_password,
       { "erase-password", "x420.erase_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_read_attribute_password,
       { "read-attribute-password", "x420.read_attribute_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_change_attribute_password,
       { "change-attribute-password", "x420.change_attribute_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_delete_password,
       { "delete-password", "x420.delete_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_pass_passwords,
       { "pass-passwords", "x420.pass_passwords",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.Pass_Passwords", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_link_password,
       { "link-password", "x420.link_password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        "Password", HFILL }},
     { &hf_x420_graphic_string,
       { "graphic-string", "x420.graphic_string",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_x420_octet_string,
       { "octet-string", "x420.octet_string",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Pass_Passwords_item,
       { "Password", "x420.Password",
         FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0,
-        "x420.Password", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ap_title,
       { "ap-title", "x420.ap_title",
         FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
-        "acse.AP_title", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_ae_qualifier,
       { "ae-qualifier", "x420.ae_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "acse.AE_qualifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_voice_message_duration,
       { "voice-message-duration", "x420.voice_message_duration",
         FT_INT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_x420_voice_encoding_type,
       { "voice-encoding-type", "x420.voice_encoding_type",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_supplementary_information,
       { "supplementary-information", "x420.supplementary_information",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x420.IA5String", HFILL }},
+        "IA5String", HFILL }},
     { &hf_x420_mts_identifier,
       { "mts-identifier", "x420.mts_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.MessageDeliveryIdentifier", HFILL }},
+        "MessageDeliveryIdentifier", HFILL }},
     { &hf_x420_submission_proof,
       { "submission-proof", "x420.submission_proof",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.SubmissionProof", HFILL }},
+        "SubmissionProof", HFILL }},
     { &hf_x420_proof_of_submission,
       { "proof-of-submission", "x420.proof_of_submission",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.ProofOfSubmission", HFILL }},
+        "ProofOfSubmission", HFILL }},
     { &hf_x420_originating_MTA_certificate,
       { "originating-MTA-certificate", "x420.originating_MTA_certificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.OriginatingMTACertificate", HFILL }},
+        "OriginatingMTACertificate", HFILL }},
     { &hf_x420_message_submission_envelope,
       { "message-submission-envelope", "x420.message_submission_envelope",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.MessageSubmissionEnvelope", HFILL }},
+        "MessageSubmissionEnvelope", HFILL }},
     { &hf_x420_IPMSynopsis_item,
       { "BodyPartSynopsis", "x420.BodyPartSynopsis",
         FT_UINT32, BASE_DEC, VALS(x420_BodyPartSynopsis_vals), 0,
-        "x420.BodyPartSynopsis", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_message_synopsis,
       { "message", "x420.message",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.MessageBodyPartSynopsis", HFILL }},
+        "MessageBodyPartSynopsis", HFILL }},
     { &hf_x420_non_message,
       { "non-message", "x420.non_message",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NonMessageBodyPartSynopsis", HFILL }},
+        "NonMessageBodyPartSynopsis", HFILL }},
     { &hf_x420_number,
       { "number", "x420.number",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        "SequenceNumber", HFILL }},
     { &hf_x420_synopsis,
       { "synopsis", "x420.synopsis",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.IPMSynopsis", HFILL }},
+        "IPMSynopsis", HFILL }},
     { &hf_x420_bp_type,
       { "type", "x420.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_bp_parameters,
       { "parameters", "x420.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.INSTANCE_OF", HFILL }},
+        "INSTANCE_OF", HFILL }},
     { &hf_x420_size,
       { "size", "x420.size",
         FT_INT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_x420_processed,
       { "processed", "x420.processed",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "x420.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_x420_data,
       { "data", "x420.data",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_parameters,
       { "parameters", "x420.parameters",
         FT_OID, BASE_NONE, NULL, 0,
-        "x420.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_this_child_entry,
       { "this-child-entry", "x420.this_child_entry",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        "SequenceNumber", HFILL }},
     { &hf_x420_position,
       { "position", "x420.position",
         FT_INT32, BASE_DEC, NULL, 0,
-        "x420.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_x420_BodyPartSignatureVerification_item,
       { "BodyPartSignatureVerification item", "x420.BodyPartSignatureVerification_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BodyPartSignatureVerification_item", HFILL }},
+        "BodyPartSignatureVerification_item", HFILL }},
     { &hf_x420_body_part_sequence_number,
       { "body-part-sequence-number", "x420.body_part_sequence_number",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartNumber", HFILL }},
+        "BodyPartNumber", HFILL }},
     { &hf_x420_body_part_signature_status,
       { "body-part-signature", "x420.body_part_signature",
         FT_INT32, BASE_DEC, VALS(p7_SignatureStatus_vals), 0,
-        "p7.SignatureStatus", HFILL }},
+        "SignatureStatus", HFILL }},
     { &hf_x420_stored,
       { "stored", "x420.stored",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.SET_OF_SequenceNumber", HFILL }},
+        "SET_OF_SequenceNumber", HFILL }},
     { &hf_x420_stored_item,
       { "SequenceNumber", "x420.SequenceNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_absent,
       { "absent", "x420.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_no_reply_received,
       { "no-reply-received", "x420.no_reply_received",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_received_replies,
       { "received-replies", "x420.received_replies",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.SEQUENCE_OF_SequenceNumber", HFILL }},
+        "SEQUENCE_OF_SequenceNumber", HFILL }},
     { &hf_x420_received_replies_item,
       { "SequenceNumber", "x420.SequenceNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_no_ipn_received,
       { "no-ipn-received", "x420.no_ipn_received",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_x420_ipns_received,
       { "ipns-received", "x420.ipns_received",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.SEQUENCE_OF_SequenceNumber", HFILL }},
+        "SEQUENCE_OF_SequenceNumber", HFILL }},
     { &hf_x420_ipns_received_item,
       { "SequenceNumber", "x420.SequenceNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "p7.SequenceNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_content_or_arguments,
       { "content-or-arguments", "x420.content_or_arguments",
         FT_UINT32, BASE_DEC, VALS(x420_T_content_or_arguments_vals), 0,
-        "x420.T_content_or_arguments", HFILL }},
+        "T_content_or_arguments", HFILL }},
     { &hf_x420_original_content,
       { "original-content", "x420.original_content",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.OriginalContent", HFILL }},
+        "OriginalContent", HFILL }},
     { &hf_x420_original_security_arguments,
       { "original-security-arguments", "x420.original_security_arguments",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.T_original_security_arguments", HFILL }},
+        "T_original_security_arguments", HFILL }},
     { &hf_x420_original_content_integrity_check,
       { "original-content-integrity-check", "x420.original_content_integrity_check",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginalContentIntegrityCheck", HFILL }},
+        "OriginalContentIntegrityCheck", HFILL }},
     { &hf_x420_original_message_origin_authentication_check,
       { "original-message-origin-authentication-check", "x420.original_message_origin_authentication_check",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginalMessageOriginAuthenticationCheck", HFILL }},
+        "OriginalMessageOriginAuthenticationCheck", HFILL }},
     { &hf_x420_original_message_token,
       { "original-message-token", "x420.original_message_token",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.OriginalMessageToken", HFILL }},
+        "OriginalMessageToken", HFILL }},
     { &hf_x420_security_diagnostic_code,
       { "security-diagnostic-code", "x420.security_diagnostic_code",
         FT_INT32, BASE_DEC, VALS(x420_SecurityDiagnosticCode_vals), 0,
-        "x420.SecurityDiagnosticCode", HFILL }},
+        "SecurityDiagnosticCode", HFILL }},
     { &hf_x420_BodyPartTokens_item,
       { "BodyPartTokens item", "x420.BodyPartTokens_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.BodyPartTokens_item", HFILL }},
+        "BodyPartTokens_item", HFILL }},
     { &hf_x420_body_part_choice,
       { "body-part-choice", "x420.body_part_choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_body_part_choice_vals), 0,
-        "x420.T_body_part_choice", HFILL }},
+        "T_body_part_choice", HFILL }},
     { &hf_x420_encryption_token,
       { "encryption-token", "x420.encryption_token",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.EncryptionToken", HFILL }},
+        "EncryptionToken", HFILL }},
     { &hf_x420_message_or_content_body_part,
       { "message-or-content-body-part", "x420.message_or_content_body_part",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.BodyPartTokens", HFILL }},
+        "BodyPartTokens", HFILL }},
     { &hf_x420_encryption_algorithm_identifier,
       { "encryption-algorithm-identifier", "x420.encryption_algorithm_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_x420_encrypted_key,
       { "encrypted-key", "x420.encrypted_key",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "x420.BIT_STRING", HFILL }},
+        "BIT_STRING", HFILL }},
     { &hf_x420_recipient_certificate_selector,
       { "recipient-certificate-selector", "x420.recipient_certificate_selector",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509ce.CertificateAssertion", HFILL }},
+        "CertificateAssertion", HFILL }},
     { &hf_x420_recipient_certificate,
       { "recipient-certificate", "x420.recipient_certificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x509af.Certificates", HFILL }},
+        "Certificates", HFILL }},
     { &hf_x420_ForwardedContentToken_item,
       { "ForwardedContentToken item", "x420.ForwardedContentToken_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ForwardedContentToken_item", HFILL }},
+        "ForwardedContentToken_item", HFILL }},
     { &hf_x420_body_part_token_choice,
       { "body-part-choice", "x420.body_part_choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_body_part_token_choice_vals), 0,
-        "x420.T_body_part_token_choice", HFILL }},
+        "T_body_part_token_choice", HFILL }},
     { &hf_x420_forwarding_token,
       { "forwarding-token", "x420.forwarding_token",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x411.MessageToken", HFILL }},
+        "MessageToken", HFILL }},
     { &hf_x420_forwarded_content_token,
       { "message-or-content-body-part", "x420.message_or_content_body_part",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.ForwardedContentToken", HFILL }},
+        "ForwardedContentToken", HFILL }},
     { &hf_x420_choice,
       { "choice", "x420.choice",
         FT_UINT32, BASE_DEC, VALS(x420_T_choice_vals), 0,
-        "x420.T_choice", HFILL }},
+        "T_choice", HFILL }},
     { &hf_x420_non_receipt_fields,
       { "non-receipt-fields", "x420.non_receipt_fields",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.NonReceiptFields", HFILL }},
+        "NonReceiptFields", HFILL }},
     { &hf_x420_receipt_fields,
       { "receipt-fields", "x420.receipt_fields",
         FT_NONE, BASE_NONE, NULL, 0,
-        "x420.ReceiptFields", HFILL }},
+        "ReceiptFields", HFILL }},
     { &hf_x420_other_notification_type_fields,
       { "other-notification-type-fields", "x420.other_notification_type_fields",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "x420.OtherNotificationTypeFields", HFILL }},
+        "OtherNotificationTypeFields", HFILL }},
     { &hf_x420_NotificationRequests_rn,
       { "rn", "x420.rn",
         FT_BOOLEAN, 8, NULL, 0x80,