Ethereal->Wireshark

svn path=/trunk/; revision=18232

30 files changed, 318 insertions, 318 deletions

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index a9e21945d4..baa874fb56 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -162,7 +162,7 @@ about_wireshark_page_new(void)
        "\n"
        "Wireshark is Open Source Software released under the GNU General Public License.\n"
        "\n"
-       "Check the man page and http://www.ethereal.com for more information.",
+       "Check the man page and http://www.wireshark.org for more information.",
        svnversion, get_copyright_info(), comp_info_str->str,
        runtime_info_str->str);
 
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 4f205d3119..1d4c35ce04 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -723,7 +723,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   filter_hb = gtk_hbox_new(FALSE, 3);
   gtk_box_pack_start(GTK_BOX(capture_vb), filter_hb, FALSE, FALSE, 0);
 
-  filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY);
+  filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY);
   SIGNAL_CONNECT(filter_bt, "clicked", capture_filter_construct_cb, NULL);
   SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
   gtk_tooltips_set_tip(tooltips, filter_bt,
@@ -789,7 +789,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     NULL);
   gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
 
-  file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+  file_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_BROWSE);
   gtk_tooltips_set_tip(tooltips, file_bt,
     "Select a file to which captured data will be written, "
     "instead of entering the file name directly. ",
@@ -1066,10 +1066,10 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
 
   /* Button row: "Start" and "Cancel" buttons */
-  bbox = dlg_button_row_new(ETHEREAL_STOCK_CAPTURE_START, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+  bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_START, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
-  ok_bt = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CAPTURE_START);
+  ok_bt = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CAPTURE_START);
   SIGNAL_CONNECT(ok_bt, "clicked", capture_start_cb, cap_open_w);
   gtk_tooltips_set_tip(tooltips, ok_bt,
     "Start the capture process.", NULL);
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 391a842736..c572be0943 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -507,7 +507,7 @@ file_open_cmd(GtkWidget *w)
   gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
   gtk_widget_show(filter_hbox);
 
-  filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+  filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
   SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
   SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
@@ -861,7 +861,7 @@ file_merge_cmd(GtkWidget *w)
   gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0);
   gtk_widget_show(filter_hbox);
 
-  filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+  filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
   SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
   SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0);
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 881ac74694..6ca7322f37 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -132,7 +132,7 @@ capture_prefs_show(void)
 	gtk_misc_set_alignment(GTK_MISC(ifopts_lb), 1.0, 0.5);
 	gtk_widget_show(ifopts_lb);
 
-	ifopts_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
+	ifopts_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT);
     gtk_tooltips_set_tip(tooltips, ifopts_bt, 
         "Open a dialog box to set various interface options.", NULL);
 	SIGNAL_CONNECT(ifopts_bt, "clicked", ifopts_edit_cb, NULL);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index fadcb7b4c3..6fd2b653e9 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -249,7 +249,7 @@ colorize_dialog_new (char *filter)
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5);
   gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter at the end of the list"), NULL);
 
-  color_props = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
+  color_props = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT);
 #if GTK_MAJOR_VERSION < 2
   WIDGET_SET_SIZE(color_props, 50, 20);
 #endif
@@ -275,14 +275,14 @@ colorize_dialog_new (char *filter)
   gtk_container_set_border_width  (GTK_CONTAINER (manage_vbox), 5);
   gtk_container_add(GTK_CONTAINER(manage_fr), manage_vbox);
 
-  color_export = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EXPORT);
+  color_export = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EXPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5);
 #if GTK_MAJOR_VERSION < 2
   WIDGET_SET_SIZE(color_export, 50, 20);
 #endif
   gtk_tooltips_set_tip(tooltips, color_export, ("Save all/marked filters to a file"), NULL);
 
-  color_import = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_IMPORT);
+  color_import = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_IMPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5);
 #if GTK_MAJOR_VERSION < 2
   WIDGET_SET_SIZE(color_import, 50, 20);
@@ -1252,7 +1252,7 @@ edit_color_filter_dialog(GtkWidget *color_filters,
 
     /* Create the "Add Expression..." button, to pop up a dialog
        for constructing filter comparison expressions. */
-    add_expression_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
+    add_expression_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION);
     SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, *colorize_filter_text);
     gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3);
     gtk_tooltips_set_tip (tooltips, add_expression_bt, ("Add an expression to the filter string"), NULL);
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 49d7a6b04b..29be9359a8 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -186,42 +186,42 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
 #define GTK_STOCK_ZOOM_100          "Zoom 100%"
 
 #ifdef HAVE_LIBPCAP
-#define ETHEREAL_STOCK_CAPTURE_INTERFACES       "Interfaces"
-#define ETHEREAL_STOCK_CAPTURE_OPTIONS          "Options"
-#define ETHEREAL_STOCK_CAPTURE_START            "Start"
-#define ETHEREAL_STOCK_CAPTURE_STOP             "Stop"
-#define ETHEREAL_STOCK_CAPTURE_RESTART          "Restart"
-#define ETHEREAL_STOCK_CAPTURE_FILTER           "CFilter"
-#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY     "Capture Filter:"
+#define WIRESHARK_STOCK_CAPTURE_INTERFACES       "Interfaces"
+#define WIRESHARK_STOCK_CAPTURE_OPTIONS          "Options"
+#define WIRESHARK_STOCK_CAPTURE_START            "Start"
+#define WIRESHARK_STOCK_CAPTURE_STOP             "Stop"
+#define WIRESHARK_STOCK_CAPTURE_RESTART          "Restart"
+#define WIRESHARK_STOCK_CAPTURE_FILTER           "CFilter"
+#define WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY     "Capture Filter:"
 #endif
-#define ETHEREAL_STOCK_DISPLAY_FILTER           "Filter"
-#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY     "Filter:"
-#define ETHEREAL_STOCK_PREFS                    "Prefs"
-#define ETHEREAL_STOCK_BROWSE                   "Browse"
-#define ETHEREAL_STOCK_CREATE_STAT              "Create Stat"
-#define ETHEREAL_STOCK_EXPORT                   "Export..."
-#define ETHEREAL_STOCK_IMPORT                   "Import..."
-#define ETHEREAL_STOCK_EDIT                     "Edit..."
-#define ETHEREAL_STOCK_ADD_EXPRESSION           "Add Expression..."
-#define ETHEREAL_STOCK_DONT_SAVE                "Continue without Saving"
-#define ETHEREAL_STOCK_ABOUT                    "About"
-#define ETHEREAL_STOCK_COLORIZE                 "Colorize"
-#define ETHEREAL_STOCK_AUTOSCROLL               "Auto Scroll"
-#define ETHEREAL_STOCK_RESIZE_COLUMNS           "Resize Columns"
-#define ETHEREAL_STOCK_TIME                     "Time"
-#define ETHEREAL_STOCK_INTERNET                 "Internet"
-#define ETHEREAL_STOCK_WEB_SUPPORT              "Web Support"
-#define ETHEREAL_STOCK_WIKI                     "Wiki"
-#define ETHEREAL_STOCK_CONVERSATIONS            "Conversations"
-#define ETHEREAL_STOCK_ENDPOINTS                "Endpoints"
-#define ETHEREAL_STOCK_GRAPHS                   "Graphs"
-#define ETHEREAL_STOCK_TELEPHONY                "Telephony"
-#define ETHEREAL_STOCK_DECODE_AS                "Decode As"
-#define ETHEREAL_STOCK_CHECKBOX                 "Checkbox"
-#define ETHEREAL_STOCK_FILE_SET_LIST            "List Files"
-#define ETHEREAL_STOCK_FILE_SET_NEXT            "Next File"
-#define ETHEREAL_STOCK_FILE_SET_PREVIOUS        "Previous File"
-#define ETHEREAL_STOCK_FILTER_OUT_STREAM        "Filter Out This Stream"
+#define WIRESHARK_STOCK_DISPLAY_FILTER           "Filter"
+#define WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY     "Filter:"
+#define WIRESHARK_STOCK_PREFS                    "Prefs"
+#define WIRESHARK_STOCK_BROWSE                   "Browse"
+#define WIRESHARK_STOCK_CREATE_STAT              "Create Stat"
+#define WIRESHARK_STOCK_EXPORT                   "Export..."
+#define WIRESHARK_STOCK_IMPORT                   "Import..."
+#define WIRESHARK_STOCK_EDIT                     "Edit..."
+#define WIRESHARK_STOCK_ADD_EXPRESSION           "Add Expression..."
+#define WIRESHARK_STOCK_DONT_SAVE                "Continue without Saving"
+#define WIRESHARK_STOCK_ABOUT                    "About"
+#define WIRESHARK_STOCK_COLORIZE                 "Colorize"
+#define WIRESHARK_STOCK_AUTOSCROLL               "Auto Scroll"
+#define WIRESHARK_STOCK_RESIZE_COLUMNS           "Resize Columns"
+#define WIRESHARK_STOCK_TIME                     "Time"
+#define WIRESHARK_STOCK_INTERNET                 "Internet"
+#define WIRESHARK_STOCK_WEB_SUPPORT              "Web Support"
+#define WIRESHARK_STOCK_WIKI                     "Wiki"
+#define WIRESHARK_STOCK_CONVERSATIONS            "Conversations"
+#define WIRESHARK_STOCK_ENDPOINTS                "Endpoints"
+#define WIRESHARK_STOCK_GRAPHS                   "Graphs"
+#define WIRESHARK_STOCK_TELEPHONY                "Telephony"
+#define WIRESHARK_STOCK_DECODE_AS                "Decode As"
+#define WIRESHARK_STOCK_CHECKBOX                 "Checkbox"
+#define WIRESHARK_STOCK_FILE_SET_LIST            "List Files"
+#define WIRESHARK_STOCK_FILE_SET_NEXT            "Next File"
+#define WIRESHARK_STOCK_FILE_SET_PREVIOUS        "Previous File"
+#define WIRESHARK_STOCK_FILTER_OUT_STREAM        "Filter Out This Stream"
 
 /** Create a stock button. Will create a "normal" button for GTK1.
  *
@@ -319,80 +319,80 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
 {path, accelerator, GTK_MENU_FUNC(callback), action, "<StockItem>", data}
 
 #ifdef HAVE_LIBPCAP
-#define ETHEREAL_STOCK_LABEL_CAPTURE_INTERFACES       "_Interfaces"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_OPTIONS          "_Options"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_START            "_Start"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_STOP             "S_top"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_RESTART          "_Restart"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER           "_CFilter"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER_ENTRY     "_Capture Filter:"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES       "_Interfaces"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_OPTIONS          "_Options"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_START            "_Start"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_STOP             "S_top"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_RESTART          "_Restart"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER           "_CFilter"
+#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER_ENTRY     "_Capture Filter:"
 #endif
-#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER           "_Filter"
-#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER_ENTRY     "_Filter:"
-#define ETHEREAL_STOCK_LABEL_PREFS                    "_Prefs"
-#define ETHEREAL_STOCK_LABEL_BROWSE                   "_Browse..."
-#define ETHEREAL_STOCK_LABEL_CREATE_STAT              "Create _Stat"
-#define ETHEREAL_STOCK_LABEL_EXPORT                   "_Export..."
-#define ETHEREAL_STOCK_LABEL_IMPORT                   "_Import..."
-#define ETHEREAL_STOCK_LABEL_EDIT                     "_Edit..."
-#define ETHEREAL_STOCK_LABEL_ADD_EXPRESSION           "_Expression..." /* plus sign coming from icon */
-#define ETHEREAL_STOCK_LABEL_DONT_SAVE                "Continue _without Saving"
-#define ETHEREAL_STOCK_LABEL_ABOUT                    "_About"
-#define ETHEREAL_STOCK_LABEL_COLORIZE                 "_Colorize"
-#define ETHEREAL_STOCK_LABEL_AUTOSCROLL               "_Auto Scroll in Live Capture"
-#define ETHEREAL_STOCK_LABEL_RESIZE_COLUMNS           "Resize Columns"
-#define ETHEREAL_STOCK_LABEL_TIME                     "Time"
-#define ETHEREAL_STOCK_LABEL_INTERNET                 "Internet"
-#define ETHEREAL_STOCK_LABEL_WEB_SUPPORT              "Web Support"
-#define ETHEREAL_STOCK_LABEL_WIKI                     "Wiki"
-#define ETHEREAL_STOCK_LABEL_CONVERSATIONS            "Conversations"
-#define ETHEREAL_STOCK_LABEL_ENDPOINTS                "Endpoints"
-#define ETHEREAL_STOCK_LABEL_GRAPHS                   "Graphs"
-#define ETHEREAL_STOCK_LABEL_TELEPHONY                "Telephony"
-#define ETHEREAL_STOCK_LABEL_DECODE_AS                "Decode As"
-#define ETHEREAL_STOCK_LABEL_CHECKBOX                 "Checkbox"
-#define ETHEREAL_STOCK_LABEL_FILE_SET_LIST            "List Files"
-#define ETHEREAL_STOCK_LABEL_FILE_SET_NEXT            "Next File"
-#define ETHEREAL_STOCK_LABEL_FILE_SET_PREVIOUS        "Previous File"
-#define ETHEREAL_STOCK_LABEL_FILTER_OUT_STREAM        "Filter Out This Stream"
+#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER           "_Filter"
+#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER_ENTRY     "_Filter:"
+#define WIRESHARK_STOCK_LABEL_PREFS                    "_Prefs"
+#define WIRESHARK_STOCK_LABEL_BROWSE                   "_Browse..."
+#define WIRESHARK_STOCK_LABEL_CREATE_STAT              "Create _Stat"
+#define WIRESHARK_STOCK_LABEL_EXPORT                   "_Export..."
+#define WIRESHARK_STOCK_LABEL_IMPORT                   "_Import..."
+#define WIRESHARK_STOCK_LABEL_EDIT                     "_Edit..."
+#define WIRESHARK_STOCK_LABEL_ADD_EXPRESSION           "_Expression..." /* plus sign coming from icon */
+#define WIRESHARK_STOCK_LABEL_DONT_SAVE                "Continue _without Saving"
+#define WIRESHARK_STOCK_LABEL_ABOUT                    "_About"
+#define WIRESHARK_STOCK_LABEL_COLORIZE                 "_Colorize"
+#define WIRESHARK_STOCK_LABEL_AUTOSCROLL               "_Auto Scroll in Live Capture"
+#define WIRESHARK_STOCK_LABEL_RESIZE_COLUMNS           "Resize Columns"
+#define WIRESHARK_STOCK_LABEL_TIME                     "Time"
+#define WIRESHARK_STOCK_LABEL_INTERNET                 "Internet"
+#define WIRESHARK_STOCK_LABEL_WEB_SUPPORT              "Web Support"
+#define WIRESHARK_STOCK_LABEL_WIKI                     "Wiki"
+#define WIRESHARK_STOCK_LABEL_CONVERSATIONS            "Conversations"
+#define WIRESHARK_STOCK_LABEL_ENDPOINTS                "Endpoints"
+#define WIRESHARK_STOCK_LABEL_GRAPHS                   "Graphs"
+#define WIRESHARK_STOCK_LABEL_TELEPHONY                "Telephony"
+#define WIRESHARK_STOCK_LABEL_DECODE_AS                "Decode As"
+#define WIRESHARK_STOCK_LABEL_CHECKBOX                 "Checkbox"
+#define WIRESHARK_STOCK_LABEL_FILE_SET_LIST            "List Files"
+#define WIRESHARK_STOCK_LABEL_FILE_SET_NEXT            "Next File"
+#define WIRESHARK_STOCK_LABEL_FILE_SET_PREVIOUS        "Previous File"
+#define WIRESHARK_STOCK_LABEL_FILTER_OUT_STREAM        "Filter Out This Stream"
 
 #ifdef HAVE_LIBPCAP
-#define ETHEREAL_STOCK_CAPTURE_INTERFACES       "Wireshark_Stock_CaptureInterfaces"
-#define ETHEREAL_STOCK_CAPTURE_OPTIONS          "Wireshark_Stock_CaptureOptionss"
-#define ETHEREAL_STOCK_CAPTURE_START            "Wireshark_Stock_CaptureStart"
-#define ETHEREAL_STOCK_CAPTURE_STOP             "Wireshark_Stock_CaptureStop"
-#define ETHEREAL_STOCK_CAPTURE_RESTART          "Wireshark_Stock_CaptureRestart"
-#define ETHEREAL_STOCK_CAPTURE_FILTER           "Wireshark_Stock_CaptureFilter"
-#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY     "Wireshark_Stock_CaptureFilter_Entry"
+#define WIRESHARK_STOCK_CAPTURE_INTERFACES       "Wireshark_Stock_CaptureInterfaces"
+#define WIRESHARK_STOCK_CAPTURE_OPTIONS          "Wireshark_Stock_CaptureOptionss"
+#define WIRESHARK_STOCK_CAPTURE_START            "Wireshark_Stock_CaptureStart"
+#define WIRESHARK_STOCK_CAPTURE_STOP             "Wireshark_Stock_CaptureStop"
+#define WIRESHARK_STOCK_CAPTURE_RESTART          "Wireshark_Stock_CaptureRestart"
+#define WIRESHARK_STOCK_CAPTURE_FILTER           "Wireshark_Stock_CaptureFilter"
+#define WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY     "Wireshark_Stock_CaptureFilter_Entry"
 #endif
-#define ETHEREAL_STOCK_DISPLAY_FILTER           "Wireshark_Stock_DisplayFilter"
-#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY     "Wireshark_Stock_DisplayFilter_Entry"
-#define ETHEREAL_STOCK_PREFS                    "Wireshark_Stock_Prefs"
-#define ETHEREAL_STOCK_BROWSE                   "Wireshark_Stock_Browse"
-#define ETHEREAL_STOCK_CREATE_STAT              "Wireshark_Stock_CreateStat"
-#define ETHEREAL_STOCK_EXPORT                   "Wireshark_Stock_Export"
-#define ETHEREAL_STOCK_IMPORT                   "Wireshark_Stock_Import"
-#define ETHEREAL_STOCK_EDIT                     "Wireshark_Stock_Edit"
-#define ETHEREAL_STOCK_ADD_EXPRESSION           "Wireshark_Stock_Edit_Add_Expression"
-#define ETHEREAL_STOCK_DONT_SAVE                "Wireshark_Stock_Continue_without_Saving"
-#define ETHEREAL_STOCK_ABOUT                    "Wireshark_Stock_About"
-#define ETHEREAL_STOCK_COLORIZE                 "Wireshark_Stock_Colorize"
-#define ETHEREAL_STOCK_AUTOSCROLL               "Wireshark_Stock_Autoscroll"
-#define ETHEREAL_STOCK_RESIZE_COLUMNS           "Wireshark_Stock_Resize_Columns"
-#define ETHEREAL_STOCK_TIME                     "Wireshark_Stock_Time"
-#define ETHEREAL_STOCK_INTERNET                 "Wireshark_Stock_Internet"
-#define ETHEREAL_STOCK_WEB_SUPPORT              "Wireshark_Stock_Web_Support"
-#define ETHEREAL_STOCK_WIKI                     "Wireshark_Stock_Wiki"
-#define ETHEREAL_STOCK_CONVERSATIONS            "Wireshark_Stock_Conversations"
-#define ETHEREAL_STOCK_ENDPOINTS                "Wireshark_Stock_Endpoints"
-#define ETHEREAL_STOCK_GRAPHS                   "Wireshark_Stock_Graphs"
-#define ETHEREAL_STOCK_TELEPHONY                "Wireshark_Stock_Telephony"
-#define ETHEREAL_STOCK_DECODE_AS                "Wireshark_Stock_DecodeAs"
-#define ETHEREAL_STOCK_CHECKBOX                 "Wireshark_Stock_Checkbox"
-#define ETHEREAL_STOCK_FILE_SET_LIST            "Wireshark_Stock_File_Set_List"
-#define ETHEREAL_STOCK_FILE_SET_NEXT            "Wireshark_Stock_File_Set_Next"
-#define ETHEREAL_STOCK_FILE_SET_PREVIOUS        "Wireshark_Stock_File_Set_Previous"
-#define ETHEREAL_STOCK_FILTER_OUT_STREAM        "Wireshark_Stock_Filter_Out_This_Stream"
+#define WIRESHARK_STOCK_DISPLAY_FILTER           "Wireshark_Stock_DisplayFilter"
+#define WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY     "Wireshark_Stock_DisplayFilter_Entry"
+#define WIRESHARK_STOCK_PREFS                    "Wireshark_Stock_Prefs"
+#define WIRESHARK_STOCK_BROWSE                   "Wireshark_Stock_Browse"
+#define WIRESHARK_STOCK_CREATE_STAT              "Wireshark_Stock_CreateStat"
+#define WIRESHARK_STOCK_EXPORT                   "Wireshark_Stock_Export"
+#define WIRESHARK_STOCK_IMPORT                   "Wireshark_Stock_Import"
+#define WIRESHARK_STOCK_EDIT                     "Wireshark_Stock_Edit"
+#define WIRESHARK_STOCK_ADD_EXPRESSION           "Wireshark_Stock_Edit_Add_Expression"
+#define WIRESHARK_STOCK_DONT_SAVE                "Wireshark_Stock_Continue_without_Saving"
+#define WIRESHARK_STOCK_ABOUT                    "Wireshark_Stock_About"
+#define WIRESHARK_STOCK_COLORIZE                 "Wireshark_Stock_Colorize"
+#define WIRESHARK_STOCK_AUTOSCROLL               "Wireshark_Stock_Autoscroll"
+#define WIRESHARK_STOCK_RESIZE_COLUMNS           "Wireshark_Stock_Resize_Columns"
+#define WIRESHARK_STOCK_TIME                     "Wireshark_Stock_Time"
+#define WIRESHARK_STOCK_INTERNET                 "Wireshark_Stock_Internet"
+#define WIRESHARK_STOCK_WEB_SUPPORT              "Wireshark_Stock_Web_Support"
+#define WIRESHARK_STOCK_WIKI                     "Wireshark_Stock_Wiki"
+#define WIRESHARK_STOCK_CONVERSATIONS            "Wireshark_Stock_Conversations"
+#define WIRESHARK_STOCK_ENDPOINTS                "Wireshark_Stock_Endpoints"
+#define WIRESHARK_STOCK_GRAPHS                   "Wireshark_Stock_Graphs"
+#define WIRESHARK_STOCK_TELEPHONY                "Wireshark_Stock_Telephony"
+#define WIRESHARK_STOCK_DECODE_AS                "Wireshark_Stock_DecodeAs"
+#define WIRESHARK_STOCK_CHECKBOX                 "Wireshark_Stock_Checkbox"
+#define WIRESHARK_STOCK_FILE_SET_LIST            "Wireshark_Stock_File_Set_List"
+#define WIRESHARK_STOCK_FILE_SET_NEXT            "Wireshark_Stock_File_Set_Next"
+#define WIRESHARK_STOCK_FILE_SET_PREVIOUS        "Wireshark_Stock_File_Set_Previous"
+#define WIRESHARK_STOCK_FILTER_OUT_STREAM        "Wireshark_Stock_Filter_Out_This_Stream"
 
 #define BUTTON_NEW_FROM_STOCK(stock_id) \
 gtk_button_new_from_stock(stock_id);
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index e39883250a..93ef8fdaa7 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -24,7 +24,7 @@
 
 /* This module provides rpc call/reply SRT statistics to Wireshark,
  * and displays them graphically.
- * It is only used by Wireshark and not tethereal
+ * It is only used by Wireshark and not twireshark
  *
  * It serves as an example on how to use the tap api.
  */
@@ -237,15 +237,15 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
 			filter=NULL;
 		}
 	} else {
-		fprintf(stderr, "ethereal: invalid \"-z dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
+		fprintf(stderr, "wireshark: invalid \"-z dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
 		exit(1);
 	}
 	if (major < 0 || major > 65535) {
-		fprintf(stderr,"ethereal: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
+		fprintf(stderr,"wireshark: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
 		exit(1);
 	}
 	if (minor < 0 || minor > 65535) {
-		fprintf(stderr,"ethereal: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
+		fprintf(stderr,"wireshark: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
 		exit(1);
 	}
 	ver = major;
@@ -254,7 +254,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
 	rs->prog=dcerpc_get_proto_name(&uuid, ver);
 	if(!rs->prog){
 		g_free(rs);
-		fprintf(stderr,"ethereal: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
+		fprintf(stderr,"wireshark: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
 		exit(1);
 	}
 	hf_opnum=dcerpc_get_proto_hf_opnum(&uuid, ver);
@@ -624,7 +624,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	filter_box=gtk_hbox_new(FALSE, 3);
 
 	/* Filter label */
-	filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+	filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 	SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
 	gtk_widget_show(filter_bt);
@@ -645,11 +645,11 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
 
 	/* button box */
-    bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
+    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
 	SIGNAL_CONNECT_OBJECT(start_button, "clicked", 
                               dcerpcstat_start_button_clicked, NULL);
 
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index b939453e8c..d5fa90656d 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -114,13 +114,13 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
     while(stock_id != NULL) {
         if (strcmp(stock_id, GTK_STOCK_OK) == 0) {
             ok = stock_id;
-        } else if (strcmp(stock_id, ETHEREAL_STOCK_CREATE_STAT) == 0) {
+        } else if (strcmp(stock_id, WIRESHARK_STOCK_CREATE_STAT) == 0) {
             create_stat = stock_id;
         } else if (strcmp(stock_id, GTK_STOCK_APPLY) == 0) {
             apply = stock_id;
         } else if (strcmp(stock_id, GTK_STOCK_SAVE) == 0) {
             save = stock_id;
-        } else if (strcmp(stock_id, ETHEREAL_STOCK_DONT_SAVE) == 0) {
+        } else if (strcmp(stock_id, WIRESHARK_STOCK_DONT_SAVE) == 0) {
         	dont_save = stock_id;  
         } else if (strcmp(stock_id, GTK_STOCK_CANCEL) == 0) {
             cancel = stock_id;
@@ -129,7 +129,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
         } else if (strcmp(stock_id, GTK_STOCK_CLEAR) == 0) {
             clear = stock_id;
 #ifdef HAVE_LIBPCAP
-        } else if (strcmp(stock_id, ETHEREAL_STOCK_CAPTURE_START) == 0) {
+        } else if (strcmp(stock_id, WIRESHARK_STOCK_CAPTURE_START) == 0) {
             start = stock_id;
 #endif /* HAVE_LIBPCAP */
         } else if (strcmp(stock_id, GTK_STOCK_STOP) == 0) {
@@ -146,7 +146,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
             yes = stock_id;
         } else if (strcmp(stock_id, GTK_STOCK_NO) == 0) {
             no = stock_id;
-        } else if (strcmp(stock_id, ETHEREAL_STOCK_FILTER_OUT_STREAM) == 0) {
+        } else if (strcmp(stock_id, WIRESHARK_STOCK_FILTER_OUT_STREAM) == 0) {
             start = stock_id;
         } else {
             /* we don't know that button! */
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index fbfc527011..1152c85438 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -562,7 +562,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
 
         /* Create the "Add Expression..." button, to pop up a dialog
            for constructing filter comparison expressions. */
-        add_expression_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
+        add_expression_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION);
         SIGNAL_CONNECT(add_expression_bt, "clicked", filter_add_expr_bt_cb, main_w);
         gtk_box_pack_start(GTK_BOX(bottom_hb), add_expression_bt, FALSE, FALSE, 0);
         gtk_widget_show(add_expression_bt);
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 82aeb09d3d..51ee5b7f2f 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -208,7 +208,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_box_pack_start(GTK_BOX(find_type_vb), filter_hb, FALSE, FALSE, 0);
   gtk_widget_show(filter_hb);
 
-  filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+  filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
   SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
   SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
   OBJECT_SET_DATA(filter_bt, E_FILT_TE_BUTTON_KEY, filter_bt);
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index ffa54523cc..2c604fa9d2 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -445,14 +445,14 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 
     /* Button row: (help), filter out, close button */
     if(topic_available(HELP_FILESET_DIALOG)) {
-      bbox = dlg_button_row_new(ETHEREAL_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+      bbox = dlg_button_row_new(WIRESHARK_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
     } else {
-      bbox = dlg_button_row_new(ETHEREAL_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, NULL);
+      bbox = dlg_button_row_new(WIRESHARK_STOCK_FILTER_OUT_STREAM, GTK_STOCK_CLOSE, NULL);
     }
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
 
 
-    button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_FILTER_OUT_STREAM);
+    button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_FILTER_OUT_STREAM);
 	gtk_tooltips_set_tip (tooltips, button,
         "Build a display filter which cuts this stream from the capture", NULL);
 	SIGNAL_CONNECT(button, "clicked", follow_filter_out_stream, follow_info);
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 0e0e55a3d9..c2cd10b4a5 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -734,24 +734,24 @@ void font_init(void)
   if (m_r_font == NULL || m_b_font == NULL) {
     /* XXX - pop this up as a dialog box? no */
     if (m_r_font == NULL) {
-	fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n",
+	fprintf(stderr, "wireshark: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n",
 		prefs.gui_font_name1);
     } else {
       gdk_font_unref(m_r_font);
     }
     if (m_b_font == NULL) {
-	fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n",
+	fprintf(stderr, "wireshark: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n",
 		bold_font_name);
     } else {
       gdk_font_unref(m_b_font);
     }
     g_free(bold_font_name);
     if ((m_r_font = gdk_font_load("6x13")) == NULL) {
-      fprintf(stderr, "ethereal: Error: font 6x13 not found\n");
+      fprintf(stderr, "wireshark: Error: font 6x13 not found\n");
       exit(1);
     }
     if ((m_b_font = gdk_font_load("6x13bold")) == NULL) {
-      fprintf(stderr, "ethereal: Error: font 6x13bold not found\n");
+      fprintf(stderr, "wireshark: Error: font 6x13bold not found\n");
       exit(1);
     }
     g_free(prefs.gui_font_name1);
@@ -764,24 +764,24 @@ void font_init(void)
   if (m_r_font == NULL || m_b_font == NULL) {
     /* XXX - pop this up as a dialog box? no */
     if (m_r_font == NULL) {
-	fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to Monospace 9\n",
+	fprintf(stderr, "wireshark: Warning: font %s not found - defaulting to Monospace 9\n",
 		prefs.gui_font_name2);
     } else {
       pango_font_description_free(m_r_font);
     }
     if (m_b_font == NULL) {
-        fprintf(stderr, "ethereal: Warning: bold font %s not found - defaulting"
+        fprintf(stderr, "wireshark: Warning: bold font %s not found - defaulting"
                         " to Monospace 9\n", prefs.gui_font_name2);
     } else {
       pango_font_description_free(m_b_font);
     }
     if ((m_r_font = pango_font_description_from_string("Monospace 9")) == NULL)
     {
-      fprintf(stderr, "ethereal: Error: font Monospace 9 not found\n");
+      fprintf(stderr, "wireshark: Error: font Monospace 9 not found\n");
       exit(1);
     }
     if ((m_b_font = pango_font_description_copy(m_r_font)) == NULL) {
-      fprintf(stderr, "ethereal: Error: font Monospace 9 bold not found\n");
+      fprintf(stderr, "wireshark: Error: font Monospace 9 bold not found\n");
       exit(1);
     }
     g_free(prefs.gui_font_name2);
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 64429ddbd5..09acd4388e 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -234,7 +234,7 @@ static void help_topic(const gchar *topic) {
     HWND hw;
     GString *url = g_string_new("");
 
-    g_string_append_printf(url, "%s\\user-guide.chm::/%s>Ethereal Help", 
+    g_string_append_printf(url, "%s\\user-guide.chm::/%s>Wireshark Help", 
         get_datafile_dir(), topic);
 
     hw = HtmlHelpW(NULL, 
@@ -335,36 +335,36 @@ void help_redraw(void)
 static void
 topic_action(topic_action_e action)
 {
-    /* pages online at www.ethereal.com */
+    /* pages online at www.wireshark.org */
     switch(action) {
     case(ONLINEPAGE_HOME):
-        browser_open_url ("http://www.ethereal.com");
+        browser_open_url ("http://www.wireshark.org");
         break;
     case(ONLINEPAGE_WIKI):
-        browser_open_url ("http://wiki.ethereal.com");
+        browser_open_url ("http://wiki.wireshark.org");
         break;
     case(ONLINEPAGE_DOWNLOAD):
-        browser_open_url ("http://www.ethereal.com/download.html");
+        browser_open_url ("http://www.wireshark.org/download.html");
         break;
     case(ONLINEPAGE_USERGUIDE):
-        browser_open_url ("http://www.ethereal.com/docs/eug_html_chunked");
+        browser_open_url ("http://www.wireshark.org/docs/eug_html_chunked");
         break;
     case(ONLINEPAGE_FAQ):
-        browser_open_url ("http://www.ethereal.com/faq.html");
+        browser_open_url ("http://www.wireshark.org/faq.html");
         break;
     case(ONLINEPAGE_SAMPLE_FILES):
-        browser_open_url ("http://wiki.ethereal.com/SampleCaptures");
+        browser_open_url ("http://wiki.wireshark.org/SampleCaptures");
         break;
 
     /* local manual pages */
-    case(LOCALPAGE_MAN_ETHEREAL):
-        browser_open_data_file("ethereal.html");
+    case(LOCALPAGE_MAN_WIRESHARK):
+        browser_open_data_file("wireshark.html");
         break;
-    case(LOCALPAGE_MAN_ETHEREAL_FILTER):
-        browser_open_data_file("ethereal-filter.html");
+    case(LOCALPAGE_MAN_WIRESHARK_FILTER):
+        browser_open_data_file("wireshark-filter.html");
         break;
-    case(LOCALPAGE_MAN_TETHEREAL):
-        browser_open_data_file("tethereal.html");
+    case(LOCALPAGE_MAN_TWIRESHARK):
+        browser_open_data_file("twireshark.html");
         break;
     case(LOCALPAGE_MAN_DUMPCAP):
         browser_open_data_file("dumpcap.html");
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index 4676af1257..49edae2fb2 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -33,7 +33,7 @@
  */
 
 typedef enum {
-    /* pages online at www.ethereal.com */
+    /* pages online at www.wireshark.org */
     ONLINEPAGE_HOME,
     ONLINEPAGE_WIKI,
     ONLINEPAGE_USERGUIDE,
@@ -42,9 +42,9 @@ typedef enum {
     ONLINEPAGE_SAMPLE_FILES,
 
     /* local manual pages */
-    LOCALPAGE_MAN_ETHEREAL = 100,
-    LOCALPAGE_MAN_ETHEREAL_FILTER,
-    LOCALPAGE_MAN_TETHEREAL,
+    LOCALPAGE_MAN_WIRESHARK = 100,
+    LOCALPAGE_MAN_WIRESHARK_FILTER,
+    LOCALPAGE_MAN_TWIRESHARK,
     LOCALPAGE_MAN_DUMPCAP,
     LOCALPAGE_MAN_MERGECAP,
     LOCALPAGE_MAN_EDITCAP,
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 4d3beac0b9..df6fbc9058 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1089,7 +1089,7 @@ gtk_iostat_init(const char *optarg _U_, void* userdata _U_)
 
 	error_string=enable_graph(&io->graphs[0], NULL, NULL);
 	if(error_string){
-		fprintf(stderr, "ethereal: Can't attach io_stat tap: %s\n",
+		fprintf(stderr, "wireshark: Can't attach io_stat tap: %s\n",
 		    error_string->str);
 		g_string_free(error_string, TRUE);
 		io->graphs[0].display=0;
@@ -1780,7 +1780,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 
 
 	/* filter prefs dialog */
-	gio->filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+	gio->filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 
 	g_snprintf(str, 256, "Wireshark: Display Filter  IO-Stat (Filter:%d)", num);
 	if(gio->args->title){
diff --git a/gtk/main.c b/gtk/main.c
index ffee252f88..ff59a123be 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -299,7 +299,7 @@ static void selected_ptree_info_answered_cb(gpointer dialog _U_, gint btn, gpoin
     case(ESD_BTN_OK):
         if (cfile.finfo_selected) {
             /* open wiki page using the protocol abbreviation */
-            selected_proto_url = g_strdup_printf("http://wiki.ethereal.com/Protocols/%s", proto_abbrev);
+            selected_proto_url = g_strdup_printf("http://wiki.wireshark.org/Protocols/%s", proto_abbrev);
             browser_open_url(selected_proto_url);
             g_free(selected_proto_url);
         }
@@ -333,12 +333,12 @@ selected_ptree_info_cb(GtkWidget *widget _U_, gpointer data _U_)
 
         /* ask the user if the wiki page really should be opened */
         dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
-                    PRIMARY_TEXT_START "Open Ethereal Wiki page of protocol \"%s\"?" PRIMARY_TEXT_END "\n"
+                    PRIMARY_TEXT_START "Open Wireshark Wiki page of protocol \"%s\"?" PRIMARY_TEXT_END "\n"
                     "\n"
-                    "This will open the \"%s\" related Ethereal Wiki page in your Web browser.\n"
+                    "This will open the \"%s\" related Wireshark Wiki page in your Web browser.\n"
                     "\n"
-                    "The Ethereal Wiki is a collaborative approach to provide information\n"
-                    "about Ethereal in several ways (not limited to protocol specifics).\n"
+                    "The Wireshark Wiki is a collaborative approach to provide information\n"
+                    "about Wireshark in several ways (not limited to protocol specifics).\n"
                     "\n"
                     "This Wiki is new, so the page of the selected protocol\n"
                     "may not exist and/or may not contain valuable information.\n"
@@ -376,7 +376,7 @@ selected_ptree_ref_cb(GtkWidget *widget _U_, gpointer data _U_)
         proto_abbrev = proto_registrar_get_abbrev(field_id);
 
         /* open reference page using the protocol abbreviation */
-        selected_proto_url = g_strdup_printf("http://www.ethereal.com/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev);
+        selected_proto_url = g_strdup_printf("http://www.wireshark.org/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev);
         browser_open_url(selected_proto_url);
         g_free(selected_proto_url);
     }
@@ -1121,7 +1121,7 @@ print_usage(gboolean print_ver) {
     output = stdout;
     fprintf(output, "Wireshark " VERSION "%s\n"
         "Interactively dump and analyze network traffic.\n"
-        "See http://www.ethereal.com for more information.\n"
+        "See http://www.wireshark.org for more information.\n"
         "\n"
         "%s",
 	svnversion, get_copyright_info());
@@ -1129,7 +1129,7 @@ print_usage(gboolean print_ver) {
     output = stderr;
   }
   fprintf(output, "\n");
-  fprintf(output, "Usage: ethereal [options] ... [ <infile> ]\n");
+  fprintf(output, "Usage: wireshark [options] ... [ <infile> ]\n");
   fprintf(output, "\n");
 
 #ifdef HAVE_LIBPCAP
@@ -1231,7 +1231,7 @@ cmdarg_err(const char *fmt, ...)
   create_console();
 #endif
   va_start(ap, fmt);
-  fprintf(stderr, "ethereal: ");
+  fprintf(stderr, "wireshark: ");
   vfprintf(stderr, fmt, ap);
   fprintf(stderr, "\n");
   va_end(ap);
@@ -1276,7 +1276,7 @@ update_cb(gpointer data _U_)
    would just be empty functions.
 
    This allows gtk2-rpcstat.c and friends to be copied unmodified to
-   gtk1-ethereal and it will just work.
+   gtk1-wireshark and it will just work.
  */
 static GStaticMutex update_thread_mutex = G_STATIC_MUTEX_INIT;
 gpointer
@@ -2478,7 +2478,7 @@ main(int argc, char *argv[])
        * Input file name not specified with "-r", and a command-line argument
        * was specified; treat it as the input file name.
        *
-       * Yes, this is different from tethereal, where non-flag command-line
+       * Yes, this is different from twireshark, where non-flag command-line
        * arguments are a filter, but this works better on GUI desktops
        * where a command can be specified to be run to open a particular
        * file - yes, you could have "-r" as the last part of the command,
@@ -3259,7 +3259,7 @@ welcome_new(void)
     gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.0);
 
 #ifdef HAVE_LIBPCAP
-    item_hb = welcome_item(ETHEREAL_STOCK_CAPTURE_START,
+    item_hb = welcome_item(WIRESHARK_STOCK_CAPTURE_START,
         "Capture",
         "Capture live data from your network",
         GTK_SIGNAL_FUNC(capture_prep_cb), NULL);
@@ -3279,7 +3279,7 @@ welcome_new(void)
         GTK_SIGNAL_FUNC(topic_cb), GINT_TO_POINTER(ONLINEPAGE_HOME));
     gtk_box_pack_start(GTK_BOX(welcome_vb), item_hb, TRUE, FALSE, 5);
 
-    item_hb = welcome_item(ETHEREAL_STOCK_WEB_SUPPORT,
+    item_hb = welcome_item(WIRESHARK_STOCK_WEB_SUPPORT,
         "User's Guide",
         "Open the Wireshark User's Guide",
         GTK_SIGNAL_FUNC(topic_cb), GINT_TO_POINTER(ONLINEPAGE_USERGUIDE));
@@ -3547,7 +3547,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
     gtk_widget_show(filter_tb);
 
     /* Create the "Filter:" button */
-    filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+    filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
     SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
     gtk_widget_show(filter_bt);
     OBJECT_SET_DATA(top_level, E_FILT_BT_PTR_KEY, filter_bt);
@@ -3580,7 +3580,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
 
     /* Create the "Add Expression..." button, to pop up a dialog
        for constructing filter comparison expressions. */
-    filter_add_expr_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
+    filter_add_expr_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION);
     OBJECT_SET_DATA(filter_tb, E_FILT_FILTER_TE_KEY, filter_te);
     SIGNAL_CONNECT(filter_add_expr_bt, "clicked", filter_add_expr_bt_cb, filter_tb);
     gtk_widget_show(filter_add_expr_bt);
diff --git a/gtk/mcast_stream.h b/gtk/mcast_stream.h
index 0f413a47f3..3f65417e6d 100644
--- a/gtk/mcast_stream.h
+++ b/gtk/mcast_stream.h
@@ -115,7 +115,7 @@ typedef struct _mcaststream_tapinfo {
 * Registers the mcast_streams tap listener (if not already done).
 * From that point on, the Mcast streams list will be updated with every redissection.
 * This function is also the entry point for the initialization routine of the tap system.
-* So whenever mcast_stream.c is added to the list of ETHEREAL_TAP_SRCs, the tap will be registered on startup.
+* So whenever mcast_stream.c is added to the list of WIRESHARK_TAP_SRCs, the tap will be registered on startup.
 * If not, it will be registered on demand by the mcast_streams and mcast_analysis functions that need it.
 */
 void register_tap_listener_mcast_stream(void);
diff --git a/gtk/menu.c b/gtk/menu.c
index 525790045f..78827e63cd 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -189,9 +189,9 @@ static GtkItemFactoryEntry menu_items[] =
                              0, GTK_STOCK_SAVE_AS),
     ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/File/File Set", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/List Files", NULL, fileset_cb, 0, ETHEREAL_STOCK_FILE_SET_LIST),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Next File", NULL, fileset_next_cb, 0, ETHEREAL_STOCK_FILE_SET_NEXT),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Previous File", NULL, fileset_previous_cb, 0, ETHEREAL_STOCK_FILE_SET_PREVIOUS),
+    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/List Files", NULL, fileset_cb, 0, WIRESHARK_STOCK_FILE_SET_LIST),
+    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Next File", NULL, fileset_next_cb, 0, WIRESHARK_STOCK_FILE_SET_NEXT),
+    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Previous File", NULL, fileset_previous_cb, 0, WIRESHARK_STOCK_FILE_SET_PREVIOUS),
     ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
@@ -232,7 +232,7 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, 
-                        REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
+                        REFTIME_TOGGLE, WIRESHARK_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Mark Packet (toggle)", "<control>M", packet_list_mark_frame_cb,
@@ -295,7 +295,7 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
                              0, GTK_STOCK_ZOOM_100),
     ITEM_FACTORY_STOCK_ENTRY("/View/Resize All Columns", NULL, packet_list_resize_columns_cb,
-                       0, ETHEREAL_STOCK_RESIZE_COLUMNS),
+                       0, WIRESHARK_STOCK_RESIZE_COLUMNS),
     ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/View/E_xpand Subtrees", NULL, expand_tree_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb,
@@ -327,21 +327,21 @@ static GtkItemFactoryEntry menu_items[] =
 #ifdef HAVE_LIBPCAP
     ITEM_FACTORY_ENTRY("/_Capture", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/_Interfaces...", NULL,
-                             capture_if_cb, 0, ETHEREAL_STOCK_CAPTURE_INTERFACES),
+                             capture_if_cb, 0, WIRESHARK_STOCK_CAPTURE_INTERFACES),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/_Options...", "<control>K",
-                             capture_prep_cb, 0, ETHEREAL_STOCK_CAPTURE_OPTIONS),
+                             capture_prep_cb, 0, WIRESHARK_STOCK_CAPTURE_OPTIONS),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/_Start", NULL,
-                             capture_start_cb, 0, ETHEREAL_STOCK_CAPTURE_START),
+                             capture_start_cb, 0, WIRESHARK_STOCK_CAPTURE_START),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/S_top", "<control>E", capture_stop_cb,
-                             0, ETHEREAL_STOCK_CAPTURE_STOP),
+                             0, WIRESHARK_STOCK_CAPTURE_STOP),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/_Restart", NULL, capture_restart_cb,
-                             0, ETHEREAL_STOCK_CAPTURE_RESTART),
+                             0, WIRESHARK_STOCK_CAPTURE_RESTART),
     ITEM_FACTORY_STOCK_ENTRY("/Capture/Capture _Filters...", NULL, cfilter_dialog_cb,
-                       0, ETHEREAL_STOCK_CAPTURE_FILTER),
+                       0, WIRESHARK_STOCK_CAPTURE_FILTER),
 #endif /* HAVE_LIBPCAP */
     ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
-                       0, ETHEREAL_STOCK_DISPLAY_FILTER),
+                       0, WIRESHARK_STOCK_DISPLAY_FILTER),
     ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL, match_selected_ptree_cb, 
                        MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
@@ -369,11 +369,11 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb, 
                        MATCH_SELECTED_OR_NOT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, ETHEREAL_STOCK_CHECKBOX),
+    ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, WIRESHARK_STOCK_CHECKBOX),
     ITEM_FACTORY_STOCK_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
-                       0, ETHEREAL_STOCK_DECODE_AS),
+                       0, WIRESHARK_STOCK_DECODE_AS),
     ITEM_FACTORY_STOCK_ENTRY("/Analyze/_User Specified Decodes...", NULL,
-                       decode_show_cb, 0, ETHEREAL_STOCK_DECODE_AS),
+                       decode_show_cb, 0, WIRESHARK_STOCK_DECODE_AS),
     ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
                        follow_stream_cb, 0, NULL, NULL),    
@@ -384,9 +384,9 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
                        proto_hier_stats_cb, 0, NULL, NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Statistics/Conversations", NULL,
-                       init_conversation_notebook_cb, 0, ETHEREAL_STOCK_CONVERSATIONS),
+                       init_conversation_notebook_cb, 0, WIRESHARK_STOCK_CONVERSATIONS),
     ITEM_FACTORY_STOCK_ENTRY("/Statistics/Endpoints", NULL,
-                       init_hostlist_notebook_cb, 0, ETHEREAL_STOCK_ENDPOINTS),
+                       init_hostlist_notebook_cb, 0, WIRESHARK_STOCK_ENDPOINTS),
     ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP),
     ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
@@ -395,25 +395,25 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Help/User's Guide", NULL, topic_menu_cb, HELP_CONTENT, NULL, NULL),
 #endif
     ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal", NULL, topic_menu_cb, LOCALPAGE_MAN_ETHEREAL, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_ETHEREAL_FILTER, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Tethereal", NULL, topic_menu_cb, LOCALPAGE_MAN_TETHEREAL, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Twireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_TWIRESHARK, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/Dumpcap", NULL, topic_menu_cb, LOCALPAGE_MAN_DUMPCAP, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/Mergecap", NULL, topic_menu_cb, LOCALPAGE_MAN_MERGECAP, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/Editcap", NULL, topic_menu_cb, LOCALPAGE_MAN_EDITCAP, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, topic_menu_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Home Page", NULL, topic_menu_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Wiki", NULL, topic_menu_cb, ONLINEPAGE_WIKI, ETHEREAL_STOCK_WIKI),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/User's Guide", NULL, topic_menu_cb, ONLINEPAGE_USERGUIDE, ETHEREAL_STOCK_WEB_SUPPORT),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, topic_menu_cb, ONLINEPAGE_FAQ, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, topic_menu_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, topic_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Wireshark Online", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/Home Page", NULL, topic_menu_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
+    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/Wiki", NULL, topic_menu_cb, ONLINEPAGE_WIKI, WIRESHARK_STOCK_WIKI),
+    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/User's Guide", NULL, topic_menu_cb, ONLINEPAGE_USERGUIDE, WIRESHARK_STOCK_WEB_SUPPORT),
+    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/FAQ's", NULL, topic_menu_cb, ONLINEPAGE_FAQ, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/Downloads", NULL, topic_menu_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/Example Files", NULL, topic_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL),
 #endif
     ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Help/_About Wireshark", NULL, about_wireshark_cb,
-                       0, ETHEREAL_STOCK_ABOUT)
+                       0, WIRESHARK_STOCK_ABOUT)
 };
 
 
@@ -425,7 +425,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
 {
     ITEM_FACTORY_ENTRY("/Mark Packet (toggle)", NULL, packet_list_mark_frame_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
+    ITEM_FACTORY_STOCK_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, WIRESHARK_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
 
@@ -466,7 +466,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
 
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
 
-    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, ETHEREAL_STOCK_DECODE_AS),
+    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, WIRESHARK_STOCK_DECODE_AS),
     ITEM_FACTORY_STOCK_ENTRY("/Print...", NULL, file_print_selected_cmd_cb, 0, GTK_STOCK_PRINT),
     ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb,
                        0, NULL, NULL)
@@ -520,13 +520,13 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
 
     ITEM_FACTORY_STOCK_ENTRY("/Wiki Protocol Page", NULL, selected_ptree_info_cb,
-                       0, ETHEREAL_STOCK_WIKI),
+                       0, WIRESHARK_STOCK_WIKI),
     ITEM_FACTORY_STOCK_ENTRY("/Filter Field Reference", NULL, selected_ptree_ref_cb,
-                       0, ETHEREAL_STOCK_INTERNET),
+                       0, WIRESHARK_STOCK_INTERNET),
     ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, ETHEREAL_STOCK_DECODE_AS),
+    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, WIRESHARK_STOCK_DECODE_AS),
     ITEM_FACTORY_ENTRY("/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
 };
@@ -825,19 +825,19 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
                 break;
             case(REGISTER_STAT_GROUP_CONVERSATION_LIST):
                 entry->item_type = "<StockItem>";
-                entry->extra_data = ETHEREAL_STOCK_CONVERSATIONS;
+                entry->extra_data = WIRESHARK_STOCK_CONVERSATIONS;
                 break;
             case(REGISTER_STAT_GROUP_ENDPOINT_LIST):
                 entry->item_type = "<StockItem>";
-                entry->extra_data = ETHEREAL_STOCK_ENDPOINTS;
+                entry->extra_data = WIRESHARK_STOCK_ENDPOINTS;
                 break;
             case(REGISTER_STAT_GROUP_RESPONSE_TIME):
                 entry->item_type = "<StockItem>";
-                entry->extra_data = ETHEREAL_STOCK_TIME;
+                entry->extra_data = WIRESHARK_STOCK_TIME;
                 break;
             case(REGISTER_STAT_GROUP_TELEPHONY):
                 entry->item_type = "<StockItem>";
-                entry->extra_data = ETHEREAL_STOCK_TELEPHONY;
+                entry->extra_data = WIRESHARK_STOCK_TELEPHONY;
                 break;
             case(REGISTER_ANALYZE_GROUP_NONE):
                 break;
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index d9b6038058..2ab08b09c6 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -504,7 +504,7 @@ packet_list_new(e_prefs *prefs)
      * meaning they'll only appear if the content doesn't fit into the window.
      *
      * As this doesn't seem to work in some cases for the vertical scrollbar
-     * (see http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=220),
+     * (see http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=220),
      * we show that scrollbar always. */
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pkt_scrollw),
                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 0638b99467..da191c919f 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -568,7 +568,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
     gtk_widget_grab_focus(file_te);
 
   /* "Browse" button */
-  file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+  file_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_BROWSE);
   OBJECT_SET_DATA(dest_cb, PRINT_FILE_BT_KEY, file_bt);
   OBJECT_SET_DATA(file_bt, PRINT_TE_PTR_KEY, file_te);
   gtk_tooltips_set_tip (tooltips, file_bt, "Browse output filename in filesystem", NULL);
@@ -898,7 +898,7 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
     /* then delete this file again. After this, the name MUST be available. */
     /* */
     /* Don't use tmpnam() or such, as this will fail under some ACL */
-    /* circumstances: http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=358 */
+    /* circumstances: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=358 */
 
     tmp_fd = create_tempfile(tmp_namebuf, sizeof(tmp_namebuf), "ethprint");
     if(tmp_fd == -1) {
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 1e971aa7fb..9b33352a02 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -117,7 +117,7 @@ GtkWidget * printer_prefs_show(void)
 	gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 1, 2, 3, 4);
 	gtk_widget_show(file_bt_hb);
 
-    file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+    file_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_BROWSE);
 	gtk_box_pack_end(GTK_BOX(file_bt_hb), file_bt, FALSE, FALSE, 0);
 	gtk_widget_show(file_bt);
 
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index b5d225b4c1..c5cc0034f7 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -23,7 +23,7 @@
  */
 
 /* This module provides rpc call/reply SRT statistics to Wireshark.
- * It is only used by Wireshark and not Tethereal
+ * It is only used by Wireshark and not TWireshark
  *
  * It serves as an example on how to use the tap api.
  */
@@ -384,7 +384,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_)
 
 	error_string=register_tap_listener("rpc", win, NULL, rpcprogs_reset, rpcprogs_packet, rpcprogs_draw);
 	if(error_string){
-		fprintf(stderr, "ethereal: Couldn't register rpc,programs tap: %s\n",
+		fprintf(stderr, "wireshark: Couldn't register rpc,programs tap: %s\n",
 		    error_string->str);
 		g_string_free(error_string, TRUE);
 		exit(1);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index e2e90c1dc8..b3701a5445 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -241,7 +241,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
 			filter=NULL;
 		}
 	} else {
-		fprintf(stderr, "ethereal: invalid \"-z rpc,srt,<program>,<version>[,<filter>]\" argument\n");
+		fprintf(stderr, "wireshark: invalid \"-z rpc,srt,<program>,<version>[,<filter>]\" argument\n");
 		exit(1);
 	}
 
@@ -487,7 +487,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	filter_box=gtk_hbox_new(FALSE, 3);
 
 	/* Filter label */
-	filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+	filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 	SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
 	gtk_widget_show(filter_bt);
@@ -511,11 +511,11 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
+    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
     SIGNAL_CONNECT_OBJECT(start_button, "clicked",
                               rpcstat_start_button_clicked, NULL);
 
diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h
index c5493c1a2f..9308d4faa2 100644
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -114,7 +114,7 @@ typedef struct _rtpstream_tapinfo {
 * Registers the rtp_streams tap listener (if not already done).
 * From that point on, the RTP streams list will be updated with every redissection.
 * This function is also the entry point for the initialization routine of the tap system.
-* So whenever rtp_stream.c is added to the list of ETHEREAL_TAP_SRCs, the tap will be registered on startup.
+* So whenever rtp_stream.c is added to the list of WIRESHARK_TAP_SRCs, the tap will be registered on startup.
 * If not, it will be registered on demand by the rtp_streams and rtp_analysis functions that need it.
 */
 void register_tap_listener_rtp_stream(void);
diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index db8445f00b..0545890463 100644
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -193,7 +193,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
 			filter=NULL;
 		}
 	} else {
-		fprintf(stderr, "ethereal: invalid \"-z scsi,srt,<cmdset>[,<filter>]\" argument\n");
+		fprintf(stderr, "wireshark: invalid \"-z scsi,srt,<cmdset>[,<filter>]\" argument\n");
 		exit(1);
 	}
 
@@ -365,7 +365,7 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
 	filter_box=gtk_hbox_new(FALSE, 3);
 
 	/* Filter label */
-	filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+	filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 	SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
 	gtk_widget_show(filter_bt);
@@ -389,11 +389,11 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
+    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
     SIGNAL_CONNECT_OBJECT(start_button, "clicked",
                               scsistat_start_button_clicked, NULL);
 
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index da04a1ae1d..4f9f34fa1d 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -204,7 +204,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message)
     bbox = dlg_button_row_new(GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL, NULL);
     break;
   case(ESD_BTNS_SAVE_DONTSAVE_CANCEL):
-    bbox = dlg_button_row_new(GTK_STOCK_SAVE, ETHEREAL_STOCK_DONT_SAVE, GTK_STOCK_CANCEL, NULL);
+    bbox = dlg_button_row_new(GTK_STOCK_SAVE, WIRESHARK_STOCK_DONT_SAVE, GTK_STOCK_CANCEL, NULL);
     break;
   case(ESD_BTNS_YES_NO):
     bbox = dlg_button_row_new(GTK_STOCK_YES, GTK_STOCK_NO, NULL);
@@ -229,7 +229,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message)
       SIGNAL_CONNECT(save_bt, "clicked", simple_dialog_cancel_cb, win);
   }
   
-  dont_save_bt = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_DONT_SAVE);
+  dont_save_bt = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_DONT_SAVE);
   if (dont_save_bt) {
       OBJECT_SET_DATA(dont_save_bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE));
       SIGNAL_CONNECT(dont_save_bt, "clicked", simple_dialog_cancel_cb, win);  	
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 0c5eb56abe..c94ff0a0ae 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -198,7 +198,7 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 	filter_box=gtk_hbox_new(FALSE, 3);
 
 	/* Filter button */
-	filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
+	filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 	SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &(current_dlg->args));
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, TRUE, 0);
 	gtk_widget_show(filter_bt);
@@ -222,11 +222,11 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT);
+    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
     SIGNAL_CONNECT(start_button, "clicked",
                               tap_dfilter_dlg_start_button_clicked, current_dlg);
 
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 26cec19772..a41dfc7814 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -1803,7 +1803,7 @@ static void graph_segment_list_get (struct graph *g)
 	ts.last=NULL;
 	error_string=register_tap_listener("tcp", &ts, "tcp", NULL, tapall_tcpip_packet, NULL);
 	if(error_string){
-		fprintf(stderr, "ethereal: Couldn't register tcp_graph tap: %s\n",
+		fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
 		    error_string->str);
 		g_string_free(error_string, TRUE);
 		exit(1);
@@ -1864,7 +1864,7 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment
 
 	error_string=register_tap_listener("tcp", &th, NULL, NULL, tap_tcpip_packet, NULL);
 	if(error_string){
-		fprintf(stderr, "ethereal: Couldn't register tcp_graph tap: %s\n",
+		fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
 		    error_string->str);
 		g_string_free(error_string, TRUE);
 		exit(1);
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 25c26763f5..20fb307987 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -174,81 +174,81 @@ static void wireshark_stock_icons(void) {
     /* register non-standard pixmaps with the gtk-stock engine */
     static const GtkStockItem stock_items[] = {
 #ifdef HAVE_LIBPCAP
-        { ETHEREAL_STOCK_CAPTURE_INTERFACES,    ETHEREAL_STOCK_LABEL_CAPTURE_INTERFACES,    0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_OPTIONS,       ETHEREAL_STOCK_LABEL_CAPTURE_OPTIONS,       0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_START,         ETHEREAL_STOCK_LABEL_CAPTURE_START,         0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_STOP,          ETHEREAL_STOCK_LABEL_CAPTURE_STOP,          0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_RESTART,       ETHEREAL_STOCK_LABEL_CAPTURE_RESTART,       0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_FILTER,        ETHEREAL_STOCK_LABEL_CAPTURE_FILTER,        0, 0, NULL },
-        { ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY,  ETHEREAL_STOCK_LABEL_CAPTURE_FILTER_ENTRY,  0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_INTERFACES,    WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES,    0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_OPTIONS,       WIRESHARK_STOCK_LABEL_CAPTURE_OPTIONS,       0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_START,         WIRESHARK_STOCK_LABEL_CAPTURE_START,         0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_STOP,          WIRESHARK_STOCK_LABEL_CAPTURE_STOP,          0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_RESTART,       WIRESHARK_STOCK_LABEL_CAPTURE_RESTART,       0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_FILTER,        WIRESHARK_STOCK_LABEL_CAPTURE_FILTER,        0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  WIRESHARK_STOCK_LABEL_CAPTURE_FILTER_ENTRY,  0, 0, NULL },
 #endif
-        { ETHEREAL_STOCK_DISPLAY_FILTER,        ETHEREAL_STOCK_LABEL_DISPLAY_FILTER,        0, 0, NULL },
-        { ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY,  ETHEREAL_STOCK_LABEL_DISPLAY_FILTER_ENTRY,  0, 0, NULL },
-        { ETHEREAL_STOCK_PREFS,                 ETHEREAL_STOCK_LABEL_PREFS,                 0, 0, NULL },
-        { ETHEREAL_STOCK_BROWSE,                ETHEREAL_STOCK_LABEL_BROWSE,                0, 0, NULL },
-        { ETHEREAL_STOCK_CREATE_STAT,           ETHEREAL_STOCK_LABEL_CREATE_STAT,           0, 0, NULL },
-        { ETHEREAL_STOCK_EXPORT,                ETHEREAL_STOCK_LABEL_EXPORT,                0, 0, NULL },
-        { ETHEREAL_STOCK_IMPORT,                ETHEREAL_STOCK_LABEL_IMPORT,                0, 0, NULL },
-        { ETHEREAL_STOCK_EDIT,                  ETHEREAL_STOCK_LABEL_EDIT,                  0, 0, NULL },
-        { ETHEREAL_STOCK_ADD_EXPRESSION,        ETHEREAL_STOCK_LABEL_ADD_EXPRESSION,        0, 0, NULL },
-        { ETHEREAL_STOCK_DONT_SAVE,             ETHEREAL_STOCK_LABEL_DONT_SAVE,             0, 0, NULL },
-        { ETHEREAL_STOCK_ABOUT,                 ETHEREAL_STOCK_LABEL_ABOUT,                 0, 0, NULL },
-        { ETHEREAL_STOCK_COLORIZE,              ETHEREAL_STOCK_LABEL_COLORIZE,              0, 0, NULL },
-        { ETHEREAL_STOCK_AUTOSCROLL,            ETHEREAL_STOCK_LABEL_AUTOSCROLL,            0, 0, NULL },
-        { ETHEREAL_STOCK_RESIZE_COLUMNS,        ETHEREAL_STOCK_LABEL_RESIZE_COLUMNS,        0, 0, NULL },
-        { ETHEREAL_STOCK_TIME,                  ETHEREAL_STOCK_LABEL_TIME,                  0, 0, NULL },
-        { ETHEREAL_STOCK_INTERNET,              ETHEREAL_STOCK_LABEL_INTERNET,              0, 0, NULL },
-        { ETHEREAL_STOCK_WEB_SUPPORT,           ETHEREAL_STOCK_LABEL_WEB_SUPPORT,           0, 0, NULL },
-        { ETHEREAL_STOCK_WIKI,                  ETHEREAL_STOCK_LABEL_WIKI,                  0, 0, NULL },
-        { ETHEREAL_STOCK_CONVERSATIONS,         ETHEREAL_STOCK_LABEL_CONVERSATIONS,         0, 0, NULL },
-        { ETHEREAL_STOCK_ENDPOINTS,             ETHEREAL_STOCK_LABEL_ENDPOINTS,             0, 0, NULL },
-        { ETHEREAL_STOCK_GRAPHS,                ETHEREAL_STOCK_LABEL_GRAPHS,                0, 0, NULL },
-        { ETHEREAL_STOCK_TELEPHONY,             ETHEREAL_STOCK_LABEL_TELEPHONY,             0, 0, NULL },
-        { ETHEREAL_STOCK_DECODE_AS,             ETHEREAL_STOCK_LABEL_DECODE_AS,             0, 0, NULL },
-        { ETHEREAL_STOCK_CHECKBOX,              ETHEREAL_STOCK_LABEL_CHECKBOX,              0, 0, NULL },
-        { ETHEREAL_STOCK_FILE_SET_LIST,         ETHEREAL_STOCK_LABEL_FILE_SET_LIST,         0, 0, NULL },
-        { ETHEREAL_STOCK_FILE_SET_NEXT,         ETHEREAL_STOCK_LABEL_FILE_SET_NEXT,         0, 0, NULL },
-        { ETHEREAL_STOCK_FILE_SET_PREVIOUS,     ETHEREAL_STOCK_LABEL_FILE_SET_PREVIOUS,     0, 0, NULL },
-        { ETHEREAL_STOCK_FILTER_OUT_STREAM,     ETHEREAL_STOCK_LABEL_FILTER_OUT_STREAM,     0, 0, NULL }
+        { WIRESHARK_STOCK_DISPLAY_FILTER,        WIRESHARK_STOCK_LABEL_DISPLAY_FILTER,        0, 0, NULL },
+        { WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  WIRESHARK_STOCK_LABEL_DISPLAY_FILTER_ENTRY,  0, 0, NULL },
+        { WIRESHARK_STOCK_PREFS,                 WIRESHARK_STOCK_LABEL_PREFS,                 0, 0, NULL },
+        { WIRESHARK_STOCK_BROWSE,                WIRESHARK_STOCK_LABEL_BROWSE,                0, 0, NULL },
+        { WIRESHARK_STOCK_CREATE_STAT,           WIRESHARK_STOCK_LABEL_CREATE_STAT,           0, 0, NULL },
+        { WIRESHARK_STOCK_EXPORT,                WIRESHARK_STOCK_LABEL_EXPORT,                0, 0, NULL },
+        { WIRESHARK_STOCK_IMPORT,                WIRESHARK_STOCK_LABEL_IMPORT,                0, 0, NULL },
+        { WIRESHARK_STOCK_EDIT,                  WIRESHARK_STOCK_LABEL_EDIT,                  0, 0, NULL },
+        { WIRESHARK_STOCK_ADD_EXPRESSION,        WIRESHARK_STOCK_LABEL_ADD_EXPRESSION,        0, 0, NULL },
+        { WIRESHARK_STOCK_DONT_SAVE,             WIRESHARK_STOCK_LABEL_DONT_SAVE,             0, 0, NULL },
+        { WIRESHARK_STOCK_ABOUT,                 WIRESHARK_STOCK_LABEL_ABOUT,                 0, 0, NULL },
+        { WIRESHARK_STOCK_COLORIZE,              WIRESHARK_STOCK_LABEL_COLORIZE,              0, 0, NULL },
+        { WIRESHARK_STOCK_AUTOSCROLL,            WIRESHARK_STOCK_LABEL_AUTOSCROLL,            0, 0, NULL },
+        { WIRESHARK_STOCK_RESIZE_COLUMNS,        WIRESHARK_STOCK_LABEL_RESIZE_COLUMNS,        0, 0, NULL },
+        { WIRESHARK_STOCK_TIME,                  WIRESHARK_STOCK_LABEL_TIME,                  0, 0, NULL },
+        { WIRESHARK_STOCK_INTERNET,              WIRESHARK_STOCK_LABEL_INTERNET,              0, 0, NULL },
+        { WIRESHARK_STOCK_WEB_SUPPORT,           WIRESHARK_STOCK_LABEL_WEB_SUPPORT,           0, 0, NULL },
+        { WIRESHARK_STOCK_WIKI,                  WIRESHARK_STOCK_LABEL_WIKI,                  0, 0, NULL },
+        { WIRESHARK_STOCK_CONVERSATIONS,         WIRESHARK_STOCK_LABEL_CONVERSATIONS,         0, 0, NULL },
+        { WIRESHARK_STOCK_ENDPOINTS,             WIRESHARK_STOCK_LABEL_ENDPOINTS,             0, 0, NULL },
+        { WIRESHARK_STOCK_GRAPHS,                WIRESHARK_STOCK_LABEL_GRAPHS,                0, 0, NULL },
+        { WIRESHARK_STOCK_TELEPHONY,             WIRESHARK_STOCK_LABEL_TELEPHONY,             0, 0, NULL },
+        { WIRESHARK_STOCK_DECODE_AS,             WIRESHARK_STOCK_LABEL_DECODE_AS,             0, 0, NULL },
+        { WIRESHARK_STOCK_CHECKBOX,              WIRESHARK_STOCK_LABEL_CHECKBOX,              0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_LIST,         WIRESHARK_STOCK_LABEL_FILE_SET_LIST,         0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_NEXT,         WIRESHARK_STOCK_LABEL_FILE_SET_NEXT,         0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_PREVIOUS,     WIRESHARK_STOCK_LABEL_FILE_SET_PREVIOUS,     0, 0, NULL },
+        { WIRESHARK_STOCK_FILTER_OUT_STREAM,     WIRESHARK_STOCK_LABEL_FILTER_OUT_STREAM,     0, 0, NULL }
     };
 
     static const stock_pixmap_t pixmaps[] = {
 #ifdef HAVE_LIBPCAP
-        { ETHEREAL_STOCK_CAPTURE_INTERFACES,    capture_interfaces_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_OPTIONS,       capture_options_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_START,         capture_start_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_STOP,          capture_stop_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_RESTART,       capture_restart_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_FILTER,        capture_filter_24_xpm },
-        { ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY,  capture_filter_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_INTERFACES,    capture_interfaces_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_OPTIONS,       capture_options_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_START,         capture_start_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_STOP,          capture_stop_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_RESTART,       capture_restart_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_FILTER,        capture_filter_24_xpm },
+        { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  capture_filter_24_xpm },
 #endif
-        { ETHEREAL_STOCK_DISPLAY_FILTER,        display_filter_24_xpm },
-        { ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY,  display_filter_24_xpm },
-        { ETHEREAL_STOCK_PREFS,                 stock_preferences_24_xpm },
-        { ETHEREAL_STOCK_BROWSE,                stock_open_24_xpm },
-        { ETHEREAL_STOCK_CREATE_STAT,           stock_ok_20_xpm },
-        { ETHEREAL_STOCK_EXPORT,                stock_save_24_xpm },    /* XXX: needs a better icon */
-        { ETHEREAL_STOCK_IMPORT,                stock_save_24_xpm },    /* XXX: needs a better icon */
-        { ETHEREAL_STOCK_EDIT,                  stock_properties_24_xpm },
-        { ETHEREAL_STOCK_ADD_EXPRESSION,        stock_add_24_xpm },
-        { ETHEREAL_STOCK_ABOUT,                 eicon3d16_xpm },
-        { ETHEREAL_STOCK_COLORIZE,              colorize_24_xpm },
-        { ETHEREAL_STOCK_AUTOSCROLL,            autoscroll_24_xpm },
-        { ETHEREAL_STOCK_RESIZE_COLUMNS,        resize_columns_24_xpm},
-        { ETHEREAL_STOCK_TIME,                  time_24_xpm},
-        { ETHEREAL_STOCK_INTERNET,              internet_24_xpm},
-        { ETHEREAL_STOCK_WEB_SUPPORT,           web_support_24_xpm},
-        { ETHEREAL_STOCK_WIKI,                  wiki_24_xpm},
-        { ETHEREAL_STOCK_CONVERSATIONS,         conversations_16_xpm},
-        { ETHEREAL_STOCK_ENDPOINTS,             endpoints_16_xpm},
-        { ETHEREAL_STOCK_GRAPHS,                graphs_16_xpm},
-        { ETHEREAL_STOCK_TELEPHONY,             telephony_16_xpm},
-        { ETHEREAL_STOCK_DECODE_AS,             decode_as_16_xpm},
-        { ETHEREAL_STOCK_CHECKBOX,              checkbox_16_xpm},
-        { ETHEREAL_STOCK_FILE_SET_LIST,         file_set_list_16_xpm},
-        { ETHEREAL_STOCK_FILE_SET_NEXT,         file_set_next_16_xpm},
-        { ETHEREAL_STOCK_FILE_SET_PREVIOUS,     file_set_previous_16_xpm},
-        { ETHEREAL_STOCK_FILTER_OUT_STREAM,     display_filter_24_xpm},
+        { WIRESHARK_STOCK_DISPLAY_FILTER,        display_filter_24_xpm },
+        { WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  display_filter_24_xpm },
+        { WIRESHARK_STOCK_PREFS,                 stock_preferences_24_xpm },
+        { WIRESHARK_STOCK_BROWSE,                stock_open_24_xpm },
+        { WIRESHARK_STOCK_CREATE_STAT,           stock_ok_20_xpm },
+        { WIRESHARK_STOCK_EXPORT,                stock_save_24_xpm },    /* XXX: needs a better icon */
+        { WIRESHARK_STOCK_IMPORT,                stock_save_24_xpm },    /* XXX: needs a better icon */
+        { WIRESHARK_STOCK_EDIT,                  stock_properties_24_xpm },
+        { WIRESHARK_STOCK_ADD_EXPRESSION,        stock_add_24_xpm },
+        { WIRESHARK_STOCK_ABOUT,                 eicon3d16_xpm },
+        { WIRESHARK_STOCK_COLORIZE,              colorize_24_xpm },
+        { WIRESHARK_STOCK_AUTOSCROLL,            autoscroll_24_xpm },
+        { WIRESHARK_STOCK_RESIZE_COLUMNS,        resize_columns_24_xpm},
+        { WIRESHARK_STOCK_TIME,                  time_24_xpm},
+        { WIRESHARK_STOCK_INTERNET,              internet_24_xpm},
+        { WIRESHARK_STOCK_WEB_SUPPORT,           web_support_24_xpm},
+        { WIRESHARK_STOCK_WIKI,                  wiki_24_xpm},
+        { WIRESHARK_STOCK_CONVERSATIONS,         conversations_16_xpm},
+        { WIRESHARK_STOCK_ENDPOINTS,             endpoints_16_xpm},
+        { WIRESHARK_STOCK_GRAPHS,                graphs_16_xpm},
+        { WIRESHARK_STOCK_TELEPHONY,             telephony_16_xpm},
+        { WIRESHARK_STOCK_DECODE_AS,             decode_as_16_xpm},
+        { WIRESHARK_STOCK_CHECKBOX,              checkbox_16_xpm},
+        { WIRESHARK_STOCK_FILE_SET_LIST,         file_set_list_16_xpm},
+        { WIRESHARK_STOCK_FILE_SET_NEXT,         file_set_next_16_xpm},
+        { WIRESHARK_STOCK_FILE_SET_PREVIOUS,     file_set_previous_16_xpm},
+        { WIRESHARK_STOCK_FILTER_OUT_STREAM,     display_filter_24_xpm},
         { NULL, NULL }
     };
 
@@ -516,15 +516,15 @@ toolbar_new(void)
 
 #ifdef HAVE_LIBPCAP
     toolbar_item(if_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_INTERFACES, "List the available capture interfaces...", capture_interfaces_24_xpm, capture_if_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_INTERFACES, "List the available capture interfaces...", capture_interfaces_24_xpm, capture_if_cb, NULL);
     toolbar_item(capture_options_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_OPTIONS, "Show the capture options...", capture_options_24_xpm, capture_prep_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_OPTIONS, "Show the capture options...", capture_options_24_xpm, capture_prep_cb, NULL);
     toolbar_item(new_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_START, "Start a new live capture", capture_start_24_xpm, capture_start_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_START, "Start a new live capture", capture_start_24_xpm, capture_start_cb, NULL);
     toolbar_item(stop_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_STOP, "Stop the running live capture", capture_stop_24_xpm, capture_stop_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_STOP, "Stop the running live capture", capture_stop_24_xpm, capture_stop_cb, NULL);
     toolbar_item(clear_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_RESTART, "Restart the running live capture", capture_restart_24_xpm, capture_restart_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_RESTART, "Restart the running live capture", capture_restart_24_xpm, capture_restart_cb, NULL);
     toolbar_append_separator(main_tb);
 #endif /* HAVE_LIBPCAP */
 
@@ -557,10 +557,10 @@ toolbar_new(void)
     toolbar_append_separator(main_tb);
 
     toolbar_toggle_button(colorize_button, window, main_tb, 
-        "Colorize"/*ETHEREAL_STOCK_COLORIZE*/, "Colorize Packet List", colorize_24_xpm, colorize_toggle_cb, NULL);
+        "Colorize"/*WIRESHARK_STOCK_COLORIZE*/, "Colorize Packet List", colorize_24_xpm, colorize_toggle_cb, NULL);
 #ifdef HAVE_LIBPCAP
     toolbar_toggle_button(autoscroll_button, window, main_tb, 
-        "Auto Scroll" /*ETHEREAL_STOCK_AUTOSCROLL*/, "Auto Scroll Packet List in Live Capture", autoscroll_24_xpm, auto_scroll_live_toggle_cb, NULL);
+        "Auto Scroll" /*WIRESHARK_STOCK_AUTOSCROLL*/, "Auto Scroll Packet List in Live Capture", autoscroll_24_xpm, auto_scroll_live_toggle_cb, NULL);
 #endif
     toolbar_append_separator(main_tb);
 
@@ -571,20 +571,20 @@ toolbar_new(void)
     toolbar_item(zoom_100_button, window, main_tb, 
         GTK_STOCK_ZOOM_100, "Zoom 100%", stock_zoom_1_24_xpm, view_zoom_100_cb, NULL);
     toolbar_item(resize_columns_button, window, main_tb, 
-        ETHEREAL_STOCK_RESIZE_COLUMNS, "Resize All Columns", resize_columns_24_xpm, packet_list_resize_columns_cb, NULL);
+        WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", resize_columns_24_xpm, packet_list_resize_columns_cb, NULL);
     toolbar_append_separator(main_tb);
     
 #ifdef HAVE_LIBPCAP
     toolbar_item(capture_filter_button, window, main_tb, 
-        ETHEREAL_STOCK_CAPTURE_FILTER, "Edit capture filter...", capture_filter_24_xpm, cfilter_dialog_cb, NULL);
+        WIRESHARK_STOCK_CAPTURE_FILTER, "Edit capture filter...", capture_filter_24_xpm, cfilter_dialog_cb, NULL);
 #endif /* HAVE_LIBPCAP */
     toolbar_item(display_filter_button, window, main_tb, 
-        ETHEREAL_STOCK_DISPLAY_FILTER, "Edit/apply display filter...", display_filter_24_xpm, dfilter_dialog_cb, NULL);
+        WIRESHARK_STOCK_DISPLAY_FILTER, "Edit/apply display filter...", display_filter_24_xpm, dfilter_dialog_cb, NULL);
     toolbar_item(color_display_button, window, main_tb, 
         GTK_STOCK_SELECT_COLOR, "Edit coloring rules...", stock_colorselector_24_xpm, color_display_cb, NULL);
     /* the preference button uses it's own Stock icon label "Prefs", as "Preferences" is too long */
     toolbar_item(prefs_button, window, main_tb, 
-        ETHEREAL_STOCK_PREFS, "Edit preferences...", stock_preferences_24_xpm, prefs_cb, NULL);
+        WIRESHARK_STOCK_PREFS, "Edit preferences...", stock_preferences_24_xpm, prefs_cb, NULL);
     toolbar_append_separator(main_tb);
 
     toolbar_item(help_button, window, main_tb, 
diff --git a/gtk/voip_calls.h b/gtk/voip_calls.h
index 407e6a47cc..0b5788d1fd 100644
--- a/gtk/voip_calls.h
+++ b/gtk/voip_calls.h
@@ -218,7 +218,7 @@ typedef struct _voip_rtp_tapinfo {
 * Registers the voip_calls tap listeners (if not already done).
 * From that point on, the calls list will be updated with every redissection.
 * This function is also the entry point for the initialization routine of the tap system.
-* So whenever voip_calls.c is added to the list of ETHEREAL_TAP_SRCs, the tap will be registered on startup.
+* So whenever voip_calls.c is added to the list of WIRESHARK_TAP_SRCs, the tap will be registered on startup.
 * If not, it will be registered on demand by the voip_calls functions that need it.
 */
 void sip_calls_init_tap(void);