diff --git a/pace-gui/configure.ac b/pace-gui/configure.ac
index 5d3525a..c38c307 100644
--- a/pace-gui/configure.ac
+++ b/pace-gui/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT(pinpad, 0.2, oepen@informatik.hu-berlin.de)
+AC_INIT(pace-gui, 0.2, oepen@informatik.hu-berlin.de)
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -24,7 +24,7 @@ AC_SUBST(PYGTK_LIBS)
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 src/pinpad_globals.py
+                 src/pace-gui-globals.py
                  src/pace-gui.desktop
                  images/Makefile])
 AC_OUTPUT
diff --git a/pace-gui/src/Makefile.am b/pace-gui/src/Makefile.am
index 215a59b..2271406 100644
--- a/pace-gui/src/Makefile.am
+++ b/pace-gui/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_SCRIPTS = pinpad.py
+bin_SCRIPTS = pace-gui.py
 
 pinpaddir = $(prefix)/bin
 
diff --git a/pace-gui/src/pinpad_globals.py.in b/pace-gui/src/pace-gui-globals.py.in
similarity index 100%
rename from pace-gui/src/pinpad_globals.py.in
rename to pace-gui/src/pace-gui-globals.py.in
diff --git a/pace-gui/src/pinpad.py b/pace-gui/src/pace-gui.py
similarity index 100%
rename from pace-gui/src/pinpad.py
rename to pace-gui/src/pace-gui.py