Regenerate a few of the ASN.1 dissectors

svn path=/trunk/; revision=32742

1 files changed, 261 insertions, 261 deletions

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 9d1a5e44b2..abb3d419d0 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -4464,1047 +4464,1047 @@ void proto_register_cmip(void) {
     { &hf_cmip_BaseManagedObjectId_PDU,
       { "BaseManagedObjectId", "cmip.BaseManagedObjectId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.BaseManagedObjectId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_EventTypeId_PDU,
       { "EventTypeId", "cmip.EventTypeId",
         FT_UINT32, BASE_DEC, VALS(cmip_EventTypeId_vals), 0,
-        "cmip.EventTypeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ObjectClass_PDU,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ActiveDestination_PDU,
       { "ActiveDestination", "cmip.ActiveDestination",
         FT_UINT32, BASE_DEC, VALS(cmip_Destination_vals), 0,
-        "cmip.ActiveDestination", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdditionalText_PDU,
       { "AdditionalText", "cmip.AdditionalText",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.AdditionalText", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdditionalInformation_PDU,
       { "AdditionalInformation", "cmip.AdditionalInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AdditionalInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Allomorphs_PDU,
       { "Allomorphs", "cmip.Allomorphs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.Allomorphs", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdministrativeState_PDU,
       { "AdministrativeState", "cmip.AdministrativeState",
         FT_UINT32, BASE_DEC, VALS(cmip_AdministrativeState_vals), 0,
-        "cmip.AdministrativeState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeIdentifierList_PDU,
       { "AttributeIdentifierList", "cmip.AttributeIdentifierList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeIdentifierList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeList_PDU,
       { "AttributeList", "cmip.AttributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeValueChangeDefinition_PDU,
       { "AttributeValueChangeDefinition", "cmip.AttributeValueChangeDefinition",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeValueChangeDefinition", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AlarmStatus_PDU,
       { "AlarmStatus", "cmip.AlarmStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AlarmStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AvailabilityStatus_PDU,
       { "AvailabilityStatus", "cmip.AvailabilityStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AvailabilityStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackedUpStatus_PDU,
       { "BackedUpStatus", "cmip.BackedUpStatus",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "cmip.BackedUpStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackUpDestinationList_PDU,
       { "BackUpDestinationList", "cmip.BackUpDestinationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.BackUpDestinationList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackUpRelationshipObject_PDU,
       { "BackUpRelationshipObject", "cmip.BackUpRelationshipObject",
         FT_UINT32, BASE_DEC, VALS(cmip_BackUpRelationshipObject_vals), 0,
-        "cmip.BackUpRelationshipObject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CapacityAlarmThreshold_PDU,
       { "CapacityAlarmThreshold", "cmip.CapacityAlarmThreshold",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.CapacityAlarmThreshold", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ConfirmedMode_PDU,
       { "ConfirmedMode", "cmip.ConfirmedMode",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "cmip.ConfirmedMode", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ControlStatus_PDU,
       { "ControlStatus", "cmip.ControlStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ControlStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CorrelatedNotifications_PDU,
       { "CorrelatedNotifications", "cmip.CorrelatedNotifications",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.CorrelatedNotifications", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CurrentLogSize_PDU,
       { "CurrentLogSize", "cmip.CurrentLogSize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.CurrentLogSize", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Destination_PDU,
       { "Destination", "cmip.Destination",
         FT_UINT32, BASE_DEC, VALS(cmip_Destination_vals), 0,
-        "cmip.Destination", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_DiscriminatorConstruct_PDU,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.DiscriminatorConstruct", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_EventTime_PDU,
       { "EventTime", "cmip.EventTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.EventTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_GroupObjects_PDU,
       { "GroupObjects", "cmip.GroupObjects",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.GroupObjects", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_IntervalsOfDay_PDU,
       { "IntervalsOfDay", "cmip.IntervalsOfDay",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.IntervalsOfDay", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LifecycleState_PDU,
       { "LifecycleState", "cmip.LifecycleState",
         FT_UINT32, BASE_DEC, VALS(cmip_LifecycleState_vals), 0,
-        "cmip.LifecycleState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LogFullAction_PDU,
       { "LogFullAction", "cmip.LogFullAction",
         FT_UINT32, BASE_DEC, VALS(cmip_LogFullAction_vals), 0,
-        "cmip.LogFullAction", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LoggingTime_PDU,
       { "LoggingTime", "cmip.LoggingTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.LoggingTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LogRecordId_PDU,
       { "LogRecordId", "cmip.LogRecordId",
         FT_UINT32, BASE_DEC, VALS(cmip_SimpleNameType_vals), 0,
-        "cmip.LogRecordId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_MaxLogSize_PDU,
       { "MaxLogSize", "cmip.MaxLogSize",
         FT_INT32, BASE_DEC, VALS(cmip_MaxLogSize_vals), 0,
-        "cmip.MaxLogSize", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_MonitoredAttributes_PDU,
       { "MonitoredAttributes", "cmip.MonitoredAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.MonitoredAttributes", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NameBinding_PDU,
       { "NameBinding", "cmip.NameBinding",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.NameBinding", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NotificationIdentifier_PDU,
       { "NotificationIdentifier", "cmip.NotificationIdentifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NotificationIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NumberOfRecords_PDU,
       { "NumberOfRecords", "cmip.NumberOfRecords",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NumberOfRecords", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_OperationalState_PDU,
       { "OperationalState", "cmip.OperationalState",
         FT_UINT32, BASE_DEC, VALS(cmip_OperationalState_vals), 0,
-        "cmip.OperationalState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Packages_PDU,
       { "Packages", "cmip.Packages",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.Packages", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PerceivedSeverity_PDU,
       { "PerceivedSeverity", "cmip.PerceivedSeverity",
         FT_UINT32, BASE_DEC, VALS(cmip_PerceivedSeverity_vals), 0,
-        "cmip.PerceivedSeverity", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PrioritisedObject_PDU,
       { "PrioritisedObject", "cmip.PrioritisedObject",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.PrioritisedObject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProbableCause_PDU,
       { "ProbableCause", "cmip.ProbableCause",
         FT_UINT32, BASE_DEC, VALS(cmip_ProbableCause_vals), 0,
-        "cmip.ProbableCause", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProceduralStatus_PDU,
       { "ProceduralStatus", "cmip.ProceduralStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ProceduralStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProposedRepairActions_PDU,
       { "ProposedRepairActions", "cmip.ProposedRepairActions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ProposedRepairActions", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmCause_PDU,
       { "SecurityAlarmCause", "cmip.SecurityAlarmCause",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.SecurityAlarmCause", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmSeverity_PDU,
       { "SecurityAlarmSeverity", "cmip.SecurityAlarmSeverity",
         FT_UINT32, BASE_DEC, VALS(cmip_PerceivedSeverity_vals), 0,
-        "cmip.SecurityAlarmSeverity", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmDetector_PDU,
       { "SecurityAlarmDetector", "cmip.SecurityAlarmDetector",
         FT_UINT32, BASE_DEC, VALS(cmip_SecurityAlarmDetector_vals), 0,
-        "cmip.SecurityAlarmDetector", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ServiceProvider_PDU,
       { "ServiceProvider", "cmip.ServiceProvider",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ServiceProvider", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ServiceUser_PDU,
       { "ServiceUser", "cmip.ServiceUser",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ServiceUser", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SimpleNameType_PDU,
       { "SimpleNameType", "cmip.SimpleNameType",
         FT_UINT32, BASE_DEC, VALS(cmip_SimpleNameType_vals), 0,
-        "cmip.SimpleNameType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SourceIndicator_PDU,
       { "SourceIndicator", "cmip.SourceIndicator",
         FT_UINT32, BASE_DEC, VALS(cmip_SourceIndicator_vals), 0,
-        "cmip.SourceIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SpecificProblems_PDU,
       { "SpecificProblems", "cmip.SpecificProblems",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SpecificProblems", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StandbyStatus_PDU,
       { "StandbyStatus", "cmip.StandbyStatus",
         FT_INT32, BASE_DEC, VALS(cmip_StandbyStatus_vals), 0,
-        "cmip.StandbyStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StartTime_PDU,
       { "StartTime", "cmip.StartTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.StartTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StopTime_PDU,
       { "StopTime", "cmip.StopTime",
         FT_UINT32, BASE_DEC, VALS(cmip_StopTime_vals), 0,
-        "cmip.StopTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SupportedFeatures_PDU,
       { "SupportedFeatures", "cmip.SupportedFeatures",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SupportedFeatures", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SystemId_PDU,
       { "SystemId", "cmip.SystemId",
         FT_UINT32, BASE_DEC, VALS(cmip_SystemId_vals), 0,
-        "cmip.SystemId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SystemTitle_PDU,
       { "SystemTitle", "cmip.SystemTitle",
         FT_UINT32, BASE_DEC, VALS(cmip_SystemTitle_vals), 0,
-        "cmip.SystemTitle", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ThresholdInfo_PDU,
       { "ThresholdInfo", "cmip.ThresholdInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ThresholdInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_TrendIndication_PDU,
       { "TrendIndication", "cmip.TrendIndication",
         FT_UINT32, BASE_DEC, VALS(cmip_TrendIndication_vals), 0,
-        "cmip.TrendIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_UnknownStatus_PDU,
       { "UnknownStatus", "cmip.UnknownStatus",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "cmip.UnknownStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_UsageState_PDU,
       { "UsageState", "cmip.UsageState",
         FT_UINT32, BASE_DEC, VALS(cmip_UsageState_vals), 0,
-        "cmip.UsageState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_WeekMask_PDU,
       { "WeekMask", "cmip.WeekMask",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.WeekMask", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PAR_missingAttributeValue_item,
       { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_managedObjectClass,
       { "managedObjectClass", "cmip.managedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        "ObjectClass", HFILL }},
     { &hf_cmip_managedObjectInstance,
       { "managedObjectInstance", "cmip.managedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_currentTime,
       { "currentTime", "cmip.currentTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_actionErroractionErrorInfo,
       { "actionErrorInfo", "cmip.actionErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionErrorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionErrorInfo_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_actionErrorInfo_errorStatus_vals), 0,
-        "cmip.T_actionErrorInfo_errorStatus", HFILL }},
+        "T_actionErrorInfo_errorStatus", HFILL }},
     { &hf_cmip_actionErrorInfo,
       { "errorInfo", "cmip.errorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_T_actionErrorInfo_vals), 0,
-        "cmip.T_actionErrorInfo", HFILL }},
+        "T_actionErrorInfo", HFILL }},
     { &hf_cmip_actionType,
       { "actionType", "cmip.actionType",
         FT_UINT32, BASE_DEC, VALS(cmip_ActionTypeId_vals), 0,
-        "cmip.ActionTypeId", HFILL }},
+        "ActionTypeId", HFILL }},
     { &hf_cmip_actionArgument,
       { "actionArgument", "cmip.actionArgument",
         FT_UINT32, BASE_DEC, VALS(cmip_NoSuchArgument_vals), 0,
-        "cmip.NoSuchArgument", HFILL }},
+        "NoSuchArgument", HFILL }},
     { &hf_cmip_argumentValue,
       { "argumentValue", "cmip.argumentValue",
         FT_UINT32, BASE_DEC, VALS(cmip_InvalidArgumentValue_vals), 0,
-        "cmip.InvalidArgumentValue", HFILL }},
+        "InvalidArgumentValue", HFILL }},
     { &hf_cmip_actionInfoArg,
       { "actionInfoArg", "cmip.actionInfoArg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionInfoArg", HFILL }},
+        "T_actionInfoArg", HFILL }},
     { &hf_cmip_actionReplyInfo,
       { "actionReplyInfo", "cmip.actionReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionReplyInfo", HFILL }},
+        "T_actionReplyInfo", HFILL }},
     { &hf_cmip_actionReply,
       { "actionReply", "cmip.actionReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionReply", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionTypeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_actionTypeId_globalForm", HFILL }},
+        "T_actionTypeId_globalForm", HFILL }},
     { &hf_cmip_localForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_attributeid,
       { "id", "cmip.id",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_value,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValue", HFILL }},
+        "AttributeValue", HFILL }},
     { &hf_cmip_attributeError_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_attributeError_errorStatus_vals), 0,
-        "cmip.T_attributeError_errorStatus", HFILL }},
+        "T_attributeError_errorStatus", HFILL }},
     { &hf_cmip_modifyOperator,
       { "modifyOperator", "cmip.modifyOperator",
         FT_INT32, BASE_DEC, VALS(cmip_ModifyOperator_vals), 0,
-        "cmip.ModifyOperator", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId,
       { "attributeId", "cmip.attributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeValue,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributeValue", HFILL }},
+        "T_attributeValue", HFILL }},
     { &hf_cmip_attributeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_attributeId_globalForm", HFILL }},
+        "T_attributeId_globalForm", HFILL }},
     { &hf_cmip_attributeIdlocalForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_attributeIdlocalForm", HFILL }},
+        "T_attributeIdlocalForm", HFILL }},
     { &hf_cmip_attributeIdError_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_attributeIdError_errorStatus_vals), 0,
-        "cmip.T_attributeIdError_errorStatus", HFILL }},
+        "T_attributeIdError_errorStatus", HFILL }},
     { &hf_cmip_id,
       { "id", "cmip.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_id", HFILL }},
+        "T_id", HFILL }},
     { &hf_cmip_attributeValueAssertionvalue,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributeValueAssertionvalue", HFILL }},
+        "T_attributeValueAssertionvalue", HFILL }},
     { &hf_cmip_baseManagedObjectClass,
       { "baseManagedObjectClass", "cmip.baseManagedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        "ObjectClass", HFILL }},
     { &hf_cmip_baseManagedObjectInstance,
       { "baseManagedObjectInstance", "cmip.baseManagedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_item,
       { "item", "cmip.item",
         FT_UINT32, BASE_DEC, VALS(cmip_FilterItem_vals), 0,
-        "cmip.FilterItem", HFILL }},
+        "FilterItem", HFILL }},
     { &hf_cmip_and,
       { "and", "cmip.and",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_CMISFilter", HFILL }},
+        "SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_and_item,
       { "CMISFilter", "cmip.CMISFilter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_or,
       { "or", "cmip.or",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_CMISFilter", HFILL }},
+        "SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_or_item,
       { "CMISFilter", "cmip.CMISFilter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_not,
       { "not", "cmip.not",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        "CMISFilter", HFILL }},
     { &hf_cmip_scope,
       { "scope", "cmip.scope",
         FT_UINT32, BASE_DEC, VALS(cmip_Scope_vals), 0,
-        "cmip.Scope", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_filter,
       { "filter", "cmip.filter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        "CMISFilter", HFILL }},
     { &hf_cmip_sync,
       { "sync", "cmip.sync",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
-        "cmip.CMISSync", HFILL }},
+        "CMISSync", HFILL }},
     { &hf_cmip_managedOrSuperiorObjectInstance,
       { "managedOrSuperiorObjectInstance", "cmip.managedOrSuperiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_T_managedOrSuperiorObjectInstance_vals), 0,
-        "cmip.T_managedOrSuperiorObjectInstance", HFILL }},
+        "T_managedOrSuperiorObjectInstance", HFILL }},
     { &hf_cmip_superiorObjectInstance,
       { "superiorObjectInstance", "cmip.superiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_accessControl,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AccessControl", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_referenceObjectInstance,
       { "referenceObjectInstance", "cmip.referenceObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_attributeList,
       { "attributeList", "cmip.attributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_cmip_attributeList_item,
       { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteErrorInfo,
       { "deleteErrorInfo", "cmip.deleteErrorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_T_deleteErrorInfo_vals), 0,
-        "cmip.T_deleteErrorInfo", HFILL }},
+        "T_deleteErrorInfo", HFILL }},
     { &hf_cmip_eventType,
       { "eventType", "cmip.eventType",
         FT_UINT32, BASE_DEC, VALS(cmip_EventTypeId_vals), 0,
-        "cmip.EventTypeId", HFILL }},
+        "EventTypeId", HFILL }},
     { &hf_cmip_eventReplyInfo,
       { "eventReplyInfo", "cmip.eventReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventReplyInfo", HFILL }},
+        "T_eventReplyInfo", HFILL }},
     { &hf_cmip_eventTime,
       { "eventTime", "cmip.eventTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_eventReportArgumenteventInfo,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EventReportArgumentEventInfo", HFILL }},
+        "EventReportArgumentEventInfo", HFILL }},
     { &hf_cmip_eventReply,
       { "eventReply", "cmip.eventReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EventReply", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventTypeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_eventTypeId_globalForm", HFILL }},
+        "T_eventTypeId_globalForm", HFILL }},
     { &hf_cmip_equality,
       { "equality", "cmip.equality",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_substrings,
       { "substrings", "cmip.substrings",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.T_substrings", HFILL }},
+        "T_substrings", HFILL }},
     { &hf_cmip_substrings_item,
       { "substrings item", "cmip.substrings_item",
         FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0,
-        "cmip.T_substrings_item", HFILL }},
+        "T_substrings_item", HFILL }},
     { &hf_cmip_initialString,
       { "initialString", "cmip.initialString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_anyString,
       { "anyString", "cmip.anyString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_finalString,
       { "finalString", "cmip.finalString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_greaterOrEqual,
       { "greaterOrEqual", "cmip.greaterOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_lessOrEqual,
       { "lessOrEqual", "cmip.lessOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_filterItempresent,
       { "present", "cmip.present",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_subsetOf,
       { "subsetOf", "cmip.subsetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_supersetOf,
       { "supersetOf", "cmip.supersetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_nonNullSetIntersection,
       { "nonNullSetIntersection", "cmip.nonNullSetIntersection",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_attributeIdError,
       { "attributeIdError", "cmip.attributeIdError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeIdError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attribute,
       { "attribute", "cmip.attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_getInfoList,
       { "getInfoList", "cmip.getInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_GetInfoStatus", HFILL }},
+        "SET_OF_GetInfoStatus", HFILL }},
     { &hf_cmip_getInfoList_item,
       { "GetInfoStatus", "cmip.GetInfoStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0,
-        "cmip.GetInfoStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionValue,
       { "actionValue", "cmip.actionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionInfo", HFILL }},
+        "ActionInfo", HFILL }},
     { &hf_cmip_eventValue,
       { "eventValue", "cmip.eventValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventValue", HFILL }},
+        "T_eventValue", HFILL }},
     { &hf_cmip_eventInfo,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventInfo", HFILL }},
+        "T_eventInfo", HFILL }},
     { &hf_cmip_getResult,
       { "getResult", "cmip.getResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.GetResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_getListError,
       { "getListError", "cmip.getListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.GetListError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setResult,
       { "setResult", "cmip.setResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SetResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setListError,
       { "setListError", "cmip.setListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SetListError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionResult,
       { "actionResult", "cmip.actionResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_processingFailure,
       { "processingFailure", "cmip.processingFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ProcessingFailure", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteResult,
       { "deleteResult", "cmip.deleteResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.DeleteResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionError,
       { "actionError", "cmip.actionError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteError,
       { "deleteError", "cmip.deleteError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.DeleteError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionId,
       { "actionId", "cmip.actionId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionId", HFILL }},
+        "T_actionId", HFILL }},
     { &hf_cmip_eventId,
       { "eventId", "cmip.eventId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventId", HFILL }},
+        "T_eventId", HFILL }},
     { &hf_cmip_objectClass_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_objectClass_globalForm", HFILL }},
+        "T_objectClass_globalForm", HFILL }},
     { &hf_cmip_objectClasslocalForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_objectClasslocalForm", HFILL }},
+        "T_objectClasslocalForm", HFILL }},
     { &hf_cmip_distinguishedName,
       { "distinguishedName", "cmip.distinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.DistinguishedName", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_nonSpecificForm,
       { "nonSpecificForm", "cmip.nonSpecificForm",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "cmip.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_cmip_localDistinguishedName,
       { "localDistinguishedName", "cmip.localDistinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.RDNSequence", HFILL }},
+        "RDNSequence", HFILL }},
     { &hf_cmip_specificErrorInfo,
       { "specificErrorInfo", "cmip.specificErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SpecificErrorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_RDNSequence_item,
       { "RelativeDistinguishedName", "cmip.RelativeDistinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.RelativeDistinguishedName", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_RelativeDistinguishedName_item,
       { "AttributeValueAssertion", "cmip.AttributeValueAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValueAssertion", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_namedNumbers,
       { "namedNumbers", "cmip.namedNumbers",
         FT_INT32, BASE_DEC, VALS(cmip_T_namedNumbers_vals), 0,
-        "cmip.T_namedNumbers", HFILL }},
+        "T_namedNumbers", HFILL }},
     { &hf_cmip_individualLevels,
       { "individualLevels", "cmip.individualLevels",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_baseToNthLevel,
       { "baseToNthLevel", "cmip.baseToNthLevel",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_attributeError,
       { "attributeError", "cmip.attributeError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setInfoList,
       { "setInfoList", "cmip.setInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_SetInfoStatus", HFILL }},
+        "SET_OF_SetInfoStatus", HFILL }},
     { &hf_cmip_setInfoList_item,
       { "SetInfoStatus", "cmip.SetInfoStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_SetInfoStatus_vals), 0,
-        "cmip.SetInfoStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorId,
       { "errorId", "cmip.errorId",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_errorId", HFILL }},
+        "T_errorId", HFILL }},
     { &hf_cmip_errorInfo,
       { "errorInfo", "cmip.errorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_errorInfo", HFILL }},
+        "T_errorInfo", HFILL }},
     { &hf_cmip_abortSource,
       { "abortSource", "cmip.abortSource",
         FT_UINT32, BASE_DEC, VALS(cmip_CMIPAbortSource_vals), 0,
-        "cmip.CMIPAbortSource", HFILL }},
+        "CMIPAbortSource", HFILL }},
     { &hf_cmip_userInfo,
       { "userInfo", "cmip.userInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
       { "protocolVersion", "cmip.protocolVersion",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "cmip.ProtocolVersion", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_functionalUnits,
       { "functionalUnits", "cmip.functionalUnits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "cmip.FunctionalUnits", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_cmipUserInfoaccessControl,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_cmip_AdditionalInformation_item,
       { "ManagementExtension", "cmip.ManagementExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ManagementExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Allomorphs_item,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeIdentifierList_item,
       { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeList_item,
       { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeValueChangeDefinition_item,
       { "AttributeValueChangeDefinition item", "cmip.AttributeValueChangeDefinition_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValueChangeDefinition_item", HFILL }},
+        "AttributeValueChangeDefinition_item", HFILL }},
     { &hf_cmip_oldAttributeValue,
       { "oldAttributeValue", "cmip.oldAttributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_oldAttributeValue", HFILL }},
+        "T_oldAttributeValue", HFILL }},
     { &hf_cmip_newAttributeValue,
       { "newAttributeValue", "cmip.newAttributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_newAttributeValue", HFILL }},
+        "T_newAttributeValue", HFILL }},
     { &hf_cmip_AlarmStatus_item,
       { "AlarmStatus item", "cmip.AlarmStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_AlarmStatus_item_vals), 0,
-        "cmip.AlarmStatus_item", HFILL }},
+        "AlarmStatus_item", HFILL }},
     { &hf_cmip_AvailabilityStatus_item,
       { "AvailabilityStatus item", "cmip.AvailabilityStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_AvailabilityStatus_item_vals), 0,
-        "cmip.AvailabilityStatus_item", HFILL }},
+        "AvailabilityStatus_item", HFILL }},
     { &hf_cmip_BackUpDestinationList_item,
       { "AE-title", "cmip.AE_title",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_objectName,
       { "objectName", "cmip.objectName",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_noObject,
       { "noObject", "cmip.noObject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_cmip_CapacityAlarmThreshold_item,
       { "CapacityAlarmThreshold item", "cmip.CapacityAlarmThreshold_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_100", HFILL }},
+        "INTEGER_0_100", HFILL }},
     { &hf_cmip_ControlStatus_item,
       { "ControlStatus item", "cmip.ControlStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_ControlStatus_item_vals), 0,
-        "cmip.ControlStatus_item", HFILL }},
+        "ControlStatus_item", HFILL }},
     { &hf_cmip_CorrelatedNotifications_item,
       { "CorrelatedNotifications item", "cmip.CorrelatedNotifications_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.CorrelatedNotifications_item", HFILL }},
+        "CorrelatedNotifications_item", HFILL }},
     { &hf_cmip_correlatedNotifications,
       { "correlatedNotifications", "cmip.correlatedNotifications",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_NotificationIdentifier", HFILL }},
+        "SET_OF_NotificationIdentifier", HFILL }},
     { &hf_cmip_correlatedNotifications_item,
       { "NotificationIdentifier", "cmip.NotificationIdentifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NotificationIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_sourceObjectInst,
       { "sourceObjectInst", "cmip.sourceObjectInst",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_single,
       { "single", "cmip.single",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        "AE_title", HFILL }},
     { &hf_cmip_multiple,
       { "multiple", "cmip.multiple",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_AE_title", HFILL }},
+        "SET_OF_AE_title", HFILL }},
     { &hf_cmip_multiple_item,
       { "AE-title", "cmip.AE_title",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_GroupObjects_item,
       { "ObjectInstance", "cmip.ObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_IntervalsOfDay_item,
       { "IntervalsOfDay item", "cmip.IntervalsOfDay_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.IntervalsOfDay_item", HFILL }},
+        "IntervalsOfDay_item", HFILL }},
     { &hf_cmip_intervalStart,
       { "intervalStart", "cmip.intervalStart",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Time24", HFILL }},
+        "Time24", HFILL }},
     { &hf_cmip_intervalEnd,
       { "intervalEnd", "cmip.intervalEnd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Time24", HFILL }},
+        "Time24", HFILL }},
     { &hf_cmip_managementExtensionidentifier,
       { "identifier", "cmip.identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_managementExtensionidentifier", HFILL }},
+        "T_managementExtensionidentifier", HFILL }},
     { &hf_cmip_significance,
       { "significance", "cmip.significance",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "cmip.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_cmip_information,
       { "information", "cmip.information",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_information", HFILL }},
+        "T_information", HFILL }},
     { &hf_cmip_MonitoredAttributes_item,
       { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_integer,
       { "integer", "cmip.integer",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_real,
       { "real", "cmip.real",
         FT_DOUBLE, BASE_NONE, NULL, 0,
-        "cmip.REAL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Packages_item,
       { "Packages item", "cmip.Packages_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_PrioritisedObject_item,
       { "PrioritisedObject item", "cmip.PrioritisedObject_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.PrioritisedObject_item", HFILL }},
+        "PrioritisedObject_item", HFILL }},
     { &hf_cmip_object,
       { "object", "cmip.object",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_priority,
       { "priority", "cmip.priority",
         FT_INT32, BASE_DEC, VALS(cmip_T_priority_vals), 0,
-        "cmip.T_priority", HFILL }},
+        "T_priority", HFILL }},
     { &hf_cmip_globalValue,
       { "globalValue", "cmip.globalValue",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_localValue,
       { "localValue", "cmip.localValue",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_ProceduralStatus_item,
       { "ProceduralStatus item", "cmip.ProceduralStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_ProceduralStatus_item_vals), 0,
-        "cmip.ProceduralStatus_item", HFILL }},
+        "ProceduralStatus_item", HFILL }},
     { &hf_cmip_ProposedRepairActions_item,
       { "SpecificIdentifier", "cmip.SpecificIdentifier",
         FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0,
-        "cmip.SpecificIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_mechanism,
       { "mechanism", "cmip.mechanism",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_application,
       { "application", "cmip.application",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        "AE_title", HFILL }},
     { &hf_cmip_serviceUseridentifier,
       { "identifier", "cmip.identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_serviceUseridentifier", HFILL }},
+        "T_serviceUseridentifier", HFILL }},
     { &hf_cmip_details,
       { "details", "cmip.details",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_details", HFILL }},
+        "T_details", HFILL }},
     { &hf_cmip_number,
       { "number", "cmip.number",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_string,
       { "string", "cmip.string",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_cmip_oi,
       { "oi", "cmip.oi",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_int,
       { "int", "cmip.int",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_SpecificProblems_item,
       { "SpecificIdentifier", "cmip.SpecificIdentifier",
         FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0,
-        "cmip.SpecificIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_specific,
       { "specific", "cmip.specific",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_continual,
       { "continual", "cmip.continual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_cmip_SupportedFeatures_item,
       { "SupportedFeatures item", "cmip.SupportedFeatures_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SupportedFeatures_item", HFILL }},
+        "SupportedFeatures_item", HFILL }},
     { &hf_cmip_featureIdentifier,
       { "featureIdentifier", "cmip.featureIdentifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_featureIdentifier", HFILL }},
+        "T_featureIdentifier", HFILL }},
     { &hf_cmip_featureInfo,
       { "featureInfo", "cmip.featureInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_featureInfo", HFILL }},
+        "T_featureInfo", HFILL }},
     { &hf_cmip_name,
       { "name", "cmip.name",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_cmip_nothing,
       { "nothing", "cmip.nothing",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_cmip_oid,
       { "oid", "cmip.oid",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_hour,
       { "hour", "cmip.hour",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_23", HFILL }},
+        "INTEGER_0_23", HFILL }},
     { &hf_cmip_minute,
       { "minute", "cmip.minute",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_59", HFILL }},
+        "INTEGER_0_59", HFILL }},
     { &hf_cmip_triggeredThreshold,
       { "triggeredThreshold", "cmip.triggeredThreshold",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_observedValue,
       { "observedValue", "cmip.observedValue",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_thresholdLevel,
       { "thresholdLevel", "cmip.thresholdLevel",
         FT_UINT32, BASE_DEC, VALS(cmip_ThresholdLevelInd_vals), 0,
-        "cmip.ThresholdLevelInd", HFILL }},
+        "ThresholdLevelInd", HFILL }},
     { &hf_cmip_armTime,
       { "armTime", "cmip.armTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_up,
       { "up", "cmip.up",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_up", HFILL }},
+        "T_up", HFILL }},
     { &hf_cmip_high,
       { "high", "cmip.high",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        "ObservedValue", HFILL }},
     { &hf_cmip_low,
       { "low", "cmip.low",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        "ObservedValue", HFILL }},
     { &hf_cmip_down,
       { "down", "cmip.down",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_down", HFILL }},
+        "T_down", HFILL }},
     { &hf_cmip_WeekMask_item,
       { "WeekMask item", "cmip.WeekMask_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.WeekMask_item", HFILL }},
+        "WeekMask_item", HFILL }},
     { &hf_cmip_daysOfWeek,
       { "daysOfWeek", "cmip.daysOfWeek",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "cmip.T_daysOfWeek", HFILL }},
+        "T_daysOfWeek", HFILL }},
     { &hf_cmip_intervalsOfDay,
       { "intervalsOfDay", "cmip.intervalsOfDay",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.IntervalsOfDay", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_local,
       { "local", "cmip.local",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_local", HFILL }},
+        "T_local", HFILL }},
     { &hf_cmip_global,
       { "global", "cmip.global",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_invoke,
       { "invoke", "cmip.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Invoke", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_returnResult,
       { "returnResult", "cmip.returnResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ReturnResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_returnError,
       { "returnError", "cmip.returnError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ReturnError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_reject,
       { "reject", "cmip.reject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Reject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_invokeId,
       { "invokeId", "cmip.invokeId",
         FT_UINT32, BASE_DEC, VALS(cmip_InvokeId_vals), 0,
-        "cmip.InvokeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_linkedId,
       { "linkedId", "cmip.linkedId",
         FT_UINT32, BASE_DEC, VALS(cmip_T_linkedId_vals), 0,
-        "cmip.T_linkedId", HFILL }},
+        "T_linkedId", HFILL }},
     { &hf_cmip_linkedIdPresent,
       { "present", "cmip.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_linkedIdPresent", HFILL }},
+        "T_linkedIdPresent", HFILL }},
     { &hf_cmip_absent,
       { "absent", "cmip.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_cmip_opcode,
       { "opcode", "cmip.opcode",
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
-        "cmip.Code", HFILL }},
+        "Code", HFILL }},
     { &hf_cmip_argument,
       { "argument", "cmip.argument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.InvokeArgument", HFILL }},
+        "InvokeArgument", HFILL }},
     { &hf_cmip_result,
       { "result", "cmip.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_result", HFILL }},
+        "T_result", HFILL }},
     { &hf_cmip_resultArgument,
       { "result", "cmip.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ResultArgument", HFILL }},
+        "ResultArgument", HFILL }},
     { &hf_cmip_errcode,
       { "errcode", "cmip.errcode",
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
-        "cmip.Code", HFILL }},
+        "Code", HFILL }},
     { &hf_cmip_parameter,
       { "parameter", "cmip.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_parameter", HFILL }},
+        "T_parameter", HFILL }},
     { &hf_cmip_problem,
       { "problem", "cmip.problem",
         FT_UINT32, BASE_DEC, VALS(cmip_T_problem_vals), 0,
-        "cmip.T_problem", HFILL }},
+        "T_problem", HFILL }},
     { &hf_cmip_general,
       { "general", "cmip.general",
         FT_INT32, BASE_DEC, VALS(cmip_GeneralProblem_vals), 0,
-        "cmip.GeneralProblem", HFILL }},
+        "GeneralProblem", HFILL }},
     { &hf_cmip_invokeProblem,
       { "invoke", "cmip.invoke",
         FT_INT32, BASE_DEC, VALS(cmip_InvokeProblem_vals), 0,
-        "cmip.InvokeProblem", HFILL }},
+        "InvokeProblem", HFILL }},
     { &hf_cmip_returnResultProblem,
       { "returnResult", "cmip.returnResult",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnResultProblem_vals), 0,
-        "cmip.ReturnResultProblem", HFILL }},
+        "ReturnResultProblem", HFILL }},
     { &hf_cmip_returnErrorProblem,
       { "returnError", "cmip.returnError",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnErrorProblem_vals), 0,
-        "cmip.ReturnErrorProblem", HFILL }},
+        "ReturnErrorProblem", HFILL }},
     { &hf_cmip_present,
       { "present", "cmip.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_synchronization,
       { "synchronization", "cmip.synchronization",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
-        "cmip.CMISSync", HFILL }},
+        "CMISSync", HFILL }},
     { &hf_cmip_actionInfo,
       { "actionInfo", "cmip.actionInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeIdList,
       { "attributeIdList", "cmip.attributeIdList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_AttributeId", HFILL }},
+        "SET_OF_AttributeId", HFILL }},
     { &hf_cmip_attributeIdList_item,
       { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_modificationList,
       { "modificationList", "cmip.modificationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.T_modificationList", HFILL }},
+        "T_modificationList", HFILL }},
     { &hf_cmip_modificationList_item,
       { "modificationList item", "cmip.modificationList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_modificationList_item", HFILL }},
+        "T_modificationList_item", HFILL }},
     { &hf_cmip_attributevalue,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributevalue", HFILL }},
+        "T_attributevalue", HFILL }},
     { &hf_cmip_InvokeId_present,
       { "InvokeId.present", "cmip.InvokeId_present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.InvokeId_present", HFILL }},
+        "InvokeId_present", HFILL }},
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
       { "multipleObjectSelection", "cmip.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,