Get rid of more new_ prefixes for statistics functions and types.

There are no "old" versions of them that we're keeping around.

Change-Id: I3c76a14d0ec1a06df39c547da37f4dea9987df4d
Reviewed-on: https://code.wireshark.org/review/25892
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

15 files changed, 285 insertions, 285 deletions

diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
index d915c6bdb6..41133cf4fc 100644
--- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
+++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c
@@ -4445,14 +4445,14 @@ static stat_tap_table_item stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "
         {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "  %d  "}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Total Bytes", "  %d  "},
         {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "  %8.2f  "}};
 
-static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_map_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     int num_fields = sizeof(stat_fields)/sizeof(stat_tap_table_item);
-    stat_tap_table* table = new_stat_tap_init_table("ANSI MAP Operation Statistics", num_fields, 0, "ansi_map.op_code", gui_callback, gui_data);
+    stat_tap_table* table = stat_tap_init_table("ANSI MAP Operation Statistics", num_fields, 0, "ansi_map.op_code", gui_callback, gui_data);
     int i = 0;
     stat_tap_table_item_type items[sizeof(stat_fields)/sizeof(stat_tap_table_item)];
 
-    new_stat_tap_add_table(new_stat, table);
+    stat_tap_add_table(new_stat, table);
 
     /* Add a fow for each value type */
     while (ansi_map_opr_code_strings[i].strptr)
@@ -4468,7 +4468,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_ini
         items[AVG_BYTES_COLUMN].type = TABLE_ITEM_FLOAT;
         items[AVG_BYTES_COLUMN].value.float_value = 0.0f;
 
-        new_stat_tap_init_table_row(table, ansi_map_opr_code_strings[i].value, num_fields, items);
+        stat_tap_init_table_row(table, ansi_map_opr_code_strings[i].value, num_fields, items);
         i++;
     }
 }
@@ -4477,7 +4477,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_ini
 static gboolean
 ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+    stat_data_t* stat_data = (stat_data_t*)tapdata;
     const ansi_map_tap_rec_t    *data_p = (const ansi_map_tap_rec_t *)data;
     stat_tap_table* table;
     stat_tap_table_item_type* item_data;
@@ -4489,19 +4489,19 @@ ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
 
     table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
     item_data->value.uint_value++;
     count = item_data->value.uint_value;
-    new_stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN);
     item_data->value.uint_value += data_p->size;
     total_bytes = item_data->value.uint_value;
-    new_stat_tap_set_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, AVG_BYTES_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, AVG_BYTES_COLUMN);
     item_data->value.float_value = (float)total_bytes/(float)count;
-    new_stat_tap_set_field_data(table, data_p->message_type, AVG_BYTES_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, AVG_BYTES_COLUMN, item_data);
 
     return TRUE;
 }
@@ -4514,17 +4514,17 @@ ansi_map_stat_reset(stat_tap_table* table)
 
     for (element = 0; element < table->num_elements; element++)
     {
-        item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, TOTAL_BYTES_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, TOTAL_BYTES_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, TOTAL_BYTES_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, TOTAL_BYTES_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
         item_data->value.float_value = 0.0f;
-        new_stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
     }
 
 }
diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c
index 413cd53421..dce964b794 100644
--- a/epan/dissectors/asn1/camel/packet-camel-template.c
+++ b/epan/dissectors/asn1/camel/packet-camel-template.c
@@ -1200,14 +1200,14 @@ typedef enum
 
 static stat_tap_table_item camel_stat_fields[] = {{TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Type or Reason", "%-25s"}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
 
-static void camel_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void camel_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(camel_stat_fields)/sizeof(stat_tap_table_item);
-  stat_tap_table* table = new_stat_tap_init_table("CAMEL Message Counters", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_table* table = stat_tap_init_table("CAMEL Message Counters", num_fields, 0, NULL, gui_callback, gui_data);
   int i;
   stat_tap_table_item_type items[sizeof(camel_stat_fields)/sizeof(stat_tap_table_item)];
 
-  new_stat_tap_add_table(new_stat, table);
+  stat_tap_add_table(new_stat, table);
 
   items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING;
   items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
@@ -1225,14 +1225,14 @@ static void camel_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
     }
 
     items[MESSAGE_TYPE_COLUMN].value.string_value = col_str;
-    new_stat_tap_init_table_row(table, i, num_fields, items);
+    stat_tap_init_table_row(table, i, num_fields, items);
   }
 }
 
 static gboolean
 camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const struct camelsrt_info_t *csi = (const struct camelsrt_info_t *) csi_ptr;
   stat_tap_table* table;
   stat_tap_table_item_type* msg_data;
@@ -1241,9 +1241,9 @@ camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_
   table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
   if (csi->opcode >= table->num_elements)
     return FALSE;
-  msg_data = new_stat_tap_get_field_data(table, csi->opcode, COUNT_COLUMN);
+  msg_data = stat_tap_get_field_data(table, csi->opcode, COUNT_COLUMN);
   msg_data->value.uint_value++;
-  new_stat_tap_set_field_data(table, csi->opcode, COUNT_COLUMN, msg_data);
+  stat_tap_set_field_data(table, csi->opcode, COUNT_COLUMN, msg_data);
 
   return TRUE;
 }
@@ -1256,9 +1256,9 @@ camel_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
index 2161f3210a..92ca6e963a 100644
--- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
+++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
@@ -2763,7 +2763,7 @@ static stat_tap_table_item gsm_map_stat_fields[] = {
   {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "%d"},
 };
 
-static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_map_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(gsm_map_stat_fields)/sizeof(stat_tap_table_item);
   stat_tap_table* table;
@@ -2783,8 +2783,8 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init
   items[TOT_BYTES_COLUMN].type = TABLE_ITEM_UINT;
   items[AVG_BYTES_COLUMN].type = TABLE_ITEM_FLOAT;
 
-  table = new_stat_tap_init_table("GSM MAP Operation Statistics", num_fields, 0, NULL, gui_callback, gui_data);
-  new_stat_tap_add_table(new_stat, table);
+  table = stat_tap_init_table("GSM MAP Operation Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_add_table(new_stat, table);
 
   /* Add a row for each value type */
   for (i = 0; i < GSM_MAP_MAX_NUM_OPR_CODES; i++)
@@ -2799,14 +2799,14 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init
 
     items[ID_COLUMN].value.uint_value = i;
     items[OP_CODE_COLUMN].value.string_value = col_str;
-    new_stat_tap_init_table_row(table, i, num_fields, items);
+    stat_tap_init_table_row(table, i, num_fields, items);
   }
 }
 
 static gboolean
 gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const gsm_map_tap_rec_t *gmtr = (const gsm_map_tap_rec_t *)gmtr_ptr;
   stat_tap_table* table;
   stat_tap_table_item_type *invoke_data, *fwd_bytes_data, *result_data, *rev_bytes_data, *avg_data;
@@ -2815,26 +2815,26 @@ gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _
 
   table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-  invoke_data = new_stat_tap_get_field_data(table, gmtr->opcode, INVOKES_COLUMN);
-  fwd_bytes_data = new_stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN);
-  result_data = new_stat_tap_get_field_data(table, gmtr->opcode, RET_RES_COLUMN);
-  rev_bytes_data = new_stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN);
+  invoke_data = stat_tap_get_field_data(table, gmtr->opcode, INVOKES_COLUMN);
+  fwd_bytes_data = stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN);
+  result_data = stat_tap_get_field_data(table, gmtr->opcode, RET_RES_COLUMN);
+  rev_bytes_data = stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN);
 
   if (gmtr->invoke)
   {
     invoke_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, gmtr->opcode, INVOKES_COLUMN, invoke_data);
+    stat_tap_set_field_data(table, gmtr->opcode, INVOKES_COLUMN, invoke_data);
 
     fwd_bytes_data->value.uint_value += gmtr->size;
-    new_stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN, fwd_bytes_data);
+    stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN, fwd_bytes_data);
   }
   else
   {
     result_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, gmtr->opcode, RET_RES_COLUMN, result_data);
+    stat_tap_set_field_data(table, gmtr->opcode, RET_RES_COLUMN, result_data);
 
     rev_bytes_data->value.uint_value += gmtr->size;
-    new_stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN, rev_bytes_data);
+    stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN, rev_bytes_data);
   }
 
   invokes = invoke_data->value.uint_value;
@@ -2844,20 +2844,20 @@ gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _
 
   if (gmtr->invoke)
   {
-    avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN);
+    avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN);
     avg_data->value.float_value += (float) fwd_bytes / invokes;
-    new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN, avg_data);
+    stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN, avg_data);
   }
   else
   {
-    avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN);
+    avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN);
     avg_data->value.float_value += (float) rev_bytes / results;
-    new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN, avg_data);
+    stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN, avg_data);
   }
 
-  avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN);
+  avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN);
   avg_data->value.float_value += (float) (fwd_bytes + rev_bytes) / (invokes + results);
-  new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN, avg_data);
+  stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN, avg_data);
   return TRUE;
 }
 
@@ -2869,9 +2869,9 @@ gsm_map_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, INVOKES_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, INVOKES_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, INVOKES_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, INVOKES_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c
index 2075c7f159..0bebdc7c8d 100644
--- a/epan/dissectors/asn1/h225/packet-h225-template.c
+++ b/epan/dissectors/asn1/h225/packet-h225-template.c
@@ -442,14 +442,14 @@ static guint facility_reason_idx[FACILITY_REASONS];
 
 static guint other_idx;
 
-static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void h225_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(h225_stat_fields)/sizeof(stat_tap_table_item);
-  stat_tap_table* table = new_stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_table* table = stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data);
   int row_idx = 0, msg_idx;
   stat_tap_table_item_type items[sizeof(h225_stat_fields)/sizeof(stat_tap_table_item)];
 
-  new_stat_tap_add_table(new_stat, table);
+  stat_tap_add_table(new_stat, table);
 
   items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING;
   items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
@@ -466,7 +466,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown RAS message";
     ras_msg_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (h225_RasMessage_vals[msg_idx].strptr);
@@ -480,7 +480,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown CS message";
     cs_msg_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (T_h323_message_body_vals[msg_idx].strptr);
@@ -494,7 +494,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown gatekeeper reject reason";
     grj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (GatekeeperRejectReason_vals[msg_idx].strptr);
@@ -508,7 +508,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown registration reject reason";
     rrj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (RegistrationRejectReason_vals[msg_idx].strptr);
@@ -522,7 +522,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown unregistration request reason";
     urq_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (UnregRequestReason_vals[msg_idx].strptr);
@@ -536,7 +536,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown unregistration reject reason";
     urj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (UnregRejectReason_vals[msg_idx].strptr);
@@ -550,7 +550,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown admission reject reason";
     arj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (AdmissionRejectReason_vals[msg_idx].strptr);
@@ -564,7 +564,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown band reject reason";
     brj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (BandRejectReason_vals[msg_idx].strptr);
@@ -578,7 +578,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown disengage reason";
     drq_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (DisengageReason_vals[msg_idx].strptr);
@@ -592,7 +592,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown disengage reject reason";
     drj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (DisengageRejectReason_vals[msg_idx].strptr);
@@ -606,7 +606,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown location reject reason";
     lrj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (LocationRejectReason_vals[msg_idx].strptr);
@@ -620,7 +620,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown info request nak reason";
     irqnak_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (InfoRequestNakReason_vals[msg_idx].strptr);
@@ -634,7 +634,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown release complete reason";
     rel_cmp_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (h225_ReleaseCompleteReason_vals[msg_idx].strptr);
@@ -648,21 +648,21 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown facility reason";
     facility_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (FacilityReason_vals[msg_idx].strptr);
 
 
   items[MESSAGE_TYPE_COLUMN].value.string_value = "Unknown H.225 message";
-  new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+  stat_tap_init_table_row(table, row_idx, num_fields, items);
   other_idx = row_idx;
 }
 
 static gboolean
 h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const h225_packet_info *hpi = (const h225_packet_info *)hpi_ptr;
   int tag_idx = -1;
   int reason_idx = -1;
@@ -750,14 +750,14 @@ h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 
   if (tag_idx >= 0) {
     stat_tap_table*table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, 0);
-    stat_tap_table_item_type* msg_data = new_stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);;
+    stat_tap_table_item_type* msg_data = stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);;
     msg_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data);
+    stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data);
 
     if (reason_idx >= 0) {
-      msg_data = new_stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);;
+      msg_data = stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);;
       msg_data->value.uint_value++;
-      new_stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data);
+      stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data);
     }
 
     return TRUE;
@@ -773,9 +773,9 @@ h225_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 84bbaefb4b..b56f96cff9 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -10573,14 +10573,14 @@ typedef enum
 static stat_tap_table_item dtap_stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "IEI", "0x%02x  "}, {TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Name", "%-50s"},
     {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
 
-static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     int num_fields = sizeof(dtap_stat_fields)/sizeof(stat_tap_table_item);
-    stat_tap_table* table = new_stat_tap_init_table("ANSI A-I/F DTAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+    stat_tap_table* table = stat_tap_init_table("ANSI A-I/F DTAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
     int i = 0;
     stat_tap_table_item_type items[sizeof(dtap_stat_fields)/sizeof(stat_tap_table_item)];
 
-    new_stat_tap_add_table(new_stat, table);
+    stat_tap_add_table(new_stat, table);
 
     /* Add a fow for each value type */
     while (ansi_a_dtap_strings[i].strptr)
@@ -10592,7 +10592,7 @@ static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_
         items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
         items[COUNT_COLUMN].value.uint_value = 0;
 
-        new_stat_tap_init_table_row(table, i, num_fields, items);
+        stat_tap_init_table_row(table, i, num_fields, items);
         i++;
     }
 }
@@ -10600,7 +10600,7 @@ static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_
 static gboolean
 ansi_a_dtap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+    stat_data_t* stat_data = (stat_data_t*)tapdata;
     const ansi_a_tap_rec_t      *data_p = (const ansi_a_tap_rec_t *)data;
     stat_tap_table_item_type* dtap_data;
     stat_tap_table* table;
@@ -10613,9 +10613,9 @@ ansi_a_dtap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *e
 
         table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-        dtap_data = new_stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
+        dtap_data = stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
         dtap_data->value.uint_value++;
-        new_stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, dtap_data);
+        stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, dtap_data);
 
         return TRUE;
     }
@@ -10631,9 +10631,9 @@ ansi_a_stat_reset(stat_tap_table* table)
 
     for (element = 0; element < table->num_elements; element++)
     {
-        item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
     }
 
 }
@@ -10641,14 +10641,14 @@ ansi_a_stat_reset(stat_tap_table* table)
 static stat_tap_table_item bsmap_stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "IEI", "0x%02x  "}, {TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Name", "%-50s"},
     {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
 
-static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     int num_fields = sizeof(bsmap_stat_fields)/sizeof(stat_tap_table_item);
-    stat_tap_table* table = new_stat_tap_init_table("ANSI A-I/F BSMAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+    stat_tap_table* table = stat_tap_init_table("ANSI A-I/F BSMAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
     int i = 0;
     stat_tap_table_item_type items[sizeof(bsmap_stat_fields)/sizeof(stat_tap_table_item)];
 
-    new_stat_tap_add_table(new_stat, table);
+    stat_tap_add_table(new_stat, table);
 
     /* Add a fow for each value type */
     while (ansi_a_bsmap_strings[i].strptr)
@@ -10660,7 +10660,7 @@ static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui
         items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
         items[COUNT_COLUMN].value.uint_value = 0;
 
-        new_stat_tap_init_table_row(table, i, num_fields, items);
+        stat_tap_init_table_row(table, i, num_fields, items);
         i++;
     }
 }
@@ -10668,7 +10668,7 @@ static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui
 static gboolean
 ansi_a_bsmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+    stat_data_t* stat_data = (stat_data_t*)tapdata;
     const ansi_a_tap_rec_t      *data_p = (const ansi_a_tap_rec_t *)data;
     stat_tap_table_item_type* dtap_data;
     stat_tap_table* table;
@@ -10681,9 +10681,9 @@ ansi_a_bsmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *
 
         table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-        dtap_data = new_stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
+        dtap_data = stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
         dtap_data->value.uint_value++;
-        new_stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, dtap_data);
+        stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, dtap_data);
 
         return TRUE;
     }
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 868ddf3dfa..7f5aaa261d 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16094,14 +16094,14 @@ static stat_tap_table_item stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "
         {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "  %d  "}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Total Bytes", "  %d  "},
         {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "  %8.2f  "}};
 
-static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_map_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     int num_fields = sizeof(stat_fields)/sizeof(stat_tap_table_item);
-    stat_tap_table* table = new_stat_tap_init_table("ANSI MAP Operation Statistics", num_fields, 0, "ansi_map.op_code", gui_callback, gui_data);
+    stat_tap_table* table = stat_tap_init_table("ANSI MAP Operation Statistics", num_fields, 0, "ansi_map.op_code", gui_callback, gui_data);
     int i = 0;
     stat_tap_table_item_type items[sizeof(stat_fields)/sizeof(stat_tap_table_item)];
 
-    new_stat_tap_add_table(new_stat, table);
+    stat_tap_add_table(new_stat, table);
 
     /* Add a fow for each value type */
     while (ansi_map_opr_code_strings[i].strptr)
@@ -16117,7 +16117,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_ini
         items[AVG_BYTES_COLUMN].type = TABLE_ITEM_FLOAT;
         items[AVG_BYTES_COLUMN].value.float_value = 0.0f;
 
-        new_stat_tap_init_table_row(table, ansi_map_opr_code_strings[i].value, num_fields, items);
+        stat_tap_init_table_row(table, ansi_map_opr_code_strings[i].value, num_fields, items);
         i++;
     }
 }
@@ -16126,7 +16126,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_ini
 static gboolean
 ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+    stat_data_t* stat_data = (stat_data_t*)tapdata;
     const ansi_map_tap_rec_t    *data_p = (const ansi_map_tap_rec_t *)data;
     stat_tap_table* table;
     stat_tap_table_item_type* item_data;
@@ -16138,19 +16138,19 @@ ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
 
     table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, COUNT_COLUMN);
     item_data->value.uint_value++;
     count = item_data->value.uint_value;
-    new_stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, COUNT_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN);
     item_data->value.uint_value += data_p->size;
     total_bytes = item_data->value.uint_value;
-    new_stat_tap_set_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, TOTAL_BYTES_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, data_p->message_type, AVG_BYTES_COLUMN);
+    item_data = stat_tap_get_field_data(table, data_p->message_type, AVG_BYTES_COLUMN);
     item_data->value.float_value = (float)total_bytes/(float)count;
-    new_stat_tap_set_field_data(table, data_p->message_type, AVG_BYTES_COLUMN, item_data);
+    stat_tap_set_field_data(table, data_p->message_type, AVG_BYTES_COLUMN, item_data);
 
     return TRUE;
 }
@@ -16163,17 +16163,17 @@ ansi_map_stat_reset(stat_tap_table* table)
 
     for (element = 0; element < table->num_elements; element++)
     {
-        item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, TOTAL_BYTES_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, TOTAL_BYTES_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, TOTAL_BYTES_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, TOTAL_BYTES_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
         item_data->value.float_value = 0.0f;
-        new_stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
     }
 
 }
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 1a9c517662..c9cec8ac04 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -6353,14 +6353,14 @@ typedef enum
 
 static stat_tap_table_item bootp_stat_fields[] = {{TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "DHCP Message Type", "%-25s"}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Packets", "%d"}};
 
-static void bootp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void bootp_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
 	int num_fields = sizeof(bootp_stat_fields)/sizeof(stat_tap_table_item);
-	stat_tap_table* table = new_stat_tap_init_table("DHCP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_table* table = stat_tap_init_table("DHCP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
 	int i = 0;
 	stat_tap_table_item_type items[sizeof(bootp_stat_fields)/sizeof(stat_tap_table_item)];
 
-	new_stat_tap_add_table(new_stat, table);
+	stat_tap_add_table(new_stat, table);
 
 	/* Add a row for each value type */
 	while (opt53_text[i].strptr)
@@ -6370,7 +6370,7 @@ static void bootp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
 		items[PACKET_COLUMN].type = TABLE_ITEM_UINT;
 		items[PACKET_COLUMN].value.uint_value = 0;
 
-		new_stat_tap_init_table_row(table, i, num_fields, items);
+		stat_tap_init_table_row(table, i, num_fields, items);
 		i++;
 	}
 }
@@ -6378,7 +6378,7 @@ static void bootp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
 static gboolean
 bootp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
 {
-	new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+	stat_data_t* stat_data = (stat_data_t*)tapdata;
 	const char* value = (const char*)data;
 	stat_tap_table* table;
 	stat_tap_table_item_type* msg_data;
@@ -6390,9 +6390,9 @@ bootp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_
 		return FALSE;
 
 	table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
-	msg_data = new_stat_tap_get_field_data(table, idx, PACKET_COLUMN);
+	msg_data = stat_tap_get_field_data(table, idx, PACKET_COLUMN);
 	msg_data->value.uint_value++;
-	new_stat_tap_set_field_data(table, idx, PACKET_COLUMN, msg_data);
+	stat_tap_set_field_data(table, idx, PACKET_COLUMN, msg_data);
 
 	return TRUE;
 }
@@ -6405,9 +6405,9 @@ bootp_stat_reset(stat_tap_table* table)
 
 	for (element = 0; element < table->num_elements; element++)
 	{
-		item_data = new_stat_tap_get_field_data(table, element, PACKET_COLUMN);
+		item_data = stat_tap_get_field_data(table, element, PACKET_COLUMN);
 		item_data->value.uint_value = 0;
-		new_stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
 	}
 }
 
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 62092f2210..e5be5a9deb 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -8161,14 +8161,14 @@ typedef enum
 
 static stat_tap_table_item camel_stat_fields[] = {{TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Type or Reason", "%-25s"}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
 
-static void camel_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void camel_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(camel_stat_fields)/sizeof(stat_tap_table_item);
-  stat_tap_table* table = new_stat_tap_init_table("CAMEL Message Counters", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_table* table = stat_tap_init_table("CAMEL Message Counters", num_fields, 0, NULL, gui_callback, gui_data);
   int i;
   stat_tap_table_item_type items[sizeof(camel_stat_fields)/sizeof(stat_tap_table_item)];
 
-  new_stat_tap_add_table(new_stat, table);
+  stat_tap_add_table(new_stat, table);
 
   items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING;
   items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
@@ -8186,14 +8186,14 @@ static void camel_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
     }
 
     items[MESSAGE_TYPE_COLUMN].value.string_value = col_str;
-    new_stat_tap_init_table_row(table, i, num_fields, items);
+    stat_tap_init_table_row(table, i, num_fields, items);
   }
 }
 
 static gboolean
 camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const struct camelsrt_info_t *csi = (const struct camelsrt_info_t *) csi_ptr;
   stat_tap_table* table;
   stat_tap_table_item_type* msg_data;
@@ -8202,9 +8202,9 @@ camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_
   table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
   if (csi->opcode >= table->num_elements)
     return FALSE;
-  msg_data = new_stat_tap_get_field_data(table, csi->opcode, COUNT_COLUMN);
+  msg_data = stat_tap_get_field_data(table, csi->opcode, COUNT_COLUMN);
   msg_data->value.uint_value++;
-  new_stat_tap_set_field_data(table, csi->opcode, COUNT_COLUMN, msg_data);
+  stat_tap_set_field_data(table, csi->opcode, COUNT_COLUMN, msg_data);
 
   return TRUE;
 }
@@ -8217,9 +8217,9 @@ camel_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 1917939087..4bc8d7361d 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -3539,7 +3539,7 @@ static stat_tap_table_item gsm_a_stat_fields[] = {
     {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}
     };
 
-static void gsm_a_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data, const char *table_title, const value_string *msg_strings)
+static void gsm_a_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data, const char *table_title, const value_string *msg_strings)
 {
     int num_fields = sizeof(gsm_a_stat_fields)/sizeof(stat_tap_table_item);
     stat_tap_table* table;
@@ -3551,8 +3551,8 @@ static void gsm_a_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
     items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
     items[COUNT_COLUMN].value.uint_value = 0;
 
-    table = new_stat_tap_init_table(table_title, num_fields, 0, NULL, gui_callback, gui_data);
-    new_stat_tap_add_table(new_stat, table);
+    table = stat_tap_init_table(table_title, num_fields, 0, NULL, gui_callback, gui_data);
+    stat_tap_add_table(new_stat, table);
 
     /* Add a row for each value type */
     for (i = 0; i < 256; i++)
@@ -3567,65 +3567,65 @@ static void gsm_a_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_c
 
         items[IEI_COLUMN].value.uint_value = i;
         items[MSG_NAME_COLUMN].value.string_value = col_str;
-        new_stat_tap_init_table_row(table, i, num_fields, items);
+        stat_tap_init_table_row(table, i, num_fields, items);
     }
 }
 
-static void gsm_a_bssmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_bssmap_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F BSSMAP Statistics", gsm_a_bssmap_msg_strings);
 }
 
-static void gsm_a_dtap_mm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_mm_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Mobility Management Statistics", gsm_a_dtap_msg_mm_strings);
 }
 
-static void gsm_a_dtap_rr_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_rr_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Radio Resource Management Statistics", gsm_a_dtap_msg_rr_strings);
 }
 
-static void gsm_a_dtap_cc_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_cc_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Call Control Statistics", gsm_a_dtap_msg_cc_strings);
 }
 
-static void gsm_a_dtap_gmm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_gmm_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP GPRS Mobility Management Statistics", gsm_a_dtap_msg_gmm_strings);
 }
 
-static void gsm_a_dtap_sm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_sm_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP GPRS Session Management Statistics", gsm_a_dtap_msg_sm_strings);
 }
 
-static void gsm_a_dtap_sms_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_sms_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Short Message Service Statistics", gsm_a_dtap_msg_sms_strings);
 }
 
-static void gsm_a_dtap_tp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_tp_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Special Conformance Testing Functions", gsm_a_dtap_msg_tp_strings);
 }
 
-static void gsm_a_dtap_ss_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_ss_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F DTAP Supplementary Services Statistics", gsm_a_dtap_msg_ss_strings);
 }
 
-static void gsm_a_sacch_rr_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_sacch_rr_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     gsm_a_stat_init(new_stat, gui_callback, gui_data,
                     "GSM A-I/F SACCH Statistics", gsm_a_rr_short_pd_msg_strings);
@@ -3634,7 +3634,7 @@ static void gsm_a_sacch_rr_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_g
 static gboolean
 gsm_a_stat_packet(void *tapdata, const void *gatr_ptr, guint8 pdu_type, int protocol_disc)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+    stat_data_t* stat_data = (stat_data_t*)tapdata;
     const gsm_a_tap_rec_t *gatr = (const gsm_a_tap_rec_t *) gatr_ptr;
     stat_tap_table* table;
     stat_tap_table_item_type* msg_data;
@@ -3645,9 +3645,9 @@ gsm_a_stat_packet(void *tapdata, const void *gatr_ptr, guint8 pdu_type, int prot
     if (pdu_type == GSM_A_PDU_TYPE_SACCH && gatr->protocol_disc != 0) return FALSE;
 
     table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
-    msg_data = new_stat_tap_get_field_data(table, gatr->message_type, COUNT_COLUMN);
+    msg_data = stat_tap_get_field_data(table, gatr->message_type, COUNT_COLUMN);
     msg_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, gatr->message_type, COUNT_COLUMN, msg_data);
+    stat_tap_set_field_data(table, gatr->message_type, COUNT_COLUMN, msg_data);
 
     return TRUE;
 }
@@ -3720,9 +3720,9 @@ gsm_a_stat_reset(stat_tap_table* table)
 
     for (element = 0; element < table->num_elements; element++)
     {
-        item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
     }
 }
 
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index c2bfc44577..36b320477b 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -23455,7 +23455,7 @@ static stat_tap_table_item gsm_map_stat_fields[] = {
   {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "%d"},
 };
 
-static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_map_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(gsm_map_stat_fields)/sizeof(stat_tap_table_item);
   stat_tap_table* table;
@@ -23475,8 +23475,8 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init
   items[TOT_BYTES_COLUMN].type = TABLE_ITEM_UINT;
   items[AVG_BYTES_COLUMN].type = TABLE_ITEM_FLOAT;
 
-  table = new_stat_tap_init_table("GSM MAP Operation Statistics", num_fields, 0, NULL, gui_callback, gui_data);
-  new_stat_tap_add_table(new_stat, table);
+  table = stat_tap_init_table("GSM MAP Operation Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_add_table(new_stat, table);
 
   /* Add a row for each value type */
   for (i = 0; i < GSM_MAP_MAX_NUM_OPR_CODES; i++)
@@ -23491,14 +23491,14 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init
 
     items[ID_COLUMN].value.uint_value = i;
     items[OP_CODE_COLUMN].value.string_value = col_str;
-    new_stat_tap_init_table_row(table, i, num_fields, items);
+    stat_tap_init_table_row(table, i, num_fields, items);
   }
 }
 
 static gboolean
 gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const gsm_map_tap_rec_t *gmtr = (const gsm_map_tap_rec_t *)gmtr_ptr;
   stat_tap_table* table;
   stat_tap_table_item_type *invoke_data, *fwd_bytes_data, *result_data, *rev_bytes_data, *avg_data;
@@ -23507,26 +23507,26 @@ gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _
 
   table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, i);
 
-  invoke_data = new_stat_tap_get_field_data(table, gmtr->opcode, INVOKES_COLUMN);
-  fwd_bytes_data = new_stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN);
-  result_data = new_stat_tap_get_field_data(table, gmtr->opcode, RET_RES_COLUMN);
-  rev_bytes_data = new_stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN);
+  invoke_data = stat_tap_get_field_data(table, gmtr->opcode, INVOKES_COLUMN);
+  fwd_bytes_data = stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN);
+  result_data = stat_tap_get_field_data(table, gmtr->opcode, RET_RES_COLUMN);
+  rev_bytes_data = stat_tap_get_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN);
 
   if (gmtr->invoke)
   {
     invoke_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, gmtr->opcode, INVOKES_COLUMN, invoke_data);
+    stat_tap_set_field_data(table, gmtr->opcode, INVOKES_COLUMN, invoke_data);
 
     fwd_bytes_data->value.uint_value += gmtr->size;
-    new_stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN, fwd_bytes_data);
+    stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_FWD_COLUMN, fwd_bytes_data);
   }
   else
   {
     result_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, gmtr->opcode, RET_RES_COLUMN, result_data);
+    stat_tap_set_field_data(table, gmtr->opcode, RET_RES_COLUMN, result_data);
 
     rev_bytes_data->value.uint_value += gmtr->size;
-    new_stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN, rev_bytes_data);
+    stat_tap_set_field_data(table, gmtr->opcode, NUM_BYTES_REV_COLUMN, rev_bytes_data);
   }
 
   invokes = invoke_data->value.uint_value;
@@ -23536,20 +23536,20 @@ gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _
 
   if (gmtr->invoke)
   {
-    avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN);
+    avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN);
     avg_data->value.float_value += (float) fwd_bytes / invokes;
-    new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN, avg_data);
+    stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_FWD_COLUMN, avg_data);
   }
   else
   {
-    avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN);
+    avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN);
     avg_data->value.float_value += (float) rev_bytes / results;
-    new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN, avg_data);
+    stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_REV_COLUMN, avg_data);
   }
 
-  avg_data = new_stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN);
+  avg_data = stat_tap_get_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN);
   avg_data->value.float_value += (float) (fwd_bytes + rev_bytes) / (invokes + results);
-  new_stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN, avg_data);
+  stat_tap_set_field_data(table, gmtr->opcode, AVG_BYTES_COLUMN, avg_data);
   return TRUE;
 }
 
@@ -23561,9 +23561,9 @@ gsm_map_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, INVOKES_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, INVOKES_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, INVOKES_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, INVOKES_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index efa638308b..9ed0cfb872 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -8021,14 +8021,14 @@ static guint facility_reason_idx[FACILITY_REASONS];
 
 static guint other_idx;
 
-static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void h225_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(h225_stat_fields)/sizeof(stat_tap_table_item);
-  stat_tap_table* table = new_stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_table* table = stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data);
   int row_idx = 0, msg_idx;
   stat_tap_table_item_type items[sizeof(h225_stat_fields)/sizeof(stat_tap_table_item)];
 
-  new_stat_tap_add_table(new_stat, table);
+  stat_tap_add_table(new_stat, table);
 
   items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING;
   items[COUNT_COLUMN].type = TABLE_ITEM_UINT;
@@ -8045,7 +8045,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown RAS message";
     ras_msg_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (h225_RasMessage_vals[msg_idx].strptr);
@@ -8059,7 +8059,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown CS message";
     cs_msg_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (T_h323_message_body_vals[msg_idx].strptr);
@@ -8073,7 +8073,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown gatekeeper reject reason";
     grj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (GatekeeperRejectReason_vals[msg_idx].strptr);
@@ -8087,7 +8087,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown registration reject reason";
     rrj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (RegistrationRejectReason_vals[msg_idx].strptr);
@@ -8101,7 +8101,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown unregistration request reason";
     urq_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (UnregRequestReason_vals[msg_idx].strptr);
@@ -8115,7 +8115,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown unregistration reject reason";
     urj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (UnregRejectReason_vals[msg_idx].strptr);
@@ -8129,7 +8129,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown admission reject reason";
     arj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (AdmissionRejectReason_vals[msg_idx].strptr);
@@ -8143,7 +8143,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown band reject reason";
     brj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (BandRejectReason_vals[msg_idx].strptr);
@@ -8157,7 +8157,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown disengage reason";
     drq_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (DisengageReason_vals[msg_idx].strptr);
@@ -8171,7 +8171,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown disengage reject reason";
     drj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (DisengageRejectReason_vals[msg_idx].strptr);
@@ -8185,7 +8185,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown location reject reason";
     lrj_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (LocationRejectReason_vals[msg_idx].strptr);
@@ -8199,7 +8199,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown info request nak reason";
     irqnak_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (InfoRequestNakReason_vals[msg_idx].strptr);
@@ -8213,7 +8213,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown release complete reason";
     rel_cmp_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (h225_ReleaseCompleteReason_vals[msg_idx].strptr);
@@ -8227,21 +8227,21 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
       : "Unknown facility reason";
     facility_reason_idx[msg_idx] = row_idx;
 
-    new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+    stat_tap_init_table_row(table, row_idx, num_fields, items);
     row_idx++;
     msg_idx++;
   } while (FacilityReason_vals[msg_idx].strptr);
 
 
   items[MESSAGE_TYPE_COLUMN].value.string_value = "Unknown H.225 message";
-  new_stat_tap_init_table_row(table, row_idx, num_fields, items);
+  stat_tap_init_table_row(table, row_idx, num_fields, items);
   other_idx = row_idx;
 }
 
 static gboolean
 h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const h225_packet_info *hpi = (const h225_packet_info *)hpi_ptr;
   int tag_idx = -1;
   int reason_idx = -1;
@@ -8329,14 +8329,14 @@ h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 
   if (tag_idx >= 0) {
     stat_tap_table*table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, 0);
-    stat_tap_table_item_type* msg_data = new_stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);;
+    stat_tap_table_item_type* msg_data = stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);;
     msg_data->value.uint_value++;
-    new_stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data);
+    stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data);
 
     if (reason_idx >= 0) {
-      msg_data = new_stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);;
+      msg_data = stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);;
       msg_data->value.uint_value++;
-      new_stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data);
+      stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data);
     }
 
     return TRUE;
@@ -8352,9 +8352,9 @@ h225_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index eb956456c2..4cdbdfcb0d 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -824,19 +824,19 @@ static stat_tap_table_item mtp3_stat_fields[] = {
   {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "%f"},
 };
 
-static void mtp3_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void mtp3_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
   int num_fields = sizeof(mtp3_stat_fields)/sizeof(stat_tap_table_item);
   stat_tap_table* table;
 
-  table = new_stat_tap_init_table("MTP3 Statistics", num_fields, 0, NULL, gui_callback, gui_data);
-  new_stat_tap_add_table(new_stat, table);
+  table = stat_tap_init_table("MTP3 Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+  stat_tap_add_table(new_stat, table);
 }
 
 static gboolean
 mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *m3tr_ptr)
 {
-  new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+  stat_data_t* stat_data = (stat_data_t*)tapdata;
   const mtp3_tap_rec_t  *m3tr = (const mtp3_tap_rec_t *)m3tr_ptr;
   gboolean found = FALSE;
   guint element;
@@ -862,9 +862,9 @@ mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
   for (element = 0; element < table->num_elements; element++)
   {
     stat_tap_table_item_type *opc_data, *dpc_data, *si_data;
-    opc_data = new_stat_tap_get_field_data(table, element, OPC_COLUMN);
-    dpc_data = new_stat_tap_get_field_data(table, element, DPC_COLUMN);
-    si_data = new_stat_tap_get_field_data(table, element, SI_COLUMN);
+    opc_data = stat_tap_get_field_data(table, element, OPC_COLUMN);
+    dpc_data = stat_tap_get_field_data(table, element, DPC_COLUMN);
+    si_data = stat_tap_get_field_data(table, element, SI_COLUMN);
 
     if (memcmp(&m3tr->addr_opc, opc_data->user_data.ptr_value, sizeof(mtp3_addr_pc_t)) == 0)
     {
@@ -897,19 +897,19 @@ mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
     items[NUM_BYTES_COLUMN].type = TABLE_ITEM_UINT;
     items[AVG_BYTES_COLUMN].type = TABLE_ITEM_FLOAT;
 
-    new_stat_tap_init_table_row(table, element, num_fields, items);
+    stat_tap_init_table_row(table, element, num_fields, items);
 
-    item_data = new_stat_tap_get_field_data(table, element, OPC_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, OPC_COLUMN);
     mtp3_addr_to_str_buf(&m3tr->addr_opc, str, 256);
     item_data->value.string_value = g_strdup(str);
     item_data->user_data.ptr_value = g_memdup(&m3tr->addr_opc, sizeof(mtp3_tap_rec_t));
-    new_stat_tap_set_field_data(table, element, OPC_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, OPC_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, element, DPC_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, DPC_COLUMN);
     mtp3_addr_to_str_buf(&m3tr->addr_dpc, str, 256);
     item_data->value.string_value = g_strdup(str);
     item_data->user_data.ptr_value = g_memdup(&m3tr->addr_dpc, sizeof(mtp3_tap_rec_t));
-    new_stat_tap_set_field_data(table, element, DPC_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, DPC_COLUMN, item_data);
 
     sis = try_val_to_str(m3tr->mtp3_si_code, mtp3_service_indicator_code_short_vals);
     if (sis) {
@@ -918,28 +918,28 @@ mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
       col_str = g_strdup_printf("Unknown service indicator %d", m3tr->mtp3_si_code);
     }
 
-    item_data = new_stat_tap_get_field_data(table, element, SI_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, SI_COLUMN);
     item_data->value.string_value = col_str;
     item_data->user_data.uint_value = m3tr->mtp3_si_code;
-    new_stat_tap_set_field_data(table, element, SI_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, SI_COLUMN, item_data);
   }
 
-  item_data = new_stat_tap_get_field_data(table, element, NUM_MSUS_COLUMN);
+  item_data = stat_tap_get_field_data(table, element, NUM_MSUS_COLUMN);
   item_data->value.uint_value++;
   msu_count = item_data->value.uint_value;
-  new_stat_tap_set_field_data(table, element, NUM_MSUS_COLUMN, item_data);
+  stat_tap_set_field_data(table, element, NUM_MSUS_COLUMN, item_data);
 
-  item_data = new_stat_tap_get_field_data(table, element, NUM_BYTES_COLUMN);
+  item_data = stat_tap_get_field_data(table, element, NUM_BYTES_COLUMN);
   item_data->value.uint_value += m3tr->size;
   byte_count = item_data->value.uint_value;
-  new_stat_tap_set_field_data(table, element, NUM_BYTES_COLUMN, item_data);
+  stat_tap_set_field_data(table, element, NUM_BYTES_COLUMN, item_data);
 
   if (msu_count > 0) {
     avg_bytes = (double) byte_count / msu_count;
   }
-  item_data = new_stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
+  item_data = stat_tap_get_field_data(table, element, AVG_BYTES_COLUMN);
   item_data->value.float_value = avg_bytes;
-  new_stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
+  stat_tap_set_field_data(table, element, AVG_BYTES_COLUMN, item_data);
 
   return TRUE;
 }
@@ -952,13 +952,13 @@ mtp3_stat_reset(stat_tap_table* table)
 
   for (element = 0; element < table->num_elements; element++)
   {
-    item_data = new_stat_tap_get_field_data(table, element, NUM_MSUS_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, NUM_MSUS_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, NUM_MSUS_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, NUM_MSUS_COLUMN, item_data);
 
-    item_data = new_stat_tap_get_field_data(table, element, NUM_BYTES_COLUMN);
+    item_data = stat_tap_get_field_data(table, element, NUM_BYTES_COLUMN);
     item_data->value.uint_value = 0;
-    new_stat_tap_set_field_data(table, element, NUM_BYTES_COLUMN, item_data);
+    stat_tap_set_field_data(table, element, NUM_BYTES_COLUMN, item_data);
   }
 }
 
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index b3c064274a..ffb0b3e981 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3883,20 +3883,20 @@ static stat_tap_table_item rpc_prog_stat_fields[] = {
 	{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg SRT (s)", "%.2f"}
 };
 
-static void rpc_prog_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void rpc_prog_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
 	int num_fields = sizeof(rpc_prog_stat_fields)/sizeof(stat_tap_table_item);
 	stat_tap_table* table;
 
-	table = new_stat_tap_init_table("ONC-RPC Program Statistics", num_fields, 0, NULL, gui_callback, gui_data);
-	new_stat_tap_add_table(new_stat, table);
+	table = stat_tap_init_table("ONC-RPC Program Statistics", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_add_table(new_stat, table);
 
 }
 
 static gboolean
 rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *rciv_ptr)
 {
-	new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+	stat_data_t* stat_data = (stat_data_t*)tapdata;
 	const rpc_call_info_value *ri = (const rpc_call_info_value *)rciv_ptr;
 	int num_fields = sizeof(rpc_prog_stat_fields)/sizeof(stat_tap_table_item);
 	nstime_t delta;
@@ -3912,8 +3912,8 @@ rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
 	for (element = 0; element < table->num_elements; element++)
 	{
 		stat_tap_table_item_type *program_data, *version_data;
-		program_data = new_stat_tap_get_field_data(table, element, PROGRAM_NUM_COLUMN);
-		version_data = new_stat_tap_get_field_data(table, element, VERSION_COLUMN);
+		program_data = stat_tap_get_field_data(table, element, PROGRAM_NUM_COLUMN);
+		version_data = stat_tap_get_field_data(table, element, VERSION_COLUMN);
 
 		if ((ri->prog == program_data->value.uint_value) && (ri->vers == version_data->value.uint_value)) {
 			found = TRUE;
@@ -3937,7 +3937,7 @@ rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
 		items[MAX_SRT_COLUMN].type = TABLE_ITEM_FLOAT;
 		items[AVG_SRT_COLUMN].type = TABLE_ITEM_FLOAT;
 
-		new_stat_tap_init_table_row(table, element, num_fields, items);
+		stat_tap_init_table_row(table, element, num_fields, items);
 	}
 
 	/* we are only interested in reply packets */
@@ -3945,31 +3945,31 @@ rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
 		return FALSE;
 	}
 
-	item_data = new_stat_tap_get_field_data(table, element, CALLS_COLUMN);
+	item_data = stat_tap_get_field_data(table, element, CALLS_COLUMN);
 	item_data->value.uint_value++;
 	call_count = item_data->value.uint_value;
-	new_stat_tap_set_field_data(table, element, CALLS_COLUMN, item_data);
+	stat_tap_set_field_data(table, element, CALLS_COLUMN, item_data);
 
 	/* calculate time delta between request and reply */
 	nstime_delta(&delta, &pinfo->abs_ts, &ri->req_time);
 	delta_s = nstime_to_sec(&delta);
 
-	item_data = new_stat_tap_get_field_data(table, element, MIN_SRT_COLUMN);
+	item_data = stat_tap_get_field_data(table, element, MIN_SRT_COLUMN);
 	if (item_data->value.float_value == 0.0 || delta_s < item_data->value.float_value) {
 		item_data->value.float_value = delta_s;
-		new_stat_tap_set_field_data(table, element, MIN_SRT_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, MIN_SRT_COLUMN, item_data);
 	}
 
-	item_data = new_stat_tap_get_field_data(table, element, MAX_SRT_COLUMN);
+	item_data = stat_tap_get_field_data(table, element, MAX_SRT_COLUMN);
 	if (item_data->value.float_value == 0.0 || delta_s > item_data->value.float_value) {
 		item_data->value.float_value = delta_s;
-		new_stat_tap_set_field_data(table, element, MAX_SRT_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, MAX_SRT_COLUMN, item_data);
 	}
 
-	item_data = new_stat_tap_get_field_data(table, element, AVG_SRT_COLUMN);
+	item_data = stat_tap_get_field_data(table, element, AVG_SRT_COLUMN);
 	item_data->user_data.float_value += delta_s;
 	item_data->value.float_value = item_data->user_data.float_value / call_count;
-	new_stat_tap_set_field_data(table, element, AVG_SRT_COLUMN, item_data);
+	stat_tap_set_field_data(table, element, AVG_SRT_COLUMN, item_data);
 
 	return TRUE;
 }
@@ -3982,18 +3982,18 @@ rpc_prog_stat_reset(stat_tap_table* table)
 
 	for (element = 0; element < table->num_elements; element++)
 	{
-		item_data = new_stat_tap_get_field_data(table, element, CALLS_COLUMN);
+		item_data = stat_tap_get_field_data(table, element, CALLS_COLUMN);
 		item_data->value.uint_value = 0;
-		new_stat_tap_set_field_data(table, element, CALLS_COLUMN, item_data);
-		item_data = new_stat_tap_get_field_data(table, element, MIN_SRT_COLUMN);
+		stat_tap_set_field_data(table, element, CALLS_COLUMN, item_data);
+		item_data = stat_tap_get_field_data(table, element, MIN_SRT_COLUMN);
 		item_data->value.float_value = 0.0;
-		new_stat_tap_set_field_data(table, element, MIN_SRT_COLUMN, item_data);
-		item_data = new_stat_tap_get_field_data(table, element, MAX_SRT_COLUMN);
+		stat_tap_set_field_data(table, element, MIN_SRT_COLUMN, item_data);
+		item_data = stat_tap_get_field_data(table, element, MAX_SRT_COLUMN);
 		item_data->value.float_value = 0.0;
-		new_stat_tap_set_field_data(table, element, MAX_SRT_COLUMN, item_data);
-		item_data = new_stat_tap_get_field_data(table, element, AVG_SRT_COLUMN);
+		stat_tap_set_field_data(table, element, MAX_SRT_COLUMN, item_data);
+		item_data = stat_tap_get_field_data(table, element, AVG_SRT_COLUMN);
 		item_data->value.float_value = 0.0;
-		new_stat_tap_set_field_data(table, element, AVG_SRT_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, AVG_SRT_COLUMN, item_data);
 	}
 }
 
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index ab379a54fe..3b849b336f 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -5557,17 +5557,17 @@ static stat_tap_table_item sip_stat_fields[] = {
     {TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Max Setup (s)", "%8.2f"},
 };
 
-static void sip_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void sip_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
     /* XXX Should we have a single request + response table instead? */
     int num_fields = sizeof(sip_stat_fields)/sizeof(stat_tap_table_item);
-    stat_tap_table *req_table = new_stat_tap_init_table("SIP Requests", num_fields, 0, NULL, gui_callback, gui_data);
-    stat_tap_table *resp_table = new_stat_tap_init_table("SIP Responses", num_fields, 0, NULL, gui_callback, gui_data);
+    stat_tap_table *req_table = stat_tap_init_table("SIP Requests", num_fields, 0, NULL, gui_callback, gui_data);
+    stat_tap_table *resp_table = stat_tap_init_table("SIP Responses", num_fields, 0, NULL, gui_callback, gui_data);
     stat_tap_table_item_type items[sizeof(sip_stat_fields)/sizeof(stat_tap_table_item)];
     guint i;
 
-    new_stat_tap_add_table(new_stat, resp_table);
-    new_stat_tap_add_table(new_stat, req_table);
+    stat_tap_add_table(new_stat, resp_table);
+    stat_tap_add_table(new_stat, req_table);
 
 
     // These values are fixed for all entries.
@@ -5586,7 +5586,7 @@ static void sip_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
     // For req_table, first column value is method.
     for (i = 1; i < array_length(sip_methods); i++) {
         items[REQ_RESP_METHOD_COLUMN].value.string_value = g_strdup(sip_methods[i]);
-        new_stat_tap_init_table_row(req_table, i-1, num_fields, items);
+        stat_tap_init_table_row(req_table, i-1, num_fields, items);
     }
 
     // For responses entries, first column gets code and description.
@@ -5595,14 +5595,14 @@ static void sip_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
         items[REQ_RESP_METHOD_COLUMN].value.string_value =
                 g_strdup_printf("%u %s", response_code, response_code_vals[i].strptr);
         items[REQ_RESP_METHOD_COLUMN].user_data.uint_value = response_code;
-        new_stat_tap_init_table_row(resp_table, i-1, num_fields, items);
+        stat_tap_init_table_row(resp_table, i-1, num_fields, items);
     }
 }
 
 static gboolean
 sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *siv_ptr)
 {
-    new_stat_data_t* stat_data = (new_stat_data_t*) tapdata;
+    stat_data_t* stat_data = (stat_data_t*) tapdata;
     const sip_info_value_t *info_value = (const sip_info_value_t *) siv_ptr;
     stat_tap_table *cur_table = NULL;
     guint cur_row = 0;  /* 0 = Unknown for both tables */
@@ -5615,7 +5615,7 @@ sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 
         cur_table = req_table;
         for (element = 0; element < req_table->num_elements; element++) {
-            item_data = new_stat_tap_get_field_data(req_table, element, REQ_RESP_METHOD_COLUMN);
+            item_data = stat_tap_get_field_data(req_table, element, REQ_RESP_METHOD_COLUMN);
             if (g_ascii_strcasecmp(info_value->request_method, item_data->value.string_value) == 0) {
                 cur_row = element;
                 break;
@@ -5637,7 +5637,7 @@ sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
         }
 
         for (element = 0; element < resp_table->num_elements; element++) {
-            item_data = new_stat_tap_get_field_data(resp_table, element, REQ_RESP_METHOD_COLUMN);
+            item_data = stat_tap_get_field_data(resp_table, element, REQ_RESP_METHOD_COLUMN);
             if (item_data->user_data.uint_value == response_code) {
                 cur_row = element;
                 break;
@@ -5651,20 +5651,20 @@ sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
     if (cur_table) {
         stat_tap_table_item_type *item_data;
 
-        item_data = new_stat_tap_get_field_data(cur_table, cur_row, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(cur_table, cur_row, COUNT_COLUMN);
         item_data->value.uint_value++;
-        new_stat_tap_set_field_data(cur_table, cur_row, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(cur_table, cur_row, COUNT_COLUMN, item_data);
 
         if (info_value->resend) {
-            item_data = new_stat_tap_get_field_data(cur_table, cur_row, RESENT_COLUMN);
+            item_data = stat_tap_get_field_data(cur_table, cur_row, RESENT_COLUMN);
             item_data->value.uint_value++;
-            new_stat_tap_set_field_data(cur_table, cur_row, RESENT_COLUMN, item_data);
+            stat_tap_set_field_data(cur_table, cur_row, RESENT_COLUMN, item_data);
         }
 
         if (info_value->setup_time > 0) {
-            stat_tap_table_item_type *min_item_data = new_stat_tap_get_field_data(cur_table, cur_row, MIN_SETUP_COLUMN);
-            stat_tap_table_item_type *avg_item_data = new_stat_tap_get_field_data(cur_table, cur_row, AVG_SETUP_COLUMN);
-            stat_tap_table_item_type *max_item_data = new_stat_tap_get_field_data(cur_table, cur_row, MAX_SETUP_COLUMN);
+            stat_tap_table_item_type *min_item_data = stat_tap_get_field_data(cur_table, cur_row, MIN_SETUP_COLUMN);
+            stat_tap_table_item_type *avg_item_data = stat_tap_get_field_data(cur_table, cur_row, AVG_SETUP_COLUMN);
+            stat_tap_table_item_type *max_item_data = stat_tap_get_field_data(cur_table, cur_row, MAX_SETUP_COLUMN);
             double setup_time = (double) info_value->setup_time / 1000;
             unsigned count;
 
@@ -5686,9 +5686,9 @@ sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
                 }
             }
 
-            new_stat_tap_set_field_data(cur_table, cur_row, MIN_SETUP_COLUMN, min_item_data);
-            new_stat_tap_set_field_data(cur_table, cur_row, AVG_SETUP_COLUMN, avg_item_data);
-            new_stat_tap_set_field_data(cur_table, cur_row, MAX_SETUP_COLUMN, max_item_data);
+            stat_tap_set_field_data(cur_table, cur_row, MIN_SETUP_COLUMN, min_item_data);
+            stat_tap_set_field_data(cur_table, cur_row, AVG_SETUP_COLUMN, avg_item_data);
+            stat_tap_set_field_data(cur_table, cur_row, MAX_SETUP_COLUMN, max_item_data);
         }
     }
 
@@ -5703,31 +5703,31 @@ sip_stat_reset(stat_tap_table* table)
 
     for (element = 0; element < table->num_elements; element++)
     {
-        item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, RESENT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, RESENT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, RESENT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, RESENT_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, RESENT_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, RESENT_COLUMN);
         item_data->value.uint_value = 0;
-        new_stat_tap_set_field_data(table, element, RESENT_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, RESENT_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, MIN_SETUP_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, MIN_SETUP_COLUMN);
         item_data->user_data.uint_value = 0;
         item_data->value.float_value = 0.0f;
-        new_stat_tap_set_field_data(table, element, MIN_SETUP_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, MIN_SETUP_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, AVG_SETUP_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, AVG_SETUP_COLUMN);
         item_data->user_data.float_value = 0;
         item_data->value.float_value = 0.0f;
-        new_stat_tap_set_field_data(table, element, AVG_SETUP_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, AVG_SETUP_COLUMN, item_data);
 
-        item_data = new_stat_tap_get_field_data(table, element, MAX_SETUP_COLUMN);
+        item_data = stat_tap_get_field_data(table, element, MAX_SETUP_COLUMN);
         item_data->value.float_value = 0.0f;
-        new_stat_tap_set_field_data(table, element, MAX_SETUP_COLUMN, item_data);
+        stat_tap_set_field_data(table, element, MAX_SETUP_COLUMN, item_data);
     }
 }
 
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 6140328a62..ec77d44794 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -5582,17 +5582,17 @@ static stat_tap_table_item wsp_stat_fields[] = {
 static int unknown_pt_idx;
 static int unknown_sc_idx;
 
-static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void wsp_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
 	int num_fields = sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item);
-	stat_tap_table* pt_table = new_stat_tap_init_table("PDU Types", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_table* pt_table = stat_tap_init_table("PDU Types", num_fields, 0, NULL, gui_callback, gui_data);
 	stat_tap_table_item_type pt_items[sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item)];
-	stat_tap_table* sc_table = new_stat_tap_init_table("Status Codes", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_table* sc_table = stat_tap_init_table("Status Codes", num_fields, 0, NULL, gui_callback, gui_data);
 	stat_tap_table_item_type sc_items[sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item)];
 	int table_idx;
 
-	new_stat_tap_add_table(new_stat, pt_table);
-	new_stat_tap_add_table(new_stat, sc_table);
+	stat_tap_add_table(new_stat, pt_table);
+	stat_tap_add_table(new_stat, sc_table);
 
 	/* Add a row for each PDU type and status code */
 	table_idx = 0;
@@ -5604,12 +5604,12 @@ static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
 		pt_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup(wsp_vals_pdu_type[table_idx].strptr);
 		pt_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = wsp_vals_pdu_type[table_idx].value;
 
-		new_stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
+		stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
 		table_idx++;
 	}
 	pt_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup("Unknown PDU type");
 	pt_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = 0;
-	new_stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
+	stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
 	unknown_pt_idx = table_idx;
 
 	table_idx = 0;
@@ -5621,19 +5621,19 @@ static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
 		sc_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup(wsp_vals_status[table_idx].strptr);
 		sc_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = wsp_vals_status[table_idx].value;
 
-		new_stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
+		stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
 		table_idx++;
 	}
 	sc_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup("Unknown status code");
 	sc_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = 0;
-	new_stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
+	stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
 	unknown_sc_idx = table_idx;
 }
 
 static gboolean
 wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *wiv_ptr)
 {
-	new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+	stat_data_t* stat_data = (stat_data_t*)tapdata;
 	const wsp_info_value_t *value = (const wsp_info_value_t *)wiv_ptr;
 	stat_tap_table *pt_table, *sc_table;
 	guint element;
@@ -5645,7 +5645,7 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 
 	found = FALSE;
 	for (element = 0; element < pt_table->num_elements; element++) {
-		item_data = new_stat_tap_get_field_data(pt_table, element, MESSAGE_TYPE_COLUMN);
+		item_data = stat_tap_get_field_data(pt_table, element, MESSAGE_TYPE_COLUMN);
 		if (value->pdut == item_data->user_data.uint_value) {
 			found = TRUE;
 			break;
@@ -5654,14 +5654,14 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 	if (!found) {
 		element = unknown_pt_idx;
 	}
-	item_data = new_stat_tap_get_field_data(pt_table, element, PACKET_COLUMN);
+	item_data = stat_tap_get_field_data(pt_table, element, PACKET_COLUMN);
 	item_data->value.uint_value++;
-	new_stat_tap_set_field_data(pt_table, element, PACKET_COLUMN, item_data);
+	stat_tap_set_field_data(pt_table, element, PACKET_COLUMN, item_data);
 
 	if (value->status_code != 0) {
 		found = FALSE;
 		for (element = 0; element < sc_table->num_elements; element++) {
-			item_data = new_stat_tap_get_field_data(sc_table, element, MESSAGE_TYPE_COLUMN);
+			item_data = stat_tap_get_field_data(sc_table, element, MESSAGE_TYPE_COLUMN);
 			if (value->status_code == (int) item_data->user_data.uint_value) {
 				found = TRUE;
 				break;
@@ -5670,9 +5670,9 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 		if (!found) {
 			element = unknown_sc_idx;
 		}
-		item_data = new_stat_tap_get_field_data(sc_table, element, PACKET_COLUMN);
+		item_data = stat_tap_get_field_data(sc_table, element, PACKET_COLUMN);
 		item_data->value.uint_value++;
-		new_stat_tap_set_field_data(sc_table, element, PACKET_COLUMN, item_data);
+		stat_tap_set_field_data(sc_table, element, PACKET_COLUMN, item_data);
 	}
 
 	return TRUE;
@@ -5686,9 +5686,9 @@ wsp_stat_reset(stat_tap_table* table)
 
 	for (element = 0; element < table->num_elements; element++)
 	{
-		item_data = new_stat_tap_get_field_data(table, element, PACKET_COLUMN);
+		item_data = stat_tap_get_field_data(table, element, PACKET_COLUMN);
 		item_data->value.uint_value = 0;
-		new_stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
 	}
 }