new_register_dissector -> register_dissector for remaining uses.

Mostly plugins, but also LUA and generated skinny dissector.

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

71 files changed, 74 insertions, 74 deletions

diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c
index ad69e3a7d3..4741464f80 100644
--- a/plugins/docsis/packet-bintrngreq.c
+++ b/plugins/docsis/packet-bintrngreq.c
@@ -127,7 +127,7 @@ proto_register_docsis_bintrngreq (void)
   proto_register_field_array (proto_docsis_bintrngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_bintrngreq", dissect_bintrngreq, proto_docsis_bintrngreq);
+  register_dissector ("docsis_bintrngreq", dissect_bintrngreq, proto_docsis_bintrngreq);
 }
 
 void
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 769c59ecab..edc7a987d7 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -534,7 +534,7 @@ proto_register_docsis_bpkmattr (void)
   proto_register_field_array (proto_docsis_bpkmattr, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_bpkmattr", dissect_bpkmattr,
+  register_dissector ("docsis_bpkmattr", dissect_bpkmattr,
                       proto_docsis_bpkmattr);
 }
 
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index 3a5697933d..ae56563c01 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -125,7 +125,7 @@ proto_register_docsis_bpkmreq (void)
   proto_register_field_array (proto_docsis_bpkmreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_bpkmreq", dissect_bpkmreq,
+  register_dissector ("docsis_bpkmreq", dissect_bpkmreq,
                       proto_docsis_bpkmreq);
 }
 
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index 48a1785f93..962534b5d3 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -127,7 +127,7 @@ proto_register_docsis_bpkmrsp (void)
   proto_register_field_array (proto_docsis_bpkmrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_bpkmrsp", dissect_bpkmrsp,
+  register_dissector ("docsis_bpkmrsp", dissect_bpkmrsp,
                       proto_docsis_bpkmrsp);
 }
 
diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c
index 1c9e569865..8b97240fc8 100644
--- a/plugins/docsis/packet-cmctrlreq.c
+++ b/plugins/docsis/packet-cmctrlreq.c
@@ -89,7 +89,7 @@ proto_register_docsis_cmctrlreq (void)
   proto_register_field_array (proto_docsis_cmctrlreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_cmctrlreq", dissect_cmctrlreq, proto_docsis_cmctrlreq);
+  register_dissector ("docsis_cmctrlreq", dissect_cmctrlreq, proto_docsis_cmctrlreq);
 }
 
 void
diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c
index 8d8f396238..86590eb7f6 100644
--- a/plugins/docsis/packet-cmctrlrsp.c
+++ b/plugins/docsis/packet-cmctrlrsp.c
@@ -97,7 +97,7 @@ proto_register_docsis_cmctrlrsp (void)
   proto_register_field_array (proto_docsis_cmctrlrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_cmctrlrsp", dissect_cmctrlrsp, proto_docsis_cmctrlrsp);
+  register_dissector ("docsis_cmctrlrsp", dissect_cmctrlrsp, proto_docsis_cmctrlrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-cmstatus.c b/plugins/docsis/packet-cmstatus.c
index bd9f8a4d5a..9c8db4e80c 100644
--- a/plugins/docsis/packet-cmstatus.c
+++ b/plugins/docsis/packet-cmstatus.c
@@ -265,7 +265,7 @@ static gint *ett[] = {
 
   proto_register_field_array (proto_docsis_cmstatus, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
-  new_register_dissector ("docsis_cmstatus", dissect_cmstatus, proto_docsis_cmstatus);
+  register_dissector ("docsis_cmstatus", dissect_cmstatus, proto_docsis_cmstatus);
 }
 
 void
diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c
index 0acd7c1416..c00e48c8e2 100644
--- a/plugins/docsis/packet-dbcack.c
+++ b/plugins/docsis/packet-dbcack.c
@@ -88,7 +88,7 @@ proto_register_docsis_dbcack (void)
   proto_register_field_array (proto_docsis_dbcack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dbcack", dissect_dbcack, proto_docsis_dbcack);
+  register_dissector ("docsis_dbcack", dissect_dbcack, proto_docsis_dbcack);
 }
 
 void
diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c
index 059b0a9b4f..e50e08af57 100644
--- a/plugins/docsis/packet-dbcreq.c
+++ b/plugins/docsis/packet-dbcreq.c
@@ -104,7 +104,7 @@ proto_register_docsis_dbcreq (void)
   proto_register_field_array (proto_docsis_dbcreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dbcreq", dissect_dbcreq, proto_docsis_dbcreq);
+  register_dissector ("docsis_dbcreq", dissect_dbcreq, proto_docsis_dbcreq);
 }
 
 void
diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c
index 8702d0190e..c8f8b866ab 100644
--- a/plugins/docsis/packet-dbcrsp.c
+++ b/plugins/docsis/packet-dbcrsp.c
@@ -101,7 +101,7 @@ proto_register_docsis_dbcrsp (void)
   proto_register_field_array (proto_docsis_dbcrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dbcrsp", dissect_dbcrsp, proto_docsis_dbcrsp);
+  register_dissector ("docsis_dbcrsp", dissect_dbcrsp, proto_docsis_dbcrsp);
 }
 
 
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index 922df79649..c93882c9ed 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -146,7 +146,7 @@ proto_register_docsis_dccack (void)
   proto_register_field_array (proto_docsis_dccack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dccack", dissect_dccack, proto_docsis_dccack);
+  register_dissector ("docsis_dccack", dissect_dccack, proto_docsis_dccack);
 }
 
 void
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index 7adfafa31c..d90a7af82f 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -577,7 +577,7 @@ proto_register_docsis_dccreq (void)
   proto_register_field_array (proto_docsis_dccreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dccreq", dissect_dccreq, proto_docsis_dccreq);
+  register_dissector ("docsis_dccreq", dissect_dccreq, proto_docsis_dccreq);
 }
 
 void
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index bb3b8088ff..ecc7e20142 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -235,7 +235,7 @@ proto_register_docsis_dccrsp (void)
   proto_register_field_array (proto_docsis_dccrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dccrsp", dissect_dccrsp, proto_docsis_dccrsp);
+  register_dissector ("docsis_dccrsp", dissect_dccrsp, proto_docsis_dccrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index c9077fe8ed..7af0c0ff0d 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -843,7 +843,7 @@ proto_register_docsis_dcd (void)
   proto_register_field_array (proto_docsis_dcd, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dcd", dissect_dcd, proto_docsis_dcd);
+  register_dissector ("docsis_dcd", dissect_dcd, proto_docsis_dcd);
 }
 
 void
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index c922883eb3..2e229b894d 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -829,7 +829,7 @@ proto_register_docsis (void)
   proto_register_field_array (proto_docsis, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis", dissect_docsis, proto_docsis);
+  register_dissector ("docsis", dissect_docsis, proto_docsis);
 }
 
 void
diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c
index d39f189053..4b2fff6cd4 100644
--- a/plugins/docsis/packet-dpvreq.c
+++ b/plugins/docsis/packet-dpvreq.c
@@ -150,7 +150,7 @@ proto_register_docsis_dpvreq (void)
   proto_register_field_array (proto_docsis_dpvreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dpvreq", dissect_dpvreq, proto_docsis_dpvreq);
+  register_dissector ("docsis_dpvreq", dissect_dpvreq, proto_docsis_dpvreq);
 }
 
 void
diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c
index bdc9dcc3eb..73dd0331eb 100644
--- a/plugins/docsis/packet-dpvrsp.c
+++ b/plugins/docsis/packet-dpvrsp.c
@@ -150,7 +150,7 @@ proto_register_docsis_dpvrsp (void)
   proto_register_field_array (proto_docsis_dpvrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dpvrsp", dissect_dpvrsp, proto_docsis_dpvrsp);
+  register_dissector ("docsis_dpvrsp", dissect_dpvrsp, proto_docsis_dpvrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index d7bca465df..25d595c065 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -102,7 +102,7 @@ proto_register_docsis_dsaack (void)
   proto_register_field_array (proto_docsis_dsaack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dsaack", dissect_dsaack, proto_docsis_dsaack);
+  register_dissector ("docsis_dsaack", dissect_dsaack, proto_docsis_dsaack);
 }
 
 void
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index 5f4cb3eb50..f821ad3874 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -89,7 +89,7 @@ proto_register_docsis_dsareq (void)
   proto_register_field_array (proto_docsis_dsareq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dsareq", dissect_dsareq, proto_docsis_dsareq);
+  register_dissector ("docsis_dsareq", dissect_dsareq, proto_docsis_dsareq);
 }
 
 void
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 7fc705ef23..6f1edd3f5c 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -102,7 +102,7 @@ proto_register_docsis_dsarsp (void)
   proto_register_field_array (proto_docsis_dsarsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dsarsp", dissect_dsarsp, proto_docsis_dsarsp);
+  register_dissector ("docsis_dsarsp", dissect_dsarsp, proto_docsis_dsarsp);
 }
 
 void
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index cdcec0c8a8..b22a2cb3c6 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -101,7 +101,7 @@ proto_register_docsis_dscack (void)
   proto_register_field_array (proto_docsis_dscack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack);
+  register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack);
 }
 
 void
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index 6a1d302067..59be9668f2 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -89,7 +89,7 @@ proto_register_docsis_dscreq (void)
   proto_register_field_array (proto_docsis_dscreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dscreq", dissect_dscreq, proto_docsis_dscreq);
+  register_dissector ("docsis_dscreq", dissect_dscreq, proto_docsis_dscreq);
 }
 
 void
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index c34fbe5e76..ac52d2887e 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -102,7 +102,7 @@ proto_register_docsis_dscrsp (void)
   proto_register_field_array (proto_docsis_dscrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dscrsp", dissect_dscrsp, proto_docsis_dscrsp);
+  register_dissector ("docsis_dscrsp", dissect_dscrsp, proto_docsis_dscrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index 6dac22aa4c..e059fc8f7c 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -105,7 +105,7 @@ proto_register_docsis_dsdreq (void)
   proto_register_field_array (proto_docsis_dsdreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dsdreq", dissect_dsdreq, proto_docsis_dsdreq);
+  register_dissector ("docsis_dsdreq", dissect_dsdreq, proto_docsis_dsdreq);
 }
 
 void
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index dbcf7a18c5..095786aa15 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -105,7 +105,7 @@ proto_register_docsis_dsdrsp (void)
   proto_register_field_array (proto_docsis_dsdrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_dsdrsp", dissect_dsdrsp, proto_docsis_dsdrsp);
+  register_dissector ("docsis_dsdrsp", dissect_dsdrsp, proto_docsis_dsdrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index b76fc2d715..55bce76b2d 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -100,7 +100,7 @@ proto_register_docsis_intrngreq (void)
   proto_register_field_array (proto_docsis_intrngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_intrngreq", dissect_intrngreq, proto_docsis_intrngreq);
+  register_dissector ("docsis_intrngreq", dissect_intrngreq, proto_docsis_intrngreq);
 }
 
 void
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 0285b6848c..6834118df5 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -267,7 +267,7 @@ proto_register_docsis_mgmt (void)
   proto_register_field_array (proto_docsis_mgmt, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt);
+  register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt);
 }
 
 void
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index e5d8765383..362aa37bd2 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -261,7 +261,7 @@ proto_register_docsis_map (void)
   proto_register_field_array (proto_docsis_map, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_map", dissect_map, proto_docsis_map);
+  register_dissector ("docsis_map", dissect_map, proto_docsis_map);
 }
 
 void
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index 4c17e4d083..5fda1f096a 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -735,7 +735,7 @@ void proto_register_docsis_mdd (void)
   proto_register_field_array (proto_docsis_mdd, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_mdd", dissect_mdd, proto_docsis_mdd);
+  register_dissector ("docsis_mdd", dissect_mdd, proto_docsis_mdd);
 }
 
 void
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 05d8210fbe..861462fdb6 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -102,7 +102,7 @@ proto_register_docsis_regack (void)
   proto_register_field_array (proto_docsis_regack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_regack", dissect_regack, proto_docsis_regack);
+  register_dissector ("docsis_regack", dissect_regack, proto_docsis_regack);
 }
 
 void
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index 1608ff178f..03244259e1 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -90,7 +90,7 @@ proto_register_docsis_regreq (void)
   proto_register_field_array (proto_docsis_regreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_regreq", dissect_regreq, proto_docsis_regreq);
+  register_dissector ("docsis_regreq", dissect_regreq, proto_docsis_regreq);
 }
 
 void
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index ebf20fd7ae..869a3b0042 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -102,7 +102,7 @@ proto_register_docsis_regreqmp (void)
   proto_register_field_array (proto_docsis_regreqmp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_regreqmp", dissect_regreqmp, proto_docsis_regreqmp);
+  register_dissector ("docsis_regreqmp", dissect_regreqmp, proto_docsis_regreqmp);
 }
 
 void
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index fdc7d6c186..f5645fa2f8 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -102,7 +102,7 @@ proto_register_docsis_regrsp (void)
   proto_register_field_array (proto_docsis_regrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_regrsp", dissect_regrsp, proto_docsis_regrsp);
+  register_dissector ("docsis_regrsp", dissect_regrsp, proto_docsis_regrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index 816c7006cb..b7e70b8c77 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -110,7 +110,7 @@ proto_register_docsis_regrspmp (void)
   proto_register_field_array (proto_docsis_regrspmp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp);
+  register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp);
 }
 
 void
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index 9ee6d8e5f1..dbcafc5c5b 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -103,7 +103,7 @@ proto_register_docsis_rngreq (void)
   proto_register_field_array (proto_docsis_rngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_rngreq", dissect_rngreq, proto_docsis_rngreq);
+  register_dissector ("docsis_rngreq", dissect_rngreq, proto_docsis_rngreq);
 }
 
 void
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index e0578d93db..596efd0f9e 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -260,7 +260,7 @@ proto_register_docsis_rngrsp (void)
   proto_register_field_array (proto_docsis_rngrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_rngrsp", dissect_rngrsp, proto_docsis_rngrsp);
+  register_dissector ("docsis_rngrsp", dissect_rngrsp, proto_docsis_rngrsp);
 }
 
 
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index c5d83113f8..bb97cf4001 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -80,7 +80,7 @@ proto_register_docsis_sync (void)
   proto_register_field_array (proto_docsis_sync, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_sync", dissect_sync, proto_docsis_sync);
+  register_dissector ("docsis_sync", dissect_sync, proto_docsis_sync);
 }
 
 void
diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c
index fe5e932eb5..0a201823ad 100644
--- a/plugins/docsis/packet-tlv-cmctrl.c
+++ b/plugins/docsis/packet-tlv-cmctrl.c
@@ -327,7 +327,7 @@ proto_register_cmctrl_tlv (void)
   proto_register_field_array (proto_cmctrl_tlv, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("cmctrl_tlv", dissect_cmctrl_tlv, proto_cmctrl_tlv);
+  register_dissector ("cmctrl_tlv", dissect_cmctrl_tlv, proto_cmctrl_tlv);
 }
 
 void
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index a54f193238..7a31c7defb 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -6003,7 +6003,7 @@ proto_register_docsis_tlv (void)
   proto_register_field_array (proto_docsis_tlv, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_tlv", dissect_tlv, proto_docsis_tlv);
+  register_dissector ("docsis_tlv", dissect_tlv, proto_docsis_tlv);
 }
 
 void
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index 00e6594171..f74ae0b953 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -1081,7 +1081,7 @@ proto_register_docsis_type29ucd (void)
   expert_docsis_type29ucd = expert_register_protocol(proto_docsis_type29ucd);
   expert_register_field_array(expert_docsis_type29ucd, ei, array_length(ei));
 
-  new_register_dissector ("docsis_type29ucd", dissect_type29ucd, proto_docsis_type29ucd);
+  register_dissector ("docsis_type29ucd", dissect_type29ucd, proto_docsis_type29ucd);
 }
 
 void
diff --git a/plugins/docsis/packet-type35ucd.c b/plugins/docsis/packet-type35ucd.c
index b31be93a0b..d09ab4554d 100644
--- a/plugins/docsis/packet-type35ucd.c
+++ b/plugins/docsis/packet-type35ucd.c
@@ -1158,7 +1158,7 @@ proto_register_docsis_type35ucd (void)
   expert_docsis_type35ucd = expert_register_protocol(proto_docsis_type35ucd);
   expert_register_field_array(expert_docsis_type35ucd, ei, array_length(ei));
 
-  new_register_dissector ("docsis_type35ucd", dissect_type35ucd, proto_docsis_type35ucd);
+  register_dissector ("docsis_type35ucd", dissect_type35ucd, proto_docsis_type35ucd);
 }
 
 void
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index 5a3dfe9659..ddc071d691 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -90,7 +90,7 @@ proto_register_docsis_uccreq (void)
   proto_register_field_array (proto_docsis_uccreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_uccreq", dissect_uccreq, proto_docsis_uccreq);
+  register_dissector ("docsis_uccreq", dissect_uccreq, proto_docsis_uccreq);
 }
 
 void
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index 3252788587..b5e862aa5a 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -85,7 +85,7 @@ proto_register_docsis_uccrsp (void)
   proto_register_field_array (proto_docsis_uccrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_uccrsp", dissect_uccrsp, proto_docsis_uccrsp);
+  register_dissector ("docsis_uccrsp", dissect_uccrsp, proto_docsis_uccrsp);
 }
 
 void
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index aaccd67afe..ec449b6119 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -996,7 +996,7 @@ proto_register_docsis_ucd (void)
   expert_docsis_ucd = expert_register_protocol(proto_docsis_ucd);
   expert_register_field_array(expert_docsis_ucd, ei, array_length(ei));
 
-  new_register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd);
+  register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd);
 }
 
 void
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index 89769649a0..e87ae16e42 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -254,7 +254,7 @@ proto_register_docsis_vsif (void)
   proto_register_field_array (proto_docsis_vsif, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  new_register_dissector ("docsis_vsif", dissect_vsif, proto_docsis_vsif);
+  register_dissector ("docsis_vsif", dissect_vsif, proto_docsis_vsif);
 }
 
 void
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 214a443abd..73a77117e8 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -1225,7 +1225,7 @@ void proto_register_ams(void)
    proto_register_field_array(proto_ams, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   new_register_dissector("ams", dissect_ams, proto_ams);
+   register_dissector("ams", dissect_ams, proto_ams);
 }
 
 /* The registration hand-off routing */
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index ba8c525c29..15e8c91716 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -1942,7 +1942,7 @@ void proto_register_ecat_mailbox(void)
    proto_register_field_array(proto_ecat_mailbox, hf,array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   new_register_dissector("ecat_mailbox", dissect_ecat_mailbox, proto_ecat_mailbox);
+   register_dissector("ecat_mailbox", dissect_ecat_mailbox, proto_ecat_mailbox);
 }
 
 void proto_reg_handoff_ecat_mailbox(void)
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c
index dc67ee747d..ead258c0d3 100644
--- a/plugins/ethercat/packet-esl.c
+++ b/plugins/ethercat/packet-esl.c
@@ -354,7 +354,7 @@ proto_register_esl(void) {
     proto_register_field_array(proto_esl,hf,array_length(hf));
     proto_register_subtree_array(ett,array_length(ett));
 
-    new_register_dissector("esl", dissect_esl_header, proto_esl);
+    register_dissector("esl", dissect_esl_header, proto_esl);
 }
 
 void
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 8fb5d3c83e..ca3f5e4c46 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -135,7 +135,7 @@ void proto_register_ethercat_frame(void)
    proto_register_field_array(proto_ethercat_frame,hf,array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   new_register_dissector("ecatf", dissect_ethercat_frame, proto_ethercat_frame);
+   register_dissector("ecatf", dissect_ethercat_frame, proto_ethercat_frame);
 
    /* Define a handle (ecatf.type) for sub dissectors that want to dissect
       the Ethercat frame ether type (E88A4) payload. */
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index 9a75380f21..7458f19e25 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -402,8 +402,8 @@ void proto_register_ircomm(void)
 
     /* Register protocol names and descriptions */
     proto_ircomm = proto_register_protocol("IrCOMM Protocol", "IrCOMM", "ircomm");
-    new_register_dissector("ircomm_raw", dissect_raw_ircomm, proto_ircomm);
-    new_register_dissector("ircomm_cooked", dissect_cooked_ircomm, proto_ircomm);
+    register_dissector("ircomm_raw", dissect_raw_ircomm, proto_ircomm);
+    register_dissector("ircomm_cooked", dissect_cooked_ircomm, proto_ircomm);
 
     /* Required function calls to register the header fields */
     proto_register_field_array(proto_ircomm, hf_ircomm, array_length(hf_ircomm));
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 6430393b15..88213b42b1 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -2197,7 +2197,7 @@ void proto_register_irda(void)
     proto_ttp   = proto_register_protocol("Tiny Transport Protocol", "TTP", "ttp");
 
     /* Register the dissector */
-    new_register_dissector("irda", dissect_irda, proto_irlap);
+    register_dissector("irda", dissect_irda, proto_irlap);
 
     /* Required function calls to register the header fields */
     proto_register_field_array(proto_irlap, hf_lap, array_length(hf_lap));
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index d1da1e5713..526db940c7 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -229,7 +229,7 @@ proto_register_irsir(void)
 
 	proto_sir = proto_register_protocol(
 			"Serial Infrared", "SIR", "sir");
-	new_register_dissector("sir", dissect_sir, proto_sir);
+	register_dissector("sir", dissect_sir, proto_sir);
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_register_field_array(
 			proto_sir, hf_sir, array_length(hf_sir));
diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c
index 0583984812..3b5bfa3a7b 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/mate/packet-mate.c
@@ -394,7 +394,7 @@ proto_register_mate(void)
 	expert_mate = expert_register_protocol(proto_mate);
 	expert_register_field_array(expert_mate, ei, array_length(ei));
 
-	mate_handle = new_register_dissector("mate",mate_tree,proto_mate);
+	mate_handle = register_dissector("mate",mate_tree,proto_mate);
 	mate_module = prefs_register_protocol(proto_mate, proto_reg_handoff_mate);
 	prefs_register_filename_preference(mate_module, "config",
 					   "Configuration Filename",
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 74e2c6ccc7..2af7ca741c 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -12304,7 +12304,7 @@ proto_register_pn_io (void)
     expert_register_field_array(expert_pn_io, ei, array_length(ei));
 
     /* subdissector code */
-    new_register_dissector("pn_io", dissect_PNIO_heur, proto_pn_io);
+    register_dissector("pn_io", dissect_PNIO_heur, proto_pn_io);
     heur_pn_subdissector_list = register_heur_dissector_list("pn_io");
 
     register_cleanup_routine(pnio_cleanup);
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 102c6481af..8d70c6718d 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -2267,7 +2267,7 @@ void proto_register_mac_header_generic(void)
 	expert_register_field_array(expert_mac_header_generic, ei, array_length(ei));
 
 	/* register the generic mac header dissector */
-	new_register_dissector("mac_header_generic_handler", dissect_mac_header_generic_decoder, proto_mac_header_generic_decoder);
+	register_dissector("mac_header_generic_handler", dissect_mac_header_generic_decoder, proto_mac_header_generic_decoder);
 
 	/* Register the payload fragment table init routine */
 	register_init_routine(wimax_defragment_init);
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c
index 540363cd72..fdc3e630ee 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/wimax/mac_hd_type1_decoder.c
@@ -556,7 +556,7 @@ void proto_register_mac_header_type_1(void)
 	proto_register_field_array(proto_mac_header_type_1_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("mac_header_type_1_handler", dissect_mac_header_type_1_decoder, proto_mac_header_type_1_decoder);
+	register_dissector("mac_header_type_1_handler", dissect_mac_header_type_1_decoder, proto_mac_header_type_1_decoder);
 }
 
 /*
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c
index 6e53c172c1..c45a88b09a 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -1366,7 +1366,7 @@ void proto_register_mac_header_type_2(void)
 	proto_register_field_array(proto_mac_header_type_2_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("mac_header_type_2_handler", dissect_mac_header_type_2_decoder, proto_mac_header_type_2_decoder);
+	register_dissector("mac_header_type_2_handler", dissect_mac_header_type_2_decoder, proto_mac_header_type_2_decoder);
 }
 
 /*
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c
index 0a7386dd8a..4900386fa3 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/wimax/mac_mgmt_msg_decoder.c
@@ -217,7 +217,7 @@ void proto_register_mac_mgmt_msg(void)
 		"WiMax MAC Management Message", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
 	/* Register dissector by name */
-	new_register_dissector("wmx_mac_mgmt_msg_decoder", dissect_mac_mgmt_msg_decoder,
+	register_dissector("wmx_mac_mgmt_msg_decoder", dissect_mac_mgmt_msg_decoder,
 	                   proto_mac_mgmt_msg_decoder);
 }
 
diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c
index 1d3e60675a..62086037a0 100644
--- a/plugins/wimax/msg_aas_beam.c
+++ b/plugins/wimax/msg_aas_beam.c
@@ -323,10 +323,10 @@ void proto_register_mac_mgmt_msg_aas_beam(void)
 	proto_register_field_array(proto_mac_mgmt_msg_aas_beam_decoder, hf_aas_beam, array_length(hf_aas_beam));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("mac_mgmt_msg_aas_beam_select_handler", dissect_mac_mgmt_msg_aas_beam_select_decoder, -1);
+	register_dissector("mac_mgmt_msg_aas_beam_select_handler", dissect_mac_mgmt_msg_aas_beam_select_decoder, -1);
 #ifdef OFDM
-	new_register_dissector("mac_mgmt_msg_aas_beam_req_handler", dissect_mac_mgmt_msg_aas_beam_req_decoder, -1);
-	new_register_dissector("mac_mgmt_msg_aas_beam_rsp_handler", dissect_mac_mgmt_msg_aas_beam_rsp_decoder, -1);
+	register_dissector("mac_mgmt_msg_aas_beam_req_handler", dissect_mac_mgmt_msg_aas_beam_req_decoder, -1);
+	register_dissector("mac_mgmt_msg_aas_beam_rsp_handler", dissect_mac_mgmt_msg_aas_beam_rsp_decoder, -1);
 #endif
 }
 
diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c
index 6c45ebf58f..33c3a5bb06 100644
--- a/plugins/wimax/msg_dsc.c
+++ b/plugins/wimax/msg_dsc.c
@@ -166,7 +166,7 @@ void proto_register_mac_mgmt_msg_dsc(void)
 	proto_register_field_array(proto_mac_mgmt_msg_dsc_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("mac_mgmt_msg_dsc_rsp_handler", dissect_mac_mgmt_msg_dsc_rsp_decoder, -1);
+	register_dissector("mac_mgmt_msg_dsc_rsp_handler", dissect_mac_mgmt_msg_dsc_rsp_decoder, -1);
 }
 
 void
diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c
index bdb4430113..2fad34875a 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/wimax/msg_reg_rsp.c
@@ -352,7 +352,7 @@ void proto_register_mac_mgmt_msg_reg_rsp(void)
 	proto_register_field_array(proto_mac_mgmt_msg_reg_rsp_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("mac_mgmt_msg_reg_rsp_handler", dissect_mac_mgmt_msg_reg_rsp_decoder, -1);
+    register_dissector("mac_mgmt_msg_reg_rsp_handler", dissect_mac_mgmt_msg_reg_rsp_decoder, -1);
 }
 
 void proto_reg_handoff_mac_mgmt_msg_reg_rsp(void)
diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c
index a6b1786b8d..0a4d439ee1 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/wimax/msg_sbc.c
@@ -2819,7 +2819,7 @@ void proto_register_mac_mgmt_msg_sbc(void)
 	proto_register_field_array(proto_mac_mgmt_msg_sbc_decoder, hf_sbc, array_length(hf_sbc));
 	proto_register_subtree_array(ett_sbc, array_length(ett_sbc));
 
-	new_register_dissector("mac_mgmt_msg_sbc_rsp_handler", dissect_mac_mgmt_msg_sbc_rsp_decoder, -1);
+	register_dissector("mac_mgmt_msg_sbc_rsp_handler", dissect_mac_mgmt_msg_sbc_rsp_decoder, -1);
 }
 
 void
diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c
index 82dec1b993..533257caa1 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/wimax/packet-wmx.c
@@ -308,7 +308,7 @@ void proto_register_wimax(void)
 	proto_register_subtree_array(ett_reg, array_length(ett_reg));
 
 	/* Register the WiMax dissector */
-	new_register_dissector("wmx", dissect_wimax, proto_wimax);
+	register_dissector("wmx", dissect_wimax, proto_wimax);
 
 	wimax_module = prefs_register_protocol(proto_wimax, NULL);
 
diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c
index 157e7ba8cd..1f85a973c9 100644
--- a/plugins/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/wimax/wimax_cdma_code_decoder.c
@@ -111,7 +111,7 @@ void proto_register_wimax_cdma(void)
 	proto_register_field_array(proto_wimax_cdma_code_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("wimax_cdma_code_burst_handler", dissect_wimax_cdma_code_decoder, -1);
+	register_dissector("wimax_cdma_code_burst_handler", dissect_wimax_cdma_code_decoder, -1);
 }
 
 
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c
index 3a59499c27..2ba8077600 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/wimax/wimax_fch_decoder.c
@@ -242,7 +242,7 @@ void proto_register_wimax_fch(void)
 	proto_register_field_array(proto_wimax_fch_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("wimax_fch_burst_handler", dissect_wimax_fch_decoder, -1);
+	register_dissector("wimax_fch_burst_handler", dissect_wimax_fch_decoder, -1);
 }
 
 /*
diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c
index e682dc5d6e..1723179f53 100644
--- a/plugins/wimax/wimax_ffb_decoder.c
+++ b/plugins/wimax/wimax_ffb_decoder.c
@@ -125,7 +125,7 @@ void proto_register_wimax_ffb(void)
 	proto_register_field_array(proto_wimax_ffb_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	new_register_dissector("wimax_ffb_burst_handler", dissect_wimax_ffb_decoder, -1);
+	register_dissector("wimax_ffb_burst_handler", dissect_wimax_ffb_decoder, -1);
 }
 
 /*
diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c
index 4a0bd0ba44..f2b83d8e49 100644
--- a/plugins/wimax/wimax_hack_decoder.c
+++ b/plugins/wimax/wimax_hack_decoder.c
@@ -134,7 +134,7 @@ void proto_register_wimax_hack(void)
 
 	proto_wimax_hack_decoder = proto_wimax;
 
-	new_register_dissector("wimax_hack_burst_handler", dissect_wimax_hack_decoder, -1);
+	register_dissector("wimax_hack_burst_handler", dissect_wimax_hack_decoder, -1);
 	proto_register_field_array(proto_wimax_hack_decoder, hf, array_length(hf));
 
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c
index b154be548a..dd643ff37d 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/wimax/wimax_harq_map_decoder.c
@@ -208,7 +208,7 @@ void proto_register_wimax_harq_map(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_register_field_array(proto_wimax_harq_map_decoder, hf_harq_map, array_length(hf_harq_map));
 
-	new_register_dissector("wimax_harq_map_handler", dissector_wimax_harq_map_decoder, proto_wimax_harq_map_decoder);
+	register_dissector("wimax_harq_map_handler", dissector_wimax_harq_map_decoder, proto_wimax_harq_map_decoder);
 }
 
 /*
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c
index 672a99218e..4d7a9cc3f5 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/wimax/wimax_pdu_decoder.c
@@ -239,7 +239,7 @@ void proto_register_wimax_pdu(void)
 
 	proto_wimax_pdu_decoder = proto_wimax;
 
-	new_register_dissector("wimax_pdu_burst_handler", dissect_wimax_pdu_decoder, -1);
+	register_dissector("wimax_pdu_burst_handler", dissect_wimax_pdu_decoder, -1);
 	proto_register_field_array(proto_wimax_pdu_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c
index da168a8285..24914fd047 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/wimax/wimax_phy_attributes_decoder.c
@@ -171,7 +171,7 @@ void proto_register_wimax_phy_attributes(void)
 
 	proto_wimax_phy_attributes_decoder = proto_wimax;
 
-	new_register_dissector("wimax_phy_attributes_burst_handler", dissect_wimax_phy_attributes_decoder, -1);
+	register_dissector("wimax_phy_attributes_burst_handler", dissect_wimax_phy_attributes_decoder, -1);
 
 	proto_register_field_array(proto_wimax_phy_attributes_decoder, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index d769d4643d..f22dfa9f78 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -3404,7 +3404,7 @@ proto_register_wimaxasncp(void)
 
 
         /* Register this dissector by name */
-    new_register_dissector("wimaxasncp", dissect_wimaxasncp, proto_wimaxasncp);
+    register_dissector("wimaxasncp", dissect_wimaxasncp, proto_wimaxasncp);
 
         /* Register preferences module (See Section 2.6 for more on
          * preferences) */