diff --git a/headers/config.h.in b/headers/config.h.in
index 4125802..af598b4 100644
--- a/headers/config.h.in
+++ b/headers/config.h.in
@@ -27,7 +27,7 @@
 #ifndef HAWAII_CONFIG_H
 #define HAWAII_CONFIG_H
 
-#define HAWAII_BASEAPPS_VERSION "@PROJECT_VERSION@"
+#define HAWAII_WORKSPACE_VERSION "@PROJECT_VERSION@"
 
 #cmakedefine01 HAVE_SYSTEMD
 
diff --git a/polkitagent/main.cpp b/polkitagent/main.cpp
index a666b37..942d77f 100644
--- a/polkitagent/main.cpp
+++ b/polkitagent/main.cpp
@@ -33,9 +33,9 @@ int main(int argc, char *argv[])
 {
     // Setup application
     QGuiApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("Hawaii PolicyKit Agent"));
-    app.setApplicationVersion(QStringLiteral(HAWAII_BASEAPPS_VERSION));
-    app.setOrganizationDomain(QStringLiteral("hawaii.org"));
+    app.setApplicationName(QStringLiteral("PolicyKit Agent"));
+    app.setApplicationVersion(QStringLiteral(HAWAII_WORKSPACE_VERSION));
+    app.setOrganizationDomain(QStringLiteral("hawaiios.org"));
     app.setOrganizationName(QStringLiteral("Hawaii"));
     app.setQuitOnLastWindowClosed(false);
 
diff --git a/powermanager/main.cpp b/powermanager/main.cpp
index a83c940..933543b 100644
--- a/powermanager/main.cpp
+++ b/powermanager/main.cpp
@@ -33,8 +33,8 @@ int main(int argc, char *argv[])
 {
     // Setup application
     QCoreApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("Hawaii Power Manager"));
-    app.setApplicationVersion(QStringLiteral(HAWAII_BASEAPPS_VERSION));
+    app.setApplicationName(QStringLiteral("Power Manager"));
+    app.setApplicationVersion(QStringLiteral(HAWAII_WORKSPACE_VERSION));
     app.setOrganizationDomain(QStringLiteral("hawaiios.org"));
     app.setOrganizationName(QStringLiteral("Hawaii"));
 
diff --git a/screenshooter/main.cpp b/screenshooter/main.cpp
index 0b225dc..431e083 100644
--- a/screenshooter/main.cpp
+++ b/screenshooter/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
     // Setup application
     QGuiApplication app(argc, argv);
     app.setApplicationName(QStringLiteral("Screenshooter"));
-    app.setApplicationVersion(QStringLiteral(HAWAII_BASEAPPS_VERSION));
+    app.setApplicationVersion(QStringLiteral(HAWAII_WORKSPACE_VERSION));
     app.setOrganizationDomain(QStringLiteral("hawaiios.org"));
     app.setOrganizationName(QStringLiteral("Hawaii"));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)