=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2015-02-03 12:31:32 +0000
+++ com.canonical.Unity.gschema.xml	2015-03-25 15:01:05 +0000
@@ -96,7 +96,7 @@
     <key type="as" name="favorites">
       <default>[
         'application://ubiquity.desktop',
-        'application://nautilus.desktop',
+        'application://org.gnome.Nautilus.desktop',
         'application://firefox.desktop',
         'application://libreoffice-writer.desktop',
         'application://libreoffice-calc.desktop',

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-07-30 13:05:51 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2015-03-25 15:01:05 +0000
@@ -1188,7 +1188,7 @@
 {
   auto const& desktop_file = DesktopFile();
 
-  return boost::algorithm::ends_with(desktop_file, "nautilus.desktop") ||
+  return boost::algorithm::ends_with(desktop_file, "org.gnome.Nautilus.desktop") ||
          boost::algorithm::ends_with(desktop_file, "nautilus-folder-handler.desktop") ||
          boost::algorithm::ends_with(desktop_file, "nautilus-home.desktop");
 }

=== modified file 'tests/autopilot/unity/tests/__init__.py'
--- tests/autopilot/unity/tests/__init__.py	2015-02-18 14:14:48 +0000
+++ tests/autopilot/unity/tests/__init__.py	2015-03-25 15:01:05 +0000
@@ -249,7 +249,7 @@
 
     def register_nautilus(self):
         self.addCleanup(self.process_manager.unregister_known_application, "Nautilus")
-        self.process_manager.register_known_application("Nautilus", "nautilus.desktop", "nautilus")
+        self.process_manager.register_known_application("Nautilus", "org.gnome.Nautilus.desktop", "nautilus")
 
     def get_startup_notification_timestamp(self, bamf_window):
         atom = display.Display().intern_atom('_NET_WM_USER_TIME')

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2014-03-12 23:44:30 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2015-03-25 15:01:05 +0000
@@ -175,7 +175,7 @@
         self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(1)))
 
         nautilus_app = self.process_manager.get_app_instances("Nautilus")
-        nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")
+        nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
         self.launcher_instance.click_launcher_icon(nautilus_icon)
         self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(2)))
 

=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py	2014-03-04 22:50:22 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py	2015-03-25 15:01:05 +0000
@@ -75,7 +75,7 @@
         self.process_manager.start_app_window("Calculator")
         self.process_manager.start_app(self.app_name)
 
-        nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")
+        nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
         ql = self.open_quicklist_for_icon(nautilus_icon)
         de = self.get_desktop_entry("Nautilus")
 

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2014-03-12 23:44:57 +0000
+++ tests/test_application_launcher_icon.cpp	2015-03-25 15:01:05 +0000
@@ -1101,7 +1101,7 @@
   EXPECT_FALSE(empty_icon->IsFileManager());
   EXPECT_FALSE(mock_icon->IsFileManager());
 
-  auto app = std::make_shared<MockApplication::Nice>("/any/path/nautilus.desktop", "Nautilus");
+  auto app = std::make_shared<MockApplication::Nice>("/any/path/org.gnome.Nautilus.desktop", "Nautilus");
   MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
   EXPECT_TRUE(icon->IsFileManager());