Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748

1 files changed, 94 insertions, 94 deletions

diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 35e5cc07ff..70df08041b 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -7848,7 +7848,7 @@ void proto_register_mms(void) {
     { &hf_mms_domain_specific,
       { "domain-specific", "mms.domain_specific",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_domain_specific", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_domainId,
       { "domainId", "mms.domainId",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -7864,19 +7864,19 @@ void proto_register_mms(void) {
     { &hf_mms_ap_title,
       { "ap-title", "mms.ap_title",
         FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
-        "T_ap_title", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ap_invocation_id,
       { "ap-invocation-id", "mms.ap_invocation_id",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_ap_invocation_id", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ae_qualifier,
       { "ae-qualifier", "mms.ae_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "T_ae_qualifier", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ae_invocation_id,
       { "ae-invocation-id", "mms.ae_invocation_id",
         FT_INT32, BASE_DEC, NULL, 0,
-        "T_ae_invocation_id", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_localDetailCalling,
       { "localDetailCalling", "mms.localDetailCalling",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -7948,55 +7948,55 @@ void proto_register_mms(void) {
     { &hf_mms_errorClass,
       { "errorClass", "mms.errorClass",
         FT_UINT32, BASE_DEC, VALS(mms_T_errorClass_vals), 0,
-        "T_errorClass", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_vmd_state,
       { "vmd-state", "mms.vmd_state",
         FT_INT32, BASE_DEC, VALS(mms_T_vmd_state_vals), 0,
-        "T_vmd_state", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_application_reference,
       { "application-reference", "mms.application_reference",
         FT_INT32, BASE_DEC, VALS(mms_T_application_reference_vals), 0,
-        "T_application_reference", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_definition,
       { "definition", "mms.definition",
         FT_INT32, BASE_DEC, VALS(mms_T_definition_vals), 0,
-        "T_definition", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_resource,
       { "resource", "mms.resource",
         FT_INT32, BASE_DEC, VALS(mms_T_resource_vals), 0,
-        "T_resource", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_service,
       { "service", "mms.service",
         FT_INT32, BASE_DEC, VALS(mms_T_service_vals), 0,
-        "T_service", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_service_preempt,
       { "service-preempt", "mms.service_preempt",
         FT_INT32, BASE_DEC, VALS(mms_T_service_preempt_vals), 0,
-        "T_service_preempt", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_time_resolution,
       { "time-resolution", "mms.time_resolution",
         FT_INT32, BASE_DEC, VALS(mms_T_time_resolution_vals), 0,
-        "T_time_resolution", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_access,
       { "access", "mms.access",
         FT_INT32, BASE_DEC, VALS(mms_T_access_vals), 0,
-        "T_access", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_initiate,
       { "initiate", "mms.initiate",
         FT_INT32, BASE_DEC, VALS(mms_T_initiate_vals), 0,
-        "T_initiate", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_conclude,
       { "conclude", "mms.conclude",
         FT_INT32, BASE_DEC, VALS(mms_T_conclude_vals), 0,
-        "T_conclude", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_cancel,
       { "cancel", "mms.cancel",
         FT_INT32, BASE_DEC, VALS(mms_T_cancel_vals), 0,
-        "T_cancel", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_file,
       { "file", "mms.file",
         FT_INT32, BASE_DEC, VALS(mms_T_file_vals), 0,
-        "T_file", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_others,
       { "others", "mms.others",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8012,7 +8012,7 @@ void proto_register_mms(void) {
     { &hf_mms_serviceSpecificInformation,
       { "serviceSpecificInformation", "mms.serviceSpecificInformation",
         FT_UINT32, BASE_DEC, VALS(mms_T_serviceSpecificInformation_vals), 0,
-        "T_serviceSpecificInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_obtainFile_02,
       { "obtainFile", "mms.obtainFile",
         FT_INT32, BASE_DEC, VALS(mms_ObtainFile_Error_vals), 0,
@@ -8056,59 +8056,59 @@ void proto_register_mms(void) {
     { &hf_mms_rejectReason,
       { "rejectReason", "mms.rejectReason",
         FT_UINT32, BASE_DEC, VALS(mms_T_rejectReason_vals), 0,
-        "T_rejectReason", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_confirmed_requestPDU,
       { "confirmed-requestPDU", "mms.confirmed_requestPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_confirmed_requestPDU_vals), 0,
-        "T_confirmed_requestPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_confirmed_responsePDU,
       { "confirmed-responsePDU", "mms.confirmed_responsePDU",
         FT_INT32, BASE_DEC, VALS(mms_T_confirmed_responsePDU_vals), 0,
-        "T_confirmed_responsePDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_confirmed_errorPDU,
       { "confirmed-errorPDU", "mms.confirmed_errorPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_confirmed_errorPDU_vals), 0,
-        "T_confirmed_errorPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_unconfirmedPDU,
       { "unconfirmedPDU", "mms.unconfirmedPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_unconfirmedPDU_vals), 0,
-        "T_unconfirmedPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_pdu_error,
       { "pdu-error", "mms.pdu_error",
         FT_INT32, BASE_DEC, VALS(mms_T_pdu_error_vals), 0,
-        "T_pdu_error", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_cancel_requestPDU,
       { "cancel-requestPDU", "mms.cancel_requestPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_cancel_requestPDU_vals), 0,
-        "T_cancel_requestPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_cancel_responsePDU,
       { "cancel-responsePDU", "mms.cancel_responsePDU",
         FT_INT32, BASE_DEC, VALS(mms_T_cancel_responsePDU_vals), 0,
-        "T_cancel_responsePDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_cancel_errorPDU,
       { "cancel-errorPDU", "mms.cancel_errorPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_cancel_errorPDU_vals), 0,
-        "T_cancel_errorPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_conclude_requestPDU,
       { "conclude-requestPDU", "mms.conclude_requestPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_conclude_requestPDU_vals), 0,
-        "T_conclude_requestPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_conclude_responsePDU,
       { "conclude-responsePDU", "mms.conclude_responsePDU",
         FT_INT32, BASE_DEC, VALS(mms_T_conclude_responsePDU_vals), 0,
-        "T_conclude_responsePDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_conclude_errorPDU,
       { "conclude-errorPDU", "mms.conclude_errorPDU",
         FT_INT32, BASE_DEC, VALS(mms_T_conclude_errorPDU_vals), 0,
-        "T_conclude_errorPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_vmdLogicalStatus,
       { "vmdLogicalStatus", "mms.vmdLogicalStatus",
         FT_INT32, BASE_DEC, VALS(mms_T_vmdLogicalStatus_vals), 0,
-        "T_vmdLogicalStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_vmdPhysicalStatus,
       { "vmdPhysicalStatus", "mms.vmdPhysicalStatus",
         FT_INT32, BASE_DEC, VALS(mms_T_vmdPhysicalStatus_vals), 0,
-        "T_vmdPhysicalStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_localDetail,
       { "localDetail", "mms.localDetail",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -8116,19 +8116,19 @@ void proto_register_mms(void) {
     { &hf_mms_extendedObjectClass,
       { "extendedObjectClass", "mms.extendedObjectClass",
         FT_UINT32, BASE_DEC, VALS(mms_T_extendedObjectClass_vals), 0,
-        "T_extendedObjectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_objectClass,
       { "objectClass", "mms.objectClass",
         FT_INT32, BASE_DEC, VALS(mms_T_objectClass_vals), 0,
-        "T_objectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_objectScope,
       { "objectScope", "mms.objectScope",
         FT_UINT32, BASE_DEC, VALS(mms_T_objectScope_vals), 0,
-        "T_objectScope", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_vmdSpecific,
       { "vmdSpecific", "mms.vmdSpecific",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_domainSpecific,
       { "domainSpecific", "mms.domainSpecific",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8136,7 +8136,7 @@ void proto_register_mms(void) {
     { &hf_mms_aaSpecific,
       { "aaSpecific", "mms.aaSpecific",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_continueAfter,
       { "continueAfter", "mms.continueAfter",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8168,7 +8168,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfAbstractSyntaxes,
       { "listOfAbstractSyntaxes", "mms.listOfAbstractSyntaxes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfAbstractSyntaxes", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfAbstractSyntaxes_item,
       { "listOfAbstractSyntaxes item", "mms.listOfAbstractSyntaxes_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -8196,7 +8196,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfCapabilities,
       { "listOfCapabilities", "mms.listOfCapabilities",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfCapabilities", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfCapabilities_item,
       { "listOfCapabilities item", "mms.listOfCapabilities_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8216,7 +8216,7 @@ void proto_register_mms(void) {
     { &hf_mms_loadData,
       { "loadData", "mms.loadData",
         FT_UINT32, BASE_DEC, VALS(mms_T_loadData_vals), 0,
-        "T_loadData", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_non_coded,
       { "non-coded", "mms.non_coded",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -8308,7 +8308,7 @@ void proto_register_mms(void) {
     { &hf_mms_executionArgument,
       { "executionArgument", "mms.executionArgument",
         FT_UINT32, BASE_DEC, VALS(mms_T_executionArgument_vals), 0,
-        "T_executionArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_simpleString,
       { "simpleString", "mms.simpleString",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8352,7 +8352,7 @@ void proto_register_mms(void) {
     { &hf_mms_array,
       { "array", "mms.array",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_array", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_packed,
       { "packed", "mms.packed",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -8368,15 +8368,15 @@ void proto_register_mms(void) {
     { &hf_mms_structure,
       { "structure", "mms.structure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_structure", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_components,
       { "components", "mms.components",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_components", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_components_item,
       { "components item", "mms.components_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_components_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_componentName,
       { "componentName", "mms.componentName",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8388,7 +8388,7 @@ void proto_register_mms(void) {
     { &hf_mms_boolean,
       { "boolean", "mms.boolean",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_bit_string,
       { "bit-string", "mms.bit_string",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8412,7 +8412,7 @@ void proto_register_mms(void) {
     { &hf_mms_generalized_time,
       { "generalized-time", "mms.generalized_time",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_binary_time,
       { "binary-time", "mms.binary_time",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -8424,11 +8424,11 @@ void proto_register_mms(void) {
     { &hf_mms_objId,
       { "objId", "mms.objId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_AlternateAccess_item,
       { "AlternateAccess item", "mms.AlternateAccess_item",
         FT_UINT32, BASE_DEC, VALS(mms_AlternateAccess_item_vals), 0,
-        "AlternateAccess_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_unnamed,
       { "unnamed", "mms.unnamed",
         FT_UINT32, BASE_DEC, VALS(mms_AlternateAccessSelection_vals), 0,
@@ -8436,7 +8436,7 @@ void proto_register_mms(void) {
     { &hf_mms_named,
       { "named", "mms.named",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_named", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_accesst,
       { "accesst", "mms.accesst",
         FT_UINT32, BASE_DEC, VALS(mms_AlternateAccessSelection_vals), 0,
@@ -8444,11 +8444,11 @@ void proto_register_mms(void) {
     { &hf_mms_selectAlternateAccess,
       { "selectAlternateAccess", "mms.selectAlternateAccess",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_selectAlternateAccess", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_accessSelection,
       { "accessSelection", "mms.accessSelection",
         FT_UINT32, BASE_DEC, VALS(mms_T_accessSelection_vals), 0,
-        "T_accessSelection", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_component,
       { "component", "mms.component",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8460,7 +8460,7 @@ void proto_register_mms(void) {
     { &hf_mms_indexRange,
       { "indexRange", "mms.indexRange",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_indexRange", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_lowIndex,
       { "lowIndex", "mms.lowIndex",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8468,7 +8468,7 @@ void proto_register_mms(void) {
     { &hf_mms_allElements,
       { "allElements", "mms.allElements",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_alternateAccess,
       { "alternateAccess", "mms.alternateAccess",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -8476,7 +8476,7 @@ void proto_register_mms(void) {
     { &hf_mms_selectAccess,
       { "selectAccess", "mms.selectAccess",
         FT_UINT32, BASE_DEC, VALS(mms_T_selectAccess_vals), 0,
-        "T_selectAccess", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_indexRange_01,
       { "indexRange", "mms.indexRange",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8512,7 +8512,7 @@ void proto_register_mms(void) {
     { &hf_mms_Write_Response_item,
       { "Write-Response item", "mms.Write_Response_item",
         FT_UINT32, BASE_DEC, VALS(mms_Write_Response_item_vals), 0,
-        "Write_Response_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_failure,
       { "failure", "mms.failure",
         FT_INT32, BASE_DEC, VALS(mms_DataAccessError_vals), 0,
@@ -8520,7 +8520,7 @@ void proto_register_mms(void) {
     { &hf_mms_success,
       { "success", "mms.success",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_variableAccessSpecification,
       { "variableAccessSpecification", "mms.variableAccessSpecification",
         FT_UINT32, BASE_DEC, VALS(mms_VariableAccessSpecification_vals), 0,
@@ -8552,7 +8552,7 @@ void proto_register_mms(void) {
     { &hf_mms_scopeOfDelete,
       { "scopeOfDelete", "mms.scopeOfDelete",
         FT_INT32, BASE_DEC, VALS(mms_T_scopeOfDelete_vals), 0,
-        "T_scopeOfDelete", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfName,
       { "listOfName", "mms.listOfName",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -8576,11 +8576,11 @@ void proto_register_mms(void) {
     { &hf_mms_listOfVariable,
       { "listOfVariable", "mms.listOfVariable",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfVariable", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfVariable_item,
       { "listOfVariable item", "mms.listOfVariable_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_listOfVariable_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_variableSpecification,
       { "variableSpecification", "mms.variableSpecification",
         FT_UINT32, BASE_DEC, VALS(mms_VariableSpecification_vals), 0,
@@ -8700,15 +8700,15 @@ void proto_register_mms(void) {
     { &hf_mms_ScatteredAccessDescription_item,
       { "ScatteredAccessDescription item", "mms.ScatteredAccessDescription_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ScatteredAccessDescription_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_variableDescription,
       { "variableDescription", "mms.variableDescription",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_variableDescription", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_invalidated,
       { "invalidated", "mms.invalidated",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_numericAddress,
       { "numericAddress", "mms.numericAddress",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8756,7 +8756,7 @@ void proto_register_mms(void) {
     { &hf_mms_noResult,
       { "noResult", "mms.noResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_numbersOfTokens,
       { "numbersOfTokens", "mms.numbersOfTokens",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8764,7 +8764,7 @@ void proto_register_mms(void) {
     { &hf_mms_class,
       { "class", "mms.class",
         FT_INT32, BASE_DEC, VALS(mms_T_class_vals), 0,
-        "T_class", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_numberOfTokens,
       { "numberOfTokens", "mms.numberOfTokens",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8784,11 +8784,11 @@ void proto_register_mms(void) {
     { &hf_mms_listOfNamedTokens,
       { "listOfNamedTokens", "mms.listOfNamedTokens",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfNamedTokens", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfNamedTokens_item,
       { "listOfNamedTokens item", "mms.listOfNamedTokens_item",
         FT_UINT32, BASE_DEC, VALS(mms_T_listOfNamedTokens_item_vals), 0,
-        "T_listOfNamedTokens_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_freeNamedToken,
       { "freeNamedToken", "mms.freeNamedToken",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8804,7 +8804,7 @@ void proto_register_mms(void) {
     { &hf_mms_state_02,
       { "state", "mms.state",
         FT_INT32, BASE_DEC, VALS(mms_T_state_vals), 0,
-        "T_state", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_entryIdToStartAfter,
       { "entryIdToStartAfter", "mms.entryIdToStartAfter",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -8824,7 +8824,7 @@ void proto_register_mms(void) {
     { &hf_mms_entryClass,
       { "entryClass", "mms.entryClass",
         FT_INT32, BASE_DEC, VALS(mms_T_entryClass_vals), 0,
-        "T_entryClass", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_applicationReference,
       { "applicationReference", "mms.applicationReference",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8844,7 +8844,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfPromptData,
       { "listOfPromptData", "mms.listOfPromptData",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfPromptData", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfPromptData_item,
       { "listOfPromptData item", "mms.listOfPromptData_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8856,7 +8856,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfOutputData,
       { "listOfOutputData", "mms.listOfOutputData",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfOutputData", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfOutputData_item,
       { "listOfOutputData item", "mms.listOfOutputData_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8900,7 +8900,7 @@ void proto_register_mms(void) {
     { &hf_mms_aa_specific_01,
       { "aa-specific", "mms.aa_specific",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_domain,
       { "domain", "mms.domain",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -8908,11 +8908,11 @@ void proto_register_mms(void) {
     { &hf_mms_vmd,
       { "vmd", "mms.vmd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_monitoredVariable_01,
       { "monitoredVariable", "mms.monitoredVariable",
         FT_UINT32, BASE_DEC, VALS(mms_T_monitoredVariable_vals), 0,
-        "T_monitoredVariable", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_variableReference,
       { "variableReference", "mms.variableReference",
         FT_UINT32, BASE_DEC, VALS(mms_VariableSpecification_vals), 0,
@@ -8920,7 +8920,7 @@ void proto_register_mms(void) {
     { &hf_mms_undefined,
       { "undefined", "mms.undefined",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_currentState,
       { "currentState", "mms.currentState",
         FT_INT32, BASE_DEC, VALS(mms_EC_State_vals), 0,
@@ -8972,7 +8972,7 @@ void proto_register_mms(void) {
     { &hf_mms_scopeOfRequest,
       { "scopeOfRequest", "mms.scopeOfRequest",
         FT_INT32, BASE_DEC, VALS(mms_T_scopeOfRequest_vals), 0,
-        "T_scopeOfRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_eventEnrollmentNames,
       { "eventEnrollmentNames", "mms.eventEnrollmentNames",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -8988,7 +8988,7 @@ void proto_register_mms(void) {
     { &hf_mms_eventConditionName_01,
       { "eventConditionName", "mms.eventConditionName",
         FT_UINT32, BASE_DEC, VALS(mms_T_eventConditionName_vals), 0,
-        "T_eventConditionName", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_eventCondition,
       { "eventCondition", "mms.eventCondition",
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
@@ -8996,7 +8996,7 @@ void proto_register_mms(void) {
     { &hf_mms_eventActionName_01,
       { "eventActionName", "mms.eventActionName",
         FT_UINT32, BASE_DEC, VALS(mms_T_eventActionName_vals), 0,
-        "T_eventActionName", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_eventAction,
       { "eventAction", "mms.eventAction",
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
@@ -9040,7 +9040,7 @@ void proto_register_mms(void) {
     { &hf_mms_currentState_02,
       { "currentState", "mms.currentState",
         FT_UINT32, BASE_DEC, VALS(mms_T_currentState_vals), 0,
-        "T_currentState", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_state_03,
       { "state", "mms.state",
         FT_INT32, BASE_DEC, VALS(mms_EE_State_vals), 0,
@@ -9068,11 +9068,11 @@ void proto_register_mms(void) {
     { &hf_mms_acknowledgmentFilter,
       { "acknowledgmentFilter", "mms.acknowledgmentFilter",
         FT_INT32, BASE_DEC, VALS(mms_T_acknowledgmentFilter_vals), 0,
-        "T_acknowledgmentFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_severityFilter,
       { "severityFilter", "mms.severityFilter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_severityFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_mostSevere,
       { "mostSevere", "mms.mostSevere",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -9092,7 +9092,7 @@ void proto_register_mms(void) {
     { &hf_mms_unacknowledgedState,
       { "unacknowledgedState", "mms.unacknowledgedState",
         FT_INT32, BASE_DEC, VALS(mms_T_unacknowledgedState_vals), 0,
-        "T_unacknowledgedState", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_acknowledgmentFilter_01,
       { "acknowledgmentFilter", "mms.acknowledgmentFilter",
         FT_INT32, BASE_DEC, VALS(mms_T_acknowledgmentFilter_01_vals), 0,
@@ -9128,7 +9128,7 @@ void proto_register_mms(void) {
     { &hf_mms_actionResult,
       { "actionResult", "mms.actionResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_actionResult", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_eventActioName,
       { "eventActioName", "mms.eventActioName",
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
@@ -9136,7 +9136,7 @@ void proto_register_mms(void) {
     { &hf_mms_eventActionResult,
       { "eventActionResult", "mms.eventActionResult",
         FT_UINT32, BASE_DEC, VALS(mms_T_eventActionResult_vals), 0,
-        "T_eventActionResult", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_success_02,
       { "success", "mms.success",
         FT_UINT32, BASE_DEC, VALS(mms_ConfirmedServiceResponse_vals), 0,
@@ -9164,7 +9164,7 @@ void proto_register_mms(void) {
     { &hf_mms_rangeStartSpecification,
       { "rangeStartSpecification", "mms.rangeStartSpecification",
         FT_UINT32, BASE_DEC, VALS(mms_T_rangeStartSpecification_vals), 0,
-        "T_rangeStartSpecification", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_startingTime,
       { "startingTime", "mms.startingTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -9176,7 +9176,7 @@ void proto_register_mms(void) {
     { &hf_mms_rangeStopSpecification,
       { "rangeStopSpecification", "mms.rangeStopSpecification",
         FT_UINT32, BASE_DEC, VALS(mms_T_rangeStopSpecification_vals), 0,
-        "T_rangeStopSpecification", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_endingTime,
       { "endingTime", "mms.endingTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -9188,7 +9188,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfVariables,
       { "listOfVariables", "mms.listOfVariables",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_listOfVariables", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfVariables_item,
       { "listOfVariables item", "mms.listOfVariables_item",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -9196,7 +9196,7 @@ void proto_register_mms(void) {
     { &hf_mms_entryToStartAfter,
       { "entryToStartAfter", "mms.entryToStartAfter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_entryToStartAfter", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_timeSpecification,
       { "timeSpecification", "mms.timeSpecification",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -9236,7 +9236,7 @@ void proto_register_mms(void) {
     { &hf_mms_limitSpecification,
       { "limitSpecification", "mms.limitSpecification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_limitSpecification", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_limitingTime,
       { "limitingTime", "mms.limitingTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -9260,15 +9260,15 @@ void proto_register_mms(void) {
     { &hf_mms_entryForm,
       { "entryForm", "mms.entryForm",
         FT_UINT32, BASE_DEC, VALS(mms_T_entryForm_vals), 0,
-        "T_entryForm", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_data,
       { "data", "mms.data",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_data", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_event,
       { "event", "mms.event",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_event", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_listOfVariables_01,
       { "listOfVariables", "mms.listOfVariables",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -9276,7 +9276,7 @@ void proto_register_mms(void) {
     { &hf_mms_listOfVariables_item_01,
       { "listOfVariables item", "mms.listOfVariables_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_listOfVariables_item", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_variableTag,
       { "variableTag", "mms.variableTag",
         FT_STRING, BASE_NONE, NULL, 0,