"new" dissector API -> dissector API for ASN.1 dissectors.

Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220
Reviewed-on: https://code.wireshark.org/review/12480
Reviewed-by: Michael Mann <mmann78@netscape.net>

80 files changed, 155 insertions, 155 deletions

diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c
index 8c276a2a2c..43a4bd906d 100644
--- a/epan/dissectors/packet-HI2Operations.c
+++ b/epan/dissectors/packet-HI2Operations.c
@@ -5158,7 +5158,7 @@ void proto_register_HI2Operations(void) {
   proto_register_field_array(proto_HI2Operations, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
+  register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
 }
 
 
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 5b2d1f75c8..9ed836ec39 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -2308,7 +2308,7 @@ void proto_register_acse(void) {
 
   /* Register protocol */
   proto_acse = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("acse", dissect_acse, proto_acse);
+  register_dissector("acse", dissect_acse, proto_acse);
 
   /* Register connectionless protocol */
   proto_clacse = proto_register_protocol(CLPNAME, CLPSNAME, CLPFNAME);
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index ee56d70480..0c002828bd 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -19527,7 +19527,7 @@ void proto_register_ansi_map(void) {
     expert_ansi_map = expert_register_protocol(proto_ansi_map);
     expert_register_field_array(expert_ansi_map, ei, array_length(ei));
 
-    new_register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
+    register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
 
     is637_tele_id_dissector_table =
         register_dissector_table("ansi_map.tele_id", "IS-637 Teleservice ID",
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index b4629e5150..46a71b4ae5 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -1806,7 +1806,7 @@ proto_register_ansi_tcap(void)
 
 /* Register the protocol name and description */
     proto_ansi_tcap = proto_register_protocol(PNAME, PSNAME, PFNAME);
-    new_register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
+    register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
 
    /* Note the high bit should be masked off when registering in this table (0x7fff)*/
    ansi_tcap_national_opcode_table = register_dissector_table("ansi_tcap.nat.opcode", "ANSI TCAP National Opcodes", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index c82e055f16..659b7ff1cf 100644
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -971,7 +971,7 @@ void proto_register_atn_cm (void)
         ett,
         array_length(ett));
 
-    new_register_dissector(
+    register_dissector(
         "atn-cm",
         dissect_atn_cm,
         proto_atn_cm);
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c
index ac6115ba9c..40aab2103e 100644
--- a/epan/dissectors/packet-atn-cpdlc.c
+++ b/epan/dissectors/packet-atn-cpdlc.c
@@ -8088,7 +8088,7 @@ void proto_register_atn_cpdlc (void)
         ett,
         array_length(ett));
 
-    new_register_dissector(
+    register_dissector(
         "atn-cpdlc",
         dissect_atn_cpdlc,
         proto_atn_cpdlc);
diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c
index cdbaee766b..bb2a506880 100644
--- a/epan/dissectors/packet-atn-ulcs.c
+++ b/epan/dissectors/packet-atn-ulcs.c
@@ -2587,7 +2587,7 @@ void proto_register_atn_ulcs (void)
         ett,
         array_length (ett));
 
-    new_register_dissector(
+    register_dissector(
         "atn-ulcs",
         dissect_atn_ulcs,
         proto_atn_ulcs);
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index bc9b260bd2..2d6f02dafb 100644
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -2056,8 +2056,8 @@ proto_reg_handoff_c1222(void)
   guint8 *temp = NULL;
 
   if( !initialized ) {
-    c1222_handle = new_create_dissector_handle(dissect_c1222, proto_c1222);
-    c1222_udp_handle = new_create_dissector_handle(dissect_c1222_common, proto_c1222);
+    c1222_handle = create_dissector_handle(dissect_c1222, proto_c1222);
+    c1222_udp_handle = create_dissector_handle(dissect_c1222_common, proto_c1222);
     dissector_add_uint("tcp.port", global_c1222_port, c1222_handle);
     dissector_add_uint("udp.port", global_c1222_port, c1222_udp_handle);
     initialized = TRUE;
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 18ee509ed5..8da51c812b 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -10669,9 +10669,9 @@ void proto_register_camel(void) {
   /* Register protocol */
   proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-  new_register_dissector("camel", dissect_camel, proto_camel);
-  new_register_dissector("camel-v1", dissect_camel_v1, proto_camel);
-  new_register_dissector("camel-v2", dissect_camel_v2, proto_camel);
+  register_dissector("camel", dissect_camel, proto_camel);
+  register_dissector("camel-v1", dissect_camel_v1, proto_camel);
+  register_dissector("camel-v2", dissect_camel_v2, proto_camel);
 
   proto_register_field_array(proto_camel, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index 31c00af74a..81c68c0343 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -1176,6 +1176,6 @@ proto_register_charging_ase(void)
 void
 proto_reg_handoff_charging_ase(void)
 {
-  charging_ase_handle = new_create_dissector_handle(dissect_charging_ase, proto_charging_ase);
+  charging_ase_handle = create_dissector_handle(dissect_charging_ase, proto_charging_ase);
 }
 
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 6f462ac7e1..6cb01ff9f3 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -5808,7 +5808,7 @@ void proto_register_cmip(void) {
 
   /* Register protocol */
   proto_cmip = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("cmip", dissect_cmip, proto_cmip);
+  register_dissector("cmip", dissect_cmip, proto_cmip);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_cmip, hf, array_length(hf));
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index cff8e15f93..f0a053e626 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -2477,15 +2477,15 @@ void proto_reg_handoff_cmp(void) {
 	static guint cmp_alternate_tcp_style_http_port_prev = 0;
 
 	if (!inited) {
-		cmp_http_handle = new_create_dissector_handle(dissect_cmp_http, proto_cmp);
+		cmp_http_handle = create_dissector_handle(dissect_cmp_http, proto_cmp);
 		dissector_add_string("media_type", "application/pkixcmp", cmp_http_handle);
 		dissector_add_string("media_type", "application/x-pkixcmp", cmp_http_handle);
 
-		cmp_tcp_style_http_handle = new_create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
+		cmp_tcp_style_http_handle = create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
 		dissector_add_string("media_type", "application/pkixcmp-poll", cmp_tcp_style_http_handle);
 		dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
 
-		cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
+		cmp_tcp_handle = create_dissector_handle(dissect_cmp_tcp, proto_cmp);
 		dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
 
 		oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 15957d14a0..bb98195841 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -2474,7 +2474,7 @@ void proto_reg_handoff_cms(void) {
   oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7");
   oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7");
 
-  content_info_handle = new_create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
+  content_info_handle = create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
   dissector_add_string("media_type", "application/pkcs7-mime", content_info_handle);
   dissector_add_string("media_type", "application/pkcs7-signature", content_info_handle);
 }
diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c
index 9eae441edf..e3c7d55100 100644
--- a/epan/dissectors/packet-credssp.c
+++ b/epan/dissectors/packet-credssp.c
@@ -537,7 +537,7 @@ void proto_register_credssp(void) {
 
   /* Register protocol */
   proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("credssp", dissect_credssp, proto_credssp);
+  register_dissector("credssp", dissect_credssp, proto_credssp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_credssp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index cc5e4459de..e289c5a018 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -2120,7 +2120,7 @@ void proto_register_disp(void) {
 
   /* Register protocol */
   proto_disp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("disp", dissect_disp, proto_disp);
+  register_dissector("disp", dissect_disp, proto_disp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_disp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index b9472c068d..7393460c0c 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -3054,7 +3054,7 @@ void proto_register_dop(void) {
   /* Register protocol */
   proto_dop = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-  new_register_dissector("dop", dissect_dop, proto_dop);
+  register_dissector("dop", dissect_dop, proto_dop);
 
   dop_dissector_table = register_dissector_table("dop.oid", "DOP OID Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 4f4e8a8274..512f32ec9e 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -2546,7 +2546,7 @@ void proto_register_dsp(void) {
   /* Register protocol */
   proto_dsp = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-  new_register_dissector("dsp", dissect_dsp, proto_dsp);
+  register_dissector("dsp", dissect_dsp, proto_dsp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_dsp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index a31fadc088..7637decc5a 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -6654,7 +6654,7 @@ void proto_register_ftam(void) {
 
   /* Register protocol */
   proto_ftam = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("ftam", dissect_ftam, proto_ftam);
+  register_dissector("ftam", dissect_ftam, proto_ftam);
   /* Register fields and subtrees */
   proto_register_field_array(proto_ftam, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index bfc5aa8dbd..2af358dfa9 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -1053,7 +1053,7 @@ void proto_register_goose(void) {
 
 	/* Register protocol */
 	proto_goose = proto_register_protocol(PNAME, PSNAME, PFNAME);
-	new_register_dissector("goose", dissect_goose, proto_goose);
+	register_dissector("goose", dissect_goose, proto_goose);
 
 	/* Register fields and subtrees */
 	proto_register_field_array(proto_goose, hf, array_length(hf));
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index c5c6556695..e245fc5af0 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -30620,8 +30620,8 @@ void proto_register_gsm_map(void) {
   /* Register protocol */
   proto_gsm_map_dialogue =proto_gsm_map = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-  new_register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
-  new_register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
+  register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
+  register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_gsm_map, hf, array_length(hf));
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index cf611e473a..ecc4e1a901 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -11659,9 +11659,9 @@ void proto_register_h225(void) {
     "ON - display tunnelled protocols inside H.225.0 tree, OFF - display tunnelled protocols in root tree after H.225.0",
     &h225_tp_in_tree);
 
-  new_register_dissector(PFNAME, dissect_h225_H323UserInformation, proto_h225);
-  new_register_dissector("h323ui",dissect_h225_H323UserInformation, proto_h225);
-  new_register_dissector("h225.ras", dissect_h225_h225_RasMessage, proto_h225);
+  register_dissector(PFNAME, dissect_h225_H323UserInformation, proto_h225);
+  register_dissector("h323ui",dissect_h225_H323UserInformation, proto_h225);
+  register_dissector("h225.ras", dissect_h225_h225_RasMessage, proto_h225);
 
   nsp_object_dissector_table = register_dissector_table("h225.nsp.object", "H.225 NonStandardParameter (object)", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
   nsp_h221_dissector_table = register_dissector_table("h225.nsp.h221", "H.225 NonStandardParameter (h221)", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index d8c0e616a1..824b7cc14a 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1572,7 +1572,7 @@ void proto_reg_handoff_h235(void) {
 
   /* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */
   dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw",
-                       new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235));
+                       create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235));
 
 }
 
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index cde430d526..6e51fbea70 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -20759,8 +20759,8 @@ void proto_register_h245(void) {
     "Show h245 info in reversed order",
     "Whether the dissector should print items of h245 Info column in reversed order",
     &info_col_fmt_prepend);
-  new_register_dissector("h245dg", dissect_h245_h245, proto_h245);
-  new_register_dissector("h245", dissect_h245, proto_h245);
+  register_dissector("h245dg", dissect_h245_h245, proto_h245);
+  register_dissector("h245", dissect_h245, proto_h245);
 
   nsp_object_dissector_table = register_dissector_table("h245.nsp.object", "H.245 NonStandardParameter (object)", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
   nsp_h221_dissector_table = register_dissector_table("h245.nsp.h221", "H.245 NonStandardParameter (h221)", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index d82d94cb37..f4811346fc 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -6945,8 +6945,8 @@ void proto_register_h248(void) {
 
     /* Register protocol */
     proto_h248 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-    new_register_dissector("h248", dissect_h248, proto_h248);
-    new_register_dissector("h248.tpkt", dissect_h248_tpkt, proto_h248);
+    register_dissector("h248", dissect_h248, proto_h248);
+    register_dissector("h248.tpkt", dissect_h248_tpkt, proto_h248);
 
     /* Register fields and subtrees */
     proto_register_field_array(proto_h248, hf, array_length(hf));
diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 665895d89c..57d92963bd 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -6317,8 +6317,8 @@ void proto_register_h282(void) {
   proto_register_field_array(proto_h282, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector(PFNAME, dissect_h282, proto_h282);
-  new_register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
+  register_dissector(PFNAME, dissect_h282, proto_h282);
+  register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
 
 }
 
diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index 7ebd449a5c..1b20fc157e 100644
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -755,7 +755,7 @@ void proto_register_h283(void) {
   proto_register_field_array(proto_h283, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector(PFNAME, dissect_h283_udp, proto_h283);
+  register_dissector(PFNAME, dissect_h283_udp, proto_h283);
 
 }
 
diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c
index c3d2f2fc45..99e96e72aa 100644
--- a/epan/dissectors/packet-h323.c
+++ b/epan/dissectors/packet-h323.c
@@ -611,10 +611,10 @@ void proto_reg_handoff_h323(void)
 
   /* H.323, Annex M4, Tunnelling of narrow-band signalling syntax (NSS) for H.323 */
   dissector_add_string("h225.gef.content", "GenericData/1000/1",
-                       new_create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323));
+                       create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323));
 
   /* H.323, Annex R, Robustness methods for H.323 entities */
   dissector_add_string("h225.gef.content", "GenericData/1/1",
-                       new_create_dissector_handle(dissect_RobustnessData_PDU, proto_h323));
+                       create_dissector_handle(dissect_RobustnessData_PDU, proto_h323));
 }
 
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index de8d7498ab..f21104fbf8 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -6481,7 +6481,7 @@ void proto_register_h450(void) {
 
   /* Register protocol */
   proto_h450 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("h4501", dissect_h450_H4501SupplementaryService_PDU, proto_h450);
+  register_dissector("h4501", dissect_h450_H4501SupplementaryService_PDU, proto_h450);
   /* Register fields and subtrees */
   proto_register_field_array(proto_h450, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
@@ -6510,13 +6510,13 @@ proto_reg_handoff_h450(void)
   dissector_handle_t h450_res_handle;
   dissector_handle_t h450_err_handle;
 
-  h450_arg_handle = new_create_dissector_handle(dissect_h450_arg, proto_h450);
-  h450_res_handle = new_create_dissector_handle(dissect_h450_res, proto_h450);
+  h450_arg_handle = create_dissector_handle(dissect_h450_arg, proto_h450);
+  h450_res_handle = create_dissector_handle(dissect_h450_res, proto_h450);
   for (i=0; i<(int)array_length(h450_op_tab); i++) {
     dissector_add_uint("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
     dissector_add_uint("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
   }
-  h450_err_handle = new_create_dissector_handle(dissect_h450_err, proto_h450);
+  h450_err_handle = create_dissector_handle(dissect_h450_err, proto_h450);
   for (i=0; i<(int)array_length(h450_err_tab); i++) {
     dissector_add_uint("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
   }
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index 74fb2c9615..7ede4f5cdd 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.c
@@ -2985,7 +2985,7 @@ void proto_register_h460(void) {
     if (ftr->opt & FD) ftr->key_fd = g_strdup_printf("FeatureDescriptor/%s", ftr->id);
     if (ftr->opt & GM) ftr->key_gm = g_strdup_printf("GenericMessage/%s", ftr->id);
     if (ftr->opt & GI) ftr->key_gi = g_strdup_printf("GenericInformation/%s", ftr->id);
-    if (ftr->content_pdu) ftr->content_hnd = new_create_dissector_handle(ftr->content_pdu, proto_h460);
+    if (ftr->content_pdu) ftr->content_hnd = create_dissector_handle(ftr->content_pdu, proto_h460);
   }
 }
 
@@ -2998,7 +2998,7 @@ void proto_reg_handoff_h460(void)
   q931_ie_handle = find_dissector("q931.ie");
   h225_ras_handle = find_dissector("h225.ras");
 
-  h460_name_handle = new_create_dissector_handle(dissect_h460_name, proto_h460);
+  h460_name_handle = create_dissector_handle(dissect_h460_name, proto_h460);
   for (ftr=h460_feature_tab; ftr->id; ftr++) {
     if (ftr->key_gd) dissector_add_string("h225.gef.name", ftr->key_gd, h460_name_handle);
     if (ftr->key_fd) dissector_add_string("h225.gef.name", ftr->key_fd, h460_name_handle);
diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index 85f9b52427..1dfa5d1596 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -3675,7 +3675,7 @@ void proto_register_h501(void) {
   proto_register_field_array(proto_h501, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  new_register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
+  register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
 
   h501_module = prefs_register_protocol(proto_h501, proto_reg_handoff_h501);
   prefs_register_uint_preference(h501_module, "udp.port",
@@ -3704,8 +3704,8 @@ void proto_reg_handoff_h501(void)
 
   if (!h501_prefs_initialized) {
     h501_pdu_handle = find_dissector(PFNAME);
-    h501_udp_handle = new_create_dissector_handle(dissect_h501_udp, proto_h501);
-    h501_tcp_handle = new_create_dissector_handle(dissect_h501_tcp, proto_h501);
+    h501_udp_handle = create_dissector_handle(dissect_h501_udp, proto_h501);
+    h501_tcp_handle = create_dissector_handle(dissect_h501_tcp, proto_h501);
     h501_prefs_initialized = TRUE;
   } else {
     dissector_delete_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c
index 3f7d418e46..50fe1dea84 100644
--- a/epan/dissectors/packet-hnbap.c
+++ b/epan/dissectors/packet-hnbap.c
@@ -3293,7 +3293,7 @@ module_t *hnbap_module;
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("hnbap", dissect_hnbap, proto_hnbap);
+  register_dissector("hnbap", dissect_hnbap, proto_hnbap);
 
   /* Register dissector tables */
   hnbap_ies_dissector_table = register_dissector_table("hnbap.ies", "HNBAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index 192244ad10..15a327b2c9 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -970,7 +970,7 @@ void proto_register_idmp(void)
     proto_register_field_array(proto_idmp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("idmp", dissect_idmp_tcp, proto_idmp);
+    register_dissector("idmp", dissect_idmp_tcp, proto_idmp);
 
     register_init_routine (&idmp_reassemble_init);
     register_cleanup_routine (&idmp_reassemble_cleanup);
diff --git a/epan/dissectors/packet-ilp.c b/epan/dissectors/packet-ilp.c
index 8e33b48473..022c8ba093 100644
--- a/epan/dissectors/packet-ilp.c
+++ b/epan/dissectors/packet-ilp.c
@@ -5855,7 +5855,7 @@ void proto_register_ilp(void) {
 
   /* Register protocol */
   proto_ilp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("ilp", dissect_ilp_tcp, proto_ilp);
+  register_dissector("ilp", dissect_ilp_tcp, proto_ilp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_ilp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 5a6fa3f3fb..08873eac88 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -11953,7 +11953,7 @@ void proto_register_inap(void) {
 
   /* Register protocol */
   proto_inap = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("inap", dissect_inap, proto_inap);
+  register_dissector("inap", dissect_inap, proto_inap);
   /* Register fields and subtrees */
   proto_register_field_array(proto_inap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c
index 539a84c12c..29667520b9 100644
--- a/epan/dissectors/packet-isdn-sup.c
+++ b/epan/dissectors/packet-isdn-sup.c
@@ -3003,8 +3003,8 @@ void proto_reg_handoff_isdn_sup(void) {
   q931_handle = find_dissector("q931");
 #endif
 
-  isdn_sup_arg_handle = new_create_dissector_handle(dissect_isdn_sup_arg, proto_isdn_sup);
-  isdn_sup_res_handle = new_create_dissector_handle(dissect_isdn_sup_res, proto_isdn_sup);
+  isdn_sup_arg_handle = create_dissector_handle(dissect_isdn_sup_arg, proto_isdn_sup);
+  isdn_sup_res_handle = create_dissector_handle(dissect_isdn_sup_res, proto_isdn_sup);
   for (i=0; i<(int)array_length(isdn_sup_op_tab); i++) {
     dissector_add_uint("q932.ros.etsi.local.arg", isdn_sup_op_tab[i].opcode, isdn_sup_arg_handle);
     dissector_add_uint("q932.ros.etsi.local.res", isdn_sup_op_tab[i].opcode, isdn_sup_res_handle);
@@ -3012,12 +3012,12 @@ void proto_reg_handoff_isdn_sup(void) {
 
   for (i=0; i<(int)array_length(isdn_sup_global_op_tab); i++) {
 	  if(isdn_sup_global_op_tab->arg_pdu)
-		  dissector_add_string("q932.ros.global.arg", isdn_sup_global_op_tab[i].oid, new_create_dissector_handle(isdn_sup_global_op_tab[i].arg_pdu, proto_isdn_sup));
+		  dissector_add_string("q932.ros.global.arg", isdn_sup_global_op_tab[i].oid, create_dissector_handle(isdn_sup_global_op_tab[i].arg_pdu, proto_isdn_sup));
 	  if(isdn_sup_global_op_tab->res_pdu)
-		  dissector_add_string("q932.ros.global.res", isdn_sup_global_op_tab[i].oid, new_create_dissector_handle(isdn_sup_global_op_tab[i].res_pdu, proto_isdn_sup));
+		  dissector_add_string("q932.ros.global.res", isdn_sup_global_op_tab[i].oid, create_dissector_handle(isdn_sup_global_op_tab[i].res_pdu, proto_isdn_sup));
   }
 
-  isdn_sup_err_handle = new_create_dissector_handle(dissect_isdn_sup_err, proto_isdn_sup);
+  isdn_sup_err_handle = create_dissector_handle(dissect_isdn_sup_err, proto_isdn_sup);
 
   for (i=0; i<(int)array_length(isdn_sup_err_tab); i++) {
     dissector_add_uint("q932.ros.etsi.local.err", isdn_sup_err_tab[i].errcode, isdn_sup_err_handle);
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 59d8b83099..3c4ac5b5bc 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -5565,10 +5565,10 @@ proto_reg_handoff_kerberos(void)
 
 	krb4_handle = find_dissector("krb4");
 
-	kerberos_handle_udp = new_create_dissector_handle(dissect_kerberos_udp,
+	kerberos_handle_udp = create_dissector_handle(dissect_kerberos_udp,
 	proto_kerberos);
 
-	kerberos_handle_tcp = new_create_dissector_handle(dissect_kerberos_tcp,
+	kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
 	proto_kerberos);
 
 	dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c
index fefe5e3ef4..5a87c20918 100644
--- a/epan/dissectors/packet-lcsap.c
+++ b/epan/dissectors/packet-lcsap.c
@@ -2851,7 +2851,7 @@ void proto_register_lcsap(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_lcsap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  new_register_dissector("lcsap", dissect_lcsap, proto_lcsap);
+  register_dissector("lcsap", dissect_lcsap, proto_lcsap);
 
   /* Register dissector tables */
   lcsap_ies_dissector_table = register_dissector_table("lcsap.ies", "LCS-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 5e27b93b50..10c6ed2090 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -5774,7 +5774,7 @@ void proto_register_ldap(void) {
   expert_ldap = expert_register_protocol(proto_ldap);
   expert_register_field_array(expert_ldap, ei, array_length(ei));
 
-  new_register_dissector("ldap", dissect_ldap_tcp, proto_ldap);
+  register_dissector("ldap", dissect_ldap_tcp, proto_ldap);
 
   ldap_module = prefs_register_protocol(proto_ldap, prefs_register_ldap);
   prefs_register_bool_preference(ldap_module, "desegment_ldap_messages",
@@ -5836,7 +5836,7 @@ proto_reg_handoff_ldap(void)
 
   dissector_add_uint("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
 
-  cldap_handle = new_create_dissector_handle(dissect_mscldap, proto_cldap);
+  cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
   dissector_add_uint("udp.port", UDP_PORT_CLDAP, cldap_handle);
 
   gssapi_handle = find_dissector("gssapi");
@@ -5891,12 +5891,12 @@ proto_reg_handoff_ldap(void)
   oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
   oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
 
-  dissector_add_string("ldap.name", "netlogon", new_create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
-  dissector_add_string("ldap.name", "objectGUID", new_create_dissector_handle(dissect_ldap_guid, proto_ldap));
-  dissector_add_string("ldap.name", "supportedControl", new_create_dissector_handle(dissect_ldap_oid, proto_ldap));
-  dissector_add_string("ldap.name", "supportedCapabilities", new_create_dissector_handle(dissect_ldap_oid, proto_ldap));
-  dissector_add_string("ldap.name", "objectSid", new_create_dissector_handle(dissect_ldap_sid, proto_ldap));
-  dissector_add_string("ldap.name", "nTSecurityDescriptor", new_create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
+  dissector_add_string("ldap.name", "netlogon", create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
+  dissector_add_string("ldap.name", "objectGUID", create_dissector_handle(dissect_ldap_guid, proto_ldap));
+  dissector_add_string("ldap.name", "supportedControl", create_dissector_handle(dissect_ldap_oid, proto_ldap));
+  dissector_add_string("ldap.name", "supportedCapabilities", create_dissector_handle(dissect_ldap_oid, proto_ldap));
+  dissector_add_string("ldap.name", "objectSid", create_dissector_handle(dissect_ldap_sid, proto_ldap));
+  dissector_add_string("ldap.name", "nTSecurityDescriptor", create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
 
 
 /*--- Included file: packet-ldap-dis-tab.c ---*/
diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c
index d27afa5d12..0a46025eb8 100644
--- a/epan/dissectors/packet-lpp.c
+++ b/epan/dissectors/packet-lpp.c
@@ -15775,7 +15775,7 @@ void proto_register_lpp(void) {
 
   /* Register protocol */
   proto_lpp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("lpp", dissect_lpp, proto_lpp);
+  register_dissector("lpp", dissect_lpp, proto_lpp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_lpp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c
index 554fa37511..06e680efe8 100644
--- a/epan/dissectors/packet-lppa.c
+++ b/epan/dissectors/packet-lppa.c
@@ -2932,7 +2932,7 @@ void proto_register_lppa(void) {
 
   /* Register protocol */
   proto_lppa = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("lppa", dissect_LPPA_PDU_PDU, proto_lppa);
+  register_dissector("lppa", dissect_LPPA_PDU_PDU, proto_lppa);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_lppa, hf, array_length(hf));
diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c
index 91cf2d60a2..f5fff86b8c 100644
--- a/epan/dissectors/packet-lppe.c
+++ b/epan/dissectors/packet-lppe.c
@@ -23934,7 +23934,7 @@ void proto_register_lppe(void) {
 
   /* Register protocol */
   proto_lppe = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("lppe", dissect_OMA_LPPe_MessageExtension_PDU, proto_lppe);
+  register_dissector("lppe", dissect_OMA_LPPe_MessageExtension_PDU, proto_lppe);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_lppe, hf, array_length(hf));
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index a35ae45f8f..1af9b3f84a 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -59082,16 +59082,16 @@ void proto_register_lte_rrc(void) {
   proto_lte_rrc = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
   /* These entry points will first create an lte_rrc root node */
-  new_register_dissector("lte_rrc.dl_ccch", dissect_lte_rrc_DL_CCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.dl_dcch", dissect_lte_rrc_DL_DCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.ul_ccch", dissect_lte_rrc_UL_CCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.ul_dcch", dissect_lte_rrc_UL_DCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.bcch_bch", dissect_lte_rrc_BCCH_BCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.bcch_dl_sch", dissect_lte_rrc_BCCH_DL_SCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.pcch", dissect_lte_rrc_PCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
-  new_register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
-  new_register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
+  register_dissector("lte_rrc.dl_ccch", dissect_lte_rrc_DL_CCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.dl_dcch", dissect_lte_rrc_DL_DCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.ul_ccch", dissect_lte_rrc_UL_CCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.ul_dcch", dissect_lte_rrc_UL_DCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.bcch_bch", dissect_lte_rrc_BCCH_BCH, proto_lte_rrc);
+  register_dissector("lte_rrc.bcch_dl_sch", dissect_lte_rrc_BCCH_DL_SCH, proto_lte_rrc);
+  register_dissector("lte_rrc.pcch", dissect_lte_rrc_PCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
+  register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c
index ddc05b6260..8d35b1d95c 100644
--- a/epan/dissectors/packet-m3ap.c
+++ b/epan/dissectors/packet-m3ap.c
@@ -2532,7 +2532,7 @@ proto_reg_handoff_m3ap(void)
   static guint SctpPort;
 
   if( !inited ) {
-    m3ap_handle = new_create_dissector_handle(dissect_m3ap, proto_m3ap);
+    m3ap_handle = create_dissector_handle(dissect_m3ap, proto_m3ap);
     dissector_add_uint("sctp.ppi", PROTO_3GPP_M3AP_PROTOCOL_ID, m3ap_handle);
     inited = TRUE;
 
@@ -2581,7 +2581,7 @@ proto_reg_handoff_m3ap(void)
 
 /*--- End of included file: packet-m3ap-dis-tab.c ---*/
 #line 190 "../../asn1/m3ap/packet-m3ap-template.c"
-    dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
+    dissector_add_uint("m3ap.extension", 17, create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
   }
   else {
     if (SctpPort != 0) {
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 438d29d4e4..3c3eeb8a21 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -9988,7 +9988,7 @@ void proto_register_mms(void) {
 
   /* Register protocol */
   proto_mms = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("mms", dissect_mms, proto_mms);
+  register_dissector("mms", dissect_mms, proto_mms);
   /* Register fields and subtrees */
   proto_register_field_array(proto_mms, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 23ab12dc15..f361cfeeea 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -1311,14 +1311,14 @@ proto_register_mpeg_pes(void)
 
 	proto_mpeg = proto_register_protocol(
 			"Moving Picture Experts Group", "MPEG", "mpeg");
-	new_register_dissector("mpeg", dissect_mpeg, proto_mpeg);
+	register_dissector("mpeg", dissect_mpeg, proto_mpeg);
 	heur_subdissector_list = register_heur_dissector_list("mpeg");
 
 	proto_mpeg_pes = proto_register_protocol(
 			"Packetized Elementary Stream", "MPEG PES", "mpeg-pes");
 	proto_register_field_array(proto_mpeg_pes, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
-	new_register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes);
+	register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes);
 }
 
 void
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 5b417e4a13..29fb3c6ba4 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -70159,7 +70159,7 @@ void proto_register_nbap(void)
 	expert_register_field_array(expert_nbap, ei, array_length(ei));
 
 	/* Register dissector */
-	new_register_dissector("nbap", dissect_nbap, proto_nbap);
+	register_dissector("nbap", dissect_nbap, proto_nbap);
 
 	nbap_module = prefs_register_protocol(proto_nbap, NULL);
 
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 93fc6b9a93..cb616ba525 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -990,8 +990,8 @@ void proto_reg_handoff_ocsp(void) {
 	dissector_handle_t ocsp_request_handle;
 	dissector_handle_t ocsp_response_handle;
 
-	ocsp_request_handle = new_create_dissector_handle(dissect_ocsp_request, proto_ocsp);
-	ocsp_response_handle = new_create_dissector_handle(dissect_ocsp_response, proto_ocsp);
+	ocsp_request_handle = create_dissector_handle(dissect_ocsp_request, proto_ocsp);
+	ocsp_response_handle = create_dissector_handle(dissect_ocsp_response, proto_ocsp);
 
 	dissector_add_string("media_type", "application/ocsp-request", ocsp_request_handle);
 	dissector_add_string("media_type", "application/ocsp-response", ocsp_response_handle);
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c
index 747dc61c37..39b7a77d0c 100644
--- a/epan/dissectors/packet-p1.c
+++ b/epan/dissectors/packet-p1.c
@@ -11095,7 +11095,7 @@ void proto_register_p1(void) {
 
   /* Register protocol */
   proto_p1 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("p1", dissect_p1, proto_p1);
+  register_dissector("p1", dissect_p1, proto_p1);
 
   proto_p3 = proto_register_protocol("X.411 Message Access Service", "P3", "p3");
 
diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c
index e298cb07cc..0c481ea4c1 100644
--- a/epan/dissectors/packet-p22.c
+++ b/epan/dissectors/packet-p22.c
@@ -6357,7 +6357,7 @@ void proto_register_p22(void) {
 
   /* Register protocol */
   proto_p22 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("p22", dissect_p22, proto_p22);
+  register_dissector("p22", dissect_p22, proto_p22);
   /* Register fields and subtrees */
   proto_register_field_array(proto_p22, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c
index a30ef711f4..3eb25dc533 100644
--- a/epan/dissectors/packet-p772.c
+++ b/epan/dissectors/packet-p772.c
@@ -1685,7 +1685,7 @@ void proto_register_p772(void) {
 
   /* Register protocol */
   proto_p772 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("p772", dissect_p772, proto_p772);
+  register_dissector("p772", dissect_p772, proto_p772);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_p772, hf, array_length(hf));
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 263c680c46..7797f32f94 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -18718,7 +18718,7 @@ void proto_register_pcap(void) {
   pcap_module = prefs_register_protocol(proto_pcap, proto_reg_handoff_pcap);
 
   /* Register dissector */
-  new_register_dissector("pcap", dissect_pcap, proto_pcap);
+  register_dissector("pcap", dissect_pcap, proto_pcap);
 
   /* Register dissector tables */
   pcap_ies_dissector_table = register_dissector_table("pcap.ies", "PCAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 72629fa9f2..b92179b523 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -558,7 +558,7 @@ dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 	/* we change the CMS id-data dissector to dissect as AuthenticatedSafe
 	   not sure why PKCS#12 couldn't have used its own content type OID for AuthenticatedSafe */
-	dissector_handle=new_create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
+	dissector_handle=create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
 	dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
 
 	  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
@@ -584,7 +584,7 @@ dissect_pkcs12_AuthenticatedSafe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 	dissector_handle_t dissector_handle;
 
 	/* we change the CMS id-data dissector to dissect as SafeContents */
-	dissector_handle=new_create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
+	dissector_handle=create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
 	dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
 
 	  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
@@ -799,7 +799,7 @@ dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
 
-	dissector_handle=new_create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
+	dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
 	dissector_change_string("ber.oid", object_identifier_id, dissector_handle);
 
 	PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index a2f6bfe2ba..d90cdf18dd 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -577,10 +577,10 @@ void proto_reg_handoff_pkixtsp(void) {
 	dissector_handle_t timestamp_reply_handle;
 	dissector_handle_t timestamp_query_handle;
 
-	timestamp_reply_handle = new_create_dissector_handle(dissect_timestamp_reply, proto_pkixtsp);
+	timestamp_reply_handle = create_dissector_handle(dissect_timestamp_reply, proto_pkixtsp);
 	dissector_add_string("media_type", "application/timestamp-reply", timestamp_reply_handle);
 
-	timestamp_query_handle = new_create_dissector_handle(dissect_timestamp_query, proto_pkixtsp);
+	timestamp_query_handle = create_dissector_handle(dissect_timestamp_query, proto_pkixtsp);
 	dissector_add_string("media_type", "application/timestamp-query", timestamp_query_handle);
 
 
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 5bad67d226..1da1c0ed5f 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1925,7 +1925,7 @@ void proto_register_pres(void) {
 
   /* Register protocol */
   proto_pres = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("pres", dissect_pres, proto_pres);
+  register_dissector("pres", dissect_pres, proto_pres);
 
   /* Register connectionless protocol (just for the description) */
   proto_clpres = proto_register_protocol(CLPNAME, CLPSNAME, CLPFNAME);
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index eaa0e39120..af91aa1782 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -834,7 +834,7 @@ void proto_register_q932_ros(void) {
   expert_q932_ros = expert_register_protocol(proto_q932_ros);
   expert_register_field_array(expert_q932_ros, ei, array_length(ei));
 
-  new_register_dissector(PFNAME, dissect_q932_ros, proto_q932_ros);
+  register_dissector(PFNAME, dissect_q932_ros, proto_q932_ros);
 }
 
 /*--- proto_reg_handoff_q932_ros --------------------------------------------*/
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 4c3e4d4031..f532865b76 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -1026,7 +1026,7 @@ void proto_register_q932(void) {
 
   /* Register protocol and dissector */
   proto_q932 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("q932.apdu", dissect_q932_apdu, proto_q932);
+  register_dissector("q932.apdu", dissect_q932_apdu, proto_q932);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_q932, hf, array_length(hf));
@@ -1064,7 +1064,7 @@ void proto_reg_handoff_q932(void) {
   static gboolean q931_prefs_initialized = FALSE;
 
   if (!q931_prefs_initialized) {
-    q932_ie_handle = new_create_dissector_handle(dissect_q932_ie, proto_q932);
+    q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
     /* Facility */
     dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle);
     /* Notification indicator */
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 06d61f4f6e..2db2daeafc 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -16400,8 +16400,8 @@ void proto_reg_handoff_qsig(void) {
   q931_handle = find_dissector("q931");
   q931_ie_handle = find_dissector("q931.ie");
 
-  qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
-  qsig_res_handle = new_create_dissector_handle(dissect_qsig_res, proto_qsig);
+  qsig_arg_handle = create_dissector_handle(dissect_qsig_arg, proto_qsig);
+  qsig_res_handle = create_dissector_handle(dissect_qsig_res, proto_qsig);
   for (i=0; i<(int)array_length(qsig_op_tab); i++) {
     dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
     dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
@@ -16412,16 +16412,16 @@ void proto_reg_handoff_qsig(void) {
       dissector_add_string("q932.ros.global.res", oid, qsig_res_handle);
     }
   }
-  qsig_err_handle = new_create_dissector_handle(dissect_qsig_err, proto_qsig);
+  qsig_err_handle = create_dissector_handle(dissect_qsig_err, proto_qsig);
   for (i=0; i<(int)array_length(qsig_err_tab); i++) {
     dissector_add_uint("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
   }
 
-  qsig_ie_handle = new_create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
+  qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
   /* QSIG-TC - Transit counter */
   dissector_add_uint("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
 
-  qsig_ie_handle = new_create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
+  qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
   /* SSIG-BC - Party category */
   dissector_add_uint("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index c7de5c9f41..29ffe69be5 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -16492,7 +16492,7 @@ void proto_register_ranap(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("ranap", dissect_ranap, proto_ranap);
+  register_dissector("ranap", dissect_ranap, proto_ranap);
 
   /* Register dissector tables */
   ranap_ies_dissector_table = register_dissector_table("ranap.ies", "RANAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index 51041cd73d..53b74b12a1 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -55349,7 +55349,7 @@ void proto_register_rnsap(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("rnsap", dissect_rnsap, proto_rnsap);
+  register_dissector("rnsap", dissect_rnsap, proto_rnsap);
 
   /* Register dissector tables */
   rnsap_ies_dissector_table = register_dissector_table("rnsap.ies", "RNSAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 6db3a874a0..4009164517 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1272,7 +1272,7 @@ void proto_register_ros(void) {
 
   /* Register protocol */
   proto_ros = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("ros", dissect_ros, proto_ros);
+  register_dissector("ros", dissect_ros, proto_ros);
   /* Register fields and subtrees */
   proto_register_field_array(proto_ros, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 5ed37ce7bf..fef28d1bfd 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -204743,7 +204743,7 @@ void proto_register_rrc(void) {
   expert_rrc = expert_register_protocol(proto_rrc);
   expert_register_field_array(expert_rrc, ei, array_length(ei));
 
-  new_register_dissector("rrc", dissect_rrc, proto_rrc);
+  register_dissector("rrc", dissect_rrc, proto_rrc);
 
 
 /*--- Included file: packet-rrc-dis-reg.c ---*/
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 2c317ef3c8..2b46c30564 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -10672,7 +10672,7 @@ void proto_register_rrlp(void) {
 
   /* Register protocol */
   proto_rrlp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
+  register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_rrlp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 4f11458369..fcecfa587d 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -1045,7 +1045,7 @@ void proto_register_rtse(void) {
 
   /* Register protocol */
   proto_rtse = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("rtse", dissect_rtse, proto_rtse);
+  register_dissector("rtse", dissect_rtse, proto_rtse);
   /* Register fields and subtrees */
   proto_register_field_array(proto_rtse, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c
index d96af352d4..f8b646e940 100644
--- a/epan/dissectors/packet-rua.c
+++ b/epan/dissectors/packet-rua.c
@@ -1739,7 +1739,7 @@ module_t *rua_module;
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("rua", dissect_rua, proto_rua);
+  register_dissector("rua", dissect_rua, proto_rua);
 
   /* Register dissector tables */
   rua_ies_dissector_table = register_dissector_table("rua.ies", "RUA-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index ca07b92813..d3d07c4bd8 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -13390,7 +13390,7 @@ void proto_register_s1ap(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("s1ap", dissect_s1ap, proto_s1ap);
+  register_dissector("s1ap", dissect_s1ap, proto_s1ap);
 
   /* Register dissector tables */
   s1ap_ies_dissector_table = register_dissector_table("s1ap.ies", "S1AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index da08756dab..6dd34f001b 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -2269,8 +2269,8 @@ void proto_register_sabp(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("sabp", dissect_sabp, proto_sabp);
-  new_register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
+  register_dissector("sabp", dissect_sabp, proto_sabp);
+  register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
 
   /* Register dissector tables */
   sabp_ies_dissector_table = register_dissector_table("sabp.ies", "SABP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c
index 12f4989f49..dfdde7843b 100644
--- a/epan/dissectors/packet-sbc-ap.c
+++ b/epan/dissectors/packet-sbc-ap.c
@@ -1477,7 +1477,7 @@ proto_reg_handoff_sbc_ap(void)
 	static guint SctpPort;
 
     if( !inited ) {
-        sbc_ap_handle = new_create_dissector_handle(dissect_sbc_ap, proto_sbc_ap);
+        sbc_ap_handle = create_dissector_handle(dissect_sbc_ap, proto_sbc_ap);
         dissector_add_uint("sctp.ppi", SBC_AP_PAYLOAD_PROTOCOL_ID,   sbc_ap_handle);
         inited = TRUE;
 
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 2a91522b07..6e6c5d50fe 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -730,7 +730,7 @@ void proto_register_smrse(void) {
 void proto_reg_handoff_smrse(void) {
   dissector_handle_t smrse_handle;
 
-  smrse_handle = new_create_dissector_handle(dissect_smrse, proto_smrse);
+  smrse_handle = create_dissector_handle(dissect_smrse, proto_smrse);
   dissector_add_uint("tcp.port",TCP_PORT_SMRSE, smrse_handle);
 }
 
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 4b7ffadc0b..efaa27ab03 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -4035,7 +4035,7 @@ void proto_register_snmp(void) {
 
 	/* Register protocol */
 	proto_snmp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-	new_register_dissector("snmp", dissect_snmp, proto_snmp);
+	register_dissector("snmp", dissect_snmp, proto_snmp);
 
 	/* Register fields and subtrees */
 	proto_register_field_array(proto_snmp, hf, array_length(hf));
@@ -4104,7 +4104,7 @@ void proto_reg_handoff_snmp(void) {
 	dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
 	dissector_add_uint("hpext.dxsap", HPEXT_SNMP, snmp_handle);
 
-	snmp_tcp_handle = new_create_dissector_handle(dissect_snmp_tcp, proto_snmp);
+	snmp_tcp_handle = create_dissector_handle(dissect_snmp_tcp, proto_snmp);
 	dissector_add_uint("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
 	dissector_add_uint("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
 
@@ -4112,10 +4112,10 @@ void proto_reg_handoff_snmp(void) {
 
 	/* SNMPv2-MIB sysDescr "1.3.6.1.2.1.1.1.0" */
 	dissector_add_string("snmp.variable_oid", "1.3.6.1.2.1.1.1.0",
-		new_create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
+		create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
 	/* SNMPv2-MIB::sysName.0 (1.3.6.1.2.1.1.5.0) */
 	dissector_add_string("snmp.variable_oid", "1.3.6.1.2.1.1.5.0",
-		new_create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
+		create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
 
 	/*
 	 * Process preference settings.
@@ -4147,7 +4147,7 @@ proto_reg_handoff_smux(void)
 {
 	dissector_handle_t smux_handle;
 
-	smux_handle = new_create_dissector_handle(dissect_smux, proto_smux);
+	smux_handle = create_dissector_handle(dissect_smux, proto_smux);
 	dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
 }
 
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 9b660f41a7..c77da81528 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1997,14 +1997,14 @@ void proto_register_spnego(void) {
 	/* Register protocol */
 	proto_spnego = proto_register_protocol(PNAME, PSNAME, PFNAME);
 
-	new_register_dissector("spnego", dissect_spnego, proto_spnego);
+	register_dissector("spnego", dissect_spnego, proto_spnego);
 
 	proto_spnego_krb5 = proto_register_protocol("SPNEGO-KRB5",
 						    "SPNEGO-KRB5",
 						    "spnego-krb5");
 
-	new_register_dissector("spnego-krb5", dissect_spnego_krb5, proto_spnego_krb5);
-	new_register_dissector("spnego-krb5-wrap", dissect_spnego_krb5_wrap, proto_spnego_krb5);
+	register_dissector("spnego-krb5", dissect_spnego_krb5, proto_spnego_krb5);
+	register_dissector("spnego-krb5-wrap", dissect_spnego_krb5_wrap, proto_spnego_krb5);
 
 	/* Register fields and subtrees */
 	proto_register_field_array(proto_spnego, hf, array_length(hf));
@@ -2023,7 +2023,7 @@ void proto_reg_handoff_spnego(void) {
 	/* Register protocol with GSS-API module */
 
         spnego_handle = find_dissector("spnego");
-	spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap,  proto_spnego);
+	spnego_wrap_handle = create_dissector_handle(dissect_spnego_wrap,  proto_spnego);
 	gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego,
 	    spnego_handle, spnego_wrap_handle,
 	    "SPNEGO - Simple Protected Negotiation");
diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 2582bbb82f..348bb6d5b3 100644
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -635,7 +635,7 @@ void proto_register_sv(void) {
 
 	/* Register protocol */
 	proto_sv = proto_register_protocol(PNAME, PSNAME, PFNAME);
-	new_register_dissector("sv", dissect_sv, proto_sv);
+	register_dissector("sv", dissect_sv, proto_sv);
 
 	/* Register fields and subtrees */
 	proto_register_field_array(proto_sv, hf, array_length(hf));
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index f2a52ddff2..edbd34a57f 100644
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -2888,7 +2888,7 @@ register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int pro
 {
   dissector_handle_t dissector_handle;
 
-  dissector_handle=new_create_dissector_handle(dissector, proto);
+  dissector_handle=create_dissector_handle(dissector, proto);
   dissector_add_string("t124.ns", nsKey, dissector_handle);
 }
 
@@ -2901,7 +2901,7 @@ void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param,
 
   dissector_handle_t dissector_handle;
 
-  dissector_handle=new_create_dissector_handle(dissector, proto);
+  dissector_handle=create_dissector_handle(dissector, proto);
   dissector_add_uint("t124.sd", channelId_param, dissector_handle);
 
 }
@@ -4015,7 +4015,7 @@ void proto_register_t124(void) {
   t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
   t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
-  new_register_dissector("t124", dissect_t124, proto_t124);
+  register_dissector("t124", dissect_t124, proto_t124);
 
 }
 
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 584d5e4f10..ba10e7a987 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -586,7 +586,7 @@ void proto_register_t125(void) {
 
   t125_heur_subdissector_list= register_heur_dissector_list("t125");
 
-  new_register_dissector("t125", dissect_t125, proto_t125);
+  register_dissector("t125", dissect_t125, proto_t125);
 }
 
 
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index a84492a138..4527d635b5 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1402,7 +1402,7 @@ proto_register_t38(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_t38 = expert_register_protocol(proto_t38);
 	expert_register_field_array(expert_t38, ei, array_length(ei));
-	new_register_dissector("t38_udp", dissect_t38_udp, proto_t38);
+	register_dissector("t38_udp", dissect_t38_udp, proto_t38);
 
 	/* Init reassemble tables for HDLC */
 	register_init_routine(t38_defragment_init);
@@ -1458,9 +1458,9 @@ proto_reg_handoff_t38(void)
 	static guint udp_port;
 
 	if (!t38_prefs_initialized) {
-		t38_udp_handle=new_create_dissector_handle(dissect_t38_udp, proto_t38);
-		t38_tcp_handle=new_create_dissector_handle(dissect_t38_tcp, proto_t38);
-		t38_tcp_pdu_handle=new_create_dissector_handle(dissect_t38_tcp_pdu, proto_t38);
+		t38_udp_handle=create_dissector_handle(dissect_t38_udp, proto_t38);
+		t38_tcp_handle=create_dissector_handle(dissect_t38_tcp, proto_t38);
+		t38_tcp_pdu_handle=create_dissector_handle(dissect_t38_tcp_pdu, proto_t38);
 		rtp_handle = find_dissector("rtp");
 		t30_hdlc_handle = find_dissector("t30.hdlc");
 		data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index b4052090ac..ec686164a4 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -3801,9 +3801,9 @@ proto_register_tcap(void)
   itu_sub_dissectors = g_hash_table_new(g_direct_hash,g_direct_equal);
 
   /* 'globally' register dissector */
-  new_register_dissector("tcap", dissect_tcap, proto_tcap);
+  register_dissector("tcap", dissect_tcap, proto_tcap);
 
-  tcap_handle = new_create_dissector_handle(dissect_tcap, proto_tcap);
+  tcap_handle = create_dissector_handle(dissect_tcap, proto_tcap);
 
   register_init_routine(&init_tcap);
   register_cleanup_routine(&cleanup_tcap);
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index e43689e9a7..f784c08fff 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -9275,7 +9275,7 @@ void proto_reg_handoff_tetra(void)
 
 	if (!initialized) {
 		data_handle = find_dissector("data");
-		tetra_handle = new_create_dissector_handle(dissect_tetra, proto_tetra);
+		tetra_handle = create_dissector_handle(dissect_tetra, proto_tetra);
 		dissector_add_uint("udp.port", global_tetra_port, tetra_handle);
 	}
 
@@ -12012,7 +12012,7 @@ void proto_register_tetra (void)
 	proto_tetra = proto_register_protocol("TETRA Protocol", "tetra", "tetra");
 	proto_register_field_array (proto_tetra, hf, array_length (hf));
 	proto_register_subtree_array (ett, array_length (ett));
-	new_register_dissector("tetra", dissect_tetra, proto_tetra);
+	register_dissector("tetra", dissect_tetra, proto_tetra);
 	expert_tetra = expert_register_protocol(proto_tetra);
 	expert_register_field_array(expert_tetra, ei, array_length(ei));
 
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index b18061d547..eb2784446d 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -9339,7 +9339,7 @@ void proto_register_ulp(void) {
 
   /* Register protocol */
   proto_ulp = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("ulp", dissect_ulp_tcp, proto_ulp);
+  register_dissector("ulp", dissect_ulp_tcp, proto_ulp);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_ulp, hf, array_length(hf));
@@ -9379,7 +9379,7 @@ proto_reg_handoff_ulp(void)
   if (!initialized) {
     ulp_tcp_handle = find_dissector("ulp");
     dissector_add_string("media_type","application/oma-supl-ulp", ulp_tcp_handle);
-    ulp_udp_handle = new_create_dissector_handle(dissect_ULP_PDU_PDU, proto_ulp);
+    ulp_udp_handle = create_dissector_handle(dissect_ULP_PDU_PDU, proto_ulp);
     rrlp_handle = find_dissector("rrlp");
     lpp_handle = find_dissector("lpp");
     initialized = TRUE;
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 023aa7ff34..cb04422ced 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -7905,7 +7905,7 @@ void proto_register_x2ap(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector */
-  new_register_dissector("x2ap", dissect_x2ap, proto_x2ap);
+  register_dissector("x2ap", dissect_x2ap, proto_x2ap);
 
   /* Register dissector tables */
   x2ap_ies_dissector_table = register_dissector_table("x2ap.ies", "X2AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index df85060a5a..dc8851266e 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1355,7 +1355,7 @@ void proto_register_x509af(void) {
 void proto_reg_handoff_x509af(void) {
 	dissector_handle_t pkix_crl_handle;
 
-	pkix_crl_handle = new_create_dissector_handle(dissect_pkix_crl, proto_x509af);
+	pkix_crl_handle = create_dissector_handle(dissect_pkix_crl, proto_x509af);
 	dissector_add_string("media_type", "application/pkix-crl", pkix_crl_handle);
 
 
@@ -1406,15 +1406,15 @@ void proto_reg_handoff_x509af(void) {
 
 	/* these will generally be encoded as ";binary" in LDAP */
 
-	dissector_add_string("ldap.name", "cACertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
-	dissector_add_string("ldap.name", "userCertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "cACertificate", create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "userCertificate", create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
 
-	dissector_add_string("ldap.name", "certificateRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
-	dissector_add_string("ldap.name", "crl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "certificateRevocationList", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "crl", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
 
-	dissector_add_string("ldap.name", "authorityRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
-	dissector_add_string("ldap.name", "arl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "authorityRevocationList", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "arl", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
 
-	dissector_add_string("ldap.name", "crossCertificatePair", new_create_dissector_handle(dissect_CertificatePair_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "crossCertificatePair", create_dissector_handle(dissect_CertificatePair_PDU, proto_x509af));
 }
 
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index adc5843f81..7749856e8a 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1957,11 +1957,11 @@ x509ce_enable_ciplus(void)
 {
 	dissector_handle_t dh25, dh26, dh27;
 
-	dh25 = new_create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
+	dh25 = create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
 	dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.25", dh25);
-	dh26 = new_create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
+	dh26 = create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
 	dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.26", dh26);
-	dh27 = new_create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
+	dh27 = create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
 	dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.27", dh27);
 }