diff --git a/DESIGN b/DESIGN
index 31c9ee4..0fdf6a0 100644
--- a/DESIGN
+++ b/DESIGN
@@ -26,10 +26,10 @@ Once running, redshift currently doesn't check location providers
 again.
 
 
-gtk-redshift
+redshift-gtk
 ------------
 
-gtk-redshift is a small program written in Python that shows a status
+redshift-gtk is a small program written in Python that shows a status
 icon (what is an appindicator versus a GTK status icon?) (does it
 change the icon according to internal program state of redshift? 
 doesn't seem so) and run an instance of the "redshift" program, and
diff --git a/HACKING b/HACKING
index 86b58bc..0138ca9 100644
--- a/HACKING
+++ b/HACKING
@@ -20,7 +20,7 @@ prefix directory run:
 You can now run the python scripts. Example:
 
  $ PYTHONHOME=$HOME/redshift/root/lib/python2.7/site-packages \
-    $HOME/redshift/root/bin/gtk-redshift
+    $HOME/redshift/root/bin/redshift-gtk
 
 
 Notes
diff --git a/Makefile.am b/Makefile.am
index b0e5c37..b657680 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ _UBUNTU_MONO_LIGHT_FILES = \
 	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
 
 _DESKTOP_FILES = \
-	data/applications/gtk-redshift.desktop
+	data/applications/redshift-gtk.desktop
 
 # Icons
 if ENABLE_GUI
diff --git a/README b/README
index 2fb3450..84439b7 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ your surroundings. This may help your eyes hurt less if you are
 working in front of the screen at night.
 
 Run `redshift -h' for help on command line options. You can run the program
-as `gtk-redshift' instead of 'redshift' for a graphical status icon.
+as `redshift-gtk' instead of 'redshift' for a graphical status icon.
 
 Website:	http://jonls.dk/redshift/
 Project page:	http://launchpad.net/redshift
diff --git a/configure.ac b/configure.ac
index 1af5bfe..88dfd62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,7 @@ AC_CONFIG_FILES([
 	Makefile
 	po/Makefile.in
 	src/Makefile
-	src/gtk-redshift/Makefile
+	src/redshift-gtk/Makefile
 ])
 AC_OUTPUT
 
diff --git a/data/applications/gtk-redshift.desktop b/data/applications/redshift-gtk.desktop
similarity index 92%
rename from data/applications/gtk-redshift.desktop
rename to data/applications/redshift-gtk.desktop
index 850255c..dc8d8b2 100755
--- a/data/applications/gtk-redshift.desktop
+++ b/data/applications/redshift-gtk.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Redshift
 GenericName=Color temperature adjustment
 Comment=Color temperature adjustment tool
-Exec=gtk-redshift
+Exec=redshift-gtk
 Icon=redshift
 Terminal=false
 Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff61d9a..01a6e9c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,4 +11,4 @@ src/gamma-w32gdi.c
 src/location-gnome-clock.c
 src/location-manual.c
 
-src/gtk-redshift/statusicon.py
+src/redshift-gtk/statusicon.py
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c4a613..ccf5108 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = gtk-redshift
+SUBDIRS = redshift-gtk
 
 # I18n
 localedir = $(datadir)/locale
diff --git a/src/gtk-redshift/Makefile.am b/src/redshift-gtk/Makefile.am
similarity index 65%
rename from src/gtk-redshift/Makefile.am
rename to src/redshift-gtk/Makefile.am
index bb69459..10242ea 100644
--- a/src/gtk-redshift/Makefile.am
+++ b/src/redshift-gtk/Makefile.am
@@ -1,14 +1,14 @@
 
 if ENABLE_GUI
-gtk_redshift_PYTHON = \
+redshift_gtk_PYTHON = \
 	__init__.py \
 	utils.py \
 	statusicon.py
-nodist_gtk_redshift_PYTHON = \
+nodist_redshift_gtk_PYTHON = \
 	defs.py
-gtk_redshiftdir = $(pythondir)/gtk_redshift
+redshift_gtkdir = $(pythondir)/redshift_gtk
 
-dist_bin_SCRIPTS = gtk-redshift
+dist_bin_SCRIPTS = redshift-gtk
 endif
 
 EXTRA_DIST = defs.py.in
diff --git a/src/gtk-redshift/__init__.py b/src/redshift-gtk/__init__.py
similarity index 93%
rename from src/gtk-redshift/__init__.py
rename to src/redshift-gtk/__init__.py
index 0e4f254..e8a14af 100644
--- a/src/gtk-redshift/__init__.py
+++ b/src/redshift-gtk/__init__.py
@@ -1,4 +1,4 @@
-# __init__.py -- gtk-redshift package __init__ file
+# __init__.py -- redshift-gtk package __init__ file
 # This file is part of Redshift.
 
 # Redshift is free software: you can redistribute it and/or modify
diff --git a/src/gtk-redshift/defs.py.in b/src/redshift-gtk/defs.py.in
similarity index 100%
rename from src/gtk-redshift/defs.py.in
rename to src/redshift-gtk/defs.py.in
diff --git a/src/gtk-redshift/gtk-redshift b/src/redshift-gtk/redshift-gtk
similarity index 89%
rename from src/gtk-redshift/gtk-redshift
rename to src/redshift-gtk/redshift-gtk
index 56d940e..3ec3010 100644
--- a/src/gtk-redshift/gtk-redshift
+++ b/src/redshift-gtk/redshift-gtk
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# gtk-redshift -- GTK+ Redshift launcher script
+# redshift-gtk -- GTK+ Redshift launcher script
 # This file is part of Redshift.
 
 # Redshift is free software: you can redistribute it and/or modify
@@ -19,5 +19,5 @@
 
 
 if __name__ == '__main__':
-    from gtk_redshift.statusicon import run
+    from redshift_gtk.statusicon import run
     run()
diff --git a/src/gtk-redshift/statusicon.py b/src/redshift-gtk/statusicon.py
similarity index 100%
rename from src/gtk-redshift/statusicon.py
rename to src/redshift-gtk/statusicon.py
diff --git a/src/gtk-redshift/utils.py b/src/redshift-gtk/utils.py
similarity index 98%
rename from src/gtk-redshift/utils.py
rename to src/redshift-gtk/utils.py
index 2fd3b71..723d4d8 100644
--- a/src/gtk-redshift/utils.py
+++ b/src/redshift-gtk/utils.py
@@ -21,7 +21,7 @@ import os
 from xdg import BaseDirectory as base
 from xdg import DesktopEntry as desktop
 
-REDSHIFT_DESKTOP = 'gtk-redshift.desktop'
+REDSHIFT_DESKTOP = 'redshift-gtk.desktop'
 
 # Keys to set when enabling/disabling autostart.
 # Only first one is checked on "get".