Update Ayatana IDO names

4 files changed, 68 insertions, 68 deletions

diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index bcf2042..fc68f91 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -38,7 +38,7 @@ public class SoundMenu: Object
         PLAYLIST = 2
     }
 
-    const string PLAYBACK_ITEM_TYPE = "org.ayatana.unity.playback-item";
+    const string PLAYBACK_ITEM_TYPE = "org.ayatana.indicator.playback-item";
 
     public SoundMenu (string? settings_action, DisplayFlags flags) {
         /* A sound menu always has at least two sections: the volume section (this.volume_section)
@@ -368,7 +368,7 @@ public class SoundMenu: Object
             base_action += ".greeter";
 
         var player_item = new MenuItem (player.name, base_action);
-        player_item.set_attribute ("x-ayatana-type", "s", "org.ayatana.unity.media-player");
+        player_item.set_attribute ("x-ayatana-type", "s", "org.ayatana.indicator.media-player");
         if (icon != null)
             player_item.set_attribute_value ("icon", icon.serialize ());
         section.append_item (player_item);
@@ -461,7 +461,7 @@ public class SoundMenu: Object
         var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name);
 
         var slider = new MenuItem (label, action);
-        slider.set_attribute ("x-ayatana-type", "s", "org.ayatana.unity.slider");
+        slider.set_attribute ("x-ayatana-type", "s", "org.ayatana.indicator.slider");
         slider.set_attribute_value ("min-icon", min_icon.serialize ());
         slider.set_attribute_value ("max-icon", max_icon.serialize ());
         slider.set_attribute ("min-value", "d", min);
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index e8eeefc..d30a6f0 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -419,7 +419,7 @@ lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(doubl
             .double_attribute("min-value", 0.0)
             .double_attribute("max-value", 1.0)
             .double_attribute("step", 0.01)
-            .string_attribute("x-ayatana-type", "org.ayatana.unity.slider")
+            .string_attribute("x-ayatana-type", "org.ayatana.indicator.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);
@@ -433,7 +433,7 @@ lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double v
             .double_attribute("min-value", 0.0)
             .double_attribute("max-value", 1.0)
             .double_attribute("step", 0.01)
-            .string_attribute("x-ayatana-type", "org.ayatana.unity.slider")
+            .string_attribute("x-ayatana-type", "org.ayatana.indicator.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);
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 44daa23..72c67ef 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -470,13 +470,13 @@ TEST_F(TestIndicator, DISABLED_PhoneAddMprisPlayer)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -524,13 +524,13 @@ TEST_F(TestIndicator, DISABLED_DesktopBasicInitialVolume)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                         .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                         .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                        .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                        .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -578,13 +578,13 @@ TEST_F(TestIndicator, DISABLED_DesktopAddMprisPlayer)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -615,11 +615,11 @@ TEST_F(TestIndicator, DISABLED_DesktopAddMprisPlayer)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
-                        .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                        .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                     )
                 )
                 .item(mh::MenuItemMatcher()
@@ -667,13 +667,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -705,13 +705,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -720,13 +720,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -758,13 +758,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -773,13 +773,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -788,13 +788,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -826,13 +826,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -841,13 +841,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -856,7 +856,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -887,13 +887,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -902,7 +902,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -911,7 +911,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -943,13 +943,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -958,7 +958,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -967,7 +967,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -999,7 +999,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1008,7 +1008,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1017,13 +1017,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
                         .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
                         .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
-                        .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                        .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1055,13 +1055,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1070,13 +1070,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer2.desktop")
                             .label("TestPlayer2")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -1085,13 +1085,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                             .action("indicator.testplayer3.desktop")
                             .label("TestPlayer3")
                             .themed_icon("icon", {"testplayer"})
-                            .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                            .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                         )
                         .item(mh::MenuItemMatcher()
                             .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
                             .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
                             .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
-                            .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                            .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                         )
                     )
             .item(mh::MenuItemMatcher()
@@ -1126,7 +1126,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1135,7 +1135,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1144,11 +1144,11 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
-                        .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                        .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1186,11 +1186,11 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer3.desktop")
                         .label("TestPlayer3")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                     .item(mh::MenuItemMatcher()
                         .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
-                        .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                        .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1199,7 +1199,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer1.desktop")
                         .label("TestPlayer1")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
             )
             .item(mh::MenuItemMatcher()
@@ -1208,7 +1208,7 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayersPlaybackControls)
                         .action("indicator.testplayer2.desktop")
                         .label("TestPlayer2")
                         .themed_icon("icon", {"testplayer"})
-                        .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                        .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                     )
                 )
             .item(mh::MenuItemMatcher()
@@ -1257,13 +1257,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1295,13 +1295,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .attribute_not_set("x-ayatana-next-action")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1334,13 +1334,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .attribute_not_set("x-ayatana-previous-action")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .attribute_not_set("x-ayatana-next-action")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
@@ -1372,13 +1372,13 @@ TEST_F(TestIndicator, DISABLED_DesktopMprisPlayerButtonsState)
                     .action("indicator.testplayer1.desktop")
                     .label("TestPlayer1")
                     .themed_icon("icon", {"testplayer"})
-                    .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
+                    .string_attribute("x-ayatana-type", "org.ayatana.indicator.media-player")
                 )
                 .item(mh::MenuItemMatcher()
                     .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
                     .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
                     .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
-                    .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
+                    .string_attribute("x-ayatana-type","org.ayatana.indicator.playback-item")
                 )
             )
             .item(mh::MenuItemMatcher()
diff --git a/tests/sound-menu.cc b/tests/sound-menu.cc
index 587d47f..42acdde 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-ayatana-type", g_variant_new_string("org.ayatana.unity.media-player"));
+            verify_item_attribute(section, 0, "x-ayatana-type", g_variant_new_string("org.ayatana.indicator.media-player"));
 
             /* Player control */
-            verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.playback-item"));
+            verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.indicator.playback-item"));
         //verify_item_attribute(section, 1, "x-ayatana-play-action", g_variant_new_string(""));
         if (!canPlay) {
                 verify_item_attribute_is_not_set(section, 1, "x-ayatana-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-ayatana-type", g_variant_new_string("org.ayatana.unity.media-player"));
+    verify_item_attribute(section, 0, "x-ayatana-type", g_variant_new_string("org.ayatana.indicator.media-player"));
 
     /* Player control */
-    verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.playback-item"));
+    verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.indicator.playback-item"));
     verify_item_attribute(section, 1, "x-ayatana-play-action", g_variant_new_string("indicator.play.player-id"));
     verify_item_attribute(section, 1, "x-ayatana-next-action", g_variant_new_string("indicator.next.player-id"));
     verify_item_attribute(section, 1, "x-ayatana-previous-action", g_variant_new_string("indicator.previous.player-id"));