diff --git a/Makefile b/Makefile
index 1c6aa21..5454562 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 all: install
 
 install:
-	install -m 755 -d $(DESTDIR)/usr/share/sabayon-welcome
-	install -Dm755 sabayon-welcome $(DESTDIR)/usr/bin/sabayon-welcome
-	install -Dm755 sabayon-welcome.desktop $(DESTDIR)/usr/share/applications/sabayon-welcome.desktop
-	install -Dm755 sabayon-welcome.desktop $(DESTDIR)/etc/skel/.config/autostart/sabayon-welcome.desktop
-	cp -R data/* $(DESTDIR)/usr/share/sabayon-welcome/
+	install -m 755 -d $(DESTDIR)/usr/share/sabayon-greeter
+	install -Dm755 sabayon-greeter $(DESTDIR)/usr/bin/sabayon-greeter
+	install -Dm755 sabayon-greeter.desktop $(DESTDIR)/usr/share/applications/sabayon-greeter.desktop
+	install -Dm755 sabayon-greeter.desktop $(DESTDIR)/etc/skel/.config/autostart/sabayon-greeter.desktop
+	cp -R data/* $(DESTDIR)/usr/share/sabayon-greeter/
diff --git a/README.md b/README.md
index 306ee48..e10476e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-sabayon-welcome
+sabayon-greeter
 ================
 
 Sabayon welcome screen
diff --git a/sabayon-welcome b/sabayon-greeter
similarity index 95%
rename from sabayon-welcome
rename to sabayon-greeter
index fa18b3c..b4bf6c2 100755
--- a/sabayon-welcome
+++ b/sabayon-greeter
@@ -66,7 +66,7 @@ class WelcomeConfig(object):
 
         # store full path to our autostart symlink
         self._autostart_path = os.path.expanduser(
-            '~/.config/autostart/sabayon-welcome.desktop')
+            '~/.config/autostart/sabayon-greeter.desktop')
 
         # ensure our config directory exists
         if not os.path.exists(self._config_dir):
@@ -91,7 +91,7 @@ class WelcomeConfig(object):
             # create the autostart symlink
             try:
                 os.symlink(
-                    '/usr/share/applications/sabayon-welcome.desktop',
+                    '/usr/share/applications/sabayon-greeter.desktop',
                     self._autostart_path)
             except OSError:
                 pass
@@ -218,11 +218,11 @@ class WelcomeApp(object):
             print('Using relative path for data source.\
                    Non-production testing.')
             self._data_path = os.path.join(self._location, 'data/')
-        elif(os.path.exists('/usr/share/sabayon-welcome/')):
-            print('Using /usr/share/sabayon-welcome/ path.')
-            self._data_path = '/usr/share/sabayon-welcome/'
+        elif(os.path.exists('/usr/share/sabayon-greeter/')):
+            print('Using /usr/share/sabayon-greeter/ path.')
+            self._data_path = '/usr/share/sabayon-greeter/'
         else:
-            print('Unable to source the sabayon-welcome data directory.')
+            print('Unable to source the sabayon-greeter data directory.')
             sys.exit(1)
 
         self._build_app()
diff --git a/sabayon-welcome.desktop b/sabayon-greeter.desktop
similarity index 81%
rename from sabayon-welcome.desktop
rename to sabayon-greeter.desktop
index 7add3ed..a1e634a 100644
--- a/sabayon-welcome.desktop
+++ b/sabayon-greeter.desktop
@@ -3,8 +3,8 @@ Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;
 StartupNotify=false
-Name=Sabayon Welcome
-Exec=sabayon-welcome
+Name=Sabayon Greeter
+Exec=sabayon-greeter
 Icon=gtk-info
 Comment=The Sabayon Welcome utility.
 Name[de_DE.UTF-8]=Sabayon Welcome