new_register_dissector -> register_dissector for dissector directory.

Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c
Reviewed-on: https://code.wireshark.org/review/12485
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

466 files changed, 626 insertions, 626 deletions

diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c
index b7fe228117..ecb4e71ced 100644
--- a/epan/dissectors/file-btsnoop.c
+++ b/epan/dissectors/file-btsnoop.c
@@ -369,7 +369,7 @@ proto_register_btsnoop(void)
     proto_register_field_array(proto_btsnoop, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    btsnoop_handle = new_register_dissector("btsnoop", dissect_btsnoop, proto_btsnoop);
+    btsnoop_handle = register_dissector("btsnoop", dissect_btsnoop, proto_btsnoop);
 
     module = prefs_register_protocol(proto_btsnoop, NULL);
     prefs_register_static_text_preference(module, "version",
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c
index 9ada20d6b4..9937fb6338 100644
--- a/epan/dissectors/file-elf.c
+++ b/epan/dissectors/file-elf.c
@@ -2467,7 +2467,7 @@ proto_register_elf(void)
     proto_register_field_array(proto_elf, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    elf_handle = new_register_dissector("elf", dissect_elf, proto_elf);
+    elf_handle = register_dissector("elf", dissect_elf, proto_elf);
 
     module = prefs_register_protocol(proto_elf, NULL);
     prefs_register_static_text_preference(module, "version",
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c
index 04fe6fad66..b01f53cd33 100644
--- a/epan/dissectors/file-file.c
+++ b/epan/dissectors/file-file.c
@@ -393,7 +393,7 @@ proto_register_file(void)
 	proto_file = proto_register_protocol("File", "File", "file");
 	proto_register_field_array(proto_file, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("file",dissect_file_record,proto_file);
+	register_dissector("file",dissect_file_record,proto_file);
 
 	/* You can't disable dissection of "Frame", as that would be
 	   tantamount to not doing any dissection whatsoever. */
diff --git a/epan/dissectors/file-gif.c b/epan/dissectors/file-gif.c
index 502736b151..87acfbc1b5 100644
--- a/epan/dissectors/file-gif.c
+++ b/epan/dissectors/file-gif.c
@@ -694,7 +694,7 @@ proto_register_gif(void)
     proto_register_fields(proto_gif, hfi, array_length(hfi));
     proto_register_subtree_array(ett, array_length(ett));
 
-    gif_handle = new_register_dissector(IMG_GIF, dissect_gif, proto_gif);
+    gif_handle = register_dissector(IMG_GIF, dissect_gif, proto_gif);
 }
 
 
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c
index d4a2799977..82af92163b 100644
--- a/epan/dissectors/file-jpeg.c
+++ b/epan/dissectors/file-jpeg.c
@@ -1331,7 +1331,7 @@ proto_register_jfif(void)
     expert_jfif = expert_register_protocol(proto_jfif);
     expert_register_field_array(expert_jfif, ei, array_length(ei));
 
-    new_register_dissector(IMG_JFIF, dissect_jfif, proto_jfif);
+    register_dissector(IMG_JFIF, dissect_jfif, proto_jfif);
 }
 
 
diff --git a/epan/dissectors/file-pcap.c b/epan/dissectors/file-pcap.c
index d04e7d86df..3b0894b9e7 100644
--- a/epan/dissectors/file-pcap.c
+++ b/epan/dissectors/file-pcap.c
@@ -290,7 +290,7 @@ proto_register_file_pcap(void)
     proto_register_field_array(proto_pcap, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("file-pcap", dissect_pcap, proto_pcap);
+    register_dissector("file-pcap", dissect_pcap, proto_pcap);
 
     module = prefs_register_protocol(proto_pcap, NULL);
     prefs_register_static_text_preference(module, "version",
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index f1710bfb75..7441269e6d 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -1809,7 +1809,7 @@ proto_register_pcapng(void)
     proto_register_field_array(proto_pcapng, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("file-pcapng", dissect_pcapng, proto_pcapng);
+    register_dissector("file-pcapng", dissect_pcapng, proto_pcapng);
 
     module = prefs_register_protocol(proto_pcapng, NULL);
     prefs_register_static_text_preference(module, "version",
diff --git a/epan/dissectors/file-png.c b/epan/dissectors/file-png.c
index 77b77023d9..de3ffd483c 100644
--- a/epan/dissectors/file-png.c
+++ b/epan/dissectors/file-png.c
@@ -602,7 +602,7 @@ proto_register_png(void)
     expert_png = expert_register_protocol(proto_png);
     expert_register_field_array(expert_png, ei, array_length(ei));
 
-    png_handle = new_register_dissector("png", dissect_png, proto_png);
+    png_handle = register_dissector("png", dissect_png, proto_png);
 }
 
 static gboolean dissect_png_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 50c5d574cf..e065ab781a 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -2723,7 +2723,7 @@ proto_register_a11(void)
     proto_a11 = proto_register_protocol("3GPP2 A11", "3GPP2 A11", "a11");
 
     /* Register the dissector by name */
-    new_register_dissector("a11", dissect_a11, proto_a11);
+    register_dissector("a11", dissect_a11, proto_a11);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_a11, hf, array_length(hf));
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index 22ae344382..812139be04 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -2914,7 +2914,7 @@ proto_register_6lowpan(void)
     expert_register_field_array(expert_6lowpan, ei, array_length(ei));
 
     /* Register the dissector with wireshark. */
-    handle_6lowpan = new_register_dissector("6lowpan", dissect_6lowpan, proto_6lowpan);
+    handle_6lowpan = register_dissector("6lowpan", dissect_6lowpan, proto_6lowpan);
 
     /* Register the dissector init function */
     register_init_routine(proto_init_6lowpan);
diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c
index 10a065044e..f4d027e439 100644
--- a/epan/dissectors/packet-acr122.c
+++ b/epan/dissectors/packet-acr122.c
@@ -885,7 +885,7 @@ proto_register_acr122(void)
     command_info = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_acr122 = proto_register_protocol("Advanced Card Systems ACR122", "ACR 122", "acr122");
-    new_register_dissector("acr122", dissect_acr122, proto_acr122);
+    register_dissector("acr122", dissect_acr122, proto_acr122);
 
     proto_register_field_array(proto_acr122, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c
index 7794ca2c32..876343bf05 100644
--- a/epan/dissectors/packet-adb.c
+++ b/epan/dissectors/packet-adb.c
@@ -882,7 +882,7 @@ proto_register_adb(void)
     service_info         = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_adb = proto_register_protocol("Android Debug Bridge", "ADB", "adb");
-    adb_handle = new_register_dissector("adb", dissect_adb, proto_adb);
+    adb_handle = register_dissector("adb", dissect_adb, proto_adb);
 
     proto_register_field_array(proto_adb, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c
index 527e6e3804..f96035b413 100644
--- a/epan/dissectors/packet-adb_cs.c
+++ b/epan/dissectors/packet-adb_cs.c
@@ -413,7 +413,7 @@ proto_register_adb_cs(void)
     client_requests = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_adb_cs = proto_register_protocol("Android Debug Bridge Client-Server", "ADB CS", "adb_cs");
-    adb_cs_handle = new_register_dissector("adb_cs", dissect_adb_cs, proto_adb_cs);
+    adb_cs_handle = register_dissector("adb_cs", dissect_adb_cs, proto_adb_cs);
 
     proto_register_field_array(proto_adb_cs, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c
index 14df595976..0cca210acf 100644
--- a/epan/dissectors/packet-adb_service.c
+++ b/epan/dissectors/packet-adb_service.c
@@ -804,7 +804,7 @@ proto_register_adb_service(void)
     continuation_infos = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_adb_service = proto_register_protocol("Android Debug Bridge Service", "ADB Service", "adb_service");
-    adb_service_handle = new_register_dissector("adb_service", dissect_adb_service, proto_adb_service);
+    adb_service_handle = register_dissector("adb_service", dissect_adb_service, proto_adb_service);
 
     proto_register_field_array(proto_adb_service, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 1e6a521cfb..fa72211c18 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -7266,10 +7266,10 @@ proto_register_afp(void)
 	register_init_routine(afp_init);
 	register_cleanup_routine(afp_cleanup);
 
-	new_register_dissector("afp", dissect_afp, proto_afp);
-	new_register_dissector("afp_server_status", dissect_afp_server_status,
+	register_dissector("afp", dissect_afp, proto_afp);
+	register_dissector("afp_server_status", dissect_afp_server_status,
 	    proto_afp);
-	new_register_dissector("afp_spotlight", dissect_spotlight, proto_afp);
+	register_dissector("afp_spotlight", dissect_spotlight, proto_afp);
 
 	afp_tap = register_tap("afp");
 
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 8b152e15ca..3f62d6316e 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -3634,7 +3634,7 @@ proto_register_afs(void)
 	register_init_routine(&afs_init_protocol);
 	register_cleanup_routine(&afs_cleanup_protocol);
 
-	new_register_dissector("afs", dissect_afs, proto_afs);
+	register_dissector("afs", dissect_afs, proto_afs);
 }
 
 /*
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index 9c4d32bdff..5b679b936b 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -2392,7 +2392,7 @@ proto_register_alcap(void)
 
     proto_alcap = proto_register_protocol(alcap_proto_name, alcap_proto_name_short, "alcap");
 
-    new_register_dissector("alcap", dissect_alcap, proto_alcap);
+    register_dissector("alcap", dissect_alcap, proto_alcap);
 
     proto_register_field_array(proto_alcap, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 1d17d7501a..3f49981de7 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -13971,7 +13971,7 @@ proto_register_amqp(void)
 
     proto_amqp = proto_register_protocol(
         "Advanced Message Queueing Protocol", "AMQP", "amqp");
-    new_register_dissector("amqp", dissect_amqp, proto_amqp);
+    register_dissector("amqp", dissect_amqp, proto_amqp);
     proto_register_field_array(proto_amqp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index f2524ee6a6..e33734e8fb 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -814,12 +814,12 @@ proto_register_amr(void)
                        "The AMR mode",
                        &pref_amr_mode, modes, AMR_NB);
 
-    amr_handle = new_register_dissector("amr", dissect_amr, proto_amr);
-    amr_wb_handle = new_register_dissector("amr-wb", dissect_amr_wb, proto_amr);
-    new_register_dissector("amr_if1_nb", dissect_amr_nb_if1, proto_amr);
-    new_register_dissector("amr_if1_wb", dissect_amr_wb_if1, proto_amr);
-    new_register_dissector("amr_if2_nb", dissect_amr_nb_if2, proto_amr);
-    new_register_dissector("amr_if2_wb", dissect_amr_wb_if2, proto_amr);
+    amr_handle = register_dissector("amr", dissect_amr, proto_amr);
+    amr_wb_handle = register_dissector("amr-wb", dissect_amr_wb, proto_amr);
+    register_dissector("amr_if1_nb", dissect_amr_nb_if1, proto_amr);
+    register_dissector("amr_if1_wb", dissect_amr_wb_if1, proto_amr);
+    register_dissector("amr_if2_nb", dissect_amr_nb_if2, proto_amr);
+    register_dissector("amr_if2_wb", dissect_amr_wb_if2, proto_amr);
 
     oid_add_from_string("G.722.2 (AMR-WB) audio capability","0.0.7.7222.1.0");
 }
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index aa0fc1ee68..fe2ac44b8f 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -3332,8 +3332,8 @@ proto_register_ansi_637(void)
     proto_ansi_637_trans =
         proto_register_protocol(ansi_proto_name_trans, "ANSI IS-637-A Transport", "ansi_637_trans");
 
-    ansi_637_tele_handle = new_register_dissector("ansi_637_tele", dissect_ansi_637_tele, proto_ansi_637_tele);
-    ansi_637_trans_handle = new_register_dissector("ansi_637_trans", dissect_ansi_637_trans, proto_ansi_637_trans);
+    ansi_637_tele_handle = register_dissector("ansi_637_tele", dissect_ansi_637_tele, proto_ansi_637_tele);
+    ansi_637_trans_handle = register_dissector("ansi_637_trans", dissect_ansi_637_trans, proto_ansi_637_trans);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_ansi_637_tele, hf_tele, array_length(hf_tele));
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 95ee92b9ad..eda9fa7482 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -2309,7 +2309,7 @@ proto_register_ansi_801(void)
 	expert_register_field_array(expert_ansi_801, ei, array_length(ei));
 
 	/* subdissector code */
-	ansi_801_handle = new_register_dissector("ansi_801", dissect_ansi_801, proto_ansi_801);
+	ansi_801_handle = register_dissector("ansi_801", dissect_ansi_801, proto_ansi_801);
 }
 
 
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 7f5a8379ae..c2c0995b1b 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -469,7 +469,7 @@ proto_register_aoe(void)
   proto_register_field_array(proto_aoe, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  aoe_handle = new_register_dissector("aoe", dissect_aoe, proto_aoe);
+  aoe_handle = register_dissector("aoe", dissect_aoe, proto_aoe);
 
   register_init_routine(ata_init);
   register_cleanup_routine(ata_cleanup);
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index 151857d2c6..146e25e70f 100644
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.c
@@ -99,7 +99,7 @@ proto_register_cert(void)
         proto_register_field_array(proto_cert, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 
-        new_register_dissector("application/pkix-cert", dissect_cert, proto_cert);
+        register_dissector("application/pkix-cert", dissect_cert, proto_cert);
 }
 
 
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index d1b0375c91..b06d06c539 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -1957,7 +1957,7 @@ proto_register_aprs( void )
 	proto_aprs = proto_register_protocol("Automatic Position Reporting System", "APRS", "aprs");
 
 	/* Register the dissector */
-	new_register_dissector( "aprs", dissect_aprs, proto_aprs);
+	register_dissector( "aprs", dissect_aprs, proto_aprs);
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array( proto_aprs, hf, array_length(hf ) );
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 92491b4428..0ae37def07 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -312,7 +312,7 @@ void proto_register_armagetronad(void)
 
 	proto_register_field_array(proto_armagetronad, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("armagetronad", dissect_armagetronad,
+	register_dissector("armagetronad", dissect_armagetronad,
 			       proto_armagetronad);
 }
 
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index e6a40f21ca..c89621aafd 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -1973,7 +1973,7 @@ proto_register_arp(void)
   atmarp_handle = create_dissector_handle(dissect_atmarp, proto_atmarp);
   ax25arp_handle = create_dissector_handle(dissect_ax25arp, proto_arp);
 
-  arp_handle = new_register_dissector( "arp" , dissect_arp, proto_arp );
+  arp_handle = register_dissector( "arp" , dissect_arp, proto_arp );
 
   /* Preferences */
   arp_module = prefs_register_protocol(proto_arp, NULL);
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 553b5485f8..35c1a69d44 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -10093,7 +10093,7 @@ void proto_register_r3 (void)
   expert_module_t* expert_r3;
 
   proto_r3 = proto_register_protocol ("Assa Abloy R3", "R3", "r3");
-  new_register_dissector ("r3", dissect_r3, proto_r3);
+  register_dissector ("r3", dissect_r3, proto_r3);
   proto_register_field_array (proto_r3, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
   expert_r3 = expert_register_protocol(proto_r3);
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c
index 4f0e5fb59a..23014958cf 100644
--- a/epan/dissectors/packet-asterix.c
+++ b/epan/dissectors/packet-asterix.c
@@ -11172,7 +11172,7 @@ void proto_register_asterix (void)
     proto_register_field_array (proto_asterix, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
 
-    asterix_handle = new_register_dissector ("asterix", dissect_asterix, proto_asterix);
+    asterix_handle = register_dissector ("asterix", dissect_asterix, proto_asterix);
 
     asterix_prefs_module = prefs_register_protocol (proto_asterix, proto_reg_handoff_asterix);
 
diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c
index ce8cb31588..4331584712 100644
--- a/epan/dissectors/packet-at.c
+++ b/epan/dissectors/packet-at.c
@@ -108,7 +108,7 @@ proto_register_at_command(void)
     proto_at = proto_register_protocol("AT Command", "AT", "at");
     proto_register_field_array(proto_at, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("at", dissect_at, proto_at);
+    register_dissector("at", dissect_at, proto_at);
 }
 
 /* Handler registration */
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 5f7218749d..d7793244b2 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -2000,12 +2000,12 @@ proto_register_atm(void)
   atm_type_aal2_table = register_dissector_table("atm.aal2.type", "ATM AAL_2 type subdissector", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
   atm_type_aal5_table = register_dissector_table("atm.aal5.type", "ATM AAL_5 type subdissector", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-  atm_handle = new_register_dissector("atm_truncated", dissect_atm_truncated, proto_atm);
-  new_register_dissector("atm_pw_truncated", dissect_atm_pw_truncated, proto_atm);
-  atm_untruncated_handle = new_register_dissector("atm_untruncated", dissect_atm_untruncated, proto_atm);
-  new_register_dissector("atm_pw_untruncated", dissect_atm_pw_untruncated, proto_atm);
-  new_register_dissector("atm_oam_cell", dissect_atm_oam_cell, proto_oamaal);
-  new_register_dissector("atm_pw_oam_cell", dissect_atm_pw_oam_cell, proto_oamaal);
+  atm_handle = register_dissector("atm_truncated", dissect_atm_truncated, proto_atm);
+  register_dissector("atm_pw_truncated", dissect_atm_pw_truncated, proto_atm);
+  atm_untruncated_handle = register_dissector("atm_untruncated", dissect_atm_untruncated, proto_atm);
+  register_dissector("atm_pw_untruncated", dissect_atm_pw_untruncated, proto_atm);
+  register_dissector("atm_oam_cell", dissect_atm_oam_cell, proto_oamaal);
+  register_dissector("atm_pw_oam_cell", dissect_atm_pw_oam_cell, proto_oamaal);
 
   atm_module = prefs_register_protocol ( proto_atm, NULL );
   prefs_register_bool_preference(atm_module, "dissect_lane_as_sscop", "Dissect LANE as SSCOP",
diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c
index 97a0bf825e..062df6ca17 100644
--- a/epan/dissectors/packet-ax25-kiss.c
+++ b/epan/dissectors/packet-ax25-kiss.c
@@ -426,7 +426,7 @@ proto_register_ax25_kiss(void)
 	proto_ax25_kiss = proto_register_protocol( "AX.25 KISS", "AX.25 KISS", "ax25_kiss" );
 
 	/* Register the dissector */
-	kiss_handle = new_register_dissector( "ax25_kiss", dissect_ax25_kiss, proto_ax25_kiss );
+	kiss_handle = register_dissector( "ax25_kiss", dissect_ax25_kiss, proto_ax25_kiss );
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array( proto_ax25_kiss, hf, array_length( hf ) );
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c
index 7603ce09ab..e8b2065ee6 100644
--- a/epan/dissectors/packet-ax25-nol3.c
+++ b/epan/dissectors/packet-ax25-nol3.c
@@ -272,7 +272,7 @@ proto_register_ax25_nol3(void)
 	proto_dx = proto_register_protocol("DX cluster", "DX", "dx");
 
 	/* Register the dissector */
-	new_register_dissector( "dx", dissect_dx, proto_dx);
+	register_dissector( "dx", dissect_dx, proto_dx);
 
 	/* Register the header fields */
 	proto_register_field_array( proto_dx, hf_dx, array_length( hf_dx ) );
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index a06b238a53..d29203dcfb 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -420,7 +420,7 @@ proto_register_ax25(void)
 	proto_ax25 = proto_register_protocol("Amateur Radio AX.25", "AX.25", "ax25");
 
 	/* Register the dissector */
-	ax25_handle = new_register_dissector( "ax25", dissect_ax25, proto_ax25 );
+	ax25_handle = register_dissector( "ax25", dissect_ax25, proto_ax25 );
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array( proto_ax25, hf, array_length(hf ) );
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index a855ff8ff5..4f9dccfa70 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -197,7 +197,7 @@ proto_register_ayiya(void)
 
     proto_ayiya = proto_register_protocol("Anything in Anything Protocol",
                           "AYIYA", "ayiya");
-    new_register_dissector("ayiya", dissect_ayiya, proto_ayiya);
+    register_dissector("ayiya", dissect_ayiya, proto_ayiya);
     proto_register_field_array(proto_ayiya, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index a1b070e651..e392b73afc 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -11311,7 +11311,7 @@ proto_register_bacapp(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_bacapp = expert_register_protocol(proto_bacapp);
     expert_register_field_array(expert_bacapp, ei, array_length(ei));
-    new_register_dissector("bacapp", dissect_bacapp, proto_bacapp);
+    register_dissector("bacapp", dissect_bacapp, proto_bacapp);
     register_init_routine(&bacapp_init_routine);
     register_cleanup_routine(&bacapp_cleanup_routine);
 
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index e0161e17a3..194d243413 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -618,7 +618,7 @@ proto_register_bacnet(void)
 	proto_register_field_array(proto_bacnet, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("bacnet", dissect_bacnet, proto_bacnet);
+	register_dissector("bacnet", dissect_bacnet, proto_bacnet);
 
 	bacnet_dissector_table = register_dissector_table("bacnet.vendor",
 							  "BACnet Vendor Identifier",
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index c188cd162b..3a06f6f210 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -5021,7 +5021,7 @@ void proto_register_batadv(void)
 				      "batadv"           /* abbrev */
 			      );
 
-	new_register_dissector("batadv",dissect_batadv_plugin,proto_batadv_plugin);
+	register_dissector("batadv",dissect_batadv_plugin,proto_batadv_plugin);
 
 	batadv_module = prefs_register_protocol(proto_batadv_plugin,
 						proto_reg_handoff_batadv);
diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c
index 64bde42b31..9e6bcd144b 100644
--- a/epan/dissectors/packet-bctp.c
+++ b/epan/dissectors/packet-bctp.c
@@ -106,7 +106,7 @@ proto_register_bctp (void)
 	proto_register_field_array(proto_bctp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("bctp", dissect_bctp, proto_bctp);
+	register_dissector("bctp", dissect_bctp, proto_bctp);
 
 	bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunneled Protocol Indicator", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 }
diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c
index 03dc0fdac2..bf361b6b6c 100644
--- a/epan/dissectors/packet-bencode.c
+++ b/epan/dissectors/packet-bencode.c
@@ -333,7 +333,7 @@ proto_register_bencode(void)
    expert_module_t* expert_bencode;
 
    proto_bencode = proto_register_protocol("Bencode", "Bencode", "bencode");
-   new_register_dissector("bencode", dissect_bencoding, proto_bencode);
+   register_dissector("bencode", dissect_bencoding, proto_bencode);
    proto_register_field_array(proto_bencode, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
    expert_bencode = expert_register_protocol(proto_bencode);
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 9faf81e349..cbad11402c 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4505,7 +4505,7 @@ proto_register_ber(void)
 
     proto_ber = proto_register_protocol("Basic Encoding Rules (ASN.1 X.690)", "BER", "ber");
 
-    ber_handle = new_register_dissector("ber", dissect_ber, proto_ber);
+    ber_handle = register_dissector("ber", dissect_ber, proto_ber);
 
     proto_register_field_array(proto_ber, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c
index 8022e0d778..159430ad8a 100644
--- a/epan/dissectors/packet-bfcp.c
+++ b/epan/dissectors/packet-bfcp.c
@@ -690,7 +690,7 @@ void proto_register_bfcp(void)
 	proto_bfcp = proto_register_protocol("Binary Floor Control Protocol",
 				"BFCP", "bfcp");
 
-	bfcp_handle = new_register_dissector("bfcp", dissect_bfcp, proto_bfcp);
+	bfcp_handle = register_dissector("bfcp", dissect_bfcp, proto_bfcp);
 
 	bfcp_module = prefs_register_protocol(proto_bfcp,
 				proto_reg_handoff_bfcp);
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index 5cf7e10943..c9b1d9553f 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -857,7 +857,7 @@ proto_register_bfd(void)
     proto_bfd = proto_register_protocol("Bidirectional Forwarding Detection Control Message",
                                         "BFD Control",
                                         "bfd");
-    new_register_dissector("bfd", dissect_bfd_control, proto_bfd);
+    register_dissector("bfd", dissect_bfd_control, proto_bfd);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_bfd, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index ce84fbadb3..a2ac77cca8 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -8397,7 +8397,7 @@ proto_register_bgp(void)
       "BGP dissector detect the length of the AS number in AS_PATH attributes automatically or manually (NOTE: Automatic detection is not 100% accurate)",
       &bgp_asn_len, asn_len, FALSE);
 
-    new_register_dissector("bgp", dissect_bgp, proto_bgp);
+    register_dissector("bgp", dissect_bgp, proto_bgp);
 }
 
 void
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index af1f4c4dae..31461d28b2 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -1863,7 +1863,7 @@ proto_register_bitcoin(void)
 
   bitcoin_command_table = register_dissector_table("bitcoin.command", "Bitcoin Command", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
-  bitcoin_handle = new_register_dissector("bitcoin", dissect_bitcoin, proto_bitcoin);
+  bitcoin_handle = register_dissector("bitcoin", dissect_bitcoin, proto_bitcoin);
 
   bitcoin_module = prefs_register_protocol(proto_bitcoin, NULL);
   prefs_register_bool_preference(bitcoin_module, "desegment",
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index ef739fccd1..423608aeaf 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -676,7 +676,7 @@ proto_register_bittorrent(void)
    proto_register_field_array(proto_bittorrent, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   new_register_dissector("bittorrent.tcp", dissect_bittorrent, proto_bittorrent);
+   register_dissector("bittorrent.tcp", dissect_bittorrent, proto_bittorrent);
 
    bittorrent_module = prefs_register_protocol(proto_bittorrent, NULL);
    prefs_register_bool_preference(bittorrent_module, "desegment",
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 9d10590d12..c63d27dd82 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -172,7 +172,7 @@ void proto_register_bjnp (void)
 
   proto_bjnp = proto_register_protocol (PNAME, PSNAME, PFNAME);
 
-  bjnp_handle = new_register_dissector (PFNAME, dissect_bjnp, proto_bjnp);
+  bjnp_handle = register_dissector (PFNAME, dissect_bjnp, proto_bjnp);
 
   proto_register_field_array (proto_bjnp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index a17f33fcc5..36dbff9ce0 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -1893,7 +1893,7 @@ proto_register_bluetooth(void)
     proto_bluetooth = proto_register_protocol("Bluetooth",
             "Bluetooth", "bluetooth");
 
-    new_register_dissector("bluetooth_ubertooth", dissect_bluetooth_ubertooth, proto_bluetooth);
+    register_dissector("bluetooth_ubertooth", dissect_bluetooth_ubertooth, proto_bluetooth);
 
     proto_register_field_array(proto_bluetooth, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c
index 2df44dd17f..12bf423fb4 100644
--- a/epan/dissectors/packet-bmc.c
+++ b/epan/dissectors/packet-bmc.c
@@ -336,7 +336,7 @@ proto_register_bmc(void)
     };
 
     proto_bmc = proto_register_protocol("Broadcast/Multicast Control", "BMC", "bmc");
-    new_register_dissector("bmc", dissect_bmc, proto_bmc);
+    register_dissector("bmc", dissect_bmc, proto_bmc);
 
     proto_register_field_array(proto_bmc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 734f53245f..4955e30ed6 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -7859,7 +7859,7 @@ proto_register_bootp(void)
 	register_init_routine(&bootp_init_protocol);
 
 	/* Allow dissector to find be found by name. */
-	bootp_handle = new_register_dissector("bootp", dissect_bootp, proto_bootp);
+	bootp_handle = register_dissector("bootp", dissect_bootp, proto_bootp);
 
 	bootp_module = prefs_register_protocol(proto_bootp, NULL);
 
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index b3eb9468e5..7a8fad4941 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -1351,8 +1351,8 @@ proto_register_bpdu(void)
   proto_register_field_array(proto_bpdu, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("bpdu", dissect_bpdu_generic, proto_bpdu);
-  new_register_dissector("bpdu_cisco", dissect_bpdu_cisco, proto_bpdu);
+  register_dissector("bpdu", dissect_bpdu_generic, proto_bpdu);
+  register_dissector("bpdu_cisco", dissect_bpdu_cisco, proto_bpdu);
 
   expert_bpdu = expert_register_protocol(proto_bpdu);
   expert_register_field_array(expert_bpdu, ei, array_length(ei));
diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c
index fc9305287b..0a6421b6cb 100644
--- a/epan/dissectors/packet-bpq.c
+++ b/epan/dissectors/packet-bpq.c
@@ -138,7 +138,7 @@ proto_register_bpq(void)
 	proto_bpq = proto_register_protocol( "Amateur Radio BPQ", "BPQ", "bpq" );
 
 	/* Register the dissector */
-	new_register_dissector( "bpq", dissect_bpq, proto_bpq );
+	register_dissector( "bpq", dissect_bpq, proto_bpq );
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array( proto_bpq, hf, array_length( hf ) );
diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c
index 9ae4ff24eb..a0430bd812 100644
--- a/epan/dissectors/packet-brp.c
+++ b/epan/dissectors/packet-brp.c
@@ -411,7 +411,7 @@ void proto_register_brp (void)
                                    "Set the UDP port for BRP messages",
                                    10, &global_brp_port);
 
-    brp_handle = new_register_dissector("brp", dissect_brp, proto_brp);
+    brp_handle = register_dissector("brp", dissect_brp, proto_brp);
 }
 
 /*--- proto_reg_handoff_brp -------------------------------------------*/
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 68a94fad6e..83e74eecbb 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -2513,8 +2513,8 @@ proto_register_bssap(void)
     proto_bssap = proto_register_protocol("BSSAP/BSAP", "BSSAP", "bssap");
     proto_bssap_plus = proto_register_protocol("BSSAP2", "BSSAP2", "bssap_plus");
 
-    new_register_dissector("bssap", dissect_bssap, proto_bssap);
-    new_register_dissector("bssap_plus", dissect_bssap_plus, proto_bssap_plus);
+    register_dissector("bssap", dissect_bssap, proto_bssap);
+    register_dissector("bssap_plus", dissect_bssap_plus, proto_bssap_plus);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_bssap, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 664e9cc156..a55b158fb1 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -7044,7 +7044,7 @@ proto_register_bssgp(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_bssgp = expert_register_protocol(proto_bssgp);
     expert_register_field_array(expert_bssgp, ei, array_length(ei));
-    new_register_dissector("bssgp", dissect_bssgp, proto_bssgp);
+    register_dissector("bssgp", dissect_bssgp, proto_bssgp);
 
     /* Register configuration options */
     bssgp_module = prefs_register_protocol(proto_bssgp, NULL);
diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c
index 9a83a088ca..eb6bbb1bb4 100644
--- a/epan/dissectors/packet-bt3ds.c
+++ b/epan/dissectors/packet-bt3ds.c
@@ -162,7 +162,7 @@ proto_register_bt3ds(void)
     };
 
     proto_bt3ds = proto_register_protocol("Bluetooth 3DS Profile", "BT 3DS", "bt3ds");
-    b3ds_handle = new_register_dissector("bt3ds", dissect_bt3ds, proto_bt3ds);
+    b3ds_handle = register_dissector("bt3ds", dissect_bt3ds, proto_bt3ds);
 
     proto_register_field_array(proto_bt3ds, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c
index d8fab866a1..eff1e84cfa 100644
--- a/epan/dissectors/packet-btamp.c
+++ b/epan/dissectors/packet-btamp.c
@@ -638,7 +638,7 @@ proto_register_btamp(void)
     /* Register the protocol name and description */
     proto_btamp = proto_register_protocol("Bluetooth AMP Packet", "BT AMP", "btamp");
 
-    btamp_handle = new_register_dissector("btamp", dissect_btamp, proto_btamp);
+    btamp_handle = register_dissector("btamp", dissect_btamp, proto_btamp);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btamp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index b49487a05e..6b3fe9f12a 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -10795,7 +10795,7 @@ proto_register_btatt(void)
     /* Register the protocol name and description */
     proto_btatt = proto_register_protocol("Bluetooth Attribute Protocol", "BT ATT", "btatt");
 
-    btatt_handle = new_register_dissector("btatt", dissect_btatt, proto_btatt);
+    btatt_handle = register_dissector("btatt", dissect_btatt, proto_btatt);
 
     att_handle_dissector_table = register_dissector_table("btatt.handle",  "BT ATT Handle",  FT_UINT16,  BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
@@ -10856,7 +10856,7 @@ proto_reg_handoff_btatt(void)
                 bluetooth_uuid_vals[i_array].value);
 
         proto_tmp = proto_register_protocol(name, short_name, abbrev);
-        handle_tmp = new_register_dissector(abbrev, dissect_btgatt, proto_tmp);
+        handle_tmp = register_dissector(abbrev, dissect_btgatt, proto_tmp);
 
         dissector_add_for_decode_as("btatt.handle", handle_tmp);
     }
@@ -10926,7 +10926,7 @@ proto_register_btgatt(void)
 
     proto_btgatt = proto_register_protocol("Bluetooth GATT Attribute Protocol", "BT GATT", "btgatt");
 
-    btgatt_handle = new_register_dissector("btgatt", dissect_btgatt, proto_btgatt);
+    btgatt_handle = register_dissector("btgatt", dissect_btgatt, proto_btgatt);
 
     proto_register_field_array(proto_btgatt, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
@@ -10969,7 +10969,7 @@ proto_reg_handoff_btgatt(void)
         }
 
         proto_tmp  = proto_register_protocol(uuid_dissectors[i_array].name, uuid_dissectors[i_array].short_name, uuid_dissectors[i_array].abbrev_name);
-        handle_tmp = new_register_dissector(uuid_dissectors[i_array].abbrev_name, uuid_dissectors[i_array].dissect_func, proto_tmp);
+        handle_tmp = register_dissector(uuid_dissectors[i_array].abbrev_name, uuid_dissectors[i_array].dissect_func, proto_tmp);
 
         dissector_add_string("bluetooth.uuid", uuid_dissectors[i_array].uuid, handle_tmp);
         dissector_add_for_decode_as("btatt.handle", handle_tmp);
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index 749373b574..661b687a5c 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -472,7 +472,7 @@ proto_register_btavctp(void)
     reassembling = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_btavctp = proto_register_protocol("Bluetooth AVCTP Protocol", "BT AVCTP", "btavctp");
-    btavctp_handle = new_register_dissector("btavctp", dissect_btavctp, proto_btavctp);
+    btavctp_handle = register_dissector("btavctp", dissect_btavctp, proto_btavctp);
 
     proto_register_field_array(proto_btavctp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index a4c391a851..25728ed8ae 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -2725,7 +2725,7 @@ proto_register_btavdtp(void)
     };
 
     proto_btavdtp = proto_register_protocol("Bluetooth AVDTP Protocol", "BT AVDTP", "btavdtp");
-    btavdtp_handle = new_register_dissector("btavdtp", dissect_btavdtp, proto_btavdtp);
+    btavdtp_handle = register_dissector("btavdtp", dissect_btavdtp, proto_btavdtp);
 
     proto_register_field_array(proto_btavdtp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
@@ -2933,7 +2933,7 @@ proto_register_aptx(void)
     proto_register_field_array(proto_bta2dp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    aptx_handle = new_register_dissector("aptx", dissect_aptx, proto_aptx);
+    aptx_handle = register_dissector("aptx", dissect_aptx, proto_aptx);
 }
 
 
@@ -3151,7 +3151,7 @@ proto_register_bta2dp(void)
     proto_register_field_array(proto_bta2dp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    bta2dp_handle = new_register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp);
+    bta2dp_handle = register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp);
 
     module = prefs_register_protocol(proto_bta2dp, NULL);
     prefs_register_static_text_preference(module, "a2dp.version",
@@ -3387,7 +3387,7 @@ proto_register_btvdp(void)
     };
 
     proto_btvdp = proto_register_protocol("Bluetooth VDP Profile", "BT VDP", "btvdp");
-    btvdp_handle = new_register_dissector("btvdp", dissect_btvdp, proto_btvdp);
+    btvdp_handle = register_dissector("btvdp", dissect_btvdp, proto_btvdp);
     proto_register_field_array(proto_bta2dp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
     expert_btavdtp = expert_register_protocol(proto_btvdp);
@@ -3473,7 +3473,7 @@ proto_register_bta2dp_content_protection_header_scms_t(void)
     proto_register_field_array(proto_bta2dp_cph_scms_t, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("bta2dp_content_protection_header_scms_t", dissect_a2dp_cp_scms_t, proto_bta2dp_cph_scms_t);
+    register_dissector("bta2dp_content_protection_header_scms_t", dissect_a2dp_cp_scms_t, proto_bta2dp_cph_scms_t);
 }
 
 static gint
@@ -3523,7 +3523,7 @@ proto_register_btvdp_content_protection_header_scms_t(void)
     proto_register_field_array(proto_btvdp_cph_scms_t, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("btvdp_content_protection_header_scms_t", dissect_vdp_cp_scms_t, proto_btvdp_cph_scms_t);
+    register_dissector("btvdp_content_protection_header_scms_t", dissect_vdp_cp_scms_t, proto_btvdp_cph_scms_t);
 }
 
 /*
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index d44b475210..5a80d69314 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -3148,7 +3148,7 @@ proto_register_btavrcp(void)
     btavrcp_song_positions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_btavrcp = proto_register_protocol("Bluetooth AVRCP Profile", "BT AVRCP", "btavrcp");
-    btavrcp_handle = new_register_dissector("btavrcp", dissect_btavrcp, proto_btavrcp);
+    btavrcp_handle = register_dissector("btavrcp", dissect_btavrcp, proto_btavrcp);
 
     proto_register_field_array(proto_btavrcp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c
index 34fe2ffec9..6dd739a378 100644
--- a/epan/dissectors/packet-btbnep.c
+++ b/epan/dissectors/packet-btbnep.c
@@ -517,7 +517,7 @@ proto_register_btbnep(void)
     };
 
     proto_btbnep = proto_register_protocol("Bluetooth BNEP Protocol", "BT BNEP", "btbnep");
-    btbnep_handle = new_register_dissector("btbnep", dissect_btbnep, proto_btbnep);
+    btbnep_handle = register_dissector("btbnep", dissect_btbnep, proto_btbnep);
 
     proto_register_field_array(proto_btbnep, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index de6a4464f4..b0b0b66541 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -662,7 +662,7 @@ proto_register_bthci_acl(void)
 
     /* Register the protocol name and description */
     proto_bthci_acl = proto_register_protocol("Bluetooth HCI ACL Packet", "HCI_ACL", "bthci_acl");
-    bthci_acl_handle = new_register_dissector("bthci_acl", dissect_bthci_acl, proto_bthci_acl);
+    bthci_acl_handle = register_dissector("bthci_acl", dissect_bthci_acl, proto_bthci_acl);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_bthci_acl, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 496e654f5e..24dd019a81 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -4843,7 +4843,7 @@ proto_register_bthci_cmd(void)
     }
 
     proto_bthci_cmd = proto_register_protocol("Bluetooth HCI Command", "HCI_CMD", "bthci_cmd");
-    bthci_cmd_handle = new_register_dissector("bthci_cmd", dissect_bthci_cmd, proto_bthci_cmd);
+    bthci_cmd_handle = register_dissector("bthci_cmd", dissect_bthci_cmd, proto_bthci_cmd);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_bthci_cmd, hf, array_length(hf));
@@ -6116,10 +6116,10 @@ proto_register_btcommon(void)
     expert_module = expert_register_protocol(proto_btcommon);
     expert_register_field_array(expert_module, ei, array_length(ei));
 
-    btcommon_ad_handle  = new_register_dissector("btcommon.eir_ad.ad",  dissect_btcommon_ad,  proto_btcommon);
-    btcommon_eir_handle = new_register_dissector("btcommon.eir_ad.eir", dissect_btcommon_eir, proto_btcommon);
-    btcommon_cod_handle = new_register_dissector("btcommon.cod",        dissect_btcommon_cod, proto_btcommon);
-    btcommon_le_channel_map_handle = new_register_dissector("btcommon.le_channel_map", dissect_btcommon_le_channel_map, proto_btcommon);
+    btcommon_ad_handle  = register_dissector("btcommon.eir_ad.ad",  dissect_btcommon_ad,  proto_btcommon);
+    btcommon_eir_handle = register_dissector("btcommon.eir_ad.eir", dissect_btcommon_eir, proto_btcommon);
+    btcommon_cod_handle = register_dissector("btcommon.cod",        dissect_btcommon_cod, proto_btcommon);
+    btcommon_le_channel_map_handle = register_dissector("btcommon.le_channel_map", dissect_btcommon_le_channel_map, proto_btcommon);
 }
 
 /*
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index ce3c59b834..8c5650e9fa 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -6127,7 +6127,7 @@ proto_register_bthci_evt(void)
     /* Register the protocol name and description */
     proto_bthci_evt = proto_register_protocol("Bluetooth HCI Event",
             "HCI_EVT", "bthci_evt");
-    bthci_evt_handle = new_register_dissector("bthci_evt", dissect_bthci_evt, proto_bthci_evt);
+    bthci_evt_handle = register_dissector("bthci_evt", dissect_bthci_evt, proto_bthci_evt);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_bthci_evt, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index 81e9cc940d..fa876c60f4 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -339,7 +339,7 @@ proto_register_bthci_sco(void)
 
     /* Register the protocol name and description */
     proto_bthci_sco = proto_register_protocol("Bluetooth HCI SCO Packet", "HCI_SCO", "bthci_sco");
-    bthci_sco_handle = new_register_dissector("bthci_sco", dissect_bthci_sco, proto_bthci_sco);
+    bthci_sco_handle = register_dissector("bthci_sco", dissect_bthci_sco, proto_bthci_sco);
 
     bthci_sco_stream_numbers = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c
index e7c1e6d7b7..b03b23eb34 100644
--- a/epan/dissectors/packet-bthci_vendor.c
+++ b/epan/dissectors/packet-bthci_vendor.c
@@ -1548,7 +1548,7 @@ proto_register_bthci_vendor_broadcom(void)
     proto_bthci_vendor_broadcom = proto_register_protocol("Bluetooth Broadcom HCI",
             "HCI BROADCOM", "bthci_vendor.broadcom");
 
-    bthci_vendor_broadcom_handle = new_register_dissector("bthci_vendor.broadcom", dissect_bthci_vendor_broadcom, proto_bthci_vendor_broadcom);
+    bthci_vendor_broadcom_handle = register_dissector("bthci_vendor.broadcom", dissect_bthci_vendor_broadcom, proto_bthci_vendor_broadcom);
 
     proto_register_field_array(proto_bthci_vendor_broadcom, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c
index bd50f856bc..7a41a430ae 100644
--- a/epan/dissectors/packet-bthcrp.c
+++ b/epan/dissectors/packet-bthcrp.c
@@ -640,7 +640,7 @@ proto_register_bthcrp(void)
     };
 
     proto_bthcrp = proto_register_protocol("Bluetooth HCRP Profile", "BT HCRP", "bthcrp");
-    bthcrp_handle = new_register_dissector("bthcrp", dissect_bthcrp, proto_bthcrp);
+    bthcrp_handle = register_dissector("bthcrp", dissect_bthcrp, proto_bthcrp);
 
     proto_register_field_array(proto_bthcrp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c
index 752b0619ef..d2d1bdaeb7 100644
--- a/epan/dissectors/packet-bthfp.c
+++ b/epan/dissectors/packet-bthfp.c
@@ -2939,7 +2939,7 @@ proto_register_bthfp(void)
     fragments = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_bthfp = proto_register_protocol("Bluetooth HFP Profile", "BT HFP", "bthfp");
-    bthfp_handle = new_register_dissector("bthfp", dissect_bthfp, proto_bthfp);
+    bthfp_handle = register_dissector("bthfp", dissect_bthfp, proto_bthfp);
 
     proto_register_field_array(proto_bthfp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c
index 3062aec4c7..9fd659d81a 100644
--- a/epan/dissectors/packet-bthid.c
+++ b/epan/dissectors/packet-bthid.c
@@ -400,7 +400,7 @@ proto_register_bthid(void)
     };
 
     proto_bthid = proto_register_protocol("Bluetooth HID Profile", "BT HID", "bthid");
-    bthid_handle = new_register_dissector("bthid", dissect_bthid, proto_bthid);
+    bthid_handle = register_dissector("bthid", dissect_bthid, proto_bthid);
 
     proto_register_field_array(proto_bthid, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index cb713ecec7..d55c5cdf80 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -1121,7 +1121,7 @@ proto_register_bthsp(void)
     fragments = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_bthsp = proto_register_protocol("Bluetooth HSP Profile", "BT HSP", "bthsp");
-    bthsp_handle = new_register_dissector("bthsp", dissect_bthsp, proto_bthsp);
+    bthsp_handle = register_dissector("bthsp", dissect_bthsp, proto_bthsp);
 
     proto_register_field_array(proto_bthsp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 3b1ed6472d..a434661cf0 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -2824,7 +2824,7 @@ proto_register_btl2cap(void)
     /* Register the protocol name and description */
     proto_btl2cap = proto_register_protocol("Bluetooth L2CAP Protocol", "BT L2CAP", "btl2cap");
 
-    new_register_dissector("btl2cap", dissect_btl2cap, proto_btl2cap);
+    register_dissector("btl2cap", dissect_btl2cap, proto_btl2cap);
 
     /* subdissector code */
     l2cap_psm_dissector_table = register_dissector_table("btl2cap.psm",     "BT L2CAP PSM",     FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c
index 3de949becd..7cf282f43f 100644
--- a/epan/dissectors/packet-btle.c
+++ b/epan/dissectors/packet-btle.c
@@ -1378,7 +1378,7 @@ proto_register_btle(void)
 
     proto_btle = proto_register_protocol("Bluetooth Low Energy Link Layer",
             "BT LE LL", "btle");
-    btle_handle = new_register_dissector("btle", dissect_btle, proto_btle);
+    btle_handle = register_dissector("btle", dissect_btle, proto_btle);
 
     proto_register_field_array(proto_btle, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btle_rf.c b/epan/dissectors/packet-btle_rf.c
index 2d5648c98c..b7c2d45a82 100644
--- a/epan/dissectors/packet-btle_rf.c
+++ b/epan/dissectors/packet-btle_rf.c
@@ -368,7 +368,7 @@ proto_register_btle_rf(void)
                                             "BTLE RF", "btle_rf");
     proto_register_field_array(proto_btle_rf, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    btle_rf_handle = new_register_dissector("btle_rf", dissect_btle_rf, proto_btle_rf);
+    btle_rf_handle = register_dissector("btle_rf", dissect_btle_rf, proto_btle_rf);
 }
 
 void
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index f9e3138ab4..3243c39b1d 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -417,7 +417,7 @@ proto_register_btmcap(void)
     };
 
     proto_btmcap = proto_register_protocol("Bluetooth MCAP Protocol", "BT MCAP", "btmcap");
-    btmcap_handle = new_register_dissector("btmcap", dissect_btmcap, proto_btmcap);
+    btmcap_handle = register_dissector("btmcap", dissect_btmcap, proto_btmcap);
 
     proto_register_field_array(proto_btmcap, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index 0b68b1b717..06dc15883c 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -3818,7 +3818,7 @@ proto_register_btobex(void)
 
     proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "BT OBEX", "btobex");
 
-    btobex_handle = new_register_dissector("btobex", dissect_btobex, proto_btobex);
+    btobex_handle = register_dissector("btobex", dissect_btobex, proto_btobex);
 
     btobex_profile = register_dissector_table("btobex.profile", "BTOBEX Profile", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
@@ -3834,25 +3834,25 @@ proto_register_btobex(void)
     register_decode_as(&btobex_profile_da);
 
     proto_raw = proto_register_protocol("BT OBEX Raw Application Parameters", "Raw Application Parameters", "btobex.parameter.raw");
-    raw_application_parameters_handle  = new_register_dissector("btobex.parameter.raw",  dissect_btobex_application_parameter_raw, proto_raw);
+    raw_application_parameters_handle  = register_dissector("btobex.parameter.raw",  dissect_btobex_application_parameter_raw, proto_raw);
 
     proto_bpp = proto_register_protocol("BT OBEX BPP Application Parameters", "BPP Application Parameters", "btobex.parameter.bpp");
-    bpp_application_parameters_handle  = new_register_dissector("btobex.parameter.bpp",  dissect_btobex_application_parameter_bpp, proto_bpp);
+    bpp_application_parameters_handle  = register_dissector("btobex.parameter.bpp",  dissect_btobex_application_parameter_bpp, proto_bpp);
 
     proto_bip = proto_register_protocol("BT OBEX BIP Application Parameters", "BIP Application Parameters", "btobex.parameter.bip");
-    bip_application_parameters_handle  = new_register_dissector("btobex.parameter.bip",  dissect_btobex_application_parameter_bip, proto_bip);
+    bip_application_parameters_handle  = register_dissector("btobex.parameter.bip",  dissect_btobex_application_parameter_bip, proto_bip);
 
     proto_map = proto_register_protocol("BT OBEX MAP Application Parameters", "MAP Application Parameters", "btobex.parameter.map");
-    map_application_parameters_handle  = new_register_dissector("btobex.parameter.map",  dissect_btobex_application_parameter_map, proto_map);
+    map_application_parameters_handle  = register_dissector("btobex.parameter.map",  dissect_btobex_application_parameter_map, proto_map);
 
     proto_gpp = proto_register_protocol("BT OBEX GPP Application Parameters", "GPP Application Parameters", "btobex.parameter.gpp");
-    gpp_application_parameters_handle  = new_register_dissector("btobex.parameter.gpp",  dissect_btobex_application_parameter_gpp, proto_gpp);
+    gpp_application_parameters_handle  = register_dissector("btobex.parameter.gpp",  dissect_btobex_application_parameter_gpp, proto_gpp);
 
     proto_ctn = proto_register_protocol("BT OBEX CTN Application Parameters", "CTN Application Parameters", "btobex.parameter.ctn");
-    ctn_application_parameters_handle  = new_register_dissector("btobex.parameter.ctn",  dissect_btobex_application_parameter_ctn, proto_ctn);
+    ctn_application_parameters_handle  = register_dissector("btobex.parameter.ctn",  dissect_btobex_application_parameter_ctn, proto_ctn);
 
     proto_pbap = proto_register_protocol("BT OBEX PBAP Application Parameters", "PBAP Application Parameters", "btobex.parameter.pbap");
-    pbap_application_parameters_handle = new_register_dissector("btobex.parameter.pbap", dissect_btobex_application_parameter_pbap, proto_pbap);
+    pbap_application_parameters_handle = register_dissector("btobex.parameter.pbap", dissect_btobex_application_parameter_pbap, proto_pbap);
 
     register_decode_as(&media_type_da);
 
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 1cd237e4b3..7551a50210 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -1129,7 +1129,7 @@ proto_register_btrfcomm(void)
 
     /* Register the protocol name and description */
     proto_btrfcomm = proto_register_protocol("Bluetooth RFCOMM Protocol", "BT RFCOMM", "btrfcomm");
-    btrfcomm_handle = new_register_dissector("btrfcomm", dissect_btrfcomm, proto_btrfcomm);
+    btrfcomm_handle = register_dissector("btrfcomm", dissect_btrfcomm, proto_btrfcomm);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btrfcomm, hf, array_length(hf));
@@ -1244,7 +1244,7 @@ proto_register_btdun(void)
     };
 
     proto_btdun = proto_register_protocol("Bluetooth DUN Packet", "BT DUN", "btdun");
-    btdun_handle = new_register_dissector("btdun", dissect_btdun, proto_btdun);
+    btdun_handle = register_dissector("btdun", dissect_btdun, proto_btdun);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btdun, hf, array_length(hf));
@@ -1311,7 +1311,7 @@ proto_register_btspp(void)
     };
 
     proto_btspp = proto_register_protocol("Bluetooth SPP Packet", "BT SPP", "btspp");
-    btspp_handle = new_register_dissector("btspp", dissect_btspp, proto_btspp);
+    btspp_handle = register_dissector("btspp", dissect_btspp, proto_btspp);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btspp, hf, array_length(hf));
@@ -1365,7 +1365,7 @@ proto_register_btgnss(void)
     };
 
     proto_btgnss = proto_register_protocol("Bluetooth GNSS Profile", "BT GNSS", "btgnss");
-    btgnss_handle = new_register_dissector("btgnss", dissect_btgnss, proto_btgnss);
+    btgnss_handle = register_dissector("btgnss", dissect_btgnss, proto_btgnss);
 
     proto_register_field_array(proto_btgnss, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c
index 3f8d5e49cc..bce4178f22 100644
--- a/epan/dissectors/packet-btsap.c
+++ b/epan/dissectors/packet-btsap.c
@@ -708,7 +708,7 @@ proto_register_btsap(void)
     };
 
     proto_btsap = proto_register_protocol("Bluetooth SAP Profile", "BT SAP", "btsap");
-    btsap_handle = new_register_dissector("btsap", dissect_btsap, proto_btsap);
+    btsap_handle = register_dissector("btsap", dissect_btsap, proto_btsap);
 
     proto_register_field_array(proto_btsap, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 334893d003..f03aedcb72 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -6508,7 +6508,7 @@ proto_register_btsdp(void)
     };
 
     proto_btsdp = proto_register_protocol("Bluetooth SDP Protocol", "BT SDP", "btsdp");
-    btsdp_handle = new_register_dissector("btsdp", dissect_btsdp, proto_btsdp);
+    btsdp_handle = register_dissector("btsdp", dissect_btsdp, proto_btsdp);
 
     proto_register_field_array(proto_btsdp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c
index 3d47d20cc1..6b53daea41 100644
--- a/epan/dissectors/packet-btsmp.c
+++ b/epan/dissectors/packet-btsmp.c
@@ -430,7 +430,7 @@ proto_register_btsmp(void)
     proto_btsmp = proto_register_protocol("Bluetooth Security Manager Protocol",
         "BT SMP", "btsmp");
 
-    btsmp_handle = new_register_dissector("btsmp", dissect_btsmp, proto_btsmp);
+    btsmp_handle = register_dissector("btsmp", dissect_btsmp, proto_btsmp);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btsmp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index b7a55f7f6e..3da6bf0b5c 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -405,7 +405,7 @@ proto_register_bvlc(void)
 					"besides the standard X'BAC0' (47808) port.",
 					10, &global_additional_bvlc_udp_port);
 
-	new_register_dissector("bvlc", dissect_bvlc, proto_bvlc);
+	register_dissector("bvlc", dissect_bvlc, proto_bvlc);
 
 	bvlc_dissector_table = register_dissector_table("bvlc.function",
 	    "BVLC Function", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c
index 88798c61f5..99d0d4208f 100644
--- a/epan/dissectors/packet-bzr.c
+++ b/epan/dissectors/packet-bzr.c
@@ -302,7 +302,7 @@ proto_register_bzr(void)
 
     module_t *bzr_module;
     proto_bzr = proto_register_protocol("Bazaar Smart Protocol", "Bazaar", "bzr");
-    new_register_dissector("bzr", dissect_bzr, proto_bzr);
+    register_dissector("bzr", dissect_bzr, proto_bzr);
     proto_register_field_array(proto_bzr, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 7745c5644e..b1c3cd16d9 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -3295,7 +3295,7 @@ void proto_register_catapult_dct2000(void)
     expert_register_field_array(expert_catapult_dct2000, ei, array_length(ei));
 
     /* Allow dissector to find be found by name. */
-    new_register_dissector("dct2000", dissect_catapult_dct2000, proto_catapult_dct2000);
+    register_dissector("dct2000", dissect_catapult_dct2000, proto_catapult_dct2000);
 
     /* Preferences */
     catapult_dct2000_module = prefs_register_protocol(proto_catapult_dct2000, NULL);
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c
index e62ae57774..92b07c071d 100644
--- a/epan/dissectors/packet-cbor.c
+++ b/epan/dissectors/packet-cbor.c
@@ -853,7 +853,7 @@ proto_register_cbor(void)
 	expert_cbor = expert_register_protocol(proto_cbor);
 	expert_register_field_array(expert_cbor, ei, array_length(ei));
 
-	new_register_dissector("cbor", dissect_cbor, proto_cbor);
+	register_dissector("cbor", dissect_cbor, proto_cbor);
 }
 
 void
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index 750fb7b57f..f857499f99 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -707,7 +707,7 @@ proto_register_ccsds(void)
     expert_ccsds = expert_register_protocol(proto_ccsds);
     expert_register_field_array(expert_ccsds, ei, array_length(ei));
 
-    new_register_dissector ( "ccsds", dissect_ccsds, proto_ccsds );
+    register_dissector ( "ccsds", dissect_ccsds, proto_ccsds );
 
     /* Register preferences module */
     ccsds_module = prefs_register_protocol(proto_ccsds, NULL);
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c
index 0bcfeb967d..b3fd231f6c 100644
--- a/epan/dissectors/packet-cell_broadcast.c
+++ b/epan/dissectors/packet-cell_broadcast.c
@@ -577,8 +577,8 @@ proto_register_cbs(void)
    register_cleanup_routine(gsm_cbs_message_reassembly_cleanup);
 
    /* subdissector code */
-   new_register_dissector("gsm_cbs", dissect_gsm_cell_broadcast, proto_cell_broadcast);
-   new_register_dissector("umts_cell_broadcast", dissect_umts_cell_broadcast_message, proto_cell_broadcast);
+   register_dissector("gsm_cbs", dissect_gsm_cell_broadcast, proto_cell_broadcast);
+   register_dissector("umts_cell_broadcast", dissect_umts_cell_broadcast_message, proto_cell_broadcast);
 
    /* subtree array */
    proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index b2c4eb0ea2..1c08c6309f 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -1625,7 +1625,7 @@ proto_register_cfdp(void)
     expert_cfdp = expert_register_protocol(proto_cfdp);
     expert_register_field_array(expert_cfdp, ei, array_length(ei));
 
-    new_register_dissector ( "cfdp", dissect_cfdp, proto_cfdp );
+    register_dissector ( "cfdp", dissect_cfdp, proto_cfdp );
 }
 
 void
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index b1d9e6bfaf..f36db338da 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -2149,7 +2149,7 @@ void proto_register_cfm(void)
 		"cfm" /* abbrev */
 		);
 
-	cfm_handle = new_register_dissector("cfm", dissect_cfm, proto_cfm);
+	cfm_handle = register_dissector("cfm", dissect_cfm, proto_cfm);
 
 	proto_register_field_array(proto_cfm, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 964cb1140d..d56c294ae9 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -237,7 +237,7 @@ proto_register_chdlc(void)
                                                 "Cisco HDLC protocol",
                                                 FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-  new_register_dissector("chdlc", dissect_chdlc, proto_chdlc);
+  register_dissector("chdlc", dissect_chdlc, proto_chdlc);
 
   /* Register the preferences for the chdlc protocol */
   chdlc_module = prefs_register_protocol(proto_chdlc, NULL);
diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c
index 640585e671..0d780088e9 100644
--- a/epan/dissectors/packet-cimetrics.c
+++ b/epan/dissectors/packet-cimetrics.c
@@ -114,7 +114,7 @@ proto_register_cimetrics(void)
 	proto_register_field_array(proto_cimetrics_mstp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("cimetrics", dissect_cimetrics_mstp,
+	register_dissector("cimetrics", dissect_cimetrics_mstp,
 			   proto_cimetrics_mstp);
 
 	llc_add_oui(OUI_CIMETRICS, "llc.cimetrics_pid",
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index ffdd6b8198..dac9171f54 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -6960,7 +6960,7 @@ proto_register_cip(void)
    /* Register the protocol name and description */
    proto_cip = proto_register_protocol("Common Industrial Protocol",
        "CIP", "cip");
-   new_register_dissector("cip_implicit", dissect_cip_implicit, proto_cip);
+   register_dissector("cip_implicit", dissect_cip_implicit, proto_cip);
 
    /* Required function calls to register the header fields and subtrees used */
    proto_register_field_array(proto_cip, hf, array_length(hf));
diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c
index 5447cb8d3d..ea29f2c7d9 100644
--- a/epan/dissectors/packet-cipmotion.c
+++ b/epan/dissectors/packet-cipmotion.c
@@ -2921,7 +2921,7 @@ proto_register_cipmotion(void)
    /* Register the subtrees for the protocol dissection */
    proto_register_subtree_array(cip_subtree, array_length(cip_subtree));
 
-   new_register_dissector( "cipmotion", dissect_cipmotion, proto_cipmotion);
+   register_dissector( "cipmotion", dissect_cipmotion, proto_cipmotion);
 }
 
 void proto_reg_handoff_cipmotion(void)
diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c
index 1a404108a3..11d6c06152 100644
--- a/epan/dissectors/packet-cipsafety.c
+++ b/epan/dissectors/packet-cipsafety.c
@@ -2582,7 +2582,7 @@ proto_register_cipsafety(void)
    expert_cip_safety = expert_register_protocol(proto_cipsafety);
    expert_register_field_array(expert_cip_safety, ei, array_length(ei));
 
-   new_register_dissector( "cipsafety", dissect_cipsafety, proto_cipsafety);
+   register_dissector( "cipsafety", dissect_cipsafety, proto_cipsafety);
 
    /* Register CIP Safety objects */
    proto_cip_class_s_supervisor = proto_register_protocol("CIP Safety Supervisor",
diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c
index 3e8e881e21..fdf7276a44 100644
--- a/epan/dissectors/packet-cisco-sm.c
+++ b/epan/dissectors/packet-cisco-sm.c
@@ -595,7 +595,7 @@ proto_register_sm(void)
     proto_sm = proto_register_protocol("Cisco Session Management",
         "SM", "sm");
 
-    new_register_dissector("sm", dissect_sm, proto_sm);
+    register_dissector("sm", dissect_sm, proto_sm);
 
 /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_sm, hf, array_length(hf));
diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index debfc1d4c6..0e64e5c046 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -693,8 +693,8 @@ proto_register_classicstun(void)
     proto_register_field_array(proto_classicstun, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("classicstun", dissect_classicstun, proto_classicstun);
-    new_register_dissector("classicstun-heur", dissect_classicstun_heur, proto_classicstun);
+    register_dissector("classicstun", dissect_classicstun, proto_classicstun);
+    register_dissector("classicstun-heur", dissect_classicstun_heur, proto_classicstun);
 }
 
 
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index a7fab232a5..aa68a99e28 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -738,7 +738,7 @@ proto_register_clnp(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_clnp = expert_register_protocol(proto_clnp);
     expert_register_field_array(expert_clnp, ei, array_length(ei));
-    new_register_dissector("clnp", dissect_clnp, proto_clnp);
+    register_dissector("clnp", dissect_clnp, proto_clnp);
     clnp_heur_subdissector_list = register_heur_dissector_list("clnp");
     register_init_routine(clnp_reassemble_init);
     register_cleanup_routine(clnp_reassemble_cleanup);
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c
index 461cda637b..113743518d 100644
--- a/epan/dissectors/packet-coap.c
+++ b/epan/dissectors/packet-coap.c
@@ -1127,7 +1127,7 @@ proto_register_coap(void)
 	expert_coap = expert_register_protocol(proto_coap);
 	expert_register_field_array(expert_coap, ei, array_length(ei));
 
-	new_register_dissector("coap", dissect_coap, proto_coap);
+	register_dissector("coap", dissect_coap, proto_coap);
 
 	/* Register our configuration options */
 	coap_module = prefs_register_protocol (proto_coap, proto_reg_handoff_coap);
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index fd24b6a88c..c317d33185 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -2822,7 +2822,7 @@ void proto_register_cops(void)
     expert_register_field_array(expert_cops, ei, array_length(ei));
 
     /* Make dissector findable by name */
-    new_register_dissector("cops", dissect_cops, proto_cops);
+    register_dissector("cops", dissect_cops, proto_cops);
 
     /* Register our configuration options for cops */
     cops_module = prefs_register_protocol(proto_cops, proto_reg_handoff_cops);
diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c
index 814e295cc8..6b4b4b6361 100644
--- a/epan/dissectors/packet-corosync-totemsrp.c
+++ b/epan/dissectors/packet-corosync-totemsrp.c
@@ -1161,7 +1161,7 @@ proto_register_corosync_totemsrp(void)
 
   heur_subdissector_list = register_heur_dissector_list("corosync_totemsrp.mcast");
 
-  new_register_dissector( "corosync_totemsrp", dissect_corosync_totemsrp, proto_corosync_totemsrp);
+  register_dissector( "corosync_totemsrp", dissect_corosync_totemsrp, proto_corosync_totemsrp);
 }
 
 void
diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c
index 7f898b3371..00e978fca3 100644
--- a/epan/dissectors/packet-cp2179.c
+++ b/epan/dissectors/packet-cp2179.c
@@ -1355,7 +1355,7 @@ proto_register_cp2179(void)
     module_t *cp2179_module;
 
     proto_cp2179 = proto_register_protocol ("CP2179 Protocol", "CP2179", "cp2179");
-    new_register_dissector("cp2179", dissect_cp2179, proto_cp2179);
+    register_dissector("cp2179", dissect_cp2179, proto_cp2179);
     proto_register_field_array(proto_cp2179, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index f3a57d1be9..e424698bee 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -137,7 +137,7 @@ proto_register_data(void)
 		"data"		/* abbrev */
 		);
 
-	new_register_dissector("data", dissect_data, proto_data);
+	register_dissector("data", dissect_data, proto_data);
 
 	proto_register_fields(proto_data, hfi, array_length(hfi));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index ae058301c3..4e1acf1cdf 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -237,8 +237,8 @@ proto_register_db_lsp (void)
 
   proto_db_lsp = proto_register_protocol (PNAME, PSNAME, PFNAME);
   proto_db_lsp_disc = proto_register_protocol (PNAME_DISC, PSNAME_DISC, PFNAME_DISC);
-  new_register_dissector ("db-lsp.tcp", dissect_db_lsp_tcp, proto_db_lsp);
-  new_register_dissector ("db-lsp.udp", dissect_db_lsp_disc, proto_db_lsp_disc);
+  register_dissector ("db-lsp.tcp", dissect_db_lsp_tcp, proto_db_lsp);
+  register_dissector ("db-lsp.udp", dissect_db_lsp_disc, proto_db_lsp_disc);
 
   heur_subdissector_list = register_heur_dissector_list("db-lsp");
 
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 5a15a9d529..2d758db277 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -7276,7 +7276,7 @@ proto_register_dcm(void)
     expert_register_field_array(expert_dcm, ei, array_length(ei));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("dicom", dissect_dcm_static, proto_dcm);
+    register_dissector("dicom", dissect_dcm_static, proto_dcm);
 
     dcm_module = prefs_register_protocol(proto_dcm, dcm_apply_settings);
 
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index d894386177..65349a99d4 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -2398,7 +2398,7 @@ proto_register_dhcpv6(void)
     expert_register_field_array(expert_dhcpv6_bulk_leasequery, ei_bulk_leasequery, array_length(ei_bulk_leasequery));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("dhcpv6", dissect_dhcpv6_stream, proto_dhcpv6);
+    register_dissector("dhcpv6", dissect_dhcpv6_stream, proto_dhcpv6);
 
     dhcpv6_module = prefs_register_protocol(proto_dhcpv6, NULL);
     prefs_register_bool_preference(dhcpv6_module, "cablelabs_interface_id",
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 9ee630e2d5..3cdb016e51 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -2270,7 +2270,7 @@ real_proto_register_diameter(void)
 	g_ptr_array_free(build_dict.ett,TRUE);
 
 	/* Allow dissector to find be found by name. */
-	new_register_dissector("diameter", dissect_diameter, proto_diameter);
+	register_dissector("diameter", dissect_diameter, proto_diameter);
 
 	/* Register dissector table(s) to do sub dissection of AVPs (OctetStrings) */
 	diameter_dissector_table = register_dissector_table("diameter.base", "DIAMETER_BASE_AVPS", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index f056b5354c..eb2e5ccac1 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -4995,7 +4995,7 @@ void proto_register_dmp (void)
 
   proto_dmp = proto_register_protocol (PNAME, PSNAME, PFNAME);
 
-  dmp_handle = new_register_dissector(PFNAME, dissect_dmp, proto_dmp);
+  dmp_handle = register_dissector(PFNAME, dissect_dmp, proto_dmp);
 
   proto_register_field_array (proto_dmp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-dmx-chan.c b/epan/dissectors/packet-dmx-chan.c
index 3fc8b0f94d..e2fa88bdf1 100644
--- a/epan/dissectors/packet-dmx-chan.c
+++ b/epan/dissectors/packet-dmx-chan.c
@@ -165,7 +165,7 @@ proto_register_dmx_chan(void)
 	proto_dmx_chan = proto_register_protocol("DMX Channels","DMX Channels", "dmx-chan");
 	proto_register_field_array(proto_dmx_chan, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("dmx-chan", dissect_dmx_chan, proto_dmx_chan);
+	register_dissector("dmx-chan", dissect_dmx_chan, proto_dmx_chan);
 
 	dmx_chan_module = prefs_register_protocol(proto_dmx_chan, NULL);
 
diff --git a/epan/dissectors/packet-dmx-sip.c b/epan/dissectors/packet-dmx-sip.c
index 0c06bd432c..4499a02f5e 100644
--- a/epan/dissectors/packet-dmx-sip.c
+++ b/epan/dissectors/packet-dmx-sip.c
@@ -301,7 +301,7 @@ proto_register_dmx_sip(void)
 	proto_dmx_sip = proto_register_protocol("DMX SIP", "DMX SIP", "dmx-sip");
 	proto_register_field_array(proto_dmx_sip, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("dmx-sip", dissect_dmx_sip, proto_dmx_sip);
+	register_dissector("dmx-sip", dissect_dmx_sip, proto_dmx_sip);
 }
 
 /*
diff --git a/epan/dissectors/packet-dmx-test.c b/epan/dissectors/packet-dmx-test.c
index 5791a44954..d6014f8b48 100644
--- a/epan/dissectors/packet-dmx-test.c
+++ b/epan/dissectors/packet-dmx-test.c
@@ -139,7 +139,7 @@ proto_register_dmx_test(void)
 	proto_dmx_test = proto_register_protocol("DMX Test Frame", "DMX Test Frame", "dmx-test");
 	proto_register_field_array(proto_dmx_test, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("dmx-test", dissect_dmx_test, proto_dmx_test);
+	register_dissector("dmx-test", dissect_dmx_test, proto_dmx_test);
 }
 
 /*
diff --git a/epan/dissectors/packet-dmx-text.c b/epan/dissectors/packet-dmx-text.c
index 0035bedde7..57f07e831a 100644
--- a/epan/dissectors/packet-dmx-text.c
+++ b/epan/dissectors/packet-dmx-text.c
@@ -106,7 +106,7 @@ proto_register_dmx_text(void)
 	proto_dmx_text = proto_register_protocol("DMX Text Frame", "DMX Text Frame", "dmx-text");
 	proto_register_field_array(proto_dmx_text, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("dmx-text", dissect_dmx_text, proto_dmx_text);
+	register_dissector("dmx-text", dissect_dmx_text, proto_dmx_text);
 }
 
 /*
diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c
index d73eda1376..5f149e0d90 100644
--- a/epan/dissectors/packet-dmx.c
+++ b/epan/dissectors/packet-dmx.c
@@ -122,7 +122,7 @@ proto_register_dmx(void)
 
 	proto_dmx = proto_register_protocol("DMX", "DMX", "dmx");
 	proto_register_field_array(proto_dmx, hf, array_length(hf));
-	new_register_dissector("dmx", dissect_dmx, proto_dmx);
+	register_dissector("dmx", dissect_dmx, proto_dmx);
 }
 
 void
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index cb679140e5..8be8ac3119 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -4566,7 +4566,7 @@ proto_register_dnp3(void)
                    "DNP 3.0", "dnp3");
 
 /* Register the dissector so it may be used as a User DLT payload protocol */
-  new_register_dissector("dnp3.udp", dissect_dnp3_udp, proto_dnp3);
+  register_dissector("dnp3.udp", dissect_dnp3_udp, proto_dnp3);
 
 /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_dnp3, hf, array_length(hf));
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index bec218ea3c..f3be389a99 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -5618,7 +5618,7 @@ proto_register_dns(void)
 
   dns_tsig_dissector_table = register_dissector_table("dns.tsig.mac", "DNS TSIG MAC Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-  new_register_dissector("dns", dissect_dns, proto_dns);
+  register_dissector("dns", dissect_dns, proto_dns);
 
   dns_tap = register_tap("dns");
 }
diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c
index 3bf708f8ad..0f00ef0c4b 100644
--- a/epan/dissectors/packet-dpnss-link.c
+++ b/epan/dissectors/packet-dpnss-link.c
@@ -206,7 +206,7 @@ proto_register_dpnss_link(void)
 	/* Register the protocol name and description */
 	proto_dpnss_link = proto_register_protocol("Digital Private Signalling System No 1 Link Layer",
 						   "DPNSS Link", "dpnss_link");
-	new_register_dissector("dpnss_link", dissect_dpnss_link, proto_dpnss_link);
+	register_dissector("dpnss_link", dissect_dpnss_link, proto_dpnss_link);
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array(proto_dpnss_link, hf, array_length(hf));
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index 13f0e874cc..6b14d4b2bb 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -1646,7 +1646,7 @@ proto_register_dpnss(void)
 
 /* Register the protocol name and description */
     proto_dpnss = proto_register_protocol("Digital Private Signalling System No 1","DPNSS", "dpnss");
-    new_register_dissector("dpnss", dissect_dpnss, proto_dpnss);
+    register_dissector("dpnss", dissect_dpnss, proto_dpnss);
 
 /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_dpnss, hf, array_length(hf));
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 77fec90292..ce51f8270e 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1833,7 +1833,7 @@ proto_register_dtls(void)
   }
 #endif
 
-  new_register_dissector("dtls", dissect_dtls, proto_dtls);
+  register_dissector("dtls", dissect_dtls, proto_dtls);
   dtls_handle = find_dissector("dtls");
 
   register_init_routine(dtls_init);
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 8f2d629dfd..a475208b52 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -2733,7 +2733,7 @@ proto_register_bundle(void)
     expert_module_t *expert_bundle, *expert_tcpcl;
 
     proto_bundle  = proto_register_protocol("Bundle Protocol", "Bundle", "bundle");
-    bundle_handle = new_register_dissector("bundle", dissect_bundle, proto_bundle);
+    bundle_handle = register_dissector("bundle", dissect_bundle, proto_bundle);
     bundle_module = prefs_register_protocol(proto_bundle, proto_reg_handoff_bundle);
 
     proto_tcp_conv = proto_register_protocol ("DTN TCP Convergence Layer Protocol", "TCPCL", "tcpcl");
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index ba9a2df8ec..89e954bdc1 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -904,7 +904,7 @@ proto_register_dua(void)
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Allow other dissectors to find this one by name. */
-  new_register_dissector("dua", dissect_dua, proto_dua);
+  register_dissector("dua", dissect_dua, proto_dua);
 }
 
 void
diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c
index 4e54ea3c7e..100ad16b1b 100644
--- a/epan/dissectors/packet-dvb-ipdc.c
+++ b/epan/dissectors/packet-dvb-ipdc.c
@@ -93,7 +93,7 @@ proto_register_dvb_ipdc(void)
 #endif
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("dvb_ipdc", dissect_ipdc, proto_ipdc);
+    register_dissector("dvb_ipdc", dissect_ipdc, proto_ipdc);
 }
 
 void
diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c
index 315a1175a0..9ef3d999d4 100644
--- a/epan/dissectors/packet-dvb-nit.c
+++ b/epan/dissectors/packet-dvb-nit.c
@@ -232,7 +232,7 @@ proto_register_dvb_nit(void)
     proto_register_field_array(proto_dvb_nit, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("dvb_nit", dissect_dvb_nit, proto_dvb_nit);
+    register_dissector("dvb_nit", dissect_dvb_nit, proto_dvb_nit);
 }
 
 
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index c544794d42..14d3b879d7 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -6334,7 +6334,7 @@ proto_register_dvbci(void)
     register_cleanup_routine(dvbci_cleanup);
 
     /* the dissector for decrypted CI+ SAC messages which we can export */
-    new_register_dissector(EXPORTED_SAC_MSG_PROTO,
+    register_dissector(EXPORTED_SAC_MSG_PROTO,
         dissect_dvbci_exported_sac_msg, proto_dvbci);
 
     exported_pdu_tap = register_export_pdu_tap("DVB-CI");
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index c959f1de42..eca7ac5d5e 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -1545,7 +1545,7 @@ proto_register_eap(void)
   expert_eap = expert_register_protocol(proto_eap);
   expert_register_field_array(expert_eap, ei, array_length(ei));
 
-  eap_handle = new_register_dissector("eap", dissect_eap, proto_eap);
+  eap_handle = register_dissector("eap", dissect_eap, proto_eap);
   register_init_routine(eap_tls_defragment_init);
   register_cleanup_routine(eap_tls_defragment_cleanup);
 }
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 96a925e52a..164c79f7d9 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -301,7 +301,7 @@ proto_register_eapol(void)
   };
 
   proto_eapol = proto_register_protocol("802.1X Authentication", "EAPOL", "eapol");
-  eapol_handle = new_register_dissector("eapol", dissect_eapol, proto_eapol);
+  eapol_handle = register_dissector("eapol", dissect_eapol, proto_eapol);
 
   proto_register_field_array(proto_eapol, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index a544b0324a..329392f46e 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -438,7 +438,7 @@ void proto_register_ecp_oui(void)
 	proto_register_field_array(proto_ecp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("ecp", dissect_ecp, proto_ecp);
+	register_dissector("ecp", dissect_ecp, proto_ecp);
 }
 
 void proto_reg_handoff_ecp(void)
diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c
index d96a027bb3..3f29b65e07 100644
--- a/epan/dissectors/packet-ehdlc.c
+++ b/epan/dissectors/packet-ehdlc.c
@@ -313,7 +313,7 @@ proto_register_ehdlc(void)
 	proto_register_field_array(proto_ehdlc, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("ehdlc", dissect_ehdlc, proto_ehdlc);
+	register_dissector("ehdlc", dissect_ehdlc, proto_ehdlc);
 }
 
 void
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index 6c660206a9..dee39b0ea8 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -1952,7 +1952,7 @@ proto_register_ehs(void)
   proto_register_subtree_array(ett, array_length(ett));
 
   /* XX: Does this dissector need to be publicly registered ?? */
-  new_register_dissector ( "ehs", dissect_ehs, proto_ehs );
+  register_dissector ( "ehs", dissect_ehs, proto_ehs );
 
 }
 
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 639f165a57..8ed80271ec 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -3707,7 +3707,7 @@ proto_register_enip(void)
    proto_enip = proto_register_protocol("EtherNet/IP (Industrial Protocol)", "ENIP", "enip");
    proto_enipio = proto_register_protocol("EtherNet/IP I/O", "ENIP I/O", "enip_io");
 
-   new_register_dissector("enip", dissect_enip_tcp, proto_enip);
+   register_dissector("enip", dissect_enip_tcp, proto_enip);
 
    /* Required function calls to register the header fields and subtrees used */
    proto_register_field_array(proto_enip, hf, array_length(hf));
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index af23788a9c..ac707a0ed1 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -4355,7 +4355,7 @@ proto_register_epl(void)
 		"Manufacturer specific ASND service", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
 	/* Registering protocol to be called by another dissector */
-	epl_handle = new_register_dissector("epl", dissect_epl, proto_epl);
+	epl_handle = register_dissector("epl", dissect_epl, proto_epl);
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array(proto_epl, hf, array_length(hf));
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index fc248bc448..8448c1af82 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -412,7 +412,7 @@ proto_register_epmd(void)
     proto_epmd = proto_register_protocol(PNAME, PSNAME, PFNAME);
     proto_register_field_array(proto_epmd, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector(PFNAME, dissect_epmd, proto_epmd);
+    register_dissector(PFNAME, dissect_epmd, proto_epmd);
 }
 
 void
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index ba817ccf13..6fc972e384 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -1897,7 +1897,7 @@ proto_register_erf(void)
   expert_module_t* expert_erf;
 
   proto_erf = proto_register_protocol("Extensible Record Format", "ERF", "erf");
-  erf_handle = new_register_dissector("erf", dissect_erf, proto_erf);
+  erf_handle = register_dissector("erf", dissect_erf, proto_erf);
 
   proto_register_field_array(proto_erf, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 3c63f8c001..7ae68b0427 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -675,7 +675,7 @@ void proto_register_erldp(void) {
   /* Register protocol and dissector */
   proto_erldp = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-  erldp_handle = new_register_dissector(PFNAME, dissect_erldp, proto_erldp);
+  erldp_handle = register_dissector(PFNAME, dissect_erldp, proto_erldp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_erldp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index b0dd2ef462..759c1dcef5 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -413,7 +413,7 @@ proto_register_esis(void) {
   proto_register_subtree_array(ett, array_length(ett));
   expert_esis = expert_register_protocol(proto_esis);
   expert_register_field_array(expert_esis, ei, array_length(ei));
-  new_register_dissector("esis", dissect_esis, proto_esis);
+  register_dissector("esis", dissect_esis, proto_esis);
 }
 
 void
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index df28f32c87..be5df8b979 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -944,7 +944,7 @@ void proto_register_etch(void)
 
   proto_register_field_array(proto_etch, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  etch_handle = new_register_dissector("etch", dissect_etch, proto_etch);
+  etch_handle = register_dissector("etch", dissect_etch, proto_etch);
 
   register_init_routine(&etch_dissector_init);
 
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index b5d45e95ef..a8ca40162c 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -1010,9 +1010,9 @@ proto_register_eth(void)
                                  "Set the condition that must be true for the CCSDS dissector to be called",
                                  &ccsds_heuristic_bit);
 
-  new_register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth);
-  new_register_dissector("eth_withfcs", dissect_eth_withfcs, proto_eth);
-  new_register_dissector("eth", dissect_eth_maybefcs, proto_eth);
+  register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth);
+  register_dissector("eth_withfcs", dissect_eth_withfcs, proto_eth);
+  register_dissector("eth", dissect_eth_maybefcs, proto_eth);
   eth_tap = register_tap("eth");
 
   register_conversation_table(proto_eth, TRUE, eth_conversation_packet, eth_hostlist_packet);
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c
index 50f6601ad1..becb3a9892 100644
--- a/epan/dissectors/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
@@ -125,7 +125,7 @@ proto_register_etherip(void)
   expert_etherip = expert_register_protocol(proto_etherip);
   expert_register_field_array(expert_etherip, ei, array_length(ei));
 
-  new_register_dissector("etherip", dissect_etherip, proto_etherip);
+  register_dissector("etherip", dissect_etherip, proto_etherip);
 }
 
 void
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 793b290563..1d9d9cc6a5 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -395,7 +395,7 @@ proto_register_ethertype(void)
 	/* This isn't a real protocol, so you can't disable its dissection. */
 	proto_set_cant_toggle(proto_ethertype);
 
-	new_register_dissector("ethertype", dissect_ethertype, proto_ethertype);
+	register_dissector("ethertype", dissect_ethertype, proto_ethertype);
 
 	/* subdissector code */
 	ethertype_dissector_table = register_dissector_table("ethertype",
diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c
index 5007c188f7..d1e2c89816 100644
--- a/epan/dissectors/packet-etsi_card_app_toolkit.c
+++ b/epan/dissectors/packet-etsi_card_app_toolkit.c
@@ -1876,7 +1876,7 @@ proto_register_card_app_toolkit(void)
 
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("etsi_cat", dissect_cat, proto_cat);
+	register_dissector("etsi_cat", dissect_cat, proto_cat);
 }
 
 void
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 3195904e47..19b88db765 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -339,7 +339,7 @@ proto_register_exported_pdu(void)
     proto_exported_pdu = proto_register_protocol("EXPORTED_PDU",
             "exported_pdu", "exported_pdu");
 
-    new_register_dissector("exported_pdu", dissect_exported_pdu, proto_exported_pdu);
+    register_dissector("exported_pdu", dissect_exported_pdu, proto_exported_pdu);
 
     /* Required function calls to register the header fields and subtrees */
     proto_register_field_array(proto_exported_pdu, hf, array_length(hf));
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 0f9a2b35c5..58e4ba1648 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -1565,8 +1565,8 @@ proto_register_fc(void)
 
     /* Register the protocol name and description */
     proto_fc = proto_register_protocol ("Fibre Channel", "FC", "fc");
-    fc_handle = new_register_dissector ("fc", dissect_fc, proto_fc);
-    new_register_dissector ("fc_ifcp", dissect_fc_ifcp, proto_fc);
+    fc_handle = register_dissector ("fc", dissect_fc, proto_fc);
+    register_dissector ("fc_ifcp", dissect_fc_ifcp, proto_fc);
     fc_tap = register_tap("fc");
 
     /* Required function calls to register the header fields and subtrees used */
@@ -1606,7 +1606,7 @@ proto_register_fc(void)
     proto_register_field_array(proto_fcsof, sof_hf, array_length(sof_hf));
     proto_register_subtree_array(sof_ett, array_length(sof_ett));
 
-    fcsof_handle = new_register_dissector("fcsof", dissect_fcsof, proto_fcsof);
+    fcsof_handle = register_dissector("fcsof", dissect_fcsof, proto_fcsof);
 
     register_conversation_table(proto_fc, TRUE, fc_conversation_packet, fc_hostlist_packet);
     register_srt_table(proto_fc, NULL, 1, fcstat_packet, fcstat_init, NULL);
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c
index 328946abbe..6b9b16c800 100644
--- a/epan/dissectors/packet-fcgi.c
+++ b/epan/dissectors/packet-fcgi.c
@@ -398,7 +398,7 @@ proto_register_fcgi(void)
                                   10,
                                   &tcp_port);
 
-   fcgi_handle = new_register_dissector("fcgi", dissect_fcgi, proto_fcgi);
+   fcgi_handle = register_dissector("fcgi", dissect_fcgi, proto_fcgi);
 }
 
 void
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index dd6e7facec..cdeb7da357 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -607,7 +607,7 @@ proto_register_fcsp(void)
     /* Register the protocol name and description */
     proto_fcsp = proto_register_protocol("Fibre Channel Security Protocol", "FC-SP", "fcsp");
 
-    new_register_dissector("fcsp", dissect_fcsp, proto_fcsp);
+    register_dissector("fcsp", dissect_fcsp, proto_fcsp);
 
     proto_register_field_array(proto_fcsp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index 9dca69fd55..c52cc21bbc 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -511,7 +511,7 @@ proto_register_fddi(void)
    * Called from various dissectors for encapsulated FDDI frames.
    * We assume the MAC addresses in them aren't bitswapped.
    */
-  new_register_dissector("fddi", dissect_fddi_not_bitswapped, proto_fddi);
+  register_dissector("fddi", dissect_fddi_not_bitswapped, proto_fddi);
 
   fddi_module = prefs_register_protocol(proto_fddi, NULL);
   prefs_register_bool_preference(fddi_module, "padding",
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index f5fededb87..6bc80befa1 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -501,7 +501,7 @@ proto_register_fix(void)
                                         "FIX", "fix");
 
     /* Allow dissector to find be found by name. */
-    fix_handle = new_register_dissector("fix", dissect_fix, proto_fix);
+    fix_handle = register_dissector("fix", dissect_fix, proto_fix);
 
     proto_register_field_array(proto_fix, hf, array_length(hf));
     proto_register_field_array(proto_fix, hf_FIX, array_length(hf_FIX));
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index d8c757e66f..9fb951f182 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.c
@@ -583,7 +583,7 @@ proto_register_fp_hint(void)
     expert_module_t* expert_fp_hint;
 
     proto_fp_hint = proto_register_protocol("FP Hint", "FP Hint", "fp_hint");
-    new_register_dissector("fp_hint", dissect_fp_hint, proto_fp_hint);
+    register_dissector("fp_hint", dissect_fp_hint, proto_fp_hint);
 
     proto_register_field_array(proto_fp_hint, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 6e92df901a..cbc3d817f1 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -985,9 +985,9 @@ proto_register_fr(void)
   fr_osinl_subdissector_table = register_dissector_table("fr.osinl",
                                                          "Frame Relay OSI NLPID", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-  new_register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr);
-  new_register_dissector("fr", dissect_fr, proto_fr);
-  new_register_dissector("fr_stripped_address", dissect_fr_stripped_address, proto_fr);
+  register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr);
+  register_dissector("fr", dissect_fr, proto_fr);
+  register_dissector("fr_stripped_address", dissect_fr_stripped_address, proto_fr);
 
   frencap_module = prefs_register_protocol(proto_fr, NULL);
   /*
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 950803696e..4521d24d1b 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -887,7 +887,7 @@ proto_register_frame(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_frame = expert_register_protocol(proto_frame);
 	expert_register_field_array(expert_frame, ei, array_length(ei));
-	new_register_dissector("frame",dissect_frame,proto_frame);
+	register_dissector("frame",dissect_frame,proto_frame);
 
 	/* You can't disable dissection of "Frame", as that would be
 	   tantamount to not doing any dissection whatsoever. */
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 03292aa672..1d8b8a4036 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -1032,9 +1032,9 @@ proto_register_ftp(void)
 
     proto_ftp = proto_register_protocol("File Transfer Protocol (FTP)", "FTP", "ftp");
 
-    new_register_dissector("ftp", dissect_ftp, proto_ftp);
+    register_dissector("ftp", dissect_ftp, proto_ftp);
     proto_ftp_data = proto_register_protocol("FTP Data", "FTP-DATA", "ftp-data");
-    new_register_dissector("ftp-data", dissect_ftpdata, proto_ftp_data);
+    register_dissector("ftp-data", dissect_ftpdata, proto_ftp_data);
     proto_register_field_array(proto_ftp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
     expert_ftp = expert_register_protocol(proto_ftp);
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index e2611bb100..0d2e283975 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -280,7 +280,7 @@ proto_register_fw1(void)
                                  "Whether the interface list includes the chain position",
                                  &fw1_iflist_with_chain);
 
-  new_register_dissector("fw1", dissect_fw1, proto_fw1);
+  register_dissector("fw1", dissect_fw1, proto_fw1);
 
   for (i=0; i<MAX_INTERFACES; i++) {
     p_interfaces[i] = NULL;
diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c
index f615d5eb92..9f732f86ae 100644
--- a/epan/dissectors/packet-ged125.c
+++ b/epan/dissectors/packet-ged125.c
@@ -1752,7 +1752,7 @@ proto_register_ged125 (void)
 	expert_ged125 = expert_register_protocol(proto_ged125);
 	expert_register_field_array(expert_ged125, ei, array_length(ei));
 
-	ged125_handle = new_register_dissector("ged125", dissect_ged125, proto_ged125);
+	ged125_handle = register_dissector("ged125", dissect_ged125, proto_ged125);
 
 	ged125_module = prefs_register_protocol(proto_ged125, NULL);
 
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 0d582ca550..626858c71f 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -5517,7 +5517,7 @@ proto_register_giop (void)
   proto_giop = proto_register_protocol("General Inter-ORB Protocol", "GIOP", "giop");
 
   /* Register by name */
-  giop_tcp_handle = new_register_dissector("giop", dissect_giop_tcp, proto_giop);
+  giop_tcp_handle = register_dissector("giop", dissect_giop_tcp, proto_giop);
 
   proto_register_field_array (proto_giop, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index 26cca1bfb5..b3c6759425 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -148,7 +148,7 @@ proto_register_git(void)
   proto_register_field_array(proto_git, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  git_handle = new_register_dissector(PFNAME, dissect_git, proto_git);
+  git_handle = register_dissector(PFNAME, dissect_git, proto_git);
 
   git_module = prefs_register_protocol(proto_git, NULL);
 
diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c
index a7462cdac8..aa84906183 100644
--- a/epan/dissectors/packet-gmr1_bcch.c
+++ b/epan/dissectors/packet-gmr1_bcch.c
@@ -1649,7 +1649,7 @@ proto_register_gmr1_bcch(void)
 	expert_gmr1_bcch = expert_register_protocol(proto_gmr1_bcch);
 	expert_register_field_array(expert_gmr1_bcch, ei, array_length(ei));
 
-	new_register_dissector("gmr1_bcch", dissect_gmr1_bcch, proto_gmr1_bcch);
+	register_dissector("gmr1_bcch", dissect_gmr1_bcch, proto_gmr1_bcch);
 }
 
 /*
diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c
index 95529d9c43..709ebbdabd 100644
--- a/epan/dissectors/packet-gmr1_dtap.c
+++ b/epan/dissectors/packet-gmr1_dtap.c
@@ -173,7 +173,7 @@ proto_register_gmr1_dtap(void)
 	proto_register_field_array(proto_gmr1_dtap, hf, array_length(hf));
 
 	/* Register dissector */
-	new_register_dissector("gmr1_dtap", dissect_gmr1_dtap, proto_gmr1_dtap);
+	register_dissector("gmr1_dtap", dissect_gmr1_dtap, proto_gmr1_dtap);
 }
 
 void
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c
index 2caeb33821..7f0dfcc0f7 100644
--- a/epan/dissectors/packet-gmr1_rach.c
+++ b/epan/dissectors/packet-gmr1_rach.c
@@ -1185,7 +1185,7 @@ proto_register_gmr1_rach(void)
 	proto_register_field_array(proto_gmr1_rach, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("gmr1_rach", dissect_gmr1_rach, proto_gmr1_rach);
+	register_dissector("gmr1_rach", dissect_gmr1_rach, proto_gmr1_rach);
 }
 
 void
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index bc07eb95d4..bd06ef0439 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -2456,7 +2456,7 @@ proto_register_gmr1_rr(void)
 	proto_gmr1_ccch = proto_register_protocol("GEO-Mobile Radio (1) CCCH", "GMR-1 CCCH", "gmr1.ccch");
 
 	/* Register dissector */
-	new_register_dissector("gmr1_ccch", dissect_gmr1_ccch, proto_gmr1_ccch);
+	register_dissector("gmr1_ccch", dissect_gmr1_ccch, proto_gmr1_ccch);
 }
 
 void
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index d73732ce88..60f20f30c0 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -394,7 +394,7 @@ proto_register_gmrp(void)
     expert_gmrp = expert_register_protocol(proto_gmrp);
     expert_register_field_array(expert_gmrp, ei, array_length(ei));
 
-    new_register_dissector("gmrp", dissect_gmrp, proto_gmrp);
+    register_dissector("gmrp", dissect_gmrp, proto_gmrp);
 
 }
 
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c
index facbdec11d..0b25c2b0c8 100644
--- a/epan/dissectors/packet-gpef.c
+++ b/epan/dissectors/packet-gpef.c
@@ -180,7 +180,7 @@ proto_register_gpef(void)
 	proto_register_field_array(proto_gpef, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("efsblob", dissect_gpef_efsblob, proto_gpef);
+	register_dissector("efsblob", dissect_gpef_efsblob, proto_gpef);
 }
 
 /*
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index df4b5a060f..a05ff45562 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -1339,7 +1339,7 @@ proto_register_llcgprs(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_llcgprs = expert_register_protocol(proto_llcgprs);
 	expert_register_field_array(expert_llcgprs, ei, array_length(ei));
-	new_register_dissector("llcgprs", dissect_llcgprs, proto_llcgprs);
+	register_dissector("llcgprs", dissect_llcgprs, proto_llcgprs);
 
 	llcgprs_module = prefs_register_protocol ( proto_llcgprs, NULL );
 	prefs_register_bool_preference ( llcgprs_module, "autodetect_cipher_bit",
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index fada2fe3d3..697fa17e4f 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -7994,7 +7994,7 @@ proto_register_gsm_a_bssmap(void)
     expert_gsm_a_bssmap = expert_register_protocol(proto_a_bssmap);
     expert_register_field_array(expert_gsm_a_bssmap, ei, array_length(ei));
 
-    new_register_dissector("gsm_a_bssmap", dissect_bssmap, proto_a_bssmap);
+    register_dissector("gsm_a_bssmap", dissect_bssmap, proto_a_bssmap);
 }
 
 
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 945ce30631..7ab416622e 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -8314,7 +8314,7 @@ proto_register_gsm_a_dtap(void)
 
 
     /* subdissector code */
-    new_register_dissector("gsm_a_dtap", dissect_dtap, proto_a_dtap);
+    register_dissector("gsm_a_dtap", dissect_dtap, proto_a_dtap);
     u2u_dissector_table = register_dissector_table("gsm_a.dtap.u2u_prot_discr", "GSM User to User Signalling",
                                                   FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 }
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index ec2d6d9757..83d52158bd 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -560,7 +560,7 @@ proto_register_gsm_a_rp(void)
 	expert_gsm_a_rp = expert_register_protocol(proto_a_rp);
 	expert_register_field_array(expert_gsm_a_rp, ei, array_length(ei));
 
-	new_register_dissector("gsm_a_rp", dissect_rp, proto_a_rp);
+	register_dissector("gsm_a_rp", dissect_rp, proto_a_rp);
 }
 
 void
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 9ff6da22df..fc0dd179a1 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -13340,7 +13340,7 @@ proto_register_gsm_a_rr(void)
         proto_register_protocol("GSM CCCH", "GSM CCCH", "gsm_a.ccch");
 
     /* subdissector code */
-    new_register_dissector("gsm_a_ccch", dissect_ccch, proto_a_ccch);
+    register_dissector("gsm_a_ccch", dissect_ccch, proto_a_ccch);
 
     /* Register the protocol name and description */
     proto_a_sacch =
@@ -13349,7 +13349,7 @@ proto_register_gsm_a_rr(void)
     proto_register_field_array(proto_a_sacch, hf_rr_short_pd, array_length(hf_rr_short_pd));
 
     /* subdissector code */
-    new_register_dissector("gsm_a_sacch", dissect_sacch, proto_a_sacch);
+    register_dissector("gsm_a_sacch", dissect_sacch, proto_a_sacch);
 
     /* subtree array (for both sub-dissectors) */
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c
index 10c3e62d72..2be66fc19f 100644
--- a/epan/dissectors/packet-gsm_abis_om2000.c
+++ b/epan/dissectors/packet-gsm_abis_om2000.c
@@ -1416,7 +1416,7 @@ proto_register_abis_om2000(void)
 
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("gsm_abis_om2000", dissect_abis_om2000,
+	register_dissector("gsm_abis_om2000", dissect_abis_om2000,
 			   proto_abis_om2000);
 }
 
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c
index f7dbd901dc..a6158c3611 100644
--- a/epan/dissectors/packet-gsm_abis_oml.c
+++ b/epan/dissectors/packet-gsm_abis_oml.c
@@ -2378,7 +2378,7 @@ proto_register_abis_oml(void)
 	expert_module = expert_register_protocol(proto_abis_oml);
 	expert_register_field_array(expert_module, ei, array_length(ei));
 
-	new_register_dissector("gsm_abis_oml", dissect_abis_oml, proto_abis_oml);
+	register_dissector("gsm_abis_oml", dissect_abis_oml, proto_abis_oml);
 
 	oml_module = prefs_register_protocol(proto_abis_oml, NULL);
 	prefs_register_enum_preference(oml_module, "oml_dialect",
diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index fb54643851..317f948041 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -969,7 +969,7 @@ proto_register_gsm_bsslap(void)
     expert_gsm_bsslap = expert_register_protocol(proto_gsm_bsslap);
     expert_register_field_array(expert_gsm_bsslap, ei, array_length(ei));
 
-    new_register_dissector("gsm_bsslap", dissect_gsm_bsslap, proto_gsm_bsslap);
+    register_dissector("gsm_bsslap", dissect_gsm_bsslap, proto_gsm_bsslap);
 }
 
 /*
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index a790ab164b..b49559ba2e 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -1212,7 +1212,7 @@ proto_register_gsm_bssmap_le(void)
 	expert_gsm_a_bssmap_le = expert_register_protocol(proto_bssmap_le);
 	expert_register_field_array(expert_gsm_a_bssmap_le, ei, array_length(ei));
 
-	new_register_dissector("gsm_bssmap_le", dissect_bssmap_le, proto_bssmap_le);
+	register_dissector("gsm_bssmap_le", dissect_bssmap_le, proto_bssmap_le);
 }
 
 void
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index f3f346797d..49258e6581 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -645,7 +645,7 @@ proto_register_gsm_cbch(void)
     expert_register_field_array(expert_cbch, ei, array_length(ei));
 
     /* subdissector code */
-    new_register_dissector("gsm_cbch", dissect_cbch, proto_cbch);
+    register_dissector("gsm_cbch", dissect_cbch, proto_cbch);
     register_init_routine(cbch_defragment_init);
     register_cleanup_routine(cbch_defragment_cleanup);
 
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 99645ce6ad..36e29ef775 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -16492,8 +16492,8 @@ proto_register_gsm_rlcmac(void)
   proto_register_subtree_array(ett, array_length(ett));
   expert_gsm_rlcmac = expert_register_protocol(proto_gsm_rlcmac);
   expert_register_field_array(expert_gsm_rlcmac, ei, array_length(ei));
-  new_register_dissector("gsm_rlcmac_ul", dissect_gsm_rlcmac_uplink, proto_gsm_rlcmac);
-  new_register_dissector("gsm_rlcmac_dl", dissect_gsm_rlcmac_downlink, proto_gsm_rlcmac);
+  register_dissector("gsm_rlcmac_ul", dissect_gsm_rlcmac_uplink, proto_gsm_rlcmac);
+  register_dissector("gsm_rlcmac_dl", dissect_gsm_rlcmac_downlink, proto_gsm_rlcmac);
 }
 
 void
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index 5c1003a5cc..85867cd354 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -2924,10 +2924,10 @@ proto_register_gsm_sim(void)
 
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("gsm_sim", dissect_gsm_sim, proto_gsm_sim);
-	new_register_dissector("gsm_sim.command", dissect_gsm_sim_command, proto_gsm_sim);
-	new_register_dissector("gsm_sim.response", dissect_gsm_sim_response, proto_gsm_sim);
-	new_register_dissector("gsm_sim.bertlv", dissect_bertlv, proto_gsm_sim);
+	register_dissector("gsm_sim", dissect_gsm_sim, proto_gsm_sim);
+	register_dissector("gsm_sim.command", dissect_gsm_sim_command, proto_gsm_sim);
+	register_dissector("gsm_sim.response", dissect_gsm_sim_response, proto_gsm_sim);
+	register_dissector("gsm_sim.bertlv", dissect_bertlv, proto_gsm_sim);
 }
 
 void
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 8379883c9f..f4055b0a2a 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -3267,7 +3267,7 @@ proto_register_gsm_sms(void)
                                     "Whether the dissector should reassemble SMS spanning multiple packets",
                                     &reassemble_sms);
 
-    new_register_dissector("gsm_sms", dissect_gsm_sms, proto_gsm_sms);
+    register_dissector("gsm_sms", dissect_gsm_sms, proto_gsm_sms);
 
     /* GSM SMS UD dissector initialization routines */
     register_init_routine (gsm_sms_defragment_init);
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index 151e63d516..3269710f2a 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -653,7 +653,7 @@ proto_register_gsm_sms_ud(void)
         "own. Eg. Prevent WSP dissector overwriting SMPP information.",
         &prevent_subdissectors_changing_columns);
 
-    new_register_dissector("gsm_sms_ud", dissect_gsm_sms_ud, proto_gsm_sms_ud);
+    register_dissector("gsm_sms_ud", dissect_gsm_sms_ud, proto_gsm_sms_ud);
 
     /* GSM SMS UD dissector initialization routines */
     register_init_routine(gsm_sms_ud_defragment_init);
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 1f556af7d1..b33fd69f24 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -635,8 +635,8 @@ proto_register_gssapi(void)
 	expert_gssapi = expert_register_protocol(proto_gssapi);
 	expert_register_field_array(expert_gssapi, ei, array_length(ei));
 
-	new_register_dissector("gssapi", dissect_gssapi, proto_gssapi);
-	new_register_dissector("gssapi_verf", dissect_gssapi_verf, proto_gssapi);
+	register_dissector("gssapi", dissect_gssapi, proto_gssapi);
+	register_dissector("gssapi_verf", dissect_gssapi_verf, proto_gssapi);
 
 	gssapi_oids = g_hash_table_new(gssapi_oid_hash, gssapi_oid_equal);
 	register_init_routine(gssapi_reassembly_init);
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index a17b66bd41..2b4f79a211 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -9796,8 +9796,8 @@ proto_register_gtp(void)
      */
     prefs_register_bool_preference(gtp_module, "dissect_gtp_over_tcp", "Dissect GTP over TCP", "Dissect GTP over TCP", &g_gtp_over_tcp);
 
-    new_register_dissector("gtp", dissect_gtp, proto_gtp);
-    new_register_dissector("gtpprime", dissect_gtpprime, proto_gtpprime);
+    register_dissector("gtp", dissect_gtp, proto_gtp);
+    register_dissector("gtpprime", dissect_gtpprime, proto_gtpprime);
 
     gtp_priv_ext_dissector_table = register_dissector_table("gtp.priv_ext", "GTP PRIVATE EXT", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
     gtp_cdr_fmt_dissector_table = register_dissector_table("gtp.cdr_fmt", "GTP DATA RECORD TYPE", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 021c71d3fd..2ca015f368 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -8132,7 +8132,7 @@ void proto_register_gtpv2(void)
     /* AVP Code: 2820 Presence-Reporting-Area-Elements-List */
     dissector_add_uint("diameter.3gpp", 2820, create_dissector_handle(dissect_diameter_3gpp_presence_reporting_area_elements_list, proto_gtpv2));
 
-    new_register_dissector("gtpv2", dissect_gtpv2, proto_gtpv2);
+    register_dissector("gtpv2", dissect_gtpv2, proto_gtpv2);
     /* Dissector table for private extensions */
     gtpv2_priv_ext_dissector_table = register_dissector_table("gtpv2.priv_ext", "GTPv2 PRIVATE EXT", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 }
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 962a27a5fd..4613297743 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -3814,7 +3814,7 @@ void proto_register_gvcp(void)
 
 	proto_gvcp = proto_register_protocol("GigE Vision Control Protocol", "GVCP", "gvcp");
 
-	new_register_dissector("gvcp", dissect_gvcp, proto_gvcp);
+	register_dissector("gvcp", dissect_gvcp, proto_gvcp);
 
 	proto_register_field_array(proto_gvcp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index b7f02d4f97..75871d6f35 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -344,7 +344,7 @@ proto_register_gvrp(void)
     expert_gvrp = expert_register_protocol(proto_gvrp);
     expert_register_field_array(expert_gvrp, ei, array_length(ei));
 
-    new_register_dissector("gvrp", dissect_gvrp, proto_gvrp);
+    register_dissector("gvrp", dissect_gvrp, proto_gvrp);
 }
 
 void
diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c
index b336d1a790..f9bf7cef2e 100644
--- a/epan/dissectors/packet-gvsp.c
+++ b/epan/dissectors/packet-gvsp.c
@@ -1980,7 +1980,7 @@ void proto_register_gvsp(void)
 
     proto_gvsp = proto_register_protocol("GigE Vision Streaming Protocol", "GVSP", "gvsp");
 
-    new_register_dissector("gvsp", dissect_gvsp, proto_gvsp);
+    register_dissector("gvsp", dissect_gvsp, proto_gvsp);
 
     proto_register_field_array(proto_gvsp, hfgvsp, array_length(hfgvsp));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index e6d4eff906..1424493aa3 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1646,8 +1646,8 @@ void proto_register_h223 (void)
 
     proto_register_field_array (proto_h223, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
-    new_register_dissector("h223", dissect_h223_circuit_data, proto_h223);
-    new_register_dissector("h223_bitswapped", dissect_h223_bitswapped, proto_h223_bitswapped);
+    register_dissector("h223", dissect_h223_circuit_data, proto_h223);
+    register_dissector("h223_bitswapped", dissect_h223_bitswapped, proto_h223_bitswapped);
 
     /* register our init routine to be called at the start of a capture,
        to clear out our hash tables etc */
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index 1c2e16f06f..cb1c72a493 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -1023,7 +1023,7 @@ proto_register_h263_data(void)
 	proto_h263_data = proto_register_protocol("ITU-T Recommendation H.263",
 	    "H.263", "h263");
 	proto_register_field_array(proto_h263_data, hf, array_length(hf));
-	new_register_dissector("h263data", dissect_h263_data, proto_h263_data);
+	register_dissector("h263data", dissect_h263_data, proto_h263_data);
 }
 
 /*
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index 2b4461e479..7b65b0172f 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -409,7 +409,7 @@ proto_register_h263P(void)
                        10,
                        &temp_dynamic_payload_type);
 
-    new_register_dissector("h263P", dissect_h263P, proto_h263P);
+    register_dissector("h263P", dissect_h263P, proto_h263P);
 
 }
 
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index 7cc6267d3c..e77e7837a1 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -3700,7 +3700,7 @@ proto_register_h264(void)
                             "; Values must be in the range 96 - 127",
                             &temp_dynamic_payload_type_range, 127);
 
-    new_register_dissector("h264", dissect_h264, proto_h264);
+    register_dissector("h264", dissect_h264, proto_h264);
 }
 
 
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c
index 7ed6d665db..a019d0876b 100644
--- a/epan/dissectors/packet-hci_h1.c
+++ b/epan/dissectors/packet-hci_h1.c
@@ -134,7 +134,7 @@ proto_register_hci_h1(void)
     proto_hci_h1 = proto_register_protocol("Bluetooth HCI H1",
             "HCI_H1", "hci_h1");
 
-    hci_h1_handle = new_register_dissector("hci_h1", dissect_hci_h1, proto_hci_h1);
+    hci_h1_handle = register_dissector("hci_h1", dissect_hci_h1, proto_hci_h1);
 
     proto_register_field_array(proto_hci_h1, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index bd8534063b..c97eee48cb 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -137,7 +137,7 @@ proto_register_hci_h4(void)
     proto_hci_h4 = proto_register_protocol("Bluetooth HCI H4",
             "HCI_H4", "hci_h4");
 
-    hci_h4_handle = new_register_dissector("hci_h4", dissect_hci_h4, proto_hci_h4);
+    hci_h4_handle = register_dissector("hci_h4", dissect_hci_h4, proto_hci_h4);
 
     proto_register_field_array(proto_hci_h4, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c
index 78262629f9..eb0b86109c 100644
--- a/epan/dissectors/packet-hci_mon.c
+++ b/epan/dissectors/packet-hci_mon.c
@@ -297,7 +297,7 @@ proto_register_hci_mon(void)
     proto_hci_mon = proto_register_protocol("Bluetooth Linux Monitor Transport", "HCI_MON", "hci_mon");
     proto_register_field_array(proto_hci_mon, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    hci_mon_handle = new_register_dissector("hci_mon", dissect_hci_mon, proto_hci_mon);
+    hci_mon_handle = register_dissector("hci_mon", dissect_hci_mon, proto_hci_mon);
 
     expert_module = expert_register_protocol(proto_hci_mon);
     expert_register_field_array(expert_module, ei, array_length(ei));
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c
index d08d461393..bf669c8023 100644
--- a/epan/dissectors/packet-hci_usb.c
+++ b/epan/dissectors/packet-hci_usb.c
@@ -369,7 +369,7 @@ proto_register_hci_usb(void)
     proto_hci_usb = proto_register_protocol("Bluetooth HCI USB Transport", "HCI_USB", "hci_usb");
     proto_register_field_array(proto_hci_usb, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    hci_usb_handle = new_register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb);
+    hci_usb_handle = register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb);
 
     module = prefs_register_protocol(proto_hci_usb, NULL);
     prefs_register_static_text_preference(module, "bthci_usb.version",
diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c
index 834b4c6ccd..bfe35de0eb 100644
--- a/epan/dissectors/packet-hdcp.c
+++ b/epan/dissectors/packet-hdcp.c
@@ -320,7 +320,7 @@ proto_register_hdcp(void)
     proto_register_field_array(proto_hdcp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("hdcp", dissect_hdcp, proto_hdcp);
+    register_dissector("hdcp", dissect_hdcp, proto_hdcp);
 
     transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c
index 771780e69c..a5af74e725 100644
--- a/epan/dissectors/packet-hdcp2.c
+++ b/epan/dissectors/packet-hdcp2.c
@@ -305,7 +305,7 @@ proto_register_hdcp2(void)
     expert_hdcp2 = expert_register_protocol(proto_hdcp2);
     expert_register_field_array(expert_hdcp2, ei, array_length(ei));
 
-    new_register_dissector("hdcp2", dissect_hdcp2, proto_hdcp2);
+    register_dissector("hdcp2", dissect_hdcp2, proto_hdcp2);
 }
 
 void
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index 5c39387874..7b084394e4 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -1060,7 +1060,7 @@ proto_register_hdfs(void)
                                    10,
                                    &tcp_port);
 
-    hdfs_handle = new_register_dissector("hdfs", dissect_hdfs, proto_hdfs);
+    hdfs_handle = register_dissector("hdfs", dissect_hdfs, proto_hdfs);
 }
 
 /* registers handoff */
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c
index 1c6762f71e..a092a899a5 100644
--- a/epan/dissectors/packet-hdfsdata.c
+++ b/epan/dissectors/packet-hdfsdata.c
@@ -792,7 +792,7 @@ proto_register_hdfsdata(void)
                                    10,
                                    &tcp_port);
 
-    hdfsdata_handle = new_register_dissector("hdfsdata", dissect_hdfsdata, proto_hdfsdata);
+    hdfsdata_handle = register_dissector("hdfsdata", dissect_hdfsdata, proto_hdfsdata);
 }
 
 /* registers handoff */
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index e6c917158f..1f3714585e 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -132,7 +132,7 @@ proto_register_hpext(void)
 	subdissector_table = register_dissector_table("hpext.dxsap",
 	  "HPEXT XSAP", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-	hpext_handle = new_register_dissector("hpext", dissect_hpext, proto_hpext);
+	hpext_handle = register_dissector("hpext", dissect_hpext, proto_hpext);
 }
 
 void
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index 6411be91cc..b91cdac274 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -359,7 +359,7 @@ proto_register_hpsw(void)
     expert_hpsw = expert_register_protocol(proto_hpsw);
     expert_register_field_array(expert_hpsw, ei, array_length(ei));
 
-    new_register_dissector("hpsw", dissect_hpsw, proto_hpsw);
+    register_dissector("hpsw", dissect_hpsw, proto_hpsw);
 }
 
 void
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index 0294779693..0c70d7419b 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -128,7 +128,7 @@ void proto_register_hpteam(void)
 	llc_add_oui(OUI_HP_2, "llc.hpteam_pid", "LLC Hewlett Packard OUI PID", &hf_pid);
 	proto_register_field_array(proto_hpteam, hf_data, array_length(hf_data));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("hpteam", dissect_hpteam, proto_hpteam);
+	register_dissector("hpteam", dissect_hpteam, proto_hpteam);
 }
 
 void proto_reg_handoff_hpteam(void)
diff --git a/epan/dissectors/packet-http-urlencoded.c b/epan/dissectors/packet-http-urlencoded.c
index 5485787b04..5b09d461d5 100644
--- a/epan/dissectors/packet-http-urlencoded.c
+++ b/epan/dissectors/packet-http-urlencoded.c
@@ -200,7 +200,7 @@ proto_register_http_urlencoded(void)
 	proto_urlencoded = proto_register_protocol("HTML Form URL Encoded", "URL Encoded Form Data", "urlencoded-form");
 	hfi_urlencoded = proto_registrar_get_nth(proto_urlencoded);
 
-	form_urlencoded_handle = new_register_dissector("urlencoded-form", dissect_form_urlencoded, proto_urlencoded);
+	form_urlencoded_handle = register_dissector("urlencoded-form", dissect_form_urlencoded, proto_urlencoded);
 
 	proto_register_fields(proto_urlencoded, hfi, array_length(hfi));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index cc48337994..d7b40b341c 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -3398,7 +3398,7 @@ proto_register_http(void)
 	expert_http = expert_register_protocol(proto_http);
 	expert_register_field_array(expert_http, ei, array_length(ei));
 
-	http_handle = new_register_dissector("http", dissect_http, proto_http);
+	http_handle = register_dissector("http", dissect_http, proto_http);
 
 	http_module = prefs_register_protocol(proto_http, reinit_http);
 	prefs_register_bool_preference(http_module, "desegment_headers",
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c
index c7bee423c2..98e4283394 100644
--- a/epan/dissectors/packet-http2.c
+++ b/epan/dissectors/packet-http2.c
@@ -1852,7 +1852,7 @@ proto_register_http2(void)
 
     prefs_register_obsolete_preference(http2_module, "heuristic_http2");
 
-    new_register_dissector("http2", dissect_http2, proto_http2);
+    register_dissector("http2", dissect_http2, proto_http2);
 
     http2_tap = register_tap("http2");
 }
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 8febc16b44..80c1e0ea36 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -186,7 +186,7 @@ proto_register_hyperscsi(void)
   proto_register_field_array(proto_hyperscsi, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("hyperscsi", dissect_hyperscsi, proto_hyperscsi);
+  register_dissector("hyperscsi", dissect_hyperscsi, proto_hyperscsi);
 }
 
 /* XXX <epan/etypes.h> */
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 933381b1d8..1064a6eb55 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -3199,7 +3199,7 @@ proto_register_iax2(void)
   expert_iax = expert_register_protocol(proto_iax2);
   expert_register_field_array(expert_iax, ei, array_length(ei));
 
-  new_register_dissector("iax2", dissect_iax2, proto_iax2);
+  register_dissector("iax2", dissect_iax2, proto_iax2);
 
   iax2_codec_dissector_table = register_dissector_table(
     "iax2.codec", "IAX codec number", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index c379ffcd51..e5d46039d1 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -2027,7 +2027,7 @@ void proto_register_icmp(void)
 				       "Whether the 128th and following bytes of the ICMP payload should be decoded as MPLS extensions or as a portion of the original packet",
 				       &favor_icmp_mpls_ext);
 
-	new_register_dissector("icmp", dissect_icmp, proto_icmp);
+	register_dissector("icmp", dissect_icmp, proto_icmp);
 	icmp_tap = register_tap("icmp");
 }
 
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 9b143ccda6..2cf3a2c92b 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -5347,7 +5347,7 @@ proto_register_icmpv6(void)
     expert_icmpv6 = expert_register_protocol(proto_icmpv6);
     expert_register_field_array(expert_icmpv6, ei, array_length(ei));
 
-    icmpv6_handle = new_register_dissector("icmpv6", dissect_icmpv6, proto_icmpv6);
+    icmpv6_handle = register_dissector("icmpv6", dissect_icmpv6, proto_icmpv6);
 
     icmpv6_tap = register_tap("icmpv6");
 }
diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c
index c8f8d5d2c5..4090fd8e5f 100644
--- a/epan/dissectors/packet-idrp.c
+++ b/epan/dissectors/packet-idrp.c
@@ -1596,7 +1596,7 @@ void proto_register_idrp(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_idrp = expert_register_protocol(proto_idrp);
     expert_register_field_array(expert_idrp, ei, array_length(ei));
-    new_register_dissector("idrp", dissect_idrp, proto_idrp);
+    register_dissector("idrp", dissect_idrp, proto_idrp);
 
 }
 
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c
index ba8b87bd45..00cca6d21c 100644
--- a/epan/dissectors/packet-ieee80211-radio.c
+++ b/epan/dissectors/packet-ieee80211-radio.c
@@ -1137,7 +1137,7 @@ void proto_register_ieee80211_radio(void)
   proto_register_field_array(proto_wlan_radio, hf_wlan_radio, array_length(hf_wlan_radio));
   proto_register_subtree_array(tree_array, array_length(tree_array));
 
-  wlan_radio_handle = new_register_dissector("wlan_radio", dissect_wlan_radio, proto_wlan_radio);
+  wlan_radio_handle = register_dissector("wlan_radio", dissect_wlan_radio, proto_wlan_radio);
 }
 
 void proto_reg_handoff_ieee80211_radio(void)
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 205b26427a..dd10179893 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -2649,7 +2649,7 @@ void proto_register_radiotap(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_radiotap = expert_register_protocol(proto_radiotap);
 	expert_register_field_array(expert_radiotap, ei, array_length(ei));
-	new_register_dissector("radiotap", dissect_radiotap, proto_radiotap);
+	register_dissector("radiotap", dissect_radiotap, proto_radiotap);
 
 	radiotap_tap = register_tap("radiotap");
 
diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c
index 01ea936597..89bb326f90 100644
--- a/epan/dissectors/packet-ieee80211-wlancap.c
+++ b/epan/dissectors/packet-ieee80211-wlancap.c
@@ -847,7 +847,7 @@ void proto_register_ieee80211_wlancap(void)
                                           "AVS WLANCAP", "wlancap");
   proto_register_field_array(proto_wlancap, hf_wlancap,
                              array_length(hf_wlancap));
-  new_register_dissector("wlancap", dissect_wlancap, proto_wlancap);
+  register_dissector("wlancap", dissect_wlancap, proto_wlancap);
 
   wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap);
   dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_AVS,
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a328e67d06..6e6a9784c3 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -27068,10 +27068,10 @@ proto_register_ieee80211 (void)
   expert_ieee80211 = expert_register_protocol(proto_wlan);
   expert_register_field_array(expert_ieee80211, ei, array_length(ei));
 
-  new_register_dissector("wlan",                dissect_ieee80211,                    proto_wlan);
-  new_register_dissector("wlan_withfcs",            dissect_ieee80211_withfcs,            proto_wlan);
-  new_register_dissector("wlan_withoutfcs",         dissect_ieee80211_withoutfcs,         proto_wlan);
-  new_register_dissector("wlan_bsfc",               dissect_ieee80211_bsfc,               proto_wlan);
+  register_dissector("wlan",                dissect_ieee80211,                    proto_wlan);
+  register_dissector("wlan_withfcs",            dissect_ieee80211_withfcs,            proto_wlan);
+  register_dissector("wlan_withoutfcs",         dissect_ieee80211_withoutfcs,         proto_wlan);
+  register_dissector("wlan_bsfc",               dissect_ieee80211_bsfc,               proto_wlan);
 
   register_init_routine(wlan_defragment_init);
   register_cleanup_routine(wlan_defragment_cleanup);
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 429c230a22..35a231e93d 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -2846,10 +2846,10 @@ void proto_register_ieee802154(void)
     ieee802154_beacon_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN_BEACON);
 
     /*  Register dissectors with Wireshark. */
-    new_register_dissector(IEEE802154_PROTOABBREV_WPAN, dissect_ieee802154, proto_ieee802154);
-    new_register_dissector("wpan_nofcs", dissect_ieee802154_nofcs, proto_ieee802154);
-    new_register_dissector("wpan_cc24xx", dissect_ieee802154_cc24xx, proto_ieee802154);
-    new_register_dissector("wpan-nonask-phy", dissect_ieee802154_nonask_phy, proto_ieee802154_nonask_phy);
+    register_dissector(IEEE802154_PROTOABBREV_WPAN, dissect_ieee802154, proto_ieee802154);
+    register_dissector("wpan_nofcs", dissect_ieee802154_nofcs, proto_ieee802154);
+    register_dissector("wpan_cc24xx", dissect_ieee802154_cc24xx, proto_ieee802154);
+    register_dissector("wpan-nonask-phy", dissect_ieee802154_nonask_phy, proto_ieee802154_nonask_phy);
 
     /* Register a Decode-As handler. */
     register_decode_as(&ieee802154_da);
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index 69cfa6c199..777f218cd8 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -350,7 +350,7 @@ proto_register_imap(void)
 
   proto_imap = proto_register_protocol("Internet Message Access Protocol", "IMAP", "imap");
 
-  imap_handle = new_register_dissector("imap", dissect_imap, proto_imap);
+  imap_handle = register_dissector("imap", dissect_imap, proto_imap);
 
   proto_register_field_array(proto_imap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index a3d1a0c34f..f6db8600dc 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -1259,7 +1259,7 @@ proto_register_imf(void)
   expert_register_field_array(expert_imf, ei, array_length(ei));
 
   /* Allow dissector to find be found by name. */
-  imf_handle = new_register_dissector(PFNAME, dissect_imf, proto_imf);
+  imf_handle = register_dissector(PFNAME, dissect_imf, proto_imf);
 
   imf_module = prefs_register_protocol(proto_imf, NULL);
   prefs_register_uat_preference(imf_module, "custom_header_fields", "Custom IMF headers",
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 03a85b86ef..6384f46722 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -7410,7 +7410,7 @@ void proto_register_infiniband(void)
     };
 
     proto_infiniband = proto_register_protocol("InfiniBand", "IB", "infiniband");
-    ib_handle = new_register_dissector("infiniband", dissect_infiniband, proto_infiniband);
+    ib_handle = register_dissector("infiniband", dissect_infiniband, proto_infiniband);
 
     proto_register_field_array(proto_infiniband, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
@@ -7437,7 +7437,7 @@ void proto_register_infiniband(void)
                                     10, &pref_rroce_udp_port);
 
     proto_infiniband_link = proto_register_protocol("InfiniBand Link", "InfiniBand Link", "infiniband_link");
-    ib_link_handle = new_register_dissector("infiniband_link", dissect_infiniband_link, proto_infiniband_link);
+    ib_link_handle = register_dissector("infiniband_link", dissect_infiniband_link, proto_infiniband_link);
 
     proto_register_field_array(proto_infiniband_link, hf_link, array_length(hf_link));
     proto_register_subtree_array(ett_link_array, array_length(ett_link_array));
diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c
index 0a289d45b2..cd6fb65548 100644
--- a/epan/dissectors/packet-infiniband_sdp.c
+++ b/epan/dissectors/packet-infiniband_sdp.c
@@ -475,7 +475,7 @@ proto_register_ib_sdp(void)
 
     proto_ib_sdp = proto_register_protocol("Infiniband Sockets Direct Protocol", "Infiniband SDP", "infiniband_sdp");
 
-    new_register_dissector("infiniband_sdp", dissect_ib_sdp, proto_ib_sdp);
+    register_dissector("infiniband_sdp", dissect_ib_sdp, proto_ib_sdp);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_ib_sdp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index 6fb463ae6c..726e495d30 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -215,7 +215,7 @@ proto_register_interlink(void)
 							"interlink");
 	proto_register_field_array(proto_interlink, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("interlink", dissect_interlink, proto_interlink);
+	register_dissector("interlink", dissect_interlink, proto_interlink);
 
 	/* Probably someone will write sub-dissectors. You can never know. */
 	subdissector_table = register_dissector_table("interlink.type_version",
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 8f9ee7b9e1..923ed98350 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -3168,7 +3168,7 @@ proto_register_ip(void)
     "Try to decode a packet using an heuristic sub-dissector before using a sub-dissector registered to a specific port",
     &try_heuristic_first);
 
-  new_register_dissector("ip", dissect_ip, proto_ip);
+  register_dissector("ip", dissect_ip, proto_ip);
   register_init_routine(ip_defragment_init);
   register_cleanup_routine(ip_defragment_cleanup);
   ip_tap = register_tap("ip");
diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index d39d5abc0a..348f41bc5b 100644
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -167,7 +167,7 @@ proto_register_ipars(void)
     proto_ipars = proto_register_protocol("International Passenger Airline Reservation System", "IPARS", "ipars");
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("ipars", dissect_ipars, proto_ipars);
+    register_dissector("ipars", dissect_ipars, proto_ipars);
 }
 
 /*
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 13721069fc..d341b11863 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -1805,10 +1805,10 @@ proto_register_ipmi(void)
 		ipmi_netfn_setdesc(i, "OEM", 0);
 	}
 
-	new_register_dissector("ipmi", dissect_ipmi, proto_ipmi);
-	new_register_dissector("ipmb", dissect_ipmi, proto_ipmb);
-	new_register_dissector("kcs", dissect_kcs, proto_kcs);
-	new_register_dissector("tmode", dissect_tmode, proto_tmode);
+	register_dissector("ipmi", dissect_ipmi, proto_ipmi);
+	register_dissector("ipmb", dissect_ipmi, proto_ipmb);
+	register_dissector("kcs", dissect_kcs, proto_kcs);
+	register_dissector("tmode", dissect_tmode, proto_tmode);
 
 	data_dissector = find_dissector("data");
 
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 1cfa14869c..d0dba8a0c7 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -2539,8 +2539,8 @@ proto_register_ipsec(void)
   register_init_routine(&ipsec_init_protocol);
   register_cleanup_routine(&ipsec_cleanup_protocol);
 
-  new_register_dissector("esp", dissect_esp, proto_esp);
-  new_register_dissector("ah", dissect_ah, proto_ah);
+  register_dissector("esp", dissect_esp, proto_esp);
+  register_dissector("ah", dissect_ah, proto_ah);
 }
 
 void
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 1a0a2b7f3d..279328ae9d 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -3514,7 +3514,7 @@ proto_register_ipv6(void)
                                    "Whether to display IPv6 extension headers as a separate protocol or a sub-protocol of the IPv6 packet",
                                    &ipv6_exthdr_under_root);
 
-    new_register_dissector("ipv6", dissect_ipv6, proto_ipv6);
+    register_dissector("ipv6", dissect_ipv6, proto_ipv6);
     register_init_routine(ipv6_reassemble_init);
     register_cleanup_routine(ipv6_reassemble_cleanup);
     ipv6_tap = register_tap("ipv6");
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 2d5557c445..cd0b1485ed 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -1544,7 +1544,7 @@ proto_register_ipx(void)
 	    "IPX", "ipx");
 	proto_register_field_array(proto_ipx, hf_ipx, array_length(hf_ipx));
 
-	new_register_dissector("ipx", dissect_ipx, proto_ipx);
+	register_dissector("ipx", dissect_ipx, proto_ipx);
 
 	proto_spx = proto_register_protocol("Sequenced Packet eXchange",
 	    "SPX", "spx");
@@ -1564,7 +1564,7 @@ proto_register_ipx(void)
 
 	proto_sap = proto_register_protocol("Service Advertisement Protocol",
 	    "IPX SAP", "ipxsap");
-	new_register_dissector("ipxsap", dissect_ipxsap, proto_sap);
+	register_dissector("ipxsap", dissect_ipxsap, proto_sap);
 
 	proto_register_field_array(proto_sap, hf_sap, array_length(hf_sap));
 
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 3f805e708c..89a53a680e 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -6546,7 +6546,7 @@ proto_register_isakmp(void)
   register_init_routine(&isakmp_init_protocol);
   register_cleanup_routine(&isakmp_cleanup_protocol);
 
-  new_register_dissector("isakmp", dissect_isakmp, proto_isakmp);
+  register_dissector("isakmp", dissect_isakmp, proto_isakmp);
 
 #ifdef HAVE_LIBGCRYPT
   isakmp_module = prefs_register_protocol(proto_isakmp, isakmp_prefs_apply_cb);
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index cdb3befc7c..17f56dbd4d 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -3075,7 +3075,7 @@ proto_register_iscsi(void)
 
     /* Register the protocol name and description */
     proto_iscsi = proto_register_protocol("iSCSI", "iSCSI", "iscsi");
-    new_register_dissector("iscsi", dissect_iscsi_handle, proto_iscsi);
+    register_dissector("iscsi", dissect_iscsi_handle, proto_iscsi);
 
     /* Required function calls to register the header fields and
      * subtrees used */
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index 2fa46bc199..34cf086b58 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -209,7 +209,7 @@ proto_register_isis(void)
     expert_isis = expert_register_protocol(proto_isis);
     expert_register_field_array(expert_isis, ei, array_length(ei));
 
-    isis_handle = new_register_dissector("isis", dissect_isis, proto_isis);
+    isis_handle = register_dissector("isis", dissect_isis, proto_isis);
 
     isis_dissector_table = register_dissector_table("isis.type",
                                 "ISIS Type", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c
index ef545b9854..1c58add1d2 100644
--- a/epan/dissectors/packet-iso14443.c
+++ b/epan/dissectors/packet-iso14443.c
@@ -1079,7 +1079,7 @@ proto_register_iso14443(void)
             FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
     iso14443_handle =
-        new_register_dissector("iso14443", dissect_iso14443, proto_iso14443);
+        register_dissector("iso14443", dissect_iso14443, proto_iso14443);
 
     transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c
index 3010984238..2d88c9b00d 100644
--- a/epan/dissectors/packet-iso7816.c
+++ b/epan/dissectors/packet-iso7816.c
@@ -925,13 +925,13 @@ proto_register_iso7816(void)
     expert_iso7816 = expert_register_protocol(proto_iso7816);
     expert_register_field_array(expert_iso7816, ei, array_length(ei));
 
-    new_register_dissector("iso7816", dissect_iso7816, proto_iso7816);
+    register_dissector("iso7816", dissect_iso7816, proto_iso7816);
 
     transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 
     proto_iso7816_atr = proto_register_protocol(
             "ISO/IEC 7816-3", "ISO 7816-3", "iso7816.atr");
-    new_register_dissector("iso7816.atr", dissect_iso7816_atr, proto_iso7816_atr);
+    register_dissector("iso7816.atr", dissect_iso7816_atr, proto_iso7816_atr);
 }
 
 void
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 1d1149d85f..c80dda8d63 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -12383,7 +12383,7 @@ proto_register_isup(void)
   proto_isup = proto_register_protocol("ISDN User Part",
                                        "ISUP", "isup");
 
-  new_register_dissector("isup", dissect_isup, proto_isup);
+  register_dissector("isup", dissect_isup, proto_isup);
 
 /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_isup, hf, array_length(hf));
@@ -12452,7 +12452,7 @@ proto_register_bicc(void)
   proto_bicc = proto_register_protocol("Bearer Independent Call Control",
                                        "BICC", "bicc");
 
-  bicc_handle = new_register_dissector("bicc", dissect_bicc, proto_bicc);
+  bicc_handle = register_dissector("bicc", dissect_bicc, proto_bicc);
 
 /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_bicc, hf, array_length(hf));
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 0787de019c..1568c5e512 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -976,7 +976,7 @@ proto_register_iua(void)
         &global_iua_gsm_sapis);
 
   /* Allow other dissectors to find this one by name. */
-  new_register_dissector("iua", dissect_iua, proto_iua);
+  register_dissector("iua", dissect_iua, proto_iua);
 }
 
 #define SCTP_PORT_IUA          9900
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index dee36e40e5..f746fb525d 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -996,8 +996,8 @@ void proto_register_iuup(void) {
     proto_register_subtree_array(ett, array_length(ett));
     expert_iuup = expert_register_protocol(proto_iuup);
     expert_register_field_array(expert_iuup, ei, array_length(ei));
-    new_register_dissector("iuup", dissect_iuup, proto_iuup);
-    new_register_dissector("find_iuup", find_iuup, proto_iuup);
+    register_dissector("iuup", dissect_iuup, proto_iuup);
+    register_dissector("find_iuup", find_iuup, proto_iuup);
 
     register_init_routine(&init_iuup);
     register_cleanup_routine(&cleanup_iuup);
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c
index 793c625540..625f357457 100644
--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@@ -893,7 +893,7 @@ proto_register_iwarp_ddp_rdmap(void)
 
 	rdmap_heur_subdissector_list = register_heur_dissector_list("iwarp_ddp_rdmap");
 
-	new_register_dissector("iwarp_ddp_rdmap", dissect_iwarp_ddp_rdmap,
+	register_dissector("iwarp_ddp_rdmap", dissect_iwarp_ddp_rdmap,
 			proto_iwarp_ddp_rdmap);
 }
 
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c
index 56df118f52..ed151f96da 100644
--- a/epan/dissectors/packet-ixveriwave.c
+++ b/epan/dissectors/packet-ixveriwave.c
@@ -1672,7 +1672,7 @@ framing signal deasserted.  this is caused by software setting the drain all reg
     proto_register_field_array(proto_ixveriwave, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    ixveriwave_handle = new_register_dissector("ixveriwave", dissect_ixveriwave, proto_ixveriwave);
+    ixveriwave_handle = register_dissector("ixveriwave", dissect_ixveriwave, proto_ixveriwave);
 }
 
 void proto_reg_handoff_ixveriwave(void)
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index 1234e63a90..8bd5c0c275 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -636,7 +636,7 @@ proto_register_json(void)
 	proto_register_fields(proto_json, hfi, array_length(hfi));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	json_handle = new_register_dissector("json", dissect_json, proto_json);
+	json_handle = register_dissector("json", dissect_json, proto_json);
 
 	init_json_parser();
 }
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 6004bbd75c..d40f7207aa 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -2356,8 +2356,8 @@ void proto_register_jxta(void)
 
     proto_message_jxta = proto_register_protocol("JXTA Message", "JXTA Message", "jxta.message");
 
-    new_register_dissector("jxta.udp", dissect_jxta_udp, proto_jxta);
-    new_register_dissector("jxta.stream", dissect_jxta_stream, proto_jxta);
+    register_dissector("jxta.udp", dissect_jxta_udp, proto_jxta);
+    register_dissector("jxta.stream", dissect_jxta_stream, proto_jxta);
 
     /* Register header fields */
     proto_register_field_array(proto_jxta, hf, array_length(hf));
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 2c1a8ee7f4..f8aa15675c 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -476,7 +476,7 @@ proto_register_k12(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_k12 = expert_register_protocol(proto_k12);
 	expert_register_field_array(expert_k12, ei, array_length(ei));
-	new_register_dissector("k12", dissect_k12, proto_k12);
+	register_dissector("k12", dissect_k12, proto_k12);
 
 	k12_uat = uat_new("K12 Protocols",
 			  sizeof(k12_handles_t),
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 4dd26095db..0cf44af2d8 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -441,7 +441,7 @@ proto_register_krb4(void)
 
 	proto_krb4 = proto_register_protocol("Kerberos v4",
 					     "KRB4", "krb4");
-	new_register_dissector("krb4", dissect_krb4, proto_krb4);
+	register_dissector("krb4", dissect_krb4, proto_krb4);
 	proto_register_field_array(proto_krb4, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c
index 4328815020..dc8f127ad8 100644
--- a/epan/dissectors/packet-knet.c
+++ b/epan/dissectors/packet-knet.c
@@ -756,9 +756,9 @@ proto_register_knet(void)
     /* Register protocols */
     proto_knet = proto_register_protocol ("kNet Protocol", "KNET", "knet");
 
-    knet_handle_sctp = new_register_dissector("knetsctp", dissect_knet_sctp, proto_knet);
-    knet_handle_tcp = new_register_dissector("knettcp",  dissect_knet_tcp, proto_knet);
-    knet_handle_udp = new_register_dissector("knetudp",  dissect_knet_udp, proto_knet);
+    knet_handle_sctp = register_dissector("knetsctp", dissect_knet_sctp, proto_knet);
+    knet_handle_tcp = register_dissector("knettcp",  dissect_knet_tcp, proto_knet);
+    knet_handle_udp = register_dissector("knetudp",  dissect_knet_udp, proto_knet);
 
     knet_module = prefs_register_protocol(proto_knet, proto_reg_handoff_knet);
 
diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c
index 064656871d..bcddbb0d18 100644
--- a/epan/dissectors/packet-kt.c
+++ b/epan/dissectors/packet-kt.c
@@ -780,7 +780,7 @@ proto_register_kt(void)
     };
 
     proto_kt = proto_register_protocol("Kyoto Tycoon Protocol", "Kyoto Tycoon", "kt");
-    new_register_dissector("kt", dissect_kt, proto_kt);
+    register_dissector("kt", dissect_kt, proto_kt);
     proto_register_field_array(proto_kt, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 910e2b0510..954a587f1a 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -214,7 +214,7 @@ proto_register_lapb(void)
     proto_register_field_array (proto_lapb, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("lapb", dissect_lapb, proto_lapb);
+    register_dissector("lapb", dissect_lapb, proto_lapb);
 }
 
 void
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index b3bcd4cf05..03c30cd7e8 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -728,7 +728,7 @@ proto_register_lapd(void)
 	expert_lapd = expert_register_protocol(proto_lapd);
 	expert_register_field_array(expert_lapd, ei, array_length(ei));
 
-	new_register_dissector("lapd", dissect_lapd, proto_lapd);
+	register_dissector("lapd", dissect_lapd, proto_lapd);
 
 	lapd_sapi_dissector_table = register_dissector_table("lapd.sapi",
 							     "LAPD SAPI", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
@@ -765,7 +765,7 @@ proto_reg_handoff_lapd(void)
 		dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_LAPD, lapd_handle);
 		heur_dissector_add("udp", dissect_udp_lapd, "LAPD over UDP", "lapd_udp", proto_lapd, HEURISTIC_ENABLE);
 
-		new_register_dissector("lapd-bitstream", dissect_lapd_bitstream, proto_lapd);
+		register_dissector("lapd-bitstream", dissect_lapd_bitstream, proto_lapd);
 		lapd_bitstream_handle = find_dissector("lapd-bitstream");
 		data_handle = find_dissector("data");
 
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index fffe40d43c..7e17810ac7 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -490,7 +490,7 @@ proto_register_lapdm(void)
     proto_register_field_array (proto_lapdm, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("lapdm", dissect_lapdm, proto_lapdm);
+    register_dissector("lapdm", dissect_lapdm, proto_lapdm);
 
     lapdm_sapi_dissector_table = register_dissector_table("lapdm.sapi", "LAPDm SAPI", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c
index 2146c8f388..9e34572a10 100644
--- a/epan/dissectors/packet-lapsat.c
+++ b/epan/dissectors/packet-lapsat.c
@@ -763,7 +763,7 @@ proto_register_lapsat(void)
 	proto_register_field_array (proto_lapsat, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("lapsat", dissect_lapsat, proto_lapsat);
+	register_dissector("lapsat", dissect_lapsat, proto_lapsat);
 
 	lapsat_sapi_dissector_table = register_dissector_table("lapsat.sapi", "LAPSat SAPI", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c
index 314c14b088..8e781a0074 100644
--- a/epan/dissectors/packet-lg8979.c
+++ b/epan/dissectors/packet-lg8979.c
@@ -1500,7 +1500,7 @@ proto_register_lg8979(void)
     proto_lg8979 = proto_register_protocol("Landis & Gyr Telegyr 8979", "L&G 8979", "lg8979");
 
     /* Registering protocol to be called by another dissector */
-    new_register_dissector("lg8979", dissect_lg8979_simple, proto_lg8979);
+    register_dissector("lg8979", dissect_lg8979_simple, proto_lg8979);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_lg8979, lg8979_hf, array_length(lg8979_hf));
diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c
index b24f763803..567d3e199e 100644
--- a/epan/dissectors/packet-link16.c
+++ b/epan/dissectors/packet-link16.c
@@ -284,7 +284,7 @@ void proto_register_link16(void)
     proto_link16 = proto_register_protocol("Link 16", "LINK16", "link16");
     proto_register_field_array(proto_link16, hf, array_length (hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("link16", dissect_link16, proto_link16);
+    register_dissector("link16", dissect_link16, proto_link16);
 }
 
 /*
diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c
index 220c06ecc7..3420b3487d 100644
--- a/epan/dissectors/packet-lisp-tcp.c
+++ b/epan/dissectors/packet-lisp-tcp.c
@@ -386,7 +386,7 @@ proto_register_lisp_tcp(void)
     expert_register_field_array(expert_lisp_tcp, ei, array_length(ei));
 
     /* Register dissector so that other dissectors can call it */
-    lisp_tcp_handle = new_register_dissector("lisp-tcp", dissect_lisp_tcp, proto_lisp_tcp);
+    lisp_tcp_handle = register_dissector("lisp-tcp", dissect_lisp_tcp, proto_lisp_tcp);
 }
 
 
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index cf0dcd4a5f..681fbdcbd1 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -3612,7 +3612,7 @@ proto_register_lisp(void)
     expert_register_field_array(expert_lisp, ei, array_length(ei));
 
     /* Register dissector so that other dissectors can call it */
-    lisp_handle = new_register_dissector("lisp", dissect_lisp, proto_lisp);
+    lisp_handle = register_dissector("lisp", dissect_lisp, proto_lisp);
 }
 
 
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index b9a0c951b0..0b39bb2e8d 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -857,7 +857,7 @@ proto_register_llc(void)
 	xid_subdissector_table = register_dissector_table("llc.xid_dsap",
 	  "LLC XID SAP", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-	new_register_dissector("llc", dissect_llc, proto_llc);
+	register_dissector("llc", dissect_llc, proto_llc);
 }
 
 void
@@ -884,7 +884,7 @@ proto_register_basicxid(void)
 	proto_register_field_array(proto_basicxid, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("basicxid", dissect_basicxid, proto_basicxid);
+	register_dissector("basicxid", dissect_basicxid, proto_basicxid);
 }
 
 static void
diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c
index 31a473b552..1f161ecdd2 100644
--- a/epan/dissectors/packet-logcat-text.c
+++ b/epan/dissectors/packet-logcat-text.c
@@ -348,19 +348,19 @@ void proto_register_logcat_text(void) {
     proto_register_field_array(proto_logcat_text, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    logcat_text_brief_handle =      new_register_dissector("logcat_text_brief",
+    logcat_text_brief_handle =      register_dissector("logcat_text_brief",
             dissect_logcat_text_brief, proto_logcat_text);
-    logcat_text_tag_handle =        new_register_dissector("logcat_text_tag",
+    logcat_text_tag_handle =        register_dissector("logcat_text_tag",
             dissect_logcat_text_tag, proto_logcat_text);
-    logcat_text_time_handle =       new_register_dissector("logcat_text_time",
+    logcat_text_time_handle =       register_dissector("logcat_text_time",
             dissect_logcat_text_time, proto_logcat_text);
-    logcat_text_process_handle =    new_register_dissector("logcat_text_process",
+    logcat_text_process_handle =    register_dissector("logcat_text_process",
             dissect_logcat_text_process, proto_logcat_text);
-    logcat_text_thread_handle =     new_register_dissector("logcat_text_thread",
+    logcat_text_thread_handle =     register_dissector("logcat_text_thread",
             dissect_logcat_text_thread, proto_logcat_text);
-    logcat_text_threadtime_handle = new_register_dissector("logcat_text_threadtime",
+    logcat_text_threadtime_handle = register_dissector("logcat_text_threadtime",
             dissect_logcat_text_threadtime, proto_logcat_text);
-    logcat_text_long_handle =       new_register_dissector("logcat_text_long",
+    logcat_text_long_handle =       register_dissector("logcat_text_long",
             dissect_logcat_text_long, proto_logcat_text);
 
     special_regex =    g_regex_new(SPECIAL_STRING,    G_REGEX_ANCHORED,  G_REGEX_MATCH_NOTEMPTY, NULL);
diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c
index 5801da9591..0905dddba8 100644
--- a/epan/dissectors/packet-logcat.c
+++ b/epan/dissectors/packet-logcat.c
@@ -287,7 +287,7 @@ proto_register_logcat(void)
     proto_logcat = proto_register_protocol("Android Logcat", "Logcat", "logcat");
     proto_register_field_array(proto_logcat, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    logcat_handle = new_register_dissector("logcat", dissect_logcat, proto_logcat);
+    logcat_handle = register_dissector("logcat", dissect_logcat, proto_logcat);
 
     expert_module = expert_register_protocol(proto_logcat);
     expert_register_field_array(expert_module, ei, array_length(ei));
diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c
index cc2922bd8a..f4ad5e1178 100644
--- a/epan/dissectors/packet-lwm.c
+++ b/epan/dissectors/packet-lwm.c
@@ -908,7 +908,7 @@ void proto_register_lwm(void)
             "128-bit decryption key in hexadecimal format", (const char **)&lwmes_key_str);
 
     /*  Register dissector with Wireshark. */
-    new_register_dissector("lwm", dissect_lwm, proto_lwm);
+    register_dissector("lwm", dissect_lwm, proto_lwm);
 
 } /* proto_register_lwm */
 
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index 93de068fa3..fe650a0bd1 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -576,7 +576,7 @@ proto_register_m2pa(void)
   expert_register_field_array(expert_m2pa, ei, array_length(ei));
 
   /* Allow other dissectors to find this one by name. */
-  new_register_dissector("m2pa", dissect_m2pa, proto_m2pa);
+  register_dissector("m2pa", dissect_m2pa, proto_m2pa);
 
   m2pa_module = prefs_register_protocol(proto_m2pa, proto_reg_handoff_m2pa);
 
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 81b36bb546..d7a60b4eec 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -2132,7 +2132,7 @@ proto_register_m3ua(void)
 
   /* Register the protocol name and description */
   proto_m3ua = proto_register_protocol("MTP 3 User Adaptation Layer", "M3UA",  "m3ua");
-  new_register_dissector("m3ua", dissect_m3ua, proto_m3ua);
+  register_dissector("m3ua", dissect_m3ua, proto_m3ua);
 
   m3ua_module = prefs_register_protocol(proto_m3ua, NULL);
   prefs_register_enum_preference(m3ua_module, "version", "M3UA Version", "Version used by Wireshark", &version, options, FALSE);
diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c
index 995878a9c6..4d671f2a2b 100644
--- a/epan/dissectors/packet-mac-lte-framed.c
+++ b/epan/dissectors/packet-mac-lte-framed.c
@@ -94,7 +94,7 @@ void proto_register_mac_lte_framed(void)
     proto_mac_lte_framed = proto_register_protocol("mac-lte-framed", "MAC-LTE-FRAMED", "mac-lte-framed");
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("mac-lte-framed", dissect_mac_lte_framed, proto_mac_lte_framed);
+    register_dissector("mac-lte-framed", dissect_mac_lte_framed, proto_mac_lte_framed);
 }
 
 /*
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index a4e89e6619..81df39f004 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -8154,7 +8154,7 @@ void proto_register_mac_lte(void)
     expert_register_field_array(expert_mac_lte, ei, array_length(ei));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("mac-lte", dissect_mac_lte, proto_mac_lte);
+    register_dissector("mac-lte", dissect_mac_lte, proto_mac_lte);
 
     /* Register the tap name */
     mac_lte_tap = register_tap("mac-lte");
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c
index f6a674fdfa..7c988a2f7e 100644
--- a/epan/dissectors/packet-mbim.c
+++ b/epan/dissectors/packet-mbim.c
@@ -7996,9 +7996,9 @@ proto_register_mbim(void)
     register_init_routine(mbim_reassembly_init);
     register_cleanup_routine(mbim_reassembly_cleanup);
 
-    new_register_dissector("mbim.control", dissect_mbim_control, proto_mbim);
-    new_register_dissector("mbim.descriptor", dissect_mbim_descriptor, proto_mbim);
-    new_register_dissector("mbim.bulk", dissect_mbim_bulk, proto_mbim);
+    register_dissector("mbim.control", dissect_mbim_control, proto_mbim);
+    register_dissector("mbim.descriptor", dissect_mbim_descriptor, proto_mbim);
+    register_dissector("mbim.bulk", dissect_mbim_bulk, proto_mbim);
     dss_dissector_table = register_dissector_table("mbim.dss_session_id",
         "MBIM DSS Session Id", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index 78ddbd3f84..cc887df9b5 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -1906,9 +1906,9 @@ proto_register_modbus(void)
     proto_modbus = proto_register_protocol("Modbus", "Modbus", "modbus");
 
     /* Registering protocol to be called by another dissector */
-    modbus_handle = new_register_dissector("modbus", dissect_modbus, proto_modbus);
-    mbtcp_handle = new_register_dissector("mbtcp", dissect_mbtcp, proto_mbtcp);
-    mbrtu_handle = new_register_dissector("mbrtu", dissect_mbrtu, proto_mbrtu);
+    modbus_handle = register_dissector("modbus", dissect_modbus, proto_modbus);
+    mbtcp_handle = register_dissector("mbtcp", dissect_mbtcp, proto_mbtcp);
+    mbrtu_handle = register_dissector("mbrtu", dissect_mbrtu, proto_mbrtu);
 
     /* Registering subdissectors table */
     modbus_data_dissector_table = register_dissector_table("modbus.data", "Modbus Data", FT_STRING, BASE_NONE, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c
index a62d70d39a..9daead7d85 100644
--- a/epan/dissectors/packet-media.c
+++ b/epan/dissectors/packet-media.c
@@ -100,7 +100,7 @@ proto_register_media(void)
         "Media",        /* short name */
         "media"         /* abbrev */
         );
-    new_register_dissector("media", dissect_media, proto_media);
+    register_dissector("media", dissect_media, proto_media);
     heur_subdissector_list = register_heur_dissector_list("media");
     proto_register_field_array(proto_media, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 3e9ea3c2f1..3954417b13 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -3718,7 +3718,7 @@ proto_register_megaco(void)
     proto_megaco = proto_register_protocol("MEGACO",
                                            "MEGACO", "megaco");
 
-    new_register_dissector("megaco", dissect_megaco_text, proto_megaco);
+    register_dissector("megaco", dissect_megaco_text, proto_megaco);
 
     proto_register_field_array(proto_megaco, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 00a596cfa2..3d1e12bb87 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -2113,8 +2113,8 @@ proto_register_memcache (void)
   expert_module_t *expert_memcache;
 
   proto_memcache = proto_register_protocol (PNAME, PSNAME, PFNAME);
-  memcache_tcp_handle = new_register_dissector ("memcache.tcp", dissect_memcache_tcp, proto_memcache);
-  memcache_udp_handle = new_register_dissector ("memcache.udp", dissect_memcache_udp, proto_memcache);
+  memcache_tcp_handle = register_dissector ("memcache.tcp", dissect_memcache_tcp, proto_memcache);
+  memcache_udp_handle = register_dissector ("memcache.udp", dissect_memcache_udp, proto_memcache);
 
   proto_register_field_array (proto_memcache, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index 21adb20a35..582881b79c 100644
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -98,7 +98,7 @@ proto_register_mesh(void)
   proto_register_field_array(proto_mesh, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("mesh", dissect_mesh, proto_mesh);
+  register_dissector("mesh", dissect_mesh, proto_mesh);
 }
 
 /*
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index aa968e8733..f5b91a493c 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -781,7 +781,7 @@ proto_register_meta(void)
     expert_module_t* expert_meta;
 
     proto_meta = proto_register_protocol("Metadata", "META", "meta");
-    new_register_dissector("meta", dissect_meta, proto_meta);
+    register_dissector("meta", dissect_meta, proto_meta);
 
     proto_register_field_array(proto_meta, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index f13a5b63ea..d9b5d0e9c7 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -2308,7 +2308,7 @@ void proto_register_mgcp(void)
 	register_init_routine(&mgcp_init_protocol);
 	register_cleanup_routine(&mgcp_cleanup_protocol);
 
-	new_register_dissector("mgcp", dissect_mgcp, proto_mgcp);
+	register_dissector("mgcp", dissect_mgcp, proto_mgcp);
 
 	/* Register our configuration options */
 	mgcp_module = prefs_register_protocol(proto_mgcp, proto_reg_handoff_mgcp);
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index 9955af94fc..5d2cfec5d2 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -1844,7 +1844,7 @@ proto_register_mikey(void)
 	proto_mikey = proto_register_protocol("Multimedia Internet KEYing",
 		"MIKEY", "mikey");
 
-	mikey_handle = new_register_dissector("mikey", dissect_mikey, proto_mikey);
+	mikey_handle = register_dissector("mikey", dissect_mikey, proto_mikey);
 
 	/* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array(proto_mikey, hf, array_length(hf));
diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c
index 5ee17abd3c..cf867ec7af 100644
--- a/epan/dissectors/packet-mime-encap.c
+++ b/epan/dissectors/packet-mime-encap.c
@@ -56,7 +56,7 @@ proto_register_mime_encap(void)
 {
 	proto_mime_encap = proto_register_protocol("MIME file", "MIME_FILE", "mime_dlt");
 
-	new_register_dissector("mime_dlt", dissect_mime_encap, proto_mime_encap);
+	register_dissector("mime_dlt", dissect_mime_encap, proto_mime_encap);
 	heur_subdissector_list = register_heur_dissector_list("wtap_file");
 }
 
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index aed4a37917..ef60769a67 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -306,7 +306,7 @@ void proto_register_miop (void) {
   expert_miop = expert_register_protocol(proto_miop);
   expert_register_field_array(expert_miop, ei, array_length(ei));
 
-  new_register_dissector("miop", dissect_miop, proto_miop);
+  register_dissector("miop", dissect_miop, proto_miop);
 
 }
 
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index d07f73a2e4..c1f4eda424 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -1462,7 +1462,7 @@ void proto_register_mip(void)
   proto_mip = proto_register_protocol("Mobile IP", "Mobile IP", "mip");
 
   /* Register the dissector by name */
-  new_register_dissector("mip", dissect_mip, proto_mip);
+  register_dissector("mip", dissect_mip, proto_mip);
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_mip, hf, array_length(hf));
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index c5e8b538d1..a6903ea8d9 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -5345,7 +5345,7 @@ proto_register_mip6(void)
     proto_mip6 = proto_register_protocol("Mobile IPv6 / Network Mobility", "MIPv6", "mipv6");
 
     /* Register the dissector by name */
-    /* new_register_dissector("mipv6", dissect_nemo, proto_nemo); */
+    /* register_dissector("mipv6", dissect_nemo, proto_nemo); */
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_mip6, hf, array_length(hf));
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c
index af6656ce42..c0eacb8115 100644
--- a/epan/dissectors/packet-mka.c
+++ b/epan/dissectors/packet-mka.c
@@ -758,7 +758,7 @@ proto_register_mka(void)
   };
 
   proto_mka = proto_register_protocol("MACsec Key Agreement", "EAPOL-MKA", "mka");
-  new_register_dissector("mka", dissect_mka, proto_mka);
+  register_dissector("mka", dissect_mka, proto_mka);
 
   proto_register_field_array(proto_mka, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index 9c21f16a03..9b520307eb 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -1032,7 +1032,7 @@ proto_register_mongo(void)
   proto_mongo = proto_register_protocol("Mongo Wire Protocol", "MONGO", "mongo");
 
   /* Allow dissector to find be found by name. */
-  new_register_dissector("mongo", dissect_mongo, proto_mongo);
+  register_dissector("mongo", dissect_mongo, proto_mongo);
 
   proto_register_field_array(proto_mongo, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 599ef0ed57..97fac2a5b1 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -1524,7 +1524,7 @@ proto_register_mp2t(void)
 
     proto_mp2t = proto_register_protocol("ISO/IEC 13818-1", "MP2T", "mp2t");
 
-    mp2t_handle = new_register_dissector("mp2t", dissect_mp2t, proto_mp2t);
+    mp2t_handle = register_dissector("mp2t", dissect_mp2t, proto_mp2t);
 
     proto_register_field_array(proto_mp2t, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 3990214316..29f7d4e3ff 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -1017,8 +1017,8 @@ proto_register_mp4ves(void)
 	expert_register_field_array(expert_mp4ves, ei, array_length(ei));
 	/* Register a configuration option for port */
 
-	new_register_dissector("mp4ves", dissect_mp4ves, proto_mp4ves);
-	new_register_dissector("mp4ves_config", dissect_mp4ves_config, proto_mp4ves);
+	register_dissector("mp4ves", dissect_mp4ves, proto_mp4ves);
+	register_dissector("mp4ves_config", dissect_mp4ves_config, proto_mp4ves);
 
 	/* Register a configuration option for port */
 	mp4ves_module = prefs_register_protocol(proto_mp4ves, proto_reg_handoff_mp4ves);
diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c
index 434a9f7827..24ca5d0da2 100644
--- a/epan/dissectors/packet-mpeg-dsmcc.c
+++ b/epan/dissectors/packet-mpeg-dsmcc.c
@@ -1206,7 +1206,7 @@ proto_register_dsmcc(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_dsmcc = expert_register_protocol(proto_dsmcc);
     expert_register_field_array(expert_dsmcc, ei, array_length(ei));
-    new_register_dissector("mp2t-dsmcc", dissect_dsmcc_ts, proto_dsmcc);
+    register_dissector("mp2t-dsmcc", dissect_dsmcc_ts, proto_dsmcc);
 
     dsmcc_module = prefs_register_protocol(proto_dsmcc, NULL);
 
diff --git a/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c
index 27465e083c..aa05030970 100644
--- a/epan/dissectors/packet-mpeg-pmt.c
+++ b/epan/dissectors/packet-mpeg-pmt.c
@@ -284,7 +284,7 @@ proto_register_mpeg_pmt(void)
     proto_register_field_array(proto_mpeg_pmt, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("mpeg_pmt", dissect_mpeg_pmt, proto_mpeg_pmt);
+    register_dissector("mpeg_pmt", dissect_mpeg_pmt, proto_mpeg_pmt);
 }
 
 
diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
index d49c3224f8..e2ccbe0380 100644
--- a/epan/dissectors/packet-mpeg-sect.c
+++ b/epan/dissectors/packet-mpeg-sect.c
@@ -363,7 +363,7 @@ proto_register_mpeg_sect(void)
     expert_module_t* expert_mpeg_sect;
 
     proto_mpeg_sect = proto_register_protocol("MPEG2 Section", "MPEG SECT", "mpeg_sect");
-    new_register_dissector("mpeg_sect", dissect_mpeg_sect, proto_mpeg_sect);
+    register_dissector("mpeg_sect", dissect_mpeg_sect, proto_mpeg_sect);
 
     proto_register_field_array(proto_mpeg_sect, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c
index e3215b4446..15b230f6ce 100644
--- a/epan/dissectors/packet-mpls-y1711.c
+++ b/epan/dissectors/packet-mpls-y1711.c
@@ -398,7 +398,7 @@ proto_register_mpls_y1711(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_mpls_y1711 = expert_register_protocol(proto_mpls_y1711);
     expert_register_field_array(expert_mpls_y1711, ei, array_length(ei));
-    new_register_dissector("mpls_y1711", dissect_mpls_y1711, proto_mpls_y1711);
+    register_dissector("mpls_y1711", dissect_mpls_y1711, proto_mpls_y1711);
 }
 
 void
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 00eac2da73..1e67b7afae 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -606,7 +606,7 @@ proto_register_mpls(void)
     expert_mpls = expert_register_protocol(proto_mpls);
     expert_register_field_array(expert_mpls, ei, array_length(ei));
 
-    new_register_dissector("mpls", dissect_mpls, proto_mpls);
+    register_dissector("mpls", dissect_mpls, proto_mpls);
 
     pw_ach_subdissector_table  = register_dissector_table("pwach.channel_type", "PW Associated Channel Type", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c
index e4a7ff2883..6be27631ca 100644
--- a/epan/dissectors/packet-mqtt.c
+++ b/epan/dissectors/packet-mqtt.c
@@ -577,7 +577,7 @@ void proto_register_mqtt(void)
   proto_mqtt = proto_register_protocol("MQ Telemetry Transport Protocol", "MQTT", "mqtt");
 
   /* Register the dissector */
-  mqtt_handle = new_register_dissector("mqtt", dissect_mqtt_data, proto_mqtt);
+  mqtt_handle = register_dissector("mqtt", dissect_mqtt_data, proto_mqtt);
 
   proto_register_field_array(proto_mqtt, hf_mqtt, array_length(hf_mqtt));
   proto_register_subtree_array(ett_mqtt, array_length(ett_mqtt));
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 04841d75f2..8db8a81044 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -1879,7 +1879,7 @@ void proto_register_msmms(void)
     proto_msmms = proto_register_protocol("Microsoft Media Server", "MSMMS", "msmms");
     proto_register_field_array(proto_msmms, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("msmms", dissect_msmms_pdu, proto_msmms);
+    register_dissector("msmms", dissect_msmms_pdu, proto_msmms);
 }
 
 void proto_reg_handoff_msmms_command(void)
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 0464c8037f..9a6508c587 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -912,7 +912,7 @@ proto_register_msrp(void)
      * Register the dissector by name, so other dissectors can
      * grab it by name rather than just referring to it directly.
      */
-    new_register_dissector("msrp", dissect_msrp, proto_msrp);
+    register_dissector("msrp", dissect_msrp, proto_msrp);
 }
 
 
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index c0c65cd8f1..6102d6d709 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -460,7 +460,7 @@ proto_register_mstp(void)
 	expert_mstp = expert_register_protocol(proto_mstp);
 	expert_register_field_array(expert_mstp, ei, array_length(ei));
 
-	new_register_dissector("mstp", dissect_mstp_wtap, proto_mstp);
+	register_dissector("mstp", dissect_mstp_wtap, proto_mstp);
 
 	subdissector_table = register_dissector_table("mstp.vendor_frame_type",
 	    "MSTP Vendor specific Frametypes", FT_UINT24, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 79a71d087f..447e2475ba 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -413,8 +413,8 @@ proto_register_mtp2(void)
   expert_module_t* expert_mtp2;
 
   proto_mtp2 = proto_register_protocol("Message Transfer Part Level 2", "MTP2", "mtp2");
-  mtp2_handle = new_register_dissector("mtp2", dissect_mtp2, proto_mtp2);
-  new_register_dissector("mtp2_with_crc", dissect_mtp2_with_crc, proto_mtp2);
+  mtp2_handle = register_dissector("mtp2", dissect_mtp2, proto_mtp2);
+  register_dissector("mtp2_with_crc", dissect_mtp2_with_crc, proto_mtp2);
 
   proto_register_field_array(proto_mtp2, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index 5a620a9121..965f26239c 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -1049,7 +1049,7 @@ proto_register_mtp3(void)
  /* Register the protocol name and description */
   proto_mtp3 = proto_register_protocol("Message Transfer Part Level 3",
                "MTP3", "mtp3");
-  mtp3_handle = new_register_dissector("mtp3", dissect_mtp3, proto_mtp3);
+  mtp3_handle = register_dissector("mtp3", dissect_mtp3, proto_mtp3);
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_mtp3, hf, array_length(hf));
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 14d77348ab..bcdec14976 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1399,7 +1399,7 @@ proto_register_mtp3mg(void)
     /* Register the protocol name and description */
     proto_mtp3mg = proto_register_protocol("Message Transfer Part Level 3 Management",
                                            "MTP3MG", "mtp3mg");
-    new_register_dissector("mtp3mg", dissect_mtp3mg, proto_mtp3mg);
+    register_dissector("mtp3mg", dissect_mtp3mg, proto_mtp3mg);
 
     /* Required calls to register the header fields and subtrees used */
     proto_register_field_array(proto_mtp3mg, hf, array_length(hf));
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 47d3afe642..8daf50275f 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -1424,7 +1424,7 @@ proto_register_mux27010 (void)
     proto_register_field_array (proto_mux27010, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
 
-    mux27010_handle = new_register_dissector("mux27010", dissect_mux27010, proto_mux27010);
+    mux27010_handle = register_dissector("mux27010", dissect_mux27010, proto_mux27010);
 
     expert_mux27010 = expert_register_protocol(proto_mux27010);
     expert_register_field_array(expert_mux27010, ei, array_length(ei));
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 77814670d4..591f8d76b5 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -3198,7 +3198,7 @@ void proto_register_mysql(void)
 				       "Whether the MySQL dissector should display the SQL query string in the INFO column.",
 				       &mysql_showquery);
 
-	 new_register_dissector("mysql", dissect_mysql, proto_mysql);
+	 register_dissector("mysql", dissect_mysql, proto_mysql);
 }
 
 /* dissector registration */
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index ee1999b31e..583c645780 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -5919,10 +5919,10 @@ proto_register_nas_eps(void)
     expert_register_field_array(expert_nas_eps, ei, array_length(ei));
 
     /* Register dissector */
-    new_register_dissector(PFNAME, dissect_nas_eps, proto_nas_eps);
+    register_dissector(PFNAME, dissect_nas_eps, proto_nas_eps);
 
     /* Register dissector */
-    new_register_dissector("nas-eps_plain", dissect_nas_eps_plain, proto_nas_eps);
+    register_dissector("nas-eps_plain", dissect_nas_eps_plain, proto_nas_eps);
 
     /* Register configuration options to always dissect as plain messages */
     nas_eps_module = prefs_register_protocol(proto_nas_eps, NULL);
diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c
index 2df90a5329..02bb8f2dd5 100644
--- a/epan/dissectors/packet-nasdaq-itch.c
+++ b/epan/dissectors/packet-nasdaq-itch.c
@@ -587,7 +587,7 @@ proto_register_nasdaq_itch(void)
                                  "Whether the Nasdaq ITCH dissector should decode Chi X extensions.",
                                  &nasdaq_itch_chi_x);
 
-  new_register_dissector("nasdaq-itch", dissect_nasdaq_itch, proto_nasdaq_itch);
+  register_dissector("nasdaq-itch", dissect_nasdaq_itch, proto_nasdaq_itch);
 }
 
 void
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c
index 27bb512a72..d910f57863 100644
--- a/epan/dissectors/packet-ndp.c
+++ b/epan/dissectors/packet-ndp.c
@@ -363,7 +363,7 @@ proto_register_ndp(void)
 	proto_register_field_array(proto_ndp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("ndp", dissect_ndp, proto_ndp);
+	register_dissector("ndp", dissect_ndp, proto_ndp);
 }
 
 void
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c
index eb8d63cdf7..0052c509a0 100644
--- a/epan/dissectors/packet-negoex.c
+++ b/epan/dissectors/packet-negoex.c
@@ -618,7 +618,7 @@ proto_register_negoex(void)
 
   /* negoex_module = prefs_register_protocol(proto_negoex, NULL);*/
 
-  new_register_dissector("negoex", dissect_negoex, proto_negoex);
+  register_dissector("negoex", dissect_negoex, proto_negoex);
 }
 
 void
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index 6882c86c04..80cbc84d5d 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -91,7 +91,7 @@ proto_register_newmail(void)
 	proto_register_field_array(proto_newmail, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("newmail", dissect_newmail, proto_newmail);
+	register_dissector("newmail", dissect_newmail, proto_newmail);
 
 	newmail_module = prefs_register_protocol(proto_newmail,
 						 proto_reg_handoff_newmail);
diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c
index 8feecd6440..ef62ed6e65 100644
--- a/epan/dissectors/packet-nflog.c
+++ b/epan/dissectors/packet-nflog.c
@@ -285,7 +285,7 @@ proto_register_nflog(void)
     proto_nflog = proto_register_protocol("Linux Netfilter NFLOG", "NFLOG", "nflog");
     hfi_nflog = proto_registrar_get_nth(proto_nflog);
 
-    new_register_dissector("nflog", dissect_nflog, proto_nflog);
+    register_dissector("nflog", dissect_nflog, proto_nflog);
 
     proto_register_fields(proto_nflog, hfi, array_length(hfi));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index 7c8a913cc8..b3bfb25f34 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -1652,7 +1652,7 @@ void proto_register_noe(void)
 
     proto_register_field_array(proto_noe, hf_noe, array_length(hf_noe));
 
-    new_register_dissector("noe", dissect_noe, proto_noe);
+    register_dissector("noe", dissect_noe, proto_noe);
 
     /* Common subtree array registration */
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 40bda18d0e..ac697ad508 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -1148,7 +1148,7 @@ proto_register_nsip(void)
   proto_register_field_array(proto_nsip, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("gprs_ns", dissect_nsip, proto_nsip);
+  register_dissector("gprs_ns", dissect_nsip, proto_nsip);
 
   /* Set default UDP ports */
   range_convert_str(&global_nsip_udp_port_range, DEFAULT_NSIP_PORT_RANGE, MAX_UDP_PORT);
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 4b7c2ef950..83221c50ec 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -3281,10 +3281,10 @@ proto_register_ntlmssp(void)
                                    "NT Password (used to decrypt payloads)",
                                    &gbl_nt_password);
 
-  new_register_dissector("ntlmssp", dissect_ntlmssp, proto_ntlmssp);
-  new_register_dissector("ntlmssp_payload", dissect_ntlmssp_payload, proto_ntlmssp);
-  new_register_dissector("ntlmssp_data_only", dissect_ntlmssp_payload_only, proto_ntlmssp);
-  new_register_dissector("ntlmssp_verf", dissect_ntlmssp_verf, proto_ntlmssp);
+  register_dissector("ntlmssp", dissect_ntlmssp, proto_ntlmssp);
+  register_dissector("ntlmssp_payload", dissect_ntlmssp_payload, proto_ntlmssp);
+  register_dissector("ntlmssp_data_only", dissect_ntlmssp_payload_only, proto_ntlmssp);
+  register_dissector("ntlmssp_verf", dissect_ntlmssp_verf, proto_ntlmssp);
 }
 
 void
diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c
index 8a75f8601d..082c4b4dbd 100644
--- a/epan/dissectors/packet-nwmtp.c
+++ b/epan/dissectors/packet-nwmtp.c
@@ -158,7 +158,7 @@ void proto_register_mwmtp(void)
 	proto_register_field_array(proto_nwmtp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	nwmtp_handle = new_register_dissector("nw_mtp", dissect_nwmtp, proto_nwmtp);
+	nwmtp_handle = register_dissector("nw_mtp", dissect_nwmtp, proto_nwmtp);
 }
 
 void proto_reg_handoff_nwmtp(void)
diff --git a/epan/dissectors/packet-nwp.c b/epan/dissectors/packet-nwp.c
index c84d2f17de..846b48d3cd 100644
--- a/epan/dissectors/packet-nwp.c
+++ b/epan/dissectors/packet-nwp.c
@@ -345,7 +345,7 @@ proto_register_nwp(void)
 		"NWP",
 	        "nwp");
 
-	new_register_dissector("nwp", dissect_nwp, proto_nwp);
+	register_dissector("nwp", dissect_nwp, proto_nwp);
 	proto_register_field_array(proto_nwp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c
index b7f9a2d9d6..06d271b265 100644
--- a/epan/dissectors/packet-openflow.c
+++ b/epan/dissectors/packet-openflow.c
@@ -159,7 +159,7 @@ proto_register_openflow(void)
     proto_openflow = proto_register_protocol("OpenFlow",
             "OpenFlow", "openflow");
 
-    new_register_dissector("openflow", dissect_openflow, proto_openflow);
+    register_dissector("openflow", dissect_openflow, proto_openflow);
 
     /* Required function calls to register the header fields and subtrees */
     proto_register_field_array(proto_openflow, hf, array_length(hf));
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c
index 437b3261e1..5945d7786c 100644
--- a/epan/dissectors/packet-openflow_v1.c
+++ b/epan/dissectors/packet-openflow_v1.c
@@ -1278,7 +1278,7 @@ proto_register_openflow_v1(void)
     proto_openflow_v1 = proto_register_protocol("OpenFlow 1.0",
             "openflow_v1", "openflow_v1");
 
-    new_register_dissector("openflow_v1", dissect_openflow_v1, proto_openflow_v1);
+    register_dissector("openflow_v1", dissect_openflow_v1, proto_openflow_v1);
 
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c
index 309f023997..194ab8e7ef 100644
--- a/epan/dissectors/packet-openflow_v4.c
+++ b/epan/dissectors/packet-openflow_v4.c
@@ -7864,7 +7864,7 @@ proto_register_openflow_v4(void)
     proto_openflow_v4 = proto_register_protocol("OpenFlow 1.3",
             "openflow_v4", "openflow_v4");
 
-    new_register_dissector("openflow_v4", dissect_openflow_v4, proto_openflow_v4);
+    register_dissector("openflow_v4", dissect_openflow_v4, proto_openflow_v4);
 
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c
index 5399ceda0d..b3c69e49e1 100644
--- a/epan/dissectors/packet-openflow_v5.c
+++ b/epan/dissectors/packet-openflow_v5.c
@@ -9816,7 +9816,7 @@ proto_register_openflow_v5(void)
     proto_openflow_v5 = proto_register_protocol("OpenFlow 1.4",
             "openflow_v5", "openflow_v5");
 
-    new_register_dissector("openflow_v5", dissect_openflow_v5, proto_openflow_v5);
+    register_dissector("openflow_v5", dissect_openflow_v5, proto_openflow_v5);
 
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index e523cedf9b..de2733c628 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -2817,9 +2817,9 @@ proto_register_opensafety(void)
                 &global_classify_transport);
 
     /* Registering default and ModBus/TCP dissector */
-    new_register_dissector("opensafety_udpdata", dissect_opensafety_udpdata, proto_opensafety );
-    new_register_dissector("opensafety_mbtcp", dissect_opensafety_mbtcp, proto_opensafety );
-    new_register_dissector("opensafety_pnio", dissect_opensafety_pn_io, proto_opensafety);
+    register_dissector("opensafety_udpdata", dissect_opensafety_udpdata, proto_opensafety );
+    register_dissector("opensafety_mbtcp", dissect_opensafety_mbtcp, proto_opensafety );
+    register_dissector("opensafety_pnio", dissect_opensafety_pn_io, proto_opensafety);
 }
 
 void
diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index ab1a260a51..c937968eed 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -610,8 +610,8 @@ proto_register_openvpn(void)
   proto_register_field_array(proto_openvpn, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  openvpn_udp_handle = new_register_dissector("openvpn.udp", dissect_openvpn_udp, proto_openvpn);
-  openvpn_tcp_handle = new_register_dissector("openvpn.tcp", dissect_openvpn_tcp, proto_openvpn);
+  openvpn_udp_handle = register_dissector("openvpn.udp", dissect_openvpn_udp, proto_openvpn);
+  openvpn_tcp_handle = register_dissector("openvpn.tcp", dissect_openvpn_tcp, proto_openvpn);
 
   register_init_routine(&openvpn_reassemble_init);
   register_cleanup_routine(&openvpn_reassemble_cleanup);
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 5d56fd6c9f..84ddab0f5c 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -2425,8 +2425,8 @@ void proto_register_cotp(void)
   cotp_heur_subdissector_list = register_heur_dissector_list("cotp");
 
   /* XXX - what about CLTP and proto_cltp? */
-  new_register_dissector("ositp", dissect_ositp, proto_cotp);
-  new_register_dissector("ositp_inactive", dissect_ositp_inactive, proto_cotp);
+  register_dissector("ositp", dissect_ositp, proto_cotp);
+  register_dissector("ositp_inactive", dissect_ositp_inactive, proto_cotp);
 
   register_init_routine(cotp_reassemble_init);
   register_cleanup_routine(cotp_reassemble_cleanup);
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index f81863b678..8f7f9c74b4 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1584,7 +1584,7 @@ void proto_register_p_mul (void)
 
   proto_p_mul = proto_register_protocol (PNAME, PSNAME, PFNAME);
 
-  p_mul_handle = new_register_dissector(PFNAME, dissect_p_mul, proto_p_mul);
+  p_mul_handle = register_dissector(PFNAME, dissect_p_mul, proto_p_mul);
 
   proto_register_field_array (proto_p_mul, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 42af360ba8..8acd90e82b 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -168,7 +168,7 @@ void proto_register_packetlogger (void)
 
   proto_packetlogger = proto_register_protocol (PNAME, PSNAME, PFNAME);
 
-  packetlogger_handle = new_register_dissector (PFNAME, dissect_packetlogger, proto_packetlogger);
+  packetlogger_handle = register_dissector (PFNAME, dissect_packetlogger, proto_packetlogger);
 
   proto_register_field_array (proto_packetlogger, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
diff --git a/epan/dissectors/packet-pcap_pktdata.c b/epan/dissectors/packet-pcap_pktdata.c
index b81194b013..4c87693d53 100644
--- a/epan/dissectors/packet-pcap_pktdata.c
+++ b/epan/dissectors/packet-pcap_pktdata.c
@@ -365,7 +365,7 @@ proto_register_pcap_pktdata(void)
     proto_register_field_array(proto_pcap_pktdata, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("pcap_pktdata", dissect_pcap_pktdata, proto_pcap_pktdata);
+    register_dissector("pcap_pktdata", dissect_pcap_pktdata, proto_pcap_pktdata);
 }
 
 void
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c
index 0997a653ba..f28ec7fb15 100644
--- a/epan/dissectors/packet-pcp.c
+++ b/epan/dissectors/packet-pcp.c
@@ -2586,7 +2586,7 @@ void proto_register_pcp(void)
     proto_register_field_array(proto_pcp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    pcp_handle = new_register_dissector("pcp", dissect_pcp, proto_pcp);
+    pcp_handle = register_dissector("pcp", dissect_pcp, proto_pcp);
 
     register_cleanup_routine(pcp_cleanup);
 }
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 158b3481d9..9fde6d508a 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -2602,7 +2602,7 @@ void proto_register_pdcp(void)
     expert_register_field_array(expert_pdcp_lte, ei, array_length(ei));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("pdcp-lte", dissect_pdcp_lte, proto_pdcp_lte);
+    register_dissector("pdcp-lte", dissect_pdcp_lte, proto_pdcp_lte);
 
     pdcp_lte_module = prefs_register_protocol(proto_pdcp_lte, NULL);
 
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c
index cd124e03fa..32766d97d2 100644
--- a/epan/dissectors/packet-peekremote.c
+++ b/epan/dissectors/packet-peekremote.c
@@ -680,7 +680,7 @@ proto_register_peekremote(void)
   expert_peekremote = expert_register_protocol(proto_peekremote);
   expert_register_field_array(expert_peekremote, ei, array_length(ei));
 
-  new_register_dissector("peekremote", dissect_peekremote_legacy, proto_peekremote);
+  register_dissector("peekremote", dissect_peekremote_legacy, proto_peekremote);
 }
 
 void
diff --git a/epan/dissectors/packet-pktap.c b/epan/dissectors/packet-pktap.c
index f1a3e95f97..f2158770ee 100644
--- a/epan/dissectors/packet-pktap.c
+++ b/epan/dissectors/packet-pktap.c
@@ -278,7 +278,7 @@ proto_register_pktap(void)
 	expert_pktap = expert_register_protocol(proto_pktap);
 	expert_register_field_array(expert_pktap, ei, array_length(ei));
 
-	pktap_handle = new_register_dissector("pktap", dissect_pktap, proto_pktap);
+	pktap_handle = register_dissector("pktap", dissect_pktap, proto_pktap);
 }
 
 void
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index f8a7948894..c2ab6c0e7b 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -448,7 +448,7 @@ proto_register_pop(void)
 
 
   proto_pop = proto_register_protocol("Post Office Protocol", "POP", "pop");
-  new_register_dissector("pop", dissect_pop, proto_pop);
+  register_dissector("pop", dissect_pop, proto_pop);
   proto_register_field_array(proto_pop, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
   register_init_routine (&pop_data_reassemble_init);
diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c
index 48a3b7397f..fea40f851b 100644
--- a/epan/dissectors/packet-ppcap.c
+++ b/epan/dissectors/packet-ppcap.c
@@ -658,7 +658,7 @@ module_t *ppcap_module;
 	proto_ppcap = proto_register_protocol("Proprietary PCAP", "PPCAP", "ppcap");
 	proto_register_field_array(proto_ppcap , hf , array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("ppcap", dissect_ppcap, proto_ppcap);
+	register_dissector("ppcap", dissect_ppcap, proto_ppcap);
 	ppcap_module = prefs_register_protocol(proto_ppcap, proto_reg_handoff_ppcap);
 	prefs_register_enum_preference(ppcap_module,"rev_doc","PPCAP, Select the document","Select Document",&global_ppcap_rev_doc,rev_doc,TRUE);
 
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index 54a56624e2..5148d3f876 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -530,7 +530,7 @@ proto_register_ppi_antenna(void) {
     proto_register_subtree_array(ett, array_length(ett));
     expert_ppi_antenna = expert_register_protocol(proto_ppi_antenna);
     expert_register_field_array(expert_ppi_antenna, ei, array_length(ei));
-    new_register_dissector("ppi_antenna", dissect_ppi_antenna, proto_ppi_antenna);
+    register_dissector("ppi_antenna", dissect_ppi_antenna, proto_ppi_antenna);
 
 }
 
diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c
index d1de54bc48..75bef2a306 100644
--- a/epan/dissectors/packet-ppi-gps.c
+++ b/epan/dissectors/packet-ppi-gps.c
@@ -614,7 +614,7 @@ proto_register_ppi_gps(void) {
     proto_register_subtree_array(ett, array_length(ett));
     expert_ppi_gps = expert_register_protocol(proto_ppi_gps);
     expert_register_field_array(expert_ppi_gps, ei, array_length(ei));
-    new_register_dissector("ppi_gps", dissect_ppi_gps, proto_ppi_gps);
+    register_dissector("ppi_gps", dissect_ppi_gps, proto_ppi_gps);
 }
 
 /*
diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c
index af86f0b9e0..aae1a354fe 100644
--- a/epan/dissectors/packet-ppi-sensor.c
+++ b/epan/dissectors/packet-ppi-sensor.c
@@ -547,7 +547,7 @@ proto_register_ppi_sensor(void) {
     proto_register_subtree_array(ett, array_length(ett));
     expert_ppi_sensor = expert_register_protocol(proto_ppi_sensor);
     expert_register_field_array(expert_ppi_sensor, ei, array_length(ei));
-    new_register_dissector("ppi_sensor", dissect_ppi_sensor, proto_ppi_sensor);
+    register_dissector("ppi_sensor", dissect_ppi_sensor, proto_ppi_sensor);
 
 }
 
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index f56cfd0855..ffb6c98f7f 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -1392,7 +1392,7 @@ proto_register_ppi_vector(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_ppi_vector = expert_register_protocol(proto_ppi_vector);
     expert_register_field_array(expert_ppi_vector, ei, array_length(ei));
-    new_register_dissector("ppi_vector", dissect_ppi_vector, proto_ppi_vector);
+    register_dissector("ppi_vector", dissect_ppi_vector, proto_ppi_vector);
 
 }
 
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 640840e3f0..d79a3b241a 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -1493,7 +1493,7 @@ proto_register_ppi(void)
     expert_ppi = expert_register_protocol(proto_ppi);
     expert_register_field_array(expert_ppi, ei, array_length(ei));
 
-    ppi_handle = new_register_dissector("ppi", dissect_ppi, proto_ppi);
+    ppi_handle = register_dissector("ppi", dissect_ppi, proto_ppi);
 
     register_init_routine(ampdu_reassemble_init);
     register_cleanup_routine(ampdu_reassemble_cleanup);
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 89425000fa..f533683258 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -5551,9 +5551,9 @@ proto_register_ppp(void)
     ppp_subdissector_table = register_dissector_table("ppp.protocol",
         "PPP protocol", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-    new_register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
-    new_register_dissector("ppp_lcp_options", dissect_lcp_options, proto_ppp);
-    new_register_dissector("ppp", dissect_ppp, proto_ppp);
+    register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
+    register_dissector("ppp_lcp_options", dissect_lcp_options, proto_ppp);
+    register_dissector("ppp", dissect_ppp, proto_ppp);
 
     /* Register the preferences for the ppp protocol */
     ppp_module = prefs_register_protocol(proto_ppp, NULL);
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 974cfadc27..5476ce05bd 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -1911,9 +1911,9 @@ proto_register_pw_atm_ata(void)
 
 	proto_register_subtree_array(ett_array, array_length(ett_array));
 
-	new_register_dissector("mpls_pw_atm_control_word"	,dissect_control_word	,proto_control_word);
-	new_register_dissector("mpls_pw_atm_cell"	,dissect_cell		,proto_cell);
-	new_register_dissector("mpls_pw_atm_cell_header",dissect_cell_header	,proto_cell_header);
+	register_dissector("mpls_pw_atm_control_word"	,dissect_control_word	,proto_control_word);
+	register_dissector("mpls_pw_atm_cell"	,dissect_cell		,proto_cell);
+	register_dissector("mpls_pw_atm_cell_header",dissect_cell_header	,proto_cell_header);
 	{
 		static const char description_allow_cw_length_nonzero[] =
 			"Enable to allow non-zero Length in Control Word."
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 1ed8a30d4a..2f5737843a 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -444,7 +444,7 @@ void proto_register_pw_cesopsn(void)
 	proto_register_subtree_array(ett_array, array_length(ett_array));
 	expert_pwcesopsn = expert_register_protocol(proto);
 	expert_register_field_array(expert_pwcesopsn, ei, array_length(ei));
-	new_register_dissector("pw_cesopsn_udp", dissect_pw_cesopsn_udp, proto);
+	register_dissector("pw_cesopsn_udp", dissect_pw_cesopsn_udp, proto);
 }
 
 
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index 96dc6ec78e..e1b1a0e071 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -120,7 +120,7 @@ void proto_register_pw_padding(void)
 	proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pw.padding");
 	proto_register_field_array(proto_pw_padding, hfpadding, array_length(hfpadding));
 	proto_register_subtree_array(ett_array, array_length(ett_array));
-	new_register_dissector("pw_padding", dissect_pw_padding, proto_pw_padding);
+	register_dissector("pw_padding", dissect_pw_padding, proto_pw_padding);
 }
 
 
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index 88cafa67be..27a26bcda0 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -192,7 +192,7 @@ proto_register_pw_eth(void)
                                 "pwethheuristic");
     proto_register_field_array(proto_pw_eth_cw, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("pw_eth_heuristic", dissect_pw_eth_heuristic,
+    register_dissector("pw_eth_heuristic", dissect_pw_eth_heuristic,
                        proto_pw_eth_heuristic);
 }
 
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 46b6a7295e..b35533f673 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -460,7 +460,7 @@ void proto_register_pw_satop(void)
 	proto_register_subtree_array(ett_array, array_length(ett_array));
 	expert_pwsatop = expert_register_protocol(proto);
 	expert_register_field_array(expert_pwsatop, ei, array_length(ei));
-	new_register_dissector("pw_satop_udp", dissect_pw_satop_udp, proto);
+	register_dissector("pw_satop_udp", dissect_pw_satop_udp, proto);
 	return;
 }
 
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index 7dd1c020e6..d8f5812363 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -2562,7 +2562,7 @@ proto_register_q2931(void)
 	expert_q2931 = expert_register_protocol(proto_q2931);
 	expert_register_field_array(expert_q2931, ei, array_length(ei));
 
-	new_register_dissector("q2931", dissect_q2931, proto_q2931);
+	register_dissector("q2931", dissect_q2931, proto_q2931);
 }
 
 /*
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 5410b46f60..70ae5fcf01 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -3966,13 +3966,13 @@ proto_register_q931(void)
     register_init_routine(q931_init);
     register_cleanup_routine(q931_cleanup);
 
-    q931_handle = new_register_dissector("q931", dissect_q931, proto_q931);
-    q931_tpkt_handle = new_register_dissector("q931.tpkt", dissect_q931_tpkt, proto_q931);
+    q931_handle = register_dissector("q931", dissect_q931, proto_q931);
+    q931_tpkt_handle = register_dissector("q931.tpkt", dissect_q931_tpkt, proto_q931);
     q931_tpkt_pdu_handle = create_dissector_handle(dissect_q931_tpkt_pdu,
         proto_q931);
-    q931_over_ip_handle = new_register_dissector("q931.over_ip", dissect_q931_over_ip, proto_q931);
-    new_register_dissector("q931.ie", dissect_q931_ie_cs0, proto_q931);
-    new_register_dissector("q931.ie.cs7", dissect_q931_ie_cs7, proto_q931);
+    q931_over_ip_handle = register_dissector("q931.over_ip", dissect_q931_over_ip, proto_q931);
+    register_dissector("q931.ie", dissect_q931_ie_cs0, proto_q931);
+    register_dissector("q931.ie.cs7", dissect_q931_ie_cs7, proto_q931);
 
     /* subdissector code */
     codeset_dissector_table = register_dissector_table("q931.codeset", "Q.931 Codeset", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index a322e67195..c734c90fe8 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -2233,7 +2233,7 @@ proto_register_q933(void)
 	expert_q933 = expert_register_protocol(proto_q933);
 	expert_register_field_array(expert_q933, ei, array_length(ei));
 
-	new_register_dissector("q933", dissect_q933, proto_q933);
+	register_dissector("q933", dissect_q933, proto_q933);
 }
 
 void
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index a6f6dcd292..3c6272f5e7 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -167,7 +167,7 @@ proto_register_qllc(void)
     proto_qllc = proto_register_protocol("Qualified Logical Link Control", "QLLC", "qllc");
     proto_register_field_array(proto_qllc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("qllc", dissect_qllc, proto_qllc);
+    register_dissector("qllc", dissect_qllc, proto_qllc);
 }
 
 void
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 6f5e2c148b..3332012339 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -2457,7 +2457,7 @@ proto_register_radius(void)
 	module_t *radius_module;
 
 	proto_radius = proto_register_protocol("RADIUS Protocol", "RADIUS", "radius");
-	new_register_dissector("radius", dissect_radius, proto_radius);
+	register_dissector("radius", dissect_radius, proto_radius);
 	register_init_routine(&radius_init_protocol);
 	register_cleanup_routine(&radius_cleanup_protocol);
 	radius_module = prefs_register_protocol(proto_radius, proto_reg_handoff_radius);
diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c
index 1a3d8ee4a7..b1c45b8f4e 100644
--- a/epan/dissectors/packet-raknet.c
+++ b/epan/dissectors/packet-raknet.c
@@ -649,7 +649,7 @@ proto_register_raknet(void)
     /*
      * Raknet subdissector for use by external protocols.
      */
-    new_register_dissector("raknet", dissect_raknet, proto_raknet);
+    register_dissector("raknet", dissect_raknet, proto_raknet);
 }
 
 void
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index b1cae79fe2..d537a83215 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -2779,7 +2779,7 @@ proto_register_rdm(void)
 			"RDM", "rdm");
 	proto_register_field_array(proto_rdm, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("rdm", dissect_rdm, proto_rdm);
+	register_dissector("rdm", dissect_rdm, proto_rdm);
 }
 
 /*
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c
index 3e77b1aa9c..f359770398 100644
--- a/epan/dissectors/packet-rdp.c
+++ b/epan/dissectors/packet-rdp.c
@@ -2921,7 +2921,7 @@ proto_register_rdp(void) {
   proto_register_field_array(proto_rdp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  /*   new_register_dissector("rdp", dissect_rdp, proto_rdp); */
+  /*   register_dissector("rdp", dissect_rdp, proto_rdp); */
 
   /* Register our configuration options for RDP, particularly our port */
 
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 9bc4511d4a..adac41b8fc 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -2161,7 +2161,7 @@ void proto_register_rdt(void)
     proto_register_subtree_array(ett, array_length(ett));
     expert_rdt = expert_register_protocol(proto_rdt);
     expert_register_field_array(expert_rdt, ei, array_length(ei));
-    new_register_dissector("rdt", dissect_rdt, proto_rdt);
+    register_dissector("rdt", dissect_rdt, proto_rdt);
 
     /* Preference settings */
     rdt_module = prefs_register_protocol(proto_rdt, proto_reg_handoff_rdt);
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 9e8b107016..38766db9a1 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -282,7 +282,7 @@ void proto_register_redbackli(void) {
 	proto_register_field_array(proto_redbackli, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("redbackli", redbackli_dissect, proto_redbackli);
+	register_dissector("redbackli", redbackli_dissect, proto_redbackli);
 }
 
 void proto_reg_handoff_redbackli(void) {
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c
index 290f09bae2..1af2757634 100644
--- a/epan/dissectors/packet-reload-framing.c
+++ b/epan/dissectors/packet-reload-framing.c
@@ -580,7 +580,7 @@ proto_register_reload_framing(void)
   expert_reload_framing = expert_register_protocol(proto_reload_framing);
   expert_register_field_array(expert_reload_framing, ei, array_length(ei));
 
-  new_register_dissector("reload-framing", dissect_reload_framing, proto_reload_framing);
+  register_dissector("reload-framing", dissect_reload_framing, proto_reload_framing);
 
 }
 
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 2477dbf903..54e04148d5 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -5888,7 +5888,7 @@ proto_register_reload(void)
 
   /* Register the protocol name and description */
   proto_reload = proto_register_protocol("REsource LOcation And Discovery", "RELOAD", "reload");
-  new_register_dissector("reload", dissect_reload_message, proto_reload);
+  register_dissector("reload", dissect_reload_message, proto_reload);
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_reload, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index f70dc9473d..fd8f4361d5 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -109,7 +109,7 @@ proto_register_retix_bpdu(void)
   proto_retix_bpdu = proto_register_protocol("Retix Spanning Tree Protocol", "R-STP", "r-stp");
   proto_register_field_array(proto_retix_bpdu, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  new_register_dissector("rbpdu", dissect_retix_bpdu, proto_retix_bpdu);
+  register_dissector("rbpdu", dissect_retix_bpdu, proto_retix_bpdu);
 }
 
 /*
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index ed61655bc1..e58b3ff582 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -522,7 +522,7 @@ proto_register_rfc2190(void)
         "RFC2190", "rfc2190");
 
     proto_register_field_array(proto_rfc2190, hf, array_length(hf));
-    new_register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190);
+    register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190);
 }
 
 /*
diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c
index 196c495444..5c4d673579 100644
--- a/epan/dissectors/packet-rfid-felica.c
+++ b/epan/dissectors/packet-rfid-felica.c
@@ -546,7 +546,7 @@ proto_register_felica(void)
     proto_register_field_array(proto_felica, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("felica", dissect_felica, proto_felica);
+    register_dissector("felica", dissect_felica, proto_felica);
 }
 
 /* Handler registration */
diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c
index 8be7f0fa5b..f526f4843b 100644
--- a/epan/dissectors/packet-rfid-mifare.c
+++ b/epan/dissectors/packet-rfid-mifare.c
@@ -191,7 +191,7 @@ proto_register_mifare(void)
     proto_register_field_array(proto_mifare, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("mifare", dissect_mifare, proto_mifare);
+    register_dissector("mifare", dissect_mifare, proto_mifare);
 }
 
 /*
diff --git a/epan/dissectors/packet-rfid-pn532-hci.c b/epan/dissectors/packet-rfid-pn532-hci.c
index 93c047a672..89f44ff442 100644
--- a/epan/dissectors/packet-rfid-pn532-hci.c
+++ b/epan/dissectors/packet-rfid-pn532-hci.c
@@ -264,7 +264,7 @@ proto_register_pn532_hci(void)
     };
 
     proto_pn532_hci = proto_register_protocol("NXP PN532 HCI", "PN532_HCI", "pn532_hci");
-    pn532_hci_handle = new_register_dissector("pn532_hci", dissect_pn532_hci, proto_pn532_hci);
+    pn532_hci_handle = register_dissector("pn532_hci", dissect_pn532_hci, proto_pn532_hci);
 
     proto_register_field_array(proto_pn532_hci, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c
index e932238d4d..41d1dd13a7 100644
--- a/epan/dissectors/packet-rfid-pn532.c
+++ b/epan/dissectors/packet-rfid-pn532.c
@@ -2327,7 +2327,7 @@ void proto_register_pn532(void)
     prefs_register_enum_preference(pref_mod, "prtype532", "Payload Type", "Protocol payload type",
         &sub_selected, sub_enum_vals, FALSE);
 
-    new_register_dissector("pn532", dissect_pn532, proto_pn532);
+    register_dissector("pn532", dissect_pn532, proto_pn532);
 }
 
 /* Handler registration */
diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index c49f2c8e11..53b619d46a 100644
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -132,7 +132,7 @@ proto_register_rgmp(void)
     proto_register_field_array(proto_rgmp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("rgmp", dissect_rgmp, proto_rgmp);
+    register_dissector("rgmp", dissect_rgmp, proto_rgmp);
 }
 
 void
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index e28a21c956..9ffb6bc68d 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -3518,7 +3518,7 @@ void proto_register_rlc_lte(void)
     expert_register_field_array(expert_rlc_lte, ei, array_length(ei));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("rlc-lte", dissect_rlc_lte, proto_rlc_lte);
+    register_dissector("rlc-lte", dissect_rlc_lte, proto_rlc_lte);
 
     /* Register the tap name */
     rlc_lte_tap = register_tap("rlc-lte");
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c
index e00d2cd741..80adde1539 100644
--- a/epan/dissectors/packet-rlc.c
+++ b/epan/dissectors/packet-rlc.c
@@ -2939,13 +2939,13 @@ proto_register_rlc(void)
     };
 
     proto_rlc = proto_register_protocol("Radio Link Control", "RLC", "rlc");
-    new_register_dissector("rlc.bcch",        dissect_rlc_bcch,        proto_rlc);
-    new_register_dissector("rlc.pcch",        dissect_rlc_pcch,        proto_rlc);
-    new_register_dissector("rlc.ccch",        dissect_rlc_ccch,        proto_rlc);
-    new_register_dissector("rlc.ctch",        dissect_rlc_ctch,        proto_rlc);
-    new_register_dissector("rlc.dcch",        dissect_rlc_dcch,        proto_rlc);
-    new_register_dissector("rlc.ps_dtch",     dissect_rlc_ps_dtch,     proto_rlc);
-    new_register_dissector("rlc.dch_unknown", dissect_rlc_dch_unknown, proto_rlc);
+    register_dissector("rlc.bcch",        dissect_rlc_bcch,        proto_rlc);
+    register_dissector("rlc.pcch",        dissect_rlc_pcch,        proto_rlc);
+    register_dissector("rlc.ccch",        dissect_rlc_ccch,        proto_rlc);
+    register_dissector("rlc.ctch",        dissect_rlc_ctch,        proto_rlc);
+    register_dissector("rlc.dcch",        dissect_rlc_dcch,        proto_rlc);
+    register_dissector("rlc.ps_dtch",     dissect_rlc_ps_dtch,     proto_rlc);
+    register_dissector("rlc.dch_unknown", dissect_rlc_dch_unknown, proto_rlc);
 
     proto_register_field_array(proto_rlc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 19e76f6ca4..90d3947b4a 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -249,7 +249,7 @@ proto_register_rmp(void)
 	proto_register_field_array(proto_rmp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("rmp", dissect_rmp, proto_rmp);
+	register_dissector("rmp", dissect_rmp, proto_rmp);
 }
 
 void
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index c77e8e65df..25f8a83069 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -184,7 +184,7 @@ void proto_register_alc(void)
 
     /* Register the protocol name and description */
     proto_rmt_alc = proto_register_protocol("Asynchronous Layered Coding", "ALC", "alc");
-    new_register_dissector("alc", dissect_alc, proto_rmt_alc);
+    register_dissector("alc", dissect_alc, proto_rmt_alc);
 
     /* Register the header fields and subtrees used */
     proto_register_field_array(proto_rmt_alc, hf_ptr, array_length(hf_ptr));
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index ece0ef0a1d..7089d98ad7 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -356,7 +356,7 @@ void proto_register_rmt_fec(void)
 
     /* Register the protocol name and description */
     proto_rmt_fec = proto_register_protocol("Forward Error Correction (FEC)", "RMT-FEC", "rmt-fec");
-    new_register_dissector("rmt-fec", dissect_fec, proto_rmt_fec);
+    register_dissector("rmt-fec", dissect_fec, proto_rmt_fec);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_rmt_fec, hf, array_length(hf));
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index f2223d36aa..0b8efd19af 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -693,7 +693,7 @@ proto_register_rmt_lct(void)
 
     /* Register the protocol name and description */
     proto_rmt_lct = proto_register_protocol("Layered Coding Transport", "RMT-LCT", "rmt-lct");
-    new_register_dissector("rmt-lct", dissect_lct, proto_rmt_lct);
+    register_dissector("rmt-lct", dissect_lct, proto_rmt_lct);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_rmt_lct, hf, array_length(hf));
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 655de03efc..2048ea164f 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -2977,7 +2977,7 @@ proto_register_rohc(void)
     /* Register the protocol name and description */
     proto_rohc = proto_register_protocol("RObust Header Compression (ROHC)", "ROHC", "rohc");
 
-    rohc_handle = new_register_dissector("rohc", dissect_rohc, proto_rohc);
+    rohc_handle = register_dissector("rohc", dissect_rohc, proto_rohc);
 
     register_init_routine(&rohc_init_protocol);
     register_cleanup_routine(&rohc_cleanup_protocol);
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 82365b2106..8f72931e60 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -4297,8 +4297,8 @@ proto_register_rpc(void)
 		"Whether the RPC dissector should attempt to locate RPC PDU boundaries when initial fragment alignment is not known.  This may cause false positives, or slow operation.",
 		&rpc_find_fragment_start);
 
-	new_register_dissector("rpc", dissect_rpc, proto_rpc);
-	new_register_dissector("rpc-tcp", dissect_rpc_tcp, proto_rpc);
+	register_dissector("rpc", dissect_rpc, proto_rpc);
+	register_dissector("rpc-tcp", dissect_rpc_tcp, proto_rpc);
 	rpc_tap = register_tap("rpc");
 
 	register_srt_table(proto_rpc, NULL, 1, rpcstat_packet, rpcstat_init, rpcstat_param);
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index ad3ceb5b8b..b1b598e481 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -1448,7 +1448,7 @@ proto_register_rpcap (void)
   expert_module_t* expert_rpcap;
 
   proto_rpcap = proto_register_protocol (PNAME, PSNAME, PFNAME);
-  new_register_dissector (PFNAME, dissect_rpcap, proto_rpcap);
+  register_dissector (PFNAME, dissect_rpcap, proto_rpcap);
   expert_rpcap = expert_register_protocol(proto_rpcap);
   expert_register_field_array(expert_rpcap, ei, array_length(ei));
 
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index b6eddcdbee..eeda6619e2 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -402,7 +402,7 @@ proto_register_rpl(void)
 	    "RPL", "rpl");
 	proto_register_field_array(proto_rpl, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("rpl", dissect_rpl, proto_rpl);
+	register_dissector("rpl", dissect_rpl, proto_rpl);
 }
 
 void
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 47ae3cacde..20ab9995ef 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -4451,7 +4451,7 @@ void proto_register_rsl(void)
     expert_rsl = expert_register_protocol(proto_rsl);
     expert_register_field_array(expert_rsl, ei, array_length(ei));
 
-    new_register_dissector("gsm_abis_rsl", dissect_rsl, proto_rsl);
+    register_dissector("gsm_abis_rsl", dissect_rsl, proto_rsl);
 
     rsl_module = prefs_register_protocol(proto_rsl, proto_reg_handoff_rsl);
     prefs_register_bool_preference(rsl_module, "use_ipaccess_rsl",
diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c
index dbf4621f35..b1be6e5916 100644
--- a/epan/dissectors/packet-rsvd.c
+++ b/epan/dissectors/packet-rsvd.c
@@ -830,7 +830,7 @@ proto_register_rsvd(void)
     proto_rsvd = proto_register_protocol("Remote Shared Virtual Disk",
             "RSVD", "rsvd");
 
-    new_register_dissector("rsvd", dissect_rsvd, proto_rsvd);
+    register_dissector("rsvd", dissect_rsvd, proto_rsvd);
     proto_register_field_array(proto_rsvd, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c
index bd33442042..9b9fdf7d7b 100644
--- a/epan/dissectors/packet-rtacser.c
+++ b/epan/dissectors/packet-rtacser.c
@@ -291,7 +291,7 @@ proto_register_rtacser(void)
     proto_rtacser = proto_register_protocol("RTAC Serial", "RTAC Serial", "rtacser");
 
     /* Registering protocol to be called by another dissector */
-    new_register_dissector("rtacser", dissect_rtacser, proto_rtacser);
+    register_dissector("rtacser", dissect_rtacser, proto_rtacser);
 
     subdissector_table = register_dissector_table("rtacser.data", "RTAC Serial Data Subdissector", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 92717e7808..05d01e5212 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -6507,7 +6507,7 @@ proto_register_rtcp(void)
     expert_rtcp = expert_register_protocol(proto_rtcp);
     expert_register_field_array(expert_rtcp, ei, array_length(ei));
 
-    new_register_dissector("rtcp", dissect_rtcp, proto_rtcp);
+    register_dissector("rtcp", dissect_rtcp, proto_rtcp);
 
     rtcp_module = prefs_register_protocol(proto_rtcp, NULL);
 
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 6a9e7072fd..808ef04ce0 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -492,7 +492,7 @@ proto_register_rtp_events(void)
 				    " that specifies Cisco Named Signaling Events", 10,
 				    &cisco_nse_pt_value);
 
-	new_register_dissector("rtpevent", dissect_rtp_events, proto_rtp_events);
+	register_dissector("rtpevent", dissect_rtp_events, proto_rtp_events);
 	rtp_event_tap = register_tap("rtpevent");
 }
 
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index 2e0c0c179e..aac6841c7d 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -10029,7 +10029,7 @@ proto_register_rtp_midi( void )
 
 	rtp_midi_module = prefs_register_protocol ( proto_rtp_midi, proto_reg_handoff_rtp_midi );
 	prefs_register_uint_preference ( rtp_midi_module, "midi_payload_type_value", "Payload Type for RFC 4695/6295 RTP-MIDI", "This is the value of the Payload Type field that specifies RTP-MIDI", 10, &rtp_midi_payload_type_value );
-	new_register_dissector( RTP_MIDI_DISSECTOR_ABBREVIATION, dissect_rtp_midi, proto_rtp_midi );
+	register_dissector( RTP_MIDI_DISSECTOR_ABBREVIATION, dissect_rtp_midi, proto_rtp_midi );
 }
 
 
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 67b39bd4de..768e104d80 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -2769,7 +2769,7 @@ proto_register_pkt_ccc(void)
     proto_register_field_array(proto_pkt_ccc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("pkt_ccc", dissect_pkt_ccc, proto_pkt_ccc);
+    register_dissector("pkt_ccc", dissect_pkt_ccc, proto_pkt_ccc);
 
     pkt_ccc_module = prefs_register_protocol(proto_pkt_ccc, proto_reg_handoff_pkt_ccc);
 
@@ -3666,8 +3666,8 @@ proto_register_rtp(void)
     expert_rtp = expert_register_protocol(proto_rtp);
     expert_register_field_array(expert_rtp, ei, array_length(ei));
 
-    new_register_dissector("rtp", dissect_rtp, proto_rtp);
-    new_register_dissector("rtp.rfc2198", dissect_rtp_rfc2198, proto_rtp);
+    register_dissector("rtp", dissect_rtp, proto_rtp);
+    register_dissector("rtp.rfc2198", dissect_rtp_rfc2198, proto_rtp);
 
     rtp_tap = register_tap("rtp");
 
@@ -3682,8 +3682,8 @@ proto_register_rtp(void)
     rtp_hdr_ext_rfc5285_dissector_table = register_dissector_table("rtp.ext.rfc5285.id",
                                     "RTP Generic header extension (RFC 5285)", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
-    new_register_dissector("rtp.ext.ed137", dissect_rtp_hdr_ext_ed137, proto_rtp);
-    new_register_dissector("rtp.ext.ed137a", dissect_rtp_hdr_ext_ed137a, proto_rtp);
+    register_dissector("rtp.ext.ed137", dissect_rtp_hdr_ext_ed137, proto_rtp);
+    register_dissector("rtp.ext.ed137a", dissect_rtp_hdr_ext_ed137a, proto_rtp);
 
     rtp_module = prefs_register_protocol(proto_rtp, proto_reg_handoff_rtp);
 
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index e45245f8b3..dd71c6850e 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -1464,7 +1464,7 @@ proto_register_rtsp(void)
     expert_register_field_array(expert_rtsp, ei, array_length(ei));
 
     /* Make this dissector findable by name */
-    new_register_dissector("rtsp", dissect_rtsp, proto_rtsp);
+    register_dissector("rtsp", dissect_rtsp, proto_rtsp);
 
     /* Register our configuration options, particularly our ports */
 
diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c
index c388af8728..4956675c27 100644
--- a/epan/dissectors/packet-s5066dts.c
+++ b/epan/dissectors/packet-s5066dts.c
@@ -1330,7 +1330,7 @@ void proto_register_s5066dts (void)
         proto_register_subtree_array(ett, array_length(ett));
         expert_s5066dts = expert_register_protocol(proto_s5066dts);
         expert_register_field_array(expert_s5066dts, ei, array_length(ei));
-        new_register_dissector(DISSECTOR_NAME, dissect_s5066dts_tcp, proto_s5066dts);
+        register_dissector(DISSECTOR_NAME, dissect_s5066dts_tcp, proto_s5066dts);
     }
 
     s5066dts_module = prefs_register_protocol(proto_s5066dts, proto_reg_handoff_s5066dts);
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c
index 7bea4f69df..ba2392ed3a 100644
--- a/epan/dissectors/packet-sbc.c
+++ b/epan/dissectors/packet-sbc.c
@@ -422,7 +422,7 @@ proto_register_sbc(void)
     expert_sbc = expert_register_protocol(proto_sbc);
     expert_register_field_array(expert_sbc, ei, array_length(ei));
 
-    new_register_dissector("sbc", dissect_sbc, proto_sbc);
+    register_dissector("sbc", dissect_sbc, proto_sbc);
 
     module = prefs_register_protocol(proto_sbc, NULL);
     prefs_register_static_text_preference(module, "a2dp.version",
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index aaf4649af5..c1a8567985 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -4076,7 +4076,7 @@ proto_register_sccp(void)
   proto_sccp = proto_register_protocol("Signalling Connection Control Part",
                                        "SCCP", "sccp");
 
-  new_register_dissector("sccp", dissect_sccp, proto_sccp);
+  register_dissector("sccp", dissect_sccp, proto_sccp);
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_sccp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c
index fd82703903..1e7d9772e5 100644
--- a/epan/dissectors/packet-scop.c
+++ b/epan/dissectors/packet-scop.c
@@ -375,8 +375,8 @@ void proto_register_scop(void)
                  10, &gPREF_scop_port_secured);
 
     /*  Register dissector with Wireshark. */
-    new_register_dissector("scop.udp", dissect_scop, proto_scop);
-    new_register_dissector("scop.tcp", dissect_scop_tcp, proto_scop);
+    register_dissector("scop.udp", dissect_scop, proto_scop);
+    register_dissector("scop.tcp", dissect_scop_tcp, proto_scop);
 } /* proto_register_scop() */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 19da2577ff..94cc64a8eb 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -5050,7 +5050,7 @@ proto_register_sctp(void)
   sctp_port_dissector_table = register_dissector_table("sctp.port", "SCTP port", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
   sctp_ppi_dissector_table  = register_dissector_table("sctp.ppi",  "SCTP payload protocol identifier", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
-  new_register_dissector("sctp", dissect_sctp, proto_sctp);
+  register_dissector("sctp", dissect_sctp, proto_sctp);
   sctp_heur_subdissector_list = register_heur_dissector_list("sctp");
 
   register_init_routine(sctp_init);
diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c
index fa8aa080dc..5604c5182b 100644
--- a/epan/dissectors/packet-sdh.c
+++ b/epan/dissectors/packet-sdh.c
@@ -277,7 +277,7 @@ proto_register_sdh(void)
     "Data rate",
     &sdh_data_rate, data_rates, ENC_BIG_ENDIAN);
 
-  new_register_dissector("sdh", dissect_sdh, proto_sdh);
+  register_dissector("sdh", dissect_sdh, proto_sdh);
 }
 
 void
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 8418746721..82b421090f 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -3096,7 +3096,7 @@ proto_register_sdp(void)
      * Register the dissector by name, so other dissectors can
      * grab it by name rather than just referring to it directly.
      */
-    new_register_dissector("sdp", dissect_sdp, proto_sdp);
+    register_dissector("sdp", dissect_sdp, proto_sdp);
 
     /* Register for tapping */
     sdp_tap = register_tap("sdp");
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c
index ff5e3ac802..0856a26c47 100644
--- a/epan/dissectors/packet-selfm.c
+++ b/epan/dissectors/packet-selfm.c
@@ -3018,7 +3018,7 @@ proto_register_selfm(void)
     proto_selfm = proto_register_protocol("SEL Protocol", "SEL Protocol", "selfm");
 
     /* Registering protocol to be called by another dissector */
-    new_register_dissector("selfm", dissect_selfm_simple, proto_selfm);
+    register_dissector("selfm", dissect_selfm_simple, proto_selfm);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_selfm, selfm_hf, array_length(selfm_hf));
diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c
index 8b3f88f2d7..b8214b7601 100644
--- a/epan/dissectors/packet-sercosiii.c
+++ b/epan/dissectors/packet-sercosiii.c
@@ -1619,7 +1619,7 @@ proto_register_sercosiii(void)
   proto_siii = proto_register_protocol("SERCOS III V1.1",
       "SERCOS III V1.1", "siii");
 
-  new_register_dissector("sercosiii", dissect_siii, proto_siii);
+  register_dissector("sercosiii", dissect_siii, proto_siii);
 
   /* subdissector code */
   heur_subdissector_list = register_heur_dissector_list("sercosiii");
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index 8605b1cd21..4c8b604adb 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -1905,7 +1905,7 @@ proto_register_ses(void)
 	 * (you can't refer to it directly from a plugin dissector
 	 * on Windows without stuffing it into the Big Transfer Vector).
 	 */
-	new_register_dissector("ses", dissect_ses, proto_ses);
+	register_dissector("ses", dissect_ses, proto_ses);
 }
 
 void
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c
index db8aabee09..31b108bb88 100644
--- a/epan/dissectors/packet-sgsap.c
+++ b/epan/dissectors/packet-sgsap.c
@@ -1681,7 +1681,7 @@ void proto_register_sgsap(void) {
     expert_register_field_array(expert_sgsap, ei, array_length(ei));
 
     /* Register dissector */
-    new_register_dissector(PFNAME, dissect_sgsap, proto_sgsap);
+    register_dissector(PFNAME, dissect_sgsap, proto_sgsap);
 
    /* Set default SCTP ports */
     range_convert_str(&global_sgsap_port_range, SGSAP_SCTP_PORT_RANGE, MAX_SCTP_PORT);
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index bb459eefba..d025f0a46a 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -6683,7 +6683,7 @@ proto_register_sigcomp(void)
     proto_raw_sigcomp = proto_register_protocol("Decompressed SigComp message as raw text",
                                                 "Raw_SigComp", "raw_sigcomp");
 
-    new_register_dissector("sigcomp", dissect_sigcomp, proto_sigcomp);
+    register_dissector("sigcomp", dissect_sigcomp, proto_sigcomp);
 
 /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_sigcomp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index a41df2b21d..4029f0fd95 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -6320,8 +6320,8 @@ void proto_register_sip(void)
                                         "SIP", "sip");
     proto_raw_sip = proto_register_protocol("Session Initiation Protocol (SIP as raw text)",
                                             "Raw_SIP", "raw_sip");
-    new_register_dissector("sip", dissect_sip, proto_sip);
-    new_register_dissector("sip.tcp", dissect_sip_tcp, proto_sip);
+    register_dissector("sip", dissect_sip, proto_sip);
+    register_dissector("sip.tcp", dissect_sip_tcp, proto_sip);
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_sip, hf, array_length(hf));
diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
index 07e85344ff..3a23dc29b5 100644
--- a/epan/dissectors/packet-sipfrag.c
+++ b/epan/dissectors/packet-sipfrag.c
@@ -115,7 +115,7 @@ void proto_register_sipfrag(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("sipfrag", dissect_sipfrag, proto_sipfrag);
+    register_dissector("sipfrag", dissect_sipfrag, proto_sipfrag);
 }
 
 void proto_reg_handoff_sipfrag(void)
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c
index 9f5bcf5b6e..b4b5b38299 100644
--- a/epan/dissectors/packet-sita.c
+++ b/epan/dissectors/packet-sita.c
@@ -379,7 +379,7 @@ proto_register_sita(void)
     sita_dissector_table = register_dissector_table("sita.proto", "SITA protocol number", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
     proto_register_field_array(proto_sita, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("sita", dissect_sita, proto_sita);
+    register_dissector("sita", dissect_sita, proto_sita);
 }
 
 void
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 0ff44096f8..732c5b5744 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -1107,9 +1107,9 @@ proto_register_smb_browse(void)
 	proto_register_field_array(proto_smb_browse, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("mailslot_browse", dissect_mailslot_browse,
+	register_dissector("mailslot_browse", dissect_mailslot_browse,
 	    proto_smb_browse);
-	new_register_dissector("mailslot_lanman", dissect_mailslot_lanman,
+	register_dissector("mailslot_lanman", dissect_mailslot_lanman,
 	    proto_smb_browse);
 }
 
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index 81e62f07c9..ec726ad223 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -1151,7 +1151,7 @@ proto_register_smb_logon( void)
 	proto_register_field_array(proto_smb_logon, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("smb_netlogon", dissect_smb_logon, proto_smb_logon);
+	register_dissector("smb_netlogon", dissect_smb_logon, proto_smb_logon);
 }
 
 /*
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 6bc28fd9ff..1792128e9b 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -20536,7 +20536,7 @@ proto_register_smb(void)
 	/* Register the tap for the "Export Object" function */
 	smb_eo_tap = register_tap("smb_eo"); /* SMB Export Object tap */
 
-	new_register_dissector("smb", dissect_smb, proto_smb);
+	register_dissector("smb", dissect_smb, proto_smb);
 
 	register_srt_table(proto_smb, NULL, 3, smbstat_packet, smbstat_init, NULL);
 }
diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smcr.c
index ef11b04f60..d7b4cecc5b 100644
--- a/epan/dissectors/packet-smcr.c
+++ b/epan/dissectors/packet-smcr.c
@@ -1423,7 +1423,7 @@ proto_register_smcr(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_smcr = proto_register_protocol("Shared Memory Communications - RDMA",
 	    "SMCR", "smcr");
-	smcr_tcp_handle = new_register_dissector("smcr", dissect_smcr_tcp, proto_smcr);
+	smcr_tcp_handle = register_dissector("smcr", dissect_smcr_tcp, proto_smcr);
 }
 
 void
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 6789868152..8918463cc1 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3765,7 +3765,7 @@ proto_register_smpp(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("smpp", dissect_smpp, proto_smpp);
+    register_dissector("smpp", dissect_smpp, proto_smpp);
 
     /* Register for tapping */
     smpp_tap = register_tap("smpp");
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 18af0abc61..9c13502ec9 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -1270,7 +1270,7 @@ proto_register_smtp(void)
   register_cleanup_routine (&smtp_data_reassemble_cleanup);
 
   /* Allow dissector to find be found by name. */
-  new_register_dissector("smtp", dissect_smtp, proto_smtp);
+  register_dissector("smtp", dissect_smtp, proto_smtp);
 
   /* Preferences */
   smtp_module = prefs_register_protocol(proto_smtp, NULL);
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 65af513555..5800896cc3 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -3484,11 +3484,11 @@ proto_register_sna(void)
 	    "SNA", "sna");
 	proto_register_field_array(proto_sna, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("sna", dissect_sna, proto_sna);
+	register_dissector("sna", dissect_sna, proto_sna);
 
 	proto_sna_xid = proto_register_protocol(
 	    "Systems Network Architecture XID", "SNA XID", "sna_xid");
-	new_register_dissector("sna_xid", dissect_sna_xid, proto_sna_xid);
+	register_dissector("sna_xid", dissect_sna_xid, proto_sna_xid);
 
 	sna_address_type = address_type_dissector_register("AT_SNA", "SNA Address", sna_fid_to_str_buf, sna_address_str_len, NULL, NULL, NULL, NULL);
 
diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c
index b8eb06f9e4..a8ec238f9b 100644
--- a/epan/dissectors/packet-sndcp-xid.c
+++ b/epan/dissectors/packet-sndcp-xid.c
@@ -864,7 +864,7 @@ proto_register_sndcp_xid(void)
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_sndcp_xid, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("sndcpxid", dissect_sndcp_xid, proto_sndcp_xid);
+    register_dissector("sndcpxid", dissect_sndcp_xid, proto_sndcp_xid);
 }
 
 /*
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 657cae264d..487222bbb4 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -560,7 +560,7 @@ proto_register_sndcp(void)
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_sndcp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  new_register_dissector("sndcp", dissect_sndcp, proto_sndcp);
+  register_dissector("sndcp", dissect_sndcp, proto_sndcp);
   register_init_routine(sndcp_defragment_init);
   register_cleanup_routine(sndcp_defragment_cleanup);
 }
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c
index 32d8e8a7ab..a16d4cf61d 100644
--- a/epan/dissectors/packet-spdy.c
+++ b/epan/dissectors/packet-spdy.c
@@ -1905,7 +1905,7 @@ void proto_register_spdy(void)
   expert_spdy = expert_register_protocol(proto_spdy);
   expert_register_field_array(expert_spdy, ei, array_length(ei));
 
-  new_register_dissector("spdy", dissect_spdy, proto_spdy);
+  register_dissector("spdy", dissect_spdy, proto_spdy);
 
   spdy_module = prefs_register_protocol(proto_spdy, NULL);
   prefs_register_bool_preference(spdy_module, "assemble_data_frames",
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c
index bb3c9616d1..9d3c7b39c0 100644
--- a/epan/dissectors/packet-sprt.c
+++ b/epan/dissectors/packet-sprt.c
@@ -3407,7 +3407,7 @@ proto_register_sprt(void)
     expert_register_field_array(expert_sprt, ei, array_length(ei));
 
     /* register the dissector */
-    new_register_dissector("sprt", dissect_sprt, proto_sprt);
+    register_dissector("sprt", dissect_sprt, proto_sprt);
 
     sprt_module = prefs_register_protocol(proto_sprt, NULL);
 
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index 844d8a7334..81a48201b6 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -186,7 +186,7 @@ void proto_register_ccsrl (void)
     proto_ccsrl = proto_register_protocol ("H.324/CCSRL", "CCSRL", "ccsrl");
     proto_register_field_array (proto_ccsrl, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
-    new_register_dissector("ccsrl", dissect_ccsrl, proto_ccsrl);
+    register_dissector("ccsrl", dissect_ccsrl, proto_ccsrl);
 }
 
 void proto_register_srp (void)
@@ -213,7 +213,7 @@ void proto_register_srp (void)
     proto_srp = proto_register_protocol ("H.324/SRP", "SRP", "srp");
     proto_register_field_array (proto_srp, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
-    new_register_dissector("srp", dissect_srp, proto_srp);
+    register_dissector("srp", dissect_srp, proto_srp);
 
     /* register our init routine to be called at the start of a capture,
        to clear out our hash tables etc */
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index a411844aa1..eb0f8147cb 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -124,7 +124,7 @@ proto_register_sscf(void)
   proto_register_field_array(proto_sscf, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("sscf-nni", dissect_sscf_nni, proto_sscf);
+  register_dissector("sscf-nni", dissect_sscf_nni, proto_sscf);
 
 }
 
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index eb2a12be04..67b2494bd1 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -440,7 +440,7 @@ proto_register_sscop(void)
   proto_register_field_array(proto_sscop, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  sscop_handle = new_register_dissector("sscop", dissect_sscop, proto_sscop);
+  sscop_handle = register_dissector("sscop", dissect_sscop, proto_sscop);
 
   sscop_module = prefs_register_protocol(proto_sscop, proto_reg_handoff_sscop);
 
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index b5041f750e..d0f6237be4 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -1391,7 +1391,7 @@ proto_register_ssh(void)
                        "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
                        &ssh_desegment);
 
-    ssh_handle = new_register_dissector("ssh", dissect_ssh, proto_ssh);
+    ssh_handle = register_dissector("ssh", dissect_ssh, proto_ssh);
 }
 
 void
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index b873d99c96..520c006b4e 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -4063,7 +4063,7 @@ proto_register_ssl(void)
     /* heuristic dissectors for any premable e.g. CredSSP before RDP */
     ssl_heur_subdissector_list = register_heur_dissector_list("ssl");
 
-    new_register_dissector("ssl", dissect_ssl, proto_ssl);
+    register_dissector("ssl", dissect_ssl, proto_ssl);
     ssl_handle = find_dissector("ssl");
 
     register_init_routine(ssl_init);
diff --git a/epan/dissectors/packet-sstp.c b/epan/dissectors/packet-sstp.c
index 25f8726861..9052a412cd 100644
--- a/epan/dissectors/packet-sstp.c
+++ b/epan/dissectors/packet-sstp.c
@@ -506,7 +506,7 @@ proto_register_sstp(void)
 
   proto_sstp = proto_register_protocol("Secure Socket Tunneling Protocol", "SSTP", "sstp");
 
-  new_register_dissector("sstp", dissect_sstp, proto_sstp);
+  register_dissector("sstp", dissect_sstp, proto_sstp);
   proto_register_field_array(proto_sstp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c
index 6ea7ed873a..54d247dfad 100644
--- a/epan/dissectors/packet-stanag4607.c
+++ b/epan/dissectors/packet-stanag4607.c
@@ -1634,7 +1634,7 @@ proto_register_stanag4607(void)
 	expert_4607 = expert_register_protocol(proto_stanag4607);
 	expert_register_field_array(expert_4607, ei, array_length(ei));
 
-	new_register_dissector("STANAG 4607", dissect_stanag4607, proto_stanag4607);
+	register_dissector("STANAG 4607", dissect_stanag4607, proto_stanag4607);
 	/* prefs_register_protocol(proto_stanag4607, proto_reg_handoff_stanag4607); */
 }
 
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 979896fa51..15f7572c44 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -1724,8 +1724,8 @@ proto_register_stun(void)
     /* heuristic subdissectors (used for the DATA field) */
     heur_subdissector_list = register_heur_dissector_list("stun");
 
-    new_register_dissector("stun-udp", dissect_stun_udp, proto_stun);
-    new_register_dissector("stun-heur", dissect_stun_heur, proto_stun);
+    register_dissector("stun-udp", dissect_stun_udp, proto_stun);
+    register_dissector("stun-heur", dissect_stun_heur, proto_stun);
 }
 
 void
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 4eaa38675b..871d6c610f 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -2454,7 +2454,7 @@ proto_register_sua(void)
 
   /* Register the protocol name and description */
   proto_sua = proto_register_protocol("SS7 SCCP-User Adaptation Layer", "SUA", "sua");
-  new_register_dissector("sua", dissect_sua, proto_sua);
+  register_dissector("sua", dissect_sua, proto_sua);
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_sua, hf, array_length(hf));
diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c
index 6f346903eb..4a33e2619d 100644
--- a/epan/dissectors/packet-sync.c
+++ b/epan/dissectors/packet-sync.c
@@ -297,7 +297,7 @@ proto_register_sync(void)
     expert_sync = expert_register_protocol(proto_sync);
     expert_register_field_array(expert_sync, ei, array_length(ei));
 
-    sync_handle = new_register_dissector("sync", dissect_sync, proto_sync);
+    sync_handle = register_dissector("sync", dissect_sync, proto_sync);
 }
 
 void
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index 473ed6adc8..7cfe86eeaa 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -562,7 +562,7 @@ proto_register_synergy(void)
 /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_synergy, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("synergy", dissect_synergy, proto_synergy);
+    register_dissector("synergy", dissect_synergy, proto_synergy);
 }
 
 void
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index c710dcd0a1..326217110c 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -1352,7 +1352,7 @@ void proto_register_synphasor(void)
 						  PROTOCOL_ABBREV);
 
 	/* Registering protocol to be called by another dissector */
-	synphasor_udp_handle = new_register_dissector("synphasor", dissect_udp, proto_synphasor);
+	synphasor_udp_handle = register_dissector("synphasor", dissect_udp, proto_synphasor);
 
 	proto_register_field_array(proto_synphasor, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c
index fe7fd8705e..ffe73a1e94 100644
--- a/epan/dissectors/packet-sysex.c
+++ b/epan/dissectors/packet-sysex.c
@@ -1412,7 +1412,7 @@ proto_register_sysex(void)
     expert_sysex = expert_register_protocol(proto_sysex);
     expert_register_field_array(expert_sysex, ei, array_length(ei));
 
-    new_register_dissector("sysex", dissect_sysex_command, proto_sysex);
+    register_dissector("sysex", dissect_sysex_command, proto_sysex);
 }
 
 /*
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index c250e60365..2ad5d68bba 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -346,7 +346,7 @@ void proto_register_syslog(void)
   proto_register_field_array(proto_syslog, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  syslog_handle = new_register_dissector("syslog", dissect_syslog, proto_syslog);
+  syslog_handle = register_dissector("syslog", dissect_syslog, proto_syslog);
 }
 
 void
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index 8db14d7df1..7062ec3e1e 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -1376,7 +1376,7 @@ proto_register_t30(void)
     expert_t30 = expert_register_protocol(proto_t30);
     expert_register_field_array(expert_t30, ei, array_length(ei));
 
-    new_register_dissector("t30.hdlc", dissect_t30_hdlc, proto_t30);
+    register_dissector("t30.hdlc", dissect_t30_hdlc, proto_t30);
 
 }
 
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 0550072efa..4708504dfc 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -204,7 +204,7 @@ proto_register_tali(void)
   proto_tali = proto_register_protocol("Transport Adapter Layer Interface v1.0, RFC 3094", "TALI", "tali");
   hfi_tali   = proto_registrar_get_nth(proto_tali);
 
-  new_register_dissector("tali", dissect_tali, proto_tali);
+  register_dissector("tali", dissect_tali, proto_tali);
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_fields(proto_tali, hfi, array_length(hfi));
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 6b271b3ab7..2ac33ebae4 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -616,7 +616,7 @@ proto_register_tapa(void)
 	proto_register_field_array(proto_tapa, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("tapa", dissect_tapa_static, proto_tapa);
+	register_dissector("tapa", dissect_tapa_static, proto_tapa);
 
 }
 
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 59604c271f..62f5c8c065 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -6515,7 +6515,7 @@ proto_register_tcp(void)
     expert_module_t* expert_mptcp;
 
     proto_tcp = proto_register_protocol("Transmission Control Protocol", "TCP", "tcp");
-    new_register_dissector("tcp", dissect_tcp, proto_tcp);
+    register_dissector("tcp", dissect_tcp, proto_tcp);
     proto_register_field_array(proto_tcp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
     expert_tcp = expert_register_protocol(proto_tcp);
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 65a5a6d0c8..2da77ed2a3 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -5591,7 +5591,7 @@ proto_register_tds(void)
     expert_register_field_array(expert_tds, ei, array_length(ei));
 
 /* Allow dissector to be found by name. */
-    tds_tcp_handle = new_register_dissector("tds", dissect_tds_message, proto_tds);
+    tds_tcp_handle = register_dissector("tds", dissect_tds_message, proto_tds);
 
     tds_module = prefs_register_protocol(proto_tds, NULL);
     prefs_register_bool_preference(tds_module, "desegment_buffers",
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 18d4f0ef25..fe662cf35d 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -2106,7 +2106,7 @@ proto_register_telnet(void)
   expert_telnet = expert_register_protocol(proto_telnet);
   expert_register_field_array(expert_telnet, ei, array_length(ei));
 
-  telnet_handle = new_register_dissector("telnet", dissect_telnet, proto_telnet);
+  telnet_handle = register_dissector("telnet", dissect_telnet, proto_telnet);
 }
 
 void
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index f550d31b60..85588baa7f 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -137,7 +137,7 @@ proto_register_text_lines(void)
 			"Line-based text data",	/* Long name */
 			"Line-based text data",	/* Short name */
 			"data-text-lines");		/* Filter name */
-	new_register_dissector("data-text-lines", dissect_text_lines, proto_text_lines);
+	register_dissector("data-text-lines", dissect_text_lines, proto_text_lines);
 }
 
 void
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 96f39bd758..2fdcc364f1 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -679,7 +679,7 @@ proto_register_tftp(void)
   expert_tftp = expert_register_protocol(proto_tftp);
   expert_register_field_array(expert_tftp, ei, array_length(ei));
 
-  new_register_dissector("tftp", dissect_tftp, proto_tftp);
+  register_dissector("tftp", dissect_tftp, proto_tftp);
 
   /* Set default UDP ports */
   range_convert_str(&global_tftp_port_range, UDP_PORT_TFTP_RANGE, MAX_UDP_PORT);
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index 7bacc6b272..b25ed61fae 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -434,7 +434,7 @@ void proto_register_thrift(void) {
     proto_register_subtree_array(ett, array_length(ett));
 
     /* register dissector */
-    /*new_register_dissector("thrift", dissect_thrift, proto_thrift); */
+    /*register_dissector("thrift", dissect_thrift, proto_thrift); */
 }
 
 void proto_reg_handoff_thrift(void) {
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index 5b5b771120..6ce80e2812 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -3037,7 +3037,7 @@ proto_register_tipc(void)
 	tipc_heur_subdissector_list = register_heur_dissector_list("tipc");
 
 	/* Register by name */
-	new_register_dissector("tipc", dissect_tipc, proto_tipc);
+	register_dissector("tipc", dissect_tipc, proto_tipc);
 
 	register_init_routine(tipc_defragment_init);
 	register_cleanup_routine(tipc_defragment_cleanup);
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index b7fbabc150..8d062df9c9 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -7666,7 +7666,7 @@ proto_register_tn3270(void)
   expert_module_t* expert_tn3270;
 
   proto_tn3270 = proto_register_protocol("TN3270 Protocol", "TN3270", "tn3270");
-  new_register_dissector("tn3270", dissect_tn3270, proto_tn3270);
+  register_dissector("tn3270", dissect_tn3270, proto_tn3270);
   proto_register_field_array(proto_tn3270, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
   expert_tn3270 = expert_register_protocol(proto_tn3270);
diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c
index fd06a13c64..f0fdc55e02 100644
--- a/epan/dissectors/packet-tn5250.c
+++ b/epan/dissectors/packet-tn5250.c
@@ -7546,7 +7546,7 @@ proto_register_tn5250(void)
   expert_module_t* expert_tn5250;
 
   proto_tn5250 = proto_register_protocol("TN5250 Protocol", "TN5250", "tn5250");
-  new_register_dissector("tn5250", dissect_tn5250, proto_tn5250);
+  register_dissector("tn5250", dissect_tn5250, proto_tn5250);
   proto_register_field_array(proto_tn5250, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
   expert_tn5250 = expert_register_protocol(proto_tn5250);
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index f5e7341faf..0265b76462 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -820,7 +820,7 @@ proto_register_tnef(void)
   expert_register_field_array(expert_tnef, ei, array_length(ei));
 
   /* Allow dissector to find be found by name. */
-  tnef_handle = new_register_dissector(PFNAME, dissect_tnef, proto_tnef);
+  tnef_handle = register_dissector(PFNAME, dissect_tnef, proto_tnef);
 
 }
 
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index ed39b39be0..f844af5196 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -640,7 +640,7 @@ proto_register_tpkt(void)
     proto_tpkt_ptr = find_protocol_by_id(proto_tpkt);
     proto_register_field_array(proto_tpkt, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("tpkt", dissect_tpkt, proto_tpkt);
+    register_dissector("tpkt", dissect_tpkt, proto_tpkt);
 
     tpkt_module = prefs_register_protocol(proto_tpkt, NULL);
     prefs_register_bool_preference(tpkt_module, "desegment",
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index 9bd255341d..ff264b7873 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -834,7 +834,7 @@ void proto_register_tpncp(void) {
         proto_register_subtree_array(ett, array_length(ett));
     }
 
-    tpncp_handle = new_register_dissector("tpncp", dissect_tpncp, proto_tpncp);
+    tpncp_handle = register_dissector("tpncp", dissect_tpncp, proto_tpncp);
 
     tpncp_module = prefs_register_protocol(proto_tpncp, proto_reg_handoff_tpncp);
 
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 85c9b5a049..3264304212 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -799,7 +799,7 @@ proto_register_tr(void)
 	    "Whether Linux mangling of the link-layer header should be checked for and worked around",
 	    &fix_linux_botches);
 
-	new_register_dissector("tr", dissect_tr, proto_tr);
+	register_dissector("tr", dissect_tr, proto_tr);
 	tr_tap=register_tap("tr");
 
 	register_conversation_table(proto_tr, TRUE, tr_conversation_packet, tr_hostlist_packet);
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index ab4cba8ffa..b4cbb954f4 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -692,7 +692,7 @@ proto_register_trmac(void)
 	expert_trmac = expert_register_protocol(proto_trmac);
 	expert_register_field_array(expert_trmac, ei, array_length(ei));
 
-	new_register_dissector("trmac", dissect_trmac, proto_trmac);
+	register_dissector("trmac", dissect_trmac, proto_trmac);
 }
 
 /*
diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c
index 370e393bac..82130f26bb 100644
--- a/epan/dissectors/packet-tte-pcf.c
+++ b/epan/dissectors/packet-tte-pcf.c
@@ -203,7 +203,7 @@ proto_register_tte_pcf(void)
     proto_register_field_array(proto_tte_pcf, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("tte_pcf", dissect_tte_pcf, proto_tte_pcf);
+    register_dissector("tte_pcf", dissect_tte_pcf, proto_tte_pcf);
 
 }
 
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 3d1ef1c3ac..2a4ef2684d 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -329,7 +329,7 @@ void proto_register_turbocell(void)
                                               "Turbocell Aggregate Data", "turbocell_aggregate");
     proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields));
 
-    new_register_dissector("turbocell", dissect_turbocell, proto_turbocell);
+    register_dissector("turbocell", dissect_turbocell, proto_turbocell);
 
     proto_register_field_array(proto_turbocell, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index 25ff88553f..c876a96053 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -185,7 +185,7 @@ proto_register_turnchannel(void)
 	proto_turnchannel = proto_register_protocol("TURN Channel",
 	    "TURNCHANNEL", "turnchannel");
 
-	new_register_dissector("turnchannel", dissect_turnchannel_message,
+	register_dissector("turnchannel", dissect_turnchannel_message,
 			   proto_turnchannel);
 
 /* subdissectors */
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index fa001a74ac..bdc481d6bc 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -534,7 +534,7 @@ proto_register_tzsp(void)
     proto_register_field_array(proto_tzsp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    tzsp_handle = new_register_dissector("tzsp", dissect_tzsp, proto_tzsp);
+    tzsp_handle = register_dissector("tzsp", dissect_tzsp, proto_tzsp);
 }
 
 void
diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c
index 976ed171cd..74ce58af65 100644
--- a/epan/dissectors/packet-ua.c
+++ b/epan/dissectors/packet-ua.c
@@ -269,8 +269,8 @@ void proto_register_ua_msg(void)
     /* UA dissector registration */
     proto_ua_msg = proto_register_protocol("Universal Alcatel Protocol", "UA", "ua");
 
-    new_register_dissector("ua_sys_to_term", dissect_ua_sys_to_term, proto_ua_msg);
-    new_register_dissector("ua_term_to_sys", dissect_ua_term_to_sys, proto_ua_msg);
+    register_dissector("ua_sys_to_term", dissect_ua_sys_to_term, proto_ua_msg);
+    register_dissector("ua_term_to_sys", dissect_ua_term_to_sys, proto_ua_msg);
 
     /* Common subtree array registration */
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c
index 08ee5472db..f1fb094d50 100644
--- a/epan/dissectors/packet-ua3g.c
+++ b/epan/dissectors/packet-ua3g.c
@@ -4531,7 +4531,7 @@ proto_register_ua3g(void)
 
     proto_register_field_array(proto_ua3g, hf, array_length(hf));
 
-    new_register_dissector("ua3g", dissect_ua3g, proto_ua3g);
+    register_dissector("ua3g", dissect_ua3g, proto_ua3g);
 
     /* Common subtree array registration */
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c
index 44439757c0..24b2de558b 100644
--- a/epan/dissectors/packet-uasip.c
+++ b/epan/dissectors/packet-uasip.c
@@ -445,7 +445,7 @@ void proto_register_uasip(void)
     };
 
     proto_uasip = proto_register_protocol("UA/SIP Protocol", "UASIP", "uasip");
-    uasip_handle = new_register_dissector("uasip", dissect_uasip, proto_uasip);
+    uasip_handle = register_dissector("uasip", dissect_uasip, proto_uasip);
 
     proto_register_field_array(proto_uasip, hf_uasip, array_length(hf_uasip));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c
index fea7a9235d..158b6137bd 100644
--- a/epan/dissectors/packet-uaudp.c
+++ b/epan/dissectors/packet-uaudp.c
@@ -592,11 +592,11 @@ void proto_register_uaudp(void)
                           "UAUDP",
                           "uaudp");
 
-    uaudp_handle = new_register_dissector("uaudp", dissect_uaudp, proto_uaudp);
+    uaudp_handle = register_dissector("uaudp", dissect_uaudp, proto_uaudp);
 #if 0 /* XXX: Not used ?? */
-    new_register_dissector("uaudp_dir_unknown",  dissect_uaudp_dir_unknown,  proto_uaudp);
-    new_register_dissector("uaudp_term_to_serv", dissect_uaudp_term_to_serv, proto_uaudp);
-    new_register_dissector("uaudp_serv_to_term", dissect_uaudp_serv_to_term, proto_uaudp);
+    register_dissector("uaudp_dir_unknown",  dissect_uaudp_dir_unknown,  proto_uaudp);
+    register_dissector("uaudp_term_to_serv", dissect_uaudp_term_to_serv, proto_uaudp);
+    register_dissector("uaudp_serv_to_term", dissect_uaudp_serv_to_term, proto_uaudp);
 #endif
 
     proto_register_field_array(proto_uaudp, hf_uaudp, array_length(hf_uaudp));
diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c
index 809b4c63c4..c9420622e9 100644
--- a/epan/dissectors/packet-ubertooth.c
+++ b/epan/dissectors/packet-ubertooth.c
@@ -3468,7 +3468,7 @@ proto_register_ubertooth(void)
     proto_ubertooth = proto_register_protocol("Ubertooth", "UBERTOOTH", "ubertooth");
     proto_register_field_array(proto_ubertooth, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    ubertooth_handle = new_register_dissector("ubertooth", dissect_ubertooth, proto_ubertooth);
+    ubertooth_handle = register_dissector("ubertooth", dissect_ubertooth, proto_ubertooth);
 
     expert_module = expert_register_protocol(proto_ubertooth);
     expert_register_field_array(expert_module, ei, array_length(ei));
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index d948458d97..f85bc460f1 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -1077,7 +1077,7 @@ proto_register_udp(void)
   proto_udp = proto_register_protocol("User Datagram Protocol",
                                       "UDP", "udp");
   hfi_udp = proto_registrar_get_nth(proto_udp);
-  udp_handle = new_register_dissector("udp", dissect_udp, proto_udp);
+  udp_handle = register_dissector("udp", dissect_udp, proto_udp);
   expert_udp = expert_register_protocol(proto_udp);
   proto_register_fields(proto_udp, hfi, array_length(hfi));
 
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index ae926f50b1..558d7bd8cc 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -2305,8 +2305,8 @@ proto_register_uma(void)
 /* Register the protocol name and description */
 	proto_uma = proto_register_protocol("Unlicensed Mobile Access","UMA", "uma");
 	/* subdissector code */
-	new_register_dissector("umatcp", dissect_uma_tcp, proto_uma);
-	new_register_dissector("umaudp", dissect_uma_urlc_udp, proto_uma);
+	register_dissector("umatcp", dissect_uma_tcp, proto_uma);
+	register_dissector("umaudp", dissect_uma_urlc_udp, proto_uma);
 
 /* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array(proto_uma, hf, array_length(hf));
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 123e0925ce..6c8bc56700 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -5578,7 +5578,7 @@ void proto_register_fp(void)
     expert_register_field_array(expert_fp, ei, array_length(ei));
 
     /* Allow other dissectors to find this one by name. */
-    new_register_dissector("fp", dissect_fp, proto_fp);
+    register_dissector("fp", dissect_fp, proto_fp);
 
     /* Preferences */
     fp_module = prefs_register_protocol(proto_fp, NULL);
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c
index 99844bfdce..2751738c74 100644
--- a/epan/dissectors/packet-umts_mac.c
+++ b/epan/dissectors/packet-umts_mac.c
@@ -1468,13 +1468,13 @@ proto_register_umts_mac(void)
     expert_umts_mac = expert_register_protocol(proto_umts_mac);
     expert_register_field_array(expert_umts_mac, ei, array_length(ei));
 
-    new_register_dissector("mac.fdd.rach", dissect_mac_fdd_rach, proto_umts_mac);
-    new_register_dissector("mac.fdd.fach", dissect_mac_fdd_fach, proto_umts_mac);
-    new_register_dissector("mac.fdd.pch", dissect_mac_fdd_pch, proto_umts_mac);
-    new_register_dissector("mac.fdd.dch", dissect_mac_fdd_dch, proto_umts_mac);
-    new_register_dissector("mac.fdd.edch", dissect_mac_fdd_edch, proto_umts_mac);
-    new_register_dissector("mac.fdd.edch.type2", dissect_mac_fdd_edch_type2, proto_umts_mac);
-    new_register_dissector("mac.fdd.hsdsch", dissect_mac_fdd_hsdsch, proto_umts_mac);
+    register_dissector("mac.fdd.rach", dissect_mac_fdd_rach, proto_umts_mac);
+    register_dissector("mac.fdd.fach", dissect_mac_fdd_fach, proto_umts_mac);
+    register_dissector("mac.fdd.pch", dissect_mac_fdd_pch, proto_umts_mac);
+    register_dissector("mac.fdd.dch", dissect_mac_fdd_dch, proto_umts_mac);
+    register_dissector("mac.fdd.edch", dissect_mac_fdd_edch, proto_umts_mac);
+    register_dissector("mac.fdd.edch.type2", dissect_mac_fdd_edch_type2, proto_umts_mac);
+    register_dissector("mac.fdd.hsdsch", dissect_mac_fdd_hsdsch, proto_umts_mac);
 
     register_init_routine(mac_init);
     register_cleanup_routine(mac_cleanup);
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index db1a55afd0..88c7e9a33d 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -638,7 +638,7 @@ proto_register_usb_audio(void)
     register_init_routine(&midi_data_reassemble_init);
     register_cleanup_routine(&midi_data_reassemble_cleanup);
 
-    new_register_dissector("usbaudio", dissect_usb_audio_bulk, proto_usb_audio);
+    register_dissector("usbaudio", dissect_usb_audio_bulk, proto_usb_audio);
 }
 
 void
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index 0779f3daca..25e0b9738b 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -738,7 +738,7 @@ proto_register_ccid(void)
     prefs_register_enum_preference(pref_mod, "prtype", "PC -> Reader Payload Type", "How commands from the PC to the reader are interpreted",
         &sub_selected, sub_enum_vals, FALSE);
 
-    usb_ccid_handle = new_register_dissector("usbccid", dissect_ccid, proto_ccid);
+    usb_ccid_handle = register_dissector("usbccid", dissect_ccid, proto_ccid);
 }
 
 /* Handler registration */
diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c
index 56cb2a5dcc..4c7d90eb64 100644
--- a/epan/dissectors/packet-usb-dfu.c
+++ b/epan/dissectors/packet-usb-dfu.c
@@ -554,7 +554,7 @@ proto_register_usb_dfu(void)
     proto_usb_dfu = proto_register_protocol("USB Device Firmware Upgrade ", "USB DFU", "usbdfu");
     proto_register_field_array(proto_usb_dfu, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    usb_dfu_handle = new_register_dissector("usb_dfu", dissect_usb_dfu, proto_usb_dfu);
+    usb_dfu_handle = register_dissector("usb_dfu", dissect_usb_dfu, proto_usb_dfu);
 
     expert_module = expert_register_protocol(proto_usb_dfu);
     expert_register_field_array(expert_module, ei, array_length(ei));
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index 29175c5b3e..e2b66749f8 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -1956,9 +1956,9 @@ proto_register_usb_hid(void)
     proto_register_field_array(proto_usb_hid, hf, array_length(hf));
     proto_register_subtree_array(usb_hid_subtrees, array_length(usb_hid_subtrees));
 
-    /*usb_hid_boot_keyboard_input_report_handle  =*/ new_register_dissector("usbhid.boot_report.keyboard.input",  dissect_usb_hid_boot_keyboard_input_report,  proto_usb_hid);
-    /*usb_hid_boot_keyboard_output_report_handle =*/ new_register_dissector("usbhid.boot_report.keyboard.output", dissect_usb_hid_boot_keyboard_output_report, proto_usb_hid);
-    /*usb_hid_boot_mouse_input_report_handle     =*/ new_register_dissector("usbhid.boot_report.mouse.input",     dissect_usb_hid_boot_mouse_input_report,     proto_usb_hid);
+    /*usb_hid_boot_keyboard_input_report_handle  =*/ register_dissector("usbhid.boot_report.keyboard.input",  dissect_usb_hid_boot_keyboard_input_report,  proto_usb_hid);
+    /*usb_hid_boot_keyboard_output_report_handle =*/ register_dissector("usbhid.boot_report.keyboard.output", dissect_usb_hid_boot_keyboard_output_report, proto_usb_hid);
+    /*usb_hid_boot_mouse_input_report_handle     =*/ register_dissector("usbhid.boot_report.mouse.input",     dissect_usb_hid_boot_mouse_input_report,     proto_usb_hid);
 
 }
 
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 094e34762f..d80cd0647b 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -451,7 +451,7 @@ proto_register_usb_ms(void)
     proto_register_field_array(proto_usb_ms, hf, array_length(hf));
     proto_register_subtree_array(usb_ms_subtrees, array_length(usb_ms_subtrees));
 
-    new_register_dissector("usbms", dissect_usb_ms_bulk, proto_usb_ms);
+    register_dissector("usbms", dissect_usb_ms_bulk, proto_usb_ms);
 }
 
 void
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 12991cc4f9..59b2d2ebab 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -4513,7 +4513,7 @@ proto_register_usb(void)
     proto_usb = proto_register_protocol("USB", "USB", "usb");
     proto_register_field_array(proto_usb, hf, array_length(hf));
     proto_register_subtree_array(usb_subtrees, array_length(usb_subtrees));
-    linux_usb_handle = new_register_dissector("usb", dissect_linux_usb, proto_usb);
+    linux_usb_handle = register_dissector("usb", dissect_linux_usb, proto_usb);
 
     expert_usb = expert_register_protocol(proto_usb);
     expert_register_field_array(expert_usb, ei, array_length(ei));
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 3d008c678a..46534c356d 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -294,7 +294,7 @@ void proto_register_user_encap(void)
                       encaps_uat);
 
 
-    new_register_dissector("user_dlt",dissect_user,proto_user_encap);
+    register_dissector("user_dlt",dissect_user,proto_user_encap);
 
     /*
     prefs_register_protocol_obsolete(proto_register_protocol("DLT User A","DLT_USER_A","user_dlt_a"));
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c
index 1a09b1979b..9f4621d2ea 100644
--- a/epan/dissectors/packet-uts.c
+++ b/epan/dissectors/packet-uts.c
@@ -368,7 +368,7 @@ proto_register_uts(void)
 	proto_uts = proto_register_protocol("Unisys Transmittal System", "UTS", "uts");		/* name, short name, abbrev */
 	proto_register_field_array(proto_uts, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("uts", dissect_uts, proto_uts);
+	register_dissector("uts", dissect_uts, proto_uts);
 }
 
 /*
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index 9cf30f9dfb..9d0a4468ca 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -330,7 +330,7 @@ proto_register_v120(void)
 	proto_register_field_array (proto_v120, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("v120", dissect_v120, proto_v120);
+	register_dissector("v120", dissect_v120, proto_v120);
 }
 
 void
diff --git a/epan/dissectors/packet-v150fw.c b/epan/dissectors/packet-v150fw.c
index 44b0926b8d..3cd2ea0adf 100644
--- a/epan/dissectors/packet-v150fw.c
+++ b/epan/dissectors/packet-v150fw.c
@@ -797,7 +797,7 @@ proto_register_v150fw(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* register the dissector */
-    new_register_dissector("v150fw", dissect_v150fw, proto_v150fw);
+    register_dissector("v150fw", dissect_v150fw, proto_v150fw);
 }
 
 /*
diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c
index 9fa7435ead..ec79b2b8f0 100644
--- a/epan/dissectors/packet-v52.c
+++ b/epan/dissectors/packet-v52.c
@@ -2404,7 +2404,7 @@ proto_register_v52(void)
     proto_register_field_array (proto_v52, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("v52", dissect_v52, proto_v52);
+    register_dissector("v52", dissect_v52, proto_v52);
 }
 
 /*
diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c
index 0879082c19..1b8baec234 100644
--- a/epan/dissectors/packet-v5dl.c
+++ b/epan/dissectors/packet-v5dl.c
@@ -428,7 +428,7 @@ proto_register_v5dl(void)
 	proto_register_field_array (proto_v5dl, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("v5dl", dissect_v5dl, proto_v5dl);
+	register_dissector("v5dl", dissect_v5dl, proto_v5dl);
 }
 
 void
diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c
index be314ae6ac..b688cc5353 100644
--- a/epan/dissectors/packet-v5ef.c
+++ b/epan/dissectors/packet-v5ef.c
@@ -185,7 +185,7 @@ proto_register_v5ef(void)
 	proto_register_field_array (proto_v5ef, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("v5ef", dissect_v5ef, proto_v5ef);
+	register_dissector("v5ef", dissect_v5ef, proto_v5ef);
 
 }
 
diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c
index 94fb321878..a7b4ef8d3e 100644
--- a/epan/dissectors/packet-vcdu.c
+++ b/epan/dissectors/packet-vcdu.c
@@ -639,7 +639,7 @@ proto_register_vcdu(void)
     expert_register_field_array(expert_vcdu, ei, array_length(ei));
 
     /* XX: Does this dissector need to be publicly registered ?? */
-    vcdu_handle = new_register_dissector("vcdu", dissect_vcdu, proto_vcdu);
+    vcdu_handle = register_dissector("vcdu", dissect_vcdu, proto_vcdu);
 
     vcdu_module = prefs_register_protocol(proto_vcdu, vcdu_prefs_apply_cb);
 
diff --git a/epan/dissectors/packet-vp8.c b/epan/dissectors/packet-vp8.c
index 1388fbe4ff..c2ac54b7cb 100644
--- a/epan/dissectors/packet-vp8.c
+++ b/epan/dissectors/packet-vp8.c
@@ -580,7 +580,7 @@ proto_register_vp8(void)
                             "; Values must be in the range 96 - 127",
                             &temp_dynamic_payload_type_range, 127);
 
-    new_register_dissector("vp8", dissect_vp8, proto_vp8);
+    register_dissector("vp8", dissect_vp8, proto_vp8);
 }
 
 static void
diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c
index f7baecebc6..93dfb1364a 100644
--- a/epan/dissectors/packet-vuze-dht.c
+++ b/epan/dissectors/packet-vuze-dht.c
@@ -1429,7 +1429,7 @@ proto_register_vuze_dht(void)
   proto_register_field_array(proto_vuze_dht, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  vuze_dht_handle = new_register_dissector("vuze-dht", dissect_vuze_dht, proto_vuze_dht);
+  vuze_dht_handle = register_dissector("vuze-dht", dissect_vuze_dht, proto_vuze_dht);
 
   /* Register our configuration options */
   vuze_dht_module = prefs_register_protocol(proto_vuze_dht, proto_reg_handoff_vuze_dht);
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index efcbef7e48..b8918d7960 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -1374,7 +1374,7 @@ proto_register_wai(void)
     proto_register_field_array(proto_wai, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    wai_handle = new_register_dissector("wai", dissect_wai, proto_wai);
+    wai_handle = register_dissector("wai", dissect_wai, proto_wai);
 }
 
 void
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 8f44d5a46d..d89b97daf5 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -8120,8 +8120,8 @@ proto_register_wbxml(void)
 				       "dissected (and visualized) then.",
 				       &disable_wbxml_token_parsing);
 
-	new_register_dissector("wbxml", dissect_wbxml, proto_wbxml);
-	new_register_dissector("wbxml-uaprof", dissect_uaprof, proto_wbxml);
+	register_dissector("wbxml", dissect_wbxml, proto_wbxml);
+	register_dissector("wbxml-uaprof", dissect_uaprof, proto_wbxml);
 }
 
 
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c
index 0d86807311..e856723595 100644
--- a/epan/dissectors/packet-websocket.c
+++ b/epan/dissectors/packet-websocket.c
@@ -541,7 +541,7 @@ proto_register_websocket(void)
   expert_websocket = expert_register_protocol(proto_websocket);
   expert_register_field_array(expert_websocket, ei, array_length(ei));
 
-  new_register_dissector("websocket", dissect_websocket, proto_websocket);
+  register_dissector("websocket", dissect_websocket, proto_websocket);
 
   websocket_module = prefs_register_protocol(proto_websocket, proto_reg_handoff_websocket);
 
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 90e7cb322a..6ba9c59859 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -98,7 +98,7 @@ proto_register_wfleet_hdlc(void)
   proto_register_field_array(proto_wfleet_hdlc, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("wfleet_hdlc", dissect_wfleet_hdlc, proto_wfleet_hdlc);
+  register_dissector("wfleet_hdlc", dissect_wfleet_hdlc, proto_wfleet_hdlc);
 
 }
 
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 025f5b6479..1669634ccb 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7161,8 +7161,8 @@ proto_register_wsp(void)
     expert_wsp = expert_register_protocol(proto_wsp);
     expert_register_field_array(expert_wsp, ei, array_length(ei));
 
-    new_register_dissector("wsp-co", dissect_wsp_fromwap_co, proto_wsp);
-    new_register_dissector("wsp-cl", dissect_wsp_fromwap_cl, proto_wsp);
+    register_dissector("wsp-co", dissect_wsp_fromwap_co, proto_wsp);
+    register_dissector("wsp-cl", dissect_wsp_fromwap_cl, proto_wsp);
     heur_subdissector_list = register_heur_dissector_list("wsp");
 
     wsp_fromudp_handle = create_dissector_handle(dissect_wsp_fromudp,
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 70bf8ec26a..9051f6294b 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -1060,8 +1060,8 @@ proto_register_wtp(void)
     proto_register_field_array(proto_wtp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("wtp-wtls", dissect_wtp_fromwtls, proto_wtp);
-    new_register_dissector("wtp-udp", dissect_wtp_fromudp, proto_wtp);
+    register_dissector("wtp-wtls", dissect_wtp_fromwtls, proto_wtp);
+    register_dissector("wtp-udp", dissect_wtp_fromudp, proto_wtp);
     register_init_routine(wtp_defragment_init);
     register_cleanup_routine(wtp_defragment_cleanup);
 }
diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index eb54134f49..106a1a2e55 100644
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -309,7 +309,7 @@ proto_register_x224(void)
 	proto_x224 = proto_register_protocol("ITU-T Rec X.224", "X.224", "x224");
 	proto_register_field_array(proto_x224, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("x224", dissect_x224, proto_x224);
+	register_dissector("x224", dissect_x224, proto_x224);
 
 }
 
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index f02f1f858f..69bd4f438b 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -2373,8 +2373,8 @@ proto_register_x25(void)
         "X.25 secondary protocol identifier", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
     x25_heur_subdissector_list = register_heur_dissector_list("x.25");
 
-    new_register_dissector("x.25_dir", dissect_x25_dir, proto_x25);
-    new_register_dissector("x.25", dissect_x25, proto_x25);
+    register_dissector("x.25_dir", dissect_x25_dir, proto_x25);
+    register_dissector("x.25", dissect_x25, proto_x25);
 
     /* Preferences */
     x25_module = prefs_register_protocol(proto_x25, NULL);
diff --git a/epan/dissectors/packet-xip-serval.c b/epan/dissectors/packet-xip-serval.c
index aadb88f174..b47b275527 100644
--- a/epan/dissectors/packet-xip-serval.c
+++ b/epan/dissectors/packet-xip-serval.c
@@ -401,7 +401,7 @@ proto_register_xip_serval(void)
 		"XIP Serval",
 		"XIP Serval",
 	        "xipserval");
-	new_register_dissector("xipserval", dissect_xip_serval,
+	register_dissector("xipserval", dissect_xip_serval,
 		proto_xip_serval);
 	proto_register_field_array(proto_xip_serval, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c
index ab1d191be8..c11e2fe9b6 100644
--- a/epan/dissectors/packet-xip.c
+++ b/epan/dissectors/packet-xip.c
@@ -683,7 +683,7 @@ proto_register_xip(void)
 		"XIP",
 	        "xip");
 
-	new_register_dissector("xip", dissect_xip, proto_xip);
+	register_dissector("xip", dissect_xip, proto_xip);
 	proto_register_field_array(proto_xip, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 41239ed389..1f13abc1e2 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -1451,7 +1451,7 @@ proto_register_xml(void)
 
     g_array_free(ett_arr, TRUE);
 
-    new_register_dissector("xml", dissect_xml, xml_ns.hf_tag);
+    register_dissector("xml", dissect_xml, xml_ns.hf_tag);
 
     init_xml_parser();
 
diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c
index 550ef19b74..0447484abe 100644
--- a/epan/dissectors/packet-xmpp.c
+++ b/epan/dissectors/packet-xmpp.c
@@ -1473,7 +1473,7 @@ proto_register_xmpp(void) {
     expert_xmpp = expert_register_protocol(proto_xmpp);
     expert_register_field_array(expert_xmpp, ei, array_length(ei));
 
-    xmpp_handle = new_register_dissector("xmpp", dissect_xmpp, proto_xmpp);
+    xmpp_handle = register_dissector("xmpp", dissect_xmpp, proto_xmpp);
 
     xmpp_init_parsers();
 }
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index 915563d5ae..d8c3766125 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -428,7 +428,7 @@ proto_register_xot(void)
    proto_xot = proto_register_protocol("X.25 over TCP", "XOT", "xot");
    proto_register_field_array(proto_xot, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
-   xot_handle = new_register_dissector("xot", dissect_xot_tcp_heur, proto_xot);
+   xot_handle = register_dissector("xot", dissect_xot_tcp_heur, proto_xot);
    xot_module = prefs_register_protocol(proto_xot, NULL);
 
    prefs_register_bool_preference(xot_module, "desegment",
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index d257c52d49..771ed5918d 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -2115,7 +2115,7 @@ void proto_register_zbee_aps(void)
 
     /* Register the APS dissector and subdissector list. */
     zbee_aps_dissector_table = register_dissector_table("zbee.profile", "ZigBee Profile ID", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
-    zbee_aps_handle = new_register_dissector(ZBEE_PROTOABBREV_APS, dissect_zbee_aps, proto_zbee_aps);
+    zbee_aps_handle = register_dissector(ZBEE_PROTOABBREV_APS, dissect_zbee_aps, proto_zbee_aps);
 
     /* Register the init routine. */
     register_init_routine(proto_init_zbee_aps);
@@ -2127,7 +2127,7 @@ void proto_register_zbee_aps(void)
     proto_register_subtree_array(ett_apf, array_length(ett_apf));
 
     /* Register the App dissector. */
-    zbee_apf_handle = new_register_dissector("zbee_apf", dissect_zbee_apf, proto_zbee_apf);
+    zbee_apf_handle = register_dissector("zbee_apf", dissect_zbee_apf, proto_zbee_apf);
 } /* proto_register_zbee_aps */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index ebcec0f9a5..4abc868f37 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -1781,7 +1781,7 @@ proto_register_zbee_nwk_gp(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the dissectors. */
-    new_register_dissector(ZBEE_PROTOABBREV_NWK_GP, dissect_zbee_nwk_gp, proto_zbee_nwk_gp);
+    register_dissector(ZBEE_PROTOABBREV_NWK_GP, dissect_zbee_nwk_gp, proto_zbee_nwk_gp);
 } /* proto_register_zbee_nwk_gp */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 3a8a952e8b..4066a6f661 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -1921,9 +1921,9 @@ void proto_register_zbee_nwk(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the dissectors with Wireshark. */
-    new_register_dissector(ZBEE_PROTOABBREV_NWK, dissect_zbee_nwk, proto_zbee_nwk);
-    new_register_dissector("zbee_beacon", dissect_zbee_beacon, proto_zbee_beacon);
-    new_register_dissector("zbip_beacon", dissect_zbip_beacon, proto_zbip_beacon);
+    register_dissector(ZBEE_PROTOABBREV_NWK, dissect_zbee_nwk, proto_zbee_nwk);
+    register_dissector("zbee_beacon", dissect_zbee_beacon, proto_zbee_beacon);
+    register_dissector("zbip_beacon", dissect_zbip_beacon, proto_zbip_beacon);
 
     /* Register the Security dissector. */
     zbee_security_register(NULL, proto_zbee_nwk);
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index edaa12f506..b63bd14f18 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -385,7 +385,7 @@ proto_register_zbee_zcl_basic(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Basic dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_BASIC, dissect_zbee_zcl_basic, proto_zbee_zcl_basic);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_BASIC, dissect_zbee_zcl_basic, proto_zbee_zcl_basic);
 } /*proto_register_zbee_zcl_basic*/
 
 /*FUNCTION:------------------------------------------------------
@@ -830,7 +830,7 @@ proto_register_zbee_zcl_power_config(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL power configuration dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_POWER_CONFIG, dissect_zbee_zcl_power_config, proto_zbee_zcl_power_config);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_POWER_CONFIG, dissect_zbee_zcl_power_config, proto_zbee_zcl_power_config);
 } /*proto_register_zbee_zcl_power_config*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1156,7 +1156,7 @@ proto_register_zbee_zcl_identify(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Identify dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_IDENTIFY, dissect_zbee_zcl_identify, proto_zbee_zcl_identify);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_IDENTIFY, dissect_zbee_zcl_identify, proto_zbee_zcl_identify);
 
 } /*proto_register_zbee_zcl_identify*/
 
@@ -1758,7 +1758,7 @@ proto_register_zbee_zcl_groups(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Groups dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_GROUPS, dissect_zbee_zcl_groups, proto_zbee_zcl_groups);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_GROUPS, dissect_zbee_zcl_groups, proto_zbee_zcl_groups);
 
 } /*proto_register_zbee_zcl_groups*/
 
@@ -2448,7 +2448,7 @@ proto_register_zbee_zcl_scenes(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Scenes dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_SCENES, dissect_zbee_zcl_scenes, proto_zbee_zcl_scenes);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_SCENES, dissect_zbee_zcl_scenes, proto_zbee_zcl_scenes);
 
 } /*proto_register_zbee_zcl_scenes*/
 
@@ -2665,7 +2665,7 @@ proto_register_zbee_zcl_on_off(void)
     proto_register_field_array(proto_zbee_zcl_on_off, hf, array_length(hf));
 
     /* Register the ZigBee ZCL OnOff dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_ONOFF, dissect_zbee_zcl_on_off, proto_zbee_zcl_on_off);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_ONOFF, dissect_zbee_zcl_on_off, proto_zbee_zcl_on_off);
 } /* proto_register_zbee_zcl_on_off */
 
 /*FUNCTION:------------------------------------------------------
@@ -3248,7 +3248,7 @@ void proto_register_zbee_zcl_part(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Partition dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_PART, dissect_zbee_zcl_part, proto_zbee_zcl_part);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_PART, dissect_zbee_zcl_part, proto_zbee_zcl_part);
 } /* proto_register_zbee_zcl_part */
 
 
@@ -4438,7 +4438,7 @@ void proto_register_zbee_zcl_ota(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL OTA dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_OTA, dissect_zbee_zcl_ota, proto_zbee_zcl_ota);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_OTA, dissect_zbee_zcl_ota, proto_zbee_zcl_ota);
 
 } /* proto_register_zbee_zcl_ota */
 
@@ -5581,7 +5581,7 @@ proto_register_zbee_zcl_pwr_prof(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Power Profile dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_PWRPROF, dissect_zbee_zcl_pwr_prof, proto_zbee_zcl_pwr_prof);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_PWRPROF, dissect_zbee_zcl_pwr_prof, proto_zbee_zcl_pwr_prof);
 } /* proto_register_zbee_zcl_pwr_prof */
 
 
@@ -6256,7 +6256,7 @@ proto_register_zbee_zcl_appl_ctrl(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Appliance Control dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_APPLCTRL, dissect_zbee_zcl_appl_ctrl, proto_zbee_zcl_appl_ctrl);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_APPLCTRL, dissect_zbee_zcl_appl_ctrl, proto_zbee_zcl_appl_ctrl);
 } /*proto_register_zbee_zcl_appl_ctrl*/
 
 
@@ -6526,7 +6526,7 @@ proto_register_zbee_zcl_poll_ctrl(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Poll Control dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_POLL, dissect_zbee_zcl_poll_ctrl, proto_zbee_zcl_poll_ctrl);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_POLL, dissect_zbee_zcl_poll_ctrl, proto_zbee_zcl_poll_ctrl);
 } /*proto_register_zbee_zcl_poll_ctrl*/
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index ea61de54af..1fba2c2b09 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -355,7 +355,7 @@ proto_register_zbee_zcl_appl_idt(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Appliance Identification dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_APPLIDT, dissect_zbee_zcl_appl_idt, proto_zbee_zcl_appl_idt);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_APPLIDT, dissect_zbee_zcl_appl_idt, proto_zbee_zcl_appl_idt);
 } /*proto_register_zbee_zcl_appl_idt*/
 
 /*FUNCTION:------------------------------------------------------
@@ -586,7 +586,7 @@ proto_register_zbee_zcl_met_idt(void)
     proto_register_field_array(proto_zbee_zcl_met_idt, hf, array_length(hf));
 
     /* Register the ZigBee ZCL Meter Identification dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_METIDT, dissect_zbee_zcl_met_idt, proto_zbee_zcl_met_idt);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_METIDT, dissect_zbee_zcl_met_idt, proto_zbee_zcl_met_idt);
 } /*proto_register_zbee_zcl_met_idt*/
 
 /*FUNCTION:------------------------------------------------------
@@ -998,7 +998,7 @@ proto_register_zbee_zcl_appl_evtalt(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Appliance Control dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_APPLEVTALT, dissect_zbee_zcl_appl_evtalt, proto_zbee_zcl_appl_evtalt);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_APPLEVTALT, dissect_zbee_zcl_appl_evtalt, proto_zbee_zcl_appl_evtalt);
 } /*proto_register_zbee_zcl_appl_evtalt*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1404,7 +1404,7 @@ proto_register_zbee_zcl_appl_stats(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Appliance Statistics dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_APPLSTATS, dissect_zbee_zcl_appl_stats, proto_zbee_zcl_appl_stats);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_APPLSTATS, dissect_zbee_zcl_appl_stats, proto_zbee_zcl_appl_stats);
 } /* proto_register_zbee_zcl_appl_stats */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index 7190e39a15..0136f2d4e9 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -343,7 +343,7 @@ proto_register_zbee_zcl_illum_meas(void)
     proto_register_field_array(proto_zbee_zcl_illum_meas, hf, array_length(hf));
 
     /* Register the ZigBee ZCL Illuminance Measurement dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_ILLUMMEAS, dissect_zbee_zcl_illum_meas, proto_zbee_zcl_illum_meas);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_ILLUMMEAS, dissect_zbee_zcl_illum_meas, proto_zbee_zcl_illum_meas);
 
 } /*proto_register_zbee_zcl_illum_meas*/
 
@@ -654,7 +654,7 @@ proto_register_zbee_zcl_temp_meas(void)
     proto_register_field_array(proto_zbee_zcl_temp_meas, hf, array_length(hf));
 
     /* Register the ZigBee ZCL Temperature Measurement dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_TEMPMEAS, dissect_zbee_zcl_temp_meas, proto_zbee_zcl_temp_meas);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_TEMPMEAS, dissect_zbee_zcl_temp_meas, proto_zbee_zcl_temp_meas);
 } /*proto_register_zbee_zcl_temp_meas*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1026,7 +1026,7 @@ proto_register_zbee_zcl_press_meas(void)
     proto_register_field_array(proto_zbee_zcl_press_meas, hf, array_length(hf));
 
     /* Register the ZigBee ZCL Pressure Measurement dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_PRESSMEAS, dissect_zbee_zcl_press_meas, proto_zbee_zcl_press_meas);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_PRESSMEAS, dissect_zbee_zcl_press_meas, proto_zbee_zcl_press_meas);
 } /*proto_register_zbee_zcl_press_meas*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1334,7 +1334,7 @@ proto_register_zbee_zcl_relhum_meas(void)
     proto_register_field_array(proto_zbee_zcl_relhum_meas, hf, array_length(hf));
 
     /* Register the ZigBee ZCL Relative Humidity Measurement dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_RELHUMMEAS, dissect_zbee_zcl_relhum_meas, proto_zbee_zcl_relhum_meas);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_RELHUMMEAS, dissect_zbee_zcl_relhum_meas, proto_zbee_zcl_relhum_meas);
 } /*proto_register_zbee_zcl_relhum_meas*/
 
 
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c
index 35c234ce69..7232a4c69c 100644
--- a/epan/dissectors/packet-zbee-zcl-misc.c
+++ b/epan/dissectors/packet-zbee-zcl-misc.c
@@ -605,7 +605,7 @@ proto_register_zbee_zcl_thermostat(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL IAS Zone dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_THERMOSTAT, dissect_zbee_zcl_thermostat, proto_zbee_zcl_thermostat);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_THERMOSTAT, dissect_zbee_zcl_thermostat, proto_zbee_zcl_thermostat);
 } /*proto_register_zbee_zcl_thermostat*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1096,7 +1096,7 @@ proto_register_zbee_zcl_ias_zone(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL IAS Zone dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_IAS_ZONE, dissect_zbee_zcl_ias_zone, proto_zbee_zcl_ias_zone);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_IAS_ZONE, dissect_zbee_zcl_ias_zone, proto_zbee_zcl_ias_zone);
 } /*proto_register_zbee_zcl_ias_zone*/
 
 /*
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index 34d91460b4..fcb936bc24 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -723,7 +723,7 @@ proto_register_zbee_zcl_msg(void)
     expert_register_field_array(expert_zbee_zcl_msg, ei, array_length(ei));
 
     /* Register the ZigBee ZCL Messaging dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_MSG, dissect_zbee_zcl_msg, proto_zbee_zcl_msg);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_MSG, dissect_zbee_zcl_msg, proto_zbee_zcl_msg);
 } /*proto_register_zbee_zcl_msg*/
 
 /*FUNCTION:------------------------------------------------------
@@ -1433,7 +1433,7 @@ proto_register_zbee_zcl_tun(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Messaging dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_TUN, dissect_zbee_zcl_tun, proto_zbee_zcl_tun);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_TUN, dissect_zbee_zcl_tun, proto_zbee_zcl_tun);
 
 } /* proto_register_zbee_zcl_tun */
 
@@ -2102,7 +2102,7 @@ proto_register_zbee_zcl_ke(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZigBee ZCL Messaging dissector. */
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL_KE, dissect_zbee_zcl_ke, proto_zbee_zcl_ke);
+    register_dissector(ZBEE_PROTOABBREV_ZCL_KE, dissect_zbee_zcl_ke, proto_zbee_zcl_ke);
 } /*proto_register_zbee_zcl_ke*/
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index e4e20ee989..13ee8b8ea5 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -2402,7 +2402,7 @@ void proto_register_zbee_zcl(void)
 
     /* Register the ZCL dissector and subdissector list. */
     zbee_zcl_dissector_table = register_dissector_table("zbee.zcl.cluster", "ZigBee ZCL Cluster ID", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
-    new_register_dissector(ZBEE_PROTOABBREV_ZCL, dissect_zbee_zcl, proto_zbee_zcl);
+    register_dissector(ZBEE_PROTOABBREV_ZCL, dissect_zbee_zcl, proto_zbee_zcl);
 } /* proto_register_zbee_zcl */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index 0a4cecf8c3..9053a7b76d 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -1882,7 +1882,7 @@ void proto_register_zbee_zdp(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* Register the ZDP dissector. */
-    new_register_dissector("zbee_zdp", dissect_zbee_zdp, proto_zbee_zdp);
+    register_dissector("zbee_zdp", dissect_zbee_zdp, proto_zbee_zdp);
 } /* proto_register_zbee_zdp */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 6072760e9f..ed28255f32 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -321,7 +321,7 @@ void proto_register_zep(void)
                  10, &gPREF_zep_udp_port);
 
     /*  Register dissector with Wireshark. */
-    zep_handle = new_register_dissector("zep", dissect_zep, proto_zep);
+    zep_handle = register_dissector("zep", dissect_zep, proto_zep);
 } /* proto_register_zep */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index 08d0495033..c4d7dbf3d2 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -322,7 +322,7 @@ proto_register_ziop (void)
   expert_ziop = expert_register_protocol(proto_ziop);
   expert_register_field_array(expert_ziop, ei, array_length(ei));
 
-  new_register_dissector("ziop", dissect_ziop, proto_ziop);
+  register_dissector("ziop", dissect_ziop, proto_ziop);
 }
 
 
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 023efe189b..9a20a3d55e 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -1159,7 +1159,7 @@ proto_register_zrtp(void)
   proto_zrtp = proto_register_protocol("ZRTP", "ZRTP", "zrtp");
   proto_register_field_array(proto_zrtp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  new_register_dissector("zrtp", dissect_zrtp, proto_zrtp);
+  register_dissector("zrtp", dissect_zrtp, proto_zrtp);
 }
 
 void
diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c
index ca59b75e8f..685c674946 100644
--- a/epan/dissectors/packet-zvt.c
+++ b/epan/dissectors/packet-zvt.c
@@ -907,7 +907,7 @@ proto_reg_handoff_zvt(void)
 
     if (!registered_dissector) {
         /* register by name to allow mapping to a user DLT */
-        new_register_dissector("zvt", dissect_zvt, proto_zvt);
+        register_dissector("zvt", dissect_zvt, proto_zvt);
 
         zvt_tcp_handle = create_dissector_handle(dissect_zvt_tcp, proto_zvt);