diff --git a/chotkeys/main.cpp b/chotkeys/main.cpp
index 6f4997b..7924925 100644
--- a/chotkeys/main.cpp
+++ b/chotkeys/main.cpp
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setQuitOnLastWindowClosed(true);
 
-//    if (!QDBusConnection::sessionBus().registerService("org.cutefish.Chotkeys")) {
+//    if (!QDBusConnection::sessionBus().registerService("com.cutefish.Chotkeys")) {
 //        return -1;
 //    }
 
diff --git a/cpufreq/CMakeLists.txt b/cpufreq/CMakeLists.txt
index 3ef0183..b8e576c 100644
--- a/cpufreq/CMakeLists.txt
+++ b/cpufreq/CMakeLists.txt
@@ -14,10 +14,10 @@ target_link_libraries(${TARGET}
 )
 
 configure_file(
-    org.cutefish.cpufreq.pkexec.policy.in
-    org.cutefish.cpufreq.pkexec.policy
+    com.cutefish.cpufreq.pkexec.policy.in
+    com.cutefish.cpufreq.pkexec.policy
     @ONLY
 )
 
 install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.cutefish.cpufreq.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.cutefish.cpufreq.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
diff --git a/cpufreq/org.cutefish.cpufreq.pkexec.policy.in b/cpufreq/com.cutefish.cpufreq.pkexec.policy.in
similarity index 93%
rename from cpufreq/org.cutefish.cpufreq.pkexec.policy.in
rename to cpufreq/com.cutefish.cpufreq.pkexec.policy.in
index bea6b8f..2325c1e 100644
--- a/cpufreq/org.cutefish.cpufreq.pkexec.policy.in
+++ b/cpufreq/com.cutefish.cpufreq.pkexec.policy.in
@@ -2,7 +2,7 @@
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
 <policyconfig>
-  <action id="org.cutefish.cpufreq.pkexec">
+  <action id="com.cutefish.cpufreq.pkexec">
     <message>Authentication is required to Change CPU configuration</message>
     <icon_name>battery</icon_name>
     <defaults>
diff --git a/polkit-agent/main.cpp b/polkit-agent/main.cpp
index fa2aa6a..279e6c6 100644
--- a/polkit-agent/main.cpp
+++ b/polkit-agent/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     PolKitAgentListener listener;
     PolkitQt1::UnixSessionSubject session(getpid());
 
-    if (!listener.registerListener(session, QStringLiteral("/org/cutefishos/PolicyKit1/AuthenticationAgent")))
+    if (!listener.registerListener(session, QStringLiteral("/com/cutefish/PolicyKit1/AuthenticationAgent")))
         return -1;
 
     return app.exec();
diff --git a/powerman/CMakeLists.txt b/powerman/CMakeLists.txt
index 1dec5c8..a0be85c 100644
--- a/powerman/CMakeLists.txt
+++ b/powerman/CMakeLists.txt
@@ -10,7 +10,7 @@ set(SOURCES
 )
 
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     cpu/org.cutefish.CPUManagement.xml
+                     cpu/com.cutefish.CPUManagement.xml
                      cpu/cpumanagement.h CPUManagement)
 set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
 
diff --git a/powerman/application.cpp b/powerman/application.cpp
index fcc16e4..d0644ac 100644
--- a/powerman/application.cpp
+++ b/powerman/application.cpp
@@ -25,5 +25,5 @@ Application::Application(QObject *parent)
     , m_lidWatcher(new LidWatcher)
     , m_cpuManagement(new CPUManagement)
 {
-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.PowerManager"));
+    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.PowerManager"));
 }
diff --git a/powerman/cpu/org.cutefish.CPUManagement.xml b/powerman/cpu/com.cutefish.CPUManagement.xml
similarity index 84%
rename from powerman/cpu/org.cutefish.CPUManagement.xml
rename to powerman/cpu/com.cutefish.CPUManagement.xml
index 86a7955..478aa77 100644
--- a/powerman/cpu/org.cutefish.CPUManagement.xml
+++ b/powerman/cpu/com.cutefish.CPUManagement.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.CPUManagement">
+  <interface name="com.cutefish.CPUManagement">
     <property name="mode" type="i" access="read"/>
 
     <method name="setMode">
diff --git a/screen-brightness/CMakeLists.txt b/screen-brightness/CMakeLists.txt
index 403eebf..40c99bb 100644
--- a/screen-brightness/CMakeLists.txt
+++ b/screen-brightness/CMakeLists.txt
@@ -18,10 +18,10 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 configure_file(
-    org.cutefish.brightness.pkexec.policy.in
-    org.cutefish.brightness.pkexec.policy
+    com.cutefish.brightness.pkexec.policy.in
+    com.cutefish.brightness.pkexec.policy
     @ONLY
 )
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.cutefish.brightness.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.cutefish.brightness.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
diff --git a/screen-brightness/org.cutefish.brightness.pkexec.policy.in b/screen-brightness/com.cutefish.brightness.pkexec.policy.in
similarity index 92%
rename from screen-brightness/org.cutefish.brightness.pkexec.policy.in
rename to screen-brightness/com.cutefish.brightness.pkexec.policy.in
index 4cec516..6605921 100644
--- a/screen-brightness/org.cutefish.brightness.pkexec.policy.in
+++ b/screen-brightness/com.cutefish.brightness.pkexec.policy.in
@@ -2,7 +2,7 @@
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
 <policyconfig>
-  <action id="org.cutefish.brightness.pkexec">
+  <action id="com.cutefish.brightness.pkexec">
     <message>Authentication is required to Change Brightness</message>
     <icon_name>battery</icon_name>
     <defaults>
diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt
index 0185b72..fbf57e5 100644
--- a/session/CMakeLists.txt
+++ b/session/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOURCES
 )
 
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     org.cutefish.Session.xml
+                     com.cutefish.Session.xml
                      application.h Application
                      sessionadaptor SessionAdaptor)
 set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
diff --git a/session/application.cpp b/session/application.cpp
index e0a2cb0..f953de2 100644
--- a/session/application.cpp
+++ b/session/application.cpp
@@ -89,7 +89,7 @@ Application::Application(int &argc, char **argv)
     new SessionAdaptor(this);
 
     // connect to D-Bus and register as an object:
-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.Session"));
+    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Session"));
     QDBusConnection::sessionBus().registerObject(QStringLiteral("/Session"), this);
 
     QCommandLineParser parser;
diff --git a/session/org.cutefish.Session.xml b/session/com.cutefish.Session.xml
similarity index 94%
rename from session/org.cutefish.Session.xml
rename to session/com.cutefish.Session.xml
index f940113..f1b6280 100644
--- a/session/org.cutefish.Session.xml
+++ b/session/com.cutefish.Session.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Session">
+  <interface name="com.cutefish.Session">
     <method name="logout">
       <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
     </method>
diff --git a/settings-daemon/CMakeLists.txt b/settings-daemon/CMakeLists.txt
index abdc5f7..a46493a 100644
--- a/settings-daemon/CMakeLists.txt
+++ b/settings-daemon/CMakeLists.txt
@@ -31,25 +31,25 @@ set(FORMS "")
 set(RESOURCES "")
 
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     audio/org.cutefish.Audio.xml
+                     audio/com.cutefish.Audio.xml
                      audio/audiomanager.h AudioManager)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     brightness/org.cutefish.Brightness.xml
+                     brightness/com.cutefish.Brightness.xml
                      brightness/brightnessmanager.h BrightnessManager)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     theme/org.cutefish.Theme.xml
+                     theme/com.cutefish.Theme.xml
                      theme/thememanager.h ThemeManager)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     battery/org.cutefish.PrimaryBattery.xml
+                     battery/com.cutefish.PrimaryBattery.xml
                      battery/battery.h Battery)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     language/org.cutefish.Language.xml
+                     language/com.cutefish.Language.xml
                      language/language.h Language)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     dock/org.cutefish.Dock.xml
+                     dock/com.cutefish.Dock.xml
                      dock/dock.h Dock)
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     mouse/org.cutefish.Mouse.xml
+                     mouse/com.cutefish.Mouse.xml
                      mouse/mousemanager.h Mouse)
 set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
 
diff --git a/settings-daemon/application.cpp b/settings-daemon/application.cpp
index edbb7b0..934a665 100644
--- a/settings-daemon/application.cpp
+++ b/settings-daemon/application.cpp
@@ -41,7 +41,7 @@ Application::Application(int &argc, char **argv)
 {
     new DBusAdaptor(this);
     // connect to D-Bus and register as an object:
-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.Settings"));
+    QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Settings"));
 
 //    m_kwinTimer->setSingleShot(false);
 //    m_kwinTimer->setInterval(50);
@@ -66,7 +66,7 @@ Application::Application(int &argc, char **argv)
 void Application::invokeDesktopProcess()
 {
     // Start desktop UI component.
-    QDBusInterface sessionInterface("org.cutefish.Session", "/Session", "org.cutefish.Session",
+    QDBusInterface sessionInterface("com.cutefish.Session", "/Session", "com.cutefish.Session",
                                     QDBusConnection::sessionBus());
 
     if (sessionInterface.isValid()) {
diff --git a/settings-daemon/audio/org.cutefish.Audio.xml b/settings-daemon/audio/com.cutefish.Audio.xml
similarity index 94%
rename from settings-daemon/audio/org.cutefish.Audio.xml
rename to settings-daemon/audio/com.cutefish.Audio.xml
index ffddd91..d960523 100644
--- a/settings-daemon/audio/org.cutefish.Audio.xml
+++ b/settings-daemon/audio/com.cutefish.Audio.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Audio">
+  <interface name="com.cutefish.Audio">
     <method name="setVolume">
         <arg name="volume" type="i" direction="in"/>
     </method>
diff --git a/settings-daemon/battery/org.cutefish.PrimaryBattery.xml b/settings-daemon/battery/com.cutefish.PrimaryBattery.xml
similarity index 95%
rename from settings-daemon/battery/org.cutefish.PrimaryBattery.xml
rename to settings-daemon/battery/com.cutefish.PrimaryBattery.xml
index 04f31c4..9809a69 100644
--- a/settings-daemon/battery/org.cutefish.PrimaryBattery.xml
+++ b/settings-daemon/battery/com.cutefish.PrimaryBattery.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.PrimaryBattery">
+  <interface name="com.cutefish.PrimaryBattery">
     <method name="refresh"></method>
 
     <property name="chargeState" type="i" access="read"/>
diff --git a/settings-daemon/brightness/org.cutefish.Brightness.xml b/settings-daemon/brightness/com.cutefish.Brightness.xml
similarity index 91%
rename from settings-daemon/brightness/org.cutefish.Brightness.xml
rename to settings-daemon/brightness/com.cutefish.Brightness.xml
index 80b5e4b..237129d 100644
--- a/settings-daemon/brightness/org.cutefish.Brightness.xml
+++ b/settings-daemon/brightness/com.cutefish.Brightness.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Brightness">
+  <interface name="com.cutefish.Brightness">
     <method name="setValue">
         <arg name="value" type="i" direction="in"/>
     </method>
diff --git a/settings-daemon/dock/org.cutefish.Dock.xml b/settings-daemon/dock/com.cutefish.Dock.xml
similarity index 93%
rename from settings-daemon/dock/org.cutefish.Dock.xml
rename to settings-daemon/dock/com.cutefish.Dock.xml
index 70823e6..7af2cd8 100644
--- a/settings-daemon/dock/org.cutefish.Dock.xml
+++ b/settings-daemon/dock/com.cutefish.Dock.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Dock">
+  <interface name="com.cutefish.Dock">
     <property name="iconSize" type="i" access="read"/>
     <method name="setIconSize">
         <arg name="value" type="i" direction="in"/>
diff --git a/settings-daemon/language/org.cutefish.Language.xml b/settings-daemon/language/com.cutefish.Language.xml
similarity index 89%
rename from settings-daemon/language/org.cutefish.Language.xml
rename to settings-daemon/language/com.cutefish.Language.xml
index 56bf812..45b1eef 100644
--- a/settings-daemon/language/org.cutefish.Language.xml
+++ b/settings-daemon/language/com.cutefish.Language.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Language">
+  <interface name="com.cutefish.Language">
     <method name="setLanguage">
         <arg name="value" type="s" direction="in"/>
     </method>
diff --git a/settings-daemon/mouse/org.cutefish.Mouse.xml b/settings-daemon/mouse/com.cutefish.Mouse.xml
similarity index 95%
rename from settings-daemon/mouse/org.cutefish.Mouse.xml
rename to settings-daemon/mouse/com.cutefish.Mouse.xml
index 88d6d13..bffd01f 100644
--- a/settings-daemon/mouse/org.cutefish.Mouse.xml
+++ b/settings-daemon/mouse/com.cutefish.Mouse.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Mouse">
+  <interface name="com.cutefish.Mouse">
     <method name="setLeftHanded"><arg name="value" type="b" direction="in"/></method>
     <property name="leftHanded" type="b" access="read"/>
     <signal name="leftHandedChanged"></signal>
diff --git a/settings-daemon/theme/org.cutefish.Theme.xml b/settings-daemon/theme/com.cutefish.Theme.xml
similarity index 98%
rename from settings-daemon/theme/org.cutefish.Theme.xml
rename to settings-daemon/theme/com.cutefish.Theme.xml
index 76a3099..bc77c8c 100644
--- a/settings-daemon/theme/org.cutefish.Theme.xml
+++ b/settings-daemon/theme/com.cutefish.Theme.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Theme">
+  <interface name="com.cutefish.Theme">
     <method name="setDarkMode">
         <arg name="darkMode" type="b" direction="in"/>
     </method>
diff --git a/shutdown-ui/actions.cpp b/shutdown-ui/actions.cpp
index 91c22b5..76bea07 100644
--- a/shutdown-ui/actions.cpp
+++ b/shutdown-ui/actions.cpp
@@ -23,9 +23,9 @@
 #include <QApplication>
 #include <QProcess>
 
-const static QString s_dbusName = "org.cutefish.Session";
+const static QString s_dbusName = "com.cutefish.Session";
 const static QString s_pathName = "/Session";
-const static QString s_interfaceName = "org.cutefish.Session";
+const static QString s_interfaceName = "com.cutefish.Session";
 
 Actions::Actions(QObject *parent)
     : QObject(parent)
diff --git a/shutdown-ui/main.cpp b/shutdown-ui/main.cpp
index 5f3e1d9..4dc7a3c 100644
--- a/shutdown-ui/main.cpp
+++ b/shutdown-ui/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 
     QGuiApplication app(argc, argv);
 
-    if (!QDBusConnection::sessionBus().registerService("org.cutefish.ShutdownUI")) {
+    if (!QDBusConnection::sessionBus().registerService("com.cutefish.ShutdownUI")) {
         return -1;
     }