Fork from Ubuntu's indicator-sound.

10 files changed, 140 insertions, 133 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fb9d4b9..a332d0b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,15 +15,20 @@ set_source_files_properties (gschemas.compiled GENERATED)
 # and help the tests to find that file by setting -DSCHEMA_DIR
 set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas")
 set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas")
+if (EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml)
+  set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml)
+else()
+  set (SOUND_SCHEMA  ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml)
+endif()
 add_definitions(-DSCHEMA_DIR="${SCHEMA_DIR}")
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas
                  OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 add_custom_command (OUTPUT gschemas.compiled
-                    DEPENDS ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.sound.gschema.xml
+                    DEPENDS ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.sound.gschema.xml
                     COMMAND mkdir -p ${SCHEMA_DIR}
-                    COMMAND cp -f ${CMAKE_SOURCE_DIR}/data/*gschema.xml ${SCHEMA_DIR}
-                    COMMAND cp -f /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml ${SCHEMA_DIR}
+                    COMMAND cp -f ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.sound.gschema.xml ${SCHEMA_DIR}
+                    COMMAND cp -f ${SOUND_SCHEMA} ${SCHEMA_DIR}
                     COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR})
 
 ###########################
@@ -265,7 +270,7 @@ add_test(greeter-list-test-iterator
 ###########################
 
 add_definitions(
-    -DINDICATOR_SOUND_SERVICE_BINARY="${CMAKE_BINARY_DIR}/src/indicator-sound-service"
+    -DINDICATOR_SOUND_SERVICE_BINARY="${CMAKE_BINARY_DIR}/src/ayatana-indicator-sound-service"
     -DPA_MOCK_LIB="${CMAKE_CURRENT_BINARY_DIR}/libpulse-mock.so"
 )
 add_executable (indicator-test indicator-test.cc gschemas.compiled)
@@ -281,7 +286,9 @@ add_test(indcator-test
     indicator-test
 )
 
+if(UNITY_API_FOUND)
 add_subdirectory(integration)
+endif()
 add_subdirectory(dbus-types)
 add_subdirectory(service-mocks)
 
diff --git a/tests/accounts-service-mock.h b/tests/accounts-service-mock.h
index 1d0c1fe..5617593 100644
--- a/tests/accounts-service-mock.h
+++ b/tests/accounts-service-mock.h
@@ -56,7 +56,7 @@ class AccountsServiceMock
 				"UserName", G_VARIANT_TYPE_STRING,
 				g_variant_new_string(g_get_user_name()), NULL);
 
-			soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "com.canonical.indicator.sound.AccountsService", NULL);
+			soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "org.ayatana.indicator.sound.AccountsService", NULL);
 			dbus_test_dbus_mock_object_add_property(mock, soundobj,
 				"Timestamp", G_VARIANT_TYPE_UINT64,
 				g_variant_new_uint64(0), NULL);
diff --git a/tests/accounts-service-user.cc b/tests/accounts-service-user.cc
index 7110fb3..aca52ea 100644
--- a/tests/accounts-service-user.cc
+++ b/tests/accounts-service-user.cc
@@ -112,7 +112,7 @@ class AccountsServiceUserTest : public ::testing::Test
 		const gchar * get_property_string (const gchar * name) {
 			GVariant * propval = g_dbus_proxy_call_sync(proxy,
 				"Get",
-				g_variant_new("(ss)", "com.canonical.indicator.sound.AccountsService", name),
+				g_variant_new("(ss)", "org.ayatana.indicator.sound.AccountsService", name),
 				G_DBUS_CALL_FLAGS_NONE,
 				-1, NULL, NULL
 				);
diff --git a/tests/dbus-types/dbus-types.h b/tests/dbus-types/dbus-types.h
index ac86027..36143d9 100644
--- a/tests/dbus-types/dbus-types.h
+++ b/tests/dbus-types/dbus-types.h
@@ -30,7 +30,7 @@ namespace DBusTypes
         DBusActionResult::registerMetaType();
     }
 
-    static constexpr char const* DBUS_NAME = "com.canonical.indicator.sound";
+    static constexpr char const* DBUS_NAME = "org.ayatana.indicator.sound";
 
     static constexpr char const* DBUS_PULSE = "org.PulseAudio1";
 
@@ -42,7 +42,7 @@ namespace DBusTypes
 
     static constexpr char const* STREAM_RESTORE_ENTRY_NAME = "org.PulseAudio.Ext.StreamRestore1.RestoreEntry";
 
-    static constexpr char const* MAIN_SERVICE_PATH = "/com/canonical/indicator/sound";
+    static constexpr char const* MAIN_SERVICE_PATH = "/org/ayatana/indicator/sound";
 
     static constexpr char const* ACTIONS_INTERFACE = "org.gtk.Actions";
 
diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc
index b41a1ab..faa42d0 100644
--- a/tests/indicator-test.cc
+++ b/tests/indicator-test.cc
@@ -28,7 +28,7 @@ class IndicatorTest : public IndicatorFixture
 {
 protected:
 	IndicatorTest (void) :
-		IndicatorFixture(INDICATOR_SOUND_SERVICE_BINARY, "com.canonical.indicator.sound")
+		IndicatorFixture(INDICATOR_SOUND_SERVICE_BINARY, "org.ayatana.indicator.sound")
 	{
 	}
 
@@ -65,10 +65,10 @@ protected:
 
 
 TEST_F(IndicatorTest, PhoneMenu) {
-	setMenu("/com/canonical/indicator/sound/phone");
+	setMenu("/org/ayatana/indicator/sound/phone");
 
 	EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0}), "action", "indicator.root");
-	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "com.canonical.indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "org.ayatana.indicator.root");
 	EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll");
 	EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute");
 
@@ -80,10 +80,10 @@ TEST_F(IndicatorTest, PhoneMenu) {
 }
 
 TEST_F(IndicatorTest, DesktopMenu) {
-	setMenu("/com/canonical/indicator/sound/desktop");
+	setMenu("/org/ayatana/indicator/sound/desktop");
 
 	EXPECT_MENU_ATTRIB({0}, "action", "indicator.root");
-	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "com.canonical.indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "org.ayatana.indicator.root");
 	EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll");
 	EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute");
 
@@ -95,7 +95,7 @@ TEST_F(IndicatorTest, DesktopMenu) {
 }
 
 TEST_F(IndicatorTest, BaseActions) {
-	setActions("/com/canonical/indicator/sound");
+	setActions("/org/ayatana/indicator/sound");
 
 	ASSERT_ACTION_EXISTS("root");
 	ASSERT_ACTION_STATE_TYPE("root", G_VARIANT_TYPE("a{sv}"));
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 0f4a53c..bee5451 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(${GMOCK_INCLUDE_DIRS})
 include_directories("${CMAKE_SOURCE_DIR}/tests/dbus-types")
 include_directories("${CMAKE_BINARY_DIR}/tests/dbus-types")
 
-add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator-sound-service"
+add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-sound-service"
                 -DSTREAM_RESTORE_TABLE="${CMAKE_SOURCE_DIR}/tests/integration/touch-stream-restore.table"
                 -DVOLUME_SET_BIN="${CMAKE_BINARY_DIR}/tests/integration/set-volume"
                 -DACCOUNTS_SERVICE_BIN="${CMAKE_BINARY_DIR}/tests/service-mocks/accounts-mock/accounts-service-sound"
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index b8608f6..8bf6556 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -160,7 +160,7 @@ bool IndicatorSoundTestBase::clearGSettingsPlayers()
 
     clearPlayers.start("gsettings", QStringList()
                                         << "set"
-                                        << "com.canonical.indicator.sound"
+                                        << "org.ayatana.indicator.sound"
                                         << "interested-media-players"
                                         << "[]");
 
@@ -385,17 +385,17 @@ void IndicatorSoundTestBase::startIndicator()
 mh::MenuMatcher::Parameters IndicatorSoundTestBase::desktopParameters()
 {
     return mh::MenuMatcher::Parameters(
-            "com.canonical.indicator.sound",
-            { { "indicator", "/com/canonical/indicator/sound" } },
-            "/com/canonical/indicator/sound/desktop");
+            "org.ayatana.indicator.sound",
+            { { "indicator", "/org/ayatana/indicator/sound" } },
+            "/org/ayatana/indicator/sound/desktop");
 }
 
 mh::MenuMatcher::Parameters IndicatorSoundTestBase::phoneParameters()
 {
     return mh::MenuMatcher::Parameters(
-            "com.canonical.indicator.sound",
-            { { "indicator", "/com/canonical/indicator/sound" } },
-            "/com/canonical/indicator/sound/phone");
+            "org.ayatana.indicator.sound",
+            { { "indicator", "/org/ayatana/indicator/sound" } },
+            "/org/ayatana/indicator/sound/phone");
 }
 
 unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label)
@@ -407,7 +407,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double
             .double_attribute("min-value", 0.0)
             .double_attribute("max-value", 1.0)
             .double_attribute("step", 0.01)
-            .string_attribute("x-canonical-type", "com.canonical.unity.slider")
+            .string_attribute("x-canonical-type", "org.ayatana.unity.slider")
             .themed_icon("max-icon", {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"})
             .themed_icon("min-icon", {"audio-volume-low-zero-panel", "audio-volume-low-zero", "audio-volume-low", "audio-volume", "audio"})
             .pass_through_double_attribute("action", volume);
@@ -421,7 +421,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double vo
             .double_attribute("min-value", 0.0)
             .double_attribute("max-value", 1.0)
             .double_attribute("step", 0.01)
-            .string_attribute("x-canonical-type", "com.canonical.unity.slider")
+            .string_attribute("x-canonical-type", "org.ayatana.unity.slider")
             .themed_icon("max-icon", {"audio-input-microphone-high-panel", "audio-input-microphone-high", "audio-input-microphone", "audio-input", "audio"})
             .themed_icon("min-icon", {"audio-input-microphone-low-zero-panel", "audio-input-microphone-low-zero", "audio-input-microphone-low", "audio-input-microphone", "audio-input", "audio"})
             .pass_through_double_attribute("action", volume);
@@ -448,8 +448,8 @@ bool IndicatorSoundTestBase::initializeMenuChangedSignal()
 {
     if (!menu_interface_)
     {
-        menu_interface_.reset(new MenusInterface("com.canonical.indicator.sound",
-                                                 "/com/canonical/indicator/sound",
+        menu_interface_.reset(new MenusInterface("org.ayatana.indicator.sound",
+                                                 "/org/ayatana/indicator/sound",
                                                  dbusTestRunner.sessionConnection(), 0));
     }
     if (menu_interface_)
@@ -911,7 +911,7 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort,
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -936,7 +936,7 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort,
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -967,8 +967,8 @@ QVariantList IndicatorSoundTestBase::getActionValue(QString const &action)
 {
     if (!menu_interface_)
     {
-        menu_interface_.reset(new MenusInterface("com.canonical.indicator.sound",
-                                                 "/com/canonical/indicator/sound",
+        menu_interface_.reset(new MenusInterface("org.ayatana.indicator.sound",
+                                                 "/org/ayatana/indicator/sound",
                                                  dbusTestRunner.sessionConnection(), 0));
     }
     if (menu_interface_)
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index bb08c40..5e2d918 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -51,7 +51,7 @@ TEST_F(TestIndicator, PhoneCheckRootIcon)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
             .item(mh::MenuItemMatcher()
                 .action("indicator.root")
-                .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+                .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
                 .string_attribute("x-canonical-scroll-action", "indicator.scroll")
                 .string_attribute("x-canonical-secondary-action", "indicator.mute")
                 .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -111,7 +111,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -134,7 +134,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -160,7 +160,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -196,7 +196,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -217,7 +217,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -239,7 +239,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
            .item(mh::MenuItemMatcher()
                .action("indicator.root")
-               .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+               .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
                .string_attribute("x-canonical-secondary-action", "indicator.mute")
                .mode(mh::MenuItemMatcher::Mode::all)
                .submenu()
@@ -301,7 +301,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -318,7 +318,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::ends_with)
             .submenu()
@@ -343,7 +343,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -360,7 +360,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::ends_with)
             .submenu()
@@ -388,7 +388,7 @@ TEST_F(TestIndicator, PhoneBasicInitialVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -423,7 +423,7 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -453,7 +453,7 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -470,13 +470,13 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -507,7 +507,7 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -524,13 +524,13 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                         .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -561,7 +561,7 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -578,13 +578,13 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -598,7 +598,7 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
             .item(mh::MenuItemMatcher()
                 .action("indicator.root")
-                .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+                .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
                 .string_attribute("x-canonical-secondary-action", "indicator.mute")
                 .mode(mh::MenuItemMatcher::Mode::all)
                 .submenu()
@@ -615,11 +615,11 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
-                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                     )
                 )
                 .item(mh::MenuItemMatcher()
@@ -650,7 +650,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -667,13 +667,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -688,7 +688,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -705,13 +705,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -720,13 +720,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -741,7 +741,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -758,13 +758,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -773,13 +773,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -788,13 +788,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -809,7 +809,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -826,13 +826,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -841,13 +841,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -856,7 +856,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -870,7 +870,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -887,13 +887,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -902,7 +902,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -911,7 +911,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -926,7 +926,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -943,13 +943,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -958,7 +958,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -967,7 +967,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -982,7 +982,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -999,7 +999,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1008,7 +1008,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1017,13 +1017,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
                         .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
-                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1038,7 +1038,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1055,13 +1055,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1070,13 +1070,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -1085,13 +1085,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                            .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
                             .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
                             .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
-                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                            .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -1109,7 +1109,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1126,7 +1126,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1135,7 +1135,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1144,11 +1144,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
-                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1169,7 +1169,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1186,11 +1186,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
-                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1199,7 +1199,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1208,7 +1208,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1240,7 +1240,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1257,13 +1257,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1278,7 +1278,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1295,13 +1295,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .attribute_not_set("x-canonical-next-action")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1317,7 +1317,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1334,13 +1334,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .attribute_not_set("x-canonical-previous-action")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .attribute_not_set("x-canonical-next-action")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1355,7 +1355,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
@@ -1372,13 +1372,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1427,7 +1427,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .submenu()
@@ -1444,7 +1444,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::ends_with)
             .submenu()
@@ -1465,7 +1465,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -1482,7 +1482,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .mode(mh::MenuItemMatcher::Mode::ends_with)
             .submenu()
@@ -1514,7 +1514,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -1645,7 +1645,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -1688,7 +1688,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
@@ -1728,7 +1728,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
             .action("indicator.root")
-            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
             .string_attribute("x-canonical-scroll-action", "indicator.scroll")
             .string_attribute("x-canonical-secondary-action", "indicator.mute")
             .string_attribute("submenu-action", "indicator.indicator-shown")
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index d66c242..2e5acd4 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -210,7 +210,7 @@ class NotificationsTest : public ::testing::Test
 
             g_dbus_connection_call(bus,
                 g_dbus_connection_get_unique_name(bus),
-                "/com/canonical/indicator/sound",
+                "/org/ayatana/indicator/sound",
                 "org.gtk.Actions",
                 "SetState",
                 g_variant_new("(sva{sv})", "indicator-shown", g_variant_new_boolean(shown), nullptr),
diff --git a/tests/sound-menu.cc b/tests/sound-menu.cc
index 79ae703..d41c9de 100644
--- a/tests/sound-menu.cc
+++ b/tests/sound-menu.cc
@@ -92,10 +92,10 @@ class SoundMenuTest : public ::testing::Test
 
             /* Player display */
             verify_item_attribute(section, 0, "action", g_variant_new_string("indicator.player-id"));
-            verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("com.canonical.unity.media-player"));
+            verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("org.ayatana.unity.media-player"));
 
             /* Player control */
-            verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("com.canonical.unity.playback-item"));
+            verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("org.ayatana.unity.playback-item"));
         //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string(""));
         if (!canPlay) {
                 verify_item_attribute_is_not_set(section, 1, "x-canonical-play-action", G_VARIANT_TYPE_STRING);
@@ -164,10 +164,10 @@ TEST_F(SoundMenuTest, AddRemovePlayer) {
 
     /* Player display */
     verify_item_attribute(section, 0, "action", g_variant_new_string("indicator.player-id"));
-    verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("com.canonical.unity.media-player"));
+    verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("org.ayatana.unity.media-player"));
 
     /* Player control */
-    verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("com.canonical.unity.playback-item"));
+    verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("org.ayatana.unity.playback-item"));
     verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id"));
     verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id"));
     verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id"));