diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d45c50155..212c75ef9 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -28,12 +28,12 @@ noinst_HEADERS = \
     stats.h \
     sexy-icon-entry.h \
     torrent-cell-renderer.h \
-    tr_core.h \
-    tr_icon.h \
+    tr-core.h \
+    tr-icon.h \
     tr-io.h \
-    tr_prefs.h \
-    tr_torrent.h \
-    tr_window.h \
+    tr-prefs.h \
+    tr-torrent.h \
+    tr-window.h \
     ui.h \
     util.h
 
@@ -55,12 +55,12 @@ transmission_SOURCES = \
     sexy-icon-entry.c \
     stats.c \
     torrent-cell-renderer.c \
-    tr_core.c \
-    tr_icon.c \
+    tr-core.c \
+    tr-icon.c \
     tr-io.c \
-    tr_prefs.c \
-    tr_torrent.c \
-    tr_window.c \
+    tr-prefs.c \
+    tr-torrent.c \
+    tr-window.c \
     util.c
 
 dist_man_MANS = transmission.1
diff --git a/gtk/actions.c b/gtk/actions.c
index 77b825b2d..21468f0ec 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -15,8 +15,8 @@
 #include <gtk/gtk.h>
 #include <libtransmission/transmission.h>
 #include "conf.h"
-#include "tr_core.h"
-#include "tr_prefs.h"
+#include "tr-core.h"
+#include "tr-prefs.h"
 #include "lock.h"
 #include "logo.h"
 
diff --git a/gtk/actions.h b/gtk/actions.h
index e90b3840b..f590636fe 100644
--- a/gtk/actions.h
+++ b/gtk/actions.h
@@ -14,7 +14,7 @@
 #define TR_ACTIONS_H
 
 #include <gtk/gtk.h>
-#include "tr_core.h"
+#include "tr-core.h"
 
 void actions_init ( GtkUIManager * ui_manager, gpointer callback_user_data );
 
diff --git a/gtk/details.c b/gtk/details.c
index 84143399e..530a813b8 100644
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -21,7 +21,7 @@
 #include "actions.h"
 #include "details.h"
 #include "file-list.h"
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 #include "hig.h"
 #include "util.h"
 
diff --git a/gtk/details.h b/gtk/details.h
index 756aec1fa..582651e79 100644
--- a/gtk/details.h
+++ b/gtk/details.h
@@ -14,7 +14,7 @@
 #define GTK_TORRENT_INSPECTOR_H
 
 #include <gtk/gtkwindow.h>
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 
 GtkWidget* torrent_inspector_new ( GtkWindow * parent, TrTorrent * tor );
 
diff --git a/gtk/dialogs.c b/gtk/dialogs.c
index d4f9cce7d..d93832907 100644
--- a/gtk/dialogs.c
+++ b/gtk/dialogs.c
@@ -30,8 +30,8 @@
 #include "conf.h"
 #include "dialogs.h"
 #include "hig.h"
-#include "tr_core.h"
-#include "tr_prefs.h"
+#include "tr-core.h"
+#include "tr-prefs.h"
 
 struct dirdata
 {
diff --git a/gtk/dialogs.h b/gtk/dialogs.h
index 0963df76d..ecde8da29 100644
--- a/gtk/dialogs.h
+++ b/gtk/dialogs.h
@@ -25,8 +25,8 @@
 #ifndef TG_PREFS_H
 #define TG_PREFS_H
 
-#include "tr_core.h"
-#include "tr_torrent.h"
+#include "tr-core.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 /* prompt for a download directory for torrents, then add them */
diff --git a/gtk/file-list.h b/gtk/file-list.h
index d22dc7e71..a27587916 100644
--- a/gtk/file-list.h
+++ b/gtk/file-list.h
@@ -26,7 +26,7 @@
 #define GTK_TORRENT_FILE_LIST_H
 
 #include <gtk/gtkwidget.h>
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 
 /* create a new file list */
 GtkWidget * file_list_new( TrTorrent * );
diff --git a/gtk/ipc.c b/gtk/ipc.c
index 36ed55fd7..6ef79a8d6 100644
--- a/gtk/ipc.c
+++ b/gtk/ipc.c
@@ -41,10 +41,10 @@
 
 #include "conf.h"
 #include "ipc.h"
-#include "tr_core.h"
+#include "tr-core.h"
 #include "tr-io.h"
-#include "tr_prefs.h"
-#include "tr_torrent.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 #ifndef AF_LOCAL
diff --git a/gtk/ipc.h b/gtk/ipc.h
index b0cf33d74..f05ba7f9e 100644
--- a/gtk/ipc.h
+++ b/gtk/ipc.h
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "tr_core.h"
+#include "tr-core.h"
 
 void
 ipc_socket_setup( GtkWindow * wind, TrCore * core );
diff --git a/gtk/main.c b/gtk/main.c
index 91ba85ab1..ff92c493d 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -50,11 +50,11 @@
 #include "notify.h"
 #include "open-dialog.h"
 #include "stats.h"
-#include "tr_core.h"
-#include "tr_icon.h"
-#include "tr_prefs.h"
-#include "tr_torrent.h"
-#include "tr_window.h"
+#include "tr-core.h"
+#include "tr-icon.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
+#include "tr-window.h"
 #include "util.h"
 #include "ui.h"
 
diff --git a/gtk/msgwin.c b/gtk/msgwin.c
index bad1804e0..4f102ca3a 100644
--- a/gtk/msgwin.c
+++ b/gtk/msgwin.c
@@ -34,7 +34,7 @@
 #include "conf.h"
 #include "hig.h"
 #include "msgwin.h"
-#include "tr_prefs.h"
+#include "tr-prefs.h"
 #include "util.h"
 
 #define MAX_MSGCOUNT 5000
diff --git a/gtk/msgwin.h b/gtk/msgwin.h
index a91aa385b..de4ee68de 100644
--- a/gtk/msgwin.h
+++ b/gtk/msgwin.h
@@ -25,7 +25,7 @@
 #ifndef TG_MSGWIN_H
 #define TG_MSGWIN_H
 
-#include "tr_core.h"
+#include "tr-core.h"
 
 void
 msgwin_init( void );
diff --git a/gtk/notify.h b/gtk/notify.h
index c68d1cd3d..b547e12e3 100644
--- a/gtk/notify.h
+++ b/gtk/notify.h
@@ -13,7 +13,7 @@
 #ifndef __TR_NOTIFY_H__
 #define __TR_NOTIFY_H__
 
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 
 void tr_notify_init( void ); 
 void tr_notify_send( TrTorrent * tor ); 
diff --git a/gtk/open-dialog.h b/gtk/open-dialog.h
index 05df6b19f..820a328b8 100644
--- a/gtk/open-dialog.h
+++ b/gtk/open-dialog.h
@@ -14,7 +14,7 @@
 #define TR_GTK_OPEN_DIALOG_H
 
 #include <gtk/gtkwindow.h>
-#include "tr_core.h"
+#include "tr-core.h"
 
 GtkWidget* makeaddwind( GtkWindow  * parent,
                         TrCore     * core,
diff --git a/gtk/stats.c b/gtk/stats.c
index ab22d9f3f..ad9e6790b 100644
--- a/gtk/stats.c
+++ b/gtk/stats.c
@@ -14,7 +14,7 @@
 #include <gtk/gtk.h>
 #include "hig.h"
 #include "stats.h"
-#include "tr_core.h"
+#include "tr-core.h"
 
 struct stat_ui
 {
diff --git a/gtk/stats.h b/gtk/stats.h
index 98cee4cec..0413d0df7 100644
--- a/gtk/stats.h
+++ b/gtk/stats.h
@@ -15,7 +15,7 @@
 
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
-#include "tr_core.h"
+#include "tr-core.h"
 
 GtkWidget* stats_dialog_create( GtkWindow * parent,
                                 TrCore    * core );
diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 72520df78..280f62612 100644
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -18,7 +18,7 @@
 #include <libtransmission/transmission.h>
 #include "hig.h"
 #include "torrent-cell-renderer.h"
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 /* #define TEST_RTL */
diff --git a/gtk/tr_core.c b/gtk/tr-core.c
similarity index 99%
rename from gtk/tr_core.c
rename to gtk/tr-core.c
index 05b80eaac..16877deaf 100644
--- a/gtk/tr_core.c
+++ b/gtk/tr-core.c
@@ -31,9 +31,9 @@
 #include <libtransmission/utils.h> /* tr_strcmp */
 
 #include "conf.h"
-#include "tr_core.h"
-#include "tr_prefs.h"
-#include "tr_torrent.h"
+#include "tr-core.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 struct TrCorePrivate
diff --git a/gtk/tr_core.h b/gtk/tr-core.h
similarity index 99%
rename from gtk/tr_core.h
rename to gtk/tr-core.h
index 3e3e625a7..045d64efc 100644
--- a/gtk/tr_core.h
+++ b/gtk/tr-core.h
@@ -32,7 +32,7 @@
 
 #include <libtransmission/transmission.h>
 
-#include "tr_torrent.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 #define TR_CORE_TYPE (tr_core_get_type())
diff --git a/gtk/tr_icon.c b/gtk/tr-icon.c
similarity index 99%
rename from gtk/tr_icon.c
rename to gtk/tr-icon.c
index 6447fc17d..30db4344a 100644
--- a/gtk/tr_icon.c
+++ b/gtk/tr-icon.c
@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include "actions.h"
-#include "tr_icon.h"
+#include "tr-icon.h"
 #include "util.h"
 
 #ifndef STATUS_ICON_SUPPORTED
diff --git a/gtk/tr_icon.h b/gtk/tr-icon.h
similarity index 98%
rename from gtk/tr_icon.h
rename to gtk/tr-icon.h
index 4f83d7a04..856b373c1 100644
--- a/gtk/tr_icon.h
+++ b/gtk/tr-icon.h
@@ -26,7 +26,7 @@
 #define TR_ICON_H
 
 #include <gtk/gtk.h>
-#include "tr_core.h"
+#include "tr-core.h"
 
 #if GTK_CHECK_VERSION(2,10,0)
 #define STATUS_ICON_SUPPORTED
diff --git a/gtk/tr_prefs.c b/gtk/tr-prefs.c
similarity index 99%
rename from gtk/tr_prefs.c
rename to gtk/tr-prefs.c
index cabbff0ae..2d3ebfaf4 100644
--- a/gtk/tr_prefs.c
+++ b/gtk/tr-prefs.c
@@ -16,8 +16,8 @@
 #include <libtransmission/transmission.h>
 #include "conf.h"
 #include "hig.h"
-#include "tr_core.h"
-#include "tr_prefs.h"
+#include "tr-core.h"
+#include "tr-prefs.h"
 #include "util.h"
 
 /**
diff --git a/gtk/tr_prefs.h b/gtk/tr-prefs.h
similarity index 100%
rename from gtk/tr_prefs.h
rename to gtk/tr-prefs.h
diff --git a/gtk/tr_torrent.c b/gtk/tr-torrent.c
similarity index 99%
rename from gtk/tr_torrent.c
rename to gtk/tr-torrent.c
index 54ecc305a..59949b301 100644
--- a/gtk/tr_torrent.c
+++ b/gtk/tr-torrent.c
@@ -31,8 +31,8 @@
 
 #include <libtransmission/transmission.h>
 
-#include "tr_prefs.h"
-#include "tr_torrent.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
 #include "conf.h"
 #include "notify.h"
 #include "util.h"
diff --git a/gtk/tr_torrent.h b/gtk/tr-torrent.h
similarity index 100%
rename from gtk/tr_torrent.h
rename to gtk/tr-torrent.h
diff --git a/gtk/tr_window.c b/gtk/tr-window.c
similarity index 99%
rename from gtk/tr_window.c
rename to gtk/tr-window.c
index b0d8b299e..5c843fcae 100644
--- a/gtk/tr_window.c
+++ b/gtk/tr-window.c
@@ -34,9 +34,9 @@
 #include "hig.h"
 #include "sexy-icon-entry.h"
 #include "torrent-cell-renderer.h"
-#include "tr_prefs.h"
-#include "tr_torrent.h"
-#include "tr_window.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
+#include "tr-window.h"
 #include "util.h"
 
 #if !GTK_CHECK_VERSION(2,8,0)
diff --git a/gtk/tr_window.h b/gtk/tr-window.h
similarity index 98%
rename from gtk/tr_window.h
rename to gtk/tr-window.h
index ad3f7c0fd..2735eb7d8 100644
--- a/gtk/tr_window.h
+++ b/gtk/tr-window.h
@@ -26,7 +26,7 @@
 #define TR_WINDOW_H
 
 #include <gtk/gtk.h>
-#include "tr_core.h"
+#include "tr-core.h"
 
 typedef GtkWindow TrWindow;
 
diff --git a/gtk/util.c b/gtk/util.c
index 400dff560..24f8e085d 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -35,9 +35,9 @@
 
 #include <libevent/evhttp.h>
 
-#include "tr_prefs.h"
-#include "tr_torrent.h"
 #include "conf.h"
+#include "tr-prefs.h"
+#include "tr-torrent.h"
 #include "util.h"
 
 static void