asn2wrs: Improve filtername of named bits.

Change-Id: Ie22137e95c8752a0783e3e9ff99b45c0b79b0d4a Reviewed-on: https://code.wireshark.org/review/32714 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
author: Anders Broman <anders.broman@ericsson.com> 2019-04-04 14:49:57 +0200
committer: Anders Broman <a.broman58@gmail.com> 2019-04-04 13:26:33 +0000
commit: 7edadf9ce38d3c983d8911200aa46f49ade26f2e (patch)
tree: bc747e60a2b59d2e9bab81889f7f00c222a19bd1 /epan/dissectors
parent: b0b02ec245b694251488c80cb605dddf66512b03 (diff)
42 files changed, 2413 insertions, 2413 deletions
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 66c8e5fec2..3804f97b89 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1553,15 +1553,15 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SecurityContext", HFILL }},
     { &hf_acp133_OnSupported_acp127_nn,
-      { "acp127-nn", "acp133.acp127-nn",
+      { "acp127-nn", "acp133.OnSupported.acp127.nn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_acp133_OnSupported_acp127_pn,
-      { "acp127-pn", "acp133.acp127-pn",
+      { "acp127-pn", "acp133.OnSupported.acp127.pn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_acp133_OnSupported_acp127_tn,
-      { "acp127-tn", "acp133.acp127-tn",
+      { "acp127-tn", "acp133.OnSupported.acp127.tn",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index c780f5a2da..a7bfe198c5 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -2193,27 +2193,27 @@ void proto_register_acse(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "Authentication_value_other", HFILL }},
     { &hf_acse_T_AARQ_protocol_version_version1,
-      { "version1", "acse.version1",
+      { "version1", "acse.T.AARQ.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_acse_T_AARE_protocol_version_version1,
-      { "version1", "acse.version1",
+      { "version1", "acse.T.AARE.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_acse_ACSE_requirements_authentication,
-      { "authentication", "acse.authentication",
+      { "authentication", "acse.ACSE.requirements.authentication",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_acse_ACSE_requirements_aSO_context_negotiation,
-      { "aSO-context-negotiation", "acse.aSO-context-negotiation",
+      { "aSO-context-negotiation", "acse.ACSE.requirements.aSO.context.negotiation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_acse_ACSE_requirements_higher_level_association,
-      { "higher-level-association", "acse.higher-level-association",
+      { "higher-level-association", "acse.ACSE.requirements.higher.level.association",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_acse_ACSE_requirements_nested_association,
-      { "nested-association", "acse.nested-association",
+      { "nested-association", "acse.ACSE.requirements.nested.association",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c
index e80f26a8d9..6e0052041f 100644
--- a/epan/dissectors/packet-ain.c
+++ b/epan/dissectors/packet-ain.c
@@ -11116,255 +11116,255 @@ void proto_register_ain(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "InvokeId_present", HFILL }},
     { &hf_ain_ApplyRestrictions_U_code,
-      { "code", "ain.code",
+      { "code", "ain.ApplyRestrictions.U.code",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_ApplyRestrictions_U_toll,
-      { "toll", "ain.toll",
+      { "toll", "ain.ApplyRestrictions.U.toll",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oCalledPartyBusy,
-      { "oCalledPartyBusy", "ain.oCalledPartyBusy",
+      { "oCalledPartyBusy", "ain.EDPNotification.U.oCalledPartyBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oNoAnswer,
-      { "oNoAnswer", "ain.oNoAnswer",
+      { "oNoAnswer", "ain.EDPNotification.U.oNoAnswer",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oTermSeized,
-      { "oTermSeized", "ain.oTermSeized",
+      { "oTermSeized", "ain.EDPNotification.U.oTermSeized",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oAnswer,
-      { "oAnswer", "ain.oAnswer",
+      { "oAnswer", "ain.EDPNotification.U.oAnswer",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_tBusy,
-      { "tBusy", "ain.tBusy",
+      { "tBusy", "ain.EDPNotification.U.tBusy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_tNoAnswer,
-      { "tNoAnswer", "ain.tNoAnswer",
+      { "tNoAnswer", "ain.EDPNotification.U.tNoAnswer",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_termResourceAvailable,
-      { "termResourceAvailable", "ain.termResourceAvailable",
+      { "termResourceAvailable", "ain.EDPNotification.U.termResourceAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_tAnswer,
-      { "tAnswer", "ain.tAnswer",
+      { "tAnswer", "ain.EDPNotification.U.tAnswer",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_networkBusy,
-      { "networkBusy", "ain.networkBusy",
+      { "networkBusy", "ain.EDPNotification.U.networkBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oSuspended,
-      { "oSuspended", "ain.oSuspended",
+      { "oSuspended", "ain.EDPNotification.U.oSuspended",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oDisconnectCalled,
-      { "oDisconnectCalled", "ain.oDisconnectCalled",
+      { "oDisconnectCalled", "ain.EDPNotification.U.oDisconnectCalled",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oDisconnect,
-      { "oDisconnect", "ain.oDisconnect",
+      { "oDisconnect", "ain.EDPNotification.U.oDisconnect",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oAbandon,
-      { "oAbandon", "ain.oAbandon",
+      { "oAbandon", "ain.EDPNotification.U.oAbandon",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_featureActivator,
-      { "featureActivator", "ain.featureActivator",
+      { "featureActivator", "ain.EDPNotification.U.featureActivator",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_switchHookFlash,
-      { "switchHookFlash", "ain.switchHookFlash",
+      { "switchHookFlash", "ain.EDPNotification.U.switchHookFlash",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_success,
-      { "success", "ain.success",
+      { "success", "ain.EDPNotification.U.success",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_tDisconnect,
-      { "tDisconnect", "ain.tDisconnect",
+      { "tDisconnect", "ain.EDPNotification.U.tDisconnect",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_timeout,
-      { "timeout", "ain.timeout",
+      { "timeout", "ain.EDPNotification.U.timeout",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_originationAttempt,
-      { "originationAttempt", "ain.originationAttempt",
+      { "originationAttempt", "ain.EDPNotification.U.originationAttempt",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_oDTMFEntered,
-      { "oDTMFEntered", "ain.oDTMFEntered",
+      { "oDTMFEntered", "ain.EDPNotification.U.oDTMFEntered",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPNotification_U_tDTMFEntered,
-      { "tDTMFEntered", "ain.tDTMFEntered",
+      { "tDTMFEntered", "ain.EDPNotification.U.tDTMFEntered",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oCalledPartyBusy,
-      { "oCalledPartyBusy", "ain.oCalledPartyBusy",
+      { "oCalledPartyBusy", "ain.EDPRequest.U.oCalledPartyBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oNoAnswer,
-      { "oNoAnswer", "ain.oNoAnswer",
+      { "oNoAnswer", "ain.EDPRequest.U.oNoAnswer",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oTermSeized,
-      { "oTermSeized", "ain.oTermSeized",
+      { "oTermSeized", "ain.EDPRequest.U.oTermSeized",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oAnswer,
-      { "oAnswer", "ain.oAnswer",
+      { "oAnswer", "ain.EDPRequest.U.oAnswer",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_tBusy,
-      { "tBusy", "ain.tBusy",
+      { "tBusy", "ain.EDPRequest.U.tBusy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_tNoAnswer,
-      { "tNoAnswer", "ain.tNoAnswer",
+      { "tNoAnswer", "ain.EDPRequest.U.tNoAnswer",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_termResourceAvailable,
-      { "termResourceAvailable", "ain.termResourceAvailable",
+      { "termResourceAvailable", "ain.EDPRequest.U.termResourceAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_tAnswer,
-      { "tAnswer", "ain.tAnswer",
+      { "tAnswer", "ain.EDPRequest.U.tAnswer",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_networkBusy,
-      { "networkBusy", "ain.networkBusy",
+      { "networkBusy", "ain.EDPRequest.U.networkBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oSuspended,
-      { "oSuspended", "ain.oSuspended",
+      { "oSuspended", "ain.EDPRequest.U.oSuspended",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oDisconnectCalled,
-      { "oDisconnectCalled", "ain.oDisconnectCalled",
+      { "oDisconnectCalled", "ain.EDPRequest.U.oDisconnectCalled",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oDisconnect,
-      { "oDisconnect", "ain.oDisconnect",
+      { "oDisconnect", "ain.EDPRequest.U.oDisconnect",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oAbandon,
-      { "oAbandon", "ain.oAbandon",
+      { "oAbandon", "ain.EDPRequest.U.oAbandon",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_featureActivator,
-      { "featureActivator", "ain.featureActivator",
+      { "featureActivator", "ain.EDPRequest.U.featureActivator",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_switchHookFlash,
-      { "switchHookFlash", "ain.switchHookFlash",
+      { "switchHookFlash", "ain.EDPRequest.U.switchHookFlash",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_success,
-      { "success", "ain.success",
+      { "success", "ain.EDPRequest.U.success",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_tDisconnect,
-      { "tDisconnect", "ain.tDisconnect",
+      { "tDisconnect", "ain.EDPRequest.U.tDisconnect",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_timeout,
-      { "timeout", "ain.timeout",
+      { "timeout", "ain.EDPRequest.U.timeout",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_originationAttempt,
-      { "originationAttempt", "ain.originationAttempt",
+      { "originationAttempt", "ain.EDPRequest.U.originationAttempt",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_oDTMFEntered,
-      { "oDTMFEntered", "ain.oDTMFEntered",
+      { "oDTMFEntered", "ain.EDPRequest.U.oDTMFEntered",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_EDPRequest_U_tDTMFEntered,
-      { "tDTMFEntered", "ain.tDTMFEntered",
+      { "tDTMFEntered", "ain.EDPRequest.U.tDTMFEntered",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ain_Empty_entireList,
-      { "entireList", "ain.entireList",
+      { "entireList", "ain.Empty.entireList",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Empty_outgoingmemorySlot,
-      { "outgoingmemorySlot", "ain.outgoingmemorySlot",
+      { "outgoingmemorySlot", "ain.Empty.outgoingmemorySlot",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_Empty_incomingmemorySlot,
-      { "incomingmemorySlot", "ain.incomingmemorySlot",
+      { "incomingmemorySlot", "ain.Empty.incomingmemorySlot",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_Empty_forwardToDn,
-      { "forwardToDn", "ain.forwardToDn",
+      { "forwardToDn", "ain.Empty.forwardToDn",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_Request1_activationStatus,
-      { "activationStatus", "ain.activationStatus",
+      { "activationStatus", "ain.Request1.activationStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Request2_activationStatus,
-      { "activationStatus", "ain.activationStatus",
+      { "activationStatus", "ain.Request2.activationStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Request2_delayInterval,
-      { "delayInterval", "ain.delayInterval",
+      { "delayInterval", "ain.Request2.delayInterval",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_Request3_activationStatus,
-      { "activationStatus", "ain.activationStatus",
+      { "activationStatus", "ain.Request3.activationStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Request3_entireList,
-      { "entireList", "ain.entireList",
+      { "entireList", "ain.Request3.entireList",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_Request3_listSize,
-      { "listSize", "ain.listSize",
+      { "listSize", "ain.Request3.listSize",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_Request4_activationStatus,
-      { "activationStatus", "ain.activationStatus",
+      { "activationStatus", "ain.Request4.activationStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Request4_forwardingDn,
-      { "forwardingDn", "ain.forwardingDn",
+      { "forwardingDn", "ain.Request4.forwardingDn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_Request5_activationStatus,
-      { "activationStatus", "ain.activationStatus",
+      { "activationStatus", "ain.Request5.activationStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_Request5_forwardingDn,
-      { "forwardingDn", "ain.forwardingDn",
+      { "forwardingDn", "ain.Request5.forwardingDn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ain_Request5_entireList,
-      { "entireList", "ain.entireList",
+      { "entireList", "ain.Request5.entireList",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ain_Request5_listSize,
-      { "listSize", "ain.listSize",
+      { "listSize", "ain.Request5.listSize",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ain_Request6_delayInterval,
-      { "delayInterval", "ain.delayInterval",
+      { "delayInterval", "ain.Request6.delayInterval",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_RequestMemorySlot_incoming,
-      { "incoming", "ain.incoming",
+      { "incoming", "ain.RequestMemorySlot.incoming",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ain_RequestMemorySlot_outgoing,
-      { "outgoing", "ain.outgoing",
+      { "outgoing", "ain.RequestMemorySlot.outgoing",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c
index eec6965c1c..0fa24562b5 100644
--- a/epan/dissectors/packet-atn-ulcs.c
+++ b/epan/dissectors/packet-atn-ulcs.c
@@ -2468,19 +2468,19 @@ void proto_register_atn_ulcs (void)
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_atn_ulcs_T_aarq_apdu_protocol_version_version1,
-      { "version1", "atn-ulcs.version1",
+      { "version1", "atn.ulcs.T.aarq.apdu.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_atn_ulcs_T_aare_apdu_protocol_version_version1,
-      { "version1", "atn-ulcs.version1",
+      { "version1", "atn.ulcs.T.aare.apdu.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_atn_ulcs_ACSE_requirements_authentication,
-      { "authentication", "atn-ulcs.authentication",
+      { "authentication", "atn.ulcs.ACSE.requirements.authentication",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_atn_ulcs_ACSE_requirements_application_context_negotiation,
-      { "application-context-negotiation", "atn-ulcs.application-context-negotiation",
+      { "application-context-negotiation", "atn.ulcs.ACSE.requirements.application.context.negotiation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index 1982555b8a..4bf273538c 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -1069,35 +1069,35 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_T_acknowledgementIndicators_accepted,
-      { "accepted", "charging_ase.accepted",
+      { "accepted", "charging.ase.T.acknowledgementIndicators.accepted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_subscriberCharge,
-      { "subscriberCharge", "charging_ase.subscriberCharge",
+      { "subscriberCharge", "charging.ase.ChargingControlIndicators.subscriberCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff,
-      { "immediateChangeOfActuallyAppliedTariff", "charging_ase.immediateChangeOfActuallyAppliedTariff",
+      { "immediateChangeOfActuallyAppliedTariff", "charging.ase.ChargingControlIndicators.immediateChangeOfActuallyAppliedTariff",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_delayUntilStart,
-      { "delayUntilStart", "charging_ase.delayUntilStart",
+      { "delayUntilStart", "charging.ase.ChargingControlIndicators.delayUntilStart",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable,
-      { "callAttemptChargesApplicable", "charging_ase.callAttemptChargesApplicable",
+      { "callAttemptChargesApplicable", "charging.ase.T.stopIndicators.callAttemptChargesApplicable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_charging_ase_SubTariffControl_oneTimeCharge,
-      { "oneTimeCharge", "charging_ase.oneTimeCharge",
+      { "oneTimeCharge", "charging.ase.SubTariffControl.oneTimeCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff,
-      { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
+      { "non-cyclicTariff", "charging.ase.T.tariffControlIndicators.non.cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff,
-      { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
+      { "non-cyclicTariff", "charging.ase.T.tariffControlIndicators.01.non.cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 74cd56df8f..389078f577 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -5598,59 +5598,59 @@ void proto_register_cmip(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "InvokeId_present", HFILL }},
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
-      { "multipleObjectSelection", "cmip.multipleObjectSelection",
+      { "multipleObjectSelection", "cmip.FunctionalUnits.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_filter,
-      { "filter", "cmip.filter",
+      { "filter", "cmip.FunctionalUnits.filter",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_multipleReply,
-      { "multipleReply", "cmip.multipleReply",
+      { "multipleReply", "cmip.FunctionalUnits.multipleReply",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_extendedService,
-      { "extendedService", "cmip.extendedService",
+      { "extendedService", "cmip.FunctionalUnits.extendedService",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_cancelGet,
-      { "cancelGet", "cmip.cancelGet",
+      { "cancelGet", "cmip.FunctionalUnits.cancelGet",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version1,
-      { "version1", "cmip.version1",
+      { "version1", "cmip.ProtocolVersion.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version2,
-      { "version2", "cmip.version2",
+      { "version2", "cmip.ProtocolVersion.version2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_sunday,
-      { "sunday", "cmip.sunday",
+      { "sunday", "cmip.T.daysOfWeek.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_monday,
-      { "monday", "cmip.monday",
+      { "monday", "cmip.T.daysOfWeek.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_tuesday,
-      { "tuesday", "cmip.tuesday",
+      { "tuesday", "cmip.T.daysOfWeek.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_wednesday,
-      { "wednesday", "cmip.wednesday",
+      { "wednesday", "cmip.T.daysOfWeek.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_thursday,
-      { "thursday", "cmip.thursday",
+      { "thursday", "cmip.T.daysOfWeek.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_friday,
-      { "friday", "cmip.friday",
+      { "friday", "cmip.T.daysOfWeek.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_saturday,
-      { "saturday", "cmip.saturday",
+      { "saturday", "cmip.T.daysOfWeek.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 73c313c92e..dfd86ad868 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -2228,111 +2228,111 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PKIFreeText", HFILL }},
     { &hf_cmp_PKIFailureInfo_badAlg,
-      { "badAlg", "cmp.badAlg",
+      { "badAlg", "cmp.PKIFailureInfo.badAlg",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badMessageCheck,
-      { "badMessageCheck", "cmp.badMessageCheck",
+      { "badMessageCheck", "cmp.PKIFailureInfo.badMessageCheck",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badRequest,
-      { "badRequest", "cmp.badRequest",
+      { "badRequest", "cmp.PKIFailureInfo.badRequest",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badTime,
-      { "badTime", "cmp.badTime",
+      { "badTime", "cmp.PKIFailureInfo.badTime",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badCertId,
-      { "badCertId", "cmp.badCertId",
+      { "badCertId", "cmp.PKIFailureInfo.badCertId",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badDataFormat,
-      { "badDataFormat", "cmp.badDataFormat",
+      { "badDataFormat", "cmp.PKIFailureInfo.badDataFormat",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_wrongAuthority,
-      { "wrongAuthority", "cmp.wrongAuthority",
+      { "wrongAuthority", "cmp.PKIFailureInfo.wrongAuthority",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_incorrectData,
-      { "incorrectData", "cmp.incorrectData",
+      { "incorrectData", "cmp.PKIFailureInfo.incorrectData",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_missingTimeStamp,
-      { "missingTimeStamp", "cmp.missingTimeStamp",
+      { "missingTimeStamp", "cmp.PKIFailureInfo.missingTimeStamp",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badPOP,
-      { "badPOP", "cmp.badPOP",
+      { "badPOP", "cmp.PKIFailureInfo.badPOP",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_certRevoked,
-      { "certRevoked", "cmp.certRevoked",
+      { "certRevoked", "cmp.PKIFailureInfo.certRevoked",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_certConfirmed,
-      { "certConfirmed", "cmp.certConfirmed",
+      { "certConfirmed", "cmp.PKIFailureInfo.certConfirmed",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_wrongIntegrity,
-      { "wrongIntegrity", "cmp.wrongIntegrity",
+      { "wrongIntegrity", "cmp.PKIFailureInfo.wrongIntegrity",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badRecipientNonce,
-      { "badRecipientNonce", "cmp.badRecipientNonce",
+      { "badRecipientNonce", "cmp.PKIFailureInfo.badRecipientNonce",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_timeNotAvailable,
-      { "timeNotAvailable", "cmp.timeNotAvailable",
+      { "timeNotAvailable", "cmp.PKIFailureInfo.timeNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unacceptedPolicy,
-      { "unacceptedPolicy", "cmp.unacceptedPolicy",
+      { "unacceptedPolicy", "cmp.PKIFailureInfo.unacceptedPolicy",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unacceptedExtension,
-      { "unacceptedExtension", "cmp.unacceptedExtension",
+      { "unacceptedExtension", "cmp.PKIFailureInfo.unacceptedExtension",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_addInfoNotAvailable,
-      { "addInfoNotAvailable", "cmp.addInfoNotAvailable",
+      { "addInfoNotAvailable", "cmp.PKIFailureInfo.addInfoNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badSenderNonce,
-      { "badSenderNonce", "cmp.badSenderNonce",
+      { "badSenderNonce", "cmp.PKIFailureInfo.badSenderNonce",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badCertTemplate,
-      { "badCertTemplate", "cmp.badCertTemplate",
+      { "badCertTemplate", "cmp.PKIFailureInfo.badCertTemplate",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_signerNotTrusted,
-      { "signerNotTrusted", "cmp.signerNotTrusted",
+      { "signerNotTrusted", "cmp.PKIFailureInfo.signerNotTrusted",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_transactionIdInUse,
-      { "transactionIdInUse", "cmp.transactionIdInUse",
+      { "transactionIdInUse", "cmp.PKIFailureInfo.transactionIdInUse",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unsupportedVersion,
-      { "unsupportedVersion", "cmp.unsupportedVersion",
+      { "unsupportedVersion", "cmp.PKIFailureInfo.unsupportedVersion",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_notAuthorized,
-      { "notAuthorized", "cmp.notAuthorized",
+      { "notAuthorized", "cmp.PKIFailureInfo.notAuthorized",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_systemUnavail,
-      { "systemUnavail", "cmp.systemUnavail",
+      { "systemUnavail", "cmp.PKIFailureInfo.systemUnavail",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_systemFailure,
-      { "systemFailure", "cmp.systemFailure",
+      { "systemFailure", "cmp.PKIFailureInfo.systemFailure",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_duplicateCertReq,
-      { "duplicateCertReq", "cmp.duplicateCertReq",
+      { "duplicateCertReq", "cmp.PKIFailureInfo.duplicateCertReq",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index ed8c55d420..2decf1bc70 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -6285,171 +6285,171 @@ void proto_register_dap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "UpdateErrorData", HFILL }},
     { &hf_dap_ServiceControlOptions_preferChaining,
-      { "preferChaining", "dap.preferChaining",
+      { "preferChaining", "dap.ServiceControlOptions.preferChaining",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_chainingProhibited,
-      { "chainingProhibited", "dap.chainingProhibited",
+      { "chainingProhibited", "dap.ServiceControlOptions.chainingProhibited",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_localScope,
-      { "localScope", "dap.localScope",
+      { "localScope", "dap.ServiceControlOptions.localScope",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontUseCopy,
-      { "dontUseCopy", "dap.dontUseCopy",
+      { "dontUseCopy", "dap.ServiceControlOptions.dontUseCopy",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontDereferenceAliases,
-      { "dontDereferenceAliases", "dap.dontDereferenceAliases",
+      { "dontDereferenceAliases", "dap.ServiceControlOptions.dontDereferenceAliases",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_subentries,
-      { "subentries", "dap.subentries",
+      { "subentries", "dap.ServiceControlOptions.subentries",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_copyShallDo,
-      { "copyShallDo", "dap.copyShallDo",
+      { "copyShallDo", "dap.ServiceControlOptions.copyShallDo",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_partialNameResolution,
-      { "partialNameResolution", "dap.partialNameResolution",
+      { "partialNameResolution", "dap.ServiceControlOptions.partialNameResolution",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_manageDSAIT,
-      { "manageDSAIT", "dap.manageDSAIT",
+      { "manageDSAIT", "dap.ServiceControlOptions.manageDSAIT",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_noSubtypeMatch,
-      { "noSubtypeMatch", "dap.noSubtypeMatch",
+      { "noSubtypeMatch", "dap.ServiceControlOptions.noSubtypeMatch",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_noSubtypeSelection,
-      { "noSubtypeSelection", "dap.noSubtypeSelection",
+      { "noSubtypeSelection", "dap.ServiceControlOptions.noSubtypeSelection",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_countFamily,
-      { "countFamily", "dap.countFamily",
+      { "countFamily", "dap.ServiceControlOptions.countFamily",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontSelectFriends,
-      { "dontSelectFriends", "dap.dontSelectFriends",
+      { "dontSelectFriends", "dap.ServiceControlOptions.dontSelectFriends",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontMatchFriends,
-      { "dontMatchFriends", "dap.dontMatchFriends",
+      { "dontMatchFriends", "dap.ServiceControlOptions.dontMatchFriends",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dap_Versions_v1,
-      { "v1", "dap.v1",
+      { "v1", "dap.Versions.v1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_Versions_v2,
-      { "v2", "dap.v2",
+      { "v2", "dap.Versions.v2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_T_permission_add,
-      { "add", "dap.add",
+      { "add", "dap.T.permission.add",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_T_permission_remove,
-      { "remove", "dap.remove",
+      { "remove", "dap.T.permission.remove",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_T_permission_rename,
-      { "rename", "dap.rename",
+      { "rename", "dap.T.permission.rename",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_T_permission_move,
-      { "move", "dap.move",
+      { "move", "dap.T.permission.move",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_self,
-      { "self", "dap.self",
+      { "self", "dap.HierarchySelections.self",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_children,
-      { "children", "dap.children",
+      { "children", "dap.HierarchySelections.children",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_parent,
-      { "parent", "dap.parent",
+      { "parent", "dap.HierarchySelections.parent",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_hierarchy,
-      { "hierarchy", "dap.hierarchy",
+      { "hierarchy", "dap.HierarchySelections.hierarchy",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_top,
-      { "top", "dap.top",
+      { "top", "dap.HierarchySelections.top",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_subtree,
-      { "subtree", "dap.subtree",
+      { "subtree", "dap.HierarchySelections.subtree",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblings,
-      { "siblings", "dap.siblings",
+      { "siblings", "dap.HierarchySelections.siblings",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblingChildren,
-      { "siblingChildren", "dap.siblingChildren",
+      { "siblingChildren", "dap.HierarchySelections.siblingChildren",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblingSubtree,
-      { "siblingSubtree", "dap.siblingSubtree",
+      { "siblingSubtree", "dap.HierarchySelections.siblingSubtree",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_HierarchySelections_all,
-      { "all", "dap.all",
+      { "all", "dap.HierarchySelections.all",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_searchAliases,
-      { "searchAliases", "dap.searchAliases",
+      { "searchAliases", "dap.SearchControlOptions.searchAliases",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_matchedValuesOnly,
-      { "matchedValuesOnly", "dap.matchedValuesOnly",
+      { "matchedValuesOnly", "dap.SearchControlOptions.matchedValuesOnly",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_checkOverspecified,
-      { "checkOverspecified", "dap.checkOverspecified",
+      { "checkOverspecified", "dap.SearchControlOptions.checkOverspecified",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_performExactly,
-      { "performExactly", "dap.performExactly",
+      { "performExactly", "dap.SearchControlOptions.performExactly",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_includeAllAreas,
-      { "includeAllAreas", "dap.includeAllAreas",
+      { "includeAllAreas", "dap.SearchControlOptions.includeAllAreas",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_noSystemRelaxation,
-      { "noSystemRelaxation", "dap.noSystemRelaxation",
+      { "noSystemRelaxation", "dap.SearchControlOptions.noSystemRelaxation",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_dnAttribute,
-      { "dnAttribute", "dap.dnAttribute",
+      { "dnAttribute", "dap.SearchControlOptions.dnAttribute",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_matchOnResidualName,
-      { "matchOnResidualName", "dap.matchOnResidualName",
+      { "matchOnResidualName", "dap.SearchControlOptions.matchOnResidualName",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_entryCount,
-      { "entryCount", "dap.entryCount",
+      { "entryCount", "dap.SearchControlOptions.entryCount",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_useSubset,
-      { "useSubset", "dap.useSubset",
+      { "useSubset", "dap.SearchControlOptions.useSubset",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_separateFamilyMembers,
-      { "separateFamilyMembers", "dap.separateFamilyMembers",
+      { "separateFamilyMembers", "dap.SearchControlOptions.separateFamilyMembers",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dap_SearchControlOptions_searchFamily,
-      { "searchFamily", "dap.searchFamily",
+      { "searchFamily", "dap.SearchControlOptions.searchFamily",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index b80892e6bb..d9b5e8beaf 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -214,7 +214,7 @@ static int hf_dop_DSEType_xr = -1;
 static int hf_dop_DSEType_admPoint = -1;
 static int hf_dop_DSEType_subentry = -1;
 static int hf_dop_DSEType_shadow = -1;
-static int hf_dop_DSEType_spare_bit_12 = -1;
+static int hf_dop_DSEType_spare_bit12 = -1;
 static int hf_dop_DSEType_immSupr = -1;
 static int hf_dop_DSEType_rhob = -1;
 static int hf_dop_DSEType_sa = -1;
@@ -365,7 +365,7 @@ static const int * DSEType_bits[] = {
   &hf_dop_DSEType_admPoint,
   &hf_dop_DSEType_subentry,
   &hf_dop_DSEType_shadow,
-  &hf_dop_DSEType_spare_bit_12,
+  &hf_dop_DSEType_spare_bit12,
   &hf_dop_DSEType_immSupr,
   &hf_dop_DSEType_rhob,
   &hf_dop_DSEType_sa,
@@ -2765,187 +2765,187 @@ void proto_register_dop(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_dop_DSEType_root,
-      { "root", "dop.root",
+      { "root", "dop.DSEType.root",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_DSEType_glue,
-      { "glue", "dop.glue",
+      { "glue", "dop.DSEType.glue",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_DSEType_cp,
-      { "cp", "dop.cp",
+      { "cp", "dop.DSEType.cp",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_DSEType_entry,
-      { "entry", "dop.entry",
+      { "entry", "dop.DSEType.entry",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dop_DSEType_alias,
-      { "alias", "dop.alias",
+      { "alias", "dop.DSEType.alias",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dop_DSEType_subr,
-      { "subr", "dop.subr",
+      { "subr", "dop.DSEType.subr",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dop_DSEType_nssr,
-      { "nssr", "dop.nssr",
+      { "nssr", "dop.DSEType.nssr",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dop_DSEType_supr,
-      { "supr", "dop.supr",
+      { "supr", "dop.DSEType.supr",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dop_DSEType_xr,
-      { "xr", "dop.xr",
+      { "xr", "dop.DSEType.xr",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_DSEType_admPoint,
-      { "admPoint", "dop.admPoint",
+      { "admPoint", "dop.DSEType.admPoint",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_DSEType_subentry,
-      { "subentry", "dop.subentry",
+      { "subentry", "dop.DSEType.subentry",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_DSEType_shadow,
-      { "shadow", "dop.shadow",
+      { "shadow", "dop.DSEType.shadow",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_dop_DSEType_spare_bit_12,
-      { "spare_bit_12", "dop.spare_bit_12",
+    { &hf_dop_DSEType_spare_bit12,
+      { "spare_bit12", "dop.DSEType.spare.bit12",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dop_DSEType_immSupr,
-      { "immSupr", "dop.immSupr",
+      { "immSupr", "dop.DSEType.immSupr",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dop_DSEType_rhob,
-      { "rhob", "dop.rhob",
+      { "rhob", "dop.DSEType.rhob",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dop_DSEType_sa,
-      { "sa", "dop.sa",
+      { "sa", "dop.DSEType.sa",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dop_DSEType_dsSubentry,
-      { "dsSubentry", "dop.dsSubentry",
+      { "dsSubentry", "dop.DSEType.dsSubentry",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_DSEType_familyMember,
-      { "familyMember", "dop.familyMember",
+      { "familyMember", "dop.DSEType.familyMember",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_DSEType_ditBridge,
-      { "ditBridge", "dop.ditBridge",
+      { "ditBridge", "dop.DSEType.ditBridge",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_DSEType_writeableCopy,
-      { "writeableCopy", "dop.writeableCopy",
+      { "writeableCopy", "dop.DSEType.writeableCopy",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantAdd,
-      { "grantAdd", "dop.grantAdd",
+      { "grantAdd", "dop.GrantsAndDenials.grantAdd",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyAdd,
-      { "denyAdd", "dop.denyAdd",
+      { "denyAdd", "dop.GrantsAndDenials.denyAdd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantDiscloseOnError,
-      { "grantDiscloseOnError", "dop.grantDiscloseOnError",
+      { "grantDiscloseOnError", "dop.GrantsAndDenials.grantDiscloseOnError",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyDiscloseOnError,
-      { "denyDiscloseOnError", "dop.denyDiscloseOnError",
+      { "denyDiscloseOnError", "dop.GrantsAndDenials.denyDiscloseOnError",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRead,
-      { "grantRead", "dop.grantRead",
+      { "grantRead", "dop.GrantsAndDenials.grantRead",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRead,
-      { "denyRead", "dop.denyRead",
+      { "denyRead", "dop.GrantsAndDenials.denyRead",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRemove,
-      { "grantRemove", "dop.grantRemove",
+      { "grantRemove", "dop.GrantsAndDenials.grantRemove",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRemove,
-      { "denyRemove", "dop.denyRemove",
+      { "denyRemove", "dop.GrantsAndDenials.denyRemove",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantBrowse,
-      { "grantBrowse", "dop.grantBrowse",
+      { "grantBrowse", "dop.GrantsAndDenials.grantBrowse",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyBrowse,
-      { "denyBrowse", "dop.denyBrowse",
+      { "denyBrowse", "dop.GrantsAndDenials.denyBrowse",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantExport,
-      { "grantExport", "dop.grantExport",
+      { "grantExport", "dop.GrantsAndDenials.grantExport",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyExport,
-      { "denyExport", "dop.denyExport",
+      { "denyExport", "dop.GrantsAndDenials.denyExport",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantImport,
-      { "grantImport", "dop.grantImport",
+      { "grantImport", "dop.GrantsAndDenials.grantImport",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyImport,
-      { "denyImport", "dop.denyImport",
+      { "denyImport", "dop.GrantsAndDenials.denyImport",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantModify,
-      { "grantModify", "dop.grantModify",
+      { "grantModify", "dop.GrantsAndDenials.grantModify",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyModify,
-      { "denyModify", "dop.denyModify",
+      { "denyModify", "dop.GrantsAndDenials.denyModify",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRename,
-      { "grantRename", "dop.grantRename",
+      { "grantRename", "dop.GrantsAndDenials.grantRename",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRename,
-      { "denyRename", "dop.denyRename",
+      { "denyRename", "dop.GrantsAndDenials.denyRename",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantReturnDN,
-      { "grantReturnDN", "dop.grantReturnDN",
+      { "grantReturnDN", "dop.GrantsAndDenials.grantReturnDN",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyReturnDN,
-      { "denyReturnDN", "dop.denyReturnDN",
+      { "denyReturnDN", "dop.GrantsAndDenials.denyReturnDN",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantCompare,
-      { "grantCompare", "dop.grantCompare",
+      { "grantCompare", "dop.GrantsAndDenials.grantCompare",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyCompare,
-      { "denyCompare", "dop.denyCompare",
+      { "denyCompare", "dop.GrantsAndDenials.denyCompare",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantFilterMatch,
-      { "grantFilterMatch", "dop.grantFilterMatch",
+      { "grantFilterMatch", "dop.GrantsAndDenials.grantFilterMatch",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyFilterMatch,
-      { "denyFilterMatch", "dop.denyFilterMatch",
+      { "denyFilterMatch", "dop.GrantsAndDenials.denyFilterMatch",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantInvoke,
-      { "grantInvoke", "dop.grantInvoke",
+      { "grantInvoke", "dop.GrantsAndDenials.grantInvoke",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyInvoke,
-      { "denyInvoke", "dop.denyInvoke",
+      { "denyInvoke", "dop.GrantsAndDenials.denyInvoke",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index bf45aa8d00..999dedbc8c 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -388,8 +388,8 @@ static int hf_ftam_Service_Class_U_management_class = -1;
 static int hf_ftam_Service_Class_U_transfer_class = -1;
 static int hf_ftam_Service_Class_U_transfer_and_management_class = -1;
 static int hf_ftam_Service_Class_U_access_class = -1;
-static int hf_ftam_Functional_Units_U_spare_bit_0 = -1;
-static int hf_ftam_Functional_Units_U_spare_bit_1 = -1;
+static int hf_ftam_Functional_Units_U_spare_bit0 = -1;
+static int hf_ftam_Functional_Units_U_spare_bit1 = -1;
 static int hf_ftam_Functional_Units_U_read = -1;
 static int hf_ftam_Functional_Units_U_write = -1;
 static int hf_ftam_Functional_Units_U_file_access = -1;
@@ -467,7 +467,7 @@ static int hf_ftam_Attribute_Names_read_Object_type = -1;
 static int hf_ftam_Attribute_Names_read_linked_Object = -1;
 static int hf_ftam_Attribute_Names_read_primary_pathname = -1;
 static int hf_ftam_Attribute_Names_read_path_access_control = -1;
-static int hf_ftam_Attribute_Names_spare_bit_22 = -1;
+static int hf_ftam_Attribute_Names_spare_bit22 = -1;
 static int hf_ftam_Attribute_Names_read_Child_objects = -1;
 
 /*--- End of included file: packet-ftam-hf.c ---*/
@@ -736,8 +736,8 @@ dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static const int * Functional_Units_U_bits[] = {
-  &hf_ftam_Functional_Units_U_spare_bit_0,
-  &hf_ftam_Functional_Units_U_spare_bit_1,
+  &hf_ftam_Functional_Units_U_spare_bit0,
+  &hf_ftam_Functional_Units_U_spare_bit1,
   &hf_ftam_Functional_Units_U_read,
   &hf_ftam_Functional_Units_U_write,
   &hf_ftam_Functional_Units_U_file_access,
@@ -2263,7 +2263,7 @@ static const int * Attribute_Names_bits[] = {
   &hf_ftam_Attribute_Names_read_linked_Object,
   &hf_ftam_Attribute_Names_read_primary_pathname,
   &hf_ftam_Attribute_Names_read_path_access_control,
-  &hf_ftam_Attribute_Names_spare_bit_22,
+  &hf_ftam_Attribute_Names_spare_bit22,
   &hf_ftam_Attribute_Names_read_Child_objects,
   NULL
 };
@@ -6124,355 +6124,355 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
         "AE_qualifier", HFILL }},
     { &hf_ftam_Protocol_Version_U_version_1,
-      { "version-1", "ftam.version-1",
+      { "version-1", "ftam.Protocol.Version.U.version.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Protocol_Version_U_version_2,
-      { "version-2", "ftam.version-2",
+      { "version-2", "ftam.Protocol.Version.U.version.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Service_Class_U_unconstrained_class,
-      { "unconstrained-class", "ftam.unconstrained-class",
+      { "unconstrained-class", "ftam.Service.Class.U.unconstrained.class",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Service_Class_U_management_class,
-      { "management-class", "ftam.management-class",
+      { "management-class", "ftam.Service.Class.U.management.class",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Service_Class_U_transfer_class,
-      { "transfer-class", "ftam.transfer-class",
+      { "transfer-class", "ftam.Service.Class.U.transfer.class",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Service_Class_U_transfer_and_management_class,
-      { "transfer-and-management-class", "ftam.transfer-and-management-class",
+      { "transfer-and-management-class", "ftam.Service.Class.U.transfer.and.management.class",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Service_Class_U_access_class,
-      { "access-class", "ftam.access-class",
+      { "access-class", "ftam.Service.Class.U.access.class",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_ftam_Functional_Units_U_spare_bit_0,
-      { "spare_bit_0", "ftam.spare_bit_0",
+    { &hf_ftam_Functional_Units_U_spare_bit0,
+      { "spare_bit0", "ftam.Functional.Units.U.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_ftam_Functional_Units_U_spare_bit_1,
-      { "spare_bit_1", "ftam.spare_bit_1",
+    { &hf_ftam_Functional_Units_U_spare_bit1,
+      { "spare_bit1", "ftam.Functional.Units.U.spare.bit1",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_read,
-      { "read", "ftam.read",
+      { "read", "ftam.Functional.Units.U.read",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_write,
-      { "write", "ftam.write",
+      { "write", "ftam.Functional.Units.U.write",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_file_access,
-      { "file-access", "ftam.file-access",
+      { "file-access", "ftam.Functional.Units.U.file.access",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_limited_file_management,
-      { "limited-file-management", "ftam.limited-file-management",
+      { "limited-file-management", "ftam.Functional.Units.U.limited.file.management",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_enhanced_file_management,
-      { "enhanced-file-management", "ftam.enhanced-file-management",
+      { "enhanced-file-management", "ftam.Functional.Units.U.enhanced.file.management",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_grouping,
-      { "grouping", "ftam.grouping",
+      { "grouping", "ftam.Functional.Units.U.grouping",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_fadu_locking,
-      { "fadu-locking", "ftam.fadu-locking",
+      { "fadu-locking", "ftam.Functional.Units.U.fadu.locking",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_recovery,
-      { "recovery", "ftam.recovery",
+      { "recovery", "ftam.Functional.Units.U.recovery",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_restart_data_transfer,
-      { "restart-data-transfer", "ftam.restart-data-transfer",
+      { "restart-data-transfer", "ftam.Functional.Units.U.restart.data.transfer",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_limited_filestore_management,
-      { "limited-filestore-management", "ftam.limited-filestore-management",
+      { "limited-filestore-management", "ftam.Functional.Units.U.limited.filestore.management",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_enhanced_filestore_management,
-      { "enhanced-filestore-management", "ftam.enhanced-filestore-management",
+      { "enhanced-filestore-management", "ftam.Functional.Units.U.enhanced.filestore.management",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_object_manipulation,
-      { "object-manipulation", "ftam.object-manipulation",
+      { "object-manipulation", "ftam.Functional.Units.U.object.manipulation",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_group_manipulation,
-      { "group-manipulation", "ftam.group-manipulation",
+      { "group-manipulation", "ftam.Functional.Units.U.group.manipulation",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_consecutive_access,
-      { "consecutive-access", "ftam.consecutive-access",
+      { "consecutive-access", "ftam.Functional.Units.U.consecutive.access",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_concurrent_access,
-      { "concurrent-access", "ftam.concurrent-access",
+      { "concurrent-access", "ftam.Functional.Units.U.concurrent.access",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_storage,
-      { "storage", "ftam.storage",
+      { "storage", "ftam.Attribute.Groups.U.storage",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_security,
-      { "security", "ftam.security",
+      { "security", "ftam.Attribute.Groups.U.security",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_private,
-      { "private", "ftam.private",
+      { "private", "ftam.Attribute.Groups.U.private",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_extension,
-      { "extension", "ftam.extension",
+      { "extension", "ftam.Attribute.Groups.U.extension",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_read,
-      { "f-read", "ftam.f-read",
+      { "f-read", "ftam.T.processing.mode.f.read",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_insert,
-      { "f-insert", "ftam.f-insert",
+      { "f-insert", "ftam.T.processing.mode.f.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_replace,
-      { "f-replace", "ftam.f-replace",
+      { "f-replace", "ftam.T.processing.mode.f.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_extend,
-      { "f-extend", "ftam.f-extend",
+      { "f-extend", "ftam.T.processing.mode.f.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_erase,
-      { "f-erase", "ftam.f-erase",
+      { "f-erase", "ftam.T.processing.mode.f.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_read,
-      { "read", "ftam.read",
+      { "read", "ftam.Access.Request.U.read",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_insert,
-      { "insert", "ftam.insert",
+      { "insert", "ftam.Access.Request.U.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_replace,
-      { "replace", "ftam.replace",
+      { "replace", "ftam.Access.Request.U.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_extend,
-      { "extend", "ftam.extend",
+      { "extend", "ftam.Access.Request.U.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_erase,
-      { "erase", "ftam.erase",
+      { "erase", "ftam.Access.Request.U.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_read_attribute,
-      { "read-attribute", "ftam.read-attribute",
+      { "read-attribute", "ftam.Access.Request.U.read.attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_change_attribute,
-      { "change-attribute", "ftam.change-attribute",
+      { "change-attribute", "ftam.Access.Request.U.change.attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Access_Request_U_delete_Object,
-      { "delete-Object", "ftam.delete-Object",
+      { "delete-Object", "ftam.Access.Request.U.delete.Object",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_not_required,
-      { "not-required", "ftam.not-required",
+      { "not-required", "ftam.Concurrency.Key.not.required",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_shared,
-      { "shared", "ftam.shared",
+      { "shared", "ftam.Concurrency.Key.shared",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_exclusive,
-      { "exclusive", "ftam.exclusive",
+      { "exclusive", "ftam.Concurrency.Key.exclusive",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_no_access,
-      { "no-access", "ftam.no-access",
+      { "no-access", "ftam.Concurrency.Key.no.access",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_read,
-      { "read", "ftam.read",
+      { "read", "ftam.Permitted.Actions.Attribute.read",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_insert,
-      { "insert", "ftam.insert",
+      { "insert", "ftam.Permitted.Actions.Attribute.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_replace,
-      { "replace", "ftam.replace",
+      { "replace", "ftam.Permitted.Actions.Attribute.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_extend,
-      { "extend", "ftam.extend",
+      { "extend", "ftam.Permitted.Actions.Attribute.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_erase,
-      { "erase", "ftam.erase",
+      { "erase", "ftam.Permitted.Actions.Attribute.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_read_attribute,
-      { "read-attribute", "ftam.read-attribute",
+      { "read-attribute", "ftam.Permitted.Actions.Attribute.read.attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_change_attribute,
-      { "change-attribute", "ftam.change-attribute",
+      { "change-attribute", "ftam.Permitted.Actions.Attribute.change.attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_delete_Object,
-      { "delete-Object", "ftam.delete-Object",
+      { "delete-Object", "ftam.Permitted.Actions.Attribute.delete.Object",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_traversal,
-      { "traversal", "ftam.traversal",
+      { "traversal", "ftam.Permitted.Actions.Attribute.traversal",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_reverse_traversal,
-      { "reverse-traversal", "ftam.reverse-traversal",
+      { "reverse-traversal", "ftam.Permitted.Actions.Attribute.reverse.traversal",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_random_Order,
-      { "random-Order", "ftam.random-Order",
+      { "random-Order", "ftam.Permitted.Actions.Attribute.random.Order",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_pass,
-      { "pass", "ftam.pass",
+      { "pass", "ftam.Permitted.Actions.Attribute.pass",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_link,
-      { "link", "ftam.link",
+      { "link", "ftam.Permitted.Actions.Attribute.link",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Equality_Comparision_no_value_available_matches,
-      { "no-value-available-matches", "ftam.no-value-available-matches",
+      { "no-value-available-matches", "ftam.Equality.Comparision.no.value.available.matches",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Equality_Comparision_equals_matches,
-      { "equals-matches", "ftam.equals-matches",
+      { "equals-matches", "ftam.Equality.Comparision.equals.matches",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_no_value_available_matches,
-      { "no-value-available-matches", "ftam.no-value-available-matches",
+      { "no-value-available-matches", "ftam.Relational.Comparision.no.value.available.matches",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_equals_matches,
-      { "equals-matches", "ftam.equals-matches",
+      { "equals-matches", "ftam.Relational.Comparision.equals.matches",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_less_than_matches,
-      { "less-than-matches", "ftam.less-than-matches",
+      { "less-than-matches", "ftam.Relational.Comparision.less.than.matches",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_greater_than_matches,
-      { "greater-than-matches", "ftam.greater-than-matches",
+      { "greater-than-matches", "ftam.Relational.Comparision.greater.than.matches",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_pathname,
-      { "read-pathname", "ftam.read-pathname",
+      { "read-pathname", "ftam.Attribute.Names.read.pathname",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_permitted_actions,
-      { "read-permitted-actions", "ftam.read-permitted-actions",
+      { "read-permitted-actions", "ftam.Attribute.Names.read.permitted.actions",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_contents_type,
-      { "read-contents-type", "ftam.read-contents-type",
+      { "read-contents-type", "ftam.Attribute.Names.read.contents.type",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_storage_account,
-      { "read-storage-account", "ftam.read-storage-account",
+      { "read-storage-account", "ftam.Attribute.Names.read.storage.account",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_creation,
-      { "read-date-and-time-of-creation", "ftam.read-date-and-time-of-creation",
+      { "read-date-and-time-of-creation", "ftam.Attribute.Names.read.date.and.time.of.creation",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_modification,
-      { "read-date-and-time-of-last-modification", "ftam.read-date-and-time-of-last-modification",
+      { "read-date-and-time-of-last-modification", "ftam.Attribute.Names.read.date.and.time.of.last.modification",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_read_access,
-      { "read-date-and-time-of-last-read-access", "ftam.read-date-and-time-of-last-read-access",
+      { "read-date-and-time-of-last-read-access", "ftam.Attribute.Names.read.date.and.time.of.last.read.access",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_attribute_modification,
-      { "read-date-and-time-of-last-attribute-modification", "ftam.read-date-and-time-of-last-attribute-modification",
+      { "read-date-and-time-of-last-attribute-modification", "ftam.Attribute.Names.read.date.and.time.of.last.attribute.modification",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_creator,
-      { "read-identity-of-creator", "ftam.read-identity-of-creator",
+      { "read-identity-of-creator", "ftam.Attribute.Names.read.identity.of.creator",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_modifier,
-      { "read-identity-of-last-modifier", "ftam.read-identity-of-last-modifier",
+      { "read-identity-of-last-modifier", "ftam.Attribute.Names.read.identity.of.last.modifier",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_reader,
-      { "read-identity-of-last-reader", "ftam.read-identity-of-last-reader",
+      { "read-identity-of-last-reader", "ftam.Attribute.Names.read.identity.of.last.reader",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_attribute_modifier,
-      { "read-identity-of-last-attribute-modifier", "ftam.read-identity-of-last-attribute-modifier",
+      { "read-identity-of-last-attribute-modifier", "ftam.Attribute.Names.read.identity.of.last.attribute.modifier",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_availability,
-      { "read-Object-availability", "ftam.read-Object-availability",
+      { "read-Object-availability", "ftam.Attribute.Names.read.Object.availability",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_size,
-      { "read-Object-size", "ftam.read-Object-size",
+      { "read-Object-size", "ftam.Attribute.Names.read.Object.size",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_future_Object_size,
-      { "read-future-Object-size", "ftam.read-future-Object-size",
+      { "read-future-Object-size", "ftam.Attribute.Names.read.future.Object.size",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_access_control,
-      { "read-access-control", "ftam.read-access-control",
+      { "read-access-control", "ftam.Attribute.Names.read.access.control",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS,
-      { "read-l8gal-qualifiCatiOnS", "ftam.read-l8gal-qualifiCatiOnS",
+      { "read-l8gal-qualifiCatiOnS", "ftam.Attribute.Names.read.l8gal.qualifiCatiOnS",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_private_use,
-      { "read-private-use", "ftam.read-private-use",
+      { "read-private-use", "ftam.Attribute.Names.read.private.use",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_type,
-      { "read-Object-type", "ftam.read-Object-type",
+      { "read-Object-type", "ftam.Attribute.Names.read.Object.type",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_linked_Object,
-      { "read-linked-Object", "ftam.read-linked-Object",
+      { "read-linked-Object", "ftam.Attribute.Names.read.linked.Object",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_primary_pathname,
-      { "read-primary-pathname", "ftam.read-primary-pathname",
+      { "read-primary-pathname", "ftam.Attribute.Names.read.primary.pathname",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_path_access_control,
-      { "read-path-access-control", "ftam.read-path-access-control",
+      { "read-path-access-control", "ftam.Attribute.Names.read.path.access.control",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_ftam_Attribute_Names_spare_bit_22,
-      { "spare_bit_22", "ftam.spare_bit_22",
+    { &hf_ftam_Attribute_Names_spare_bit22,
+      { "spare_bit22", "ftam.Attribute.Names.spare.bit22",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Child_objects,
-      { "read-Child-objects", "ftam.read-Child-objects",
+      { "read-Child-objects", "ftam.Attribute.Names.read.Child.objects",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c
index 0c36f4b862..6dabf7ad7f 100644
--- a/epan/dissectors/packet-gprscdr.c
+++ b/epan/dissectors/packet-gprscdr.c
@@ -429,7 +429,7 @@ static int hf_gprscdr_ServiceConditionChangeV651_configurationChange = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_serviceStop = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached = -1;
-static int hf_gprscdr_ServiceConditionChangeV651_spare_bit_12 = -1;
+static int hf_gprscdr_ServiceConditionChangeV651_spare_bit12 = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_timeExhausted = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_volumeExhausted = -1;
 static int hf_gprscdr_ServiceConditionChangeV651_timeout = -1;
@@ -2642,7 +2642,7 @@ static const int * ServiceConditionChangeV651_bits[] = {
   &hf_gprscdr_ServiceConditionChangeV651_serviceStop,
   &hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached,
   &hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached,
-  &hf_gprscdr_ServiceConditionChangeV651_spare_bit_12,
+  &hf_gprscdr_ServiceConditionChangeV651_spare_bit12,
   &hf_gprscdr_ServiceConditionChangeV651_timeExhausted,
   &hf_gprscdr_ServiceConditionChangeV651_volumeExhausted,
   &hf_gprscdr_ServiceConditionChangeV651_timeout,
@@ -6450,367 +6450,367 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "PLMN_Id", HFILL }},
     { &hf_gprscdr_LevelOfCAMELService_basic,
-      { "basic", "gprscdr.basic",
+      { "basic", "gprscdr.LevelOfCAMELService.basic",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_LevelOfCAMELService_callDurationSupervision,
-      { "callDurationSupervision", "gprscdr.callDurationSupervision",
+      { "callDurationSupervision", "gprscdr.LevelOfCAMELService.callDurationSupervision",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_LevelOfCAMELService_onlineCharging,
-      { "onlineCharging", "gprscdr.onlineCharging",
+      { "onlineCharging", "gprscdr.LevelOfCAMELService.onlineCharging",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_qoSChange,
-      { "qoSChange", "gprscdr.qoSChange",
+      { "qoSChange", "gprscdr.ServiceConditionChangeV651.qoSChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_sGSNChange,
-      { "sGSNChange", "gprscdr.sGSNChange",
+      { "sGSNChange", "gprscdr.ServiceConditionChangeV651.sGSNChange",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_sGSNPLMNIDChange,
-      { "sGSNPLMNIDChange", "gprscdr.sGSNPLMNIDChange",
+      { "sGSNPLMNIDChange", "gprscdr.ServiceConditionChangeV651.sGSNPLMNIDChange",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_tariffTimeSwitch,
-      { "tariffTimeSwitch", "gprscdr.tariffTimeSwitch",
+      { "tariffTimeSwitch", "gprscdr.ServiceConditionChangeV651.tariffTimeSwitch",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_pDPContextRelease,
-      { "pDPContextRelease", "gprscdr.pDPContextRelease",
+      { "pDPContextRelease", "gprscdr.ServiceConditionChangeV651.pDPContextRelease",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_rATChange,
-      { "rATChange", "gprscdr.rATChange",
+      { "rATChange", "gprscdr.ServiceConditionChangeV651.rATChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_serviceIdledOut,
-      { "serviceIdledOut", "gprscdr.serviceIdledOut",
+      { "serviceIdledOut", "gprscdr.ServiceConditionChangeV651.serviceIdledOut",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_qCTExpiry,
-      { "qCTExpiry", "gprscdr.qCTExpiry",
+      { "qCTExpiry", "gprscdr.ServiceConditionChangeV651.qCTExpiry",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_configurationChange,
-      { "configurationChange", "gprscdr.configurationChange",
+      { "configurationChange", "gprscdr.ServiceConditionChangeV651.configurationChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_serviceStop,
-      { "serviceStop", "gprscdr.serviceStop",
+      { "serviceStop", "gprscdr.ServiceConditionChangeV651.serviceStop",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_timeThresholdReached,
-      { "timeThresholdReached", "gprscdr.timeThresholdReached",
+      { "timeThresholdReached", "gprscdr.ServiceConditionChangeV651.timeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_volumeThresholdReached,
-      { "volumeThresholdReached", "gprscdr.volumeThresholdReached",
+      { "volumeThresholdReached", "gprscdr.ServiceConditionChangeV651.volumeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_gprscdr_ServiceConditionChangeV651_spare_bit_12,
-      { "spare_bit_12", "gprscdr.spare_bit_12",
+    { &hf_gprscdr_ServiceConditionChangeV651_spare_bit12,
+      { "spare_bit12", "gprscdr.ServiceConditionChangeV651.spare.bit12",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_timeExhausted,
-      { "timeExhausted", "gprscdr.timeExhausted",
+      { "timeExhausted", "gprscdr.ServiceConditionChangeV651.timeExhausted",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_volumeExhausted,
-      { "volumeExhausted", "gprscdr.volumeExhausted",
+      { "volumeExhausted", "gprscdr.ServiceConditionChangeV651.volumeExhausted",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_timeout,
-      { "timeout", "gprscdr.timeout",
+      { "timeout", "gprscdr.ServiceConditionChangeV651.timeout",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_returnRequested,
-      { "returnRequested", "gprscdr.returnRequested",
+      { "returnRequested", "gprscdr.ServiceConditionChangeV651.returnRequested",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_reauthorisationRequest,
-      { "reauthorisationRequest", "gprscdr.reauthorisationRequest",
+      { "reauthorisationRequest", "gprscdr.ServiceConditionChangeV651.reauthorisationRequest",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_continueOngoingSession,
-      { "continueOngoingSession", "gprscdr.continueOngoingSession",
+      { "continueOngoingSession", "gprscdr.ServiceConditionChangeV651.continueOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_retryAndTerminateOngoingSession,
-      { "retryAndTerminateOngoingSession", "gprscdr.retryAndTerminateOngoingSession",
+      { "retryAndTerminateOngoingSession", "gprscdr.ServiceConditionChangeV651.retryAndTerminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV651_terminateOngoingSession,
-      { "terminateOngoingSession", "gprscdr.terminateOngoingSession",
+      { "terminateOngoingSession", "gprscdr.ServiceConditionChangeV651.terminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_qoSChange,
-      { "qoSChange", "gprscdr.qoSChange",
+      { "qoSChange", "gprscdr.ServiceConditionChangeV750.qoSChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_sGSNChange,
-      { "sGSNChange", "gprscdr.sGSNChange",
+      { "sGSNChange", "gprscdr.ServiceConditionChangeV750.sGSNChange",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_sGSNPLMNIDChange,
-      { "sGSNPLMNIDChange", "gprscdr.sGSNPLMNIDChange",
+      { "sGSNPLMNIDChange", "gprscdr.ServiceConditionChangeV750.sGSNPLMNIDChange",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_tariffTimeSwitch,
-      { "tariffTimeSwitch", "gprscdr.tariffTimeSwitch",
+      { "tariffTimeSwitch", "gprscdr.ServiceConditionChangeV750.tariffTimeSwitch",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_pDPContextRelease,
-      { "pDPContextRelease", "gprscdr.pDPContextRelease",
+      { "pDPContextRelease", "gprscdr.ServiceConditionChangeV750.pDPContextRelease",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_rATChange,
-      { "rATChange", "gprscdr.rATChange",
+      { "rATChange", "gprscdr.ServiceConditionChangeV750.rATChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_serviceIdledOut,
-      { "serviceIdledOut", "gprscdr.serviceIdledOut",
+      { "serviceIdledOut", "gprscdr.ServiceConditionChangeV750.serviceIdledOut",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_reserved,
-      { "reserved", "gprscdr.reserved",
+      { "reserved", "gprscdr.ServiceConditionChangeV750.reserved",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_configurationChange,
-      { "configurationChange", "gprscdr.configurationChange",
+      { "configurationChange", "gprscdr.ServiceConditionChangeV750.configurationChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_serviceStop,
-      { "serviceStop", "gprscdr.serviceStop",
+      { "serviceStop", "gprscdr.ServiceConditionChangeV750.serviceStop",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCATimeThresholdReached,
-      { "dCCATimeThresholdReached", "gprscdr.dCCATimeThresholdReached",
+      { "dCCATimeThresholdReached", "gprscdr.ServiceConditionChangeV750.dCCATimeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeThresholdReached,
-      { "dCCAVolumeThresholdReached", "gprscdr.dCCAVolumeThresholdReached",
+      { "dCCAVolumeThresholdReached", "gprscdr.ServiceConditionChangeV750.dCCAVolumeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitThresholdReached,
-      { "dCCAServiceSpecificUnitThresholdReached", "gprscdr.dCCAServiceSpecificUnitThresholdReached",
+      { "dCCAServiceSpecificUnitThresholdReached", "gprscdr.ServiceConditionChangeV750.dCCAServiceSpecificUnitThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCATimeExhausted,
-      { "dCCATimeExhausted", "gprscdr.dCCATimeExhausted",
+      { "dCCATimeExhausted", "gprscdr.ServiceConditionChangeV750.dCCATimeExhausted",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAVolumeExhausted,
-      { "dCCAVolumeExhausted", "gprscdr.dCCAVolumeExhausted",
+      { "dCCAVolumeExhausted", "gprscdr.ServiceConditionChangeV750.dCCAVolumeExhausted",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAValidityTimeout,
-      { "dCCAValidityTimeout", "gprscdr.dCCAValidityTimeout",
+      { "dCCAValidityTimeout", "gprscdr.ServiceConditionChangeV750.dCCAValidityTimeout",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_reserved2,
-      { "reserved2", "gprscdr.reserved2",
+      { "reserved2", "gprscdr.ServiceConditionChangeV750.reserved2",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAReauthorisationRequest,
-      { "dCCAReauthorisationRequest", "gprscdr.dCCAReauthorisationRequest",
+      { "dCCAReauthorisationRequest", "gprscdr.ServiceConditionChangeV750.dCCAReauthorisationRequest",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAContinueOngoingSession,
-      { "dCCAContinueOngoingSession", "gprscdr.dCCAContinueOngoingSession",
+      { "dCCAContinueOngoingSession", "gprscdr.ServiceConditionChangeV750.dCCAContinueOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCARetryAndTerminateOngoingSession,
-      { "dCCARetryAndTerminateOngoingSession", "gprscdr.dCCARetryAndTerminateOngoingSession",
+      { "dCCARetryAndTerminateOngoingSession", "gprscdr.ServiceConditionChangeV750.dCCARetryAndTerminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCATerminateOngoingSession,
-      { "dCCATerminateOngoingSession", "gprscdr.dCCATerminateOngoingSession",
+      { "dCCATerminateOngoingSession", "gprscdr.ServiceConditionChangeV750.dCCATerminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_cGI_SAIChange,
-      { "cGI-SAIChange", "gprscdr.cGI-SAIChange",
+      { "cGI-SAIChange", "gprscdr.ServiceConditionChangeV750.cGI.SAIChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_rAIChange,
-      { "rAIChange", "gprscdr.rAIChange",
+      { "rAIChange", "gprscdr.ServiceConditionChangeV750.rAIChange",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_dCCAServiceSpecificUnitExhausted,
-      { "dCCAServiceSpecificUnitExhausted", "gprscdr.dCCAServiceSpecificUnitExhausted",
+      { "dCCAServiceSpecificUnitExhausted", "gprscdr.ServiceConditionChangeV750.dCCAServiceSpecificUnitExhausted",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_recordClosure,
-      { "recordClosure", "gprscdr.recordClosure",
+      { "recordClosure", "gprscdr.ServiceConditionChangeV750.recordClosure",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_timeLimit,
-      { "timeLimit", "gprscdr.timeLimit",
+      { "timeLimit", "gprscdr.ServiceConditionChangeV750.timeLimit",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_volumeLimit,
-      { "volumeLimit", "gprscdr.volumeLimit",
+      { "volumeLimit", "gprscdr.ServiceConditionChangeV750.volumeLimit",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_serviceSpecificUnitLimit,
-      { "serviceSpecificUnitLimit", "gprscdr.serviceSpecificUnitLimit",
+      { "serviceSpecificUnitLimit", "gprscdr.ServiceConditionChangeV750.serviceSpecificUnitLimit",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChangeV750_envelopeClosure,
-      { "envelopeClosure", "gprscdr.envelopeClosure",
+      { "envelopeClosure", "gprscdr.ServiceConditionChangeV750.envelopeClosure",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_qoSChange,
-      { "qoSChange", "gprscdr.qoSChange",
+      { "qoSChange", "gprscdr.ServiceConditionChange.qoSChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_sGSNChange,
-      { "sGSNChange", "gprscdr.sGSNChange",
+      { "sGSNChange", "gprscdr.ServiceConditionChange.sGSNChange",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_sGSNPLMNIDChange,
-      { "sGSNPLMNIDChange", "gprscdr.sGSNPLMNIDChange",
+      { "sGSNPLMNIDChange", "gprscdr.ServiceConditionChange.sGSNPLMNIDChange",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_tariffTimeSwitch,
-      { "tariffTimeSwitch", "gprscdr.tariffTimeSwitch",
+      { "tariffTimeSwitch", "gprscdr.ServiceConditionChange.tariffTimeSwitch",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_pDPContextRelease,
-      { "pDPContextRelease", "gprscdr.pDPContextRelease",
+      { "pDPContextRelease", "gprscdr.ServiceConditionChange.pDPContextRelease",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_rATChange,
-      { "rATChange", "gprscdr.rATChange",
+      { "rATChange", "gprscdr.ServiceConditionChange.rATChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_serviceIdledOut,
-      { "serviceIdledOut", "gprscdr.serviceIdledOut",
+      { "serviceIdledOut", "gprscdr.ServiceConditionChange.serviceIdledOut",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_reserved,
-      { "reserved", "gprscdr.reserved",
+      { "reserved", "gprscdr.ServiceConditionChange.reserved",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_configurationChange,
-      { "configurationChange", "gprscdr.configurationChange",
+      { "configurationChange", "gprscdr.ServiceConditionChange.configurationChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_serviceStop,
-      { "serviceStop", "gprscdr.serviceStop",
+      { "serviceStop", "gprscdr.ServiceConditionChange.serviceStop",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCATimeThresholdReached,
-      { "dCCATimeThresholdReached", "gprscdr.dCCATimeThresholdReached",
+      { "dCCATimeThresholdReached", "gprscdr.ServiceConditionChange.dCCATimeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAVolumeThresholdReached,
-      { "dCCAVolumeThresholdReached", "gprscdr.dCCAVolumeThresholdReached",
+      { "dCCAVolumeThresholdReached", "gprscdr.ServiceConditionChange.dCCAVolumeThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitThresholdReached,
-      { "dCCAServiceSpecificUnitThresholdReached", "gprscdr.dCCAServiceSpecificUnitThresholdReached",
+      { "dCCAServiceSpecificUnitThresholdReached", "gprscdr.ServiceConditionChange.dCCAServiceSpecificUnitThresholdReached",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCATimeExhausted,
-      { "dCCATimeExhausted", "gprscdr.dCCATimeExhausted",
+      { "dCCATimeExhausted", "gprscdr.ServiceConditionChange.dCCATimeExhausted",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAVolumeExhausted,
-      { "dCCAVolumeExhausted", "gprscdr.dCCAVolumeExhausted",
+      { "dCCAVolumeExhausted", "gprscdr.ServiceConditionChange.dCCAVolumeExhausted",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAValidityTimeout,
-      { "dCCAValidityTimeout", "gprscdr.dCCAValidityTimeout",
+      { "dCCAValidityTimeout", "gprscdr.ServiceConditionChange.dCCAValidityTimeout",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_reserved1,
-      { "reserved1", "gprscdr.reserved1",
+      { "reserved1", "gprscdr.ServiceConditionChange.reserved1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAReauthorisationRequest,
-      { "dCCAReauthorisationRequest", "gprscdr.dCCAReauthorisationRequest",
+      { "dCCAReauthorisationRequest", "gprscdr.ServiceConditionChange.dCCAReauthorisationRequest",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAContinueOngoingSession,
-      { "dCCAContinueOngoingSession", "gprscdr.dCCAContinueOngoingSession",
+      { "dCCAContinueOngoingSession", "gprscdr.ServiceConditionChange.dCCAContinueOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCARetryAndTerminateOngoingSession,
-      { "dCCARetryAndTerminateOngoingSession", "gprscdr.dCCARetryAndTerminateOngoingSession",
+      { "dCCARetryAndTerminateOngoingSession", "gprscdr.ServiceConditionChange.dCCARetryAndTerminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCATerminateOngoingSession,
-      { "dCCATerminateOngoingSession", "gprscdr.dCCATerminateOngoingSession",
+      { "dCCATerminateOngoingSession", "gprscdr.ServiceConditionChange.dCCATerminateOngoingSession",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_cGI_SAIChange,
-      { "cGI-SAIChange", "gprscdr.cGI-SAIChange",
+      { "cGI-SAIChange", "gprscdr.ServiceConditionChange.cGI.SAIChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_rAIChange,
-      { "rAIChange", "gprscdr.rAIChange",
+      { "rAIChange", "gprscdr.ServiceConditionChange.rAIChange",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_dCCAServiceSpecificUnitExhausted,
-      { "dCCAServiceSpecificUnitExhausted", "gprscdr.dCCAServiceSpecificUnitExhausted",
+      { "dCCAServiceSpecificUnitExhausted", "gprscdr.ServiceConditionChange.dCCAServiceSpecificUnitExhausted",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_recordClosure,
-      { "recordClosure", "gprscdr.recordClosure",
+      { "recordClosure", "gprscdr.ServiceConditionChange.recordClosure",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_timeLimit,
-      { "timeLimit", "gprscdr.timeLimit",
+      { "timeLimit", "gprscdr.ServiceConditionChange.timeLimit",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_volumeLimit,
-      { "volumeLimit", "gprscdr.volumeLimit",
+      { "volumeLimit", "gprscdr.ServiceConditionChange.volumeLimit",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_serviceSpecificUnitLimit,
-      { "serviceSpecificUnitLimit", "gprscdr.serviceSpecificUnitLimit",
+      { "serviceSpecificUnitLimit", "gprscdr.ServiceConditionChange.serviceSpecificUnitLimit",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_envelopeClosure,
-      { "envelopeClosure", "gprscdr.envelopeClosure",
+      { "envelopeClosure", "gprscdr.ServiceConditionChange.envelopeClosure",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_eCGIChange,
-      { "eCGIChange", "gprscdr.eCGIChange",
+      { "eCGIChange", "gprscdr.ServiceConditionChange.eCGIChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_tAIChange,
-      { "tAIChange", "gprscdr.tAIChange",
+      { "tAIChange", "gprscdr.ServiceConditionChange.tAIChange",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_userLocationChange,
-      { "userLocationChange", "gprscdr.userLocationChange",
+      { "userLocationChange", "gprscdr.ServiceConditionChange.userLocationChange",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_userCSGInformationChange,
-      { "userCSGInformationChange", "gprscdr.userCSGInformationChange",
+      { "userCSGInformationChange", "gprscdr.ServiceConditionChange.userCSGInformationChange",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_presenceInPRAChange,
-      { "presenceInPRAChange", "gprscdr.presenceInPRAChange",
+      { "presenceInPRAChange", "gprscdr.ServiceConditionChange.presenceInPRAChange",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_accessChangeOfSDF,
-      { "accessChangeOfSDF", "gprscdr.accessChangeOfSDF",
+      { "accessChangeOfSDF", "gprscdr.ServiceConditionChange.accessChangeOfSDF",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_indirectServiceConditionChange,
-      { "indirectServiceConditionChange", "gprscdr.indirectServiceConditionChange",
+      { "indirectServiceConditionChange", "gprscdr.ServiceConditionChange.indirectServiceConditionChange",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_servingPLMNRateControlChange,
-      { "servingPLMNRateControlChange", "gprscdr.servingPLMNRateControlChange",
+      { "servingPLMNRateControlChange", "gprscdr.ServiceConditionChange.servingPLMNRateControlChange",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gprscdr_ServiceConditionChange_aPNRateControlChange,
-      { "aPNRateControlChange", "gprscdr.aPNRateControlChange",
+      { "aPNRateControlChange", "gprscdr.ServiceConditionChange.aPNRateControlChange",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index c9cd42d6b2..673c52f68f 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -24696,11 +24696,11 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ss_ServiceIndicator_clir_invoked,
-      { "clir-invoked", "gsm_map.ss.clir-invoked",
+      { "clir-invoked", "gsm.map.ss.ServiceIndicator.clir.invoked",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ServiceIndicator_camel_invoked,
-      { "camel-invoked", "gsm_map.ss.camel-invoked",
+      { "camel-invoked", "gsm.map.ss.ServiceIndicator.camel.invoked",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
@@ -25134,19 +25134,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded,
-      { "sc-AddressNotIncluded", "gsm_map.sm.sc-AddressNotIncluded",
+      { "sc-AddressNotIncluded", "gsm.map.sm.MW.Status.sc.AddressNotIncluded",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mnrf_Set,
-      { "mnrf-Set", "gsm_map.sm.mnrf-Set",
+      { "mnrf-Set", "gsm.map.sm.MW.Status.mnrf.Set",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mcef_Set,
-      { "mcef-Set", "gsm_map.sm.mcef-Set",
+      { "mcef-Set", "gsm.map.sm.MW.Status.mcef.Set",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mnrg_Set,
-      { "mnrg-Set", "gsm_map.sm.mnrg-Set",
+      { "mnrg-Set", "gsm.map.sm.MW.Status.mnrg.Set",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
@@ -25501,355 +25501,355 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_msc_s,
-      { "msc-s", "gsm_map.om.msc-s",
+      { "msc-s", "gsm.map.om.TraceNE.TypeList.msc.s",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_mgw,
-      { "mgw", "gsm_map.om.mgw",
+      { "mgw", "gsm.map.om.TraceNE.TypeList.mgw",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_sgsn,
-      { "sgsn", "gsm_map.om.sgsn",
+      { "sgsn", "gsm.map.om.TraceNE.TypeList.sgsn",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_ggsn,
-      { "ggsn", "gsm_map.om.ggsn",
+      { "ggsn", "gsm.map.om.TraceNE.TypeList.ggsn",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_rnc,
-      { "rnc", "gsm_map.om.rnc",
+      { "rnc", "gsm.map.om.TraceNE.TypeList.rnc",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_bm_sc,
-      { "bm-sc", "gsm_map.om.bm-sc",
+      { "bm-sc", "gsm.map.om.TraceNE.TypeList.bm.sc",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_mme,
-      { "mme", "gsm_map.om.mme",
+      { "mme", "gsm.map.om.TraceNE.TypeList.mme",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_sgw,
-      { "sgw", "gsm_map.om.sgw",
+      { "sgw", "gsm.map.om.TraceNE.TypeList.sgw",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_pgw,
-      { "pgw", "gsm_map.om.pgw",
+      { "pgw", "gsm.map.om.TraceNE.TypeList.pgw",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_eNB,
-      { "eNB", "gsm_map.om.eNB",
+      { "eNB", "gsm.map.om.TraceNE.TypeList.eNB",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_a,
-      { "a", "gsm_map.om.a",
+      { "a", "gsm.map.om.MSC.S.InterfaceList.a",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_iu,
-      { "iu", "gsm_map.om.iu",
+      { "iu", "gsm.map.om.MSC.S.InterfaceList.iu",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_mc,
-      { "mc", "gsm_map.om.mc",
+      { "mc", "gsm.map.om.MSC.S.InterfaceList.mc",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_g,
-      { "map-g", "gsm_map.om.map-g",
+      { "map-g", "gsm.map.om.MSC.S.InterfaceList.map.g",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_b,
-      { "map-b", "gsm_map.om.map-b",
+      { "map-b", "gsm.map.om.MSC.S.InterfaceList.map.b",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_e,
-      { "map-e", "gsm_map.om.map-e",
+      { "map-e", "gsm.map.om.MSC.S.InterfaceList.map.e",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_f,
-      { "map-f", "gsm_map.om.map-f",
+      { "map-f", "gsm.map.om.MSC.S.InterfaceList.map.f",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_cap,
-      { "cap", "gsm_map.om.cap",
+      { "cap", "gsm.map.om.MSC.S.InterfaceList.cap",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_d,
-      { "map-d", "gsm_map.om.map-d",
+      { "map-d", "gsm.map.om.MSC.S.InterfaceList.map.d",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_c,
-      { "map-c", "gsm_map.om.map-c",
+      { "map-c", "gsm.map.om.MSC.S.InterfaceList.map.c",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_mc,
-      { "mc", "gsm_map.om.mc",
+      { "mc", "gsm.map.om.MGW.InterfaceList.mc",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_nb_up,
-      { "nb-up", "gsm_map.om.nb-up",
+      { "nb-up", "gsm.map.om.MGW.InterfaceList.nb.up",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_iu_up,
-      { "iu-up", "gsm_map.om.iu-up",
+      { "iu-up", "gsm.map.om.MGW.InterfaceList.iu.up",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gb,
-      { "gb", "gsm_map.om.gb",
+      { "gb", "gsm.map.om.SGSN.InterfaceList.gb",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_iu,
-      { "iu", "gsm_map.om.iu",
+      { "iu", "gsm.map.om.SGSN.InterfaceList.iu",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gn,
-      { "gn", "gsm_map.om.gn",
+      { "gn", "gsm.map.om.SGSN.InterfaceList.gn",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gr,
-      { "map-gr", "gsm_map.om.map-gr",
+      { "map-gr", "gsm.map.om.SGSN.InterfaceList.map.gr",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gd,
-      { "map-gd", "gsm_map.om.map-gd",
+      { "map-gd", "gsm.map.om.SGSN.InterfaceList.map.gd",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gf,
-      { "map-gf", "gsm_map.om.map-gf",
+      { "map-gf", "gsm.map.om.SGSN.InterfaceList.map.gf",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gs,
-      { "gs", "gsm_map.om.gs",
+      { "gs", "gsm.map.om.SGSN.InterfaceList.gs",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_ge,
-      { "ge", "gsm_map.om.ge",
+      { "ge", "gsm.map.om.SGSN.InterfaceList.ge",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_s3,
-      { "s3", "gsm_map.om.s3",
+      { "s3", "gsm.map.om.SGSN.InterfaceList.s3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_s4,
-      { "s4", "gsm_map.om.s4",
+      { "s4", "gsm.map.om.SGSN.InterfaceList.s4",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_s6d,
-      { "s6d", "gsm_map.om.s6d",
+      { "s6d", "gsm.map.om.SGSN.InterfaceList.s6d",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gn,
-      { "gn", "gsm_map.om.gn",
+      { "gn", "gsm.map.om.GGSN.InterfaceList.gn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gi,
-      { "gi", "gsm_map.om.gi",
+      { "gi", "gsm.map.om.GGSN.InterfaceList.gi",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gmb,
-      { "gmb", "gsm_map.om.gmb",
+      { "gmb", "gsm.map.om.GGSN.InterfaceList.gmb",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iu,
-      { "iu", "gsm_map.om.iu",
+      { "iu", "gsm.map.om.RNC.InterfaceList.iu",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iur,
-      { "iur", "gsm_map.om.iur",
+      { "iur", "gsm.map.om.RNC.InterfaceList.iur",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iub,
-      { "iub", "gsm_map.om.iub",
+      { "iub", "gsm.map.om.RNC.InterfaceList.iub",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_uu,
-      { "uu", "gsm_map.om.uu",
+      { "uu", "gsm.map.om.RNC.InterfaceList.uu",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_BMSC_InterfaceList_gmb,
-      { "gmb", "gsm_map.om.gmb",
+      { "gmb", "gsm.map.om.BMSC.InterfaceList.gmb",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_InterfaceList_s1_mme,
-      { "s1-mme", "gsm_map.om.s1-mme",
+      { "s1-mme", "gsm.map.om.MME.InterfaceList.s1.mme",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_InterfaceList_s3,
-      { "s3", "gsm_map.om.s3",
+      { "s3", "gsm.map.om.MME.InterfaceList.s3",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_InterfaceList_s6a,
-      { "s6a", "gsm_map.om.s6a",
+      { "s6a", "gsm.map.om.MME.InterfaceList.s6a",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_InterfaceList_s10,
-      { "s10", "gsm_map.om.s10",
+      { "s10", "gsm.map.om.MME.InterfaceList.s10",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_InterfaceList_s11,
-      { "s11", "gsm_map.om.s11",
+      { "s11", "gsm.map.om.MME.InterfaceList.s11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_InterfaceList_s4,
-      { "s4", "gsm_map.om.s4",
+      { "s4", "gsm.map.om.SGW.InterfaceList.s4",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_InterfaceList_s5,
-      { "s5", "gsm_map.om.s5",
+      { "s5", "gsm.map.om.SGW.InterfaceList.s5",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_InterfaceList_s8b,
-      { "s8b", "gsm_map.om.s8b",
+      { "s8b", "gsm.map.om.SGW.InterfaceList.s8b",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_InterfaceList_s11,
-      { "s11", "gsm_map.om.s11",
+      { "s11", "gsm.map.om.SGW.InterfaceList.s11",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_InterfaceList_gxc,
-      { "gxc", "gsm_map.om.gxc",
+      { "gxc", "gsm.map.om.SGW.InterfaceList.gxc",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s2a,
-      { "s2a", "gsm_map.om.s2a",
+      { "s2a", "gsm.map.om.PGW.InterfaceList.s2a",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s2b,
-      { "s2b", "gsm_map.om.s2b",
+      { "s2b", "gsm.map.om.PGW.InterfaceList.s2b",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s2c,
-      { "s2c", "gsm_map.om.s2c",
+      { "s2c", "gsm.map.om.PGW.InterfaceList.s2c",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s5,
-      { "s5", "gsm_map.om.s5",
+      { "s5", "gsm.map.om.PGW.InterfaceList.s5",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s6b,
-      { "s6b", "gsm_map.om.s6b",
+      { "s6b", "gsm.map.om.PGW.InterfaceList.s6b",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_gx,
-      { "gx", "gsm_map.om.gx",
+      { "gx", "gsm.map.om.PGW.InterfaceList.gx",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_s8b,
-      { "s8b", "gsm_map.om.s8b",
+      { "s8b", "gsm.map.om.PGW.InterfaceList.s8b",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_InterfaceList_sgi,
-      { "sgi", "gsm_map.om.sgi",
+      { "sgi", "gsm.map.om.PGW.InterfaceList.sgi",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_om_ENB_InterfaceList_s1_mme,
-      { "s1-mme", "gsm_map.om.s1-mme",
+      { "s1-mme", "gsm.map.om.ENB.InterfaceList.s1.mme",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_ENB_InterfaceList_x2,
-      { "x2", "gsm_map.om.x2",
+      { "x2", "gsm.map.om.ENB.InterfaceList.x2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_ENB_InterfaceList_uu,
-      { "uu", "gsm_map.om.uu",
+      { "uu", "gsm.map.om.ENB.InterfaceList.uu",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_mo_mtCall,
-      { "mo-mtCall", "gsm_map.om.mo-mtCall",
+      { "mo-mtCall", "gsm.map.om.MSC.S.EventList.mo.mtCall",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_mo_mt_sms,
-      { "mo-mt-sms", "gsm_map.om.mo-mt-sms",
+      { "mo-mt-sms", "gsm.map.om.MSC.S.EventList.mo.mt.sms",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach,
-      { "lu-imsiAttach-imsiDetach", "gsm_map.om.lu-imsiAttach-imsiDetach",
+      { "lu-imsiAttach-imsiDetach", "gsm.map.om.MSC.S.EventList.lu.imsiAttach.imsiDetach",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_handovers,
-      { "handovers", "gsm_map.om.handovers",
+      { "handovers", "gsm.map.om.MSC.S.EventList.handovers",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_ss,
-      { "ss", "gsm_map.om.ss",
+      { "ss", "gsm.map.om.MSC.S.EventList.ss",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_MGW_EventList_context,
-      { "context", "gsm_map.om.context",
+      { "context", "gsm.map.om.MGW.EventList.context",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_pdpContext,
-      { "pdpContext", "gsm_map.om.pdpContext",
+      { "pdpContext", "gsm.map.om.SGSN.EventList.pdpContext",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_mo_mt_sms,
-      { "mo-mt-sms", "gsm_map.om.mo-mt-sms",
+      { "mo-mt-sms", "gsm.map.om.SGSN.EventList.mo.mt.sms",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_rau_gprsAttach_gprsDetach,
-      { "rau-gprsAttach-gprsDetach", "gsm_map.om.rau-gprsAttach-gprsDetach",
+      { "rau-gprsAttach-gprsDetach", "gsm.map.om.SGSN.EventList.rau.gprsAttach.gprsDetach",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_mbmsContext,
-      { "mbmsContext", "gsm_map.om.mbmsContext",
+      { "mbmsContext", "gsm.map.om.SGSN.EventList.mbmsContext",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_EventList_pdpContext,
-      { "pdpContext", "gsm_map.om.pdpContext",
+      { "pdpContext", "gsm.map.om.GGSN.EventList.pdpContext",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_EventList_mbmsContext,
-      { "mbmsContext", "gsm_map.om.mbmsContext",
+      { "mbmsContext", "gsm.map.om.GGSN.EventList.mbmsContext",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation,
-      { "mbmsMulticastServiceActivation", "gsm_map.om.mbmsMulticastServiceActivation",
+      { "mbmsMulticastServiceActivation", "gsm.map.om.BMSC.EventList.mbmsMulticastServiceActivation",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest,
-      { "ue-initiatedPDNconectivityRequest", "gsm_map.om.ue-initiatedPDNconectivityRequest",
+      { "ue-initiatedPDNconectivityRequest", "gsm.map.om.MME.EventList.ue.initiatedPDNconectivityRequest",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_serviceRequestts,
-      { "serviceRequestts", "gsm_map.om.serviceRequestts",
+      { "serviceRequestts", "gsm.map.om.MME.EventList.serviceRequestts",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach,
-      { "initialAttachTrackingAreaUpdateDetach", "gsm_map.om.initialAttachTrackingAreaUpdateDetach",
+      { "initialAttachTrackingAreaUpdateDetach", "gsm.map.om.MME.EventList.initialAttachTrackingAreaUpdateDetach",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection,
-      { "ue-initiatedPDNdisconnection", "gsm_map.om.ue-initiatedPDNdisconnection",
+      { "ue-initiatedPDNdisconnection", "gsm.map.om.MME.EventList.ue.initiatedPDNdisconnection",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion,
-      { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion",
+      { "bearerActivationModificationDeletion", "gsm.map.om.MME.EventList.bearerActivationModificationDeletion",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_om_MME_EventList_handover,
-      { "handover", "gsm_map.om.handover",
+      { "handover", "gsm.map.om.MME.EventList.handover",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation,
-      { "pdn-connectionCreation", "gsm_map.om.pdn-connectionCreation",
+      { "pdn-connectionCreation", "gsm.map.om.SGW.EventList.pdn.connectionCreation",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination,
-      { "pdn-connectionTermination", "gsm_map.om.pdn-connectionTermination",
+      { "pdn-connectionTermination", "gsm.map.om.SGW.EventList.pdn.connectionTermination",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion,
-      { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion",
+      { "bearerActivationModificationDeletion", "gsm.map.om.SGW.EventList.bearerActivationModificationDeletion",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation,
-      { "pdn-connectionCreation", "gsm_map.om.pdn-connectionCreation",
+      { "pdn-connectionCreation", "gsm.map.om.PGW.EventList.pdn.connectionCreation",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination,
-      { "pdn-connectionTermination", "gsm_map.om.pdn-connectionTermination",
+      { "pdn-connectionTermination", "gsm.map.om.PGW.EventList.pdn.connectionTermination",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion,
-      { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion",
+      { "bearerActivationModificationDeletion", "gsm.map.om.PGW.EventList.bearerActivationModificationDeletion",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
@@ -28444,623 +28444,623 @@ void proto_register_gsm_map(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_utran,
-      { "utran", "gsm_map.ms.utran",
+      { "utran", "gsm.map.ms.SupportedRAT.Types.utran",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_geran,
-      { "geran", "gsm_map.ms.geran",
+      { "geran", "gsm.map.ms.SupportedRAT.Types.geran",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_gan,
-      { "gan", "gsm_map.ms.gan",
+      { "gan", "gsm.map.ms.SupportedRAT.Types.gan",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution,
-      { "i-hspa-evolution", "gsm_map.ms.i-hspa-evolution",
+      { "i-hspa-evolution", "gsm.map.ms.SupportedRAT.Types.i.hspa.evolution",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_e_utran,
-      { "e-utran", "gsm_map.ms.e-utran",
+      { "e-utran", "gsm.map.ms.SupportedRAT.Types.e.utran",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_nb_iot,
-      { "nb-iot", "gsm_map.ms.nb-iot",
+      { "nb-iot", "gsm.map.ms.SupportedRAT.Types.nb.iot",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1,
-      { "lcsCapabilitySet1", "gsm_map.ms.lcsCapabilitySet1",
+      { "lcsCapabilitySet1", "gsm.map.ms.SupportedLCS.CapabilitySets.lcsCapabilitySet1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2,
-      { "lcsCapabilitySet2", "gsm_map.ms.lcsCapabilitySet2",
+      { "lcsCapabilitySet2", "gsm.map.ms.SupportedLCS.CapabilitySets.lcsCapabilitySet2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3,
-      { "lcsCapabilitySet3", "gsm_map.ms.lcsCapabilitySet3",
+      { "lcsCapabilitySet3", "gsm.map.ms.SupportedLCS.CapabilitySets.lcsCapabilitySet3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet4,
-      { "lcsCapabilitySet4", "gsm_map.ms.lcsCapabilitySet4",
+      { "lcsCapabilitySet4", "gsm.map.ms.SupportedLCS.CapabilitySets.lcsCapabilitySet4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet5,
-      { "lcsCapabilitySet5", "gsm_map.ms.lcsCapabilitySet5",
+      { "lcsCapabilitySet5", "gsm.map.ms.SupportedLCS.CapabilitySets.lcsCapabilitySet5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ISR_Information_updateLocation,
-      { "updateLocation", "gsm_map.ms.updateLocation",
+      { "updateLocation", "gsm.map.ms.ISR.Information.updateLocation",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ISR_Information_cancelSGSN,
-      { "cancelSGSN", "gsm_map.ms.cancelSGSN",
+      { "cancelSGSN", "gsm.map.ms.ISR.Information.cancelSGSN",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ISR_Information_initialAttachIndicator,
-      { "initialAttachIndicator", "gsm_map.ms.initialAttachIndicator",
+      { "initialAttachIndicator", "gsm.map.ms.ISR.Information.initialAttachIndicator",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_apn,
-      { "odb-all-apn", "gsm_map.ms.odb-all-apn",
+      { "odb-all-apn", "gsm.map.ms.SupportedFeatures.odb.all.apn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN,
-      { "odb-HPLMN-APN", "gsm_map.ms.odb-HPLMN-APN",
+      { "odb-HPLMN-APN", "gsm.map.ms.SupportedFeatures.odb.HPLMN.APN",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN,
-      { "odb-VPLMN-APN", "gsm_map.ms.odb-VPLMN-APN",
+      { "odb-VPLMN-APN", "gsm.map.ms.SupportedFeatures.odb.VPLMN.APN",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_og,
-      { "odb-all-og", "gsm_map.ms.odb-all-og",
+      { "odb-all-og", "gsm.map.ms.SupportedFeatures.odb.all.og",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_international_og,
-      { "odb-all-international-og", "gsm_map.ms.odb-all-international-og",
+      { "odb-all-international-og", "gsm.map.ms.SupportedFeatures.odb.all.international.og",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country,
-      { "odb-all-int-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-int-og-not-to-HPLMN-country",
+      { "odb-all-int-og-not-to-HPLMN-country", "gsm.map.ms.SupportedFeatures.odb.all.int.og.not.to.HPLMN.country",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og,
-      { "odb-all-interzonal-og", "gsm_map.ms.odb-all-interzonal-og",
+      { "odb-all-interzonal-og", "gsm.map.ms.SupportedFeatures.odb.all.interzonal.og",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country,
-      { "odb-all-interzonal-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-interzonal-og-not-to-HPLMN-country",
+      { "odb-all-interzonal-og-not-to-HPLMN-country", "gsm.map.ms.SupportedFeatures.odb.all.interzonal.og.not.to.HPLMN.country",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country,
-      { "odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country",
+      { "odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", "gsm.map.ms.SupportedFeatures.odb.all.interzonal.og.and.internat.og.not.to.HPLMN.country",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_regSub,
-      { "regSub", "gsm_map.ms.regSub",
+      { "regSub", "gsm.map.ms.SupportedFeatures.regSub",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_trace,
-      { "trace", "gsm_map.ms.trace",
+      { "trace", "gsm.map.ms.SupportedFeatures.trace",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep,
-      { "lcs-all-PrivExcep", "gsm_map.ms.lcs-all-PrivExcep",
+      { "lcs-all-PrivExcep", "gsm.map.ms.SupportedFeatures.lcs.all.PrivExcep",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_universal,
-      { "lcs-universal", "gsm_map.ms.lcs-universal",
+      { "lcs-universal", "gsm.map.ms.SupportedFeatures.lcs.universal",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated,
-      { "lcs-CallSessionRelated", "gsm_map.ms.lcs-CallSessionRelated",
+      { "lcs-CallSessionRelated", "gsm.map.ms.SupportedFeatures.lcs.CallSessionRelated",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated,
-      { "lcs-CallSessionUnrelated", "gsm_map.ms.lcs-CallSessionUnrelated",
+      { "lcs-CallSessionUnrelated", "gsm.map.ms.SupportedFeatures.lcs.CallSessionUnrelated",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator,
-      { "lcs-PLMN-operator", "gsm_map.ms.lcs-PLMN-operator",
+      { "lcs-PLMN-operator", "gsm.map.ms.SupportedFeatures.lcs.PLMN.operator",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType,
-      { "lcs-ServiceType", "gsm_map.ms.lcs-ServiceType",
+      { "lcs-ServiceType", "gsm.map.ms.SupportedFeatures.lcs.ServiceType",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS,
-      { "lcs-all-MOLR-SS", "gsm_map.ms.lcs-all-MOLR-SS",
+      { "lcs-all-MOLR-SS", "gsm.map.ms.SupportedFeatures.lcs.all.MOLR.SS",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation,
-      { "lcs-basicSelfLocation", "gsm_map.ms.lcs-basicSelfLocation",
+      { "lcs-basicSelfLocation", "gsm.map.ms.SupportedFeatures.lcs.basicSelfLocation",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation,
-      { "lcs-autonomousSelfLocation", "gsm_map.ms.lcs-autonomousSelfLocation",
+      { "lcs-autonomousSelfLocation", "gsm.map.ms.SupportedFeatures.lcs.autonomousSelfLocation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty,
-      { "lcs-transferToThirdParty", "gsm_map.ms.lcs-transferToThirdParty",
+      { "lcs-transferToThirdParty", "gsm.map.ms.SupportedFeatures.lcs.transferToThirdParty",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_sm_mo_pp,
-      { "sm-mo-pp", "gsm_map.ms.sm-mo-pp",
+      { "sm-mo-pp", "gsm.map.ms.SupportedFeatures.sm.mo.pp",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls,
-      { "barring-OutgoingCalls", "gsm_map.ms.barring-OutgoingCalls",
+      { "barring-OutgoingCalls", "gsm.map.ms.SupportedFeatures.barring.OutgoingCalls",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_baoc,
-      { "baoc", "gsm_map.ms.baoc",
+      { "baoc", "gsm.map.ms.SupportedFeatures.baoc",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_boic,
-      { "boic", "gsm_map.ms.boic",
+      { "boic", "gsm.map.ms.SupportedFeatures.boic",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_boicExHC,
-      { "boicExHC", "gsm_map.ms.boicExHC",
+      { "boicExHC", "gsm.map.ms.SupportedFeatures.boicExHC",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_localTimeZoneRetrieval,
-      { "localTimeZoneRetrieval", "gsm_map.ms.localTimeZoneRetrieval",
+      { "localTimeZoneRetrieval", "gsm.map.ms.SupportedFeatures.localTimeZoneRetrieval",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_additionalMsisdn,
-      { "additionalMsisdn", "gsm_map.ms.additionalMsisdn",
+      { "additionalMsisdn", "gsm.map.ms.SupportedFeatures.additionalMsisdn",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_smsInMME,
-      { "smsInMME", "gsm_map.ms.smsInMME",
+      { "smsInMME", "gsm.map.ms.SupportedFeatures.smsInMME",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_smsInSGSN,
-      { "smsInSGSN", "gsm_map.ms.smsInSGSN",
+      { "smsInSGSN", "gsm.map.ms.SupportedFeatures.smsInSGSN",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_ue_Reachability_Notification,
-      { "ue-Reachability-Notification", "gsm_map.ms.ue-Reachability-Notification",
+      { "ue-Reachability-Notification", "gsm.map.ms.SupportedFeatures.ue.Reachability.Notification",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_state_Location_Information_Retrieval,
-      { "state-Location-Information-Retrieval", "gsm_map.ms.state-Location-Information-Retrieval",
+      { "state-Location-Information-Retrieval", "gsm.map.ms.SupportedFeatures.state.Location.Information.Retrieval",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_partialPurge,
-      { "partialPurge", "gsm_map.ms.partialPurge",
+      { "partialPurge", "gsm.map.ms.SupportedFeatures.partialPurge",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_gddInSGSN,
-      { "gddInSGSN", "gsm_map.ms.gddInSGSN",
+      { "gddInSGSN", "gsm.map.ms.SupportedFeatures.gddInSGSN",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_sgsnCAMELCapability,
-      { "sgsnCAMELCapability", "gsm_map.ms.sgsnCAMELCapability",
+      { "sgsnCAMELCapability", "gsm.map.ms.SupportedFeatures.sgsnCAMELCapability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_pcscf_Restoration,
-      { "pcscf-Restoration", "gsm_map.ms.pcscf-Restoration",
+      { "pcscf-Restoration", "gsm.map.ms.SupportedFeatures.pcscf.Restoration",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_dedicatedCoreNetworks,
-      { "dedicatedCoreNetworks", "gsm_map.ms.dedicatedCoreNetworks",
+      { "dedicatedCoreNetworks", "gsm.map.ms.SupportedFeatures.dedicatedCoreNetworks",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs,
-      { "non-IP-PDN-Type-APNs", "gsm_map.ms.non-IP-PDN-Type-APNs",
+      { "non-IP-PDN-Type-APNs", "gsm.map.ms.SupportedFeatures.non.IP.PDN.Type.APNs",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs,
-      { "non-IP-PDP-Type-APNs", "gsm_map.ms.non-IP-PDP-Type-APNs",
+      { "non-IP-PDP-Type-APNs", "gsm.map.ms.SupportedFeatures.non.IP.PDP.Type.APNs",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit,
-      { "permission-indicator-not-allowed-bit", "gsm_map.ms.permission-indicator-not-allowed-bit",
+      { "permission-indicator-not-allowed-bit", "gsm.map.ms.LCLS.Negotiation.permission.indicator.not.allowed.bit",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_spare_bit,
-      { "permission-indicator-spare-bit", "gsm_map.ms.permission-indicator-spare-bit",
+      { "permission-indicator-spare-bit", "gsm.map.ms.LCLS.Negotiation.permission.indicator.spare.bit",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_sending_indicator,
-      { "forward-data-sending-indicator", "gsm_map.ms.forward-data-sending-indicator",
+      { "forward-data-sending-indicator", "gsm.map.ms.LCLS.ConfigurationPreference.forward.data.sending.indicator",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_sending_indicator,
-      { "backward-data-sending-indicator", "gsm_map.ms.backward-data-sending-indicator",
+      { "backward-data-sending-indicator", "gsm.map.ms.LCLS.ConfigurationPreference.backward.data.sending.indicator",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_reception_indicator,
-      { "forward-data-reception-indicator", "gsm_map.ms.forward-data-reception-indicator",
+      { "forward-data-reception-indicator", "gsm.map.ms.LCLS.ConfigurationPreference.forward.data.reception.indicator",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_reception_indicator,
-      { "backward-data-reception-indicator", "gsm_map.ms.backward-data-reception-indicator",
+      { "backward-data-reception-indicator", "gsm.map.ms.LCLS.ConfigurationPreference.backward.data.reception.indicator",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus,
-      { "equipmentStatus", "gsm_map.ms.equipmentStatus",
+      { "equipmentStatus", "gsm.map.ms.RequestedEquipmentInfo.equipmentStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedEquipmentInfo_bmuef,
-      { "bmuef", "gsm_map.ms.bmuef",
+      { "bmuef", "gsm.map.ms.RequestedEquipmentInfo.bmuef",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed,
-      { "utranNotAllowed", "gsm_map.ms.utranNotAllowed",
+      { "utranNotAllowed", "gsm.map.ms.AccessRestrictionData.utranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed,
-      { "geranNotAllowed", "gsm_map.ms.geranNotAllowed",
+      { "geranNotAllowed", "gsm.map.ms.AccessRestrictionData.geranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed,
-      { "ganNotAllowed", "gsm_map.ms.ganNotAllowed",
+      { "ganNotAllowed", "gsm.map.ms.AccessRestrictionData.ganNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed,
-      { "i-hspa-evolutionNotAllowed", "gsm_map.ms.i-hspa-evolutionNotAllowed",
+      { "i-hspa-evolutionNotAllowed", "gsm.map.ms.AccessRestrictionData.i.hspa.evolutionNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed,
-      { "wb-e-utranNotAllowed", "gsm_map.ms.wb-e-utranNotAllowed",
+      { "wb-e-utranNotAllowed", "gsm.map.ms.AccessRestrictionData.wb.e.utranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed,
-      { "ho-toNon3GPP-AccessNotAllowed", "gsm_map.ms.ho-toNon3GPP-AccessNotAllowed",
+      { "ho-toNon3GPP-AccessNotAllowed", "gsm.map.ms.AccessRestrictionData.ho.toNon3GPP.AccessNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed,
-      { "nb-iotNotAllowed", "gsm_map.ms.nb-iotNotAllowed",
+      { "nb-iotNotAllowed", "gsm.map.ms.AccessRestrictionData.nb.iotNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed,
-      { "enhancedCoverageNotAllowed", "gsm_map.ms.enhancedCoverageNotAllowed",
+      { "enhancedCoverageNotAllowed", "gsm.map.ms.AccessRestrictionData.enhancedCoverageNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred,
-      { "allOG-CallsBarred", "gsm_map.ms.allOG-CallsBarred",
+      { "allOG-CallsBarred", "gsm.map.ms.ODB.GeneralData.allOG.CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred,
-      { "internationalOGCallsBarred", "gsm_map.ms.internationalOGCallsBarred",
+      { "internationalOGCallsBarred", "gsm.map.ms.ODB.GeneralData.internationalOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred,
-      { "internationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.internationalOGCallsNotToHPLMN-CountryBarred",
+      { "internationalOGCallsNotToHPLMN-CountryBarred", "gsm.map.ms.ODB.GeneralData.internationalOGCallsNotToHPLMN.CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred,
-      { "premiumRateInformationOGCallsBarred", "gsm_map.ms.premiumRateInformationOGCallsBarred",
+      { "premiumRateInformationOGCallsBarred", "gsm.map.ms.ODB.GeneralData.premiumRateInformationOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_premiumRateEntertainementOGCallsBarred,
-      { "premiumRateEntertainementOGCallsBarred", "gsm_map.ms.premiumRateEntertainementOGCallsBarred",
+      { "premiumRateEntertainementOGCallsBarred", "gsm.map.ms.ODB.GeneralData.premiumRateEntertainementOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_ss_AccessBarred,
-      { "ss-AccessBarred", "gsm_map.ms.ss-AccessBarred",
+      { "ss-AccessBarred", "gsm.map.ms.ODB.GeneralData.ss.AccessBarred",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred,
-      { "interzonalOGCallsBarred", "gsm_map.ms.interzonalOGCallsBarred",
+      { "interzonalOGCallsBarred", "gsm.map.ms.ODB.GeneralData.interzonalOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred,
-      { "interzonalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsNotToHPLMN-CountryBarred",
+      { "interzonalOGCallsNotToHPLMN-CountryBarred", "gsm.map.ms.ODB.GeneralData.interzonalOGCallsNotToHPLMN.CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred,
-      { "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred",
+      { "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", "gsm.map.ms.ODB.GeneralData.interzonalOGCallsAndInternationalOGCallsNotToHPLMN.CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allECT_Barred,
-      { "allECT-Barred", "gsm_map.ms.allECT-Barred",
+      { "allECT-Barred", "gsm.map.ms.ODB.GeneralData.allECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_chargeableECT_Barred,
-      { "chargeableECT-Barred", "gsm_map.ms.chargeableECT-Barred",
+      { "chargeableECT-Barred", "gsm.map.ms.ODB.GeneralData.chargeableECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalECT_Barred,
-      { "internationalECT-Barred", "gsm_map.ms.internationalECT-Barred",
+      { "internationalECT-Barred", "gsm.map.ms.ODB.GeneralData.internationalECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalECT_Barred,
-      { "interzonalECT-Barred", "gsm_map.ms.interzonalECT-Barred",
+      { "interzonalECT-Barred", "gsm.map.ms.ODB.GeneralData.interzonalECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_doublyChargeableECT_Barred,
-      { "doublyChargeableECT-Barred", "gsm_map.ms.doublyChargeableECT-Barred",
+      { "doublyChargeableECT-Barred", "gsm.map.ms.ODB.GeneralData.doublyChargeableECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_multipleECT_Barred,
-      { "multipleECT-Barred", "gsm_map.ms.multipleECT-Barred",
+      { "multipleECT-Barred", "gsm.map.ms.ODB.GeneralData.multipleECT.Barred",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allPacketOrientedServicesBarred,
-      { "allPacketOrientedServicesBarred", "gsm_map.ms.allPacketOrientedServicesBarred",
+      { "allPacketOrientedServicesBarred", "gsm.map.ms.ODB.GeneralData.allPacketOrientedServicesBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToHPLMN_AP_Barred,
-      { "roamerAccessToHPLMN-AP-Barred", "gsm_map.ms.roamerAccessToHPLMN-AP-Barred",
+      { "roamerAccessToHPLMN-AP-Barred", "gsm.map.ms.ODB.GeneralData.roamerAccessToHPLMN.AP.Barred",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToVPLMN_AP_Barred,
-      { "roamerAccessToVPLMN-AP-Barred", "gsm_map.ms.roamerAccessToVPLMN-AP-Barred",
+      { "roamerAccessToVPLMN-AP-Barred", "gsm.map.ms.ODB.GeneralData.roamerAccessToVPLMN.AP.Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNOG_CallsBarred,
-      { "roamingOutsidePLMNOG-CallsBarred", "gsm_map.ms.roamingOutsidePLMNOG-CallsBarred",
+      { "roamingOutsidePLMNOG-CallsBarred", "gsm.map.ms.ODB.GeneralData.roamingOutsidePLMNOG.CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allIC_CallsBarred,
-      { "allIC-CallsBarred", "gsm_map.ms.allIC-CallsBarred",
+      { "allIC-CallsBarred", "gsm.map.ms.ODB.GeneralData.allIC.CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNIC_CallsBarred,
-      { "roamingOutsidePLMNIC-CallsBarred", "gsm_map.ms.roamingOutsidePLMNIC-CallsBarred",
+      { "roamingOutsidePLMNIC-CallsBarred", "gsm.map.ms.ODB.GeneralData.roamingOutsidePLMNIC.CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNICountryIC_CallsBarred,
-      { "roamingOutsidePLMNICountryIC-CallsBarred", "gsm_map.ms.roamingOutsidePLMNICountryIC-CallsBarred",
+      { "roamingOutsidePLMNICountryIC-CallsBarred", "gsm.map.ms.ODB.GeneralData.roamingOutsidePLMNICountryIC.CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_Barred,
-      { "roamingOutsidePLMN-Barred", "gsm_map.ms.roamingOutsidePLMN-Barred",
+      { "roamingOutsidePLMN-Barred", "gsm.map.ms.ODB.GeneralData.roamingOutsidePLMN.Barred",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_CountryBarred,
-      { "roamingOutsidePLMN-CountryBarred", "gsm_map.ms.roamingOutsidePLMN-CountryBarred",
+      { "roamingOutsidePLMN-CountryBarred", "gsm.map.ms.ODB.GeneralData.roamingOutsidePLMN.CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationAllCF_Barred,
-      { "registrationAllCF-Barred", "gsm_map.ms.registrationAllCF-Barred",
+      { "registrationAllCF-Barred", "gsm.map.ms.ODB.GeneralData.registrationAllCF.Barred",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationCFNotToHPLMN_Barred,
-      { "registrationCFNotToHPLMN-Barred", "gsm_map.ms.registrationCFNotToHPLMN-Barred",
+      { "registrationCFNotToHPLMN-Barred", "gsm.map.ms.ODB.GeneralData.registrationCFNotToHPLMN.Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCF_Barred,
-      { "registrationInterzonalCF-Barred", "gsm_map.ms.registrationInterzonalCF-Barred",
+      { "registrationInterzonalCF-Barred", "gsm.map.ms.ODB.GeneralData.registrationInterzonalCF.Barred",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCFNotToHPLMN_Barred,
-      { "registrationInterzonalCFNotToHPLMN-Barred", "gsm_map.ms.registrationInterzonalCFNotToHPLMN-Barred",
+      { "registrationInterzonalCFNotToHPLMN-Barred", "gsm.map.ms.ODB.GeneralData.registrationInterzonalCFNotToHPLMN.Barred",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInternationalCF_Barred,
-      { "registrationInternationalCF-Barred", "gsm_map.ms.registrationInternationalCF-Barred",
+      { "registrationInternationalCF-Barred", "gsm.map.ms.ODB.GeneralData.registrationInternationalCF.Barred",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType1,
-      { "plmn-SpecificBarringType1", "gsm_map.ms.plmn-SpecificBarringType1",
+      { "plmn-SpecificBarringType1", "gsm.map.ms.ODB.HPLMN.Data.plmn.SpecificBarringType1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType2,
-      { "plmn-SpecificBarringType2", "gsm_map.ms.plmn-SpecificBarringType2",
+      { "plmn-SpecificBarringType2", "gsm.map.ms.ODB.HPLMN.Data.plmn.SpecificBarringType2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType3,
-      { "plmn-SpecificBarringType3", "gsm_map.ms.plmn-SpecificBarringType3",
+      { "plmn-SpecificBarringType3", "gsm.map.ms.ODB.HPLMN.Data.plmn.SpecificBarringType3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType4,
-      { "plmn-SpecificBarringType4", "gsm_map.ms.plmn-SpecificBarringType4",
+      { "plmn-SpecificBarringType4", "gsm.map.ms.ODB.HPLMN.Data.plmn.SpecificBarringType4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_o_csi,
-      { "o-csi", "gsm_map.ms.o-csi",
+      { "o-csi", "gsm.map.ms.SpecificCSI.Withdraw.o.csi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_ss_csi,
-      { "ss-csi", "gsm_map.ms.ss-csi",
+      { "ss-csi", "gsm.map.ms.SpecificCSI.Withdraw.ss.csi",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_tif_csi,
-      { "tif-csi", "gsm_map.ms.tif-csi",
+      { "tif-csi", "gsm.map.ms.SpecificCSI.Withdraw.tif.csi",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_d_csi,
-      { "d-csi", "gsm_map.ms.d-csi",
+      { "d-csi", "gsm.map.ms.SpecificCSI.Withdraw.d.csi",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_csi,
-      { "vt-csi", "gsm_map.ms.vt-csi",
+      { "vt-csi", "gsm.map.ms.SpecificCSI.Withdraw.vt.csi",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mo_sms_csi,
-      { "mo-sms-csi", "gsm_map.ms.mo-sms-csi",
+      { "mo-sms-csi", "gsm.map.ms.SpecificCSI.Withdraw.mo.sms.csi",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_m_csi,
-      { "m-csi", "gsm_map.ms.m-csi",
+      { "m-csi", "gsm.map.ms.SpecificCSI.Withdraw.m.csi",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_gprs_csi,
-      { "gprs-csi", "gsm_map.ms.gprs-csi",
+      { "gprs-csi", "gsm.map.ms.SpecificCSI.Withdraw.gprs.csi",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_t_csi,
-      { "t-csi", "gsm_map.ms.t-csi",
+      { "t-csi", "gsm.map.ms.SpecificCSI.Withdraw.t.csi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mt_sms_csi,
-      { "mt-sms-csi", "gsm_map.ms.mt-sms-csi",
+      { "mt-sms-csi", "gsm.map.ms.SpecificCSI.Withdraw.mt.sms.csi",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mg_csi,
-      { "mg-csi", "gsm_map.ms.mg-csi",
+      { "mg-csi", "gsm.map.ms.SpecificCSI.Withdraw.mg.csi",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_o_IM_CSI,
-      { "o-IM-CSI", "gsm_map.ms.o-IM-CSI",
+      { "o-IM-CSI", "gsm.map.ms.SpecificCSI.Withdraw.o.IM.CSI",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_d_IM_CSI,
-      { "d-IM-CSI", "gsm_map.ms.d-IM-CSI",
+      { "d-IM-CSI", "gsm.map.ms.SpecificCSI.Withdraw.d.IM.CSI",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_IM_CSI,
-      { "vt-IM-CSI", "gsm_map.ms.vt-IM-CSI",
+      { "vt-IM-CSI", "gsm.map.ms.SpecificCSI.Withdraw.vt.IM.CSI",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase1,
-      { "phase1", "gsm_map.ms.phase1",
+      { "phase1", "gsm.map.ms.SupportedCamelPhases.phase1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase2,
-      { "phase2", "gsm_map.ms.phase2",
+      { "phase2", "gsm.map.ms.SupportedCamelPhases.phase2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase3,
-      { "phase3", "gsm_map.ms.phase3",
+      { "phase3", "gsm.map.ms.SupportedCamelPhases.phase3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase4,
-      { "phase4", "gsm_map.ms.phase4",
+      { "phase4", "gsm.map.ms.SupportedCamelPhases.phase4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_o_csi,
-      { "o-csi", "gsm_map.ms.o-csi",
+      { "o-csi", "gsm.map.ms.OfferedCamel4CSIs.o.csi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_d_csi,
-      { "d-csi", "gsm_map.ms.d-csi",
+      { "d-csi", "gsm.map.ms.OfferedCamel4CSIs.d.csi",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_vt_csi,
-      { "vt-csi", "gsm_map.ms.vt-csi",
+      { "vt-csi", "gsm.map.ms.OfferedCamel4CSIs.vt.csi",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_t_csi,
-      { "t-csi", "gsm_map.ms.t-csi",
+      { "t-csi", "gsm.map.ms.OfferedCamel4CSIs.t.csi",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_mt_sms_csi,
-      { "mt-sms-csi", "gsm_map.ms.mt-sms-csi",
+      { "mt-sms-csi", "gsm.map.ms.OfferedCamel4CSIs.mt.sms.csi",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_mg_csi,
-      { "mg-csi", "gsm_map.ms.mg-csi",
+      { "mg-csi", "gsm.map.ms.OfferedCamel4CSIs.mg.csi",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_psi_enhancements,
-      { "psi-enhancements", "gsm_map.ms.psi-enhancements",
+      { "psi-enhancements", "gsm.map.ms.OfferedCamel4CSIs.psi.enhancements",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_initiateCallAttempt,
-      { "initiateCallAttempt", "gsm_map.ms.initiateCallAttempt",
+      { "initiateCallAttempt", "gsm.map.ms.OfferedCamel4Functionalities.initiateCallAttempt",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_splitLeg,
-      { "splitLeg", "gsm_map.ms.splitLeg",
+      { "splitLeg", "gsm.map.ms.OfferedCamel4Functionalities.splitLeg",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_moveLeg,
-      { "moveLeg", "gsm_map.ms.moveLeg",
+      { "moveLeg", "gsm.map.ms.OfferedCamel4Functionalities.moveLeg",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_disconnectLeg,
-      { "disconnectLeg", "gsm_map.ms.disconnectLeg",
+      { "disconnectLeg", "gsm.map.ms.OfferedCamel4Functionalities.disconnectLeg",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_entityReleased,
-      { "entityReleased", "gsm_map.ms.entityReleased",
+      { "entityReleased", "gsm.map.ms.OfferedCamel4Functionalities.entityReleased",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_dfc_WithArgument,
-      { "dfc-WithArgument", "gsm_map.ms.dfc-WithArgument",
+      { "dfc-WithArgument", "gsm.map.ms.OfferedCamel4Functionalities.dfc.WithArgument",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_playTone,
-      { "playTone", "gsm_map.ms.playTone",
+      { "playTone", "gsm.map.ms.OfferedCamel4Functionalities.playTone",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_dtmf_MidCall,
-      { "dtmf-MidCall", "gsm_map.ms.dtmf-MidCall",
+      { "dtmf-MidCall", "gsm.map.ms.OfferedCamel4Functionalities.dtmf.MidCall",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_chargingIndicator,
-      { "chargingIndicator", "gsm_map.ms.chargingIndicator",
+      { "chargingIndicator", "gsm.map.ms.OfferedCamel4Functionalities.chargingIndicator",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_alertingDP,
-      { "alertingDP", "gsm_map.ms.alertingDP",
+      { "alertingDP", "gsm.map.ms.OfferedCamel4Functionalities.alertingDP",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_locationAtAlerting,
-      { "locationAtAlerting", "gsm_map.ms.locationAtAlerting",
+      { "locationAtAlerting", "gsm.map.ms.OfferedCamel4Functionalities.locationAtAlerting",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_changeOfPositionDP,
-      { "changeOfPositionDP", "gsm_map.ms.changeOfPositionDP",
+      { "changeOfPositionDP", "gsm.map.ms.OfferedCamel4Functionalities.changeOfPositionDP",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_or_Interactions,
-      { "or-Interactions", "gsm_map.ms.or-Interactions",
+      { "or-Interactions", "gsm.map.ms.OfferedCamel4Functionalities.or.Interactions",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_warningToneEnhancements,
-      { "warningToneEnhancements", "gsm_map.ms.warningToneEnhancements",
+      { "warningToneEnhancements", "gsm.map.ms.OfferedCamel4Functionalities.warningToneEnhancements",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_cf_Enhancements,
-      { "cf-Enhancements", "gsm_map.ms.cf-Enhancements",
+      { "cf-Enhancements", "gsm.map.ms.OfferedCamel4Functionalities.cf.Enhancements",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_subscribedEnhancedDialledServices,
-      { "subscribedEnhancedDialledServices", "gsm_map.ms.subscribedEnhancedDialledServices",
+      { "subscribedEnhancedDialledServices", "gsm.map.ms.OfferedCamel4Functionalities.subscribedEnhancedDialledServices",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_servingNetworkEnhancedDialledServices,
-      { "servingNetworkEnhancedDialledServices", "gsm_map.ms.servingNetworkEnhancedDialledServices",
+      { "servingNetworkEnhancedDialledServices", "gsm.map.ms.OfferedCamel4Functionalities.servingNetworkEnhancedDialledServices",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP,
-      { "criteriaForChangeOfPositionDP", "gsm_map.ms.criteriaForChangeOfPositionDP",
+      { "criteriaForChangeOfPositionDP", "gsm.map.ms.OfferedCamel4Functionalities.criteriaForChangeOfPositionDP",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_serviceChangeDP,
-      { "serviceChangeDP", "gsm_map.ms.serviceChangeDP",
+      { "serviceChangeDP", "gsm.map.ms.OfferedCamel4Functionalities.serviceChangeDP",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_collectInformation,
-      { "collectInformation", "gsm_map.ms.collectInformation",
+      { "collectInformation", "gsm.map.ms.OfferedCamel4Functionalities.collectInformation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest,
-      { "privilegedUplinkRequest", "gsm_map.ms.privilegedUplinkRequest",
+      { "privilegedUplinkRequest", "gsm.map.ms.AdditionalSubscriptions.privilegedUplinkRequest",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest,
-      { "emergencyUplinkRequest", "gsm_map.ms.emergencyUplinkRequest",
+      { "emergencyUplinkRequest", "gsm.map.ms.AdditionalSubscriptions.emergencyUplinkRequest",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset,
-      { "emergencyReset", "gsm_map.ms.emergencyReset",
+      { "emergencyReset", "gsm.map.ms.AdditionalSubscriptions.emergencyReset",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedNodes_mme,
-      { "mme", "gsm_map.ms.mme",
+      { "mme", "gsm.map.ms.RequestedNodes.mme",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedNodes_sgsn,
-      { "sgsn", "gsm_map.ms.sgsn",
+      { "sgsn", "gsm.map.ms.RequestedNodes.sgsn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn,
-      { "mmeAndSgsn", "gsm_map.ms.mmeAndSgsn",
+      { "mmeAndSgsn", "gsm.map.ms.RequestedServingNode.mmeAndSgsn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ServingNode_mme,
-      { "mme", "gsm_map.ms.mme",
+      { "mme", "gsm.map.ms.ServingNode.mme",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ServingNode_sgsn,
-      { "sgsn", "gsm_map.ms.sgsn",
+      { "sgsn", "gsm.map.ms.ServingNode.sgsn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
@@ -29479,19 +29479,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_SuppressMTSS_suppressCUG,
-      { "suppressCUG", "gsm_map.ch.suppressCUG",
+      { "suppressCUG", "gsm.map.ch.SuppressMTSS.suppressCUG",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ch_SuppressMTSS_suppressCCBS,
-      { "suppressCCBS", "gsm_map.ch.suppressCCBS",
+      { "suppressCCBS", "gsm.map.ch.SuppressMTSS.suppressCCBS",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_ch_AllowedServices_firstServiceAllowed,
-      { "firstServiceAllowed", "gsm_map.ch.firstServiceAllowed",
+      { "firstServiceAllowed", "gsm.map.ch.AllowedServices.firstServiceAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_ch_AllowedServices_secondServiceAllowed,
-      { "secondServiceAllowed", "gsm_map.ch.secondServiceAllowed",
+      { "secondServiceAllowed", "gsm.map.ch.AllowedServices.secondServiceAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
@@ -29902,51 +29902,51 @@ void proto_register_gsm_map(void) {
         FT_STRING, STR_ASCII, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable,
-      { "msAvailable", "gsm_map.lcs.msAvailable",
+      { "msAvailable", "gsm.map.lcs.DeferredLocationEventType.msAvailable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea,
-      { "enteringIntoArea", "gsm_map.lcs.enteringIntoArea",
+      { "enteringIntoArea", "gsm.map.lcs.DeferredLocationEventType.enteringIntoArea",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_leavingFromArea,
-      { "leavingFromArea", "gsm_map.lcs.leavingFromArea",
+      { "leavingFromArea", "gsm.map.lcs.DeferredLocationEventType.leavingFromArea",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_beingInsideArea,
-      { "beingInsideArea", "gsm_map.lcs.beingInsideArea",
+      { "beingInsideArea", "gsm.map.lcs.DeferredLocationEventType.beingInsideArea",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_periodicLDR,
-      { "periodicLDR", "gsm_map.lcs.periodicLDR",
+      { "periodicLDR", "gsm.map.lcs.DeferredLocationEventType.periodicLDR",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPoint,
-      { "ellipsoidPoint", "gsm_map.lcs.ellipsoidPoint",
+      { "ellipsoidPoint", "gsm.map.lcs.SupportedGADShapes.ellipsoidPoint",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyCircle,
-      { "ellipsoidPointWithUncertaintyCircle", "gsm_map.lcs.ellipsoidPointWithUncertaintyCircle",
+      { "ellipsoidPointWithUncertaintyCircle", "gsm.map.lcs.SupportedGADShapes.ellipsoidPointWithUncertaintyCircle",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyEllipse,
-      { "ellipsoidPointWithUncertaintyEllipse", "gsm_map.lcs.ellipsoidPointWithUncertaintyEllipse",
+      { "ellipsoidPointWithUncertaintyEllipse", "gsm.map.lcs.SupportedGADShapes.ellipsoidPointWithUncertaintyEllipse",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_polygon,
-      { "polygon", "gsm_map.lcs.polygon",
+      { "polygon", "gsm.map.lcs.SupportedGADShapes.polygon",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitude,
-      { "ellipsoidPointWithAltitude", "gsm_map.lcs.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "gsm.map.lcs.SupportedGADShapes.ellipsoidPointWithAltitude",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaintyElipsoid,
-      { "ellipsoidPointWithAltitudeAndUncertaintyElipsoid", "gsm_map.lcs.ellipsoidPointWithAltitudeAndUncertaintyElipsoid",
+      { "ellipsoidPointWithAltitudeAndUncertaintyElipsoid", "gsm.map.lcs.SupportedGADShapes.ellipsoidPointWithAltitudeAndUncertaintyElipsoid",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidArc,
-      { "ellipsoidArc", "gsm_map.lcs.ellipsoidArc",
+      { "ellipsoidArc", "gsm.map.lcs.SupportedGADShapes.ellipsoidArc",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
@@ -31476,7 +31476,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(NokiaMAP_Extensions_Access_vals), 0,
         NULL, HFILL }},
     { &hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed,
-      { "amr-wb-allowed", "NokiaMAP-Extensions.amr-wb-allowed",
+      { "amr-wb-allowed", "NokiaMAP.Extensions.AllowedServiceData.amr.wb.allowed",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 62d901df0e..4f2c98c2f1 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -7436,63 +7436,63 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SigParamValueV1", HFILL }},
     { &hf_h248_T_auditToken_muxToken,
-      { "muxToken", "h248.muxToken",
+      { "muxToken", "h248.T.auditToken.muxToken",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_modemToken,
-      { "modemToken", "h248.modemToken",
+      { "modemToken", "h248.T.auditToken.modemToken",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_mediaToken,
-      { "mediaToken", "h248.mediaToken",
+      { "mediaToken", "h248.T.auditToken.mediaToken",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_eventsToken,
-      { "eventsToken", "h248.eventsToken",
+      { "eventsToken", "h248.T.auditToken.eventsToken",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_signalsToken,
-      { "signalsToken", "h248.signalsToken",
+      { "signalsToken", "h248.T.auditToken.signalsToken",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_digitMapToken,
-      { "digitMapToken", "h248.digitMapToken",
+      { "digitMapToken", "h248.T.auditToken.digitMapToken",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_statsToken,
-      { "statsToken", "h248.statsToken",
+      { "statsToken", "h248.T.auditToken.statsToken",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_observedEventsToken,
-      { "observedEventsToken", "h248.observedEventsToken",
+      { "observedEventsToken", "h248.T.auditToken.observedEventsToken",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_packagesToken,
-      { "packagesToken", "h248.packagesToken",
+      { "packagesToken", "h248.T.auditToken.packagesToken",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_h248_T_auditToken_eventBufferToken,
-      { "eventBufferToken", "h248.eventBufferToken",
+      { "eventBufferToken", "h248.T.auditToken.eventBufferToken",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onTimeOut,
-      { "onTimeOut", "h248.onTimeOut",
+      { "onTimeOut", "h248.NotifyCompletion.onTimeOut",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByEvent,
-      { "onInterruptByEvent", "h248.onInterruptByEvent",
+      { "onInterruptByEvent", "h248.NotifyCompletion.onInterruptByEvent",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr,
-      { "onInterruptByNewSignalDescr", "h248.onInterruptByNewSignalDescr",
+      { "onInterruptByNewSignalDescr", "h248.NotifyCompletion.onInterruptByNewSignalDescr",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_h248_NotifyCompletion_otherReason,
-      { "otherReason", "h248.otherReason",
+      { "otherReason", "h248.NotifyCompletion.otherReason",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onIteration,
-      { "onIteration", "h248.onIteration",
+      { "onIteration", "h248.NotifyCompletion.onIteration",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ieee1609dot2.c b/epan/dissectors/packet-ieee1609dot2.c
index 7318227115..eddee7b233 100644
--- a/epan/dissectors/packet-ieee1609dot2.c
+++ b/epan/dissectors/packet-ieee1609dot2.c
@@ -2550,11 +2550,11 @@ void proto_register_ieee1609dot2(void) {
         FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0,
         "EccP256CurvePoint", HFILL }},
     { &hf_ieee1609dot2_EndEntityType_app,
-      { "app", "ieee1609dot2.app",
+      { "app", "ieee1609dot2.EndEntityType.app",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ieee1609dot2_EndEntityType_enrol,
-      { "enrol", "ieee1609dot2.enrol",
+      { "enrol", "ieee1609dot2.EndEntityType.enrol",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ilp.c b/epan/dissectors/packet-ilp.c
index 9a90638f69..771277a3a6 100644
--- a/epan/dissectors/packet-ilp.c
+++ b/epan/dissectors/packet-ilp.c
@@ -6452,47 +6452,47 @@ void proto_register_ilp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_60000", HFILL }},
     { &hf_ilp_GANSSSignals_signal1,
-      { "signal1", "ilp.signal1",
+      { "signal1", "ilp.GANSSSignals.signal1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal2,
-      { "signal2", "ilp.signal2",
+      { "signal2", "ilp.GANSSSignals.signal2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal3,
-      { "signal3", "ilp.signal3",
+      { "signal3", "ilp.GANSSSignals.signal3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal4,
-      { "signal4", "ilp.signal4",
+      { "signal4", "ilp.GANSSSignals.signal4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal5,
-      { "signal5", "ilp.signal5",
+      { "signal5", "ilp.GANSSSignals.signal5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal6,
-      { "signal6", "ilp.signal6",
+      { "signal6", "ilp.GANSSSignals.signal6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal7,
-      { "signal7", "ilp.signal7",
+      { "signal7", "ilp.GANSSSignals.signal7",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ilp_GANSSSignals_signal8,
-      { "signal8", "ilp.signal8",
+      { "signal8", "ilp.GANSSSignals.signal8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_ilp_T_addPosMode_standalone,
-      { "standalone", "ilp.standalone",
+      { "standalone", "ilp.T.addPosMode.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ilp_T_addPosMode_setBased,
-      { "setBased", "ilp.setBased",
+      { "setBased", "ilp.T.addPosMode.setBased",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ilp_T_addPosMode_setAssisted,
-      { "setAssisted", "ilp.setAssisted",
+      { "setAssisted", "ilp.T.addPosMode.setAssisted",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c
index 91c844d8d9..8ae4cfa63d 100644
--- a/epan/dissectors/packet-its.c
+++ b/epan/dissectors/packet-its.c
@@ -1337,16 +1337,16 @@ static int hf_evcsn_ChargingSpotType_standardChargeMode1 = -1;
 static int hf_evcsn_ChargingSpotType_standardChargeMode2 = -1;
 static int hf_evcsn_ChargingSpotType_standardOrFastChargeMode3 = -1;
 static int hf_evcsn_ChargingSpotType_fastChargeWithExternalCharger = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_4 = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_5 = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_6 = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_7 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit4 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit5 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit6 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit7 = -1;
 static int hf_evcsn_ChargingSpotType_quickDrop = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_9 = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_10 = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_11 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit9 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit10 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit11 = -1;
 static int hf_evcsn_ChargingSpotType_inductiveChargeWhileStationary = -1;
-static int hf_evcsn_ChargingSpotType_spare_bit_13 = -1;
+static int hf_evcsn_ChargingSpotType_spare_bit13 = -1;
 static int hf_evcsn_ChargingSpotType_inductiveChargeWhileDriving = -1;
 
 /* --- Module EV-RechargingSpotReservation-PDU-Descriptions --- --- ---       */
@@ -11961,16 +11961,16 @@ static const int * evcsn_ChargingSpotType_bits[] = {
   &hf_evcsn_ChargingSpotType_standardChargeMode2,
   &hf_evcsn_ChargingSpotType_standardOrFastChargeMode3,
   &hf_evcsn_ChargingSpotType_fastChargeWithExternalCharger,
-  &hf_evcsn_ChargingSpotType_spare_bit_4,
-  &hf_evcsn_ChargingSpotType_spare_bit_5,
-  &hf_evcsn_ChargingSpotType_spare_bit_6,
-  &hf_evcsn_ChargingSpotType_spare_bit_7,
+  &hf_evcsn_ChargingSpotType_spare_bit4,
+  &hf_evcsn_ChargingSpotType_spare_bit5,
+  &hf_evcsn_ChargingSpotType_spare_bit6,
+  &hf_evcsn_ChargingSpotType_spare_bit7,
   &hf_evcsn_ChargingSpotType_quickDrop,
-  &hf_evcsn_ChargingSpotType_spare_bit_9,
-  &hf_evcsn_ChargingSpotType_spare_bit_10,
-  &hf_evcsn_ChargingSpotType_spare_bit_11,
+  &hf_evcsn_ChargingSpotType_spare_bit9,
+  &hf_evcsn_ChargingSpotType_spare_bit10,
+  &hf_evcsn_ChargingSpotType_spare_bit11,
   &hf_evcsn_ChargingSpotType_inductiveChargeWhileStationary,
-  &hf_evcsn_ChargingSpotType_spare_bit_13,
+  &hf_evcsn_ChargingSpotType_spare_bit13,
   &hf_evcsn_ChargingSpotType_inductiveChargeWhileDriving,
   NULL
 };
@@ -13025,203 +13025,203 @@ void proto_register_its(void)
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_brakePedalEngaged,
-      { "brakePedalEngaged", "its.brakePedalEngaged",
+      { "brakePedalEngaged", "its.AccelerationControl.brakePedalEngaged",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_gasPedalEngaged,
-      { "gasPedalEngaged", "its.gasPedalEngaged",
+      { "gasPedalEngaged", "its.AccelerationControl.gasPedalEngaged",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_emergencyBrakeEngaged,
-      { "emergencyBrakeEngaged", "its.emergencyBrakeEngaged",
+      { "emergencyBrakeEngaged", "its.AccelerationControl.emergencyBrakeEngaged",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_collisionWarningEngaged,
-      { "collisionWarningEngaged", "its.collisionWarningEngaged",
+      { "collisionWarningEngaged", "its.AccelerationControl.collisionWarningEngaged",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_accEngaged,
-      { "accEngaged", "its.accEngaged",
+      { "accEngaged", "its.AccelerationControl.accEngaged",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_cruiseControlEngaged,
-      { "cruiseControlEngaged", "its.cruiseControlEngaged",
+      { "cruiseControlEngaged", "its.AccelerationControl.cruiseControlEngaged",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_its_AccelerationControl_speedLimiterEngaged,
-      { "speedLimiterEngaged", "its.speedLimiterEngaged",
+      { "speedLimiterEngaged", "its.AccelerationControl.speedLimiterEngaged",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_lowBeamHeadlightsOn,
-      { "lowBeamHeadlightsOn", "its.lowBeamHeadlightsOn",
+      { "lowBeamHeadlightsOn", "its.ExteriorLights.lowBeamHeadlightsOn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_highBeamHeadlightsOn,
-      { "highBeamHeadlightsOn", "its.highBeamHeadlightsOn",
+      { "highBeamHeadlightsOn", "its.ExteriorLights.highBeamHeadlightsOn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_leftTurnSignalOn,
-      { "leftTurnSignalOn", "its.leftTurnSignalOn",
+      { "leftTurnSignalOn", "its.ExteriorLights.leftTurnSignalOn",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_rightTurnSignalOn,
-      { "rightTurnSignalOn", "its.rightTurnSignalOn",
+      { "rightTurnSignalOn", "its.ExteriorLights.rightTurnSignalOn",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_daytimeRunningLightsOn,
-      { "daytimeRunningLightsOn", "its.daytimeRunningLightsOn",
+      { "daytimeRunningLightsOn", "its.ExteriorLights.daytimeRunningLightsOn",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_reverseLightOn,
-      { "reverseLightOn", "its.reverseLightOn",
+      { "reverseLightOn", "its.ExteriorLights.reverseLightOn",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_fogLightOn,
-      { "fogLightOn", "its.fogLightOn",
+      { "fogLightOn", "its.ExteriorLights.fogLightOn",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_its_ExteriorLights_parkingLightsOn,
-      { "parkingLightsOn", "its.parkingLightsOn",
+      { "parkingLightsOn", "its.ExteriorLights.parkingLightsOn",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_its_SpecialTransportType_heavyLoad,
-      { "heavyLoad", "its.heavyLoad",
+      { "heavyLoad", "its.SpecialTransportType.heavyLoad",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_SpecialTransportType_excessWidth,
-      { "excessWidth", "its.excessWidth",
+      { "excessWidth", "its.SpecialTransportType.excessWidth",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_SpecialTransportType_excessLength,
-      { "excessLength", "its.excessLength",
+      { "excessLength", "its.SpecialTransportType.excessLength",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_SpecialTransportType_excessHeight,
-      { "excessHeight", "its.excessHeight",
+      { "excessHeight", "its.SpecialTransportType.excessHeight",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_LightBarSirenInUse_lightBarActivated,
-      { "lightBarActivated", "its.lightBarActivated",
+      { "lightBarActivated", "its.LightBarSirenInUse.lightBarActivated",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_LightBarSirenInUse_sirenActivated,
-      { "sirenActivated", "its.sirenActivated",
+      { "sirenActivated", "its.LightBarSirenInUse.sirenActivated",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row1LeftOccupied,
-      { "row1LeftOccupied", "its.row1LeftOccupied",
+      { "row1LeftOccupied", "its.PositionOfOccupants.row1LeftOccupied",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row1RightOccupied,
-      { "row1RightOccupied", "its.row1RightOccupied",
+      { "row1RightOccupied", "its.PositionOfOccupants.row1RightOccupied",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row1MidOccupied,
-      { "row1MidOccupied", "its.row1MidOccupied",
+      { "row1MidOccupied", "its.PositionOfOccupants.row1MidOccupied",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row1NotDetectable,
-      { "row1NotDetectable", "its.row1NotDetectable",
+      { "row1NotDetectable", "its.PositionOfOccupants.row1NotDetectable",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row1NotPresent,
-      { "row1NotPresent", "its.row1NotPresent",
+      { "row1NotPresent", "its.PositionOfOccupants.row1NotPresent",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row2LeftOccupied,
-      { "row2LeftOccupied", "its.row2LeftOccupied",
+      { "row2LeftOccupied", "its.PositionOfOccupants.row2LeftOccupied",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row2RightOccupied,
-      { "row2RightOccupied", "its.row2RightOccupied",
+      { "row2RightOccupied", "its.PositionOfOccupants.row2RightOccupied",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row2MidOccupied,
-      { "row2MidOccupied", "its.row2MidOccupied",
+      { "row2MidOccupied", "its.PositionOfOccupants.row2MidOccupied",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row2NotDetectable,
-      { "row2NotDetectable", "its.row2NotDetectable",
+      { "row2NotDetectable", "its.PositionOfOccupants.row2NotDetectable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row2NotPresent,
-      { "row2NotPresent", "its.row2NotPresent",
+      { "row2NotPresent", "its.PositionOfOccupants.row2NotPresent",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row3LeftOccupied,
-      { "row3LeftOccupied", "its.row3LeftOccupied",
+      { "row3LeftOccupied", "its.PositionOfOccupants.row3LeftOccupied",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row3RightOccupied,
-      { "row3RightOccupied", "its.row3RightOccupied",
+      { "row3RightOccupied", "its.PositionOfOccupants.row3RightOccupied",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row3MidOccupied,
-      { "row3MidOccupied", "its.row3MidOccupied",
+      { "row3MidOccupied", "its.PositionOfOccupants.row3MidOccupied",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row3NotDetectable,
-      { "row3NotDetectable", "its.row3NotDetectable",
+      { "row3NotDetectable", "its.PositionOfOccupants.row3NotDetectable",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row3NotPresent,
-      { "row3NotPresent", "its.row3NotPresent",
+      { "row3NotPresent", "its.PositionOfOccupants.row3NotPresent",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row4LeftOccupied,
-      { "row4LeftOccupied", "its.row4LeftOccupied",
+      { "row4LeftOccupied", "its.PositionOfOccupants.row4LeftOccupied",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row4RightOccupied,
-      { "row4RightOccupied", "its.row4RightOccupied",
+      { "row4RightOccupied", "its.PositionOfOccupants.row4RightOccupied",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row4MidOccupied,
-      { "row4MidOccupied", "its.row4MidOccupied",
+      { "row4MidOccupied", "its.PositionOfOccupants.row4MidOccupied",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row4NotDetectable,
-      { "row4NotDetectable", "its.row4NotDetectable",
+      { "row4NotDetectable", "its.PositionOfOccupants.row4NotDetectable",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_PositionOfOccupants_row4NotPresent,
-      { "row4NotPresent", "its.row4NotPresent",
+      { "row4NotPresent", "its.PositionOfOccupants.row4NotPresent",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_hydrogenStorage,
-      { "hydrogenStorage", "its.hydrogenStorage",
+      { "hydrogenStorage", "its.EnergyStorageType.hydrogenStorage",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_electricEnergyStorage,
-      { "electricEnergyStorage", "its.electricEnergyStorage",
+      { "electricEnergyStorage", "its.EnergyStorageType.electricEnergyStorage",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_liquidPropaneGas,
-      { "liquidPropaneGas", "its.liquidPropaneGas",
+      { "liquidPropaneGas", "its.EnergyStorageType.liquidPropaneGas",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_compressedNaturalGas,
-      { "compressedNaturalGas", "its.compressedNaturalGas",
+      { "compressedNaturalGas", "its.EnergyStorageType.compressedNaturalGas",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_diesel,
-      { "diesel", "its.diesel",
+      { "diesel", "its.EnergyStorageType.diesel",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_gasoline,
-      { "gasoline", "its.gasoline",
+      { "gasoline", "its.EnergyStorageType.gasoline",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_its_EnergyStorageType_ammonia,
-      { "ammonia", "its.ammonia",
+      { "ammonia", "its.EnergyStorageType.ammonia",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_its_EmergencyPriority_requestForRightOfWay,
-      { "requestForRightOfWay", "its.requestForRightOfWay",
+      { "requestForRightOfWay", "its.EmergencyPriority.requestForRightOfWay",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_its_EmergencyPriority_requestForFreeCrossingAtATrafficLight,
-      { "requestForFreeCrossingAtATrafficLight", "its.requestForFreeCrossingAtATrafficLight",
+      { "requestForFreeCrossingAtATrafficLight", "its.EmergencyPriority.requestForFreeCrossingAtATrafficLight",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
@@ -14273,51 +14273,51 @@ void proto_register_its(void)
         FT_STRING, BASE_NONE, NULL, 0,
         "UTF8String", HFILL }},
     { &hf_ivi_PMD_national_holiday,
-      { "national-holiday", "ivi.national-holiday",
+      { "national-holiday", "ivi.PMD.national.holiday",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ivi_PMD_even_days,
-      { "even-days", "ivi.even-days",
+      { "even-days", "ivi.PMD.even.days",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ivi_PMD_odd_days,
-      { "odd-days", "ivi.odd-days",
+      { "odd-days", "ivi.PMD.odd.days",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ivi_PMD_market_day,
-      { "market-day", "ivi.market-day",
+      { "market-day", "ivi.PMD.market.day",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_unused,
-      { "unused", "ivi.unused",
+      { "unused", "ivi.DayOfWeek.unused",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_monday,
-      { "monday", "ivi.monday",
+      { "monday", "ivi.DayOfWeek.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_tuesday,
-      { "tuesday", "ivi.tuesday",
+      { "tuesday", "ivi.DayOfWeek.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_wednesday,
-      { "wednesday", "ivi.wednesday",
+      { "wednesday", "ivi.DayOfWeek.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_thursday,
-      { "thursday", "ivi.thursday",
+      { "thursday", "ivi.DayOfWeek.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_friday,
-      { "friday", "ivi.friday",
+      { "friday", "ivi.DayOfWeek.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_saturday,
-      { "saturday", "ivi.saturday",
+      { "saturday", "ivi.DayOfWeek.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ivi_DayOfWeek_sunday,
-      { "sunday", "ivi.sunday",
+      { "sunday", "ivi.DayOfWeek.sunday",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
@@ -15336,403 +15336,403 @@ void proto_register_its(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_overlappingLaneDescriptionProvided,
-      { "overlappingLaneDescriptionProvided", "dsrc.overlappingLaneDescriptionProvided",
+      { "overlappingLaneDescriptionProvided", "dsrc.LaneSharing.overlappingLaneDescriptionProvided",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_multipleLanesTreatedAsOneLane,
-      { "multipleLanesTreatedAsOneLane", "dsrc.multipleLanesTreatedAsOneLane",
+      { "multipleLanesTreatedAsOneLane", "dsrc.LaneSharing.multipleLanesTreatedAsOneLane",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_otherNonMotorizedTrafficTypes,
-      { "otherNonMotorizedTrafficTypes", "dsrc.otherNonMotorizedTrafficTypes",
+      { "otherNonMotorizedTrafficTypes", "dsrc.LaneSharing.otherNonMotorizedTrafficTypes",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_individualMotorizedVehicleTraffic,
-      { "individualMotorizedVehicleTraffic", "dsrc.individualMotorizedVehicleTraffic",
+      { "individualMotorizedVehicleTraffic", "dsrc.LaneSharing.individualMotorizedVehicleTraffic",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_busVehicleTraffic,
-      { "busVehicleTraffic", "dsrc.busVehicleTraffic",
+      { "busVehicleTraffic", "dsrc.LaneSharing.busVehicleTraffic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_taxiVehicleTraffic,
-      { "taxiVehicleTraffic", "dsrc.taxiVehicleTraffic",
+      { "taxiVehicleTraffic", "dsrc.LaneSharing.taxiVehicleTraffic",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_pedestriansTraffic,
-      { "pedestriansTraffic", "dsrc.pedestriansTraffic",
+      { "pedestriansTraffic", "dsrc.LaneSharing.pedestriansTraffic",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_cyclistVehicleTraffic,
-      { "cyclistVehicleTraffic", "dsrc.cyclistVehicleTraffic",
+      { "cyclistVehicleTraffic", "dsrc.LaneSharing.cyclistVehicleTraffic",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_trackedVehicleTraffic,
-      { "trackedVehicleTraffic", "dsrc.trackedVehicleTraffic",
+      { "trackedVehicleTraffic", "dsrc.LaneSharing.trackedVehicleTraffic",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneSharing_pedestrianTraffic,
-      { "pedestrianTraffic", "dsrc.pedestrianTraffic",
+      { "pedestrianTraffic", "dsrc.LaneSharing.pedestrianTraffic",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverStraightAllowed,
-      { "maneuverStraightAllowed", "dsrc.maneuverStraightAllowed",
+      { "maneuverStraightAllowed", "dsrc.AllowedManeuvers.maneuverStraightAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverLeftAllowed,
-      { "maneuverLeftAllowed", "dsrc.maneuverLeftAllowed",
+      { "maneuverLeftAllowed", "dsrc.AllowedManeuvers.maneuverLeftAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverRightAllowed,
-      { "maneuverRightAllowed", "dsrc.maneuverRightAllowed",
+      { "maneuverRightAllowed", "dsrc.AllowedManeuvers.maneuverRightAllowed",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverUTurnAllowed,
-      { "maneuverUTurnAllowed", "dsrc.maneuverUTurnAllowed",
+      { "maneuverUTurnAllowed", "dsrc.AllowedManeuvers.maneuverUTurnAllowed",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverLeftTurnOnRedAllowed,
-      { "maneuverLeftTurnOnRedAllowed", "dsrc.maneuverLeftTurnOnRedAllowed",
+      { "maneuverLeftTurnOnRedAllowed", "dsrc.AllowedManeuvers.maneuverLeftTurnOnRedAllowed",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverRightTurnOnRedAllowed,
-      { "maneuverRightTurnOnRedAllowed", "dsrc.maneuverRightTurnOnRedAllowed",
+      { "maneuverRightTurnOnRedAllowed", "dsrc.AllowedManeuvers.maneuverRightTurnOnRedAllowed",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverLaneChangeAllowed,
-      { "maneuverLaneChangeAllowed", "dsrc.maneuverLaneChangeAllowed",
+      { "maneuverLaneChangeAllowed", "dsrc.AllowedManeuvers.maneuverLaneChangeAllowed",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_maneuverNoStoppingAllowed,
-      { "maneuverNoStoppingAllowed", "dsrc.maneuverNoStoppingAllowed",
+      { "maneuverNoStoppingAllowed", "dsrc.AllowedManeuvers.maneuverNoStoppingAllowed",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_yieldAllwaysRequired,
-      { "yieldAllwaysRequired", "dsrc.yieldAllwaysRequired",
+      { "yieldAllwaysRequired", "dsrc.AllowedManeuvers.yieldAllwaysRequired",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_goWithHalt,
-      { "goWithHalt", "dsrc.goWithHalt",
+      { "goWithHalt", "dsrc.AllowedManeuvers.goWithHalt",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_caution,
-      { "caution", "dsrc.caution",
+      { "caution", "dsrc.AllowedManeuvers.caution",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_AllowedManeuvers_reserved1,
-      { "reserved1", "dsrc.reserved1",
+      { "reserved1", "dsrc.AllowedManeuvers.reserved1",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_manualControlIsEnabled,
-      { "manualControlIsEnabled", "dsrc.manualControlIsEnabled",
+      { "manualControlIsEnabled", "dsrc.IntersectionStatusObject.manualControlIsEnabled",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_stopTimeIsActivated,
-      { "stopTimeIsActivated", "dsrc.stopTimeIsActivated",
+      { "stopTimeIsActivated", "dsrc.IntersectionStatusObject.stopTimeIsActivated",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_failureFlash,
-      { "failureFlash", "dsrc.failureFlash",
+      { "failureFlash", "dsrc.IntersectionStatusObject.failureFlash",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_preemptIsActive,
-      { "preemptIsActive", "dsrc.preemptIsActive",
+      { "preemptIsActive", "dsrc.IntersectionStatusObject.preemptIsActive",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_signalPriorityIsActive,
-      { "signalPriorityIsActive", "dsrc.signalPriorityIsActive",
+      { "signalPriorityIsActive", "dsrc.IntersectionStatusObject.signalPriorityIsActive",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_fixedTimeOperation,
-      { "fixedTimeOperation", "dsrc.fixedTimeOperation",
+      { "fixedTimeOperation", "dsrc.IntersectionStatusObject.fixedTimeOperation",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_trafficDependentOperation,
-      { "trafficDependentOperation", "dsrc.trafficDependentOperation",
+      { "trafficDependentOperation", "dsrc.IntersectionStatusObject.trafficDependentOperation",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_standbyOperation,
-      { "standbyOperation", "dsrc.standbyOperation",
+      { "standbyOperation", "dsrc.IntersectionStatusObject.standbyOperation",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_failureMode,
-      { "failureMode", "dsrc.failureMode",
+      { "failureMode", "dsrc.IntersectionStatusObject.failureMode",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_off,
-      { "off", "dsrc.off",
+      { "off", "dsrc.IntersectionStatusObject.off",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_recentMAPmessageUpdate,
-      { "recentMAPmessageUpdate", "dsrc.recentMAPmessageUpdate",
+      { "recentMAPmessageUpdate", "dsrc.IntersectionStatusObject.recentMAPmessageUpdate",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_recentChangeInMAPassignedLanesIDsUsed,
-      { "recentChangeInMAPassignedLanesIDsUsed", "dsrc.recentChangeInMAPassignedLanesIDsUsed",
+      { "recentChangeInMAPassignedLanesIDsUsed", "dsrc.IntersectionStatusObject.recentChangeInMAPassignedLanesIDsUsed",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_noValidMAPisAvailableAtThisTime,
-      { "noValidMAPisAvailableAtThisTime", "dsrc.noValidMAPisAvailableAtThisTime",
+      { "noValidMAPisAvailableAtThisTime", "dsrc.IntersectionStatusObject.noValidMAPisAvailableAtThisTime",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_IntersectionStatusObject_noValidSPATisAvailableAtThisTime,
-      { "noValidSPATisAvailableAtThisTime", "dsrc.noValidSPATisAvailableAtThisTime",
+      { "noValidSPATisAvailableAtThisTime", "dsrc.IntersectionStatusObject.noValidSPATisAvailableAtThisTime",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_median_RevocableLane,
-      { "median-RevocableLane", "dsrc.median-RevocableLane",
+      { "median-RevocableLane", "dsrc.LaneAttributes.Barrier.median.RevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_median,
-      { "median", "dsrc.median",
+      { "median", "dsrc.LaneAttributes.Barrier.median",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_whiteLineHashing,
-      { "whiteLineHashing", "dsrc.whiteLineHashing",
+      { "whiteLineHashing", "dsrc.LaneAttributes.Barrier.whiteLineHashing",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_stripedLines,
-      { "stripedLines", "dsrc.stripedLines",
+      { "stripedLines", "dsrc.LaneAttributes.Barrier.stripedLines",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_doubleStripedLines,
-      { "doubleStripedLines", "dsrc.doubleStripedLines",
+      { "doubleStripedLines", "dsrc.LaneAttributes.Barrier.doubleStripedLines",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_trafficCones,
-      { "trafficCones", "dsrc.trafficCones",
+      { "trafficCones", "dsrc.LaneAttributes.Barrier.trafficCones",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_constructionBarrier,
-      { "constructionBarrier", "dsrc.constructionBarrier",
+      { "constructionBarrier", "dsrc.LaneAttributes.Barrier.constructionBarrier",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_trafficChannels,
-      { "trafficChannels", "dsrc.trafficChannels",
+      { "trafficChannels", "dsrc.LaneAttributes.Barrier.trafficChannels",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_lowCurbs,
-      { "lowCurbs", "dsrc.lowCurbs",
+      { "lowCurbs", "dsrc.LaneAttributes.Barrier.lowCurbs",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Barrier_highCurbs,
-      { "highCurbs", "dsrc.highCurbs",
+      { "highCurbs", "dsrc.LaneAttributes.Barrier.highCurbs",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_bikeRevocableLane,
-      { "bikeRevocableLane", "dsrc.bikeRevocableLane",
+      { "bikeRevocableLane", "dsrc.LaneAttributes.Bike.bikeRevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_pedestrianUseAllowed,
-      { "pedestrianUseAllowed", "dsrc.pedestrianUseAllowed",
+      { "pedestrianUseAllowed", "dsrc.LaneAttributes.Bike.pedestrianUseAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_isBikeFlyOverLane,
-      { "isBikeFlyOverLane", "dsrc.isBikeFlyOverLane",
+      { "isBikeFlyOverLane", "dsrc.LaneAttributes.Bike.isBikeFlyOverLane",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_fixedCycleTime,
-      { "fixedCycleTime", "dsrc.fixedCycleTime",
+      { "fixedCycleTime", "dsrc.LaneAttributes.Bike.fixedCycleTime",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_biDirectionalCycleTimes,
-      { "biDirectionalCycleTimes", "dsrc.biDirectionalCycleTimes",
+      { "biDirectionalCycleTimes", "dsrc.LaneAttributes.Bike.biDirectionalCycleTimes",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_isolatedByBarrier,
-      { "isolatedByBarrier", "dsrc.isolatedByBarrier",
+      { "isolatedByBarrier", "dsrc.LaneAttributes.Bike.isolatedByBarrier",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Bike_unsignalizedSegmentsPresent,
-      { "unsignalizedSegmentsPresent", "dsrc.unsignalizedSegmentsPresent",
+      { "unsignalizedSegmentsPresent", "dsrc.LaneAttributes.Bike.unsignalizedSegmentsPresent",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_crosswalkRevocableLane,
-      { "crosswalkRevocableLane", "dsrc.crosswalkRevocableLane",
+      { "crosswalkRevocableLane", "dsrc.LaneAttributes.Crosswalk.crosswalkRevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_bicyleUseAllowed,
-      { "bicyleUseAllowed", "dsrc.bicyleUseAllowed",
+      { "bicyleUseAllowed", "dsrc.LaneAttributes.Crosswalk.bicyleUseAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_isXwalkFlyOverLane,
-      { "isXwalkFlyOverLane", "dsrc.isXwalkFlyOverLane",
+      { "isXwalkFlyOverLane", "dsrc.LaneAttributes.Crosswalk.isXwalkFlyOverLane",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_fixedCycleTime,
-      { "fixedCycleTime", "dsrc.fixedCycleTime",
+      { "fixedCycleTime", "dsrc.LaneAttributes.Crosswalk.fixedCycleTime",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_biDirectionalCycleTimes,
-      { "biDirectionalCycleTimes", "dsrc.biDirectionalCycleTimes",
+      { "biDirectionalCycleTimes", "dsrc.LaneAttributes.Crosswalk.biDirectionalCycleTimes",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_hasPushToWalkButton,
-      { "hasPushToWalkButton", "dsrc.hasPushToWalkButton",
+      { "hasPushToWalkButton", "dsrc.LaneAttributes.Crosswalk.hasPushToWalkButton",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_audioSupport,
-      { "audioSupport", "dsrc.audioSupport",
+      { "audioSupport", "dsrc.LaneAttributes.Crosswalk.audioSupport",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_rfSignalRequestPresent,
-      { "rfSignalRequestPresent", "dsrc.rfSignalRequestPresent",
+      { "rfSignalRequestPresent", "dsrc.LaneAttributes.Crosswalk.rfSignalRequestPresent",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Crosswalk_unsignalizedSegmentsPresent,
-      { "unsignalizedSegmentsPresent", "dsrc.unsignalizedSegmentsPresent",
+      { "unsignalizedSegmentsPresent", "dsrc.LaneAttributes.Crosswalk.unsignalizedSegmentsPresent",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_parkingRevocableLane,
-      { "parkingRevocableLane", "dsrc.parkingRevocableLane",
+      { "parkingRevocableLane", "dsrc.LaneAttributes.Parking.parkingRevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_parallelParkingInUse,
-      { "parallelParkingInUse", "dsrc.parallelParkingInUse",
+      { "parallelParkingInUse", "dsrc.LaneAttributes.Parking.parallelParkingInUse",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_headInParkingInUse,
-      { "headInParkingInUse", "dsrc.headInParkingInUse",
+      { "headInParkingInUse", "dsrc.LaneAttributes.Parking.headInParkingInUse",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_doNotParkZone,
-      { "doNotParkZone", "dsrc.doNotParkZone",
+      { "doNotParkZone", "dsrc.LaneAttributes.Parking.doNotParkZone",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_parkingForBusUse,
-      { "parkingForBusUse", "dsrc.parkingForBusUse",
+      { "parkingForBusUse", "dsrc.LaneAttributes.Parking.parkingForBusUse",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_parkingForTaxiUse,
-      { "parkingForTaxiUse", "dsrc.parkingForTaxiUse",
+      { "parkingForTaxiUse", "dsrc.LaneAttributes.Parking.parkingForTaxiUse",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Parking_noPublicParkingUse,
-      { "noPublicParkingUse", "dsrc.noPublicParkingUse",
+      { "noPublicParkingUse", "dsrc.LaneAttributes.Parking.noPublicParkingUse",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Sidewalk_sidewalk_RevocableLane,
-      { "sidewalk-RevocableLane", "dsrc.sidewalk-RevocableLane",
+      { "sidewalk-RevocableLane", "dsrc.LaneAttributes.Sidewalk.sidewalk.RevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Sidewalk_bicyleUseAllowed,
-      { "bicyleUseAllowed", "dsrc.bicyleUseAllowed",
+      { "bicyleUseAllowed", "dsrc.LaneAttributes.Sidewalk.bicyleUseAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Sidewalk_isSidewalkFlyOverLane,
-      { "isSidewalkFlyOverLane", "dsrc.isSidewalkFlyOverLane",
+      { "isSidewalkFlyOverLane", "dsrc.LaneAttributes.Sidewalk.isSidewalkFlyOverLane",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Sidewalk_walkBikes,
-      { "walkBikes", "dsrc.walkBikes",
+      { "walkBikes", "dsrc.LaneAttributes.Sidewalk.walkBikes",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeToConnectingLanesRevocableLane,
-      { "stripeToConnectingLanesRevocableLane", "dsrc.stripeToConnectingLanesRevocableLane",
+      { "stripeToConnectingLanesRevocableLane", "dsrc.LaneAttributes.Striping.stripeToConnectingLanesRevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeDrawOnLeft,
-      { "stripeDrawOnLeft", "dsrc.stripeDrawOnLeft",
+      { "stripeDrawOnLeft", "dsrc.LaneAttributes.Striping.stripeDrawOnLeft",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeDrawOnRight,
-      { "stripeDrawOnRight", "dsrc.stripeDrawOnRight",
+      { "stripeDrawOnRight", "dsrc.LaneAttributes.Striping.stripeDrawOnRight",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeToConnectingLanesLeft,
-      { "stripeToConnectingLanesLeft", "dsrc.stripeToConnectingLanesLeft",
+      { "stripeToConnectingLanesLeft", "dsrc.LaneAttributes.Striping.stripeToConnectingLanesLeft",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeToConnectingLanesRight,
-      { "stripeToConnectingLanesRight", "dsrc.stripeToConnectingLanesRight",
+      { "stripeToConnectingLanesRight", "dsrc.LaneAttributes.Striping.stripeToConnectingLanesRight",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Striping_stripeToConnectingLanesAhead,
-      { "stripeToConnectingLanesAhead", "dsrc.stripeToConnectingLanesAhead",
+      { "stripeToConnectingLanesAhead", "dsrc.LaneAttributes.Striping.stripeToConnectingLanesAhead",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_RevocableLane,
-      { "spec-RevocableLane", "dsrc.spec-RevocableLane",
+      { "spec-RevocableLane", "dsrc.LaneAttributes.TrackedVehicle.spec.RevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_commuterRailRoadTrack,
-      { "spec-commuterRailRoadTrack", "dsrc.spec-commuterRailRoadTrack",
+      { "spec-commuterRailRoadTrack", "dsrc.LaneAttributes.TrackedVehicle.spec.commuterRailRoadTrack",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_lightRailRoadTrack,
-      { "spec-lightRailRoadTrack", "dsrc.spec-lightRailRoadTrack",
+      { "spec-lightRailRoadTrack", "dsrc.LaneAttributes.TrackedVehicle.spec.lightRailRoadTrack",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_heavyRailRoadTrack,
-      { "spec-heavyRailRoadTrack", "dsrc.spec-heavyRailRoadTrack",
+      { "spec-heavyRailRoadTrack", "dsrc.LaneAttributes.TrackedVehicle.spec.heavyRailRoadTrack",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_otherRailType,
-      { "spec-otherRailType", "dsrc.spec-otherRailType",
+      { "spec-otherRailType", "dsrc.LaneAttributes.TrackedVehicle.spec.otherRailType",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_isVehicleRevocableLane,
-      { "isVehicleRevocableLane", "dsrc.isVehicleRevocableLane",
+      { "isVehicleRevocableLane", "dsrc.LaneAttributes.Vehicle.isVehicleRevocableLane",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_isVehicleFlyOverLane,
-      { "isVehicleFlyOverLane", "dsrc.isVehicleFlyOverLane",
+      { "isVehicleFlyOverLane", "dsrc.LaneAttributes.Vehicle.isVehicleFlyOverLane",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_hovLaneUseOnly,
-      { "hovLaneUseOnly", "dsrc.hovLaneUseOnly",
+      { "hovLaneUseOnly", "dsrc.LaneAttributes.Vehicle.hovLaneUseOnly",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_restrictedToBusUse,
-      { "restrictedToBusUse", "dsrc.restrictedToBusUse",
+      { "restrictedToBusUse", "dsrc.LaneAttributes.Vehicle.restrictedToBusUse",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_restrictedToTaxiUse,
-      { "restrictedToTaxiUse", "dsrc.restrictedToTaxiUse",
+      { "restrictedToTaxiUse", "dsrc.LaneAttributes.Vehicle.restrictedToTaxiUse",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_restrictedFromPublicUse,
-      { "restrictedFromPublicUse", "dsrc.restrictedFromPublicUse",
+      { "restrictedFromPublicUse", "dsrc.LaneAttributes.Vehicle.restrictedFromPublicUse",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_hasIRbeaconCoverage,
-      { "hasIRbeaconCoverage", "dsrc.hasIRbeaconCoverage",
+      { "hasIRbeaconCoverage", "dsrc.LaneAttributes.Vehicle.hasIRbeaconCoverage",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_dsrc_LaneAttributes_Vehicle_permissionOnRequest,
-      { "permissionOnRequest", "dsrc.permissionOnRequest",
+      { "permissionOnRequest", "dsrc.LaneAttributes.Vehicle.permissionOnRequest",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_dsrc_LaneDirection_ingressPath,
-      { "ingressPath", "dsrc.ingressPath",
+      { "ingressPath", "dsrc.LaneDirection.ingressPath",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_LaneDirection_egressPath,
-      { "egressPath", "dsrc.egressPath",
+      { "egressPath", "dsrc.LaneDirection.egressPath",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_loading,
-      { "loading", "dsrc.loading",
+      { "loading", "dsrc.TransitVehicleStatus.loading",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_anADAuse,
-      { "anADAuse", "dsrc.anADAuse",
+      { "anADAuse", "dsrc.TransitVehicleStatus.anADAuse",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_aBikeLoad,
-      { "aBikeLoad", "dsrc.aBikeLoad",
+      { "aBikeLoad", "dsrc.TransitVehicleStatus.aBikeLoad",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_doorOpen,
-      { "doorOpen", "dsrc.doorOpen",
+      { "doorOpen", "dsrc.TransitVehicleStatus.doorOpen",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_charging,
-      { "charging", "dsrc.charging",
+      { "charging", "dsrc.TransitVehicleStatus.charging",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_dsrc_TransitVehicleStatus_atStopLine,
-      { "atStopLine", "dsrc.atStopLine",
+      { "atStopLine", "dsrc.TransitVehicleStatus.atStopLine",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
 
@@ -16660,35 +16660,35 @@ void proto_register_its(void)
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tistpg_TpgAutomation_fullAutomated,
-      { "fullAutomated", "tistpg.fullAutomated",
+      { "fullAutomated", "tistpg.TpgAutomation.fullAutomated",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_tistpg_TpgAutomation_semiAutomated,
-      { "semiAutomated", "tistpg.semiAutomated",
+      { "semiAutomated", "tistpg.TpgAutomation.semiAutomated",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_tistpg_TpgAutomation_manual,
-      { "manual", "tistpg.manual",
+      { "manual", "tistpg.TpgAutomation.manual",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_tistpg_TpgAutomation_reserved,
-      { "reserved", "tistpg.reserved",
+      { "reserved", "tistpg.TpgAutomation.reserved",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_tistpg_TisProfile_reserved,
-      { "reserved", "tistpg.reserved",
+      { "reserved", "tistpg.TisProfile.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_tistpg_TisProfile_profileOne,
-      { "profileOne", "tistpg.profileOne",
+      { "profileOne", "tistpg.TisProfile.profileOne",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_tistpg_TisProfile_profileTwo,
-      { "profileTwo", "tistpg.profileTwo",
+      { "profileTwo", "tistpg.TisProfile.profileTwo",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_tistpg_TisProfile_profileThree,
-      { "profileThree", "tistpg.profileThree",
+      { "profileThree", "tistpg.TisProfile.profileThree",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
@@ -16819,63 +16819,63 @@ void proto_register_its(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_evcsn_ChargingSpotType_standardChargeMode1,
-      { "standardChargeMode1", "evcsn.standardChargeMode1",
+      { "standardChargeMode1", "evcsn.ChargingSpotType.standardChargeMode1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_standardChargeMode2,
-      { "standardChargeMode2", "evcsn.standardChargeMode2",
+      { "standardChargeMode2", "evcsn.ChargingSpotType.standardChargeMode2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_standardOrFastChargeMode3,
-      { "standardOrFastChargeMode3", "evcsn.standardOrFastChargeMode3",
+      { "standardOrFastChargeMode3", "evcsn.ChargingSpotType.standardOrFastChargeMode3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_fastChargeWithExternalCharger,
-      { "fastChargeWithExternalCharger", "evcsn.fastChargeWithExternalCharger",
+      { "fastChargeWithExternalCharger", "evcsn.ChargingSpotType.fastChargeWithExternalCharger",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_4,
-      { "spare_bit_4", "evcsn.spare_bit_4",
+    { &hf_evcsn_ChargingSpotType_spare_bit4,
+      { "spare_bit4", "evcsn.ChargingSpotType.spare.bit4",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_5,
-      { "spare_bit_5", "evcsn.spare_bit_5",
+    { &hf_evcsn_ChargingSpotType_spare_bit5,
+      { "spare_bit5", "evcsn.ChargingSpotType.spare.bit5",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_6,
-      { "spare_bit_6", "evcsn.spare_bit_6",
+    { &hf_evcsn_ChargingSpotType_spare_bit6,
+      { "spare_bit6", "evcsn.ChargingSpotType.spare.bit6",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_7,
-      { "spare_bit_7", "evcsn.spare_bit_7",
+    { &hf_evcsn_ChargingSpotType_spare_bit7,
+      { "spare_bit7", "evcsn.ChargingSpotType.spare.bit7",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_quickDrop,
-      { "quickDrop", "evcsn.quickDrop",
+      { "quickDrop", "evcsn.ChargingSpotType.quickDrop",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_9,
-      { "spare_bit_9", "evcsn.spare_bit_9",
+    { &hf_evcsn_ChargingSpotType_spare_bit9,
+      { "spare_bit9", "evcsn.ChargingSpotType.spare.bit9",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_10,
-      { "spare_bit_10", "evcsn.spare_bit_10",
+    { &hf_evcsn_ChargingSpotType_spare_bit10,
+      { "spare_bit10", "evcsn.ChargingSpotType.spare.bit10",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_11,
-      { "spare_bit_11", "evcsn.spare_bit_11",
+    { &hf_evcsn_ChargingSpotType_spare_bit11,
+      { "spare_bit11", "evcsn.ChargingSpotType.spare.bit11",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_inductiveChargeWhileStationary,
-      { "inductiveChargeWhileStationary", "evcsn.inductiveChargeWhileStationary",
+      { "inductiveChargeWhileStationary", "evcsn.ChargingSpotType.inductiveChargeWhileStationary",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_evcsn_ChargingSpotType_spare_bit_13,
-      { "spare_bit_13", "evcsn.spare_bit_13",
+    { &hf_evcsn_ChargingSpotType_spare_bit13,
+      { "spare_bit13", "evcsn.ChargingSpotType.spare.bit13",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_evcsn_ChargingSpotType_inductiveChargeWhileDriving,
-      { "inductiveChargeWhileDriving", "evcsn.inductiveChargeWhileDriving",
+      { "inductiveChargeWhileDriving", "evcsn.ChargingSpotType.inductiveChargeWhileDriving",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
@@ -17042,11 +17042,11 @@ void proto_register_its(void)
         FT_UINT32, BASE_DEC, VALS(evrsr_PowerSource_vals), 0,
         NULL, HFILL }},
     { &hf_evrsr_SupportedPaymentTypes_contract,
-      { "contract", "evrsr.contract",
+      { "contract", "evrsr.SupportedPaymentTypes.contract",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_evrsr_SupportedPaymentTypes_externalIdentification,
-      { "externalIdentification", "evrsr.externalIdentification",
+      { "externalIdentification", "evrsr.SupportedPaymentTypes.externalIdentification",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 528988298e..8b448517fa 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -5600,227 +5600,227 @@ void proto_register_kerberos(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptedData", HFILL }},
     { &hf_kerberos_APOptions_reserved,
-      { "reserved", "kerberos.reserved",
+      { "reserved", "kerberos.APOptions.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_APOptions_use_session_key,
-      { "use-session-key", "kerberos.use-session-key",
+      { "use-session-key", "kerberos.APOptions.use.session.key",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_APOptions_mutual_required,
-      { "mutual-required", "kerberos.mutual-required",
+      { "mutual-required", "kerberos.APOptions.mutual.required",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_reserved,
-      { "reserved", "kerberos.reserved",
+      { "reserved", "kerberos.TicketFlags.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_forwardable,
-      { "forwardable", "kerberos.forwardable",
+      { "forwardable", "kerberos.TicketFlags.forwardable",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_forwarded,
-      { "forwarded", "kerberos.forwarded",
+      { "forwarded", "kerberos.TicketFlags.forwarded",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_proxiable,
-      { "proxiable", "kerberos.proxiable",
+      { "proxiable", "kerberos.TicketFlags.proxiable",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_proxy,
-      { "proxy", "kerberos.proxy",
+      { "proxy", "kerberos.TicketFlags.proxy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_may_postdate,
-      { "may-postdate", "kerberos.may-postdate",
+      { "may-postdate", "kerberos.TicketFlags.may.postdate",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_postdated,
-      { "postdated", "kerberos.postdated",
+      { "postdated", "kerberos.TicketFlags.postdated",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_invalid,
-      { "invalid", "kerberos.invalid",
+      { "invalid", "kerberos.TicketFlags.invalid",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_renewable,
-      { "renewable", "kerberos.renewable",
+      { "renewable", "kerberos.TicketFlags.renewable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_initial,
-      { "initial", "kerberos.initial",
+      { "initial", "kerberos.TicketFlags.initial",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_pre_authent,
-      { "pre-authent", "kerberos.pre-authent",
+      { "pre-authent", "kerberos.TicketFlags.pre.authent",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_hw_authent,
-      { "hw-authent", "kerberos.hw-authent",
+      { "hw-authent", "kerberos.TicketFlags.hw.authent",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_transited_policy_checked,
-      { "transited-policy-checked", "kerberos.transited-policy-checked",
+      { "transited-policy-checked", "kerberos.TicketFlags.transited.policy.checked",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_ok_as_delegate,
-      { "ok-as-delegate", "kerberos.ok-as-delegate",
+      { "ok-as-delegate", "kerberos.TicketFlags.ok.as.delegate",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_unused,
-      { "unused", "kerberos.unused",
+      { "unused", "kerberos.TicketFlags.unused",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_enc_pa_rep,
-      { "enc-pa-rep", "kerberos.enc-pa-rep",
+      { "enc-pa-rep", "kerberos.TicketFlags.enc.pa.rep",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_TicketFlags_anonymous,
-      { "anonymous", "kerberos.anonymous",
+      { "anonymous", "kerberos.TicketFlags.anonymous",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_reserved,
-      { "reserved", "kerberos.reserved",
+      { "reserved", "kerberos.KDCOptions.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_forwardable,
-      { "forwardable", "kerberos.forwardable",
+      { "forwardable", "kerberos.KDCOptions.forwardable",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_forwarded,
-      { "forwarded", "kerberos.forwarded",
+      { "forwarded", "kerberos.KDCOptions.forwarded",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_proxiable,
-      { "proxiable", "kerberos.proxiable",
+      { "proxiable", "kerberos.KDCOptions.proxiable",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_proxy,
-      { "proxy", "kerberos.proxy",
+      { "proxy", "kerberos.KDCOptions.proxy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_allow_postdate,
-      { "allow-postdate", "kerberos.allow-postdate",
+      { "allow-postdate", "kerberos.KDCOptions.allow.postdate",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_postdated,
-      { "postdated", "kerberos.postdated",
+      { "postdated", "kerberos.KDCOptions.postdated",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused7,
-      { "unused7", "kerberos.unused7",
+      { "unused7", "kerberos.KDCOptions.unused7",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_renewable,
-      { "renewable", "kerberos.renewable",
+      { "renewable", "kerberos.KDCOptions.renewable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused9,
-      { "unused9", "kerberos.unused9",
+      { "unused9", "kerberos.KDCOptions.unused9",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused10,
-      { "unused10", "kerberos.unused10",
+      { "unused10", "kerberos.KDCOptions.unused10",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_opt_hardware_auth,
-      { "opt-hardware-auth", "kerberos.opt-hardware-auth",
+      { "opt-hardware-auth", "kerberos.KDCOptions.opt.hardware.auth",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused12,
-      { "unused12", "kerberos.unused12",
+      { "unused12", "kerberos.KDCOptions.unused12",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused13,
-      { "unused13", "kerberos.unused13",
+      { "unused13", "kerberos.KDCOptions.unused13",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_constrained_delegation,
-      { "constrained-delegation", "kerberos.constrained-delegation",
+      { "constrained-delegation", "kerberos.KDCOptions.constrained.delegation",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_canonicalize,
-      { "canonicalize", "kerberos.canonicalize",
+      { "canonicalize", "kerberos.KDCOptions.canonicalize",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_request_anonymous,
-      { "request-anonymous", "kerberos.request-anonymous",
+      { "request-anonymous", "kerberos.KDCOptions.request.anonymous",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused17,
-      { "unused17", "kerberos.unused17",
+      { "unused17", "kerberos.KDCOptions.unused17",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused18,
-      { "unused18", "kerberos.unused18",
+      { "unused18", "kerberos.KDCOptions.unused18",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused19,
-      { "unused19", "kerberos.unused19",
+      { "unused19", "kerberos.KDCOptions.unused19",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused20,
-      { "unused20", "kerberos.unused20",
+      { "unused20", "kerberos.KDCOptions.unused20",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused21,
-      { "unused21", "kerberos.unused21",
+      { "unused21", "kerberos.KDCOptions.unused21",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused22,
-      { "unused22", "kerberos.unused22",
+      { "unused22", "kerberos.KDCOptions.unused22",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused23,
-      { "unused23", "kerberos.unused23",
+      { "unused23", "kerberos.KDCOptions.unused23",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused24,
-      { "unused24", "kerberos.unused24",
+      { "unused24", "kerberos.KDCOptions.unused24",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused25,
-      { "unused25", "kerberos.unused25",
+      { "unused25", "kerberos.KDCOptions.unused25",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_disable_transited_check,
-      { "disable-transited-check", "kerberos.disable-transited-check",
+      { "disable-transited-check", "kerberos.KDCOptions.disable.transited.check",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_renewable_ok,
-      { "renewable-ok", "kerberos.renewable-ok",
+      { "renewable-ok", "kerberos.KDCOptions.renewable.ok",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_enc_tkt_in_skey,
-      { "enc-tkt-in-skey", "kerberos.enc-tkt-in-skey",
+      { "enc-tkt-in-skey", "kerberos.KDCOptions.enc.tkt.in.skey",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_unused29,
-      { "unused29", "kerberos.unused29",
+      { "unused29", "kerberos.KDCOptions.unused29",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_renew,
-      { "renew", "kerberos.renew",
+      { "renew", "kerberos.KDCOptions.renew",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_kerberos_KDCOptions_validate,
-      { "validate", "kerberos.validate",
+      { "validate", "kerberos.KDCOptions.validate",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_kerberos_PAC_OPTIONS_FLAGS_claims,
-      { "claims", "kerberos.claims",
+      { "claims", "kerberos.PAC.OPTIONS.FLAGS.claims",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_kerberos_PAC_OPTIONS_FLAGS_branch_aware,
-      { "branch-aware", "kerberos.branch-aware",
+      { "branch-aware", "kerberos.PAC.OPTIONS.FLAGS.branch.aware",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc,
-      { "forward-to-full-dc", "kerberos.forward-to-full-dc",
+      { "forward-to-full-dc", "kerberos.PAC.OPTIONS.FLAGS.forward.to.full.dc",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_kerberos_PAC_OPTIONS_FLAGS_resource_based_constrained_delegation,
-      { "resource-based-constrained-delegation", "kerberos.resource-based-constrained-delegation",
+      { "resource-based-constrained-delegation", "kerberos.PAC.OPTIONS.FLAGS.resource.based.constrained.delegation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c
index 7e5ee1af51..d4ad5bedb9 100644
--- a/epan/dissectors/packet-lpp.c
+++ b/epan/dissectors/packet-lpp.c
@@ -24969,391 +24969,391 @@ void proto_register_lpp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_eutra,
-      { "eutra", "lpp.eutra",
+      { "eutra", "lpp.T.accessTypes.eutra",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_utra,
-      { "utra", "lpp.utra",
+      { "utra", "lpp.T.accessTypes.utra",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_gsm,
-      { "gsm", "lpp.gsm",
+      { "gsm", "lpp.T.accessTypes.gsm",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_nb_iot,
-      { "nb-iot", "lpp.nb-iot",
+      { "nb-iot", "lpp.T.accessTypes.nb.iot",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_nr_v1510,
-      { "nr-v1510", "lpp.nr-v1510",
+      { "nr-v1510", "lpp.T.accessTypes.nr.v1510",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_posModes_standalone,
-      { "standalone", "lpp.standalone",
+      { "standalone", "lpp.T.posModes.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_posModes_ue_based,
-      { "ue-based", "lpp.ue-based",
+      { "ue-based", "lpp.T.posModes.ue.based",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_posModes_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.posModes.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_lpp_message_segmentation_req_r14_serverToTarget,
-      { "serverToTarget", "lpp.serverToTarget",
+      { "serverToTarget", "lpp.T.lpp.message.segmentation.req.r14.serverToTarget",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_lpp_message_segmentation_req_r14_targetToServer,
-      { "targetToServer", "lpp.targetToServer",
+      { "targetToServer", "lpp.T.lpp.message.segmentation.req.r14.targetToServer",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_lpp_message_segmentation_r14_serverToTarget,
-      { "serverToTarget", "lpp.serverToTarget",
+      { "serverToTarget", "lpp.T.lpp.message.segmentation.r14.serverToTarget",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_lpp_message_segmentation_r14_targetToServer,
-      { "targetToServer", "lpp.targetToServer",
+      { "targetToServer", "lpp.T.lpp.message.segmentation.r14.targetToServer",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_a_gnss,
-      { "a-gnss", "lpp.a-gnss",
+      { "a-gnss", "lpp.LocationSource.r13.a.gnss",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_wlan,
-      { "wlan", "lpp.wlan",
+      { "wlan", "lpp.LocationSource.r13.wlan",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_bt,
-      { "bt", "lpp.bt",
+      { "bt", "lpp.LocationSource.r13.bt",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_tbs,
-      { "tbs", "lpp.tbs",
+      { "tbs", "lpp.LocationSource.r13.tbs",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_sensor,
-      { "sensor", "lpp.sensor",
+      { "sensor", "lpp.LocationSource.r13.sensor",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_LocationSource_r13_ha_gnss_v1510,
-      { "ha-gnss-v1510", "lpp.ha-gnss-v1510",
+      { "ha-gnss-v1510", "lpp.LocationSource.r13.ha.gnss.v1510",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lpp_T_adType_r14_prs,
-      { "prs", "lpp.prs",
+      { "prs", "lpp.T.adType.r14.prs",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_adType_r14_nprs,
-      { "nprs", "lpp.nprs",
+      { "nprs", "lpp.T.adType.r14.nprs",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_otdoa_Mode_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.otdoa.Mode.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_otdoa_Mode_ue_assisted_NB_r14,
-      { "ue-assisted-NB-r14", "lpp.ue-assisted-NB-r14",
+      { "ue-assisted-NB-r14", "lpp.T.otdoa.Mode.ue.assisted.NB.r14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_otdoa_Mode_ue_assisted_NB_TDD_r15,
-      { "ue-assisted-NB-TDD-r15", "lpp.ue-assisted-NB-TDD-r15",
+      { "ue-assisted-NB-TDD-r15", "lpp.T.otdoa.Mode.ue.assisted.NB.TDD.r15",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_periodicAssistanceData_r15_solicited,
-      { "solicited", "lpp.solicited",
+      { "solicited", "lpp.T.periodicAssistanceData.r15.solicited",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_periodicAssistanceData_r15_unsolicited,
-      { "unsolicited", "lpp.unsolicited",
+      { "unsolicited", "lpp.T.periodicAssistanceData.r15.unsolicited",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_ionoModel_klobuchar,
-      { "klobuchar", "lpp.klobuchar",
+      { "klobuchar", "lpp.T.ionoModel.klobuchar",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_ionoModel_neQuick,
-      { "neQuick", "lpp.neQuick",
+      { "neQuick", "lpp.T.ionoModel.neQuick",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_1,
-      { "model-1", "lpp.model-1",
+      { "model-1", "lpp.T.clockModel.model.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_2,
-      { "model-2", "lpp.model-2",
+      { "model-2", "lpp.T.clockModel.model.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_3,
-      { "model-3", "lpp.model-3",
+      { "model-3", "lpp.T.clockModel.model.3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_4,
-      { "model-4", "lpp.model-4",
+      { "model-4", "lpp.T.clockModel.model.4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_5,
-      { "model-5", "lpp.model-5",
+      { "model-5", "lpp.T.clockModel.model.5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_clockModel_model_6,
-      { "model-6", "lpp.model-6",
+      { "model-6", "lpp.T.clockModel.model.6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_1,
-      { "model-1", "lpp.model-1",
+      { "model-1", "lpp.T.orbitModel.model.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_2,
-      { "model-2", "lpp.model-2",
+      { "model-2", "lpp.T.orbitModel.model.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_3,
-      { "model-3", "lpp.model-3",
+      { "model-3", "lpp.T.orbitModel.model.3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_4,
-      { "model-4", "lpp.model-4",
+      { "model-4", "lpp.T.orbitModel.model.4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_5,
-      { "model-5", "lpp.model-5",
+      { "model-5", "lpp.T.orbitModel.model.5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_orbitModel_model_6,
-      { "model-6", "lpp.model-6",
+      { "model-6", "lpp.T.orbitModel.model.6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_1,
-      { "model-1", "lpp.model-1",
+      { "model-1", "lpp.T.almanacModel.model.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_2,
-      { "model-2", "lpp.model-2",
+      { "model-2", "lpp.T.almanacModel.model.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_3,
-      { "model-3", "lpp.model-3",
+      { "model-3", "lpp.T.almanacModel.model.3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_4,
-      { "model-4", "lpp.model-4",
+      { "model-4", "lpp.T.almanacModel.model.4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_5,
-      { "model-5", "lpp.model-5",
+      { "model-5", "lpp.T.almanacModel.model.5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_6,
-      { "model-6", "lpp.model-6",
+      { "model-6", "lpp.T.almanacModel.model.6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lpp_T_almanacModel_model_7,
-      { "model-7", "lpp.model-7",
+      { "model-7", "lpp.T.almanacModel.model.7",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lpp_T_utc_Model_model_1,
-      { "model-1", "lpp.model-1",
+      { "model-1", "lpp.T.utc.Model.model.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_utc_Model_model_2,
-      { "model-2", "lpp.model-2",
+      { "model-2", "lpp.T.utc.Model.model.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_utc_Model_model_3,
-      { "model-3", "lpp.model-3",
+      { "model-3", "lpp.T.utc.Model.model.3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_utc_Model_model_4,
-      { "model-4", "lpp.model-4",
+      { "model-4", "lpp.T.utc.Model.model.4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_utc_Model_model_5,
-      { "model-5", "lpp.model-5",
+      { "model-5", "lpp.T.utc.Model.model.5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_gps,
-      { "gps", "lpp.gps",
+      { "gps", "lpp.T.gnss.ids.gps",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_sbas,
-      { "sbas", "lpp.sbas",
+      { "sbas", "lpp.T.gnss.ids.sbas",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_qzss,
-      { "qzss", "lpp.qzss",
+      { "qzss", "lpp.T.gnss.ids.qzss",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_galileo,
-      { "galileo", "lpp.galileo",
+      { "galileo", "lpp.T.gnss.ids.galileo",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_glonass,
-      { "glonass", "lpp.glonass",
+      { "glonass", "lpp.T.gnss.ids.glonass",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_gnss_ids_bds,
-      { "bds", "lpp.bds",
+      { "bds", "lpp.T.gnss.ids.bds",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lpp_T_sbas_IDs_waas,
-      { "waas", "lpp.waas",
+      { "waas", "lpp.T.sbas.IDs.waas",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_sbas_IDs_egnos,
-      { "egnos", "lpp.egnos",
+      { "egnos", "lpp.T.sbas.IDs.egnos",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_sbas_IDs_msas,
-      { "msas", "lpp.msas",
+      { "msas", "lpp.T.sbas.IDs.msas",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_sbas_IDs_gagan,
-      { "gagan", "lpp.gagan",
+      { "gagan", "lpp.T.sbas.IDs.gagan",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_rsrpReq,
-      { "rsrpReq", "lpp.rsrpReq",
+      { "rsrpReq", "lpp.T.requestedMeasurements.rsrpReq",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_rsrqReq,
-      { "rsrqReq", "lpp.rsrqReq",
+      { "rsrqReq", "lpp.T.requestedMeasurements.rsrqReq",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_ueRxTxReq,
-      { "ueRxTxReq", "lpp.ueRxTxReq",
+      { "ueRxTxReq", "lpp.T.requestedMeasurements.ueRxTxReq",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_nrsrpReq_r14,
-      { "nrsrpReq-r14", "lpp.nrsrpReq-r14",
+      { "nrsrpReq-r14", "lpp.T.requestedMeasurements.nrsrpReq.r14",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_nrsrqReq_r14,
-      { "nrsrqReq-r14", "lpp.nrsrqReq-r14",
+      { "nrsrqReq-r14", "lpp.T.requestedMeasurements.nrsrqReq.r14",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_ecid_MeasSupported_rsrpSup,
-      { "rsrpSup", "lpp.rsrpSup",
+      { "rsrpSup", "lpp.T.ecid.MeasSupported.rsrpSup",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_ecid_MeasSupported_rsrqSup,
-      { "rsrqSup", "lpp.rsrqSup",
+      { "rsrqSup", "lpp.T.ecid.MeasSupported.rsrqSup",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_ecid_MeasSupported_ueRxTxSup,
-      { "ueRxTxSup", "lpp.ueRxTxSup",
+      { "ueRxTxSup", "lpp.T.ecid.MeasSupported.ueRxTxSup",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_ecid_MeasSupported_nrsrpSup_r14,
-      { "nrsrpSup-r14", "lpp.nrsrpSup-r14",
+      { "nrsrpSup-r14", "lpp.T.ecid.MeasSupported.nrsrpSup.r14",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_ecid_MeasSupported_nrsrqSup_r14,
-      { "nrsrqSup-r14", "lpp.nrsrqSup-r14",
+      { "nrsrqSup-r14", "lpp.T.ecid.MeasSupported.nrsrqSup.r14",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lpp_T_mbsRequestedMeasurements_r14_rssi,
-      { "rssi", "lpp.rssi",
+      { "rssi", "lpp.T.mbsRequestedMeasurements.r14.rssi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_tbs_Modes_r13_standalone,
-      { "standalone", "lpp.standalone",
+      { "standalone", "lpp.T.tbs.Modes.r13.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_tbs_Modes_r13_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.tbs.Modes.r13.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_tbs_Modes_r13_ue_based,
-      { "ue-based", "lpp.ue-based",
+      { "ue-based", "lpp.T.tbs.Modes.r13.ue.based",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_mbs_ConfigSupport_r14_tb1,
-      { "tb1", "lpp.tb1",
+      { "tb1", "lpp.T.mbs.ConfigSupport.r14.tb1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_mbs_ConfigSupport_r14_tb2,
-      { "tb2", "lpp.tb2",
+      { "tb2", "lpp.T.mbs.ConfigSupport.r14.tb2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_mbs_ConfigSupport_r14_tb3,
-      { "tb3", "lpp.tb3",
+      { "tb3", "lpp.T.mbs.ConfigSupport.r14.tb3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_mbs_ConfigSupport_r14_tb4,
-      { "tb4", "lpp.tb4",
+      { "tb4", "lpp.T.mbs.ConfigSupport.r14.tb4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lpp_T_sensor_Modes_r13_standalone,
-      { "standalone", "lpp.standalone",
+      { "standalone", "lpp.T.sensor.Modes.r13.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_sensor_Modes_r13_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.sensor.Modes.r13.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_sensor_Modes_r13_ue_based,
-      { "ue-based", "lpp.ue-based",
+      { "ue-based", "lpp.T.sensor.Modes.r13.ue.based",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_r13_rssi,
-      { "rssi", "lpp.rssi",
+      { "rssi", "lpp.T.requestedMeasurements.r13.rssi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_r13_rtt,
-      { "rtt", "lpp.rtt",
+      { "rtt", "lpp.T.requestedMeasurements.r13.rtt",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_Modes_r13_standalone,
-      { "standalone", "lpp.standalone",
+      { "standalone", "lpp.T.wlan.Modes.r13.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_Modes_r13_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.wlan.Modes.r13.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_Modes_r13_ue_based,
-      { "ue-based", "lpp.ue-based",
+      { "ue-based", "lpp.T.wlan.Modes.r13.ue.based",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_MeasSupported_r13_rssi_r13,
-      { "rssi-r13", "lpp.rssi-r13",
+      { "rssi-r13", "lpp.T.wlan.MeasSupported.r13.rssi.r13",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_MeasSupported_r13_rtt_r13,
-      { "rtt-r13", "lpp.rtt-r13",
+      { "rtt-r13", "lpp.T.wlan.MeasSupported.r13.rtt.r13",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_AP_AD_Supported_r14_ap_identifier,
-      { "ap-identifier", "lpp.ap-identifier",
+      { "ap-identifier", "lpp.T.wlan.AP.AD.Supported.r14.ap.identifier",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_wlan_AP_AD_Supported_r14_ap_location,
-      { "ap-location", "lpp.ap-location",
+      { "ap-location", "lpp.T.wlan.AP.AD.Supported.r14.ap.location",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_requestedAD_r14_ap_identifier,
-      { "ap-identifier", "lpp.ap-identifier",
+      { "ap-identifier", "lpp.T.requestedAD.r14.ap.identifier",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_requestedAD_r14_ap_location,
-      { "ap-location", "lpp.ap-location",
+      { "ap-location", "lpp.T.requestedAD.r14.ap.location",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_requestedMeasurements_r13_01_rssi,
-      { "rssi", "lpp.rssi",
+      { "rssi", "lpp.T.requestedMeasurements.r13.01.rssi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_bt_Modes_r13_standalone,
-      { "standalone", "lpp.standalone",
+      { "standalone", "lpp.T.bt.Modes.r13.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lpp_T_bt_Modes_r13_ue_assisted,
-      { "ue-assisted", "lpp.ue-assisted",
+      { "ue-assisted", "lpp.T.bt.Modes.r13.ue.assisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lpp_T_bt_MeasSupported_r13_rssi_r13,
-      { "rssi-r13", "lpp.rssi-r13",
+      { "rssi-r13", "lpp.T.bt.MeasSupported.r13.rssi.r13",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c
index 7b5d4959ee..2757ac72a8 100644
--- a/epan/dissectors/packet-lppe.c
+++ b/epan/dissectors/packet-lppe.c
@@ -21207,1039 +21207,1039 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_FixedAccessTypes_cable,
-      { "cable", "lppe.cable",
+      { "cable", "lppe.OMA.LPPe.FixedAccessTypes.cable",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_FixedAccessTypes_dsl,
-      { "dsl", "lppe.dsl",
+      { "dsl", "lppe.OMA.LPPe.FixedAccessTypes.dsl",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_FixedAccessTypes_lan,
-      { "lan", "lppe.lan",
+      { "lan", "lppe.OMA.LPPe.FixedAccessTypes.lan",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_FixedAccessTypes_pstn,
-      { "pstn", "lppe.pstn",
+      { "pstn", "lppe.OMA.LPPe.FixedAccessTypes.pstn",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_FixedAccessTypes_other,
-      { "other", "lppe.other",
+      { "other", "lppe.OMA.LPPe.FixedAccessTypes.other",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_gsm,
-      { "gsm", "lppe.gsm",
+      { "gsm", "lppe.OMA.LPPe.WirelessAccessTypes.gsm",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_utra,
-      { "utra", "lppe.utra",
+      { "utra", "lppe.OMA.LPPe.WirelessAccessTypes.utra",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_lte,
-      { "lte", "lppe.lte",
+      { "lte", "lppe.OMA.LPPe.WirelessAccessTypes.lte",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_wimax,
-      { "wimax", "lppe.wimax",
+      { "wimax", "lppe.OMA.LPPe.WirelessAccessTypes.wimax",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_wifi,
-      { "wifi", "lppe.wifi",
+      { "wifi", "lppe.OMA.LPPe.WirelessAccessTypes.wifi",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WirelessAccessTypes_other,
-      { "other", "lppe.other",
+      { "other", "lppe.OMA.LPPe.WirelessAccessTypes.other",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11a,
-      { "ieee802-11a", "lppe.ieee802-11a",
+      { "ieee802-11a", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11a",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11b,
-      { "ieee802-11b", "lppe.ieee802-11b",
+      { "ieee802-11b", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11b",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11g,
-      { "ieee802-11g", "lppe.ieee802-11g",
+      { "ieee802-11g", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11g",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11n,
-      { "ieee802-11n", "lppe.ieee802-11n",
+      { "ieee802-11n", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11n",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11ac,
-      { "ieee802-11ac", "lppe.ieee802-11ac",
+      { "ieee802-11ac", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11ac",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11ad,
-      { "ieee802-11ad", "lppe.ieee802-11ad",
+      { "ieee802-11ad", "lppe.OMA.LPPe.WLAN.AP.Type.List.ieee802.11ad",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_iP_Address_support_iPv4,
-      { "iPv4", "lppe.iPv4",
+      { "iPv4", "lppe.T.iP.Address.support.iPv4",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_iP_Address_support_iPv6,
-      { "iPv6", "lppe.iPv6",
+      { "iPv6", "lppe.T.iP.Address.support.iPv6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_iP_Address_support_nat,
-      { "nat", "lppe.nat",
+      { "nat", "lppe.T.iP.Address.support.nat",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_HighAccuracyFormatCapabilities_hAposition,
-      { "hAposition", "lppe.hAposition",
+      { "hAposition", "lppe.OMA.LPPe.HighAccuracyFormatCapabilities.hAposition",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_HighAccuracyFormatCapabilities_hAvelocity,
-      { "hAvelocity", "lppe.hAvelocity",
+      { "hAvelocity", "lppe.OMA.LPPe.HighAccuracyFormatCapabilities.hAvelocity",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_relativeLocationReportingSupport_geo,
-      { "geo", "lppe.geo",
+      { "geo", "lppe.T.relativeLocationReportingSupport.geo",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_relativeLocationReportingSupport_civic,
-      { "civic", "lppe.civic",
+      { "civic", "lppe.T.relativeLocationReportingSupport.civic",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_relativeLocationReportingSupport_otherProviders,
-      { "otherProviders", "lppe.otherProviders",
+      { "otherProviders", "lppe.T.relativeLocationReportingSupport.otherProviders",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ionoreq_klobucharModel,
-      { "klobucharModel", "lppe.klobucharModel",
+      { "klobucharModel", "lppe.T.ionoreq.klobucharModel",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ionoreq_ionoStormWarning,
-      { "ionoStormWarning", "lppe.ionoStormWarning",
+      { "ionoStormWarning", "lppe.T.ionoreq.ionoStormWarning",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_troposphereModelReq_delay,
-      { "delay", "lppe.delay",
+      { "delay", "lppe.T.troposphereModelReq.delay",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_troposphereModelReq_surface,
-      { "surface", "lppe.surface",
+      { "surface", "lppe.T.troposphereModelReq.surface",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ionosphereMeasurementsReq_tecPerSV,
-      { "tecPerSV", "lppe.tecPerSV",
+      { "tecPerSV", "lppe.T.ionosphereMeasurementsReq.tecPerSV",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ionosphereMeasurementsReq_zenithTEC,
-      { "zenithTEC", "lppe.zenithTEC",
+      { "zenithTEC", "lppe.T.ionosphereMeasurementsReq.zenithTEC",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ionosphereMeasurementSupport_tecPerSVsupport,
-      { "tecPerSVsupport", "lppe.tecPerSVsupport",
+      { "tecPerSVsupport", "lppe.T.ionosphereMeasurementSupport.tecPerSVsupport",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ionosphereMeasurementSupport_zenithTecSupport,
-      { "zenithTecSupport", "lppe.zenithTecSupport",
+      { "zenithTecSupport", "lppe.T.ionosphereMeasurementSupport.zenithTecSupport",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ionoModel_localKlobuchar,
-      { "localKlobuchar", "lppe.localKlobuchar",
+      { "localKlobuchar", "lppe.T.ionoModel.localKlobuchar",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ionoModel_ionoStormWarning,
-      { "ionoStormWarning", "lppe.ionoStormWarning",
+      { "ionoStormWarning", "lppe.T.ionoModel.ionoStormWarning",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ionoModel_wideAreaIonoSurface,
-      { "wideAreaIonoSurface", "lppe.wideAreaIonoSurface",
+      { "wideAreaIonoSurface", "lppe.T.ionoModel.wideAreaIonoSurface",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_tropoModel_localTroposphereDelay,
-      { "localTroposphereDelay", "lppe.localTroposphereDelay",
+      { "localTroposphereDelay", "lppe.T.tropoModel.localTroposphereDelay",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_tropoModel_surfaceParameters,
-      { "surfaceParameters", "lppe.surfaceParameters",
+      { "surfaceParameters", "lppe.T.tropoModel.surfaceParameters",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_modeSupport_ueBased,
-      { "ueBased", "lppe.ueBased",
+      { "ueBased", "lppe.T.modeSupport.ueBased",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_modeSupport_ueAssisted,
-      { "ueAssisted", "lppe.ueAssisted",
+      { "ueAssisted", "lppe.T.modeSupport.ueAssisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_haGNSSantennaInformationSupport_antennaDescriptionSupported,
-      { "antennaDescriptionSupported", "lppe.antennaDescriptionSupported",
+      { "antennaDescriptionSupported", "lppe.T.haGNSSantennaInformationSupport.antennaDescriptionSupported",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_haGNSSantennaInformationSupport_antennaOrientationSupported,
-      { "antennaOrientationSupported", "lppe.antennaOrientationSupported",
+      { "antennaOrientationSupported", "lppe.T.haGNSSantennaInformationSupport.antennaOrientationSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedCells_eNBs,
-      { "eNBs", "lppe.eNBs",
+      { "eNBs", "lppe.T.requestedCells.eNBs",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedCells_heNBs,
-      { "heNBs", "lppe.heNBs",
+      { "heNBs", "lppe.T.requestedCells.heNBs",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_eotdAssistanceReq_ueAssisted,
-      { "ueAssisted", "lppe.ueAssisted",
+      { "ueAssisted", "lppe.T.eotdAssistanceReq.ueAssisted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_eotdAssistanceReq_ueBased,
-      { "ueBased", "lppe.ueBased",
+      { "ueBased", "lppe.T.eotdAssistanceReq.ueBased",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_eotdSupport_ueBased,
-      { "ueBased", "lppe.ueBased",
+      { "ueBased", "lppe.T.eotdSupport.ueBased",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_eotdSupport_ueAssisted,
-      { "ueAssisted", "lppe.ueAssisted",
+      { "ueAssisted", "lppe.T.eotdSupport.ueAssisted",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_otdoaUtraAssistanceReq_ueAssisted,
-      { "ueAssisted", "lppe.ueAssisted",
+      { "ueAssisted", "lppe.T.otdoaUtraAssistanceReq.ueAssisted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_otdoaUtraAssistanceReq_ueBased,
-      { "ueBased", "lppe.ueBased",
+      { "ueBased", "lppe.T.otdoaUtraAssistanceReq.ueBased",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.eNBrequestedAD.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.eNBrequestedAD.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.eNBrequestedAD.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_antennaPortConfig,
-      { "antennaPortConfig", "lppe.antennaPortConfig",
+      { "antennaPortConfig", "lppe.T.eNBrequestedAD.antennaPortConfig",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.eNBrequestedAD.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.eNBrequestedAD.beam.width",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.eNBrequestedAD.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.eNBrequestedAD.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_eNBrequestedAD_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.eNBrequestedAD.non.serving",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.heNBrequestedAD.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.heNBrequestedAD.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.heNBrequestedAD.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.heNBrequestedAD.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_antennaPortConfig,
-      { "antennaPortConfig", "lppe.antennaPortConfig",
+      { "antennaPortConfig", "lppe.T.heNBrequestedAD.antennaPortConfig",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.heNBrequestedAD.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.heNBrequestedAD.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_heNBrequestedAD_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.heNBrequestedAD.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_rsrp,
-      { "rsrp", "lppe.rsrp",
+      { "rsrp", "lppe.T.requestedMeasurements.rsrp",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_rsrq,
-      { "rsrq", "lppe.rsrq",
+      { "rsrq", "lppe.T.requestedMeasurements.rsrq",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_ueRxTx,
-      { "ueRxTx", "lppe.ueRxTx",
+      { "ueRxTx", "lppe.T.requestedMeasurements.ueRxTx",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedMeasurements.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.requestedMeasurements.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_MeasSupported_rsrp,
-      { "rsrp", "lppe.rsrp",
+      { "rsrp", "lppe.T.ecid.lte.MeasSupported.rsrp",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_MeasSupported_rsrq,
-      { "rsrq", "lppe.rsrq",
+      { "rsrq", "lppe.T.ecid.lte.MeasSupported.rsrq",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_MeasSupported_ueRxTx,
-      { "ueRxTx", "lppe.ueRxTx",
+      { "ueRxTx", "lppe.T.ecid.lte.MeasSupported.ueRxTx",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_MeasSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.lte.MeasSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_MeasSupported_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.ecid.lte.MeasSupported.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.ecid.lte.eNodeB.ADSupported.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.ecid.lte.eNodeB.ADSupported.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.ecid.lte.eNodeB.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_antennaPortConfig,
-      { "antennaPortConfig", "lppe.antennaPortConfig",
+      { "antennaPortConfig", "lppe.T.ecid.lte.eNodeB.ADSupported.antennaPortConfig",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.ecid.lte.eNodeB.ADSupported.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.ecid.lte.eNodeB.ADSupported.beam.width",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.ecid.lte.eNodeB.ADSupported.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.ecid.lte.eNodeB.ADSupported.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.lte.eNodeB.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.ecid.utra.HeNB.ADSupported.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.ecid.utra.HeNB.ADSupported.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.ecid.utra.HeNB.ADSupported.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.ecid.utra.HeNB.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_antennaPortConfig,
-      { "antennaPortConfig", "lppe.antennaPortConfig",
+      { "antennaPortConfig", "lppe.T.ecid.utra.HeNB.ADSupported.antennaPortConfig",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.ecid.utra.HeNB.ADSupported.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.ecid.utra.HeNB.ADSupported.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HeNB_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.utra.HeNB.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.requestedAD.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.requestedAD.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.requestedAD.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.requestedAD.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.requestedAD.beam.width",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.requestedAD.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.requestedAD.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedAD.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_01_rxLevel,
-      { "rxLevel", "lppe.rxLevel",
+      { "rxLevel", "lppe.T.requestedMeasurements.01.rxLevel",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_01_tA,
-      { "tA", "lppe.tA",
+      { "tA", "lppe.T.requestedMeasurements.01.tA",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_01_nMR_GERAN,
-      { "nMR-GERAN", "lppe.nMR-GERAN",
+      { "nMR-GERAN", "lppe.T.requestedMeasurements.01.nMR.GERAN",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_01_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedMeasurements.01.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_01_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.requestedMeasurements.01.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_MeasSupported_rxLevel,
-      { "rxLevel", "lppe.rxLevel",
+      { "rxLevel", "lppe.T.ecid.gsm.MeasSupported.rxLevel",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_MeasSupported_tA,
-      { "tA", "lppe.tA",
+      { "tA", "lppe.T.ecid.gsm.MeasSupported.tA",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_MeasSupported_nMR_GERAN,
-      { "nMR-GERAN", "lppe.nMR-GERAN",
+      { "nMR-GERAN", "lppe.T.ecid.gsm.MeasSupported.nMR.GERAN",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_MeasSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.gsm.MeasSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_MeasSupported_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.ecid.gsm.MeasSupported.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.ecid.gsm.ADSupported.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.ecid.gsm.ADSupported.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.ecid.gsm.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.ecid.gsm.ADSupported.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.ecid.gsm.ADSupported.beam.width",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.ecid.gsm.ADSupported.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.ecid.gsm.ADSupported.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_gsm_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.gsm.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.nBrequestedAD.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.nBrequestedAD.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.nBrequestedAD.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.nBrequestedAD.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.nBrequestedAD.beam.width",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.nBrequestedAD.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.nBrequestedAD.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_nBrequestedAD_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.nBrequestedAD.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.hNBrequestedAD.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.hNBrequestedAD.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.hNBrequestedAD.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.hNBrequestedAD.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.hNBrequestedAD.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.hNBrequestedAD.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_hNBrequestedAD_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.hNBrequestedAD.non.serving",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_measuredResultsList,
-      { "measuredResultsList", "lppe.measuredResultsList",
+      { "measuredResultsList", "lppe.T.requestedMeasurements.02.measuredResultsList",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_tdd_timingAdvance,
-      { "tdd-timingAdvance", "lppe.tdd-timingAdvance",
+      { "tdd-timingAdvance", "lppe.T.requestedMeasurements.02.tdd.timingAdvance",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_utra_CarrierRSSI,
-      { "mRL-utra-CarrierRSSI", "lppe.mRL-utra-CarrierRSSI",
+      { "mRL-utra-CarrierRSSI", "lppe.T.requestedMeasurements.02.mRL.utra.CarrierRSSI",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_FDD_cpich_Ec_N0,
-      { "mRL-FDD-cpich-Ec-N0", "lppe.mRL-FDD-cpich-Ec-N0",
+      { "mRL-FDD-cpich-Ec-N0", "lppe.T.requestedMeasurements.02.mRL.FDD.cpich.Ec.N0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_FDD_cpich_RSCP,
-      { "mRL-FDD-cpich-RSCP", "lppe.mRL-FDD-cpich-RSCP",
+      { "mRL-FDD-cpich-RSCP", "lppe.T.requestedMeasurements.02.mRL.FDD.cpich.RSCP",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_FDD_pathloss,
-      { "mRL-FDD-pathloss", "lppe.mRL-FDD-pathloss",
+      { "mRL-FDD-pathloss", "lppe.T.requestedMeasurements.02.mRL.FDD.pathloss",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_TDD_primaryCCPCH_RSCP,
-      { "mRL-TDD-primaryCCPCH-RSCP", "lppe.mRL-TDD-primaryCCPCH-RSCP",
+      { "mRL-TDD-primaryCCPCH-RSCP", "lppe.T.requestedMeasurements.02.mRL.TDD.primaryCCPCH.RSCP",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_mRL_TDD_pathloss,
-      { "mRL-TDD-pathloss", "lppe.mRL-TDD-pathloss",
+      { "mRL-TDD-pathloss", "lppe.T.requestedMeasurements.02.mRL.TDD.pathloss",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedMeasurements.02.non.serving",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_02_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.requestedMeasurements.02.historic",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_measuredResultsList,
-      { "measuredResultsList", "lppe.measuredResultsList",
+      { "measuredResultsList", "lppe.T.ecid.utra.MeasSupported.measuredResultsList",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_tdd_timingAdvance,
-      { "tdd-timingAdvance", "lppe.tdd-timingAdvance",
+      { "tdd-timingAdvance", "lppe.T.ecid.utra.MeasSupported.tdd.timingAdvance",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_utra_CarrierRSSI,
-      { "mRL-utra-CarrierRSSI", "lppe.mRL-utra-CarrierRSSI",
+      { "mRL-utra-CarrierRSSI", "lppe.T.ecid.utra.MeasSupported.mRL.utra.CarrierRSSI",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_FDD_cpich_Ec_N0,
-      { "mRL-FDD-cpich-Ec-N0", "lppe.mRL-FDD-cpich-Ec-N0",
+      { "mRL-FDD-cpich-Ec-N0", "lppe.T.ecid.utra.MeasSupported.mRL.FDD.cpich.Ec.N0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_FDD_cpich_RSCP,
-      { "mRL-FDD-cpich-RSCP", "lppe.mRL-FDD-cpich-RSCP",
+      { "mRL-FDD-cpich-RSCP", "lppe.T.ecid.utra.MeasSupported.mRL.FDD.cpich.RSCP",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_FDD_pathloss,
-      { "mRL-FDD-pathloss", "lppe.mRL-FDD-pathloss",
+      { "mRL-FDD-pathloss", "lppe.T.ecid.utra.MeasSupported.mRL.FDD.pathloss",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_TDD_primaryCCPCH_RSCP,
-      { "mRL-TDD-primaryCCPCH-RSCP", "lppe.mRL-TDD-primaryCCPCH-RSCP",
+      { "mRL-TDD-primaryCCPCH-RSCP", "lppe.T.ecid.utra.MeasSupported.mRL.TDD.primaryCCPCH.RSCP",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_mRL_TDD_pathloss,
-      { "mRL-TDD-pathloss", "lppe.mRL-TDD-pathloss",
+      { "mRL-TDD-pathloss", "lppe.T.ecid.utra.MeasSupported.mRL.TDD.pathloss",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.utra.MeasSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_MeasSupported_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.ecid.utra.MeasSupported.historic",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.ecid.utra.nodeB.ADSupported.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.ecid.utra.nodeB.ADSupported.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.ecid.utra.nodeB.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.ecid.utra.nodeB.ADSupported.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_beam_width,
-      { "beam-width", "lppe.beam-width",
+      { "beam-width", "lppe.T.ecid.utra.nodeB.ADSupported.beam.width",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_transmit_direction,
-      { "transmit-direction", "lppe.transmit-direction",
+      { "transmit-direction", "lppe.T.ecid.utra.nodeB.ADSupported.transmit.direction",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.ecid.utra.nodeB.ADSupported.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_nodeB_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.utra.nodeB.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_bslist,
-      { "bslist", "lppe.bslist",
+      { "bslist", "lppe.T.ecid.utra.HNB.ADSupported.bslist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_bslocation,
-      { "bslocation", "lppe.bslocation",
+      { "bslocation", "lppe.T.ecid.utra.HNB.ADSupported.bslocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.ecid.utra.HNB.ADSupported.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.ecid.utra.HNB.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_frequency_accuracy,
-      { "frequency-accuracy", "lppe.frequency-accuracy",
+      { "frequency-accuracy", "lppe.T.ecid.utra.HNB.ADSupported.frequency.accuracy",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.ecid.utra.HNB.ADSupported.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_utra_HNB_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.utra.HNB.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_aplist,
-      { "aplist", "lppe.aplist",
+      { "aplist", "lppe.T.requestedAD.01.aplist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_aplocation,
-      { "aplocation", "lppe.aplocation",
+      { "aplocation", "lppe.T.requestedAD.01.aplocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.requestedAD.01.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.requestedAD.01.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.requestedAD.01.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.requestedAD.01.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedAD_01_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedAD.01.non.serving",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apSSID,
-      { "apSSID", "lppe.apSSID",
+      { "apSSID", "lppe.T.requestedMeasurements.03.apSSID",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apSN,
-      { "apSN", "lppe.apSN",
+      { "apSN", "lppe.T.requestedMeasurements.03.apSN",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apDevType,
-      { "apDevType", "lppe.apDevType",
+      { "apDevType", "lppe.T.requestedMeasurements.03.apDevType",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apPhyType,
-      { "apPhyType", "lppe.apPhyType",
+      { "apPhyType", "lppe.T.requestedMeasurements.03.apPhyType",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apRSSI,
-      { "apRSSI", "lppe.apRSSI",
+      { "apRSSI", "lppe.T.requestedMeasurements.03.apRSSI",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apChanFreq,
-      { "apChanFreq", "lppe.apChanFreq",
+      { "apChanFreq", "lppe.T.requestedMeasurements.03.apChanFreq",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apRTD,
-      { "apRTD", "lppe.apRTD",
+      { "apRTD", "lppe.T.requestedMeasurements.03.apRTD",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_ueTP,
-      { "ueTP", "lppe.ueTP",
+      { "ueTP", "lppe.T.requestedMeasurements.03.ueTP",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_ueAG,
-      { "ueAG", "lppe.ueAG",
+      { "ueAG", "lppe.T.requestedMeasurements.03.ueAG",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apRepLoc,
-      { "apRepLoc", "lppe.apRepLoc",
+      { "apRepLoc", "lppe.T.requestedMeasurements.03.apRepLoc",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedMeasurements.03.non.serving",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.requestedMeasurements.03.historic",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apTP,
-      { "apTP", "lppe.apTP",
+      { "apTP", "lppe.T.requestedMeasurements.03.apTP",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_apAG,
-      { "apAG", "lppe.apAG",
+      { "apAG", "lppe.T.requestedMeasurements.03.apAG",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_ueSN,
-      { "ueSN", "lppe.ueSN",
+      { "ueSN", "lppe.T.requestedMeasurements.03.ueSN",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_03_ueRSSI,
-      { "ueRSSI", "lppe.ueRSSI",
+      { "ueRSSI", "lppe.T.requestedMeasurements.03.ueRSSI",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_additionalRequestedMeasurements_oc,
-      { "oc", "lppe.oc",
+      { "oc", "lppe.T.additionalRequestedMeasurements.oc",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_additionalRequestedMeasurements_ueMacAddr,
-      { "ueMacAddr", "lppe.ueMacAddr",
+      { "ueMacAddr", "lppe.T.additionalRequestedMeasurements.ueMacAddr",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apSSID,
-      { "apSSID", "lppe.apSSID",
+      { "apSSID", "lppe.T.wlan.ecid.MeasSupported.apSSID",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apSN,
-      { "apSN", "lppe.apSN",
+      { "apSN", "lppe.T.wlan.ecid.MeasSupported.apSN",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apDevType,
-      { "apDevType", "lppe.apDevType",
+      { "apDevType", "lppe.T.wlan.ecid.MeasSupported.apDevType",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apPhyType,
-      { "apPhyType", "lppe.apPhyType",
+      { "apPhyType", "lppe.T.wlan.ecid.MeasSupported.apPhyType",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apRSSI,
-      { "apRSSI", "lppe.apRSSI",
+      { "apRSSI", "lppe.T.wlan.ecid.MeasSupported.apRSSI",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apChanFreq,
-      { "apChanFreq", "lppe.apChanFreq",
+      { "apChanFreq", "lppe.T.wlan.ecid.MeasSupported.apChanFreq",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apRTD,
-      { "apRTD", "lppe.apRTD",
+      { "apRTD", "lppe.T.wlan.ecid.MeasSupported.apRTD",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_ueTP,
-      { "ueTP", "lppe.ueTP",
+      { "ueTP", "lppe.T.wlan.ecid.MeasSupported.ueTP",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_ueAG,
-      { "ueAG", "lppe.ueAG",
+      { "ueAG", "lppe.T.wlan.ecid.MeasSupported.ueAG",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apRepLoc,
-      { "apRepLoc", "lppe.apRepLoc",
+      { "apRepLoc", "lppe.T.wlan.ecid.MeasSupported.apRepLoc",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.wlan.ecid.MeasSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.wlan.ecid.MeasSupported.historic",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apTP,
-      { "apTP", "lppe.apTP",
+      { "apTP", "lppe.T.wlan.ecid.MeasSupported.apTP",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_apAG,
-      { "apAG", "lppe.apAG",
+      { "apAG", "lppe.T.wlan.ecid.MeasSupported.apAG",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_ueSN,
-      { "ueSN", "lppe.ueSN",
+      { "ueSN", "lppe.T.wlan.ecid.MeasSupported.ueSN",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ecid_MeasSupported_ueRSSI,
-      { "ueRSSI", "lppe.ueRSSI",
+      { "ueRSSI", "lppe.T.wlan.ecid.MeasSupported.ueRSSI",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_aplist,
-      { "aplist", "lppe.aplist",
+      { "aplist", "lppe.T.wlan.ap.ADSupported.aplist",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_aplocation,
-      { "aplocation", "lppe.aplocation",
+      { "aplocation", "lppe.T.wlan.ap.ADSupported.aplocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_locationreliability,
-      { "locationreliability", "lppe.locationreliability",
+      { "locationreliability", "lppe.T.wlan.ap.ADSupported.locationreliability",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_transmit_power,
-      { "transmit-power", "lppe.transmit-power",
+      { "transmit-power", "lppe.T.wlan.ap.ADSupported.transmit.power",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_antenna_gain,
-      { "antenna-gain", "lppe.antenna-gain",
+      { "antenna-gain", "lppe.T.wlan.ap.ADSupported.antenna.gain",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_coveragearea,
-      { "coveragearea", "lppe.coveragearea",
+      { "coveragearea", "lppe.T.wlan.ap.ADSupported.coveragearea",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_wlan_ap_ADSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.wlan.ap.ADSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_additional_wlan_ecid_MeasSupported_oc,
-      { "oc", "lppe.oc",
+      { "oc", "lppe.T.additional.wlan.ecid.MeasSupported.oc",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_additional_wlan_ecid_MeasSupported_ueMacAddr,
-      { "ueMacAddr", "lppe.ueMacAddr",
+      { "ueMacAddr", "lppe.T.additional.wlan.ecid.MeasSupported.ueMacAddr",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_rTD,
-      { "rTD", "lppe.rTD",
+      { "rTD", "lppe.T.requestedMeasurements.04.rTD",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_rTDstd,
-      { "rTDstd", "lppe.rTDstd",
+      { "rTDstd", "lppe.T.requestedMeasurements.04.rTDstd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMR,
-      { "nMR", "lppe.nMR",
+      { "nMR", "lppe.T.requestedMeasurements.04.nMR",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRrelDelay,
-      { "nMRrelDelay", "lppe.nMRrelDelay",
+      { "nMRrelDelay", "lppe.T.requestedMeasurements.04.nMRrelDelay",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRrelDelaystd,
-      { "nMRrelDelaystd", "lppe.nMRrelDelaystd",
+      { "nMRrelDelaystd", "lppe.T.requestedMeasurements.04.nMRrelDelaystd",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRrSSI,
-      { "nMRrSSI", "lppe.nMRrSSI",
+      { "nMRrSSI", "lppe.T.requestedMeasurements.04.nMRrSSI",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRrSSIstd,
-      { "nMRrSSIstd", "lppe.nMRrSSIstd",
+      { "nMRrSSIstd", "lppe.T.requestedMeasurements.04.nMRrSSIstd",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRbSTxPower,
-      { "nMRbSTxPower", "lppe.nMRbSTxPower",
+      { "nMRbSTxPower", "lppe.T.requestedMeasurements.04.nMRbSTxPower",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRcINR,
-      { "nMRcINR", "lppe.nMRcINR",
+      { "nMRcINR", "lppe.T.requestedMeasurements.04.nMRcINR",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRcINRstd,
-      { "nMRcINRstd", "lppe.nMRcINRstd",
+      { "nMRcINRstd", "lppe.T.requestedMeasurements.04.nMRcINRstd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_nMRbSLocation,
-      { "nMRbSLocation", "lppe.nMRbSLocation",
+      { "nMRbSLocation", "lppe.T.requestedMeasurements.04.nMRbSLocation",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.requestedMeasurements.04.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_requestedMeasurements_04_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.requestedMeasurements.04.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_rTD,
-      { "rTD", "lppe.rTD",
+      { "rTD", "lppe.T.ecid.wimax.MeasSupported.rTD",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_rTDstd,
-      { "rTDstd", "lppe.rTDstd",
+      { "rTDstd", "lppe.T.ecid.wimax.MeasSupported.rTDstd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMR,
-      { "nMR", "lppe.nMR",
+      { "nMR", "lppe.T.ecid.wimax.MeasSupported.nMR",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRrelDelay,
-      { "nMRrelDelay", "lppe.nMRrelDelay",
+      { "nMRrelDelay", "lppe.T.ecid.wimax.MeasSupported.nMRrelDelay",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRrelDelaystd,
-      { "nMRrelDelaystd", "lppe.nMRrelDelaystd",
+      { "nMRrelDelaystd", "lppe.T.ecid.wimax.MeasSupported.nMRrelDelaystd",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRrSSI,
-      { "nMRrSSI", "lppe.nMRrSSI",
+      { "nMRrSSI", "lppe.T.ecid.wimax.MeasSupported.nMRrSSI",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRrSSIstd,
-      { "nMRrSSIstd", "lppe.nMRrSSIstd",
+      { "nMRrSSIstd", "lppe.T.ecid.wimax.MeasSupported.nMRrSSIstd",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRbSTxPower,
-      { "nMRbSTxPower", "lppe.nMRbSTxPower",
+      { "nMRbSTxPower", "lppe.T.ecid.wimax.MeasSupported.nMRbSTxPower",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRcINR,
-      { "nMRcINR", "lppe.nMRcINR",
+      { "nMRcINR", "lppe.T.ecid.wimax.MeasSupported.nMRcINR",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRcINRstd,
-      { "nMRcINRstd", "lppe.nMRcINRstd",
+      { "nMRcINRstd", "lppe.T.ecid.wimax.MeasSupported.nMRcINRstd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_nMRbSLocation,
-      { "nMRbSLocation", "lppe.nMRbSLocation",
+      { "nMRbSLocation", "lppe.T.ecid.wimax.MeasSupported.nMRbSLocation",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_non_serving,
-      { "non-serving", "lppe.non-serving",
+      { "non-serving", "lppe.T.ecid.wimax.MeasSupported.non.serving",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_ecid_wimax_MeasSupported_historic,
-      { "historic", "lppe.historic",
+      { "historic", "lppe.T.ecid.wimax.MeasSupported.historic",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_stationary,
-      { "stationary", "lppe.stationary",
+      { "stationary", "lppe.T.secondaryMotionState.stationary",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_pedestrian,
-      { "pedestrian", "lppe.pedestrian",
+      { "pedestrian", "lppe.T.secondaryMotionState.pedestrian",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_running,
-      { "running", "lppe.running",
+      { "running", "lppe.T.secondaryMotionState.running",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_cycling,
-      { "cycling", "lppe.cycling",
+      { "cycling", "lppe.T.secondaryMotionState.cycling",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_car,
-      { "car", "lppe.car",
+      { "car", "lppe.T.secondaryMotionState.car",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_train,
-      { "train", "lppe.train",
+      { "train", "lppe.T.secondaryMotionState.train",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_aeroplane,
-      { "aeroplane", "lppe.aeroplane",
+      { "aeroplane", "lppe.T.secondaryMotionState.aeroplane",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_boat,
-      { "boat", "lppe.boat",
+      { "boat", "lppe.T.secondaryMotionState.boat",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_lppe_T_secondaryMotionState_fidgeting,
-      { "fidgeting", "lppe.fidgeting",
+      { "fidgeting", "lppe.T.secondaryMotionState.fidgeting",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_supportedAssistanceData_srnGroup,
-      { "srnGroup", "lppe.srnGroup",
+      { "srnGroup", "lppe.T.supportedAssistanceData.srnGroup",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_supportedAssistanceData_antennaPattern,
-      { "antennaPattern", "lppe.antennaPattern",
+      { "antennaPattern", "lppe.T.supportedAssistanceData.antennaPattern",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_lppe_T_srnMeasurements_rssi,
-      { "rssi", "lppe.rssi",
+      { "rssi", "lppe.T.srnMeasurements.rssi",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_lppe_T_srnMeasurements_rtd,
-      { "rtd", "lppe.rtd",
+      { "rtd", "lppe.T.srnMeasurements.rtd",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index e4017452fa..8c31063a06 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -619,7 +619,7 @@ static int hf_mms_ParameterSupportOptions_vsca = -1;
 static int hf_mms_ParameterSupportOptions_tpy = -1;
 static int hf_mms_ParameterSupportOptions_vlis = -1;
 static int hf_mms_ParameterSupportOptions_real = -1;
-static int hf_mms_ParameterSupportOptions_spare_bit_9 = -1;
+static int hf_mms_ParameterSupportOptions_spare_bit9 = -1;
 static int hf_mms_ParameterSupportOptions_cei = -1;
 static int hf_mms_ServiceSupportOptions_status = -1;
 static int hf_mms_ServiceSupportOptions_getNameList = -1;
@@ -6864,7 +6864,7 @@ static const int * ParameterSupportOptions_bits[] = {
   &hf_mms_ParameterSupportOptions_tpy,
   &hf_mms_ParameterSupportOptions_vlis,
   &hf_mms_ParameterSupportOptions_real,
-  &hf_mms_ParameterSupportOptions_spare_bit_9,
+  &hf_mms_ParameterSupportOptions_spare_bit9,
   &hf_mms_ParameterSupportOptions_cei,
   NULL
 };
@@ -9444,415 +9444,415 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_mms_ParameterSupportOptions_str1,
-      { "str1", "mms.str1",
+      { "str1", "mms.ParameterSupportOptions.str1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_str2,
-      { "str2", "mms.str2",
+      { "str2", "mms.ParameterSupportOptions.str2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vnam,
-      { "vnam", "mms.vnam",
+      { "vnam", "mms.ParameterSupportOptions.vnam",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_valt,
-      { "valt", "mms.valt",
+      { "valt", "mms.ParameterSupportOptions.valt",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vadr,
-      { "vadr", "mms.vadr",
+      { "vadr", "mms.ParameterSupportOptions.vadr",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vsca,
-      { "vsca", "mms.vsca",
+      { "vsca", "mms.ParameterSupportOptions.vsca",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_tpy,
-      { "tpy", "mms.tpy",
+      { "tpy", "mms.ParameterSupportOptions.tpy",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vlis,
-      { "vlis", "mms.vlis",
+      { "vlis", "mms.ParameterSupportOptions.vlis",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_real,
-      { "real", "mms.real",
+      { "real", "mms.ParameterSupportOptions.real",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_mms_ParameterSupportOptions_spare_bit_9,
-      { "spare_bit_9", "mms.spare_bit_9",
+    { &hf_mms_ParameterSupportOptions_spare_bit9,
+      { "spare_bit9", "mms.ParameterSupportOptions.spare.bit9",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_cei,
-      { "cei", "mms.cei",
+      { "cei", "mms.ParameterSupportOptions.cei",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_status,
-      { "status", "mms.status",
+      { "status", "mms.ServiceSupportOptions.status",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNameList,
-      { "getNameList", "mms.getNameList",
+      { "getNameList", "mms.ServiceSupportOptions.getNameList",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_identify,
-      { "identify", "mms.identify",
+      { "identify", "mms.ServiceSupportOptions.identify",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_rename,
-      { "rename", "mms.rename",
+      { "rename", "mms.ServiceSupportOptions.rename",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_read,
-      { "read", "mms.read",
+      { "read", "mms.ServiceSupportOptions.read",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_write,
-      { "write", "mms.write",
+      { "write", "mms.ServiceSupportOptions.write",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getVariableAccessAttributes,
-      { "getVariableAccessAttributes", "mms.getVariableAccessAttributes",
+      { "getVariableAccessAttributes", "mms.ServiceSupportOptions.getVariableAccessAttributes",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedVariable,
-      { "defineNamedVariable", "mms.defineNamedVariable",
+      { "defineNamedVariable", "mms.ServiceSupportOptions.defineNamedVariable",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineScatteredAccess,
-      { "defineScatteredAccess", "mms.defineScatteredAccess",
+      { "defineScatteredAccess", "mms.ServiceSupportOptions.defineScatteredAccess",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getScatteredAccessAttributes,
-      { "getScatteredAccessAttributes", "mms.getScatteredAccessAttributes",
+      { "getScatteredAccessAttributes", "mms.ServiceSupportOptions.getScatteredAccessAttributes",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteVariableAccess,
-      { "deleteVariableAccess", "mms.deleteVariableAccess",
+      { "deleteVariableAccess", "mms.ServiceSupportOptions.deleteVariableAccess",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedVariableList,
-      { "defineNamedVariableList", "mms.defineNamedVariableList",
+      { "defineNamedVariableList", "mms.ServiceSupportOptions.defineNamedVariableList",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNamedVariableListAttributes,
-      { "getNamedVariableListAttributes", "mms.getNamedVariableListAttributes",
+      { "getNamedVariableListAttributes", "mms.ServiceSupportOptions.getNamedVariableListAttributes",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteNamedVariableList,
-      { "deleteNamedVariableList", "mms.deleteNamedVariableList",
+      { "deleteNamedVariableList", "mms.ServiceSupportOptions.deleteNamedVariableList",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedType,
-      { "defineNamedType", "mms.defineNamedType",
+      { "defineNamedType", "mms.ServiceSupportOptions.defineNamedType",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNamedTypeAttributes,
-      { "getNamedTypeAttributes", "mms.getNamedTypeAttributes",
+      { "getNamedTypeAttributes", "mms.ServiceSupportOptions.getNamedTypeAttributes",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteNamedType,
-      { "deleteNamedType", "mms.deleteNamedType",
+      { "deleteNamedType", "mms.ServiceSupportOptions.deleteNamedType",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_input,
-      { "input", "mms.input",
+      { "input", "mms.ServiceSupportOptions.input",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_output,
-      { "output", "mms.output",
+      { "output", "mms.ServiceSupportOptions.output",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_takeControl,
-      { "takeControl", "mms.takeControl",
+      { "takeControl", "mms.ServiceSupportOptions.takeControl",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_relinquishControl,
-      { "relinquishControl", "mms.relinquishControl",
+      { "relinquishControl", "mms.ServiceSupportOptions.relinquishControl",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineSemaphore,
-      { "defineSemaphore", "mms.defineSemaphore",
+      { "defineSemaphore", "mms.ServiceSupportOptions.defineSemaphore",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteSemaphore,
-      { "deleteSemaphore", "mms.deleteSemaphore",
+      { "deleteSemaphore", "mms.ServiceSupportOptions.deleteSemaphore",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportSemaphoreStatus,
-      { "reportSemaphoreStatus", "mms.reportSemaphoreStatus",
+      { "reportSemaphoreStatus", "mms.ServiceSupportOptions.reportSemaphoreStatus",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportPoolSemaphoreStatus,
-      { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus",
+      { "reportPoolSemaphoreStatus", "mms.ServiceSupportOptions.reportPoolSemaphoreStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportSemaphoreEntryStatus,
-      { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus",
+      { "reportSemaphoreEntryStatus", "mms.ServiceSupportOptions.reportSemaphoreEntryStatus",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initiateDownloadSequence,
-      { "initiateDownloadSequence", "mms.initiateDownloadSequence",
+      { "initiateDownloadSequence", "mms.ServiceSupportOptions.initiateDownloadSequence",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_downloadSegment,
-      { "downloadSegment", "mms.downloadSegment",
+      { "downloadSegment", "mms.ServiceSupportOptions.downloadSegment",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_terminateDownloadSequence,
-      { "terminateDownloadSequence", "mms.terminateDownloadSequence",
+      { "terminateDownloadSequence", "mms.ServiceSupportOptions.terminateDownloadSequence",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initiateUploadSequence,
-      { "initiateUploadSequence", "mms.initiateUploadSequence",
+      { "initiateUploadSequence", "mms.ServiceSupportOptions.initiateUploadSequence",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_uploadSegment,
-      { "uploadSegment", "mms.uploadSegment",
+      { "uploadSegment", "mms.ServiceSupportOptions.uploadSegment",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_terminateUploadSequence,
-      { "terminateUploadSequence", "mms.terminateUploadSequence",
+      { "terminateUploadSequence", "mms.ServiceSupportOptions.terminateUploadSequence",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_requestDomainDownload,
-      { "requestDomainDownload", "mms.requestDomainDownload",
+      { "requestDomainDownload", "mms.ServiceSupportOptions.requestDomainDownload",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_requestDomainUpload,
-      { "requestDomainUpload", "mms.requestDomainUpload",
+      { "requestDomainUpload", "mms.ServiceSupportOptions.requestDomainUpload",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_loadDomainContent,
-      { "loadDomainContent", "mms.loadDomainContent",
+      { "loadDomainContent", "mms.ServiceSupportOptions.loadDomainContent",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_storeDomainContent,
-      { "storeDomainContent", "mms.storeDomainContent",
+      { "storeDomainContent", "mms.ServiceSupportOptions.storeDomainContent",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteDomain,
-      { "deleteDomain", "mms.deleteDomain",
+      { "deleteDomain", "mms.ServiceSupportOptions.deleteDomain",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getDomainAttributes,
-      { "getDomainAttributes", "mms.getDomainAttributes",
+      { "getDomainAttributes", "mms.ServiceSupportOptions.getDomainAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_createProgramInvocation,
-      { "createProgramInvocation", "mms.createProgramInvocation",
+      { "createProgramInvocation", "mms.ServiceSupportOptions.createProgramInvocation",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteProgramInvocation,
-      { "deleteProgramInvocation", "mms.deleteProgramInvocation",
+      { "deleteProgramInvocation", "mms.ServiceSupportOptions.deleteProgramInvocation",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_start,
-      { "start", "mms.start",
+      { "start", "mms.ServiceSupportOptions.start",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_stop,
-      { "stop", "mms.stop",
+      { "stop", "mms.ServiceSupportOptions.stop",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_resume,
-      { "resume", "mms.resume",
+      { "resume", "mms.ServiceSupportOptions.resume",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reset,
-      { "reset", "mms.reset",
+      { "reset", "mms.ServiceSupportOptions.reset",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_kill,
-      { "kill", "mms.kill",
+      { "kill", "mms.ServiceSupportOptions.kill",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getProgramInvocationAttributes,
-      { "getProgramInvocationAttributes", "mms.getProgramInvocationAttributes",
+      { "getProgramInvocationAttributes", "mms.ServiceSupportOptions.getProgramInvocationAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_obtainFile,
-      { "obtainFile", "mms.obtainFile",
+      { "obtainFile", "mms.ServiceSupportOptions.obtainFile",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventCondition,
-      { "defineEventCondition", "mms.defineEventCondition",
+      { "defineEventCondition", "mms.ServiceSupportOptions.defineEventCondition",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventCondition,
-      { "deleteEventCondition", "mms.deleteEventCondition",
+      { "deleteEventCondition", "mms.ServiceSupportOptions.deleteEventCondition",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventConditionAttributes,
-      { "getEventConditionAttributes", "mms.getEventConditionAttributes",
+      { "getEventConditionAttributes", "mms.ServiceSupportOptions.getEventConditionAttributes",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportEventConditionStatus,
-      { "reportEventConditionStatus", "mms.reportEventConditionStatus",
+      { "reportEventConditionStatus", "mms.ServiceSupportOptions.reportEventConditionStatus",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_alterEventConditionMonitoring,
-      { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring",
+      { "alterEventConditionMonitoring", "mms.ServiceSupportOptions.alterEventConditionMonitoring",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_triggerEvent,
-      { "triggerEvent", "mms.triggerEvent",
+      { "triggerEvent", "mms.ServiceSupportOptions.triggerEvent",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventAction,
-      { "defineEventAction", "mms.defineEventAction",
+      { "defineEventAction", "mms.ServiceSupportOptions.defineEventAction",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventAction,
-      { "deleteEventAction", "mms.deleteEventAction",
+      { "deleteEventAction", "mms.ServiceSupportOptions.deleteEventAction",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventActionAttributes,
-      { "getEventActionAttributes", "mms.getEventActionAttributes",
+      { "getEventActionAttributes", "mms.ServiceSupportOptions.getEventActionAttributes",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportActionStatus,
-      { "reportActionStatus", "mms.reportActionStatus",
+      { "reportActionStatus", "mms.ServiceSupportOptions.reportActionStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventEnrollment,
-      { "defineEventEnrollment", "mms.defineEventEnrollment",
+      { "defineEventEnrollment", "mms.ServiceSupportOptions.defineEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventEnrollment,
-      { "deleteEventEnrollment", "mms.deleteEventEnrollment",
+      { "deleteEventEnrollment", "mms.ServiceSupportOptions.deleteEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_alterEventEnrollment,
-      { "alterEventEnrollment", "mms.alterEventEnrollment",
+      { "alterEventEnrollment", "mms.ServiceSupportOptions.alterEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportEventEnrollmentStatus,
-      { "reportEventEnrollmentStatus", "mms.reportEventEnrollmentStatus",
+      { "reportEventEnrollmentStatus", "mms.ServiceSupportOptions.reportEventEnrollmentStatus",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventEnrollmentAttributes,
-      { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes",
+      { "getEventEnrollmentAttributes", "mms.ServiceSupportOptions.getEventEnrollmentAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_acknowledgeEventNotification,
-      { "acknowledgeEventNotification", "mms.acknowledgeEventNotification",
+      { "acknowledgeEventNotification", "mms.ServiceSupportOptions.acknowledgeEventNotification",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getAlarmSummary,
-      { "getAlarmSummary", "mms.getAlarmSummary",
+      { "getAlarmSummary", "mms.ServiceSupportOptions.getAlarmSummary",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getAlarmEnrollmentSummary,
-      { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary",
+      { "getAlarmEnrollmentSummary", "mms.ServiceSupportOptions.getAlarmEnrollmentSummary",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_readJournal,
-      { "readJournal", "mms.readJournal",
+      { "readJournal", "mms.ServiceSupportOptions.readJournal",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_writeJournal,
-      { "writeJournal", "mms.writeJournal",
+      { "writeJournal", "mms.ServiceSupportOptions.writeJournal",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initializeJournal,
-      { "initializeJournal", "mms.initializeJournal",
+      { "initializeJournal", "mms.ServiceSupportOptions.initializeJournal",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportJournalStatus,
-      { "reportJournalStatus", "mms.reportJournalStatus",
+      { "reportJournalStatus", "mms.ServiceSupportOptions.reportJournalStatus",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_createJournal,
-      { "createJournal", "mms.createJournal",
+      { "createJournal", "mms.ServiceSupportOptions.createJournal",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteJournal,
-      { "deleteJournal", "mms.deleteJournal",
+      { "deleteJournal", "mms.ServiceSupportOptions.deleteJournal",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getCapabilityList,
-      { "getCapabilityList", "mms.getCapabilityList",
+      { "getCapabilityList", "mms.ServiceSupportOptions.getCapabilityList",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileOpen,
-      { "fileOpen", "mms.fileOpen",
+      { "fileOpen", "mms.ServiceSupportOptions.fileOpen",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileRead,
-      { "fileRead", "mms.fileRead",
+      { "fileRead", "mms.ServiceSupportOptions.fileRead",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileClose,
-      { "fileClose", "mms.fileClose",
+      { "fileClose", "mms.ServiceSupportOptions.fileClose",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileRename,
-      { "fileRename", "mms.fileRename",
+      { "fileRename", "mms.ServiceSupportOptions.fileRename",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileDelete,
-      { "fileDelete", "mms.fileDelete",
+      { "fileDelete", "mms.ServiceSupportOptions.fileDelete",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileDirectory,
-      { "fileDirectory", "mms.fileDirectory",
+      { "fileDirectory", "mms.ServiceSupportOptions.fileDirectory",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_unsolicitedStatus,
-      { "unsolicitedStatus", "mms.unsolicitedStatus",
+      { "unsolicitedStatus", "mms.ServiceSupportOptions.unsolicitedStatus",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_informationReport,
-      { "informationReport", "mms.informationReport",
+      { "informationReport", "mms.ServiceSupportOptions.informationReport",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_eventNotification,
-      { "eventNotification", "mms.eventNotification",
+      { "eventNotification", "mms.ServiceSupportOptions.eventNotification",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_attachToEventCondition,
-      { "attachToEventCondition", "mms.attachToEventCondition",
+      { "attachToEventCondition", "mms.ServiceSupportOptions.attachToEventCondition",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_attachToSemaphore,
-      { "attachToSemaphore", "mms.attachToSemaphore",
+      { "attachToSemaphore", "mms.ServiceSupportOptions.attachToSemaphore",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_conclude,
-      { "conclude", "mms.conclude",
+      { "conclude", "mms.ServiceSupportOptions.conclude",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_cancel,
-      { "cancel", "mms.cancel",
+      { "cancel", "mms.ServiceSupportOptions.cancel",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_Transitions_idle_to_disabled,
-      { "idle-to-disabled", "mms.idle-to-disabled",
+      { "idle-to-disabled", "mms.Transitions.idle.to.disabled",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_mms_Transitions_active_to_disabled,
-      { "active-to-disabled", "mms.active-to-disabled",
+      { "active-to-disabled", "mms.Transitions.active.to.disabled",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_mms_Transitions_disabled_to_idle,
-      { "disabled-to-idle", "mms.disabled-to-idle",
+      { "disabled-to-idle", "mms.Transitions.disabled.to.idle",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_mms_Transitions_active_to_idle,
-      { "active-to-idle", "mms.active-to-idle",
+      { "active-to-idle", "mms.Transitions.active.to.idle",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_mms_Transitions_disabled_to_active,
-      { "disabled-to-active", "mms.disabled-to-active",
+      { "disabled-to-active", "mms.Transitions.disabled.to.active",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_mms_Transitions_idle_to_active,
-      { "idle-to-active", "mms.idle-to-active",
+      { "idle-to-active", "mms.Transitions.idle.to.active",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_mms_Transitions_any_to_deleted,
-      { "any-to-deleted", "mms.any-to-deleted",
+      { "any-to-deleted", "mms.Transitions.any.to.deleted",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index ecf56082b1..1308579090 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -69048,115 +69048,115 @@ void proto_register_nbap(void)
         FT_NONE, BASE_NONE, NULL, 0,
         "Outcome_value", HFILL }},
     { &hf_nbap_PreambleSignatures_signature15,
-      { "signature15", "nbap.signature15",
+      { "signature15", "nbap.PreambleSignatures.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature14,
-      { "signature14", "nbap.signature14",
+      { "signature14", "nbap.PreambleSignatures.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature13,
-      { "signature13", "nbap.signature13",
+      { "signature13", "nbap.PreambleSignatures.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature12,
-      { "signature12", "nbap.signature12",
+      { "signature12", "nbap.PreambleSignatures.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature11,
-      { "signature11", "nbap.signature11",
+      { "signature11", "nbap.PreambleSignatures.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature10,
-      { "signature10", "nbap.signature10",
+      { "signature10", "nbap.PreambleSignatures.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature9,
-      { "signature9", "nbap.signature9",
+      { "signature9", "nbap.PreambleSignatures.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature8,
-      { "signature8", "nbap.signature8",
+      { "signature8", "nbap.PreambleSignatures.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature7,
-      { "signature7", "nbap.signature7",
+      { "signature7", "nbap.PreambleSignatures.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature6,
-      { "signature6", "nbap.signature6",
+      { "signature6", "nbap.PreambleSignatures.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature5,
-      { "signature5", "nbap.signature5",
+      { "signature5", "nbap.PreambleSignatures.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature4,
-      { "signature4", "nbap.signature4",
+      { "signature4", "nbap.PreambleSignatures.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature3,
-      { "signature3", "nbap.signature3",
+      { "signature3", "nbap.PreambleSignatures.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature2,
-      { "signature2", "nbap.signature2",
+      { "signature2", "nbap.PreambleSignatures.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature1,
-      { "signature1", "nbap.signature1",
+      { "signature1", "nbap.PreambleSignatures.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature0,
-      { "signature0", "nbap.signature0",
+      { "signature0", "nbap.PreambleSignatures.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh11,
-      { "subCh11", "nbap.subCh11",
+      { "subCh11", "nbap.RACH.SubChannelNumbers.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh10,
-      { "subCh10", "nbap.subCh10",
+      { "subCh10", "nbap.RACH.SubChannelNumbers.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh9,
-      { "subCh9", "nbap.subCh9",
+      { "subCh9", "nbap.RACH.SubChannelNumbers.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh8,
-      { "subCh8", "nbap.subCh8",
+      { "subCh8", "nbap.RACH.SubChannelNumbers.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh7,
-      { "subCh7", "nbap.subCh7",
+      { "subCh7", "nbap.RACH.SubChannelNumbers.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh6,
-      { "subCh6", "nbap.subCh6",
+      { "subCh6", "nbap.RACH.SubChannelNumbers.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh5,
-      { "subCh5", "nbap.subCh5",
+      { "subCh5", "nbap.RACH.SubChannelNumbers.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh4,
-      { "subCh4", "nbap.subCh4",
+      { "subCh4", "nbap.RACH.SubChannelNumbers.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh3,
-      { "subCh3", "nbap.subCh3",
+      { "subCh3", "nbap.RACH.SubChannelNumbers.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh2,
-      { "subCh2", "nbap.subCh2",
+      { "subCh2", "nbap.RACH.SubChannelNumbers.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh1,
-      { "subCh1", "nbap.subCh1",
+      { "subCh1", "nbap.RACH.SubChannelNumbers.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh0,
-      { "subCh0", "nbap.subCh0",
+      { "subCh0", "nbap.RACH.SubChannelNumbers.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index 67ff8e5714..722fa4d7b0 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -272,35 +272,35 @@ void proto_register_ns_cert_exts(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_ssl_client,
-      { "ssl-client", "ns_cert_exts.ssl-client",
+      { "ssl-client", "ns.cert.exts.CertType.ssl.client",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_ssl_server,
-      { "ssl-server", "ns_cert_exts.ssl-server",
+      { "ssl-server", "ns.cert.exts.CertType.ssl.server",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_smime,
-      { "smime", "ns_cert_exts.smime",
+      { "smime", "ns.cert.exts.CertType.smime",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_object_signing,
-      { "object-signing", "ns_cert_exts.object-signing",
+      { "object-signing", "ns.cert.exts.CertType.object.signing",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_reserved_for_future_use,
-      { "reserved-for-future-use", "ns_cert_exts.reserved-for-future-use",
+      { "reserved-for-future-use", "ns.cert.exts.CertType.reserved.for.future.use",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_ssl_ca,
-      { "ssl-ca", "ns_cert_exts.ssl-ca",
+      { "ssl-ca", "ns.cert.exts.CertType.ssl.ca",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_smime_ca,
-      { "smime-ca", "ns_cert_exts.smime-ca",
+      { "smime-ca", "ns.cert.exts.CertType.smime.ca",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_object_signing_ca,
-      { "object-signing-ca", "ns_cert_exts.object-signing-ca",
+      { "object-signing-ca", "ns.cert.exts.CertType.object.signing.ca",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c
index ee96b32deb..a2dc1a43ab 100644
--- a/epan/dissectors/packet-p1.c
+++ b/epan/dissectors/packet-p1.c
@@ -569,12 +569,12 @@ static int hf_p1_PerMessageIndicators_U_reserved = -1;
 static int hf_p1_PerMessageIndicators_U_bit_5 = -1;
 static int hf_p1_PerMessageIndicators_U_bit_6 = -1;
 static int hf_p1_PerMessageIndicators_U_service_message = -1;
-static int hf_p1_OriginatorReportRequest_spare_bit_0 = -1;
-static int hf_p1_OriginatorReportRequest_spare_bit_1 = -1;
-static int hf_p1_OriginatorReportRequest_spare_bit_2 = -1;
+static int hf_p1_OriginatorReportRequest_spare_bit0 = -1;
+static int hf_p1_OriginatorReportRequest_spare_bit1 = -1;
+static int hf_p1_OriginatorReportRequest_spare_bit2 = -1;
 static int hf_p1_OriginatorReportRequest_report = -1;
 static int hf_p1_OriginatorReportRequest_non_delivery_report = -1;
-static int hf_p1_DeliveryFlags_spare_bit_0 = -1;
+static int hf_p1_DeliveryFlags_spare_bit0 = -1;
 static int hf_p1_DeliveryFlags_implicit_conversion_prohibited = -1;
 static int hf_p1_Criticality_for_submission = -1;
 static int hf_p1_Criticality_for_transfer = -1;
@@ -597,77 +597,77 @@ static int hf_p1_BuiltInEncodedInformationTypes_videotex = -1;
 static int hf_p1_BuiltInEncodedInformationTypes_voice = -1;
 static int hf_p1_BuiltInEncodedInformationTypes_sfd = -1;
 static int hf_p1_BuiltInEncodedInformationTypes_mixed_mode = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_0 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_1 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_2 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_3 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_4 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_5 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_6 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_7 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit0 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit1 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit2 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit3 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit4 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit5 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit6 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit7 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_two_dimensional = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_fine_resolution = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_10 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_11 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_12 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_13 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_14 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_15 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_16 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_17 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_18 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_19 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit10 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit11 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit12 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit13 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit14 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit15 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit16 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit17 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit18 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit19 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_unlimited_length = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_b4_length = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_a3_width = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_b4_width = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_24 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit24 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_t6_coding = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_26 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_27 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_28 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_29 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit26 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit27 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit28 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit29 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_uncompressed = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_31 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_32 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_33 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_34 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_35 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_36 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit31 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit32 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit33 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit34 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit35 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit36 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_39 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_40 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_41 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_42 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_43 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit39 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit40 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit41 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit42 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit43 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_resolution_type = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_resolution_400x400 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_resolution_300x300 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_resolution_8x15 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_48 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit48 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_edi = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_dtm = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_bft = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_52 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_53 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_54 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_55 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_56 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_57 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit52 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit53 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit54 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit55 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit56 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit57 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_mixed_mode = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_59 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit59 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_character_mode = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_61 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_62 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_63 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_64 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit61 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit62 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit63 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit64 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_twelve_bits = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_full_colour = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_jpeg = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_69 = -1;
-static int hf_p1_G3FacsimileNonBasicParameters_spare_bit_70 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit69 = -1;
+static int hf_p1_G3FacsimileNonBasicParameters_spare_bit70 = -1;
 static int hf_p1_G3FacsimileNonBasicParameters_processable_mode_26 = -1;
 
 /*--- End of included file: packet-p1-hf.c ---*/
@@ -2396,77 +2396,77 @@ dissect_p1_BuiltInEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *t
 
 
 static const int * G3FacsimileNonBasicParameters_bits[] = {
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_0,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_1,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_2,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_3,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_4,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_5,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_6,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_7,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit0,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit1,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit2,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit3,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit4,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit5,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit6,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit7,
   &hf_p1_G3FacsimileNonBasicParameters_two_dimensional,
   &hf_p1_G3FacsimileNonBasicParameters_fine_resolution,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_10,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_11,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_12,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_13,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_14,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_15,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_16,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_17,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_18,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_19,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit10,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit11,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit12,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit13,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit14,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit15,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit16,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit17,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit18,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit19,
   &hf_p1_G3FacsimileNonBasicParameters_unlimited_length,
   &hf_p1_G3FacsimileNonBasicParameters_b4_length,
   &hf_p1_G3FacsimileNonBasicParameters_a3_width,
   &hf_p1_G3FacsimileNonBasicParameters_b4_width,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_24,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit24,
   &hf_p1_G3FacsimileNonBasicParameters_t6_coding,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_26,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_27,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_28,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_29,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit26,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit27,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit28,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit29,
   &hf_p1_G3FacsimileNonBasicParameters_uncompressed,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_31,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_32,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_33,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_34,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_35,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_36,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit31,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit32,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit33,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit34,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit35,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit36,
   &hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728,
   &hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_39,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_40,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_41,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_42,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_43,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit39,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit40,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit41,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit42,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit43,
   &hf_p1_G3FacsimileNonBasicParameters_resolution_type,
   &hf_p1_G3FacsimileNonBasicParameters_resolution_400x400,
   &hf_p1_G3FacsimileNonBasicParameters_resolution_300x300,
   &hf_p1_G3FacsimileNonBasicParameters_resolution_8x15,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_48,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit48,
   &hf_p1_G3FacsimileNonBasicParameters_edi,
   &hf_p1_G3FacsimileNonBasicParameters_dtm,
   &hf_p1_G3FacsimileNonBasicParameters_bft,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_52,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_53,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_54,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_55,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_56,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_57,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit52,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit53,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit54,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit55,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit56,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit57,
   &hf_p1_G3FacsimileNonBasicParameters_mixed_mode,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_59,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit59,
   &hf_p1_G3FacsimileNonBasicParameters_character_mode,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_61,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_62,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_63,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_64,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit61,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit62,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit63,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit64,
   &hf_p1_G3FacsimileNonBasicParameters_twelve_bits,
   &hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann,
   &hf_p1_G3FacsimileNonBasicParameters_full_colour,
   &hf_p1_G3FacsimileNonBasicParameters_jpeg,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_69,
-  &hf_p1_G3FacsimileNonBasicParameters_spare_bit_70,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit69,
+  &hf_p1_G3FacsimileNonBasicParameters_spare_bit70,
   &hf_p1_G3FacsimileNonBasicParameters_processable_mode_26,
   NULL
 };
@@ -4161,9 +4161,9 @@ dissect_p1_RecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 
 static const int * OriginatorReportRequest_bits[] = {
-  &hf_p1_OriginatorReportRequest_spare_bit_0,
-  &hf_p1_OriginatorReportRequest_spare_bit_1,
-  &hf_p1_OriginatorReportRequest_spare_bit_2,
+  &hf_p1_OriginatorReportRequest_spare_bit0,
+  &hf_p1_OriginatorReportRequest_spare_bit1,
+  &hf_p1_OriginatorReportRequest_spare_bit2,
   &hf_p1_OriginatorReportRequest_report,
   &hf_p1_OriginatorReportRequest_non_delivery_report,
   NULL
@@ -4733,7 +4733,7 @@ dissect_p1_DeliveredOriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const int * DeliveryFlags_bits[] = {
-  &hf_p1_DeliveryFlags_spare_bit_0,
+  &hf_p1_DeliveryFlags_spare_bit0,
   &hf_p1_DeliveryFlags_implicit_conversion_prohibited,
   NULL
 };
@@ -10658,531 +10658,531 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ExtendedEncodedInformationTypes", HFILL }},
     { &hf_p1_PerRecipientIndicators_responsibility,
-      { "responsibility", "p1.responsibility",
+      { "responsibility", "p1.PerRecipientIndicators.responsibility",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_originating_MTA_report,
-      { "originating-MTA-report", "p1.originating-MTA-report",
+      { "originating-MTA-report", "p1.PerRecipientIndicators.originating.MTA.report",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_originating_MTA_non_delivery_report,
-      { "originating-MTA-non-delivery-report", "p1.originating-MTA-non-delivery-report",
+      { "originating-MTA-non-delivery-report", "p1.PerRecipientIndicators.originating.MTA.non.delivery.report",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_originator_report,
-      { "originator-report", "p1.originator-report",
+      { "originator-report", "p1.PerRecipientIndicators.originator.report",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_originator_non_delivery_report,
-      { "originator-non-delivery-report", "p1.originator-non-delivery-report",
+      { "originator-non-delivery-report", "p1.PerRecipientIndicators.originator.non.delivery.report",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_reserved_5,
-      { "reserved-5", "p1.reserved-5",
+      { "reserved-5", "p1.PerRecipientIndicators.reserved.5",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_reserved_6,
-      { "reserved-6", "p1.reserved-6",
+      { "reserved-6", "p1.PerRecipientIndicators.reserved.6",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_PerRecipientIndicators_reserved_7,
-      { "reserved-7", "p1.reserved-7",
+      { "reserved-7", "p1.PerRecipientIndicators.reserved.7",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_p1_OtherActions_redirected,
-      { "redirected", "p1.redirected",
+      { "redirected", "p1.OtherActions.redirected",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_OtherActions_dl_operation,
-      { "dl-operation", "p1.dl-operation",
+      { "dl-operation", "p1.OtherActions.dl.operation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_Operations_probe_submission_or_report_delivery,
-      { "probe-submission-or-report-delivery", "p1.probe-submission-or-report-delivery",
+      { "probe-submission-or-report-delivery", "p1.Operations.probe.submission.or.report.delivery",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_Operations_message_submission_or_message_delivery,
-      { "message-submission-or-message-delivery", "p1.message-submission-or-message-delivery",
+      { "message-submission-or-message-delivery", "p1.Operations.message.submission.or.message.delivery",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_WaitingMessages_long_content,
-      { "long-content", "p1.long-content",
+      { "long-content", "p1.WaitingMessages.long.content",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_WaitingMessages_low_priority,
-      { "low-priority", "p1.low-priority",
+      { "low-priority", "p1.WaitingMessages.low.priority",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_WaitingMessages_other_security_labels,
-      { "other-security-labels", "p1.other-security-labels",
+      { "other-security-labels", "p1.WaitingMessages.other.security.labels",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_T_source_type_originated_by,
-      { "originated-by", "p1.originated-by",
+      { "originated-by", "p1.T.source.type.originated.by",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_T_source_type_redirected_by,
-      { "redirected-by", "p1.redirected-by",
+      { "redirected-by", "p1.T.source.type.redirected.by",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_T_source_type_dl_expanded_by,
-      { "dl-expanded-by", "p1.dl-expanded-by",
+      { "dl-expanded-by", "p1.T.source.type.dl.expanded.by",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_user_name,
-      { "user-name", "p1.user-name",
+      { "user-name", "p1.T.standard.parameters.user.name",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_user_address,
-      { "user-address", "p1.user-address",
+      { "user-address", "p1.T.standard.parameters.user.address",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_deliverable_class,
-      { "deliverable-class", "p1.deliverable-class",
+      { "deliverable-class", "p1.T.standard.parameters.deliverable.class",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_default_delivery_controls,
-      { "default-delivery-controls", "p1.default-delivery-controls",
+      { "default-delivery-controls", "p1.T.standard.parameters.default.delivery.controls",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_redirections,
-      { "redirections", "p1.redirections",
+      { "redirections", "p1.T.standard.parameters.redirections",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_T_standard_parameters_restricted_delivery,
-      { "restricted-delivery", "p1.restricted-delivery",
+      { "restricted-delivery", "p1.T.standard.parameters.restricted.delivery",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_disclosure_of_other_recipients,
-      { "disclosure-of-other-recipients", "p1.disclosure-of-other-recipients",
+      { "disclosure-of-other-recipients", "p1.PerMessageIndicators.U.disclosure.of.other.recipients",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_implicit_conversion_prohibited,
-      { "implicit-conversion-prohibited", "p1.implicit-conversion-prohibited",
+      { "implicit-conversion-prohibited", "p1.PerMessageIndicators.U.implicit.conversion.prohibited",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_alternate_recipient_allowed,
-      { "alternate-recipient-allowed", "p1.alternate-recipient-allowed",
+      { "alternate-recipient-allowed", "p1.PerMessageIndicators.U.alternate.recipient.allowed",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_content_return_request,
-      { "content-return-request", "p1.content-return-request",
+      { "content-return-request", "p1.PerMessageIndicators.U.content.return.request",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_reserved,
-      { "reserved", "p1.reserved",
+      { "reserved", "p1.PerMessageIndicators.U.reserved",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_bit_5,
-      { "bit-5", "p1.bit-5",
+      { "bit-5", "p1.PerMessageIndicators.U.bit.5",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_bit_6,
-      { "bit-6", "p1.bit-6",
+      { "bit-6", "p1.PerMessageIndicators.U.bit.6",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_PerMessageIndicators_U_service_message,
-      { "service-message", "p1.service-message",
+      { "service-message", "p1.PerMessageIndicators.U.service.message",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_OriginatorReportRequest_spare_bit_0,
-      { "spare_bit_0", "p1.spare_bit_0",
+    { &hf_p1_OriginatorReportRequest_spare_bit0,
+      { "spare_bit0", "p1.OriginatorReportRequest.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_OriginatorReportRequest_spare_bit_1,
-      { "spare_bit_1", "p1.spare_bit_1",
+    { &hf_p1_OriginatorReportRequest_spare_bit1,
+      { "spare_bit1", "p1.OriginatorReportRequest.spare.bit1",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_OriginatorReportRequest_spare_bit_2,
-      { "spare_bit_2", "p1.spare_bit_2",
+    { &hf_p1_OriginatorReportRequest_spare_bit2,
+      { "spare_bit2", "p1.OriginatorReportRequest.spare.bit2",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_OriginatorReportRequest_report,
-      { "report", "p1.report",
+      { "report", "p1.OriginatorReportRequest.report",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_OriginatorReportRequest_non_delivery_report,
-      { "non-delivery-report", "p1.non-delivery-report",
+      { "non-delivery-report", "p1.OriginatorReportRequest.non.delivery.report",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_DeliveryFlags_spare_bit_0,
-      { "spare_bit_0", "p1.spare_bit_0",
+    { &hf_p1_DeliveryFlags_spare_bit0,
+      { "spare_bit0", "p1.DeliveryFlags.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_DeliveryFlags_implicit_conversion_prohibited,
-      { "implicit-conversion-prohibited", "p1.implicit-conversion-prohibited",
+      { "implicit-conversion-prohibited", "p1.DeliveryFlags.implicit.conversion.prohibited",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_Criticality_for_submission,
-      { "for-submission", "p1.for-submission",
+      { "for-submission", "p1.Criticality.for.submission",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_Criticality_for_transfer,
-      { "for-transfer", "p1.for-transfer",
+      { "for-transfer", "p1.Criticality.for.transfer",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_Criticality_for_delivery,
-      { "for-delivery", "p1.for-delivery",
+      { "for-delivery", "p1.Criticality.for.delivery",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_ordinary_mail,
-      { "ordinary-mail", "p1.ordinary-mail",
+      { "ordinary-mail", "p1.PhysicalDeliveryModes.ordinary.mail",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_special_delivery,
-      { "special-delivery", "p1.special-delivery",
+      { "special-delivery", "p1.PhysicalDeliveryModes.special.delivery",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_express_mail,
-      { "express-mail", "p1.express-mail",
+      { "express-mail", "p1.PhysicalDeliveryModes.express.mail",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_counter_collection,
-      { "counter-collection", "p1.counter-collection",
+      { "counter-collection", "p1.PhysicalDeliveryModes.counter.collection",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_counter_collection_with_telephone_advice,
-      { "counter-collection-with-telephone-advice", "p1.counter-collection-with-telephone-advice",
+      { "counter-collection-with-telephone-advice", "p1.PhysicalDeliveryModes.counter.collection.with.telephone.advice",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_counter_collection_with_telex_advice,
-      { "counter-collection-with-telex-advice", "p1.counter-collection-with-telex-advice",
+      { "counter-collection-with-telex-advice", "p1.PhysicalDeliveryModes.counter.collection.with.telex.advice",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_counter_collection_with_teletex_advice,
-      { "counter-collection-with-teletex-advice", "p1.counter-collection-with-teletex-advice",
+      { "counter-collection-with-teletex-advice", "p1.PhysicalDeliveryModes.counter.collection.with.teletex.advice",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryModes_bureau_fax_delivery,
-      { "bureau-fax-delivery", "p1.bureau-fax-delivery",
+      { "bureau-fax-delivery", "p1.PhysicalDeliveryModes.bureau.fax.delivery",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_unknown,
-      { "unknown", "p1.unknown",
+      { "unknown", "p1.BuiltInEncodedInformationTypes.unknown",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_telex,
-      { "telex", "p1.telex",
+      { "telex", "p1.BuiltInEncodedInformationTypes.telex",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_ia5_text,
-      { "ia5-text", "p1.ia5-text",
+      { "ia5-text", "p1.BuiltInEncodedInformationTypes.ia5.text",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_g3_facsimile,
-      { "g3-facsimile", "p1.g3-facsimile",
+      { "g3-facsimile", "p1.BuiltInEncodedInformationTypes.g3.facsimile",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_g4_class_1,
-      { "g4-class-1", "p1.g4-class-1",
+      { "g4-class-1", "p1.BuiltInEncodedInformationTypes.g4.class.1",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_teletex,
-      { "teletex", "p1.teletex",
+      { "teletex", "p1.BuiltInEncodedInformationTypes.teletex",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_videotex,
-      { "videotex", "p1.videotex",
+      { "videotex", "p1.BuiltInEncodedInformationTypes.videotex",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_voice,
-      { "voice", "p1.voice",
+      { "voice", "p1.BuiltInEncodedInformationTypes.voice",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_sfd,
-      { "sfd", "p1.sfd",
+      { "sfd", "p1.BuiltInEncodedInformationTypes.sfd",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_BuiltInEncodedInformationTypes_mixed_mode,
-      { "mixed-mode", "p1.mixed-mode",
+      { "mixed-mode", "p1.BuiltInEncodedInformationTypes.mixed.mode",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_0,
-      { "spare_bit_0", "p1.spare_bit_0",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit0,
+      { "spare_bit0", "p1.G3FacsimileNonBasicParameters.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_1,
-      { "spare_bit_1", "p1.spare_bit_1",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit1,
+      { "spare_bit1", "p1.G3FacsimileNonBasicParameters.spare.bit1",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_2,
-      { "spare_bit_2", "p1.spare_bit_2",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit2,
+      { "spare_bit2", "p1.G3FacsimileNonBasicParameters.spare.bit2",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_3,
-      { "spare_bit_3", "p1.spare_bit_3",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit3,
+      { "spare_bit3", "p1.G3FacsimileNonBasicParameters.spare.bit3",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_4,
-      { "spare_bit_4", "p1.spare_bit_4",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit4,
+      { "spare_bit4", "p1.G3FacsimileNonBasicParameters.spare.bit4",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_5,
-      { "spare_bit_5", "p1.spare_bit_5",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit5,
+      { "spare_bit5", "p1.G3FacsimileNonBasicParameters.spare.bit5",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_6,
-      { "spare_bit_6", "p1.spare_bit_6",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit6,
+      { "spare_bit6", "p1.G3FacsimileNonBasicParameters.spare.bit6",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_7,
-      { "spare_bit_7", "p1.spare_bit_7",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit7,
+      { "spare_bit7", "p1.G3FacsimileNonBasicParameters.spare.bit7",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_two_dimensional,
-      { "two-dimensional", "p1.two-dimensional",
+      { "two-dimensional", "p1.G3FacsimileNonBasicParameters.two.dimensional",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_fine_resolution,
-      { "fine-resolution", "p1.fine-resolution",
+      { "fine-resolution", "p1.G3FacsimileNonBasicParameters.fine.resolution",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_10,
-      { "spare_bit_10", "p1.spare_bit_10",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit10,
+      { "spare_bit10", "p1.G3FacsimileNonBasicParameters.spare.bit10",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_11,
-      { "spare_bit_11", "p1.spare_bit_11",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit11,
+      { "spare_bit11", "p1.G3FacsimileNonBasicParameters.spare.bit11",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_12,
-      { "spare_bit_12", "p1.spare_bit_12",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit12,
+      { "spare_bit12", "p1.G3FacsimileNonBasicParameters.spare.bit12",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_13,
-      { "spare_bit_13", "p1.spare_bit_13",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit13,
+      { "spare_bit13", "p1.G3FacsimileNonBasicParameters.spare.bit13",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_14,
-      { "spare_bit_14", "p1.spare_bit_14",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit14,
+      { "spare_bit14", "p1.G3FacsimileNonBasicParameters.spare.bit14",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_15,
-      { "spare_bit_15", "p1.spare_bit_15",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit15,
+      { "spare_bit15", "p1.G3FacsimileNonBasicParameters.spare.bit15",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_16,
-      { "spare_bit_16", "p1.spare_bit_16",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit16,
+      { "spare_bit16", "p1.G3FacsimileNonBasicParameters.spare.bit16",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_17,
-      { "spare_bit_17", "p1.spare_bit_17",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit17,
+      { "spare_bit17", "p1.G3FacsimileNonBasicParameters.spare.bit17",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_18,
-      { "spare_bit_18", "p1.spare_bit_18",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit18,
+      { "spare_bit18", "p1.G3FacsimileNonBasicParameters.spare.bit18",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_19,
-      { "spare_bit_19", "p1.spare_bit_19",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit19,
+      { "spare_bit19", "p1.G3FacsimileNonBasicParameters.spare.bit19",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_unlimited_length,
-      { "unlimited-length", "p1.unlimited-length",
+      { "unlimited-length", "p1.G3FacsimileNonBasicParameters.unlimited.length",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_b4_length,
-      { "b4-length", "p1.b4-length",
+      { "b4-length", "p1.G3FacsimileNonBasicParameters.b4.length",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_a3_width,
-      { "a3-width", "p1.a3-width",
+      { "a3-width", "p1.G3FacsimileNonBasicParameters.a3.width",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_b4_width,
-      { "b4-width", "p1.b4-width",
+      { "b4-width", "p1.G3FacsimileNonBasicParameters.b4.width",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_24,
-      { "spare_bit_24", "p1.spare_bit_24",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit24,
+      { "spare_bit24", "p1.G3FacsimileNonBasicParameters.spare.bit24",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_t6_coding,
-      { "t6-coding", "p1.t6-coding",
+      { "t6-coding", "p1.G3FacsimileNonBasicParameters.t6.coding",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_26,
-      { "spare_bit_26", "p1.spare_bit_26",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit26,
+      { "spare_bit26", "p1.G3FacsimileNonBasicParameters.spare.bit26",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_27,
-      { "spare_bit_27", "p1.spare_bit_27",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit27,
+      { "spare_bit27", "p1.G3FacsimileNonBasicParameters.spare.bit27",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_28,
-      { "spare_bit_28", "p1.spare_bit_28",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit28,
+      { "spare_bit28", "p1.G3FacsimileNonBasicParameters.spare.bit28",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_29,
-      { "spare_bit_29", "p1.spare_bit_29",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit29,
+      { "spare_bit29", "p1.G3FacsimileNonBasicParameters.spare.bit29",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_uncompressed,
-      { "uncompressed", "p1.uncompressed",
+      { "uncompressed", "p1.G3FacsimileNonBasicParameters.uncompressed",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_31,
-      { "spare_bit_31", "p1.spare_bit_31",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit31,
+      { "spare_bit31", "p1.G3FacsimileNonBasicParameters.spare.bit31",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_32,
-      { "spare_bit_32", "p1.spare_bit_32",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit32,
+      { "spare_bit32", "p1.G3FacsimileNonBasicParameters.spare.bit32",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_33,
-      { "spare_bit_33", "p1.spare_bit_33",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit33,
+      { "spare_bit33", "p1.G3FacsimileNonBasicParameters.spare.bit33",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_34,
-      { "spare_bit_34", "p1.spare_bit_34",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit34,
+      { "spare_bit34", "p1.G3FacsimileNonBasicParameters.spare.bit34",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_35,
-      { "spare_bit_35", "p1.spare_bit_35",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit35,
+      { "spare_bit35", "p1.G3FacsimileNonBasicParameters.spare.bit35",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_36,
-      { "spare_bit_36", "p1.spare_bit_36",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit36,
+      { "spare_bit36", "p1.G3FacsimileNonBasicParameters.spare.bit36",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_width_middle_864_of_1728,
-      { "width-middle-864-of-1728", "p1.width-middle-864-of-1728",
+      { "width-middle-864-of-1728", "p1.G3FacsimileNonBasicParameters.width.middle.864.of.1728",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_width_middle_1216_of_1728,
-      { "width-middle-1216-of-1728", "p1.width-middle-1216-of-1728",
+      { "width-middle-1216-of-1728", "p1.G3FacsimileNonBasicParameters.width.middle.1216.of.1728",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_39,
-      { "spare_bit_39", "p1.spare_bit_39",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit39,
+      { "spare_bit39", "p1.G3FacsimileNonBasicParameters.spare.bit39",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_40,
-      { "spare_bit_40", "p1.spare_bit_40",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit40,
+      { "spare_bit40", "p1.G3FacsimileNonBasicParameters.spare.bit40",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_41,
-      { "spare_bit_41", "p1.spare_bit_41",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit41,
+      { "spare_bit41", "p1.G3FacsimileNonBasicParameters.spare.bit41",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_42,
-      { "spare_bit_42", "p1.spare_bit_42",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit42,
+      { "spare_bit42", "p1.G3FacsimileNonBasicParameters.spare.bit42",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_43,
-      { "spare_bit_43", "p1.spare_bit_43",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit43,
+      { "spare_bit43", "p1.G3FacsimileNonBasicParameters.spare.bit43",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_resolution_type,
-      { "resolution-type", "p1.resolution-type",
+      { "resolution-type", "p1.G3FacsimileNonBasicParameters.resolution.type",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_resolution_400x400,
-      { "resolution-400x400", "p1.resolution-400x400",
+      { "resolution-400x400", "p1.G3FacsimileNonBasicParameters.resolution.400x400",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_resolution_300x300,
-      { "resolution-300x300", "p1.resolution-300x300",
+      { "resolution-300x300", "p1.G3FacsimileNonBasicParameters.resolution.300x300",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_resolution_8x15,
-      { "resolution-8x15", "p1.resolution-8x15",
+      { "resolution-8x15", "p1.G3FacsimileNonBasicParameters.resolution.8x15",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_48,
-      { "spare_bit_48", "p1.spare_bit_48",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit48,
+      { "spare_bit48", "p1.G3FacsimileNonBasicParameters.spare.bit48",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_edi,
-      { "edi", "p1.edi",
+      { "edi", "p1.G3FacsimileNonBasicParameters.edi",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_dtm,
-      { "dtm", "p1.dtm",
+      { "dtm", "p1.G3FacsimileNonBasicParameters.dtm",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_bft,
-      { "bft", "p1.bft",
+      { "bft", "p1.G3FacsimileNonBasicParameters.bft",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_52,
-      { "spare_bit_52", "p1.spare_bit_52",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit52,
+      { "spare_bit52", "p1.G3FacsimileNonBasicParameters.spare.bit52",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_53,
-      { "spare_bit_53", "p1.spare_bit_53",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit53,
+      { "spare_bit53", "p1.G3FacsimileNonBasicParameters.spare.bit53",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_54,
-      { "spare_bit_54", "p1.spare_bit_54",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit54,
+      { "spare_bit54", "p1.G3FacsimileNonBasicParameters.spare.bit54",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_55,
-      { "spare_bit_55", "p1.spare_bit_55",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit55,
+      { "spare_bit55", "p1.G3FacsimileNonBasicParameters.spare.bit55",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_56,
-      { "spare_bit_56", "p1.spare_bit_56",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit56,
+      { "spare_bit56", "p1.G3FacsimileNonBasicParameters.spare.bit56",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_57,
-      { "spare_bit_57", "p1.spare_bit_57",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit57,
+      { "spare_bit57", "p1.G3FacsimileNonBasicParameters.spare.bit57",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_mixed_mode,
-      { "mixed-mode", "p1.mixed-mode",
+      { "mixed-mode", "p1.G3FacsimileNonBasicParameters.mixed.mode",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_59,
-      { "spare_bit_59", "p1.spare_bit_59",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit59,
+      { "spare_bit59", "p1.G3FacsimileNonBasicParameters.spare.bit59",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_character_mode,
-      { "character-mode", "p1.character-mode",
+      { "character-mode", "p1.G3FacsimileNonBasicParameters.character.mode",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_61,
-      { "spare_bit_61", "p1.spare_bit_61",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit61,
+      { "spare_bit61", "p1.G3FacsimileNonBasicParameters.spare.bit61",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_62,
-      { "spare_bit_62", "p1.spare_bit_62",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit62,
+      { "spare_bit62", "p1.G3FacsimileNonBasicParameters.spare.bit62",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_63,
-      { "spare_bit_63", "p1.spare_bit_63",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit63,
+      { "spare_bit63", "p1.G3FacsimileNonBasicParameters.spare.bit63",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_64,
-      { "spare_bit_64", "p1.spare_bit_64",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit64,
+      { "spare_bit64", "p1.G3FacsimileNonBasicParameters.spare.bit64",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_twelve_bits,
-      { "twelve-bits", "p1.twelve-bits",
+      { "twelve-bits", "p1.G3FacsimileNonBasicParameters.twelve.bits",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_preferred_huffmann,
-      { "preferred-huffmann", "p1.preferred-huffmann",
+      { "preferred-huffmann", "p1.G3FacsimileNonBasicParameters.preferred.huffmann",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_full_colour,
-      { "full-colour", "p1.full-colour",
+      { "full-colour", "p1.G3FacsimileNonBasicParameters.full.colour",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_jpeg,
-      { "jpeg", "p1.jpeg",
+      { "jpeg", "p1.G3FacsimileNonBasicParameters.jpeg",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_69,
-      { "spare_bit_69", "p1.spare_bit_69",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit69,
+      { "spare_bit69", "p1.G3FacsimileNonBasicParameters.spare.bit69",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit_70,
-      { "spare_bit_70", "p1.spare_bit_70",
+    { &hf_p1_G3FacsimileNonBasicParameters_spare_bit70,
+      { "spare_bit70", "p1.G3FacsimileNonBasicParameters.spare.bit70",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p1_G3FacsimileNonBasicParameters_processable_mode_26,
-      { "processable-mode-26", "p1.processable-mode-26",
+      { "processable-mode-26", "p1.G3FacsimileNonBasicParameters.processable.mode.26",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c
index 1dc38db0ec..1b5beb10d7 100644
--- a/epan/dissectors/packet-p22.c
+++ b/epan/dissectors/packet-p22.c
@@ -6136,71 +6136,71 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OtherNotificationTypeFields", HFILL }},
     { &hf_p22_NotificationRequests_rn,
-      { "rn", "p22.rn",
+      { "rn", "p22.NotificationRequests.rn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p22_NotificationRequests_nrn,
-      { "nrn", "p22.nrn",
+      { "nrn", "p22.NotificationRequests.nrn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p22_NotificationRequests_ipm_return,
-      { "ipm-return", "p22.ipm-return",
+      { "ipm-return", "p22.NotificationRequests.ipm.return",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p22_NotificationRequests_an_supported,
-      { "an-supported", "p22.an-supported",
+      { "an-supported", "p22.NotificationRequests.an.supported",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p22_NotificationRequests_suppress_an,
-      { "suppress-an", "p22.suppress-an",
+      { "suppress-an", "p22.NotificationRequests.suppress.an",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p22_Access_Request_read,
-      { "read", "p22.read",
+      { "read", "p22.Access.Request.read",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p22_Access_Request_insert,
-      { "insert", "p22.insert",
+      { "insert", "p22.Access.Request.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p22_Access_Request_replace,
-      { "replace", "p22.replace",
+      { "replace", "p22.Access.Request.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p22_Access_Request_extend,
-      { "extend", "p22.extend",
+      { "extend", "p22.Access.Request.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p22_Access_Request_erase,
-      { "erase", "p22.erase",
+      { "erase", "p22.Access.Request.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p22_Access_Request_read_attribute,
-      { "read-attribute", "p22.read-attribute",
+      { "read-attribute", "p22.Access.Request.read.attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p22_Access_Request_change_attribute,
-      { "change-attribute", "p22.change-attribute",
+      { "change-attribute", "p22.Access.Request.change.attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_p22_Access_Request_delete_object,
-      { "delete-object", "p22.delete-object",
+      { "delete-object", "p22.Access.Request.delete.object",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_p22_RecipientSecurityRequest_content_non_repudiation,
-      { "content-non-repudiation", "p22.content-non-repudiation",
+      { "content-non-repudiation", "p22.RecipientSecurityRequest.content.non.repudiation",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p22_RecipientSecurityRequest_content_proof,
-      { "content-proof", "p22.content-proof",
+      { "content-proof", "p22.RecipientSecurityRequest.content.proof",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p22_RecipientSecurityRequest_ipn_non_repudiation,
-      { "ipn-non-repudiation", "p22.ipn-non-repudiation",
+      { "ipn-non-repudiation", "p22.RecipientSecurityRequest.ipn.non.repudiation",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p22_RecipientSecurityRequest_ipn_proof,
-      { "ipn-proof", "p22.ipn-proof",
+      { "ipn-proof", "p22.RecipientSecurityRequest.ipn.proof",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 52ebc9da69..2ecc25acba 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -5608,51 +5608,51 @@ void proto_register_p7(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_content_types_restriction,
-      { "override-content-types-restriction", "p7.override-content-types-restriction",
+      { "override-content-types-restriction", "p7.OverrideRestrictions.override.content.types.restriction",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_EITs_restriction,
-      { "override-EITs-restriction", "p7.override-EITs-restriction",
+      { "override-EITs-restriction", "p7.OverrideRestrictions.override.EITs.restriction",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_attribute_length_restriction,
-      { "override-attribute-length-restriction", "p7.override-attribute-length-restriction",
+      { "override-attribute-length-restriction", "p7.OverrideRestrictions.override.attribute.length.restriction",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p7_T_registrations_auto_action_registrations,
-      { "auto-action-registrations", "p7.auto-action-registrations",
+      { "auto-action-registrations", "p7.T.registrations.auto.action.registrations",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p7_T_registrations_list_attribute_defaults,
-      { "list-attribute-defaults", "p7.list-attribute-defaults",
+      { "list-attribute-defaults", "p7.T.registrations.list.attribute.defaults",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p7_T_registrations_fetch_attribute_defaults,
-      { "fetch-attribute-defaults", "p7.fetch-attribute-defaults",
+      { "fetch-attribute-defaults", "p7.T.registrations.fetch.attribute.defaults",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_p7_T_registrations_ua_registrations,
-      { "ua-registrations", "p7.ua-registrations",
+      { "ua-registrations", "p7.T.registrations.ua.registrations",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_p7_T_registrations_submission_defaults,
-      { "submission-defaults", "p7.submission-defaults",
+      { "submission-defaults", "p7.T.registrations.submission.defaults",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_p7_T_registrations_message_group_registrations,
-      { "message-group-registrations", "p7.message-group-registrations",
+      { "message-group-registrations", "p7.T.registrations.message.group.registrations",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_unsupported_entry_class,
-      { "unsupported-entry-class", "p7.unsupported-entry-class",
+      { "unsupported-entry-class", "p7.T.entry.class.problem.unsupported.entry.class",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_entry_class_not_subscribed,
-      { "entry-class-not-subscribed", "p7.entry-class-not-subscribed",
+      { "entry-class-not-subscribed", "p7.T.entry.class.problem.entry.class.not.subscribed",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_inappropriate_entry_class,
-      { "inappropriate-entry-class", "p7.inappropriate-entry-class",
+      { "inappropriate-entry-class", "p7.T.entry.class.problem.inappropriate.entry.class",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c
index c753bafe11..8fcf99fdfb 100644
--- a/epan/dissectors/packet-p772.c
+++ b/epan/dissectors/packet-p772.c
@@ -1617,15 +1617,15 @@ void proto_register_p772(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherMessageDeliveryFields", HFILL }},
     { &hf_p772_Acp127NotificationType_acp127_nn,
-      { "acp127-nn", "p772.acp127-nn",
+      { "acp127-nn", "p772.Acp127NotificationType.acp127.nn",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_p772_Acp127NotificationType_acp127_pn,
-      { "acp127-pn", "p772.acp127-pn",
+      { "acp127-pn", "p772.Acp127NotificationType.acp127.pn",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_p772_Acp127NotificationType_acp127_tn,
-      { "acp127-tn", "p772.acp127-tn",
+      { "acp127-tn", "p772.Acp127NotificationType.acp127.tn",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index c3d20dcb1c..648a3539a5 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -18208,115 +18208,115 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "Outcome_value", HFILL }},
     { &hf_pcap_AvailableSignatures_signature15,
-      { "signature15", "pcap.signature15",
+      { "signature15", "pcap.AvailableSignatures.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature14,
-      { "signature14", "pcap.signature14",
+      { "signature14", "pcap.AvailableSignatures.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature13,
-      { "signature13", "pcap.signature13",
+      { "signature13", "pcap.AvailableSignatures.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature12,
-      { "signature12", "pcap.signature12",
+      { "signature12", "pcap.AvailableSignatures.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature11,
-      { "signature11", "pcap.signature11",
+      { "signature11", "pcap.AvailableSignatures.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature10,
-      { "signature10", "pcap.signature10",
+      { "signature10", "pcap.AvailableSignatures.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature9,
-      { "signature9", "pcap.signature9",
+      { "signature9", "pcap.AvailableSignatures.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature8,
-      { "signature8", "pcap.signature8",
+      { "signature8", "pcap.AvailableSignatures.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature7,
-      { "signature7", "pcap.signature7",
+      { "signature7", "pcap.AvailableSignatures.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature6,
-      { "signature6", "pcap.signature6",
+      { "signature6", "pcap.AvailableSignatures.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature5,
-      { "signature5", "pcap.signature5",
+      { "signature5", "pcap.AvailableSignatures.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature4,
-      { "signature4", "pcap.signature4",
+      { "signature4", "pcap.AvailableSignatures.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature3,
-      { "signature3", "pcap.signature3",
+      { "signature3", "pcap.AvailableSignatures.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature2,
-      { "signature2", "pcap.signature2",
+      { "signature2", "pcap.AvailableSignatures.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature1,
-      { "signature1", "pcap.signature1",
+      { "signature1", "pcap.AvailableSignatures.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature0,
-      { "signature0", "pcap.signature0",
+      { "signature0", "pcap.AvailableSignatures.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh11,
-      { "subCh11", "pcap.subCh11",
+      { "subCh11", "pcap.AvailableSubChannelNumbers.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh10,
-      { "subCh10", "pcap.subCh10",
+      { "subCh10", "pcap.AvailableSubChannelNumbers.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh9,
-      { "subCh9", "pcap.subCh9",
+      { "subCh9", "pcap.AvailableSubChannelNumbers.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh8,
-      { "subCh8", "pcap.subCh8",
+      { "subCh8", "pcap.AvailableSubChannelNumbers.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh7,
-      { "subCh7", "pcap.subCh7",
+      { "subCh7", "pcap.AvailableSubChannelNumbers.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh6,
-      { "subCh6", "pcap.subCh6",
+      { "subCh6", "pcap.AvailableSubChannelNumbers.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh5,
-      { "subCh5", "pcap.subCh5",
+      { "subCh5", "pcap.AvailableSubChannelNumbers.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh4,
-      { "subCh4", "pcap.subCh4",
+      { "subCh4", "pcap.AvailableSubChannelNumbers.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh3,
-      { "subCh3", "pcap.subCh3",
+      { "subCh3", "pcap.AvailableSubChannelNumbers.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh2,
-      { "subCh2", "pcap.subCh2",
+      { "subCh2", "pcap.AvailableSubChannelNumbers.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh1,
-      { "subCh1", "pcap.subCh1",
+      { "subCh1", "pcap.AvailableSubChannelNumbers.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh0,
-      { "subCh0", "pcap.subCh0",
+      { "subCh0", "pcap.AvailableSubChannelNumbers.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c
index 48e30a9296..d6da566e2d 100644
--- a/epan/dissectors/packet-pkixac.c
+++ b/epan/dissectors/packet-pkixac.c
@@ -773,27 +773,27 @@ void proto_register_pkixac(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_unmarked,
-      { "unmarked", "pkixac.unmarked",
+      { "unmarked", "pkixac.ClassList.unmarked",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_unclassified,
-      { "unclassified", "pkixac.unclassified",
+      { "unclassified", "pkixac.ClassList.unclassified",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_restricted,
-      { "restricted", "pkixac.restricted",
+      { "restricted", "pkixac.ClassList.restricted",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_confidential,
-      { "confidential", "pkixac.confidential",
+      { "confidential", "pkixac.ClassList.confidential",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_secret,
-      { "secret", "pkixac.secret",
+      { "secret", "pkixac.ClassList.secret",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pkixac_ClassList_topSecret,
-      { "topSecret", "pkixac.topSecret",
+      { "topSecret", "pkixac.ClassList.topSecret",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index f27a715eea..373627c319 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -66,30 +66,30 @@ static int hf_pkixtsp_millis = -1;                /* INTEGER_1_999 */
 static int hf_pkixtsp_micros = -1;                /* INTEGER_1_999 */
 /* named bits */
 static int hf_pkixtsp_PKIFailureInfo_badAlg = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_1 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit1 = -1;
 static int hf_pkixtsp_PKIFailureInfo_badRequest = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_3 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_4 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit3 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit4 = -1;
 static int hf_pkixtsp_PKIFailureInfo_badDataFormat = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_6 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_7 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_8 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_9 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_10 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_11 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_12 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_13 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit6 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit7 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit8 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit9 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit10 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit11 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit12 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit13 = -1;
 static int hf_pkixtsp_PKIFailureInfo_timeNotAvailable = -1;
 static int hf_pkixtsp_PKIFailureInfo_unacceptedPolicy = -1;
 static int hf_pkixtsp_PKIFailureInfo_unacceptedExtension = -1;
 static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_18 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_19 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_20 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_21 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_22 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_23 = -1;
-static int hf_pkixtsp_PKIFailureInfo_spare_bit_24 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit18 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit19 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit20 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit21 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit22 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit23 = -1;
+static int hf_pkixtsp_PKIFailureInfo_spare_bit24 = -1;
 static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1;
 
 /*--- End of included file: packet-pkixtsp-hf.c ---*/
@@ -225,30 +225,30 @@ dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 static const int * PKIFailureInfo_bits[] = {
   &hf_pkixtsp_PKIFailureInfo_badAlg,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_1,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit1,
   &hf_pkixtsp_PKIFailureInfo_badRequest,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_3,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_4,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit3,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit4,
   &hf_pkixtsp_PKIFailureInfo_badDataFormat,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_6,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_7,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_8,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_9,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_10,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_11,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_12,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_13,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit6,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit7,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit8,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit9,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit10,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit11,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit12,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit13,
   &hf_pkixtsp_PKIFailureInfo_timeNotAvailable,
   &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy,
   &hf_pkixtsp_PKIFailureInfo_unacceptedExtension,
   &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_18,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_19,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_20,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_21,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_22,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_23,
-  &hf_pkixtsp_PKIFailureInfo_spare_bit_24,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit18,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit19,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit20,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit21,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit22,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit23,
+  &hf_pkixtsp_PKIFailureInfo_spare_bit24,
   &hf_pkixtsp_PKIFailureInfo_systemFailure,
   NULL
 };
@@ -553,107 +553,107 @@ void proto_register_pkixtsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_999", HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badAlg,
-      { "badAlg", "pkixtsp.badAlg",
+      { "badAlg", "pkixtsp.PKIFailureInfo.badAlg",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_1,
-      { "spare_bit_1", "pkixtsp.spare_bit_1",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit1,
+      { "spare_bit1", "pkixtsp.PKIFailureInfo.spare.bit1",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badRequest,
-      { "badRequest", "pkixtsp.badRequest",
+      { "badRequest", "pkixtsp.PKIFailureInfo.badRequest",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_3,
-      { "spare_bit_3", "pkixtsp.spare_bit_3",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit3,
+      { "spare_bit3", "pkixtsp.PKIFailureInfo.spare.bit3",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_4,
-      { "spare_bit_4", "pkixtsp.spare_bit_4",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit4,
+      { "spare_bit4", "pkixtsp.PKIFailureInfo.spare.bit4",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badDataFormat,
-      { "badDataFormat", "pkixtsp.badDataFormat",
+      { "badDataFormat", "pkixtsp.PKIFailureInfo.badDataFormat",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_6,
-      { "spare_bit_6", "pkixtsp.spare_bit_6",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit6,
+      { "spare_bit6", "pkixtsp.PKIFailureInfo.spare.bit6",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_7,
-      { "spare_bit_7", "pkixtsp.spare_bit_7",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit7,
+      { "spare_bit7", "pkixtsp.PKIFailureInfo.spare.bit7",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_8,
-      { "spare_bit_8", "pkixtsp.spare_bit_8",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit8,
+      { "spare_bit8", "pkixtsp.PKIFailureInfo.spare.bit8",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_9,
-      { "spare_bit_9", "pkixtsp.spare_bit_9",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit9,
+      { "spare_bit9", "pkixtsp.PKIFailureInfo.spare.bit9",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_10,
-      { "spare_bit_10", "pkixtsp.spare_bit_10",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit10,
+      { "spare_bit10", "pkixtsp.PKIFailureInfo.spare.bit10",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_11,
-      { "spare_bit_11", "pkixtsp.spare_bit_11",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit11,
+      { "spare_bit11", "pkixtsp.PKIFailureInfo.spare.bit11",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_12,
-      { "spare_bit_12", "pkixtsp.spare_bit_12",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit12,
+      { "spare_bit12", "pkixtsp.PKIFailureInfo.spare.bit12",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_13,
-      { "spare_bit_13", "pkixtsp.spare_bit_13",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit13,
+      { "spare_bit13", "pkixtsp.PKIFailureInfo.spare.bit13",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_timeNotAvailable,
-      { "timeNotAvailable", "pkixtsp.timeNotAvailable",
+      { "timeNotAvailable", "pkixtsp.PKIFailureInfo.timeNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy,
-      { "unacceptedPolicy", "pkixtsp.unacceptedPolicy",
+      { "unacceptedPolicy", "pkixtsp.PKIFailureInfo.unacceptedPolicy",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_unacceptedExtension,
-      { "unacceptedExtension", "pkixtsp.unacceptedExtension",
+      { "unacceptedExtension", "pkixtsp.PKIFailureInfo.unacceptedExtension",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable,
-      { "addInfoNotAvailable", "pkixtsp.addInfoNotAvailable",
+      { "addInfoNotAvailable", "pkixtsp.PKIFailureInfo.addInfoNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_18,
-      { "spare_bit_18", "pkixtsp.spare_bit_18",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit18,
+      { "spare_bit18", "pkixtsp.PKIFailureInfo.spare.bit18",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_19,
-      { "spare_bit_19", "pkixtsp.spare_bit_19",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit19,
+      { "spare_bit19", "pkixtsp.PKIFailureInfo.spare.bit19",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_20,
-      { "spare_bit_20", "pkixtsp.spare_bit_20",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit20,
+      { "spare_bit20", "pkixtsp.PKIFailureInfo.spare.bit20",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_21,
-      { "spare_bit_21", "pkixtsp.spare_bit_21",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit21,
+      { "spare_bit21", "pkixtsp.PKIFailureInfo.spare.bit21",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_22,
-      { "spare_bit_22", "pkixtsp.spare_bit_22",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit22,
+      { "spare_bit22", "pkixtsp.PKIFailureInfo.spare.bit22",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_23,
-      { "spare_bit_23", "pkixtsp.spare_bit_23",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit23,
+      { "spare_bit23", "pkixtsp.PKIFailureInfo.spare.bit23",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
-    { &hf_pkixtsp_PKIFailureInfo_spare_bit_24,
-      { "spare_bit_24", "pkixtsp.spare_bit_24",
+    { &hf_pkixtsp_PKIFailureInfo_spare_bit24,
+      { "spare_bit24", "pkixtsp.PKIFailureInfo.spare.bit24",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_systemFailure,
-      { "systemFailure", "pkixtsp.systemFailure",
+      { "systemFailure", "pkixtsp.PKIFailureInfo.systemFailure",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index ee1cd44187..853823f592 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1736,79 +1736,79 @@ void proto_register_pres(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_pres_Presentation_requirements_context_management,
-      { "context-management", "pres.context-management",
+      { "context-management", "pres.Presentation.requirements.context.management",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pres_Presentation_requirements_restoration,
-      { "restoration", "pres.restoration",
+      { "restoration", "pres.Presentation.requirements.restoration",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pres_Protocol_options_nominated_context,
-      { "nominated-context", "pres.nominated-context",
+      { "nominated-context", "pres.Protocol.options.nominated.context",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pres_Protocol_options_short_encoding,
-      { "short-encoding", "pres.short-encoding",
+      { "short-encoding", "pres.Protocol.options.short.encoding",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pres_Protocol_options_packed_encoding_rules,
-      { "packed-encoding-rules", "pres.packed-encoding-rules",
+      { "packed-encoding-rules", "pres.Protocol.options.packed.encoding.rules",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pres_Protocol_version_version_1,
-      { "version-1", "pres.version-1",
+      { "version-1", "pres.Protocol.version.version.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_half_duplex,
-      { "half-duplex", "pres.half-duplex",
+      { "half-duplex", "pres.User.session.requirements.half.duplex",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_duplex,
-      { "duplex", "pres.duplex",
+      { "duplex", "pres.User.session.requirements.duplex",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_expedited_data,
-      { "expedited-data", "pres.expedited-data",
+      { "expedited-data", "pres.User.session.requirements.expedited.data",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_minor_synchronize,
-      { "minor-synchronize", "pres.minor-synchronize",
+      { "minor-synchronize", "pres.User.session.requirements.minor.synchronize",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_major_synchronize,
-      { "major-synchronize", "pres.major-synchronize",
+      { "major-synchronize", "pres.User.session.requirements.major.synchronize",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_resynchronize,
-      { "resynchronize", "pres.resynchronize",
+      { "resynchronize", "pres.User.session.requirements.resynchronize",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_activity_management,
-      { "activity-management", "pres.activity-management",
+      { "activity-management", "pres.User.session.requirements.activity.management",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_negotiated_release,
-      { "negotiated-release", "pres.negotiated-release",
+      { "negotiated-release", "pres.User.session.requirements.negotiated.release",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_capability_data,
-      { "capability-data", "pres.capability-data",
+      { "capability-data", "pres.User.session.requirements.capability.data",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_exceptions,
-      { "exceptions", "pres.exceptions",
+      { "exceptions", "pres.User.session.requirements.exceptions",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_typed_data,
-      { "typed-data", "pres.typed-data",
+      { "typed-data", "pres.User.session.requirements.typed.data",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_symmetric_synchronize,
-      { "symmetric-synchronize", "pres.symmetric-synchronize",
+      { "symmetric-synchronize", "pres.User.session.requirements.symmetric.synchronize",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_pres_User_session_requirements_data_separation,
-      { "data-separation", "pres.data-separation",
+      { "data-separation", "pres.User.session.requirements.data.separation",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 4556498863..29543fb83a 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -931,7 +931,7 @@ static int hf_qsig_dnd_serviceList = -1;          /* ServiceList */
 static int hf_qsig_dnd_extendedServiceList = -1;  /* T_extendedServiceList */
 static int hf_qsig_dnd_extendedServiceList_01 = -1;  /* T_extendedServiceList_01 */
 /* named bits */
-static int hf_qsig_dnd_ServiceList_spare_bit_0 = -1;
+static int hf_qsig_dnd_ServiceList_spare_bit0 = -1;
 static int hf_qsig_dnd_ServiceList_dndo_low = -1;
 static int hf_qsig_dnd_ServiceList_dndo_medium = -1;
 static int hf_qsig_dnd_ServiceList_dndo_high = -1;
@@ -960,10 +960,10 @@ static int hf_qsig_ci_resultExtension = -1;       /* T_resultExtension */
 static int hf_qsig_ci_ciProtectionLevel = -1;     /* CIProtectionLevel */
 static int hf_qsig_ci_resultExtension_01 = -1;    /* T_resultExtension_01 */
 /* named bits */
-static int hf_qsig_ci_ServiceList_spare_bit_0 = -1;
-static int hf_qsig_ci_ServiceList_spare_bit_1 = -1;
-static int hf_qsig_ci_ServiceList_spare_bit_2 = -1;
-static int hf_qsig_ci_ServiceList_spare_bit_3 = -1;
+static int hf_qsig_ci_ServiceList_spare_bit0 = -1;
+static int hf_qsig_ci_ServiceList_spare_bit1 = -1;
+static int hf_qsig_ci_ServiceList_spare_bit2 = -1;
+static int hf_qsig_ci_ServiceList_spare_bit3 = -1;
 static int hf_qsig_ci_ServiceList_ci_low = -1;
 static int hf_qsig_ci_ServiceList_ci_medium = -1;
 static int hf_qsig_ci_ServiceList_ci_high = -1;
@@ -1454,8 +1454,8 @@ static int hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted = -1
 static int hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError = -1;
 static int hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying = -1;
 static int hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying = -1;
-static int hf_qsig_sms_SmscControlParameterHeader_spare_bit_4 = -1;
-static int hf_qsig_sms_SmscControlParameterHeader_spare_bit_5 = -1;
+static int hf_qsig_sms_SmscControlParameterHeader_spare_bit4 = -1;
+static int hf_qsig_sms_SmscControlParameterHeader_spare_bit5 = -1;
 static int hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM = -1;
 static int hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR = -1;
 
@@ -4907,7 +4907,7 @@ dissect_qsig_dnd_DNDOverrideArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 
 static const int * qsig_dnd_ServiceList_bits[] = {
-  &hf_qsig_dnd_ServiceList_spare_bit_0,
+  &hf_qsig_dnd_ServiceList_spare_bit0,
   &hf_qsig_dnd_ServiceList_dndo_low,
   &hf_qsig_dnd_ServiceList_dndo_medium,
   &hf_qsig_dnd_ServiceList_dndo_high,
@@ -5082,10 +5082,10 @@ static int dissect_qsig_dnd_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 static const int * qsig_ci_ServiceList_bits[] = {
-  &hf_qsig_ci_ServiceList_spare_bit_0,
-  &hf_qsig_ci_ServiceList_spare_bit_1,
-  &hf_qsig_ci_ServiceList_spare_bit_2,
-  &hf_qsig_ci_ServiceList_spare_bit_3,
+  &hf_qsig_ci_ServiceList_spare_bit0,
+  &hf_qsig_ci_ServiceList_spare_bit1,
+  &hf_qsig_ci_ServiceList_spare_bit2,
+  &hf_qsig_ci_ServiceList_spare_bit3,
   &hf_qsig_ci_ServiceList_ci_low,
   &hf_qsig_ci_ServiceList_ci_medium,
   &hf_qsig_ci_ServiceList_ci_high,
@@ -9929,8 +9929,8 @@ static const int * qsig_sms_SmscControlParameterHeader_bits[] = {
   &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError,
   &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying,
   &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying,
-  &hf_qsig_sms_SmscControlParameterHeader_spare_bit_4,
-  &hf_qsig_sms_SmscControlParameterHeader_spare_bit_5,
+  &hf_qsig_sms_SmscControlParameterHeader_spare_bit4,
+  &hf_qsig_sms_SmscControlParameterHeader_spare_bit5,
   &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM,
   &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR,
   NULL
@@ -13404,7 +13404,7 @@ void proto_register_qsig(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_ServiceList_callOffer,
-      { "callOffer", "qsig.co.callOffer",
+      { "callOffer", "qsig.co.ServiceList.callOffer",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
 
@@ -13538,20 +13538,20 @@ void proto_register_qsig(void) {
       { "extendedServiceList", "qsig.dnd.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_extendedServiceList_01", HFILL }},
-    { &hf_qsig_dnd_ServiceList_spare_bit_0,
-      { "spare_bit_0", "qsig.dnd.spare_bit_0",
+    { &hf_qsig_dnd_ServiceList_spare_bit0,
+      { "spare_bit0", "qsig.dnd.ServiceList.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_low,
-      { "dndo-low", "qsig.dnd.dndo-low",
+      { "dndo-low", "qsig.dnd.ServiceList.dndo.low",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_medium,
-      { "dndo-medium", "qsig.dnd.dndo-medium",
+      { "dndo-medium", "qsig.dnd.ServiceList.dndo.medium",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_high,
-      { "dndo-high", "qsig.dnd.dndo-high",
+      { "dndo-high", "qsig.dnd.ServiceList.dndo.high",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
@@ -13641,32 +13641,32 @@ void proto_register_qsig(void) {
       { "resultExtension", "qsig.ci.resultExtension",
         FT_UINT32, BASE_DEC, VALS(qsig_ci_T_resultExtension_01_vals), 0,
         "T_resultExtension_01", HFILL }},
-    { &hf_qsig_ci_ServiceList_spare_bit_0,
-      { "spare_bit_0", "qsig.ci.spare_bit_0",
+    { &hf_qsig_ci_ServiceList_spare_bit0,
+      { "spare_bit0", "qsig.ci.ServiceList.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_qsig_ci_ServiceList_spare_bit_1,
-      { "spare_bit_1", "qsig.ci.spare_bit_1",
+    { &hf_qsig_ci_ServiceList_spare_bit1,
+      { "spare_bit1", "qsig.ci.ServiceList.spare.bit1",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_qsig_ci_ServiceList_spare_bit_2,
-      { "spare_bit_2", "qsig.ci.spare_bit_2",
+    { &hf_qsig_ci_ServiceList_spare_bit2,
+      { "spare_bit2", "qsig.ci.ServiceList.spare.bit2",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
-    { &hf_qsig_ci_ServiceList_spare_bit_3,
-      { "spare_bit_3", "qsig.ci.spare_bit_3",
+    { &hf_qsig_ci_ServiceList_spare_bit3,
+      { "spare_bit3", "qsig.ci.ServiceList.spare.bit3",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_low,
-      { "ci-low", "qsig.ci.ci-low",
+      { "ci-low", "qsig.ci.ServiceList.ci.low",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_medium,
-      { "ci-medium", "qsig.ci.ci-medium",
+      { "ci-medium", "qsig.ci.ServiceList.ci.medium",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_high,
-      { "ci-high", "qsig.ci.ci-high",
+      { "ci-high", "qsig.ci.ServiceList.ci.high",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
@@ -14173,75 +14173,75 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String_SIZE_1_10", HFILL }},
     { &hf_qsig_cmn_FeatureIdList_reserved,
-      { "reserved", "qsig.cmn.reserved",
+      { "reserved", "qsig.cmn.FeatureIdList.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported,
-      { "ssCFreRoutingSupported", "qsig.cmn.ssCFreRoutingSupported",
+      { "ssCFreRoutingSupported", "qsig.cmn.FeatureIdList.ssCFreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported,
-      { "ssCTreRoutingSupported", "qsig.cmn.ssCTreRoutingSupported",
+      { "ssCTreRoutingSupported", "qsig.cmn.FeatureIdList.ssCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCBSpossible,
-      { "ssCCBSpossible", "qsig.cmn.ssCCBSpossible",
+      { "ssCCBSpossible", "qsig.cmn.FeatureIdList.ssCCBSpossible",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCNRpossible,
-      { "ssCCNRpossible", "qsig.cmn.ssCCNRpossible",
+      { "ssCCNRpossible", "qsig.cmn.FeatureIdList.ssCCNRpossible",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCOsupported,
-      { "ssCOsupported", "qsig.cmn.ssCOsupported",
+      { "ssCOsupported", "qsig.cmn.FeatureIdList.ssCOsupported",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIforcedRelease,
-      { "ssCIforcedRelease", "qsig.cmn.ssCIforcedRelease",
+      { "ssCIforcedRelease", "qsig.cmn.FeatureIdList.ssCIforcedRelease",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIisolation,
-      { "ssCIisolation", "qsig.cmn.ssCIisolation",
+      { "ssCIisolation", "qsig.cmn.FeatureIdList.ssCIisolation",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIwaitOnBusy,
-      { "ssCIwaitOnBusy", "qsig.cmn.ssCIwaitOnBusy",
+      { "ssCIwaitOnBusy", "qsig.cmn.FeatureIdList.ssCIwaitOnBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportChargeRateProvAtGatewPinx,
-      { "ssAOCsupportChargeRateProvAtGatewPinx", "qsig.cmn.ssAOCsupportChargeRateProvAtGatewPinx",
+      { "ssAOCsupportChargeRateProvAtGatewPinx", "qsig.cmn.FeatureIdList.ssAOCsupportChargeRateProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportInterimChargeProvAtGatewPinx,
-      { "ssAOCsupportInterimChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportInterimChargeProvAtGatewPinx",
+      { "ssAOCsupportInterimChargeProvAtGatewPinx", "qsig.cmn.FeatureIdList.ssAOCsupportInterimChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportFinalChargeProvAtGatewPinx,
-      { "ssAOCsupportFinalChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportFinalChargeProvAtGatewPinx",
+      { "ssAOCsupportFinalChargeProvAtGatewPinx", "qsig.cmn.FeatureIdList.ssAOCsupportFinalChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPRsupportedAtCooperatingPinx,
-      { "anfPRsupportedAtCooperatingPinx", "qsig.cmn.anfPRsupportedAtCooperatingPinx",
+      { "anfPRsupportedAtCooperatingPinx", "qsig.cmn.FeatureIdList.anfPRsupportedAtCooperatingPinx",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptImmediate,
-      { "anfCINTcanInterceptImmediate", "qsig.cmn.anfCINTcanInterceptImmediate",
+      { "anfCINTcanInterceptImmediate", "qsig.cmn.FeatureIdList.anfCINTcanInterceptImmediate",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptDelayed,
-      { "anfCINTcanInterceptDelayed", "qsig.cmn.anfCINTcanInterceptDelayed",
+      { "anfCINTcanInterceptDelayed", "qsig.cmn.FeatureIdList.anfCINTcanInterceptDelayed",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfWTMIreRoutingSupported,
-      { "anfWTMIreRoutingSupported", "qsig.cmn.anfWTMIreRoutingSupported",
+      { "anfWTMIreRoutingSupported", "qsig.cmn.FeatureIdList.anfWTMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPUMIreRoutingSupported,
-      { "anfPUMIreRoutingSupported", "qsig.cmn.anfPUMIreRoutingSupported",
+      { "anfPUMIreRoutingSupported", "qsig.cmn.FeatureIdList.anfPUMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssSSCTreRoutingSupported,
-      { "ssSSCTreRoutingSupported", "qsig.cmn.ssSSCTreRoutingSupported",
+      { "ssSSCTreRoutingSupported", "qsig.cmn.FeatureIdList.ssSSCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
@@ -15459,35 +15459,35 @@ void proto_register_qsig(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted,
-      { "sRforTransactionCompleted", "qsig.sms.sRforTransactionCompleted",
+      { "sRforTransactionCompleted", "qsig.sms.SmscControlParameterHeader.sRforTransactionCompleted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError,
-      { "sRforPermanentError", "qsig.sms.sRforPermanentError",
+      { "sRforPermanentError", "qsig.sms.SmscControlParameterHeader.sRforPermanentError",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying,
-      { "sRforTempErrorSCnotTrying", "qsig.sms.sRforTempErrorSCnotTrying",
+      { "sRforTempErrorSCnotTrying", "qsig.sms.SmscControlParameterHeader.sRforTempErrorSCnotTrying",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying,
-      { "sRforTempErrorSCstillTrying", "qsig.sms.sRforTempErrorSCstillTrying",
+      { "sRforTempErrorSCstillTrying", "qsig.sms.SmscControlParameterHeader.sRforTempErrorSCstillTrying",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_qsig_sms_SmscControlParameterHeader_spare_bit_4,
-      { "spare_bit_4", "qsig.sms.spare_bit_4",
+    { &hf_qsig_sms_SmscControlParameterHeader_spare_bit4,
+      { "spare_bit4", "qsig.sms.SmscControlParameterHeader.spare.bit4",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_qsig_sms_SmscControlParameterHeader_spare_bit_5,
-      { "spare_bit_5", "qsig.sms.spare_bit_5",
+    { &hf_qsig_sms_SmscControlParameterHeader_spare_bit5,
+      { "spare_bit5", "qsig.sms.SmscControlParameterHeader.spare.bit5",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM,
-      { "cancelSRRforConcatenatedSM", "qsig.sms.cancelSRRforConcatenatedSM",
+      { "cancelSRRforConcatenatedSM", "qsig.sms.SmscControlParameterHeader.cancelSRRforConcatenatedSM",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR,
-      { "includeOrigUDHintoSR", "qsig.sms.includeOrigUDHintoSR",
+      { "includeOrigUDHintoSR", "qsig.sms.SmscControlParameterHeader.includeOrigUDHintoSR",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index adddee22f5..b0953db3b5 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -207891,879 +207891,879 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare15,
-      { "spare15", "rrc.spare15",
+      { "spare15", "rrc.T.cipheringAlgorithmCap.spare15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare14,
-      { "spare14", "rrc.spare14",
+      { "spare14", "rrc.T.cipheringAlgorithmCap.spare14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare13,
-      { "spare13", "rrc.spare13",
+      { "spare13", "rrc.T.cipheringAlgorithmCap.spare13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare12,
-      { "spare12", "rrc.spare12",
+      { "spare12", "rrc.T.cipheringAlgorithmCap.spare12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare11,
-      { "spare11", "rrc.spare11",
+      { "spare11", "rrc.T.cipheringAlgorithmCap.spare11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare10,
-      { "spare10", "rrc.spare10",
+      { "spare10", "rrc.T.cipheringAlgorithmCap.spare10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare9,
-      { "spare9", "rrc.spare9",
+      { "spare9", "rrc.T.cipheringAlgorithmCap.spare9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare8,
-      { "spare8", "rrc.spare8",
+      { "spare8", "rrc.T.cipheringAlgorithmCap.spare8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare7,
-      { "spare7", "rrc.spare7",
+      { "spare7", "rrc.T.cipheringAlgorithmCap.spare7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare6,
-      { "spare6", "rrc.spare6",
+      { "spare6", "rrc.T.cipheringAlgorithmCap.spare6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare5,
-      { "spare5", "rrc.spare5",
+      { "spare5", "rrc.T.cipheringAlgorithmCap.spare5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare4,
-      { "spare4", "rrc.spare4",
+      { "spare4", "rrc.T.cipheringAlgorithmCap.spare4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare3,
-      { "spare3", "rrc.spare3",
+      { "spare3", "rrc.T.cipheringAlgorithmCap.spare3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea2,
-      { "uea2", "rrc.uea2",
+      { "uea2", "rrc.T.cipheringAlgorithmCap.uea2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea1,
-      { "uea1", "rrc.uea1",
+      { "uea1", "rrc.T.cipheringAlgorithmCap.uea1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea0,
-      { "uea0", "rrc.uea0",
+      { "uea0", "rrc.T.cipheringAlgorithmCap.uea0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare15,
-      { "spare15", "rrc.spare15",
+      { "spare15", "rrc.T.integrityProtectionAlgorithmCap.spare15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare14,
-      { "spare14", "rrc.spare14",
+      { "spare14", "rrc.T.integrityProtectionAlgorithmCap.spare14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare13,
-      { "spare13", "rrc.spare13",
+      { "spare13", "rrc.T.integrityProtectionAlgorithmCap.spare13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare12,
-      { "spare12", "rrc.spare12",
+      { "spare12", "rrc.T.integrityProtectionAlgorithmCap.spare12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare11,
-      { "spare11", "rrc.spare11",
+      { "spare11", "rrc.T.integrityProtectionAlgorithmCap.spare11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare10,
-      { "spare10", "rrc.spare10",
+      { "spare10", "rrc.T.integrityProtectionAlgorithmCap.spare10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare9,
-      { "spare9", "rrc.spare9",
+      { "spare9", "rrc.T.integrityProtectionAlgorithmCap.spare9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare8,
-      { "spare8", "rrc.spare8",
+      { "spare8", "rrc.T.integrityProtectionAlgorithmCap.spare8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare7,
-      { "spare7", "rrc.spare7",
+      { "spare7", "rrc.T.integrityProtectionAlgorithmCap.spare7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare6,
-      { "spare6", "rrc.spare6",
+      { "spare6", "rrc.T.integrityProtectionAlgorithmCap.spare6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare5,
-      { "spare5", "rrc.spare5",
+      { "spare5", "rrc.T.integrityProtectionAlgorithmCap.spare5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare4,
-      { "spare4", "rrc.spare4",
+      { "spare4", "rrc.T.integrityProtectionAlgorithmCap.spare4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare3,
-      { "spare3", "rrc.spare3",
+      { "spare3", "rrc.T.integrityProtectionAlgorithmCap.spare3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_uia2,
-      { "uia2", "rrc.uia2",
+      { "uia2", "rrc.T.integrityProtectionAlgorithmCap.uia2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_uia1,
-      { "uia1", "rrc.uia1",
+      { "uia1", "rrc.T.integrityProtectionAlgorithmCap.uia1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare0,
-      { "spare0", "rrc.spare0",
+      { "spare0", "rrc.T.integrityProtectionAlgorithmCap.spare0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b3,
-      { "b3", "rrc.b3",
+      { "b3", "rrc.T.assignedSubChannelNumber.b3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b2,
-      { "b2", "rrc.b2",
+      { "b2", "rrc.T.assignedSubChannelNumber.b2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b1,
-      { "b1", "rrc.b1",
+      { "b1", "rrc.T.assignedSubChannelNumber.b1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b0,
-      { "b0", "rrc.b0",
+      { "b0", "rrc.T.assignedSubChannelNumber.b0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex7,
-      { "chCodeIndex7", "rrc.chCodeIndex7",
+      { "chCodeIndex7", "rrc.T.channelisationCodeIndices.chCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex6,
-      { "chCodeIndex6", "rrc.chCodeIndex6",
+      { "chCodeIndex6", "rrc.T.channelisationCodeIndices.chCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex5,
-      { "chCodeIndex5", "rrc.chCodeIndex5",
+      { "chCodeIndex5", "rrc.T.channelisationCodeIndices.chCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex4,
-      { "chCodeIndex4", "rrc.chCodeIndex4",
+      { "chCodeIndex4", "rrc.T.channelisationCodeIndices.chCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex3,
-      { "chCodeIndex3", "rrc.chCodeIndex3",
+      { "chCodeIndex3", "rrc.T.channelisationCodeIndices.chCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex2,
-      { "chCodeIndex2", "rrc.chCodeIndex2",
+      { "chCodeIndex2", "rrc.T.channelisationCodeIndices.chCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex1,
-      { "chCodeIndex1", "rrc.chCodeIndex1",
+      { "chCodeIndex1", "rrc.T.channelisationCodeIndices.chCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex0,
-      { "chCodeIndex0", "rrc.chCodeIndex0",
+      { "chCodeIndex0", "rrc.T.channelisationCodeIndices.chCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.01.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.01.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.01.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.01.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh7,
-      { "subCh7", "rrc.subCh7",
+      { "subCh7", "rrc.T.subchannels.02.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh6,
-      { "subCh6", "rrc.subCh6",
+      { "subCh6", "rrc.T.subchannels.02.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh5,
-      { "subCh5", "rrc.subCh5",
+      { "subCh5", "rrc.T.subchannels.02.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh4,
-      { "subCh4", "rrc.subCh4",
+      { "subCh4", "rrc.T.subchannels.02.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.02.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.02.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.02.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.02.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex15,
-      { "chCodeIndex15", "rrc.chCodeIndex15",
+      { "chCodeIndex15", "rrc.T.channelisationCodeIndices.01.chCodeIndex15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex14,
-      { "chCodeIndex14", "rrc.chCodeIndex14",
+      { "chCodeIndex14", "rrc.T.channelisationCodeIndices.01.chCodeIndex14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex13,
-      { "chCodeIndex13", "rrc.chCodeIndex13",
+      { "chCodeIndex13", "rrc.T.channelisationCodeIndices.01.chCodeIndex13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex12,
-      { "chCodeIndex12", "rrc.chCodeIndex12",
+      { "chCodeIndex12", "rrc.T.channelisationCodeIndices.01.chCodeIndex12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex11,
-      { "chCodeIndex11", "rrc.chCodeIndex11",
+      { "chCodeIndex11", "rrc.T.channelisationCodeIndices.01.chCodeIndex11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex10,
-      { "chCodeIndex10", "rrc.chCodeIndex10",
+      { "chCodeIndex10", "rrc.T.channelisationCodeIndices.01.chCodeIndex10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex9,
-      { "chCodeIndex9", "rrc.chCodeIndex9",
+      { "chCodeIndex9", "rrc.T.channelisationCodeIndices.01.chCodeIndex9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex8,
-      { "chCodeIndex8", "rrc.chCodeIndex8",
+      { "chCodeIndex8", "rrc.T.channelisationCodeIndices.01.chCodeIndex8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex7,
-      { "chCodeIndex7", "rrc.chCodeIndex7",
+      { "chCodeIndex7", "rrc.T.channelisationCodeIndices.01.chCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex6,
-      { "chCodeIndex6", "rrc.chCodeIndex6",
+      { "chCodeIndex6", "rrc.T.channelisationCodeIndices.01.chCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex5,
-      { "chCodeIndex5", "rrc.chCodeIndex5",
+      { "chCodeIndex5", "rrc.T.channelisationCodeIndices.01.chCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex4,
-      { "chCodeIndex4", "rrc.chCodeIndex4",
+      { "chCodeIndex4", "rrc.T.channelisationCodeIndices.01.chCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex3,
-      { "chCodeIndex3", "rrc.chCodeIndex3",
+      { "chCodeIndex3", "rrc.T.channelisationCodeIndices.01.chCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex2,
-      { "chCodeIndex2", "rrc.chCodeIndex2",
+      { "chCodeIndex2", "rrc.T.channelisationCodeIndices.01.chCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex1,
-      { "chCodeIndex1", "rrc.chCodeIndex1",
+      { "chCodeIndex1", "rrc.T.channelisationCodeIndices.01.chCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex0,
-      { "chCodeIndex0", "rrc.chCodeIndex0",
+      { "chCodeIndex0", "rrc.T.channelisationCodeIndices.01.chCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.04.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.04.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.04.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.04.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh7,
-      { "subCh7", "rrc.subCh7",
+      { "subCh7", "rrc.T.subchannels.05.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh6,
-      { "subCh6", "rrc.subCh6",
+      { "subCh6", "rrc.T.subchannels.05.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh5,
-      { "subCh5", "rrc.subCh5",
+      { "subCh5", "rrc.T.subchannels.05.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh4,
-      { "subCh4", "rrc.subCh4",
+      { "subCh4", "rrc.T.subchannels.05.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.05.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.05.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.05.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.05.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh15,
-      { "subCh15", "rrc.subCh15",
+      { "subCh15", "rrc.T.subchannels.06.subCh15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh14,
-      { "subCh14", "rrc.subCh14",
+      { "subCh14", "rrc.T.subchannels.06.subCh14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh13,
-      { "subCh13", "rrc.subCh13",
+      { "subCh13", "rrc.T.subchannels.06.subCh13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh12,
-      { "subCh12", "rrc.subCh12",
+      { "subCh12", "rrc.T.subchannels.06.subCh12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh11,
-      { "subCh11", "rrc.subCh11",
+      { "subCh11", "rrc.T.subchannels.06.subCh11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh10,
-      { "subCh10", "rrc.subCh10",
+      { "subCh10", "rrc.T.subchannels.06.subCh10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh9,
-      { "subCh9", "rrc.subCh9",
+      { "subCh9", "rrc.T.subchannels.06.subCh9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh8,
-      { "subCh8", "rrc.subCh8",
+      { "subCh8", "rrc.T.subchannels.06.subCh8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh7,
-      { "subCh7", "rrc.subCh7",
+      { "subCh7", "rrc.T.subchannels.06.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh6,
-      { "subCh6", "rrc.subCh6",
+      { "subCh6", "rrc.T.subchannels.06.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh5,
-      { "subCh5", "rrc.subCh5",
+      { "subCh5", "rrc.T.subchannels.06.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh4,
-      { "subCh4", "rrc.subCh4",
+      { "subCh4", "rrc.T.subchannels.06.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.06.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.06.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.06.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.06.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex7,
-      { "sulCodeIndex7", "rrc.sulCodeIndex7",
+      { "sulCodeIndex7", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex6,
-      { "sulCodeIndex6", "rrc.sulCodeIndex6",
+      { "sulCodeIndex6", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex5,
-      { "sulCodeIndex5", "rrc.sulCodeIndex5",
+      { "sulCodeIndex5", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex4,
-      { "sulCodeIndex4", "rrc.sulCodeIndex4",
+      { "sulCodeIndex4", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex3,
-      { "sulCodeIndex3", "rrc.sulCodeIndex3",
+      { "sulCodeIndex3", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex2,
-      { "sulCodeIndex2", "rrc.sulCodeIndex2",
+      { "sulCodeIndex2", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex1,
-      { "sulCodeIndex1", "rrc.sulCodeIndex1",
+      { "sulCodeIndex1", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex0,
-      { "sulCodeIndex0", "rrc.sulCodeIndex0",
+      { "sulCodeIndex0", "rrc.T.availableSYNC.UlCodesIndics.sulCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.08.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.08.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.08.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.08.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh7,
-      { "subCh7", "rrc.subCh7",
+      { "subCh7", "rrc.T.subchannels.09.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh6,
-      { "subCh6", "rrc.subCh6",
+      { "subCh6", "rrc.T.subchannels.09.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh5,
-      { "subCh5", "rrc.subCh5",
+      { "subCh5", "rrc.T.subchannels.09.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh4,
-      { "subCh4", "rrc.subCh4",
+      { "subCh4", "rrc.T.subchannels.09.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.T.subchannels.09.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.T.subchannels.09.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.T.subchannels.09.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.T.subchannels.09.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature15,
-      { "signature15", "rrc.signature15",
+      { "signature15", "rrc.AvailableSignatures.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature14,
-      { "signature14", "rrc.signature14",
+      { "signature14", "rrc.AvailableSignatures.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature13,
-      { "signature13", "rrc.signature13",
+      { "signature13", "rrc.AvailableSignatures.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature12,
-      { "signature12", "rrc.signature12",
+      { "signature12", "rrc.AvailableSignatures.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature11,
-      { "signature11", "rrc.signature11",
+      { "signature11", "rrc.AvailableSignatures.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature10,
-      { "signature10", "rrc.signature10",
+      { "signature10", "rrc.AvailableSignatures.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature9,
-      { "signature9", "rrc.signature9",
+      { "signature9", "rrc.AvailableSignatures.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature8,
-      { "signature8", "rrc.signature8",
+      { "signature8", "rrc.AvailableSignatures.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature7,
-      { "signature7", "rrc.signature7",
+      { "signature7", "rrc.AvailableSignatures.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature6,
-      { "signature6", "rrc.signature6",
+      { "signature6", "rrc.AvailableSignatures.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature5,
-      { "signature5", "rrc.signature5",
+      { "signature5", "rrc.AvailableSignatures.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature4,
-      { "signature4", "rrc.signature4",
+      { "signature4", "rrc.AvailableSignatures.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature3,
-      { "signature3", "rrc.signature3",
+      { "signature3", "rrc.AvailableSignatures.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature2,
-      { "signature2", "rrc.signature2",
+      { "signature2", "rrc.AvailableSignatures.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature1,
-      { "signature1", "rrc.signature1",
+      { "signature1", "rrc.AvailableSignatures.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature0,
-      { "signature0", "rrc.signature0",
+      { "signature0", "rrc.AvailableSignatures.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh11,
-      { "subCh11", "rrc.subCh11",
+      { "subCh11", "rrc.AvailableSubChannelNumbers.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh10,
-      { "subCh10", "rrc.subCh10",
+      { "subCh10", "rrc.AvailableSubChannelNumbers.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh9,
-      { "subCh9", "rrc.subCh9",
+      { "subCh9", "rrc.AvailableSubChannelNumbers.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh8,
-      { "subCh8", "rrc.subCh8",
+      { "subCh8", "rrc.AvailableSubChannelNumbers.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh7,
-      { "subCh7", "rrc.subCh7",
+      { "subCh7", "rrc.AvailableSubChannelNumbers.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh6,
-      { "subCh6", "rrc.subCh6",
+      { "subCh6", "rrc.AvailableSubChannelNumbers.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh5,
-      { "subCh5", "rrc.subCh5",
+      { "subCh5", "rrc.AvailableSubChannelNumbers.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh4,
-      { "subCh4", "rrc.subCh4",
+      { "subCh4", "rrc.AvailableSubChannelNumbers.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh3,
-      { "subCh3", "rrc.subCh3",
+      { "subCh3", "rrc.AvailableSubChannelNumbers.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh2,
-      { "subCh2", "rrc.subCh2",
+      { "subCh2", "rrc.AvailableSubChannelNumbers.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh1,
-      { "subCh1", "rrc.subCh1",
+      { "subCh1", "rrc.AvailableSubChannelNumbers.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh0,
-      { "subCh0", "rrc.subCh0",
+      { "subCh0", "rrc.AvailableSubChannelNumbers.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode16_SF16,
-      { "chCode16-SF16", "rrc.chCode16-SF16",
+      { "chCode16-SF16", "rrc.T.bitmap.chCode16.SF16",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode15_SF16,
-      { "chCode15-SF16", "rrc.chCode15-SF16",
+      { "chCode15-SF16", "rrc.T.bitmap.chCode15.SF16",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode14_SF16,
-      { "chCode14-SF16", "rrc.chCode14-SF16",
+      { "chCode14-SF16", "rrc.T.bitmap.chCode14.SF16",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode13_SF16,
-      { "chCode13-SF16", "rrc.chCode13-SF16",
+      { "chCode13-SF16", "rrc.T.bitmap.chCode13.SF16",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode12_SF16,
-      { "chCode12-SF16", "rrc.chCode12-SF16",
+      { "chCode12-SF16", "rrc.T.bitmap.chCode12.SF16",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode11_SF16,
-      { "chCode11-SF16", "rrc.chCode11-SF16",
+      { "chCode11-SF16", "rrc.T.bitmap.chCode11.SF16",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode10_SF16,
-      { "chCode10-SF16", "rrc.chCode10-SF16",
+      { "chCode10-SF16", "rrc.T.bitmap.chCode10.SF16",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode9_SF16,
-      { "chCode9-SF16", "rrc.chCode9-SF16",
+      { "chCode9-SF16", "rrc.T.bitmap.chCode9.SF16",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode8_SF16,
-      { "chCode8-SF16", "rrc.chCode8-SF16",
+      { "chCode8-SF16", "rrc.T.bitmap.chCode8.SF16",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode7_SF16,
-      { "chCode7-SF16", "rrc.chCode7-SF16",
+      { "chCode7-SF16", "rrc.T.bitmap.chCode7.SF16",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode6_SF16,
-      { "chCode6-SF16", "rrc.chCode6-SF16",
+      { "chCode6-SF16", "rrc.T.bitmap.chCode6.SF16",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode5_SF16,
-      { "chCode5-SF16", "rrc.chCode5-SF16",
+      { "chCode5-SF16", "rrc.T.bitmap.chCode5.SF16",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode4_SF16,
-      { "chCode4-SF16", "rrc.chCode4-SF16",
+      { "chCode4-SF16", "rrc.T.bitmap.chCode4.SF16",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode3_SF16,
-      { "chCode3-SF16", "rrc.chCode3-SF16",
+      { "chCode3-SF16", "rrc.T.bitmap.chCode3.SF16",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode2_SF16,
-      { "chCode2-SF16", "rrc.chCode2-SF16",
+      { "chCode2-SF16", "rrc.T.bitmap.chCode2.SF16",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode1_SF16,
-      { "chCode1-SF16", "rrc.chCode1-SF16",
+      { "chCode1-SF16", "rrc.T.bitmap.chCode1.SF16",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode32_SF32,
-      { "chCode32-SF32", "rrc.chCode32-SF32",
+      { "chCode32-SF32", "rrc.T.bitmap.01.chCode32.SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode31_SF32,
-      { "chCode31-SF32", "rrc.chCode31-SF32",
+      { "chCode31-SF32", "rrc.T.bitmap.01.chCode31.SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode30_SF32,
-      { "chCode30-SF32", "rrc.chCode30-SF32",
+      { "chCode30-SF32", "rrc.T.bitmap.01.chCode30.SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode29_SF32,
-      { "chCode29-SF32", "rrc.chCode29-SF32",
+      { "chCode29-SF32", "rrc.T.bitmap.01.chCode29.SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode28_SF32,
-      { "chCode28-SF32", "rrc.chCode28-SF32",
+      { "chCode28-SF32", "rrc.T.bitmap.01.chCode28.SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode27_SF32,
-      { "chCode27-SF32", "rrc.chCode27-SF32",
+      { "chCode27-SF32", "rrc.T.bitmap.01.chCode27.SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode26_SF32,
-      { "chCode26-SF32", "rrc.chCode26-SF32",
+      { "chCode26-SF32", "rrc.T.bitmap.01.chCode26.SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode25_SF32,
-      { "chCode25-SF32", "rrc.chCode25-SF32",
+      { "chCode25-SF32", "rrc.T.bitmap.01.chCode25.SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode24_SF32,
-      { "chCode24-SF32", "rrc.chCode24-SF32",
+      { "chCode24-SF32", "rrc.T.bitmap.01.chCode24.SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode23_SF32,
-      { "chCode23-SF32", "rrc.chCode23-SF32",
+      { "chCode23-SF32", "rrc.T.bitmap.01.chCode23.SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode22_SF32,
-      { "chCode22-SF32", "rrc.chCode22-SF32",
+      { "chCode22-SF32", "rrc.T.bitmap.01.chCode22.SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode21_SF32,
-      { "chCode21-SF32", "rrc.chCode21-SF32",
+      { "chCode21-SF32", "rrc.T.bitmap.01.chCode21.SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode20_SF32,
-      { "chCode20-SF32", "rrc.chCode20-SF32",
+      { "chCode20-SF32", "rrc.T.bitmap.01.chCode20.SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode19_SF32,
-      { "chCode19-SF32", "rrc.chCode19-SF32",
+      { "chCode19-SF32", "rrc.T.bitmap.01.chCode19.SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode18_SF32,
-      { "chCode18-SF32", "rrc.chCode18-SF32",
+      { "chCode18-SF32", "rrc.T.bitmap.01.chCode18.SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode17_SF32,
-      { "chCode17-SF32", "rrc.chCode17-SF32",
+      { "chCode17-SF32", "rrc.T.bitmap.01.chCode17.SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode16_SF32,
-      { "chCode16-SF32", "rrc.chCode16-SF32",
+      { "chCode16-SF32", "rrc.T.bitmap.01.chCode16.SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode15_SF32,
-      { "chCode15-SF32", "rrc.chCode15-SF32",
+      { "chCode15-SF32", "rrc.T.bitmap.01.chCode15.SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode14_SF32,
-      { "chCode14-SF32", "rrc.chCode14-SF32",
+      { "chCode14-SF32", "rrc.T.bitmap.01.chCode14.SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode13_SF32,
-      { "chCode13-SF32", "rrc.chCode13-SF32",
+      { "chCode13-SF32", "rrc.T.bitmap.01.chCode13.SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode12_SF32,
-      { "chCode12-SF32", "rrc.chCode12-SF32",
+      { "chCode12-SF32", "rrc.T.bitmap.01.chCode12.SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode11_SF32,
-      { "chCode11-SF32", "rrc.chCode11-SF32",
+      { "chCode11-SF32", "rrc.T.bitmap.01.chCode11.SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode10_SF32,
-      { "chCode10-SF32", "rrc.chCode10-SF32",
+      { "chCode10-SF32", "rrc.T.bitmap.01.chCode10.SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode9_SF32,
-      { "chCode9-SF32", "rrc.chCode9-SF32",
+      { "chCode9-SF32", "rrc.T.bitmap.01.chCode9.SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode8_SF32,
-      { "chCode8-SF32", "rrc.chCode8-SF32",
+      { "chCode8-SF32", "rrc.T.bitmap.01.chCode8.SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode7_SF32,
-      { "chCode7-SF32", "rrc.chCode7-SF32",
+      { "chCode7-SF32", "rrc.T.bitmap.01.chCode7.SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode6_SF32,
-      { "chCode6-SF32", "rrc.chCode6-SF32",
+      { "chCode6-SF32", "rrc.T.bitmap.01.chCode6.SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode5_SF32,
-      { "chCode5-SF32", "rrc.chCode5-SF32",
+      { "chCode5-SF32", "rrc.T.bitmap.01.chCode5.SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode4_SF32,
-      { "chCode4-SF32", "rrc.chCode4-SF32",
+      { "chCode4-SF32", "rrc.T.bitmap.01.chCode4.SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode3_SF32,
-      { "chCode3-SF32", "rrc.chCode3-SF32",
+      { "chCode3-SF32", "rrc.T.bitmap.01.chCode3.SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode2_SF32,
-      { "chCode2-SF32", "rrc.chCode2-SF32",
+      { "chCode2-SF32", "rrc.T.bitmap.01.chCode2.SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode1_SF32,
-      { "chCode1-SF32", "rrc.chCode1-SF32",
+      { "chCode1-SF32", "rrc.T.bitmap.01.chCode1.SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code7,
-      { "code7", "rrc.code7",
+      { "code7", "rrc.T.sync.UL.CodesBitmap.code7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code6,
-      { "code6", "rrc.code6",
+      { "code6", "rrc.T.sync.UL.CodesBitmap.code6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code5,
-      { "code5", "rrc.code5",
+      { "code5", "rrc.T.sync.UL.CodesBitmap.code5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code4,
-      { "code4", "rrc.code4",
+      { "code4", "rrc.T.sync.UL.CodesBitmap.code4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code3,
-      { "code3", "rrc.code3",
+      { "code3", "rrc.T.sync.UL.CodesBitmap.code3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code2,
-      { "code2", "rrc.code2",
+      { "code2", "rrc.T.sync.UL.CodesBitmap.code2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code1,
-      { "code1", "rrc.code1",
+      { "code1", "rrc.T.sync.UL.CodesBitmap.code1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code0,
-      { "code0", "rrc.code0",
+      { "code0", "rrc.T.sync.UL.CodesBitmap.code0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code7,
-      { "code7", "rrc.code7",
+      { "code7", "rrc.Sync.UL.Codes.Bitmap.code7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code6,
-      { "code6", "rrc.code6",
+      { "code6", "rrc.Sync.UL.Codes.Bitmap.code6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code5,
-      { "code5", "rrc.code5",
+      { "code5", "rrc.Sync.UL.Codes.Bitmap.code5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code4,
-      { "code4", "rrc.code4",
+      { "code4", "rrc.Sync.UL.Codes.Bitmap.code4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code3,
-      { "code3", "rrc.code3",
+      { "code3", "rrc.Sync.UL.Codes.Bitmap.code3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code2,
-      { "code2", "rrc.code2",
+      { "code2", "rrc.Sync.UL.Codes.Bitmap.code2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code1,
-      { "code1", "rrc.code1",
+      { "code1", "rrc.Sync.UL.Codes.Bitmap.code1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code0,
-      { "code0", "rrc.code0",
+      { "code0", "rrc.Sync.UL.Codes.Bitmap.code0",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_7,
-      { "a5-7", "rrc.a5-7",
+      { "a5-7", "rrc.GsmSecurityCapability.a5.7",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_6,
-      { "a5-6", "rrc.a5-6",
+      { "a5-6", "rrc.GsmSecurityCapability.a5.6",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_5,
-      { "a5-5", "rrc.a5-5",
+      { "a5-5", "rrc.GsmSecurityCapability.a5.5",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_4,
-      { "a5-4", "rrc.a5-4",
+      { "a5-4", "rrc.GsmSecurityCapability.a5.4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_3,
-      { "a5-3", "rrc.a5-3",
+      { "a5-3", "rrc.GsmSecurityCapability.a5.3",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_2,
-      { "a5-2", "rrc.a5-2",
+      { "a5-2", "rrc.GsmSecurityCapability.a5.2",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_1,
-      { "a5-1", "rrc.a5-1",
+      { "a5-1", "rrc.GsmSecurityCapability.a5.1",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 95abe5efd9..81d1c07290 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -847,7 +847,7 @@ static int hf_rrlp_GPSAssistance_ephemerisExtension = -1;
 static int hf_rrlp_GPSAssistance_ephemerisExtensionCheck = -1;
 static int hf_rrlp_CommonGANSSAssistance_referenceTime = -1;
 static int hf_rrlp_CommonGANSSAssistance_referenceLocation = -1;
-static int hf_rrlp_CommonGANSSAssistance_spare_bit_2 = -1;
+static int hf_rrlp_CommonGANSSAssistance_spare_bit2 = -1;
 static int hf_rrlp_CommonGANSSAssistance_ionosphericModel = -1;
 static int hf_rrlp_CommonGANSSAssistance_addIonosphericModel = -1;
 static int hf_rrlp_CommonGANSSAssistance_earthOrientationParam = -1;
@@ -6956,7 +6956,7 @@ dissect_rrlp_GPSAssistance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 static const int * CommonGANSSAssistance_bits[] = {
   &hf_rrlp_CommonGANSSAssistance_referenceTime,
   &hf_rrlp_CommonGANSSAssistance_referenceLocation,
-  &hf_rrlp_CommonGANSSAssistance_spare_bit_2,
+  &hf_rrlp_CommonGANSSAssistance_spare_bit2,
   &hf_rrlp_CommonGANSSAssistance_ionosphericModel,
   &hf_rrlp_CommonGANSSAssistance_addIonosphericModel,
   &hf_rrlp_CommonGANSSAssistance_earthOrientationParam,
@@ -10209,295 +10209,295 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GANSSModelID", HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_gps,
-      { "gps", "rrlp.gps",
+      { "gps", "rrlp.GANSSPositioningMethod.gps",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_galileo,
-      { "galileo", "rrlp.galileo",
+      { "galileo", "rrlp.GANSSPositioningMethod.galileo",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_sbas,
-      { "sbas", "rrlp.sbas",
+      { "sbas", "rrlp.GANSSPositioningMethod.sbas",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_modernizedGPS,
-      { "modernizedGPS", "rrlp.modernizedGPS",
+      { "modernizedGPS", "rrlp.GANSSPositioningMethod.modernizedGPS",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_qzss,
-      { "qzss", "rrlp.qzss",
+      { "qzss", "rrlp.GANSSPositioningMethod.qzss",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_glonass,
-      { "glonass", "rrlp.glonass",
+      { "glonass", "rrlp.GANSSPositioningMethod.glonass",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_e_otd,
-      { "e-otd", "rrlp.e-otd",
+      { "e-otd", "rrlp.PositionData.e.otd",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_gps,
-      { "gps", "rrlp.gps",
+      { "gps", "rrlp.PositionData.gps",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_galileo,
-      { "galileo", "rrlp.galileo",
+      { "galileo", "rrlp.PositionData.galileo",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_sbas,
-      { "sbas", "rrlp.sbas",
+      { "sbas", "rrlp.PositionData.sbas",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_modernizedGPS,
-      { "modernizedGPS", "rrlp.modernizedGPS",
+      { "modernizedGPS", "rrlp.PositionData.modernizedGPS",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_qzss,
-      { "qzss", "rrlp.qzss",
+      { "qzss", "rrlp.PositionData.qzss",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_PositionData_glonass,
-      { "glonass", "rrlp.glonass",
+      { "glonass", "rrlp.PositionData.glonass",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrlp_NonGANSSPositionMethods_msAssistedEOTD,
-      { "msAssistedEOTD", "rrlp.msAssistedEOTD",
+      { "msAssistedEOTD", "rrlp.NonGANSSPositionMethods.msAssistedEOTD",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_NonGANSSPositionMethods_msBasedEOTD,
-      { "msBasedEOTD", "rrlp.msBasedEOTD",
+      { "msBasedEOTD", "rrlp.NonGANSSPositionMethods.msBasedEOTD",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_NonGANSSPositionMethods_msAssistedGPS,
-      { "msAssistedGPS", "rrlp.msAssistedGPS",
+      { "msAssistedGPS", "rrlp.NonGANSSPositionMethods.msAssistedGPS",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_NonGANSSPositionMethods_msBasedGPS,
-      { "msBasedGPS", "rrlp.msBasedGPS",
+      { "msBasedGPS", "rrlp.NonGANSSPositionMethods.msBasedGPS",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_NonGANSSPositionMethods_standaloneGPS,
-      { "standaloneGPS", "rrlp.standaloneGPS",
+      { "standaloneGPS", "rrlp.NonGANSSPositionMethods.standaloneGPS",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethodTypes_msAssisted,
-      { "msAssisted", "rrlp.msAssisted",
+      { "msAssisted", "rrlp.GANSSPositioningMethodTypes.msAssisted",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethodTypes_msBased,
-      { "msBased", "rrlp.msBased",
+      { "msBased", "rrlp.GANSSPositioningMethodTypes.msBased",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethodTypes_standalone,
-      { "standalone", "rrlp.standalone",
+      { "standalone", "rrlp.GANSSPositioningMethodTypes.standalone",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal1,
-      { "signal1", "rrlp.signal1",
+      { "signal1", "rrlp.GANSSSignals.signal1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal2,
-      { "signal2", "rrlp.signal2",
+      { "signal2", "rrlp.GANSSSignals.signal2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal3,
-      { "signal3", "rrlp.signal3",
+      { "signal3", "rrlp.GANSSSignals.signal3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal4,
-      { "signal4", "rrlp.signal4",
+      { "signal4", "rrlp.GANSSSignals.signal4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal5,
-      { "signal5", "rrlp.signal5",
+      { "signal5", "rrlp.GANSSSignals.signal5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal6,
-      { "signal6", "rrlp.signal6",
+      { "signal6", "rrlp.GANSSSignals.signal6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal7,
-      { "signal7", "rrlp.signal7",
+      { "signal7", "rrlp.GANSSSignals.signal7",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrlp_GANSSSignals_signal8,
-      { "signal8", "rrlp.signal8",
+      { "signal8", "rrlp.GANSSSignals.signal8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrlp_SBASID_waas,
-      { "waas", "rrlp.waas",
+      { "waas", "rrlp.SBASID.waas",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_SBASID_egnos,
-      { "egnos", "rrlp.egnos",
+      { "egnos", "rrlp.SBASID.egnos",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_SBASID_masas,
-      { "masas", "rrlp.masas",
+      { "masas", "rrlp.SBASID.masas",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_SBASID_gagan,
-      { "gagan", "rrlp.gagan",
+      { "gagan", "rrlp.SBASID.gagan",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_MultipleMeasurementSets_eotd,
-      { "eotd", "rrlp.eotd",
+      { "eotd", "rrlp.MultipleMeasurementSets.eotd",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_MultipleMeasurementSets_gps,
-      { "gps", "rrlp.gps",
+      { "gps", "rrlp.MultipleMeasurementSets.gps",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_MultipleMeasurementSets_ganss,
-      { "ganss", "rrlp.ganss",
+      { "ganss", "rrlp.MultipleMeasurementSets.ganss",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_almanac,
-      { "almanac", "rrlp.almanac",
+      { "almanac", "rrlp.GPSAssistance.almanac",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_uTCmodel,
-      { "uTCmodel", "rrlp.uTCmodel",
+      { "uTCmodel", "rrlp.GPSAssistance.uTCmodel",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_ionosphericModel,
-      { "ionosphericModel", "rrlp.ionosphericModel",
+      { "ionosphericModel", "rrlp.GPSAssistance.ionosphericModel",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_navigationmodel,
-      { "navigationmodel", "rrlp.navigationmodel",
+      { "navigationmodel", "rrlp.GPSAssistance.navigationmodel",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_dGPScorrections,
-      { "dGPScorrections", "rrlp.dGPScorrections",
+      { "dGPScorrections", "rrlp.GPSAssistance.dGPScorrections",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_referenceLocation,
-      { "referenceLocation", "rrlp.referenceLocation",
+      { "referenceLocation", "rrlp.GPSAssistance.referenceLocation",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_referenceTime,
-      { "referenceTime", "rrlp.referenceTime",
+      { "referenceTime", "rrlp.GPSAssistance.referenceTime",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_acquisitionAssistance,
-      { "acquisitionAssistance", "rrlp.acquisitionAssistance",
+      { "acquisitionAssistance", "rrlp.GPSAssistance.acquisitionAssistance",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_realTimeIntegrity,
-      { "realTimeIntegrity", "rrlp.realTimeIntegrity",
+      { "realTimeIntegrity", "rrlp.GPSAssistance.realTimeIntegrity",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_ephemerisExtension,
-      { "ephemerisExtension", "rrlp.ephemerisExtension",
+      { "ephemerisExtension", "rrlp.GPSAssistance.ephemerisExtension",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GPSAssistance_ephemerisExtensionCheck,
-      { "ephemerisExtensionCheck", "rrlp.ephemerisExtensionCheck",
+      { "ephemerisExtensionCheck", "rrlp.GPSAssistance.ephemerisExtensionCheck",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_CommonGANSSAssistance_referenceTime,
-      { "referenceTime", "rrlp.referenceTime",
+      { "referenceTime", "rrlp.CommonGANSSAssistance.referenceTime",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_CommonGANSSAssistance_referenceLocation,
-      { "referenceLocation", "rrlp.referenceLocation",
+      { "referenceLocation", "rrlp.CommonGANSSAssistance.referenceLocation",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
-    { &hf_rrlp_CommonGANSSAssistance_spare_bit_2,
-      { "spare_bit_2", "rrlp.spare_bit_2",
+    { &hf_rrlp_CommonGANSSAssistance_spare_bit2,
+      { "spare_bit2", "rrlp.CommonGANSSAssistance.spare.bit2",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_CommonGANSSAssistance_ionosphericModel,
-      { "ionosphericModel", "rrlp.ionosphericModel",
+      { "ionosphericModel", "rrlp.CommonGANSSAssistance.ionosphericModel",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_CommonGANSSAssistance_addIonosphericModel,
-      { "addIonosphericModel", "rrlp.addIonosphericModel",
+      { "addIonosphericModel", "rrlp.CommonGANSSAssistance.addIonosphericModel",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_CommonGANSSAssistance_earthOrientationParam,
-      { "earthOrientationParam", "rrlp.earthOrientationParam",
+      { "earthOrientationParam", "rrlp.CommonGANSSAssistance.earthOrientationParam",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_realTimeIntegrity,
-      { "realTimeIntegrity", "rrlp.realTimeIntegrity",
+      { "realTimeIntegrity", "rrlp.GANSSAssistance.realTimeIntegrity",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_differentialCorrections,
-      { "differentialCorrections", "rrlp.differentialCorrections",
+      { "differentialCorrections", "rrlp.GANSSAssistance.differentialCorrections",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_almanac,
-      { "almanac", "rrlp.almanac",
+      { "almanac", "rrlp.GANSSAssistance.almanac",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_referenceMeasurementInformation,
-      { "referenceMeasurementInformation", "rrlp.referenceMeasurementInformation",
+      { "referenceMeasurementInformation", "rrlp.GANSSAssistance.referenceMeasurementInformation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_navigationModel,
-      { "navigationModel", "rrlp.navigationModel",
+      { "navigationModel", "rrlp.GANSSAssistance.navigationModel",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_timeModelGNSS_UTC,
-      { "timeModelGNSS-UTC", "rrlp.timeModelGNSS-UTC",
+      { "timeModelGNSS-UTC", "rrlp.GANSSAssistance.timeModelGNSS.UTC",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_timeModelGNSS_GNSS,
-      { "timeModelGNSS-GNSS", "rrlp.timeModelGNSS-GNSS",
+      { "timeModelGNSS-GNSS", "rrlp.GANSSAssistance.timeModelGNSS.GNSS",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_databitassistance,
-      { "databitassistance", "rrlp.databitassistance",
+      { "databitassistance", "rrlp.GANSSAssistance.databitassistance",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_ephemerisExtension,
-      { "ephemerisExtension", "rrlp.ephemerisExtension",
+      { "ephemerisExtension", "rrlp.GANSSAssistance.ephemerisExtension",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_ephemerisExtensionCheck,
-      { "ephemerisExtensionCheck", "rrlp.ephemerisExtensionCheck",
+      { "ephemerisExtensionCheck", "rrlp.GANSSAssistance.ephemerisExtensionCheck",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_addUTCmodel,
-      { "addUTCmodel", "rrlp.addUTCmodel",
+      { "addUTCmodel", "rrlp.GANSSAssistance.addUTCmodel",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAssistance_auxiliaryInformation,
-      { "auxiliaryInformation", "rrlp.auxiliaryInformation",
+      { "auxiliaryInformation", "rrlp.GANSSAssistance.auxiliaryInformation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model1,
-      { "model1", "rrlp.model1",
+      { "model1", "rrlp.GANSSModelID.model1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model2,
-      { "model2", "rrlp.model2",
+      { "model2", "rrlp.GANSSModelID.model2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model3,
-      { "model3", "rrlp.model3",
+      { "model3", "rrlp.GANSSModelID.model3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model4,
-      { "model4", "rrlp.model4",
+      { "model4", "rrlp.GANSSModelID.model4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model5,
-      { "model5", "rrlp.model5",
+      { "model5", "rrlp.GANSSModelID.model5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model6,
-      { "model6", "rrlp.model6",
+      { "model6", "rrlp.GANSSModelID.model6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model7,
-      { "model7", "rrlp.model7",
+      { "model7", "rrlp.GANSSModelID.model7",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_rrlp_GANSSModelID_model8,
-      { "model8", "rrlp.model8",
+      { "model8", "rrlp.GANSSModelID.model8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 6ddec3262d..1481680b02 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1893,31 +1893,31 @@ void proto_register_spnego(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_delegFlag,
-      { "delegFlag", "spnego.delegFlag",
+      { "delegFlag", "spnego.ContextFlags.delegFlag",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_mutualFlag,
-      { "mutualFlag", "spnego.mutualFlag",
+      { "mutualFlag", "spnego.ContextFlags.mutualFlag",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_replayFlag,
-      { "replayFlag", "spnego.replayFlag",
+      { "replayFlag", "spnego.ContextFlags.replayFlag",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_sequenceFlag,
-      { "sequenceFlag", "spnego.sequenceFlag",
+      { "sequenceFlag", "spnego.ContextFlags.sequenceFlag",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_anonFlag,
-      { "anonFlag", "spnego.anonFlag",
+      { "anonFlag", "spnego.ContextFlags.anonFlag",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_confFlag,
-      { "confFlag", "spnego.confFlag",
+      { "confFlag", "spnego.ContextFlags.confFlag",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_integFlag,
-      { "integFlag", "spnego.integFlag",
+      { "integFlag", "spnego.ContextFlags.integFlag",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index 2231d05ae9..9f3b185ea1 100644
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -3874,11 +3874,11 @@ void proto_register_t124(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_Segmentation_begin,
-      { "begin", "t124.begin",
+      { "begin", "t124.Segmentation.begin",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_t124_Segmentation_end,
-      { "end", "t124.end",
+      { "end", "t124.Segmentation.end",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index d94dc9a6a2..0a4c08bf96 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -3545,15 +3545,15 @@ proto_register_tcap(void)
         FT_INT32, BASE_DEC, VALS(tcap_T_dialogue_service_provider_vals), 0,
         NULL, HFILL }},
     { &hf_tcap_AUDT_protocol_version_version1,
-      { "version1", "tcap.version1",
+      { "version1", "tcap.AUDT.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_tcap_AARQ_protocol_version_version1,
-      { "version1", "tcap.version1",
+      { "version1", "tcap.AARQ.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_tcap_AARE_protocol_version_version1,
-      { "version1", "tcap.version1",
+      { "version1", "tcap.AARE.protocol.version.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index eff6f95ee4..767e51aa61 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -10508,47 +10508,47 @@ void proto_register_ulp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_T_addPosMode_standalone,
-      { "standalone", "ulp.standalone",
+      { "standalone", "ulp.T.addPosMode.standalone",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ulp_T_addPosMode_setBased,
-      { "setBased", "ulp.setBased",
+      { "setBased", "ulp.T.addPosMode.setBased",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ulp_T_addPosMode_setAssisted,
-      { "setAssisted", "ulp.setAssisted",
+      { "setAssisted", "ulp.T.addPosMode.setAssisted",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal1,
-      { "signal1", "ulp.signal1",
+      { "signal1", "ulp.GANSSSignals.signal1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal2,
-      { "signal2", "ulp.signal2",
+      { "signal2", "ulp.GANSSSignals.signal2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal3,
-      { "signal3", "ulp.signal3",
+      { "signal3", "ulp.GANSSSignals.signal3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal4,
-      { "signal4", "ulp.signal4",
+      { "signal4", "ulp.GANSSSignals.signal4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal5,
-      { "signal5", "ulp.signal5",
+      { "signal5", "ulp.GANSSSignals.signal5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal6,
-      { "signal6", "ulp.signal6",
+      { "signal6", "ulp.GANSSSignals.signal6",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal7,
-      { "signal7", "ulp.signal7",
+      { "signal7", "ulp.GANSSSignals.signal7",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal8,
-      { "signal8", "ulp.signal8",
+      { "signal8", "ulp.GANSSSignals.signal8",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 73a7a9cf30..e6fbca3098 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -2692,111 +2692,111 @@ void proto_register_x509ce(void) {
         FT_UINT64, BASE_DEC, NULL, 0,
         "INTEGER_0_MAX", HFILL }},
     { &hf_x509ce_KeyUsage_digitalSignature,
-      { "digitalSignature", "x509ce.digitalSignature",
+      { "digitalSignature", "x509ce.KeyUsage.digitalSignature",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_contentCommitment,
-      { "contentCommitment", "x509ce.contentCommitment",
+      { "contentCommitment", "x509ce.KeyUsage.contentCommitment",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyEncipherment,
-      { "keyEncipherment", "x509ce.keyEncipherment",
+      { "keyEncipherment", "x509ce.KeyUsage.keyEncipherment",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_dataEncipherment,
-      { "dataEncipherment", "x509ce.dataEncipherment",
+      { "dataEncipherment", "x509ce.KeyUsage.dataEncipherment",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyAgreement,
-      { "keyAgreement", "x509ce.keyAgreement",
+      { "keyAgreement", "x509ce.KeyUsage.keyAgreement",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyCertSign,
-      { "keyCertSign", "x509ce.keyCertSign",
+      { "keyCertSign", "x509ce.KeyUsage.keyCertSign",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_cRLSign,
-      { "cRLSign", "x509ce.cRLSign",
+      { "cRLSign", "x509ce.KeyUsage.cRLSign",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_encipherOnly,
-      { "encipherOnly", "x509ce.encipherOnly",
+      { "encipherOnly", "x509ce.KeyUsage.encipherOnly",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_x509ce_KeyUsage_decipherOnly,
-      { "decipherOnly", "x509ce.decipherOnly",
+      { "decipherOnly", "x509ce.KeyUsage.decipherOnly",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_user,
-      { "user", "x509ce.user",
+      { "user", "x509ce.OnlyCertificateTypes.user",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_authority,
-      { "authority", "x509ce.authority",
+      { "authority", "x509ce.OnlyCertificateTypes.authority",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_attribute,
-      { "attribute", "x509ce.attribute",
+      { "attribute", "x509ce.OnlyCertificateTypes.attribute",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_unused,
-      { "unused", "x509ce.unused",
+      { "unused", "x509ce.ReasonFlags.unused",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_keyCompromise,
-      { "keyCompromise", "x509ce.keyCompromise",
+      { "keyCompromise", "x509ce.ReasonFlags.keyCompromise",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_cACompromise,
-      { "cACompromise", "x509ce.cACompromise",
+      { "cACompromise", "x509ce.ReasonFlags.cACompromise",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_affiliationChanged,
-      { "affiliationChanged", "x509ce.affiliationChanged",
+      { "affiliationChanged", "x509ce.ReasonFlags.affiliationChanged",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_superseded,
-      { "superseded", "x509ce.superseded",
+      { "superseded", "x509ce.ReasonFlags.superseded",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_cessationOfOperation,
-      { "cessationOfOperation", "x509ce.cessationOfOperation",
+      { "cessationOfOperation", "x509ce.ReasonFlags.cessationOfOperation",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_certificateHold,
-      { "certificateHold", "x509ce.certificateHold",
+      { "certificateHold", "x509ce.ReasonFlags.certificateHold",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_privilegeWithdrawn,
-      { "privilegeWithdrawn", "x509ce.privilegeWithdrawn",
+      { "privilegeWithdrawn", "x509ce.ReasonFlags.privilegeWithdrawn",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_aACompromise,
-      { "aACompromise", "x509ce.aACompromise",
+      { "aACompromise", "x509ce.ReasonFlags.aACompromise",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed,
-      { "keyUpdateAllowed", "x509ce.keyUpdateAllowed",
+      { "keyUpdateAllowed", "x509ce.EntrustInfoFlags.keyUpdateAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_newExtensions,
-      { "newExtensions", "x509ce.newExtensions",
+      { "newExtensions", "x509ce.EntrustInfoFlags.newExtensions",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_pKIXCertificate,
-      { "pKIXCertificate", "x509ce.pKIXCertificate",
+      { "pKIXCertificate", "x509ce.EntrustInfoFlags.pKIXCertificate",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_enterpriseCategory,
-      { "enterpriseCategory", "x509ce.enterpriseCategory",
+      { "enterpriseCategory", "x509ce.EntrustInfoFlags.enterpriseCategory",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_webCategory,
-      { "webCategory", "x509ce.webCategory",
+      { "webCategory", "x509ce.EntrustInfoFlags.webCategory",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_sETCategory,
-      { "sETCategory", "x509ce.sETCategory",
+      { "sETCategory", "x509ce.EntrustInfoFlags.sETCategory",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 10639033c2..6604b54aef 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -2743,15 +2743,15 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_x509if_AllowedSubset_baseObject,
-      { "baseObject", "x509if.baseObject",
+      { "baseObject", "x509if.AllowedSubset.baseObject",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509if_AllowedSubset_oneLevel,
-      { "oneLevel", "x509if.oneLevel",
+      { "oneLevel", "x509if.AllowedSubset.oneLevel",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509if_AllowedSubset_wholeSubtree,
-      { "wholeSubtree", "x509if.wholeSubtree",
+      { "wholeSubtree", "x509if.AllowedSubset.wholeSubtree",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index e85046bb14..e3099efb3b 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -2439,127 +2439,127 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_x509sat_T_bitDay_sunday,
-      { "sunday", "x509sat.sunday",
+      { "sunday", "x509sat.T.bitDay.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_monday,
-      { "monday", "x509sat.monday",
+      { "monday", "x509sat.T.bitDay.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_tuesday,
-      { "tuesday", "x509sat.tuesday",
+      { "tuesday", "x509sat.T.bitDay.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_wednesday,
-      { "wednesday", "x509sat.wednesday",
+      { "wednesday", "x509sat.T.bitDay.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_thursday,
-      { "thursday", "x509sat.thursday",
+      { "thursday", "x509sat.T.bitDay.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_friday,
-      { "friday", "x509sat.friday",
+      { "friday", "x509sat.T.bitDay.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_x509sat_T_bitDay_saturday,
-      { "saturday", "x509sat.saturday",
+      { "saturday", "x509sat.T.bitDay.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week1,
-      { "week1", "x509sat.week1",
+      { "week1", "x509sat.T.bitWeek.week1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week2,
-      { "week2", "x509sat.week2",
+      { "week2", "x509sat.T.bitWeek.week2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week3,
-      { "week3", "x509sat.week3",
+      { "week3", "x509sat.T.bitWeek.week3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week4,
-      { "week4", "x509sat.week4",
+      { "week4", "x509sat.T.bitWeek.week4",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week5,
-      { "week5", "x509sat.week5",
+      { "week5", "x509sat.T.bitWeek.week5",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_january,
-      { "january", "x509sat.january",
+      { "january", "x509sat.T.bitMonth.january",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_february,
-      { "february", "x509sat.february",
+      { "february", "x509sat.T.bitMonth.february",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_march,
-      { "march", "x509sat.march",
+      { "march", "x509sat.T.bitMonth.march",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_april,
-      { "april", "x509sat.april",
+      { "april", "x509sat.T.bitMonth.april",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_may,
-      { "may", "x509sat.may",
+      { "may", "x509sat.T.bitMonth.may",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_june,
-      { "june", "x509sat.june",
+      { "june", "x509sat.T.bitMonth.june",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_july,
-      { "july", "x509sat.july",
+      { "july", "x509sat.T.bitMonth.july",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_august,
-      { "august", "x509sat.august",
+      { "august", "x509sat.T.bitMonth.august",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_september,
-      { "september", "x509sat.september",
+      { "september", "x509sat.T.bitMonth.september",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_october,
-      { "october", "x509sat.october",
+      { "october", "x509sat.T.bitMonth.october",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_november,
-      { "november", "x509sat.november",
+      { "november", "x509sat.T.bitMonth.november",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_december,
-      { "december", "x509sat.december",
+      { "december", "x509sat.T.bitMonth.december",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_sunday,
-      { "sunday", "x509sat.sunday",
+      { "sunday", "x509sat.T.bitNamedDays.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_monday,
-      { "monday", "x509sat.monday",
+      { "monday", "x509sat.T.bitNamedDays.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_tuesday,
-      { "tuesday", "x509sat.tuesday",
+      { "tuesday", "x509sat.T.bitNamedDays.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_wednesday,
-      { "wednesday", "x509sat.wednesday",
+      { "wednesday", "x509sat.T.bitNamedDays.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_thursday,
-      { "thursday", "x509sat.thursday",
+      { "thursday", "x509sat.T.bitNamedDays.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_friday,
-      { "friday", "x509sat.friday",
+      { "friday", "x509sat.T.bitNamedDays.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_saturday,
-      { "saturday", "x509sat.saturday",
+      { "saturday", "x509sat.T.bitNamedDays.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c
index 58b67b6eed..f8dee4322a 100644
--- a/epan/dissectors/packet-xnap.c
+++ b/epan/dissectors/packet-xnap.c
@@ -980,19 +980,19 @@ static int hf_xnap_T_interfaces_to_trace_x_nc = -1;
 static int hf_xnap_T_interfaces_to_trace_uu = -1;
 static int hf_xnap_T_interfaces_to_trace_f1_c = -1;
 static int hf_xnap_T_interfaces_to_trace_e1 = -1;
-static int hf_xnap_T_nr_EncyptionAlgorithms_spare_bit_0 = -1;
+static int hf_xnap_T_nr_EncyptionAlgorithms_spare_bit0 = -1;
 static int hf_xnap_T_nr_EncyptionAlgorithms_nea1_128 = -1;
 static int hf_xnap_T_nr_EncyptionAlgorithms_nea2_128 = -1;
 static int hf_xnap_T_nr_EncyptionAlgorithms_nea3_128 = -1;
-static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit_0 = -1;
+static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit0 = -1;
 static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128 = -1;
 static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia2_128 = -1;
 static int hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia3_128 = -1;
-static int hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit_0 = -1;
+static int hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit0 = -1;
 static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128 = -1;
 static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea2_128 = -1;
 static int hf_xnap_T_e_utra_EncyptionAlgorithms_eea3_128 = -1;
-static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit_0 = -1;
+static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit0 = -1;
 static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128 = -1;
 static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128 = -1;
 static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia3_128 = -1;
@@ -8480,7 +8480,7 @@ dissect_xnap_UEContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 
 static const int * T_nr_EncyptionAlgorithms_bits[] = {
-  &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit_0,
+  &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit0,
   &hf_xnap_T_nr_EncyptionAlgorithms_nea1_128,
   &hf_xnap_T_nr_EncyptionAlgorithms_nea2_128,
   &hf_xnap_T_nr_EncyptionAlgorithms_nea3_128,
@@ -8512,7 +8512,7 @@ dissect_xnap_T_nr_EncyptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 
 
 static const int * T_nr_IntegrityProtectionAlgorithms_bits[] = {
-  &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit_0,
+  &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit0,
   &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128,
   &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia2_128,
   &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia3_128,
@@ -8544,7 +8544,7 @@ dissect_xnap_T_nr_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U
 
 
 static const int * T_e_utra_EncyptionAlgorithms_bits[] = {
-  &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit_0,
+  &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit0,
   &hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128,
   &hf_xnap_T_e_utra_EncyptionAlgorithms_eea2_128,
   &hf_xnap_T_e_utra_EncyptionAlgorithms_eea3_128,
@@ -8576,7 +8576,7 @@ dissect_xnap_T_e_utra_EncyptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn
 
 
 static const int * T_e_utra_IntegrityProtectionAlgorithms_bits[] = {
-  &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit_0,
+  &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit0,
   &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128,
   &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128,
   &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia3_128,
@@ -15142,95 +15142,95 @@ void proto_register_xnap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_xnap_RAT_RestrictionInformation_e_UTRA,
-      { "e-UTRA", "xnap.e-UTRA",
+      { "e-UTRA", "xnap.RAT.RestrictionInformation.e.UTRA",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_RAT_RestrictionInformation_nR,
-      { "nR", "xnap.nR",
+      { "nR", "xnap.RAT.RestrictionInformation.nR",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_interfaces_to_trace_ng_c,
-      { "ng-c", "xnap.ng-c",
+      { "ng-c", "xnap.T.interfaces.to.trace.ng.c",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_T_interfaces_to_trace_x_nc,
-      { "x-nc", "xnap.x-nc",
+      { "x-nc", "xnap.T.interfaces.to.trace.x.nc",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_interfaces_to_trace_uu,
-      { "uu", "xnap.uu",
+      { "uu", "xnap.T.interfaces.to.trace.uu",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_xnap_T_interfaces_to_trace_f1_c,
-      { "f1-c", "xnap.f1-c",
+      { "f1-c", "xnap.T.interfaces.to.trace.f1.c",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_xnap_T_interfaces_to_trace_e1,
-      { "e1", "xnap.e1",
+      { "e1", "xnap.T.interfaces.to.trace.e1",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
-    { &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit_0,
-      { "spare_bit_0", "xnap.spare_bit_0",
+    { &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit0,
+      { "spare_bit0", "xnap.T.nr.EncyptionAlgorithms.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_T_nr_EncyptionAlgorithms_nea1_128,
-      { "nea1-128", "xnap.nea1-128",
+      { "nea1-128", "xnap.T.nr.EncyptionAlgorithms.nea1.128",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_nr_EncyptionAlgorithms_nea2_128,
-      { "nea2-128", "xnap.nea2-128",
+      { "nea2-128", "xnap.T.nr.EncyptionAlgorithms.nea2.128",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_xnap_T_nr_EncyptionAlgorithms_nea3_128,
-      { "nea3-128", "xnap.nea3-128",
+      { "nea3-128", "xnap.T.nr.EncyptionAlgorithms.nea3.128",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit_0,
-      { "spare_bit_0", "xnap.spare_bit_0",
+    { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit0,
+      { "spare_bit0", "xnap.T.nr.IntegrityProtectionAlgorithms.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128,
-      { "nia1-128", "xnap.nia1-128",
+      { "nia1-128", "xnap.T.nr.IntegrityProtectionAlgorithms.nia1.128",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia2_128,
-      { "nia2-128", "xnap.nia2-128",
+      { "nia2-128", "xnap.T.nr.IntegrityProtectionAlgorithms.nia2.128",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia3_128,
-      { "nia3-128", "xnap.nia3-128",
+      { "nia3-128", "xnap.T.nr.IntegrityProtectionAlgorithms.nia3.128",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit_0,
-      { "spare_bit_0", "xnap.spare_bit_0",
+    { &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit0,
+      { "spare_bit0", "xnap.T.e.utra.EncyptionAlgorithms.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128,
-      { "eea1-128", "xnap.eea1-128",
+      { "eea1-128", "xnap.T.e.utra.EncyptionAlgorithms.eea1.128",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_EncyptionAlgorithms_eea2_128,
-      { "eea2-128", "xnap.eea2-128",
+      { "eea2-128", "xnap.T.e.utra.EncyptionAlgorithms.eea2.128",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_EncyptionAlgorithms_eea3_128,
-      { "eea3-128", "xnap.eea3-128",
+      { "eea3-128", "xnap.T.e.utra.EncyptionAlgorithms.eea3.128",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
-    { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit_0,
-      { "spare_bit_0", "xnap.spare_bit_0",
+    { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit0,
+      { "spare_bit0", "xnap.T.e.utra.IntegrityProtectionAlgorithms.spare.bit0",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128,
-      { "eia1-128", "xnap.eia1-128",
+      { "eia1-128", "xnap.T.e.utra.IntegrityProtectionAlgorithms.eia1.128",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128,
-      { "eia2-128", "xnap.eia2-128",
+      { "eia2-128", "xnap.T.e.utra.IntegrityProtectionAlgorithms.eia2.128",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia3_128,
-      { "eia3-128", "xnap.eia3-128",
+      { "eia3-128", "xnap.T.e.utra.IntegrityProtectionAlgorithms.eia3.128",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c
index 9c5cdd79ef..b2594bda97 100644
--- a/epan/dissectors/packet-z3950.c
+++ b/epan/dissectors/packet-z3950.c
@@ -1506,7 +1506,7 @@ static int hf_z3950_Options_U_resourceCtrl = -1;
 static int hf_z3950_Options_U_accessCtrl = -1;
 static int hf_z3950_Options_U_scan = -1;
 static int hf_z3950_Options_U_sort = -1;
-static int hf_z3950_Options_U_spare_bit_9 = -1;
+static int hf_z3950_Options_U_spare_bit9 = -1;
 static int hf_z3950_Options_U_extendedServices = -1;
 static int hf_z3950_Options_U_level_1Segmentation = -1;
 static int hf_z3950_Options_U_level_2Segmentation = -1;
@@ -2154,7 +2154,7 @@ static const int * Options_U_bits[] = {
   &hf_z3950_Options_U_accessCtrl,
   &hf_z3950_Options_U_scan,
   &hf_z3950_Options_U_sort,
-  &hf_z3950_Options_U_spare_bit_9,
+  &hf_z3950_Options_U_spare_bit9,
   &hf_z3950_Options_U_extendedServices,
   &hf_z3950_Options_U_level_1Segmentation,
   &hf_z3950_Options_U_level_2Segmentation,
@@ -12022,75 +12022,75 @@ void proto_register_z3950(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "InternationalString", HFILL }},
     { &hf_z3950_ProtocolVersion_U_version_1,
-      { "version-1", "z3950.version-1",
+      { "version-1", "z3950.ProtocolVersion.U.version.1",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_z3950_ProtocolVersion_U_version_2,
-      { "version-2", "z3950.version-2",
+      { "version-2", "z3950.ProtocolVersion.U.version.2",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_z3950_ProtocolVersion_U_version_3,
-      { "version-3", "z3950.version-3",
+      { "version-3", "z3950.ProtocolVersion.U.version.3",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_z3950_Options_U_search,
-      { "search", "z3950.search",
+      { "search", "z3950.Options.U.search",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
     { &hf_z3950_Options_U_present,
-      { "present", "z3950.present",
+      { "present", "z3950.Options.U.present",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_z3950_Options_U_delSet,
-      { "delSet", "z3950.delSet",
+      { "delSet", "z3950.Options.U.delSet",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_z3950_Options_U_resourceReport,
-      { "resourceReport", "z3950.resourceReport",
+      { "resourceReport", "z3950.Options.U.resourceReport",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_z3950_Options_U_triggerResourceCtrl,
-      { "triggerResourceCtrl", "z3950.triggerResourceCtrl",
+      { "triggerResourceCtrl", "z3950.Options.U.triggerResourceCtrl",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_z3950_Options_U_resourceCtrl,
-      { "resourceCtrl", "z3950.resourceCtrl",
+      { "resourceCtrl", "z3950.Options.U.resourceCtrl",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_z3950_Options_U_accessCtrl,
-      { "accessCtrl", "z3950.accessCtrl",
+      { "accessCtrl", "z3950.Options.U.accessCtrl",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
     { &hf_z3950_Options_U_scan,
-      { "scan", "z3950.scan",
+      { "scan", "z3950.Options.U.scan",
         FT_BOOLEAN, 8, NULL, 0x01,
         NULL, HFILL }},
     { &hf_z3950_Options_U_sort,
-      { "sort", "z3950.sort",
+      { "sort", "z3950.Options.U.sort",
         FT_BOOLEAN, 8, NULL, 0x80,
         NULL, HFILL }},
-    { &hf_z3950_Options_U_spare_bit_9,
-      { "spare_bit_9", "z3950.spare_bit_9",
+    { &hf_z3950_Options_U_spare_bit9,
+      { "spare_bit9", "z3950.Options.U.spare.bit9",
         FT_BOOLEAN, 8, NULL, 0x40,
         NULL, HFILL }},
     { &hf_z3950_Options_U_extendedServices,
-      { "extendedServices", "z3950.extendedServices",
+      { "extendedServices", "z3950.Options.U.extendedServices",
         FT_BOOLEAN, 8, NULL, 0x20,
         NULL, HFILL }},
     { &hf_z3950_Options_U_level_1Segmentation,
-      { "level-1Segmentation", "z3950.level-1Segmentation",
+      { "level-1Segmentation", "z3950.Options.U.level.1Segmentation",
         FT_BOOLEAN, 8, NULL, 0x10,
         NULL, HFILL }},
     { &hf_z3950_Options_U_level_2Segmentation,
-      { "level-2Segmentation", "z3950.level-2Segmentation",
+      { "level-2Segmentation", "z3950.Options.U.level.2Segmentation",
         FT_BOOLEAN, 8, NULL, 0x08,
         NULL, HFILL }},
     { &hf_z3950_Options_U_concurrentOperations,
-      { "concurrentOperations", "z3950.concurrentOperations",
+      { "concurrentOperations", "z3950.Options.U.concurrentOperations",
         FT_BOOLEAN, 8, NULL, 0x04,
         NULL, HFILL }},
     { &hf_z3950_Options_U_namedResultSets,
-      { "namedResultSets", "z3950.namedResultSets",
+      { "namedResultSets", "z3950.Options.U.namedResultSets",
         FT_BOOLEAN, 8, NULL, 0x02,
         NULL, HFILL }},
author	Anders Broman <anders.broman@ericsson.com>	2019-04-04 14:49:57 +0200
committer	Anders Broman <a.broman58@gmail.com>	2019-04-04 13:26:33 +0000
commit	7edadf9ce38d3c983d8911200aa46f49ade26f2e (patch)
tree	bc747e60a2b59d2e9bab81889f7f00c222a19bd1 /epan/dissectors
parent	b0b02ec245b694251488c80cb605dddf66512b03 (diff)