update filter fields for bug 1803

svn path=/trunk/; revision=23038

7 files changed, 168 insertions, 168 deletions

diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index 501f242e3c..e657733457 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -1731,325 +1731,325 @@ proto_register_fldb (void)
 {
   static hf_register_info hf[] = {
     {&hf_fldb_releaselock_rqst_fsid_low,
-     {"FSID releaselock Low", "hf_fldb_releaselock_rqst_fsid_low", FT_UINT32,
+     {"FSID releaselock Low", "fldb.releaselock_rqst_fsid_low", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_releaselock_rqst_voltype,
-     {"voltype", "hf_fldb_releaselock_rqst_voltype", FT_UINT32, BASE_DEC,
+     {"voltype", "fldb.releaselock_rqst_voltype", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_releaselock_rqst_voloper,
-     {"voloper", "hf_fldb_releaselock_rqst_voloper", FT_UINT32, BASE_DEC,
+     {"voloper", "fldb.releaselock_rqst_voloper", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_setlock_rqst_fsid_high,
-     {"FSID setlock Hi", "hf_fldb_setlock_rqst_fsid_high", FT_UINT32,
+     {"FSID setlock Hi", "fldb.setlock_rqst_fsid_high", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_setlock_rqst_fsid_low,
-     {"FSID setlock Low", "hf_fldb_setlock_rqst_fsid_low", FT_UINT32,
+     {"FSID setlock Low", "fldb.setlock_rqst_fsid_low", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_setlock_rqst_voltype,
-     {"voltype", "hf_fldb_setlock_rqst_voltype", FT_UINT32, BASE_DEC, NULL,
+     {"voltype", "fldb.setlock_rqst_voltype", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_setlock_rqst_voloper,
-     {"voloper", "hf_fldb_setlock_rqst_voloper", FT_UINT32, BASE_DEC, NULL,
+     {"voloper", "fldb.setlock_rqst_voloper", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_setlock_resp_st,
-     {"Error", "hf_fldb_setlock_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Error", "fldb.setlock_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_setlock_resp_st2,
-     {"Error", "hf_fldb_setlock_resp_st2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Error", "fldb.setlock_resp_st2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_listentry_rqst_previous_index,
-     {"Previous Index", "hf_fldb_listentry_rqst_previous_index", FT_UINT32,
+     {"Previous Index", "fldb.listentry_rqst_previous_index", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_listentry_rqst_var1,
-     {"Var 1", "hf_fldb_listentry_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"Var 1", "fldb.listentry_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_listentry_resp_count,
-     {"Count", "hf_fldb_listentry_resp_count", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"Count", "fldb.listentry_resp_count", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_listentry_resp_next_index,
-     {"Next Index", "hf_fldb_listentry_resp_next_index", FT_UINT32, BASE_DEC,
+     {"Next Index", "fldb.listentry_resp_next_index", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_listentry_resp_key_size,
-     {"Key Size", "hf_fldb_listentry_resp_key_size", FT_UINT32, BASE_DEC,
+     {"Key Size", "fldb.listentry_resp_key_size", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_listentry_resp_key_t,
-     {"Volume", "hf_fldb_listentry_resp_key_t", FT_STRING, BASE_NONE, NULL,
+     {"Volume", "fldb.listentry_resp_key_t", FT_STRING, BASE_NONE, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_listentry_resp_voltype,
-     {"VolType", "hf_fldb_listentry_resp_voltype", FT_UINT32, BASE_HEX, NULL,
+     {"VolType", "fldb.listentry_resp_voltype", FT_UINT32, BASE_HEX, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_listentry_resp_key_size2,
-     {"key_size2", "hf_fldb_listentry_resp_key_size2", FT_UINT32, BASE_DEC,
+     {"key_size2", "fldb.listentry_resp_key_size2", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_listentry_resp_key_t2,
-     {"Server", "hf_fldb_listentry_resp_key_t2", FT_STRING, BASE_NONE, NULL,
+     {"Server", "fldb.listentry_resp_key_t2", FT_STRING, BASE_NONE, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_createentry_rqst_key_t,
-     {"Volume", "hf_fldb_createentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
+     {"Volume", "fldb.createentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_createentry_rqst_key_size,
-     {"Volume Size", "hf_fldb_createentry_rqst_key_size", FT_UINT32, BASE_DEC,
+     {"Volume Size", "fldb.createentry_rqst_key_size", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_deleteentry_rqst_fsid_high,
-     {"FSID deleteentry Hi", "hf_fldb_deleteentry_rqst_fsid_high", FT_UINT32,
+     {"FSID deleteentry Hi", "fldb.deleteentry_rqst_fsid_high", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_deleteentry_rqst_fsid_low,
-     {"FSID deleteentry Low", "hf_fldb_deleteentry_rqst_fsid_low", FT_UINT32,
+     {"FSID deleteentry Low", "fldb.deleteentry_rqst_fsid_low", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_deleteentry_rqst_voltype,
-     {"voltype", "hf_fldb_deleteentry_rqst_voltype", FT_UINT32, BASE_DEC,
+     {"voltype", "fldb.deleteentry_rqst_voltype", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_deleteentry_rqst_voloper,
-     {"voloper", "hf_fldb_deleteentry_rqst_voloper", FT_UINT32, BASE_DEC,
+     {"voloper", "fldb.deleteentry_rqst_voloper", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_getentrybyid_rqst_fsid_high,
-     {"FSID deleteentry Hi", "hf_fldb_getentrybyid_rqst_fsid_high", FT_UINT32,
+     {"FSID deleteentry Hi", "fldb.getentrybyid_rqst_fsid_high", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_getentrybyid_rqst_fsid_low,
-     {"FSID getentrybyid Low", "hf_fldb_getentrybyid_rqst_fsid_low",
+     {"FSID getentrybyid Low", "fldb.getentrybyid_rqst_fsid_low",
       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_getentrybyid_rqst_voltype,
-     {"voltype", "hf_fldb_getentrybyid_rqst_voltype", FT_UINT32, BASE_DEC,
+     {"voltype", "fldb.getentrybyid_rqst_voltype", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_getentrybyid_rqst_voloper,
-     {"voloper", "hf_fldb_getentrybyid_rqst_voloper", FT_UINT32, BASE_DEC,
+     {"voloper", "fldb.getentrybyid_rqst_voloper", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_replaceentry_rqst_fsid_high,
-     {"FSID replaceentry Hi", "hf_fldb_replaceentry_rqst_fsid_high",
+     {"FSID replaceentry Hi", "fldb.replaceentry_rqst_fsid_high",
       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_replaceentry_rqst_fsid_low,
-     {"FSID  replaceentry Low", "hf_fldb_replaceentry_rqst_fsid_low",
+     {"FSID  replaceentry Low", "fldb.replaceentry_rqst_fsid_low",
       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_replaceentry_rqst_voltype,
-     {"voltype", "hf_fldb_replaceentry_rqst_voltype", FT_UINT32, BASE_DEC,
+     {"voltype", "fldb.replaceentry_rqst_voltype", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_replaceentry_rqst_key_t,
-     {"Key", "hf_fldb_replaceentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
+     {"Key", "fldb.replaceentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_replaceentry_rqst_key_size,
-     {"Key Size", "hf_fldb_replaceentry_rqst_key_size", FT_UINT32, BASE_DEC,
+     {"Key Size", "fldb.replaceentry_rqst_key_size", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_replaceentry_resp_st,
-     {"Error", "hf_fldb_replaceentry_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"Error", "fldb.replaceentry_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_replaceentry_resp_st2,
-     {"Error", "hf_fldb_replaceentry_resp_st2", FT_UINT32, BASE_DEC, NULL,
+     {"Error", "fldb.replaceentry_resp_st2", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_volumetype,
-     {"hf_fldb_getentrybyname_resp_volumetype",
-      "hf_fldb_getentrybyname_resp_volumetype", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_volumetype",
+      "fldb.getentrybyname_resp_volumetype", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_numservers,
-     {"hf_fldb_getentrybyname_resp_numservers",
-      "hf_fldb_getentrybyname_resp_numservers", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_numservers",
+      "fldb.getentrybyname_resp_numservers", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_sitecookies,
-     {"hf_fldb_getentrybyname_resp_sitecookies",
-      "hf_fldb_getentrybyname_resp_sitecookies", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_sitecookies",
+      "fldb.getentrybyname_resp_sitecookies", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_sitepartition,
-     {"hf_fldb_getentrybyname_resp_sitepartition",
-      "hf_fldb_getentrybyname_resp_sitepartition", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_sitepartition",
+      "fldb.getentrybyname_resp_sitepartition", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_siteflags,
-     {"hf_fldb_getentrybyname_resp_siteflags",
-      "hf_fldb_getentrybyname_resp_siteflags", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_siteflags",
+      "fldb.getentrybyname_resp_siteflags", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_sitemaxreplat,
-     {"hf_fldb_getentrybyname_resp_sitemaxreplat",
-      "hf_fldb_getentrybyname_resp_sitemaxreplat", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_sitemaxreplat",
+      "fldb.getentrybyname_resp_sitemaxreplat", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_volid_high,
-     {"hf_fldb_getentrybyname_resp_volid_high",
-      "hf_fldb_getentrybyname_resp_volid_high", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_volid_high",
+      "fldb.getentrybyname_resp_volid_high", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_volid_low,
-     {"hf_fldb_getentrybyname_resp_volid_low",
-      "hf_fldb_getentrybyname_resp_volid_low", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_volid_low",
+      "fldb.getentrybyname_resp_volid_low", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_voltype,
-     {"hf_fldb_getentrybyname_resp_voltype",
-      "hf_fldb_getentrybyname_resp_voltype", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_voltype",
+      "fldb.getentrybyname_resp_voltype", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_cloneid_high,
-     {"hf_fldb_getentrybyname_resp_cloneid_high",
-      "hf_fldb_getentrybyname_resp_cloneid_high", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_cloneid_high",
+      "fldb.getentrybyname_resp_cloneid_high", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_cloneid_low,
-     {"hf_fldb_getentrybyname_resp_cloneid_low",
-      "hf_fldb_getentrybyname_resp_cloneid_low", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_cloneid_low",
+      "fldb.getentrybyname_resp_cloneid_low", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_flags,
-     {"hf_fldb_getentrybyname_resp_flags",
-      "hf_fldb_getentrybyname_resp_flags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"fldb_getentrybyname_resp_flags",
+      "fldb.getentrybyname_resp_flags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_getentrybyname_resp_maxtotallat,
-     {"hf_fldb_getentrybyname_resp_maxtotallat",
-      "hf_fldb_getentrybyname_resp_maxtotallat", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_maxtotallat",
+      "fldb.getentrybyname_resp_maxtotallat", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_hardmaxtotlat,
-     {"hf_fldb_getentrybyname_resp_hardmaxtotlat",
-      "hf_fldb_getentrybyname_resp_hardmaxtotlat", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_hardmaxtotlat",
+      "fldb.getentrybyname_resp_hardmaxtotlat", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_minpouncedally,
-     {"hf_fldb_getentrybyname_resp_minpouncedally",
-      "hf_fldb_getentrybyname_resp_minpouncedally", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_minpouncedally",
+      "fldb.getentrybyname_resp_minpouncedally", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_defaultmaxreplat,
-     {"hf_fldb_getentrybyname_resp_defaultmaxreplat",
-      "hf_fldb_getentrybyname_resp_defaultmaxreplat", FT_UINT32, BASE_DEC,
+     {"fldb_getentrybyname_resp_defaultmaxreplat",
+      "fldb.getentrybyname_resp_defaultmaxreplat", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_reclaimdally,
-     {"hf_fldb_getentrybyname_resp_reclaimdally",
-      "hf_fldb_getentrybyname_resp_reclaimdally", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_reclaimdally",
+      "fldb.getentrybyname_resp_reclaimdally", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_whenlocked,
-     {"hf_fldb_getentrybyname_resp_whenlocked",
-      "hf_fldb_getentrybyname_resp_whenlocked", FT_UINT32, BASE_DEC, NULL,
+     {"fldb_getentrybyname_resp_whenlocked",
+      "fldb.getentrybyname_resp_whenlocked", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_getentrybyname_resp_spare1,
-     {"hf_fldb_getentrybyname_resp_spare1",
-      "hf_fldb_getentrybyname_resp_spare1", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_spare1",
+      "fldb.getentrybyname_resp_spare1", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_spare2,
-     {"hf_fldb_getentrybyname_resp_spare2",
-      "hf_fldb_getentrybyname_resp_spare2", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_spare2",
+      "fldb.getentrybyname_resp_spare2", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_spare3,
-     {"hf_fldb_getentrybyname_resp_spare3",
-      "hf_fldb_getentrybyname_resp_spare3", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_spare3",
+      "fldb.getentrybyname_resp_spare3", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_spare4,
-     {"hf_fldb_getentrybyname_resp_spare4",
-      "hf_fldb_getentrybyname_resp_spare4", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_spare4",
+      "fldb.getentrybyname_resp_spare4", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_key_t,
-     {"hf_fldb_getentrybyname_resp_key_t",
-      "hf_fldb_getentrybyname_resp_key_t", FT_STRING, BASE_NONE, NULL, 0x0,
+     {"fldb_getentrybyname_resp_key_t",
+      "fldb.getentrybyname_resp_key_t", FT_STRING, BASE_NONE, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_key_size,
-     {"hf_fldb_getentrybyname_resp_key_size",
-      "hf_fldb_getentrybyname_resp_key_size", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"fldb_getentrybyname_resp_key_size",
+      "fldb.getentrybyname_resp_key_size", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_getentrybyname_resp_test,
-     {"hf_fldb_getentrybyname_resp_test", "hf_fldb_getentrybyname_resp_test",
+     {"fldb_getentrybyname_resp_test", "fldb.getentrybyname_resp_test",
       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_releaselock_rqst_fsid_high,
-     {"FSID  releaselock Hi", "hf_fldb_releaselock_rqst_fsid_high", FT_UINT32,
+     {"FSID releaselock Hi", "fldb.releaselock_rqst_fsid_high", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_opnum,
      {"Operation", "fldb.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation",
       HFILL}},
     {&hf_fldb_vldbentry_volumename,
-     {"VolumeName", "vldbentry.volumename", FT_STRING, BASE_NONE, NULL, 0x0,
+     {"VolumeName", "fldb.vldbentry.volumename", FT_STRING, BASE_NONE, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_volumetype,
-     {"VolumeType", "vldbentry.volumetype", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"VolumeType", "fldb.vldbentry.volumetype", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_nservers,
-     {"Number of Servers", "vldbentry.nservers", FT_UINT32, BASE_DEC, NULL,
+     {"Number of Servers", "fldb.vldbentry.nservers", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_afsnetaddr_type,
-     {"Type", "afsnetaddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Type", "fldb.afsnetaddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_afsnetaddr_data,
-     {"IP Data", "afsnetaddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+     {"IP Data", "fldb.afsnetaddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_sitepartition,
-     {"Site Partition", "vldbentry.sitepartition", FT_UINT32, BASE_DEC, NULL,
+     {"Site Partition", "fldb.vldbentry.sitepartition", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_siteflags,
-     {"Site Flags", "vldbentry.siteflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Site Flags", "fldb.vldbentry.siteflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_sitemaxreplicalatency,
-     {"Site Max Replica Latench", "vldbentry.sitemaxreplatency", FT_UINT32,
+     {"Site Max Replica Latench", "fldb.vldbentry.sitemaxreplatency", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vldbentry_siteprincipal,
-     {"Principal Name", "vldbentry.siteprincipal", FT_STRING, BASE_NONE, NULL,
+     {"Principal Name", "fldb.vldbentry.siteprincipal", FT_STRING, BASE_NONE, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_vldbentry_siteowner,
-     {"Site Owner", "vldbentry.siteowner", FT_GUID, BASE_NONE, NULL, 0x0,
+     {"Site Owner", "fldb.vldbentry.siteowner", FT_GUID, BASE_NONE, NULL, 0x0,
       "UUID", HFILL}},
     {&hf_fldb_vldbentry_siteobjid,
-     {"Site Object ID", "vldbentry.siteobjid", FT_GUID, BASE_NONE, NULL,
+     {"Site Object ID", "fldb.vldbentry.siteobjid", FT_GUID, BASE_NONE, NULL,
       0x0, "UUID", HFILL}},
     {&hf_fldb_vldbentry_volids_high,
-     {"VolIDs high", "vldbentry.volidshigh", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"VolIDs high", "fldb.vldbentry.volidshigh", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_volids_low,
-     {"VolIDs low", "vldbentry.volidslow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"VolIDs low", "fldb.vldbentry.volidslow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_voltypes,
-     {"VolTypes", "vldbentry.voltypes", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"VolTypes", "fldb.vldbentry.voltypes", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_cloneid_high,
-     {"CloneID High", "vldbentry.cloneidhigh", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"CloneID High", "fldb.vldbentry.cloneidhigh", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_cloneid_low,
-     {"CloneID Low", "vldbentry.cloneidlow", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"CloneID Low", "fldb.vldbentry.cloneidlow", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_afsflags_flags,
-     {"AFS Flags", "vldbentry.afsflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"AFS Flags", "fldb.vldbentry.afsflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_maxtotallatency,
-     {"Max Total Latency", "vldbentry.maxtotallatency", FT_UINT32, BASE_DEC,
+     {"Max Total Latency", "fldb.vldbentry.maxtotallatency", FT_UINT32, BASE_DEC,
       NULL, 0x0, "", HFILL}},
     {&hf_fldb_vldbentry_hardmaxtotallatency,
-     {"Hard Max Total Latency", "vldbentry.hardmaxtotallatency", FT_UINT32,
+     {"Hard Max Total Latency", "fldb.vldbentry.hardmaxtotallatency", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vldbentry_minimumpouncedally,
-     {"Minimum Pounce Dally", "vldbentry.minimumpouncedally", FT_UINT32,
+     {"Minimum Pounce Dally", "fldb.vldbentry.minimumpouncedally", FT_UINT32,
       BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vldbentry_defaultmaxreplicalatency,
-     {"Default Max Replica Latency", "vldbentry.defaultmaxreplicalatency",
+     {"Default Max Replica Latency", "fldb.vldbentry.defaultmaxreplicalatency",
       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vldbentry_reclaimdally,
-     {"Reclaim Dally", "vldbentry.reclaimdally", FT_UINT32, BASE_DEC, NULL,
+     {"Reclaim Dally", "fldb.vldbentry.reclaimdally", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_vldbentry_whenlocked,
-     {"When Locked", "vldbentry.whenlocked", FT_UINT32, BASE_DEC, NULL, 0x0,
+     {"When Locked", "fldb.vldbentry.whenlocked", FT_UINT32, BASE_DEC, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_spare1,
-     {"Spare 1", "vldbentry.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 1", "fldb.vldbentry.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_spare2,
-     {"Spare 2", "vldbentry.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 2", "fldb.vldbentry.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_spare3,
-     {"Spare 3", "vldbentry.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 3", "fldb.vldbentry.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_spare4,
-     {"Spare 4", "vldbentry.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 4", "fldb.vldbentry.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vldbentry_lockername,
-     {"Locker Name", "vldbentry.lockername", FT_STRING, BASE_NONE, NULL, 0x0,
+     {"Locker Name", "fldb.vldbentry.lockername", FT_STRING, BASE_NONE, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vldbentry_charspares,
-     {"Char Spares", "vldbentry.charspares", FT_STRING, BASE_NONE, NULL, 0x0,
+     {"Char Spares", "fldb.vldbentry.charspares", FT_STRING, BASE_NONE, NULL, 0x0,
       "", HFILL}},
     {&hf_fldb_vlconf_cell_name,
-     {"Name", "vlconf.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Name", "fldb.vlconf.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_cellid_high,
-     {"CellID High", "vlconf.cellidhigh", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"CellID High", "fldb.vlconf.cellidhigh", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vlconf_cell_cellid_low,
-     {"CellID Low", "vlconf.cellidlow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"CellID Low", "fldb.vlconf.cellidlow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vlconf_cell_numservers,
-     {"Number of Servers", "vlconf.numservers", FT_UINT32, BASE_DEC, NULL,
+     {"Number of Servers", "fldb.vlconf.numservers", FT_UINT32, BASE_DEC, NULL,
       0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_hostname,
-     {"hostName", "vlconf.hostname", FT_STRING, BASE_NONE, NULL, 0x0, "",
+     {"hostName", "fldb.vlconf.hostname", FT_STRING, BASE_NONE, NULL, 0x0, "",
       HFILL}},
     {&hf_fldb_vlconf_cell_spare1,
-     {"Spare1", "vlconf.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare1", "fldb.vlconf.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_spare2,
-     {"Spare2", "vlconf.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare2", "fldb.vlconf.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_spare3,
-     {"Spare3", "vlconf.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare3", "fldb.vlconf.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_spare4,
-     {"Spare4", "vlconf.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare4", "fldb.vlconf.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_vlconf_cell_spare5,
-     {"Spare5", "vlconf.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare5", "fldb.vlconf.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_flagsp,
      {"flagsp", "fldb.flagsp", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
     {&hf_fldb_nextstartp,
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 937016c776..a37251bad5 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -266,13 +266,13 @@ proto_register_fcct(void)
           {"Transaction ID", "fcct.ext_tid", FT_UINT32, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_fcct_ext_reqname,
-          {"Requestor Port Name", "fcct_ext_reqnm", FT_BYTES, BASE_HEX, NULL,
+          {"Requestor Port Name", "fcct.ext_reqnm", FT_BYTES, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_fcct_ext_tstamp,
-          {"Timestamp", "fcct_ext_tstamp", FT_BYTES, BASE_HEX, NULL, 0x0, "",
+          {"Timestamp", "fcct.ext_tstamp", FT_BYTES, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_fcct_ext_authblk,
-          {"Auth Hash Blk", "fcct_ext_authblk", FT_BYTES, BASE_HEX, NULL, 0x0,
+          {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_HEX, NULL, 0x0,
            "", HFILL}},
     };
 
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 28d416dafe..18585a88c0 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -1908,7 +1908,7 @@ proto_register_fcdns (void)
           {"Zone Member Type", "fcdns.zone.mbrtype", FT_UINT8, BASE_HEX,
            VALS (fc_swils_zonembr_type_val), 0x0, "", HFILL}},
         { &hf_fcdns_zone_mbrid,
-          {"Member Identifier", "swils.zone.mbrid", FT_STRING, BASE_HEX, NULL,
+          {"Member Identifier", "fcdns.zone.mbrid", FT_STRING, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_fcdns_zonenm,
           {"Zone Name", "fcdns.zonename", FT_STRING, BASE_HEX, NULL, 0x0, "",
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index f14486dfde..2499b23d4a 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -2389,55 +2389,55 @@ proto_register_fcels (void)
           {"Status", "fcels.unbind.status", FT_UINT16, BASE_DEC,
            VALS(unbind_status_vals), 0x0, "Unbind status", HFILL}},
         { &hf_fcels_cmn_cios,
-          {"Cont. Incr. Offset Supported", "fc.fcels.cmn.cios", FT_BOOLEAN, 16, 
+          {"Cont. Incr. Offset Supported", "fcels.cmn.cios", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_cios), 0x8000, "", HFILL}},
         { &hf_fcels_cmn_rro,
-          {"RRO Supported", "fc.fcels.cmn.rro", FT_BOOLEAN, 16, 
+          {"RRO Supported", "fcels.cmn.rro", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_rro), 0x4000, "", HFILL}},
         { &hf_fcels_cmn_vvv,
-          {"Valid Vendor Version", "fc.fcels.cmn.vvv", FT_BOOLEAN, 16, 
+          {"Valid Vendor Version", "fcels.cmn.vvv", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_vvv), 0x2000, "", HFILL}},
         { &hf_fcels_cmn_b2b,
-          {"B2B Credit Mgmt", "fc.fcels.cmn.bbb", FT_BOOLEAN, 16, 
+          {"B2B Credit Mgmt", "fcels.cmn.bbb", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_b2b), 0x0800, "", HFILL}},
         { &hf_fcels_cmn_e_d_tov,
-          {"E_D_TOV", "fc.fcels.cmn.e_d_tov", FT_BOOLEAN, 16, 
+          {"E_D_TOV", "fcels.cmn.e_d_tov", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_e_d_tov), 0x0400, "", HFILL}},
         { &hf_fcels_cmn_simplex,
-          {"Simplex", "fc.fcels.cmn.simplex", FT_BOOLEAN, 16, 
+          {"Simplex", "fcels.cmn.simplex", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_simplex), 0x0040, "", HFILL}},
         { &hf_fcels_cmn_multicast,
-          {"Multicast", "fc.fcels.cmn.multicast", FT_BOOLEAN, 16, 
+          {"Multicast", "fcels.cmn.multicast", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_multicast), 0x0200, "", HFILL}},
         { &hf_fcels_cmn_broadcast,
-          {"Broadcast", "fc.fcels.cmn.broadcast", FT_BOOLEAN, 16, 
+          {"Broadcast", "fcels.cmn.broadcast", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_broadcast), 0x0100, "", HFILL}},
         { &hf_fcels_cmn_security,
-          {"Security", "fc.fcels.cmn.security", FT_BOOLEAN, 16, 
+          {"Security", "fcels.cmn.security", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_security), 0x0020, "", HFILL}},
         { &hf_fcels_cmn_clk,
-          {"Clk Sync", "fc.fcels.cmn.clk", FT_BOOLEAN, 16, 
+          {"Clk Sync", "fcels.cmn.clk", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_clk), 0x0010, "", HFILL}},
         { &hf_fcels_cmn_dhd,
-          {"DHD Capable", "fc.fcels.cmn.dhd", FT_BOOLEAN, 16, 
+          {"DHD Capable", "fcels.cmn.dhd", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_dhd), 0x0004, "", HFILL}},
         { &hf_fcels_cmn_seqcnt,
-          {"SEQCNT", "fc.fcels.cmn.seqcnt", FT_BOOLEAN, 16, 
+          {"SEQCNT", "fcels.cmn.seqcnt", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_seqcnt), 0x0002, "", HFILL}},
         { &hf_fcels_cmn_payload,
-          {"Payload Len", "fc.fcels.cmn.payload", FT_BOOLEAN, 16, 
+          {"Payload Len", "fcels.cmn.payload", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cmn_payload), 0x0001, "", HFILL}},
         { &hf_fcels_cls_cns,
-          {"Class Supported", "fc.fcels.cls.cns", FT_BOOLEAN, 16, 
+          {"Class Supported", "fcels.cls.cns", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cls_cns), 0x8000, "", HFILL}},
         { &hf_fcels_cls_sdr,
-          {"Delivery Mode", "fc.fcels.cls.sdr", FT_BOOLEAN, 16, 
+          {"Delivery Mode", "fcels.cls.sdr", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cls_sdr), 0x0800, "", HFILL}},
         { &hf_fcels_cls_prio,
-          {"Priority", "fc.fcels.cls.prio", FT_BOOLEAN, 16, 
+          {"Priority", "fcels.cls.prio", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cls_prio), 0x0080, "", HFILL}},
         { &hf_fcels_cls_nzctl,
-          {"Non-zero CS_CTL", "fc.fcels.cls.nzctl", FT_BOOLEAN, 16, 
+          {"Non-zero CS_CTL", "fcels.cls.nzctl", FT_BOOLEAN, 16, 
            TFS(&tfs_fc_fcels_cls_nzctl), 0x0040, "", HFILL}},
         { &hf_fcels_initctl,
           {"Initiator Ctl", "fcels.logi.initctl", FT_UINT16, BASE_HEX,
@@ -2585,7 +2585,7 @@ proto_register_fcels (void)
     };
 
     /* Register the protocol name and description */
-    proto_fcels = proto_register_protocol("FC Extended Link Svc", "FC ELS", "els");
+    proto_fcels = proto_register_protocol("FC Extended Link Svc", "FC ELS", "fcels");
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_fcels, hf, array_length(hf));
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 9922a66849..8838c8db20 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -542,39 +542,39 @@ proto_register_fcip (void)
     /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_fcip_protocol,
-	  { "Protocol", "fcencap.proto", FT_UINT8, BASE_DEC,
+	  { "Protocol", "fcip.proto", FT_UINT8, BASE_DEC,
 	     VALS(fcencap_proto_vals), 0, "Protocol", HFILL }},
         { &hf_fcip_protocol_c,
-          {"Protocol (1's Complement)", "fcencap.protoc", FT_UINT8, BASE_DEC, NULL,
+          {"Protocol (1's Complement)", "fcip.protoc", FT_UINT8, BASE_DEC, NULL,
            0, "Protocol (1's Complement)", HFILL}},
         { &hf_fcip_version,
-          {"Version", "fcencap.version", FT_UINT8, BASE_DEC, NULL, 0, "",
+          {"Version", "fcip.version", FT_UINT8, BASE_DEC, NULL, 0, "",
            HFILL}},
         { &hf_fcip_version_c,
-          {"Version (1's Complement)", "fcencap.versionc", FT_UINT8, BASE_DEC,
+          {"Version (1's Complement)", "fcip.versionc", FT_UINT8, BASE_DEC,
            NULL, 0, "", HFILL}},
         { &hf_fcip_encap_word1,
-          {"FCIP Encapsulation Word1", "fcip.word1", FT_UINT32, BASE_HEX, NULL,
+          {"FCIP Encapsulation Word1", "fcip.encap_word1", FT_UINT32, BASE_HEX, NULL,
            0, "", HFILL}},
         { &hf_fcip_flags,
-          {"Flags", "fcencap.flags", FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL}},
+          {"Flags", "fcip.flags", FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL}},
         { &hf_fcip_flags_c,
-          {"Flags (1's Complement)", "fcencap.flagsc", FT_UINT8, BASE_HEX,
+          {"Flags (1's Complement)", "fcip.flagsc", FT_UINT8, BASE_HEX,
            NULL, 0xFC, "", HFILL}},
         { &hf_fcip_framelen,
-          {"Frame Length (in Words)", "fcencap.framelen", FT_UINT16, BASE_DEC,
+          {"Frame Length (in Words)", "fcip.framelen", FT_UINT16, BASE_DEC,
            NULL, 0x03FF, "", HFILL}},
         { &hf_fcip_framelen_c,
-          {"Frame Length (1's Complement)", "fcencap.framelenc", FT_UINT16,
+          {"Frame Length (1's Complement)", "fcip.framelenc", FT_UINT16,
            BASE_DEC, NULL, 0x03FF, "", HFILL}},
         { &hf_fcip_tsec,
-          {"Time (secs)", "fcencap.tsec", FT_UINT32, BASE_DEC, NULL, 0, "",
+          {"Time (secs)", "fcip.tsec", FT_UINT32, BASE_DEC, NULL, 0, "",
            HFILL}},
         { &hf_fcip_tusec,
-          {"Time (fraction)", "fcencap.tusec", FT_UINT32, BASE_DEC, NULL, 0,
+          {"Time (fraction)", "fcip.tusec", FT_UINT32, BASE_DEC, NULL, 0,
            "", HFILL}},
         { &hf_fcip_encap_crc,
-          {"CRC", "fcencap.crc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL}},
+          {"CRC", "fcip.encap_crc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL}},
         { &hf_fcip_sof,
           {"SOF", "fcip.sof", FT_UINT8, BASE_HEX, VALS (&fcip_sof_vals), 0,
            "", HFILL}},
@@ -625,7 +625,7 @@ proto_register_fcip (void)
     module_t *fcip_module;
 
     /* Register the protocol name and description */
-    proto_fcip = proto_register_protocol("FCIP", "FCIP", "fcip");
+    proto_fcip = proto_register_protocol("FCIP", "Fibre Channel over IP", "fcip");
 
     /* Required function calls to register the header fields and
      * subtrees used */
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index c48c25e818..41c2e92c7f 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -864,10 +864,10 @@ void proto_register_fr(void)
 	  "Supervisory frame type", "fr.control.s_ftype", FT_UINT16, BASE_HEX,
 	  VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
 	{ &hf_fr_u_modifier_cmd, {
-	  "Command", "lapd.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
+	  "Command", "fr.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
 	  VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
 	{ &hf_fr_u_modifier_resp, {
-	  "Response", "lapd.control.u_modifier_resp", FT_UINT8, BASE_HEX,
+	  "Response", "fr.control.u_modifier_resp", FT_UINT8, BASE_HEX,
 	    VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
 	{ &hf_fr_ftype_i, {
 	  "Frame type", "fr.control.ftype", FT_UINT16, BASE_HEX,
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 6454418ea6..64e9d5a065 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -4985,7 +4985,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Diagnostic", HFILL }},
     { &hf_ftam__untag_item,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_List_item_vals), 0,
         "ftam.Contents_Type_List_item", HFILL }},
     { &hf_ftam_document_type_name,
@@ -5409,7 +5409,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Attribute_Extensions", HFILL }},
     { &hf_ftam__untag_item_01,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Charging_item", HFILL }},
     { &hf_ftam_resource_identifier,
@@ -5473,7 +5473,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Access_Control_Attribute_vals), 0,
         "ftam.Access_Control_Attribute", HFILL }},
     { &hf_ftam__untag_item_02,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Diagnostic_item", HFILL }},
     { &hf_ftam_diagnostic_type,
@@ -5953,7 +5953,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T_extension_attribute", HFILL }},
     { &hf_ftam__untag_item_03,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Scope_item", HFILL }},
     { &hf_ftam_root_directory,
@@ -6161,7 +6161,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T_extension_attribute_Pattern", HFILL }},
     { &hf_ftam__untag_item_04,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Read_Attributes", HFILL }},
     { &hf_ftam_success_Object_count,
@@ -6185,7 +6185,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Password", HFILL }},
     { &hf_ftam__untag_item_05,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Path_Access_Passwords_item", HFILL }},
     { &hf_ftam_ap,
@@ -6197,7 +6197,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
         "ftam.AE_qualifier", HFILL }},
     { &hf_ftam__untag_item_06,
-      { "Item", "ftam._untag_item",
+      { "Item", "ftam.untag_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.AND_Set", HFILL }},
     { &hf_ftam_Protocol_Version_U_version_1,