diff --git a/gtk/actions.c b/gtk/actions.c
index 8fddabf06..30bdc01a7 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -57,8 +57,8 @@ static GtkToggleActionEntry show_toggle_entries[] =
 {
   { "toggle-main-window", NULL, 
     N_("Show _Main Window"), NULL, NULL, G_CALLBACK(action_cb), TRUE }, 
-  { "toggle-debug-window", NULL,
-    N_("Show _Debug Window"), NULL, NULL, G_CALLBACK(action_cb), FALSE }
+  { "toggle-message-log", NULL,
+    N_("Show Message _Log"), NULL, NULL, G_CALLBACK(action_cb), FALSE }
 };
 
 static GtkActionEntry entries[] =
diff --git a/gtk/main.c b/gtk/main.c
index 39ed46de9..b56811fc2 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -844,7 +844,7 @@ recheckTorrentForeach (GtkTreeModel * model,
 static gboolean 
 msgwinclosed()
 {
-  action_toggle( "toggle-debug-window", FALSE );
+  action_toggle( "toggle-message-log", FALSE );
   return FALSE;
 }
 
@@ -938,7 +938,7 @@ doAction ( const char * action_name, gpointer user_data )
             gtk_widget_show( GTK_WIDGET( data->prefs ) );
         }
     }
-    else if (!strcmp (action_name, "toggle-debug-window"))
+    else if (!strcmp (action_name, "toggle-message-log"))
     {
         if( !data->msgwin )
         {
@@ -949,7 +949,7 @@ doAction ( const char * action_name, gpointer user_data )
         }
         else
         {
-            action_toggle("toggle-debug-window", FALSE);
+            action_toggle("toggle-message-log", FALSE);
             gtk_widget_destroy( data->msgwin );
             data->msgwin = NULL;
         }
diff --git a/gtk/msgwin.c b/gtk/msgwin.c
index 45d0cfda5..300bd0e2e 100644
--- a/gtk/msgwin.c
+++ b/gtk/msgwin.c
@@ -187,7 +187,7 @@ static void
 save_cb( GtkWidget * w, GtkTextBuffer * textbuf )
 {
   GtkWindow * window = GTK_WINDOW( gtk_widget_get_toplevel( w ) );
-  GtkWidget * d = gtk_file_chooser_dialog_new( _("Save Debug Log"), window,
+  GtkWidget * d = gtk_file_chooser_dialog_new( _("Save Log"), window,
                                                GTK_FILE_CHOOSER_ACTION_SAVE,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
@@ -229,9 +229,9 @@ msgwin_create( TrCore * core )
   int ii, curlevel;
 
   win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  gtk_window_set_title( GTK_WINDOW( win ), _( "Debug Window" ) );
+  gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) );
   gtk_window_set_default_size( GTK_WINDOW( win ), 600, 400 );
-  gtk_window_set_role( GTK_WINDOW( win ), "debug-window" );
+  gtk_window_set_role( GTK_WINDOW( win ), "message-log" );
   vbox = gtk_vbox_new( FALSE, 0 );
 
   /**
diff --git a/gtk/ui.h b/gtk/ui.h
index fdedddd59..abbf41003 100644
--- a/gtk/ui.h
+++ b/gtk/ui.h
@@ -22,7 +22,7 @@ const char * fallback_ui_file =
 "      <menuitem action='edit-preferences'/>\n"
 "    </menu>\n"
 "    <menu action='help-menu'>\n"
-"      <menuitem action='toggle-debug-window'/>\n"
+"      <menuitem action='toggle-message-log'/>\n"
 "      <separator/>\n"
 "      <menuitem action='show-about-dialog'/>\n"
 "    </menu>\n"
@@ -52,7 +52,7 @@ const char * fallback_ui_file =
 "    <menuitem action='add-torrent'/>\n"
 "    <separator/>\n"
 "    <menuitem action='toggle-main-window'/>\n"
-"    <menuitem action='toggle-debug-window'/>\n"
+"    <menuitem action='toggle-message-log'/>\n"
 "    <menuitem action='show-about-dialog'/>\n"
 "    <separator/>\n"
 "    <menuitem action='quit'/>\n"