From ce3d2ff3ded3eccb9d64c6cb46c64ad8f8a837b9 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 20 Jun 2014 09:43:28 -0700
Subject: Rename dissector_add_handle() to dissector_add_for_decode_as().

Hopefully that name makes it clear what the routiner's purpose is, and
will encourage people to use it rather than using dissector_add_uint()
with a bogus integer value.

Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8
Reviewed-on: https://code.wireshark.org/review/2483
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 epan/dissectors/packet-6lowpan.c        |  2 +-
 epan/dissectors/packet-acn.c            |  2 +-
 epan/dissectors/packet-adb_cs.c         |  2 +-
 epan/dissectors/packet-artnet.c         |  2 +-
 epan/dissectors/packet-ber.c            |  2 +-
 epan/dissectors/packet-bfcp.c           |  4 ++--
 epan/dissectors/packet-bitcoin.c        |  2 +-
 epan/dissectors/packet-brp.c            |  2 +-
 epan/dissectors/packet-bt-dht.c         |  2 +-
 epan/dissectors/packet-bt-utp.c         |  2 +-
 epan/dissectors/packet-bt3ds.c          |  2 +-
 epan/dissectors/packet-btavctp.c        |  2 +-
 epan/dissectors/packet-btavdtp.c        |  6 +++---
 epan/dissectors/packet-btbnep.c         |  2 +-
 epan/dissectors/packet-bthcrp.c         |  4 ++--
 epan/dissectors/packet-bthfp.c          |  2 +-
 epan/dissectors/packet-bthid.c          |  2 +-
 epan/dissectors/packet-bthsp.c          |  2 +-
 epan/dissectors/packet-btmcap.c         |  4 ++--
 epan/dissectors/packet-btobex.c         |  6 +++---
 epan/dissectors/packet-btrfcomm.c       |  8 ++++----
 epan/dissectors/packet-btsap.c          |  2 +-
 epan/dissectors/packet-btsdp.c          |  2 +-
 epan/dissectors/packet-ccsds.c          |  2 +-
 epan/dissectors/packet-cfdp.c           |  2 +-
 epan/dissectors/packet-cigi.c           |  4 ++--
 epan/dissectors/packet-cimd.c           |  2 +-
 epan/dissectors/packet-cisco-wids.c     |  2 +-
 epan/dissectors/packet-ctdb.c           |  2 +-
 epan/dissectors/packet-dbus.c           |  2 +-
 epan/dissectors/packet-dtls.c           |  4 ++--
 epan/dissectors/packet-ehs.c            |  2 +-
 epan/dissectors/packet-erldp.c          |  2 +-
 epan/dissectors/packet-eth.c            |  2 +-
 epan/dissectors/packet-fcgi.c           |  2 +-
 epan/dissectors/packet-fcip.c           |  2 +-
 epan/dissectors/packet-fix.c            |  2 +-
 epan/dissectors/packet-gdb.c            |  2 +-
 epan/dissectors/packet-geneve.c         |  2 +-
 epan/dissectors/packet-giop.c           |  2 +-
 epan/dissectors/packet-h223.c           |  4 ++--
 epan/dissectors/packet-h245.c           |  4 ++--
 epan/dissectors/packet-h283.c           |  2 +-
 epan/dissectors/packet-hci_usb.c        |  2 +-
 epan/dissectors/packet-hdfs.c           |  2 +-
 epan/dissectors/packet-hdfsdata.c       |  2 +-
 epan/dissectors/packet-http2.c          |  2 +-
 epan/dissectors/packet-ifcp.c           |  2 +-
 epan/dissectors/packet-interlink.c      |  2 +-
 epan/dissectors/packet-ip.c             |  2 +-
 epan/dissectors/packet-iscsi.c          |  2 +-
 epan/dissectors/packet-lbmpdmtcp.c      |  2 +-
 epan/dissectors/packet-lbmr.c           |  2 +-
 epan/dissectors/packet-lbtrm.c          |  2 +-
 epan/dissectors/packet-lbtru.c          |  2 +-
 epan/dissectors/packet-lbttcp.c         |  2 +-
 epan/dissectors/packet-lcsap.c          |  2 +-
 epan/dissectors/packet-lge_monitor.c    |  2 +-
 epan/dissectors/packet-logcat.c         |  2 +-
 epan/dissectors/packet-lsc.c            |  4 ++--
 epan/dissectors/packet-lte-rrc.c        |  2 +-
 epan/dissectors/packet-lwm.c            |  2 +-
 epan/dissectors/packet-miop.c           |  2 +-
 epan/dissectors/packet-mp2t.c           |  2 +-
 epan/dissectors/packet-mq.c             |  2 +-
 epan/dissectors/packet-mqtt.c           |  2 +-
 epan/dissectors/packet-msrp.c           |  2 +-
 epan/dissectors/packet-nasdaq-soup.c    |  2 +-
 epan/dissectors/packet-nat-pmp.c        |  2 +-
 epan/dissectors/packet-nb_rtpmux.c      |  2 +-
 epan/dissectors/packet-nbap.c           |  4 ++--
 epan/dissectors/packet-netdump.c        |  2 +-
 epan/dissectors/packet-newmail.c        |  2 +-
 epan/dissectors/packet-nwmtp.c          |  3 +--
 epan/dissectors/packet-openwire.c       |  2 +-
 epan/dissectors/packet-osc.c            |  3 ++-
 epan/dissectors/packet-osi.c            |  2 +-
 epan/dissectors/packet-pana.c           |  2 +-
 epan/dissectors/packet-pdc.c            |  2 +-
 epan/dissectors/packet-pgm.c            |  4 ++--
 epan/dissectors/packet-pw-atm.c         |  8 ++++----
 epan/dissectors/packet-pw-cesopsn.c     |  4 ++--
 epan/dissectors/packet-pw-eth.c         |  6 +++---
 epan/dissectors/packet-pw-fr.c          |  2 +-
 epan/dissectors/packet-pw-hdlc.c        |  4 ++--
 epan/dissectors/packet-pw-satop.c       |  4 ++--
 epan/dissectors/packet-rdt.c            |  2 +-
 epan/dissectors/packet-redbackli.c      |  2 +-
 epan/dissectors/packet-rfid-pn532-hci.c |  4 ++--
 epan/dissectors/packet-rmt-alc.c        |  2 +-
 epan/dissectors/packet-rmt-norm.c       |  2 +-
 epan/dissectors/packet-rtcp.c           |  2 +-
 epan/dissectors/packet-rtmpt.c          |  2 +-
 epan/dissectors/packet-rtp.c            |  6 +++---
 epan/dissectors/packet-rudp.c           |  2 +-
 epan/dissectors/packet-s1ap.c           |  2 +-
 epan/dissectors/packet-sgsap.c          |  2 +-
 epan/dissectors/packet-simulcrypt.c     |  4 ++--
 epan/dissectors/packet-skype.c          |  4 ++--
 epan/dissectors/packet-smpp.c           |  2 +-
 epan/dissectors/packet-soupbintcp.c     |  2 +-
 epan/dissectors/packet-spice.c          |  2 +-
 epan/dissectors/packet-sprt.c           |  2 +-
 epan/dissectors/packet-stun.c           |  4 ++--
 epan/dissectors/packet-sync.c           |  2 +-
 epan/dissectors/packet-syslog.c         |  2 +-
 epan/dissectors/packet-turnchannel.c    |  8 ++++----
 epan/dissectors/packet-tuxedo.c         |  2 +-
 epan/dissectors/packet-uaudp.c          |  2 +-
 epan/dissectors/packet-ubertooth.c      |  4 ++--
 epan/dissectors/packet-ucp.c            |  2 +-
 epan/dissectors/packet-udt.c            |  2 +-
 epan/dissectors/packet-uma.c            |  2 +-
 epan/dissectors/packet-usb-ccid.c       |  6 +++---
 epan/dissectors/packet-usb-dfu.c        |  4 ++--
 epan/dissectors/packet-vcdu.c           |  2 +-
 epan/dissectors/packet-vxlan.c          |  2 +-
 epan/dissectors/packet-x2ap.c           |  2 +-
 epan/dissectors/packet-zbee-nwk-gp.c    |  2 +-
 epan/dissectors/packet-zbee-nwk.c       |  2 +-
 epan/dissectors/packet-ziop.c           |  2 +-
 epan/dissectors/packet-zrtp.c           |  2 +-
 epan/packet.c                           | 18 ++++++++++--------
 epan/packet.h                           | 10 +++++++---
 124 files changed, 178 insertions(+), 172 deletions(-)

(limited to 'epan')

diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index ba132664f5..62ca5e83df 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -2860,7 +2860,7 @@ proto_reg_handoff_6lowpan(void)
     ipv6_handle = find_dissector("ipv6");
 
     /* Register the 6LoWPAN dissector with IEEE 802.15.4 */
-    dissector_add_handle(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector("6lowpan"));
+    dissector_add_for_decode_as(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector("6lowpan"));
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN, dissect_6lowpan_heur, proto_6lowpan);
 } /* proto_reg_handoff_6lowpan */
 
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index dae082ce49..67ce91fe60 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -3246,7 +3246,7 @@ proto_reg_handoff_acn(void)
 {
   /* dissector_handle_t acn_handle; */
   /* acn_handle = new_create_dissector_handle(dissect_acn, proto_acn); */
-  /* dissector_add_handle("udp.port", acn_handle);                         */
+  /* dissector_add_for_decode_as("udp.port", acn_handle);                         */
   heur_dissector_add("udp", dissect_acn_heur, proto_acn);
 }
 
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c
index 2ab768da35..fb0a5b6f26 100644
--- a/epan/dissectors/packet-adb_cs.c
+++ b/epan/dissectors/packet-adb_cs.c
@@ -1004,7 +1004,7 @@ proto_reg_handoff_adb_cs(void)
     logcat_handle = find_dissector("logcat");
     data_handle   = find_dissector("data");
 
-    dissector_add_handle("tcp.port", adb_cs_handle);
+    dissector_add_for_decode_as("tcp.port", adb_cs_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index bf233212f1..f67ccd6463 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -4324,7 +4324,7 @@ proto_reg_handoff_artnet(void) {
   dissector_handle_t artnet_handle;
 
   artnet_handle   = create_dissector_handle(dissect_artnet, proto_artnet);
-  dissector_add_handle("udp.port", artnet_handle);
+  dissector_add_for_decode_as("udp.port", artnet_handle);
   rdm_handle      = find_dissector("rdm");
   dmx_chan_handle = find_dissector("dmx-chan");
 
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 6fdc4d6d1b..1c45c1b1c2 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4458,7 +4458,7 @@ proto_reg_handoff_ber(void)
 
     /* allow the dissection of BER/DER carried over a TCP transport
        by using "Decode As..." */
-    dissector_add_handle("tcp.port", ber_handle);
+    dissector_add_for_decode_as("tcp.port", ber_handle);
 
     ber_update_oids();
 }
diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c
index 129909ad5c..c5d9ef1ee0 100644
--- a/epan/dissectors/packet-bfcp.c
+++ b/epan/dissectors/packet-bfcp.c
@@ -697,8 +697,8 @@ void proto_reg_handoff_bfcp(void)
 	{
 		heur_dissector_add("tcp", dissect_bfcp_heur, proto_bfcp);
 		heur_dissector_add("udp", dissect_bfcp_heur, proto_bfcp);
-		dissector_add_handle("tcp.port", bfcp_handle);
-		dissector_add_handle("udp.port", bfcp_handle);
+		dissector_add_for_decode_as("tcp.port", bfcp_handle);
+		dissector_add_for_decode_as("udp.port", bfcp_handle);
 		prefs_initialized = TRUE;
 	}
 
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index 8544fe764f..d59bf277c9 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -1300,7 +1300,7 @@ proto_register_bitcoin(void)
 void
 proto_reg_handoff_bitcoin(void)
 {
-  dissector_add_handle("tcp.port", bitcoin_handle);  /* for 'decode-as' */
+  dissector_add_for_decode_as("tcp.port", bitcoin_handle);
 
   heur_dissector_add( "tcp", dissect_bitcoin_heur, hfi_bitcoin->id);
 }
diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c
index 5e9fc533a4..eb2be8fc49 100644
--- a/epan/dissectors/packet-brp.c
+++ b/epan/dissectors/packet-brp.c
@@ -422,7 +422,7 @@ void proto_reg_handoff_brp(void)
     static guint              saved_brp_port;
 
     if (!initialized) {
-        dissector_add_handle("udp.port", brp_handle);
+        dissector_add_for_decode_as("udp.port", brp_handle);
         initialized = TRUE;
     } else {
         if (saved_brp_port != 0) {
diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c
index e8599d916e..70c017dcb7 100644
--- a/epan/dissectors/packet-bt-dht.c
+++ b/epan/dissectors/packet-bt-dht.c
@@ -598,7 +598,7 @@ proto_reg_handoff_bt_dht(void)
     heur_dissector_add("udp", dissect_bt_dht_heur, proto_bt_dht);
 
     bt_dht_handle = new_create_dissector_handle(dissect_bt_dht, proto_bt_dht);
-    dissector_add_handle("udp.port", bt_dht_handle);   /* for "decode_as" */
+    dissector_add_for_decode_as("udp.port", bt_dht_handle);
 
     prefs_initialized = TRUE;
   }
diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c
index ffda931e5a..ea9b155013 100644
--- a/epan/dissectors/packet-bt-utp.c
+++ b/epan/dissectors/packet-bt-utp.c
@@ -492,7 +492,7 @@ proto_reg_handoff_bt_utp(void)
     heur_dissector_add("udp", dissect_bt_utp, proto_bt_utp);
 
     bt_utp_handle = new_create_dissector_handle(dissect_bt_utp, proto_bt_utp);
-    dissector_add_handle("udp.port", bt_utp_handle);
+    dissector_add_for_decode_as("udp.port", bt_utp_handle);
 
     prefs_initialized = TRUE;
   }
diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c
index b82108bf95..cee51c161d 100644
--- a/epan/dissectors/packet-bt3ds.c
+++ b/epan/dissectors/packet-bt3ds.c
@@ -186,7 +186,7 @@ proto_reg_handoff_bt3ds(void)
     dissector_add_uint("btl2cap.service", BTSDP_3D_GLASSES_UUID, b3ds_handle);
 
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_3DS, b3ds_handle);
-    dissector_add_handle("btl2cap.cid", b3ds_handle);
+    dissector_add_for_decode_as("btl2cap.cid", b3ds_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index 50c468673c..97cc6535e1 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -511,7 +511,7 @@ proto_reg_handoff_btavctp(void)
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_AVCTP_CTRL, btavctp_handle);
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_AVCTP_BRWS, btavctp_handle);
 
-    dissector_add_handle("btl2cap.cid", btavctp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btavctp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 13097c8a28..164d9d4a5f 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -2579,7 +2579,7 @@ proto_reg_handoff_btavdtp(void)
 
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_AVDTP, btavdtp_handle);
 
-    dissector_add_handle("btl2cap.cid", btavdtp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btavdtp_handle);
 }
 
 
@@ -2929,7 +2929,7 @@ proto_reg_handoff_bta2dp(void)
     dissector_add_uint("btl2cap.service", BTSDP_A2DP_SOURCE_SERVICE_UUID, bta2dp_handle);
     dissector_add_uint("btl2cap.service", BTSDP_A2DP_SINK_SERVICE_UUID, bta2dp_handle);
     dissector_add_uint("btl2cap.service", BTSDP_A2DP_DISTRIBUTION_SERVICE_UUID, bta2dp_handle);
-    dissector_add_handle("btl2cap.cid", bta2dp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", bta2dp_handle);
 }
 
 static gint
@@ -3099,7 +3099,7 @@ proto_reg_handoff_btvdp(void)
     dissector_add_uint("btl2cap.service", BTSDP_VDP_SOURCE_SERVICE_UUID, btvdp_handle);
     dissector_add_uint("btl2cap.service", BTSDP_VDP_SINK_SERVICE_UUID, btvdp_handle);
     dissector_add_uint("btl2cap.service", BTSDP_VDP_DISTRIBUTION_SERVICE_UUID, btvdp_handle);
-    dissector_add_handle("btl2cap.cid", btvdp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btvdp_handle);
 }
 
 
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c
index 928256d3c2..20a3d27343 100644
--- a/epan/dissectors/packet-btbnep.c
+++ b/epan/dissectors/packet-btbnep.c
@@ -553,7 +553,7 @@ proto_reg_handoff_btbnep(void)
     dissector_add_uint("btl2cap.service", BTSDP_PAN_GN_SERVICE_UUID, btbnep_handle);
 
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_BNEP, btbnep_handle);
-    dissector_add_handle("btl2cap.cid", btbnep_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btbnep_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c
index 682a683f98..a1c8575795 100644
--- a/epan/dissectors/packet-bthcrp.c
+++ b/epan/dissectors/packet-bthcrp.c
@@ -685,8 +685,8 @@ proto_reg_handoff_bthcrp(void)
     dissector_add_uint("btl2cap.service", BTSDP_HCRP_SCAN_SERVICE_UUID, bthcrp_handle);
     dissector_add_uint("btl2cap.service", BTSDP_HCRP_SERVICE_UUID, bthcrp_handle);
 
-    dissector_add_handle("btl2cap.psm", bthcrp_handle);
-    dissector_add_handle("btl2cap.cid", bthcrp_handle);
+    dissector_add_for_decode_as("btl2cap.psm", bthcrp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", bthcrp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c
index b66f4d10d8..eb766e87aa 100644
--- a/epan/dissectors/packet-bthfp.c
+++ b/epan/dissectors/packet-bthfp.c
@@ -2033,7 +2033,7 @@ proto_reg_handoff_bthfp(void)
 {
     dissector_add_uint("btrfcomm.service", BTSDP_HFP_SERVICE_UUID, bthfp_handle);
     dissector_add_uint("btrfcomm.service", BTSDP_HFP_GW_SERVICE_UUID, bthfp_handle);
-    dissector_add_handle("btrfcomm.channel", bthfp_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", bthfp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c
index c888237726..35e6222bea 100644
--- a/epan/dissectors/packet-bthid.c
+++ b/epan/dissectors/packet-bthid.c
@@ -1112,7 +1112,7 @@ proto_reg_handoff_bthid(void)
 
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_HID_CTRL, bthid_handle);
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_HID_INTR, bthid_handle);
-    dissector_add_handle("btl2cap.cid", bthid_handle);
+    dissector_add_for_decode_as("btl2cap.cid", bthid_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index 8c3dd201df..d7cbb86348 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -1162,7 +1162,7 @@ proto_reg_handoff_bthsp(void)
     dissector_add_uint("btrfcomm.service", BTSDP_HSP_SERVICE_UUID, bthsp_handle);
     dissector_add_uint("btrfcomm.service", BTSDP_HSP_HS_SERVICE_UUID, bthsp_handle);
     dissector_add_uint("btrfcomm.service", BTSDP_HSP_GW_SERVICE_UUID, bthsp_handle);
-    dissector_add_handle("btrfcomm.channel", bthsp_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", bthsp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index 1ca6fecaef..1d4bd430a3 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -444,8 +444,8 @@ proto_reg_handoff_btmcap(void)
     dissector_add_uint("btl2cap.service", BTSDP_HDP_SINK_SERVICE_UUID, btmcap_handle);
 
     /* dynamic PSM */
-    dissector_add_handle("btl2cap.psm", btmcap_handle);
-    dissector_add_handle("btl2cap.cid", btmcap_handle);
+    dissector_add_for_decode_as("btl2cap.psm", btmcap_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btmcap_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index c4c175981b..94660af5e8 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -2582,9 +2582,9 @@ proto_reg_handoff_btobex(void)
     xml_handle  = find_dissector("xml");
     data_handle = find_dissector("data");
 
-    dissector_add_handle("btrfcomm.channel", btobex_handle);
-    dissector_add_handle("btl2cap.psm", btobex_handle);
-    dissector_add_handle("btl2cap.cid", btobex_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", btobex_handle);
+    dissector_add_for_decode_as("btl2cap.psm", btobex_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btobex_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index d8fc59ffab..c9c5670f01 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -1201,7 +1201,7 @@ void
 proto_reg_handoff_btrfcomm(void)
 {
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_RFCOMM, btrfcomm_handle);
-    dissector_add_handle("btl2cap.cid", btrfcomm_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btrfcomm_handle);
 
     data_handle = find_dissector("data");
 }
@@ -1280,7 +1280,7 @@ void
 proto_reg_handoff_btdun(void)
 {
     dissector_add_uint("btrfcomm.service", BTSDP_DUN_SERVICE_UUID, btdun_handle);
-    dissector_add_handle("btrfcomm.channel", btdun_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", btdun_handle);
 
     ppp_handle = find_dissector("ppp_raw_hdlc");
 }
@@ -1345,7 +1345,7 @@ void
 proto_reg_handoff_btspp(void)
 {
     dissector_add_uint("btrfcomm.service", BTSDP_SPP_SERVICE_UUID, btspp_handle);
-    dissector_add_handle("btrfcomm.channel", btspp_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", btspp_handle);
 }
 
 
@@ -1398,7 +1398,7 @@ proto_reg_handoff_btgnss(void)
 {
     dissector_add_uint("btrfcomm.service", BTSDP_GNSS_UUID, btgnss_handle);
     dissector_add_uint("btrfcomm.service", BTSDP_GNSS_SERVER_UUID, btgnss_handle);
-    dissector_add_handle("btrfcomm.channel", btgnss_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", btgnss_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c
index 8d3f901466..b8ffb403a5 100644
--- a/epan/dissectors/packet-btsap.c
+++ b/epan/dissectors/packet-btsap.c
@@ -739,7 +739,7 @@ proto_reg_handoff_btsap(void)
 
     dissector_add_uint("btrfcomm.service", BTSDP_SAP_SERVICE_UUID, btsap_handle);
 
-    dissector_add_handle("btrfcomm.channel", btsap_handle);
+    dissector_add_for_decode_as("btrfcomm.channel", btsap_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 81f2a79be5..07376eb2f6 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -5681,7 +5681,7 @@ void
 proto_reg_handoff_btsdp(void)
 {
     dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_SDP, btsdp_handle);
-    dissector_add_handle("btl2cap.cid", btsdp_handle);
+    dissector_add_for_decode_as("btl2cap.cid", btsdp_handle);
 
     btrfcomm_service_table = find_dissector_table("btrfcomm.service");
     btl2cap_service_table = find_dissector_table("btl2cap.service");
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index bb11334b57..02e71ea43a 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -700,7 +700,7 @@ proto_register_ccsds(void)
 void
 proto_reg_handoff_ccsds(void)
 {
-    dissector_add_handle ( "udp.port", find_dissector("ccsds") ); /* for 'decode as' */
+    dissector_add_for_decode_as ( "udp.port", find_dissector("ccsds") );
     data_handle = find_dissector("data");
 }
 
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index 79f32e58f3..570ca626f7 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -1618,7 +1618,7 @@ proto_reg_handoff_cfdp(void)
 
     cfdp_handle = create_dissector_handle(dissect_cfdp, proto_cfdp);
     dissector_add_uint("ccsds.apid", CFDP_APID, cfdp_handle);
-    dissector_add_handle ( "udp.port", cfdp_handle ); /* for 'decode as' */
+    dissector_add_for_decode_as ( "udp.port", cfdp_handle );
     data_handle = find_dissector("data");
 }
 
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 30f3c65223..1e11f0e748 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -12005,8 +12005,8 @@ proto_reg_handoff_cigi(void)
     if( !inited ) {
 
         cigi_handle = new_create_dissector_handle(dissect_cigi, proto_cigi);
-        dissector_add_handle("udp.port", cigi_handle);
-        dissector_add_handle("tcp.port", cigi_handle);
+        dissector_add_for_decode_as("udp.port", cigi_handle);
+        dissector_add_for_decode_as("tcp.port", cigi_handle);
         heur_dissector_add("udp", dissect_cigi_heur, proto_cigi);
 
         inited = TRUE;
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index ea5dbd760c..13609bed1e 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -1179,5 +1179,5 @@ proto_reg_handoff_cimd(void)
    * Also register as one that can be selected by a TCP port number.
    */
   cimd_handle = create_dissector_handle(dissect_cimd, proto_cimd);
-  dissector_add_handle("tcp.port", cimd_handle);
+  dissector_add_for_decode_as("tcp.port", cimd_handle);
 }
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index 1c4268c675..8fa76a9de2 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -195,7 +195,7 @@ proto_reg_handoff_cwids(void)
 
 	if (!initialized) {
 		cwids_handle = create_dissector_handle(dissect_cwids, proto_cwids);
-		dissector_add_handle("udp.port", cwids_handle);
+		dissector_add_for_decode_as("udp.port", cwids_handle);
 		ieee80211_handle = find_dissector("wlan_withoutfcs");
 		initialized = TRUE;
 	} else {
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 077938d5f7..53147a1fa6 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -1245,7 +1245,7 @@ proto_reg_handoff_ctdb(void)
 	dissector_handle_t ctdb_handle;
 
 	ctdb_handle = new_create_dissector_handle(dissect_ctdb, proto_ctdb);
-	dissector_add_handle("tcp.port", ctdb_handle);
+	dissector_add_for_decode_as("tcp.port", ctdb_handle);
 
 	heur_dissector_add("tcp", dissect_ctdb, proto_ctdb);
 }
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c
index 36edd41769..fb39346faf 100644
--- a/epan/dissectors/packet-dbus.c
+++ b/epan/dissectors/packet-dbus.c
@@ -686,6 +686,6 @@ void
 proto_reg_handoff_dbus(void)
 {
 	dissector_add_uint("wtap_encap", WTAP_ENCAP_DBUS, dbus_handle);
-	dissector_add_handle("tcp.port", dbus_handle_tcp);
+	dissector_add_for_decode_as("tcp.port", dbus_handle_tcp);
 }
 
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 854c35866d..84a94057bd 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -301,8 +301,8 @@ dtls_parse_uat(void)
     }
   }
 
-  dissector_add_handle("sctp.port", dtls_handle);
-  dissector_add_handle("udp.port", dtls_handle);
+  dissector_add_for_decode_as("sctp.port", dtls_handle);
+  dissector_add_for_decode_as("udp.port", dtls_handle);
 }
 
 static void
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index 4a32bae29e..1a6f565db4 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -1935,7 +1935,7 @@ proto_register_ehs(void)
 void
 proto_reg_handoff_ehs(void)
 {
-  dissector_add_handle ( "udp.port", find_dissector("ehs") ); /* for 'decode as' */
+  dissector_add_for_decode_as ( "udp.port", find_dissector("ehs") );
   ccsds_handle = find_dissector ( "ccsds" );
 }
 
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index a2f445981c..64a1772480 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -688,5 +688,5 @@ void proto_register_erldp(void) {
 /*--- proto_reg_handoff_erldp -------------------------------------------*/
 void proto_reg_handoff_erldp(void) {
 
-  dissector_add_handle("tcp.port", erldp_handle);
+  dissector_add_for_decode_as("tcp.port", erldp_handle);
 }
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 4a548212a3..21e7e1195e 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -972,5 +972,5 @@ proto_reg_handoff_eth(void)
      * command - it encapsulates Ethernet frames in UDP packets, but
      * the UDP port is user-defined.
      */
-    dissector_add_handle("udp.port", eth_withoutfcs_handle);
+    dissector_add_for_decode_as("udp.port", eth_withoutfcs_handle);
 }
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c
index 7b6f7855aa..d652439cd8 100644
--- a/epan/dissectors/packet-fcgi.c
+++ b/epan/dissectors/packet-fcgi.c
@@ -410,7 +410,7 @@ proto_reg_handoff_fcgi(void)
    static guint saved_tcp_port;
 
    if (!initialized) {
-      dissector_add_handle("tcp.port", fcgi_handle);  /* for "decode as" */
+      dissector_add_for_decode_as("tcp.port", fcgi_handle);
       initialized = TRUE;
    } else if (saved_tcp_port != 0) {
       dissector_delete_uint("tcp.port", saved_tcp_port, fcgi_handle);
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 642155ac2d..f5c32c559e 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -655,7 +655,7 @@ proto_reg_handoff_fcip (void)
     heur_dissector_add("tcp", dissect_fcip_heur, proto_fcip);
 
     fcip_handle = create_dissector_handle(dissect_fcip_handle, proto_fcip);
-    dissector_add_handle("tcp.port", fcip_handle);
+    dissector_add_for_decode_as("tcp.port", fcip_handle);
 
     data_handle = find_dissector("data");
     fc_handle   = find_dissector("fc");
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 8529d83a94..923b91c51e 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -534,6 +534,6 @@ proto_reg_handoff_fix(void)
     /* Let the tcp dissector know that we're interested in traffic      */
     heur_dissector_add("tcp", dissect_fix_heur, proto_fix);
     /* Register a fix handle to "tcp.port" to be able to do 'decode-as' */
-    dissector_add_handle("tcp.port", fix_handle);
+    dissector_add_for_decode_as("tcp.port", fix_handle);
 }
 
diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c
index 8e77d2d43f..4f1b823599 100644
--- a/epan/dissectors/packet-gdb.c
+++ b/epan/dissectors/packet-gdb.c
@@ -245,7 +245,7 @@ proto_reg_handoff_gdb(void)
         initialized = TRUE;
     }
 
-    dissector_add_handle("tcp.port", gdb_handle);
+    dissector_add_for_decode_as("tcp.port", gdb_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c
index 8dc289dd74..5e8526d3d6 100644
--- a/epan/dissectors/packet-geneve.c
+++ b/epan/dissectors/packet-geneve.c
@@ -432,7 +432,7 @@ proto_reg_handoff_geneve(void)
 
     geneve_handle = create_dissector_handle(dissect_geneve, proto_geneve);
     dissector_add_uint("udp.port", UDP_PORT_GENEVE, geneve_handle);
-    dissector_add_handle("udp.port", geneve_handle);  /* For 'Decode As' */
+    dissector_add_for_decode_as("udp.port", geneve_handle);
 
     ethertype_dissector_table = find_dissector_table("ethertype");
     data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index dc24268af1..cf24e08237 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -5462,7 +5462,7 @@ void proto_reg_handoff_giop (void) {
   heur_dissector_add("tcp", dissect_giop_heur, proto_giop);
   /* Support DIOP (GIOP/UDP) */
   heur_dissector_add("udp", dissect_giop_heur, proto_giop);
-  dissector_add_handle("tcp.port", giop_tcp_handle);  /* for "decode-as" */
+  dissector_add_for_decode_as("tcp.port", giop_tcp_handle);
 }
 
 
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 6b70fcc1a3..60745f3fec 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1614,8 +1614,8 @@ void proto_reg_handoff_h223(void)
     data_handle = find_dissector("data");
     srp_handle = find_dissector("srp");
 
-    dissector_add_handle("tcp.port", h223);
-    dissector_add_handle("tcp.port", h223_bitswapped);
+    dissector_add_for_decode_as("tcp.port", h223);
+    dissector_add_for_decode_as("tcp.port", h223_bitswapped);
     dissector_add_string("rtp_dyn_payload_type","CLEARMODE", h223_bitswapped);
     dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_H223_H245, h223_bitswapped);
 }
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 092f003725..4e5d2035d7 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -20782,9 +20782,9 @@ void proto_reg_handoff_h245(void) {
 
 
 	h245_handle = find_dissector("h245");
-	dissector_add_handle("tcp.port", h245_handle);
+	dissector_add_for_decode_as("tcp.port", h245_handle);
 	MultimediaSystemControlMessage_handle = find_dissector("h245dg");
-	dissector_add_handle("udp.port", MultimediaSystemControlMessage_handle);
+	dissector_add_for_decode_as("udp.port", MultimediaSystemControlMessage_handle);
 }
 
 static void init_h245_packet_info(h245_packet_info *pi)
diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index 2ebfb9e024..4b972ce357 100644
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -766,7 +766,7 @@ void proto_reg_handoff_h283(void)
   dissector_handle_t h283_udp_handle;
 
   h283_udp_handle = find_dissector(PFNAME);
-  dissector_add_handle("udp.port", h283_udp_handle);
+  dissector_add_for_decode_as("udp.port", h283_udp_handle);
 
   rdc_pdu_handle = find_dissector("rdc");
   rdc_device_list_handle = find_dissector("rdc.device_list");
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c
index f8527cd4aa..b2789ed1ee 100644
--- a/epan/dissectors/packet-hci_usb.c
+++ b/epan/dissectors/packet-hci_usb.c
@@ -411,7 +411,7 @@ proto_reg_handoff_hci_usb(void)
     dissector_add_uint("usb.protocol", 0xE00101, hci_usb_handle);
     dissector_add_uint("usb.protocol", 0xE00104, hci_usb_handle);
 
-    dissector_add_handle("usb.device", hci_usb_handle);
+    dissector_add_for_decode_as("usb.device", hci_usb_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index 44546131c4..bc2f581b1e 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -1072,7 +1072,7 @@ proto_reg_handoff_hdfs(void)
     static guint saved_tcp_port;
 
     if (!initialized) {
-        dissector_add_handle("tcp.port", hdfs_handle);  /* for "decode as" */
+        dissector_add_for_decode_as("tcp.port", hdfs_handle);
         initialized = TRUE;
     } else if (saved_tcp_port != 0) {
         dissector_delete_uint("tcp.port", saved_tcp_port, hdfs_handle);
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c
index 7545be2d8e..c0b87b8423 100644
--- a/epan/dissectors/packet-hdfsdata.c
+++ b/epan/dissectors/packet-hdfsdata.c
@@ -803,7 +803,7 @@ proto_reg_handoff_hdfsdata(void)
     static guint saved_tcp_port;
 
     if (!initialized) {
-        dissector_add_handle("tcp.port", hdfsdata_handle);  /* for "decode as" */
+        dissector_add_for_decode_as("tcp.port", hdfsdata_handle);
         initialized = TRUE;
     } else if (saved_tcp_port != 0) {
         dissector_delete_uint("tcp.port", saved_tcp_port, hdfsdata_handle);
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c
index e25d88d06f..20d14cd2c7 100644
--- a/epan/dissectors/packet-http2.c
+++ b/epan/dissectors/packet-http2.c
@@ -1437,7 +1437,7 @@ proto_reg_handoff_http2(void)
     data_handle = find_dissector("data");
 
     http2_handle = new_create_dissector_handle(dissect_http2, proto_http2);
-    dissector_add_handle("tcp.port", http2_handle);
+    dissector_add_for_decode_as("tcp.port", http2_handle);
 
     heur_dissector_add("ssl", dissect_http2_heur, proto_http2);
     heur_dissector_add("http", dissect_http2_heur, proto_http2);
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 8f253f50f5..22d97634ee 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -666,7 +666,7 @@ proto_reg_handoff_ifcp (void)
     heur_dissector_add("tcp", dissect_ifcp_heur, proto_ifcp);
 
     ifcp_handle = new_create_dissector_handle(dissect_ifcp_handle, proto_ifcp);
-    dissector_add_handle("tcp.port", ifcp_handle);
+    dissector_add_for_decode_as("tcp.port", ifcp_handle);
 
     data_handle = find_dissector("data");
     fc_handle = find_dissector("fc_ifcp");
diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index 8b6a59fade..ae717d6b88 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -247,7 +247,7 @@ proto_reg_handoff_interlink(void)
 	interlink_handle = find_dissector("interlink");
 
 	/* Allow "Decode As" with any UDP packet. */
-	dissector_add_handle("udp.port", interlink_handle);
+	dissector_add_for_decode_as("udp.port", interlink_handle);
 
 	/* Add our heuristic packet finder. */
 	heur_dissector_add("udp", dissect_interlink_heur, proto_interlink);
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 5d0f35a0ed..c9e16d315a 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -3076,7 +3076,7 @@ proto_reg_handoff_ip(void)
   dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle);
   dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle);
   dissector_add_uint("ax25.pid", AX25_P_IP, ip_handle);
-  dissector_add_handle("udp.port", ip_handle);
+  dissector_add_for_decode_as("udp.port", ip_handle);
 
   heur_dissector_add("tipc", dissect_ip_heur, proto_ip);
 }
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 7cb68aaa1d..e24ac40677 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -3113,5 +3113,5 @@ proto_reg_handoff_iscsi(void)
     heur_dissector_add("tcp", dissect_iscsi_heur, proto_iscsi);
 
     iscsi_handle = new_create_dissector_handle(dissect_iscsi_handle, proto_iscsi);
-    dissector_add_handle("tcp.port", iscsi_handle);
+    dissector_add_for_decode_as("tcp.port", iscsi_handle);
 }
diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c
index 6bb660a478..e14d37e013 100644
--- a/epan/dissectors/packet-lbmpdmtcp.c
+++ b/epan/dissectors/packet-lbmpdmtcp.c
@@ -438,7 +438,7 @@ void proto_reg_handoff_lbmpdm_tcp(void)
     if (!already_registered)
     {
         lbmpdm_tcp_dissector_handle = create_dissector_handle(dissect_lbmpdm_tcp, lbmpdm_tcp_protocol_handle);
-        dissector_add_handle("tcp.port", lbmpdm_tcp_dissector_handle); /* for "decode as" */
+        dissector_add_for_decode_as("tcp.port", lbmpdm_tcp_dissector_handle);
         heur_dissector_add("tcp", test_lbmpdm_tcp_packet, lbmpdm_tcp_protocol_handle);
     }
 
diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c
index 80eb36a026..d75f915da3 100644
--- a/epan/dissectors/packet-lbmr.c
+++ b/epan/dissectors/packet-lbmr.c
@@ -6800,7 +6800,7 @@ void proto_reg_handoff_lbmr(void)
     if (!already_registered)
     {
         lbmr_dissector_handle = new_create_dissector_handle(dissect_lbmr, proto_lbmr);
-        dissector_add_handle("udp.port", lbmr_dissector_handle);  /* for "decode as" */
+        dissector_add_for_decode_as("udp.port", lbmr_dissector_handle);
         heur_dissector_add("udp", test_lbmr_packet, proto_lbmr);
     }
 
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c
index 4d2b505ec1..c8323d7ee4 100644
--- a/epan/dissectors/packet-lbtrm.c
+++ b/epan/dissectors/packet-lbtrm.c
@@ -1892,7 +1892,7 @@ void proto_reg_handoff_lbtrm(void)
     if (!already_registered)
     {
         lbtrm_dissector_handle = new_create_dissector_handle(dissect_lbtrm, proto_lbtrm);
-        dissector_add_handle("udp.port", lbtrm_dissector_handle); /* for "decode as* */
+        dissector_add_for_decode_as("udp.port", lbtrm_dissector_handle);
         heur_dissector_add("udp", test_lbtrm_packet, proto_lbtrm);
         lbtrm_tap_handle = register_tap("lbtrm");
     }
diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c
index 1af694ea59..4775f2ed59 100644
--- a/epan/dissectors/packet-lbtru.c
+++ b/epan/dissectors/packet-lbtru.c
@@ -2023,7 +2023,7 @@ void proto_reg_handoff_lbtru(void)
     if (!already_registered)
     {
         lbtru_dissector_handle = new_create_dissector_handle(dissect_lbtru, proto_lbtru);
-        dissector_add_handle("udp.port", lbtru_dissector_handle);  /* for "decode as" */
+        dissector_add_for_decode_as("udp.port", lbtru_dissector_handle);
         heur_dissector_add("udp", test_lbtru_packet, proto_lbtru);
         lbtru_tap_handle = register_tap("lbtru");
     }
diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c
index ed8c85360d..c331b782a5 100644
--- a/epan/dissectors/packet-lbttcp.c
+++ b/epan/dissectors/packet-lbttcp.c
@@ -801,7 +801,7 @@ void proto_reg_handoff_lbttcp(void)
     if (!already_registered)
     {
         lbttcp_dissector_handle = new_create_dissector_handle(dissect_lbttcp, proto_lbttcp);
-        dissector_add_handle("tcp.port", lbttcp_dissector_handle); /* for decode as */
+        dissector_add_for_decode_as("tcp.port", lbttcp_dissector_handle);
         heur_dissector_add("tcp", test_lbttcp_packet, proto_lbttcp);
     }
 
diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c
index 100139d97b..834d03b659 100644
--- a/epan/dissectors/packet-lcsap.c
+++ b/epan/dissectors/packet-lcsap.c
@@ -2276,7 +2276,7 @@ proto_reg_handoff_lcsap(void)
 		lcsap_handle = find_dissector("lcsap");
 		lpp_handle = find_dissector("lpp");
 		lppa_handle = find_dissector("lppa");
-		dissector_add_handle("sctp.port", lcsap_handle);   /* for "decode-as"  */
+		dissector_add_for_decode_as("sctp.port", lcsap_handle);
 		dissector_add_uint("sctp.ppi", LCS_AP_PAYLOAD_PROTOCOL_ID,   lcsap_handle);
 		Initialized=TRUE;
 
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index d7d8a5e701..67f40aae3a 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -122,7 +122,7 @@ proto_reg_handoff_lge_monitor(void)
 
 	if (!lge_monitor_prefs_initialized) {
 		lge_monitor_handle = create_dissector_handle(dissect_lge_monitor, proto_lge_monitor);
-		dissector_add_handle("udp.port", lge_monitor_handle);  /* for 'decode-as' */
+		dissector_add_for_decode_as("udp.port", lge_monitor_handle);
 		mtp3_handle  = find_dissector("mtp3");
 		m3ua_handle  = find_dissector("m3ua");
 		sccp_handle  = find_dissector("sccp");
diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c
index 49c3bd5987..7633ba24f3 100644
--- a/epan/dissectors/packet-logcat.c
+++ b/epan/dissectors/packet-logcat.c
@@ -287,7 +287,7 @@ proto_reg_handoff_logcat(void)
 {
     dissector_add_uint("wtap_encap", WTAP_ENCAP_LOGCAT, logcat_handle);
 
-    dissector_add_handle("tcp.port", logcat_handle);
+    dissector_add_for_decode_as("tcp.port", logcat_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 278018eb75..a82fc50e89 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -437,8 +437,8 @@ proto_reg_handoff_lsc(void)
   if (!initialized) {
     lsc_udp_handle = new_create_dissector_handle(dissect_lsc_udp, proto_lsc);
     lsc_tcp_handle = new_create_dissector_handle(dissect_lsc_tcp, proto_lsc);
-    dissector_add_handle("udp.port", lsc_udp_handle);   /* for 'decode-as' */
-    dissector_add_handle("tcp.port", lsc_tcp_handle);   /* ...             */
+    dissector_add_for_decode_as("udp.port", lsc_udp_handle);
+    dissector_add_for_decode_as("tcp.port", lsc_tcp_handle);
     initialized = TRUE;
   } else {
     if (saved_lsc_port != 0) {
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 902ea13b6d..364121f7f4 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -45369,7 +45369,7 @@ proto_reg_handoff_lte_rrc(void)
 	static dissector_handle_t lte_rrc_dl_ccch_handle;
 
 	lte_rrc_dl_ccch_handle = find_dissector("lte_rrc.dl_ccch");
-	dissector_add_handle("udp.port", lte_rrc_dl_ccch_handle);
+	dissector_add_for_decode_as("udp.port", lte_rrc_dl_ccch_handle);
 	nas_eps_handle = find_dissector("nas-eps");
 	rrc_irat_ho_to_utran_cmd_handle = find_dissector("rrc.irat.ho_to_utran_cmd");
 	rrc_sys_info_cont_handle = find_dissector("rrc.sysinfo.cont");
diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c
index c3a334b498..d00d93a0c5 100644
--- a/epan/dissectors/packet-lwm.c
+++ b/epan/dissectors/packet-lwm.c
@@ -814,7 +814,7 @@ void proto_reg_handoff_lwm(void)
     data_handle     = find_dissector("data");
 
     /* Register our dissector with IEEE 802.15.4 */
-    dissector_add_handle(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector("lwm"));
+    dissector_add_for_decode_as(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector("lwm"));
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN, dissect_lwm_heur, proto_lwm);
 
 } /* proto_reg_handoff_lwm */
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index 093c9cef5f..9ce42e321a 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -314,7 +314,7 @@ void proto_reg_handoff_miop (void) {
   dissector_handle_t miop_handle;
 
   miop_handle = find_dissector("miop");
-  dissector_add_handle("udp.port", miop_handle);    /* for 'Decode As' */
+  dissector_add_for_decode_as("udp.port", miop_handle);
 
   heur_dissector_add("udp", dissect_miop_heur, proto_miop);
 
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index c4757c43b8..676a0541fd 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -1547,7 +1547,7 @@ proto_reg_handoff_mp2t(void)
     heur_dissector_add("udp", heur_dissect_mp2t, proto_mp2t);
 
     dissector_add_uint("rtp.pt", PT_MP2T, mp2t_handle);
-    dissector_add_handle("udp.port", mp2t_handle);  /* for decode-as */
+    dissector_add_for_decode_as("udp.port", mp2t_handle);
     heur_dissector_add("usb.bulk", heur_dissect_mp2t, proto_mp2t);
     dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG_2_TS, mp2t_handle);
 
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 3359dbae68..e77a98fd12 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -4656,7 +4656,7 @@ void proto_reg_handoff_mq(void)
     mq_tcp_handle = new_create_dissector_handle(dissect_mq_tcp, proto_mq);
     mq_spx_handle = create_dissector_handle(dissect_mq_spx, proto_mq);
 
-    dissector_add_handle("tcp.port", mq_tcp_handle);
+    dissector_add_for_decode_as("tcp.port", mq_tcp_handle);
     heur_dissector_add("tcp",     dissect_mq_heur_tcp, proto_mq);
     heur_dissector_add("netbios", dissect_mq_heur_netbios, proto_mq);
     heur_dissector_add("http",    dissect_mq_heur_http, proto_mq);
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c
index b00fbae241..6ad2648d11 100644
--- a/epan/dissectors/packet-mqtt.c
+++ b/epan/dissectors/packet-mqtt.c
@@ -587,7 +587,7 @@ void proto_register_mqtt(void)
  */
 void proto_reg_handoff_mqtt(void)
 {
-  dissector_add_handle("tcp.port", mqtt_handle);
+  dissector_add_for_decode_as("tcp.port", mqtt_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index df48c4e787..66d5b38f29 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -926,7 +926,7 @@ void
 proto_reg_handoff_msrp(void)
 {
     msrp_handle = find_dissector("msrp");
-    dissector_add_handle("tcp.port", msrp_handle);   /* for "decode-as" */
+    dissector_add_for_decode_as("tcp.port", msrp_handle);   /* for "decode-as" */
     heur_dissector_add("tcp", dissect_msrp_heur, proto_msrp);
     media_type_dissector_table = find_dissector_table("media_type");
 }
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index 4e0ba4de12..53e75e8365 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -292,6 +292,6 @@ proto_reg_handoff_nasdaq_soup(void)
 {
     nasdaq_soup_handle = create_dissector_handle(dissect_nasdaq_soup, proto_nasdaq_soup);
     nasdaq_itch_handle = find_dissector("nasdaq-itch");
-    dissector_add_handle("tcp.port", nasdaq_soup_handle); /* for "decode-as" */
+    dissector_add_for_decode_as("tcp.port", nasdaq_soup_handle);
 }
 
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index c78a5f2860..9428499116 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -807,7 +807,7 @@ void proto_reg_handoff_nat_pmp(void)
      NAT-PMP, but it backwards compatible.  However, still let NAT-PMP
      use Decode As
    */
-  dissector_add_handle("udp.port", nat_pmp_handle);
+  dissector_add_for_decode_as("udp.port", nat_pmp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c
index a254be1cea..c3dd29a725 100644
--- a/epan/dissectors/packet-nb_rtpmux.c
+++ b/epan/dissectors/packet-nb_rtpmux.c
@@ -259,7 +259,7 @@ proto_reg_handoff_nb_rtpmux(void)
     nb_rtpmux_handle = new_create_dissector_handle(dissect_nb_rtpmux,
                                                    proto_nb_rtpmux);
 
-    dissector_add_handle("udp.port", nb_rtpmux_handle);
+    dissector_add_for_decode_as("udp.port", nb_rtpmux_handle);
     rtpdissector = find_dissector("rtp");
 }
 
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 1f0d1a8a81..4204664e5f 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -70195,9 +70195,9 @@ proto_reg_handoff_nbap(void)
 	fp_handle = find_dissector("fp");
 	dissector_add_uint("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
 #ifdef EXTRA_PPI
-		dissector_add_uint("sctp.ppi", 17, nbap_handle);
+	dissector_add_uint("sctp.ppi", 17, nbap_handle);
 #endif
-	dissector_add_handle("sctp.port", nbap_handle);  /* for "decode-as" */
+	dissector_add_for_decode_as("sctp.port", nbap_handle);
 
 
 /*--- Included file: packet-nbap-dis-tab.c ---*/
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index 09ac2a49d3..31c2a0ecbf 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -212,7 +212,7 @@ void proto_reg_handoff_netdump(void)
 		netdump_handle = create_dissector_handle(dissect_netdump,
 				proto_netdump);
 
-		dissector_add_handle("udp.port", netdump_handle); /* For Decode As */
+		dissector_add_for_decode_as("udp.port", netdump_handle);
 		initalized = TRUE;
 	} else {
 		if (CurrentPort != 0)
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index e815a27245..27ac90445f 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -115,7 +115,7 @@ proto_reg_handoff_newmail(void)
 
 	if(!inited) {
 		newmail_handle = find_dissector("newmail");
-		dissector_add_handle("udp.port", newmail_handle); /* for 'decode-as' */
+		dissector_add_for_decode_as("udp.port", newmail_handle);
 		inited = TRUE;
 	} else {
 		if (preference_default_port_last != 0) {
diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c
index 6a937e3f34..40f97a1b37 100644
--- a/epan/dissectors/packet-nwmtp.c
+++ b/epan/dissectors/packet-nwmtp.c
@@ -163,8 +163,7 @@ void proto_register_mwmtp(void)
 
 void proto_reg_handoff_nwmtp(void)
 {
-	/* For decode as */
-	dissector_add_handle("udp.port", nwmtp_handle);
+	dissector_add_for_decode_as("udp.port", nwmtp_handle);
 	mtp_handle = find_dissector("mtp3");
 }
 
diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c
index 3d76fa8bbc..ec453e5fac 100644
--- a/epan/dissectors/packet-openwire.c
+++ b/epan/dissectors/packet-openwire.c
@@ -2020,5 +2020,5 @@ proto_reg_handoff_openwire(void)
 {
     heur_dissector_add("tcp", dissect_openwire_heur, proto_openwire);
     openwire_tcp_handle = new_create_dissector_handle(dissect_openwire_tcp, proto_openwire);
-    dissector_add_handle("tcp.port", openwire_tcp_handle);
+    dissector_add_for_decode_as("tcp.port", openwire_tcp_handle);
 }
diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c
index eee27fb2e4..6495f0df75 100644
--- a/epan/dissectors/packet-osc.c
+++ b/epan/dissectors/packet-osc.c
@@ -903,7 +903,8 @@ proto_reg_handoff_osc(void)
     if(! initialized)
     {
         osc_tcp_handle = new_create_dissector_handle(dissect_osc_tcp, proto_osc);
-        dissector_add_handle("tcp.port", osc_tcp_handle); /* for "decode-as" */
+        /* register for "decode as" for TCP connections */
+        dissector_add_for_decode_as("tcp.port", osc_tcp_handle);
 
         /* XXX: Add port pref and  "decode as" for UDP ? */
         /*      (The UDP heuristic is a bit expensive    */
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index ca825aa744..19ad2b7538 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -519,7 +519,7 @@ proto_reg_handoff_osi(void)
 
 
     osi_tpkt_handle = create_dissector_handle(dissect_osi_tpkt, proto_osi);
-    dissector_add_handle("tcp.port", osi_tpkt_handle); /* for 'decode-as' */
+    dissector_add_for_decode_as("tcp.port", osi_tpkt_handle);
     osi_prefs_initialized = TRUE;
   } else {
     if (tcp_port_osi_over_tpkt != 0) {
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index a2c4afb1a5..8541022c41 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -938,7 +938,7 @@ proto_reg_handoff_pana(void)
     heur_dissector_add("udp", dissect_pana, proto_pana);
 
     pana_handle = new_create_dissector_handle(dissect_pana, proto_pana);
-    dissector_add_handle("udp.port", pana_handle);
+    dissector_add_for_decode_as("udp.port", pana_handle);
 
     eap_handle = find_dissector("eap");
 /**    if(!eap_handle) fprintf(stderr,"PANA warning: EAP dissector not found\n"); **/
diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c
index 3084c14e41..f3c5a7b2fa 100644
--- a/epan/dissectors/packet-pdc.c
+++ b/epan/dissectors/packet-pdc.c
@@ -584,7 +584,7 @@ void proto_reg_handoff_pdc(void)
 	{
 		asterix_handle = find_dissector("asterix");
 		pdc_tcp_handle = create_dissector_handle(tcp_dissect_pdc, proto_pdc);
-		dissector_add_handle("tcp.port", pdc_tcp_handle); /* for "decode-as" */
+		dissector_add_for_decode_as("tcp.port", pdc_tcp_handle);
 		initialized    = TRUE;
 	}
 	else
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 6dc1f3c95f..486746a5eb 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -1412,7 +1412,7 @@ proto_register_pgm(void)
    * (Note: Initially the ports are set to zero and the ports
    *        are not registered so the dissecting of PGM
    *        encapsulated in UDP packets is off by default;
-   *        dissector_add_handle is called so that pgm
+   *        dissector_add_for_decode_as is called so that pgm
    *        is available for 'decode-as'
    */
   pgm_module = prefs_register_protocol(proto_pgm, proto_reg_handoff_pgm);
@@ -1451,7 +1451,7 @@ proto_reg_handoff_pgm(void)
 
   if (! initialized) {
     pgm_handle = create_dissector_handle(dissect_pgm, proto_pgm);
-    dissector_add_handle("udp.port", pgm_handle);  /* for 'decode-as' */
+    dissector_add_for_decode_as("udp.port", pgm_handle);
     dissector_add_uint("ip.proto", IP_PROTO_PGM, pgm_handle);
     data_handle = find_dissector("data");
     initialized = TRUE;
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index dc9ff2bcaf..951b2c0e2c 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -1966,13 +1966,13 @@ proto_reg_handoff_pw_atm_ata(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("mpls_pw_atm_n1_cw");
-	dissector_add_handle( "mpls.label", h );
+	dissector_add_for_decode_as( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_n1_nocw");
-	dissector_add_handle( "mpls.label", h );
+	dissector_add_for_decode_as( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_11_or_aal5_pdu");
-	dissector_add_handle( "mpls.label", h );
+	dissector_add_for_decode_as( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_aal5_sdu");
-	dissector_add_handle( "mpls.label", h );
+	dissector_add_for_decode_as( "mpls.label", h );
 
 	dh_cell		   = find_dissector("mpls_pw_atm_cell");
 	dh_cell_header	   = find_dissector("mpls_pw_atm_cell_header");
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 5e11207459..e99a36be58 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -457,7 +457,7 @@ void proto_reg_handoff_pw_cesopsn(void)
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
 	/* For Decode As */
-	dissector_add_handle("mpls.label", find_dissector("pw_cesopsn_mpls"));
-	dissector_add_handle("udp.port", find_dissector("pw_cesopsn_udp"));
+	dissector_add_for_decode_as("mpls.label", find_dissector("pw_cesopsn_mpls"));
+	dissector_add_for_decode_as("udp.port", find_dissector("pw_cesopsn_udp"));
 	return;
 }
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index 966dc3d563..96a81c19ad 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -209,13 +209,13 @@ proto_reg_handoff_pw_eth(void)
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
     pw_eth_handle_cw = find_dissector("pw_eth_cw");
-    dissector_add_handle("mpls.label", pw_eth_handle_cw);
+    dissector_add_for_decode_as("mpls.label", pw_eth_handle_cw);
 
     pw_eth_handle_nocw = find_dissector("pw_eth_nocw");
-    dissector_add_handle("mpls.label", pw_eth_handle_nocw);
+    dissector_add_for_decode_as("mpls.label", pw_eth_handle_nocw);
 
     pw_eth_handle_heuristic = find_dissector("pw_eth_heuristic");
-    dissector_add_handle("mpls.label", pw_eth_handle_heuristic);
+    dissector_add_for_decode_as("mpls.label", pw_eth_handle_heuristic);
 }
 
 /*
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index 5d04833231..0d40dd7663 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -311,7 +311,7 @@ proto_reg_handoff_pw_fr(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("pw_fr");
-	dissector_add_handle("mpls.label", h);
+	dissector_add_for_decode_as("mpls.label", h);
 	fr_stripped_address_handle = find_dissector("fr_stripped_address");
 }
 
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index d6b9060a2a..15b418e8f5 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -222,10 +222,10 @@ void proto_reg_handoff_pw_hdlc(void)
 	dissector_handle_t handle;
 
 	handle = find_dissector("pw_hdlc_nocw_fr");
-	dissector_add_handle( "mpls.label", handle );
+	dissector_add_for_decode_as( "mpls.label", handle );
 
 	handle = find_dissector("pw_hdlc_nocw_hdlc_ppp");
-	dissector_add_handle( "mpls.label", handle );
+	dissector_add_for_decode_as( "mpls.label", handle );
 
 	ppp_handle = find_dissector( "ppp" );
 	fr_handle = find_dissector( "fr" );
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 30db8e7d15..8418de00a8 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -472,6 +472,6 @@ void proto_reg_handoff_pw_satop(void)
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
 	/* For Decode As */
-	dissector_add_handle("mpls.label", find_dissector("pw_satop_mpls"));
-	dissector_add_handle("udp.port", find_dissector("pw_satop_udp"));
+	dissector_add_for_decode_as("mpls.label", find_dissector("pw_satop_mpls"));
+	dissector_add_for_decode_as("udp.port", find_dissector("pw_satop_udp"));
 }
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 93dee3bdea..c5e0a298c9 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -2192,7 +2192,7 @@ void proto_reg_handoff_rdt(void)
         /* Register this dissector as one that can be selected by a
            UDP port number. */
         rdt_handle = find_dissector("rdt");
-        dissector_add_handle("udp.port", rdt_handle);
+        dissector_add_for_decode_as("udp.port", rdt_handle);
         rdt_prefs_initialized = TRUE;
     }
     else
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index b1f6eec744..24477ba837 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -287,7 +287,7 @@ void proto_reg_handoff_redbackli(void) {
 	ip_handle = find_dissector("ip");
 
 	redbackli_handle = find_dissector("redbackli");
-	dissector_add_handle("udp.port", redbackli_handle);  /* for 'decode-as' */
+	dissector_add_for_decode_as("udp.port", redbackli_handle);
 
 	heur_dissector_add("udp", redbackli_dissect_heur, proto_redbackli);
 }
diff --git a/epan/dissectors/packet-rfid-pn532-hci.c b/epan/dissectors/packet-rfid-pn532-hci.c
index fe81c5b130..1f444552a2 100644
--- a/epan/dissectors/packet-rfid-pn532-hci.c
+++ b/epan/dissectors/packet-rfid-pn532-hci.c
@@ -286,8 +286,8 @@ proto_reg_handoff_pn532_hci(void)
 
     dissector_add_uint("usb.product", (0x04e6 << 16) | 0x5591, pn532_hci_handle);
 
-    dissector_add_handle("usb.device", pn532_hci_handle);
-    dissector_add_handle("usb.protocol", pn532_hci_handle);
+    dissector_add_for_decode_as("usb.device", pn532_hci_handle);
+    dissector_add_for_decode_as("usb.protocol", pn532_hci_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index 3a657e9bd6..5560569074 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -238,7 +238,7 @@ void proto_reg_handoff_alc(void)
     {
         preferences_initialized = TRUE;
         handle = new_create_dissector_handle(dissect_alc, proto_rmt_alc);
-        dissector_add_handle("udp.port", handle);
+        dissector_add_for_decode_as("udp.port", handle);
         xml_handle = find_dissector("xml");
         rmt_lct_handle = find_dissector("rmt-lct");
         rmt_fec_handle = find_dissector("rmt-fec");
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index ba1d540b59..255e8c988f 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -989,7 +989,7 @@ void proto_reg_handoff_norm(void)
     static dissector_handle_t handle;
 
     handle = new_create_dissector_handle(dissect_norm, proto_rmt_norm);
-    dissector_add_handle("udp.port", handle);
+    dissector_add_for_decode_as("udp.port", handle);
     heur_dissector_add("udp", dissect_norm_heur, proto_rmt_norm);
 
     rmt_fec_handle = find_dissector("rmt-fec");
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index ab62369284..664c27039b 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -5274,7 +5274,7 @@ proto_reg_handoff_rtcp(void)
      * UDP port number.
      */
     rtcp_handle = find_dissector("rtcp");
-    dissector_add_handle("udp.port", rtcp_handle);
+    dissector_add_for_decode_as("udp.port", rtcp_handle);
 
     heur_dissector_add( "udp", dissect_rtcp_heur, proto_rtcp);
         heur_dissector_add("stun", dissect_rtcp_heur, proto_rtcp);
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 19470834cb..0ffc04e299 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -2937,7 +2937,7 @@ proto_reg_handoff_rtmpt(void)
 
 /*      heur_dissector_add("tcp", dissect_rtmpt_heur, proto_rtmpt); */
         rtmpt_tcp_handle = new_create_dissector_handle(dissect_rtmpt_tcp, proto_rtmpt);
-/*      dissector_add_handle("tcp.port", rtmpt_tcp_handle); */
+/*      dissector_add_for_decode_as("tcp.port", rtmpt_tcp_handle); */
         dissector_add_uint("tcp.port", RTMP_PORT, rtmpt_tcp_handle);
 
         rtmpt_http_handle = create_dissector_handle(dissect_rtmpt_http, proto_rtmpt);
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index a05a7d57ed..72a748ed80 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -2752,7 +2752,7 @@ proto_reg_handoff_pkt_ccc(void)
 
     if (!initialized) {
         pkt_ccc_handle = find_dissector("pkt_ccc");
-        dissector_add_handle("udp.port", pkt_ccc_handle);  /* for 'decode-as' */
+        dissector_add_for_decode_as("udp.port", pkt_ccc_handle);
         initialized = TRUE;
     } else {
         if (saved_pkt_ccc_udp_port != 0) {
@@ -3679,7 +3679,7 @@ proto_reg_handoff_rtp(void)
         rtp_handle = find_dissector("rtp");
         rtp_rfc2198_handle = find_dissector("rtp.rfc2198");
 
-        dissector_add_handle("udp.port", rtp_handle);  /* for 'decode-as' */
+        dissector_add_for_decode_as("udp.port", rtp_handle);
         dissector_add_string("rtp_dyn_payload_type", "red", rtp_rfc2198_handle);
         heur_dissector_add( "udp", dissect_rtp_heur_udp,  proto_rtp);
         heur_dissector_add("stun", dissect_rtp_heur_stun, proto_rtp);
@@ -3709,7 +3709,7 @@ proto_reg_handoff_rtp(void)
 
         dissector_add_string("rtp_dyn_payload_type", "v150fw", v150fw_handle);
 
-        dissector_add_handle("btl2cap.cid", rtp_handle);
+        dissector_add_for_decode_as("btl2cap.cid", rtp_handle);
 
         rtp_prefs_initialized = TRUE;
     } else {
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c
index 549a6d07b1..8996464171 100644
--- a/epan/dissectors/packet-rudp.c
+++ b/epan/dissectors/packet-rudp.c
@@ -251,7 +251,7 @@ proto_reg_handoff_rudp(void) {
 
 	if (!initialized) {
 		rudp_handle = create_dissector_handle(dissect_rudp, proto_rudp);
-		dissector_add_handle("udp.port", rudp_handle);  /* for "decode as" */
+		dissector_add_for_decode_as("udp.port", rudp_handle);
 		sm_handle = find_dissector("sm");
 		data_handle = find_dissector("data");
 		initialized = TRUE;
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index dd5aeaa483..3e1972e44f 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -10106,7 +10106,7 @@ proto_reg_handoff_s1ap(void)
 		nas_eps_handle = find_dissector("nas-eps");
 		lppa_handle = find_dissector("lppa");
 		bssgp_handle = find_dissector("bssgp");
-		dissector_add_handle("sctp.port", s1ap_handle);   /* for "decode-as"  */
+		dissector_add_for_decode_as("sctp.port", s1ap_handle);
 		dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
 		Initialized=TRUE;
 
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c
index 84a706b40c..0a3df2d6c0 100644
--- a/epan/dissectors/packet-sgsap.c
+++ b/epan/dissectors/packet-sgsap.c
@@ -1580,7 +1580,7 @@ proto_reg_handoff_sgsap(void)
     gsm_a_dtap_handle = find_dissector("gsm_a_dtap");
 
     if (!Initialized) {
-        dissector_add_handle("sctp.port", sgsap_handle);   /* for "decode-as"  */
+        dissector_add_for_decode_as("sctp.port", sgsap_handle);
         Initialized=TRUE;
     } else {
         dissector_delete_uint_range("sctp.port", sgsap_port_range, sgsap_handle);
diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c
index 71dc217123..e4e34e5c14 100644
--- a/epan/dissectors/packet-simulcrypt.c
+++ b/epan/dissectors/packet-simulcrypt.c
@@ -1846,8 +1846,8 @@ proto_reg_handoff_simulcrypt(void)
 		{
 			tab_ecm_inter[i].protocol_handle = find_dissector(tab_ecm_inter[i].protocol_name);
 		}
-		dissector_add_handle("tcp.port", simulcrypt_handle);   /* for "decode_as" */
-		dissector_add_handle("udp.port", simulcrypt_handle);   /* for "decode_as" */
+		dissector_add_for_decode_as("tcp.port", simulcrypt_handle);
+		dissector_add_for_decode_as("udp.port", simulcrypt_handle);
 		initialized = TRUE;
 	}
 	else {
diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c
index 30c7e926e6..d7c24b0016 100644
--- a/epan/dissectors/packet-skype.c
+++ b/epan/dissectors/packet-skype.c
@@ -448,8 +448,8 @@ proto_reg_handoff_skype(void)
 	dissector_handle_t skype_handle;
 
 	skype_handle = new_create_dissector_handle(dissect_skype_static, proto_skype);
-	dissector_add_handle("tcp.port", skype_handle);
-	dissector_add_handle("udp.port", skype_handle);
+	dissector_add_for_decode_as("tcp.port", skype_handle);
+	dissector_add_for_decode_as("udp.port", skype_handle);
 #if SKYPE_HEUR
 	heur_dissector_add("tcp", dissect_skype_heur, proto_skype);
 	heur_dissector_add("udp", dissect_skype_heur, proto_skype);
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 5ae1054583..de5642cc78 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3800,7 +3800,7 @@ proto_reg_handoff_smpp(void)
      * however.
      */
     smpp_handle = find_dissector("smpp");
-    dissector_add_handle("tcp.port", smpp_handle);
+    dissector_add_for_decode_as("tcp.port", smpp_handle);
     heur_dissector_add("tcp", dissect_smpp_heur, proto_smpp);
     heur_dissector_add("x.25", dissect_smpp_heur, proto_smpp);
 
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c
index 04337dd437..9fcd04ba46 100644
--- a/epan/dissectors/packet-soupbintcp.c
+++ b/epan/dissectors/packet-soupbintcp.c
@@ -619,7 +619,7 @@ proto_reg_handoff_soupbintcp(void)
                                                 proto_soupbintcp);
 
     /* For "decode-as" */
-    dissector_add_handle("tcp.port", soupbintcp_handle);
+    dissector_add_for_decode_as("tcp.port", soupbintcp_handle);
 }
 
 
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index 951c2ec500..c2fa858882 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -4577,7 +4577,7 @@ void
 proto_reg_handoff_spice(void)
 {
     spice_handle = new_create_dissector_handle(dissect_spice, proto_spice);
-    dissector_add_handle("tcp.port", spice_handle);   /* for "decode as" */
+    dissector_add_for_decode_as("tcp.port", spice_handle);
     heur_dissector_add("tcp", test_spice_protocol, proto_spice);
     jpeg_handle  = find_dissector("image-jfif");
 }
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c
index a5cdad1746..b887b5cb32 100644
--- a/epan/dissectors/packet-sprt.c
+++ b/epan/dissectors/packet-sprt.c
@@ -3433,7 +3433,7 @@ void
 proto_reg_handoff_sprt(void)
 {
     sprt_handle = find_dissector("sprt");
-    dissector_add_handle("udp.port", sprt_handle);
+    dissector_add_for_decode_as("udp.port", sprt_handle);
 
     heur_dissector_add( "udp", dissect_sprt_heur, proto_sprt);
 }
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index ffd32171b0..8823266738 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -1623,8 +1623,8 @@ proto_reg_handoff_stun(void)
     dissector_add_uint("udp.port", UDP_PORT_STUN, stun_udp_handle);
 
     /* Used for "Decode As" in case STUN negotiation isn't captured */
-    dissector_add_handle("tcp.port", stun_tcp_handle);
-    dissector_add_handle("udp.port", stun_udp_handle);
+    dissector_add_for_decode_as("tcp.port", stun_tcp_handle);
+    dissector_add_for_decode_as("udp.port", stun_udp_handle);
 
     heur_dissector_add("udp", dissect_stun_heur, proto_stun);
 
diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c
index cfea027642..5247c40979 100644
--- a/epan/dissectors/packet-sync.c
+++ b/epan/dissectors/packet-sync.c
@@ -296,7 +296,7 @@ proto_reg_handoff_sync(void)
 {
     ip_handle   = find_dissector("ip");
 
-    dissector_add_handle("udp.port", sync_handle);
+    dissector_add_for_decode_as("udp.port", sync_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index a91dbc212f..f50c80e135 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -357,7 +357,7 @@ void
 proto_reg_handoff_syslog(void)
 {
   dissector_add_uint("udp.port", UDP_PORT_SYSLOG, syslog_handle);
-  dissector_add_handle("tcp.port", syslog_handle);
+  dissector_add_for_decode_as("tcp.port", syslog_handle);
 
   /* Find the mtp3 dissector */
   mtp_handle = find_dissector("mtp3");
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index c9637af694..b9da7eaac0 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -208,11 +208,11 @@ proto_reg_handoff_turnchannel(void)
 	turnchannel_tcp_handle = new_create_dissector_handle(dissect_turnchannel_tcp, proto_turnchannel);
 	turnchannel_udp_handle = find_dissector("turnchannel");
 
-	/* Used for "Decode As" in case STUN negotiation isn't captured */
-	dissector_add_handle("tcp.port", turnchannel_tcp_handle);
-	dissector_add_handle("udp.port", turnchannel_udp_handle);
+	/* Register for "Decode As" in case STUN negotiation isn't captured */
+	dissector_add_for_decode_as("tcp.port", turnchannel_tcp_handle);
+	dissector_add_for_decode_as("udp.port", turnchannel_udp_handle);
 
-	/* TURN negoiation is handled through STUN2 dissector (packet-stun.c),
+	/* TURN negotiation is handled through STUN2 dissector (packet-stun.c),
 	   so only it should be able to determine if a packet is a TURN packet */
 	heur_dissector_add("stun", dissect_turnchannel_heur, proto_turnchannel);
 
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index fdf6be0604..3fe3882b75 100644
--- a/epan/dissectors/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
@@ -186,6 +186,6 @@ void
 proto_reg_handoff_tuxedo(void)
 {
 	tuxedo_handle = create_dissector_handle(dissect_tuxedo, proto_tuxedo);
-	dissector_add_handle("tcp.port", tuxedo_handle);
+	dissector_add_for_decode_as("tcp.port", tuxedo_handle);
 	heur_dissector_add("tcp", dissect_tuxedo_heur, proto_tuxedo);
 }
diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c
index 60bc292200..d7fdf5b022 100644
--- a/epan/dissectors/packet-uaudp.c
+++ b/epan/dissectors/packet-uaudp.c
@@ -685,7 +685,7 @@ void proto_reg_handoff_uaudp(void)
         {
             /* If all ports are set to 0, then just register the handle so
              * at least "Decode As..." will work. */
-            dissector_add_handle("udp.port", uaudp_handle);
+            dissector_add_for_decode_as("udp.port", uaudp_handle);
         }
     }
 }
diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c
index 4ac66a3d62..843cf90382 100644
--- a/epan/dissectors/packet-ubertooth.c
+++ b/epan/dissectors/packet-ubertooth.c
@@ -3317,8 +3317,8 @@ proto_reg_handoff_ubertooth(void)
     dissector_add_uint("usb.product", (0x1d50 << 16) | 0x6000, ubertooth_handle); /* Ubertooth Zero */
     dissector_add_uint("usb.product", (0x1d50 << 16) | 0x6002, ubertooth_handle); /* Ubertooth One */
 
-    dissector_add_handle("usb.device",   ubertooth_handle);
-    dissector_add_handle("usb.protocol", ubertooth_handle);
+    dissector_add_for_decode_as("usb.device",   ubertooth_handle);
+    dissector_add_for_decode_as("usb.protocol", ubertooth_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 38c8a7401e..c961b5a67e 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -2795,7 +2795,7 @@ proto_reg_handoff_ucp(void)
      * Also register as a dissector that can be selected by a TCP port number via "decode as".
      */
     ucp_handle = new_create_dissector_handle(dissect_ucp_tcp, proto_ucp);
-    dissector_add_handle("tcp.port", ucp_handle);
+    dissector_add_for_decode_as("tcp.port", ucp_handle);
 
     /* Tapping setup */
     stats_tree_register_with_group("ucp", "ucp_messages", "_UCP Messages", 0,
diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c
index 8f0dbd290b..28dafe5fae 100644
--- a/epan/dissectors/packet-udt.c
+++ b/epan/dissectors/packet-udt.c
@@ -455,7 +455,7 @@ void proto_reg_handoff_udt(void)
 	udt_handle  = new_create_dissector_handle(dissect_udt, proto_udt);
 
 	heur_dissector_add("udp", dissect_udt_heur, proto_udt);
-	dissector_add_handle("udp.port", udt_handle);
+	dissector_add_for_decode_as("udp.port", udt_handle);
 }
 
 
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 75fc509568..6fef5a4546 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -1756,7 +1756,7 @@ proto_reg_handoff_uma(void)
 	if (!Initialized) {
 		uma_tcp_handle = find_dissector("umatcp");
 		uma_udp_handle = find_dissector("umaudp");
-		dissector_add_handle("udp.port", uma_udp_handle);  /* for "decode-as" */
+		dissector_add_for_decode_as("udp.port", uma_udp_handle);
 		data_handle = find_dissector("data");
 		rtcp_handle = find_dissector("rtcp");
 		llc_handle = find_dissector("llcgprs");
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index 1d4de957fe..6a50c24025 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -667,9 +667,9 @@ proto_reg_handoff_ccid(void)
 
     dissector_add_uint("usb.bulk", IF_CLASS_SMART_CARD, usb_ccid_handle);
 
-    dissector_add_handle("usb.device", usb_ccid_handle);
-    dissector_add_handle("usb.product", usb_ccid_handle);
-    dissector_add_handle("usb.protocol", usb_ccid_handle);
+    dissector_add_for_decode_as("usb.device", usb_ccid_handle);
+    dissector_add_for_decode_as("usb.product", usb_ccid_handle);
+    dissector_add_for_decode_as("usb.protocol", usb_ccid_handle);
 
     sub_handles[SUB_DATA] = find_dissector("data");
     sub_handles[SUB_ISO7816] = find_dissector("iso7816");
diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c
index ba3d5bd86b..4c8f30f82c 100644
--- a/epan/dissectors/packet-usb-dfu.c
+++ b/epan/dissectors/packet-usb-dfu.c
@@ -587,8 +587,8 @@ proto_reg_handoff_usb_dfu(void)
     dissector_add_uint("usb.product", (0x1d50 << 16) | 0x6082, usb_dfu_handle); /* Facecandy *USB DFU loader */
     dissector_add_uint("usb.product", (0x1d50 << 16) | 0x6084, usb_dfu_handle); /* arcin arcade controller (USB DFU loader) */
 
-    dissector_add_handle("usb.device",   usb_dfu_handle);
-    dissector_add_handle("usb.protocol", usb_dfu_handle);
+    dissector_add_for_decode_as("usb.device",   usb_dfu_handle);
+    dissector_add_for_decode_as("usb.protocol", usb_dfu_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c
index d3ffa73cc1..3615063639 100644
--- a/epan/dissectors/packet-vcdu.c
+++ b/epan/dissectors/packet-vcdu.c
@@ -641,7 +641,7 @@ proto_register_vcdu(void)
 void
 proto_reg_handoff_vcdu(void)
 {
-    dissector_add_handle("udp.port", vcdu_handle); /* for 'decode as' */
+    dissector_add_for_decode_as("udp.port", vcdu_handle);
     ccsds_handle = find_dissector("ccsds");
 }
 
diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c
index 0b44f6a68c..bd24368396 100644
--- a/epan/dissectors/packet-vxlan.c
+++ b/epan/dissectors/packet-vxlan.c
@@ -221,7 +221,7 @@ proto_reg_handoff_vxlan(void)
 
     vxlan_handle = create_dissector_handle(dissect_vxlan, proto_vxlan);
     dissector_add_uint("udp.port", UDP_PORT_VXLAN, vxlan_handle);
-    dissector_add_handle("udp.port", vxlan_handle);  /* For 'Decode As' */
+    dissector_add_for_decode_as("udp.port", vxlan_handle);
 
 }
 
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 88b899b849..9d17c4a82c 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -6956,7 +6956,7 @@ proto_reg_handoff_x2ap(void)
 
 	x2ap_handle = find_dissector("x2ap");
 	if (!Initialized) {
-		dissector_add_handle("sctp.port", x2ap_handle);  /* for "decode-as" */
+		dissector_add_for_decode_as("sctp.port", x2ap_handle);
 		dissector_add_uint("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
 		Initialized=TRUE;
 
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index 43f4d2baec..b85b9c83b3 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -1753,7 +1753,7 @@ proto_reg_handoff_zbee_nwk_gp(void)
     /* Find the other dissectors we need. */
     data_handle = find_dissector("data");
     /* Register our dissector with IEEE 802.15.4. */
-    dissector_add_handle(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector(ZBEE_PROTOABBREV_NWK_GP));
+    dissector_add_for_decode_as(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector(ZBEE_PROTOABBREV_NWK_GP));
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN, dissect_zbee_nwk_heur_gp, proto_zbee_nwk_gp);
 } /* proto_reg_handoff_zbee */
 
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index f58e2f4d0b..1ca5bfb4ed 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -2023,7 +2023,7 @@ void proto_reg_handoff_zbee_nwk(void)
     zbee_gp_handle  = find_dissector(ZBEE_PROTOABBREV_NWK_GP);
 
     /* Register our dissector with IEEE 802.15.4 */
-    dissector_add_handle(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector(ZBEE_PROTOABBREV_NWK));
+    dissector_add_for_decode_as(IEEE802154_PROTOABBREV_WPAN_PANID, find_dissector(ZBEE_PROTOABBREV_NWK));
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN_BEACON, dissect_zbee_beacon_heur, proto_zbee_beacon);
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN_BEACON, dissect_zbip_beacon_heur, proto_zbip_beacon);
     heur_dissector_add(IEEE802154_PROTOABBREV_WPAN, dissect_zbee_nwk_heur, proto_zbee_nwk);
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index cbb6ac825a..7da421f855 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -328,7 +328,7 @@ void
 proto_reg_handoff_ziop (void)
 {
   ziop_tcp_handle = new_create_dissector_handle(dissect_ziop_tcp, proto_ziop);
-  dissector_add_handle("udp.port", ziop_tcp_handle);  /* For 'Decode As' */
+  dissector_add_for_decode_as("udp.port", ziop_tcp_handle);
 
   heur_dissector_add("tcp", dissect_ziop_heur, proto_ziop);
 
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 7b9b102402..b15751375b 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -1170,5 +1170,5 @@ proto_reg_handoff_zrtp(void)
   dissector_handle_t zrtp_handle;
 
   zrtp_handle = find_dissector("zrtp");
-  dissector_add_handle("udp.port", zrtp_handle);
+  dissector_add_for_decode_as("udp.port", zrtp_handle);
 }
diff --git a/epan/packet.c b/epan/packet.c
index 865f972047..e938884126 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -955,10 +955,11 @@ dissector_add_uint(const char *name, const guint32 pattern, dissector_handle_t h
 			     GUINT_TO_POINTER( pattern), (gpointer)dtbl_entry);
 
 	/*
-	 * Now add it to the list of handles that could be used with this
-	 * table, because it *is* being used with this table.
+	 * Now add it to the list of handles that could be used for
+	 * "Decode As" with this table, because it *is* being used
+	 * with this table.
 	 */
-	dissector_add_handle(name, handle);
+	dissector_add_for_decode_as(name, handle);
 }
 
 
@@ -1275,10 +1276,11 @@ dissector_add_string(const char *name, const gchar *pattern,
 			     (gpointer)dtbl_entry);
 
 	/*
-	 * Now add it to the list of handles that could be used with this
-	 * table, because it *is* being used with this table.
+	 * Now add it to the list of handles that could be used for
+	 * "Decode As" with this table, because it *is* being used
+	 * with this table.
 	 */
-	dissector_add_handle(name, handle);
+	dissector_add_for_decode_as(name, handle);
 }
 
 /* Delete the entry for a dissector in a string dissector table
@@ -1493,9 +1495,9 @@ dissector_compare_filter_name(gconstpointer dissector_a, gconstpointer dissector
 }
 
 /* Add a handle to the list of handles that *could* be used with this
-   table.  That list is used by code in the UI. */
+   table.  That list is used by the "Decode As"/"-d" code in the UI. */
 void
-dissector_add_handle(const char *name, dissector_handle_t handle)
+dissector_add_for_decode_as(const char *name, dissector_handle_t handle)
 {
 	dissector_table_t  sub_dissectors = find_dissector_table( name);
 	GSList            *entry;
diff --git a/epan/packet.h b/epan/packet.h
index c96bd4fab6..dc09bcb98b 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -318,8 +318,12 @@ WS_DLL_PUBLIC dissector_handle_t dissector_get_default_string_handle(
     const char *name, const gchar *string);
 
 /* Add a handle to the list of handles that *could* be used with this
-   table.  That list is used by code in the UI. */
-WS_DLL_PUBLIC void dissector_add_handle(const char *name, dissector_handle_t handle);
+   table.  That list is used by the "Decode As"/"-d" code in the UI. */
+WS_DLL_PUBLIC void dissector_add_for_decode_as(const char *name,
+    dissector_handle_t handle);
+
+/* DEPRECATED, do not use in new code, call dissector_add_for_decode_as directly! */
+#define dissector_add_handle dissector_add_for_decode_as
 
 /** Get the list of handles for a dissector table
  */
@@ -339,7 +343,7 @@ typedef GSList *heur_dissector_list_t;
 typedef struct {
 	heur_dissector_t dissector;
 	protocol_t *protocol; /* this entry's protocol */
-  gchar *list_name;     /* the list name this entry is in the list of */
+	gchar *list_name;     /* the list name this entry is in the list of */
 	gboolean enabled;
 } heur_dtbl_entry_t;
 
-- 
cgit v1.2.1