8 files changed, 17 insertions, 17 deletions
diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h
index 0a1806d..bf66208 100644
--- a/tests/service-mocks/accounts-mock/AccountsDefs.h
+++ b/tests/service-mocks/accounts-mock/AccountsDefs.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-namespace ubuntu
+namespace ayatana
 {
 
 namespace indicators
@@ -28,8 +28,8 @@ namespace testing
     constexpr const char ACCOUNTS_SERVICE[] = "org.freedesktop.Accounts";
     constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest";
     constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts";
-#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS
-    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound";
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS
+    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound";
 #else
     constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound";
 #endif
@@ -37,4 +37,4 @@ namespace testing
 
 } // namespace indicators
 
-} // namespace ubuntu
+} // namespace ayatana
diff --git a/tests/service-mocks/accounts-mock/AccountsMock.cpp b/tests/service-mocks/accounts-mock/AccountsMock.cpp
index 5c92dc5..af2065a 100644
--- a/tests/service-mocks/accounts-mock/AccountsMock.cpp
+++ b/tests/service-mocks/accounts-mock/AccountsMock.cpp
@@ -20,7 +20,7 @@
 #include "AccountsMock.h"
 #include "AccountsDefs.h"
 
-using namespace ubuntu::indicators::testing;
+using namespace ayatana::indicators::testing;
 
 AccountsMock::AccountsMock(QObject* parent)
     : QObject(parent)
diff --git a/tests/service-mocks/accounts-mock/AccountsMock.h b/tests/service-mocks/accounts-mock/AccountsMock.h
index 72372e0..e8efbdb 100644
--- a/tests/service-mocks/accounts-mock/AccountsMock.h
+++ b/tests/service-mocks/accounts-mock/AccountsMock.h
@@ -21,7 +21,7 @@
 #include <QDBusObjectPath>
 #include <QObject>
 
-namespace ubuntu
+namespace ayatana
 {
 
 namespace indicators
@@ -47,4 +47,4 @@ public:
 
 } // namespace indicators
 
-} // namespace ubuntu
+} // namespace ayatana
diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
index b0e4862..e4f83ed 100644
--- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
+++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
@@ -22,7 +22,7 @@
 #include "AccountsServiceSoundMock.h"
 #include "AccountsDefs.h"
 
-using namespace ubuntu::indicators::testing;
+using namespace ayatana::indicators::testing;
 
 AccountsServiceSoundMock::AccountsServiceSoundMock(QObject* parent)
     : QObject(parent)
diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
index fd5104e..bcc2413 100644
--- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
+++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
@@ -22,7 +22,7 @@
 
 #include "DBusPropertiesNotifier.h"
 
-namespace ubuntu
+namespace ayatana
 {
 
 namespace indicators
@@ -59,4 +59,4 @@ private:
 
 } // namespace indicators
 
-} // namespace ubuntu
+} // namespace ayatana
diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt
index 421e155..1549249 100644
--- a/tests/service-mocks/accounts-mock/CMakeLists.txt
+++ b/tests/service-mocks/accounts-mock/CMakeLists.txt
@@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS}
 
 add_definitions(-DQT_NO_KEYWORDS=1)
 
-if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml")
-    add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS)
-    set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml")
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
+    add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS)
+    set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml")
 else()
     set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml")
 endif()
@@ -22,13 +22,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservic
 qt5_add_dbus_adaptor(adaptor_files
     ${dbusinterface_sound_xml}
     AccountsServiceSoundMock.h
-    ubuntu::indicators::testing::AccountsServiceSoundMock
+    ayatana::indicators::testing::AccountsServiceSoundMock
     AccountsServiceSoundMockAdaptor)
 
 qt5_add_dbus_adaptor(adaptor_files
     ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml
     AccountsMock.h
-    ubuntu::indicators::testing::AccountsMock
+    ayatana::indicators::testing::AccountsMock
     AccountsMockAdaptor)
 
 add_executable(
diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml
index da9e8aa..d51abd2 100644
--- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
+++ b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.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="com.ubuntu.AccountsService.Sound">
+  <interface name="com.lomiri.AccountsService.Sound">
     <property name="Volume" type="d" access="readwrite"/>
     <property name="LastRunningPlayer" type="s" access="readwrite"/>
   </interface>
diff --git a/tests/service-mocks/accounts-mock/main.cpp b/tests/service-mocks/accounts-mock/main.cpp
index d6cd1d3..f937022 100644
--- a/tests/service-mocks/accounts-mock/main.cpp
+++ b/tests/service-mocks/accounts-mock/main.cpp
@@ -26,7 +26,7 @@
 #include "AccountsMock.h"
 #include "AccountsMockAdaptor.h"
 
-using namespace ubuntu::indicators::testing;
+using namespace ayatana::indicators::testing;
 
 int main(int argc, char *argv[])
 {