diff --git a/gtk/dialogs.c b/gtk/dialogs.c
index 2f12b102f..f21a68473 100644
--- a/gtk/dialogs.c
+++ b/gtk/dialogs.c
@@ -134,7 +134,7 @@ promptfordir( GtkWindow * parent, TrCore * core, GList * files, tr_ctor * ctor )
 
     g_object_weak_ref( G_OBJECT( core ), promptdirnocore, stuff );
 
-    wind =  gtk_file_chooser_dialog_new( _("Choose a directory"), parent,
+    wind =  gtk_file_chooser_dialog_new( _("Destination folder"), parent,
                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
diff --git a/gtk/dialogs.h b/gtk/dialogs.h
index 7285a424b..8929b446f 100644
--- a/gtk/dialogs.h
+++ b/gtk/dialogs.h
@@ -29,7 +29,7 @@
 #include "tr-torrent.h"
 #include "util.h"
 
-/* prompt for a download directory for torrents, then add them */
+/* prompt for a download folder for torrents, then add them */
 GtkWidget* promptfordir( GtkWindow  * parent,
                          TrCore     * core,
                          GList      * filenames,
diff --git a/gtk/main.c b/gtk/main.c
index 47009580f..27bc1683d 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -375,7 +375,7 @@ appsetup( TrWindow * wind, GList * args,
 
     /* set up core handlers */
     g_signal_connect( cbdata->core, "error", G_CALLBACK( coreerr ), cbdata );
-    g_signal_connect( cbdata->core, "directory-prompt",
+    g_signal_connect( cbdata->core, "destination-prompt",
                       G_CALLBACK( coreprompt ), cbdata );
     g_signal_connect_swapped( cbdata->core, "quit",
                               G_CALLBACK( wannaquit ), cbdata );
diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index f55bcdf45..52d580364 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -250,7 +250,7 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle )
 
         g_snprintf( name, sizeof(name), "%s:", _("File _Type"));
         h = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
-        w = rb_dir = gtk_radio_button_new_with_mnemonic( NULL, _("Directory"));
+        w = rb_dir = gtk_radio_button_new_with_mnemonic( NULL, _("Folder"));
         gtk_box_pack_start ( GTK_BOX(h), w, FALSE, FALSE, 0 );
         w = rb_file = gtk_radio_button_new_with_mnemonic_from_widget( GTK_RADIO_BUTTON(w), _("Single File") );
         gtk_box_pack_start ( GTK_BOX(h), w, FALSE, FALSE, 0 );
diff --git a/gtk/open-dialog.c b/gtk/open-dialog.c
index fe0fbff01..17de990ef 100644
--- a/gtk/open-dialog.c
+++ b/gtk/open-dialog.c
@@ -195,7 +195,7 @@ makeaddwind( GtkWindow  * parent,
 
     ++row;
     col = 0;
-    l = gtk_label_new_with_mnemonic( _( "Download _to:" ) );
+    l = gtk_label_new_with_mnemonic( _( "Destination _folder:" ) );
     gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
     gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );
     ++col;
diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index 3a920b265..8e16f3949 100644
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -131,7 +131,7 @@ tr_core_class_init( gpointer g_class, gpointer g_class_data UNUSED )
                                        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
                                        tr_core_marshal_err, G_TYPE_NONE,
                                        2, G_TYPE_INT, G_TYPE_STRING );
-    core_class->promptsig = g_signal_new( "directory-prompt",
+    core_class->promptsig = g_signal_new( "destination-prompt",
                                           G_TYPE_FROM_CLASS( g_class ),
                                           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
                                           tr_core_marshal_prompt, G_TYPE_NONE,
diff --git a/gtk/tr-core.h b/gtk/tr-core.h
index 045d64efc..07b369b9e 100644
--- a/gtk/tr-core.h
+++ b/gtk/tr-core.h
@@ -65,7 +65,7 @@ typedef struct TrCoreClass
        void handler( TrCore *, enum tr_core_err, const char *, gpointer ) */
     int errsig;
 
-    /* "directory-prompt" signal:
+    /* "destination-prompt" signal:
        void handler( TrCore *, GList *, gpointer ctor, gpointer userData ) */
     int promptsig;