diff --git a/data/meson.build b/data/meson.build
index ccaf2854f..0a3edb6bf 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,7 +17,7 @@ desktopFiles = [
   ),
 
   configure_file(
-    input : 'org.Nemo.desktop.in',
+    input : 'nemo.desktop.in',
     output: 'org.Nemo.desktop',
     configuration: dataConf,
   )
diff --git a/data/org.Nemo.desktop.in b/data/nemo.desktop.in
similarity index 100%
rename from data/org.Nemo.desktop.in
rename to data/nemo.desktop.in
diff --git a/generate_additional_file b/generate_additional_file
index 154facde6..4dd096ff7 100755
--- a/generate_additional_file
+++ b/generate_additional_file
@@ -30,7 +30,7 @@ MimeType=inode/directory;application/x-gnome-saved-search;
 Actions=open-home;open-computer;open-trash;
 """
 
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Files"), _("Access and organize files"), suffix)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Files"), _("Access and organize files"), suffix)
 
 
 prefix = """
@@ -38,18 +38,18 @@ prefix = """
 """
 suffix = """Exec=nemo %U
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Home"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Home"), None, suffix, append=True)
 
 prefix = """
 [Desktop Action open-computer]
 """
 suffix = """Exec=nemo computer:///
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Computer"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Computer"), None, suffix, append=True)
 
 prefix = """
 [Desktop Action open-trash]
 """
 suffix = """Exec=nemo trash:///
 """
-additionalfiles.generate(DOMAIN, PATH, "data/org.Nemo.desktop.in", prefix, _("Trash"), None, suffix, append=True)
+additionalfiles.generate(DOMAIN, PATH, "data/nemo.desktop.in", prefix, _("Trash"), None, suffix, append=True)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea46c121a..2f1eec6d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,8 @@
 [encoding: UTF-8]
 data/action_i18n_strings.py
 data/nemo.xml.in
+data/nemo-autorun-software.desktop.in.in
+data/nemo.desktop.in.in
 eel/eel-canvas.c
 eel/eel-editable-label.c
 eel/eel-glib-extensions.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 3a114a0ba..d6c546701 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,5 +2,10 @@
 # Please keep this file sorted alphabetically.
 libbackground/applier.c
 data/nemo-autorun-software.desktop.in
-data/org.Nemo.desktop.in
+data/nemo-computer.desktop.in
+data/nemo-file-management-properties.desktop.in
+data/nemo-folder-handler.desktop.in
+data/nemo-home.desktop.in
+data/nemo.desktop.in
+data/nemo-browser.desktop.in
 debian
diff --git a/src/nemo-mime-actions.c b/src/nemo-mime-actions.c
index 0d6a826d3..0064d23fe 100644
--- a/src/nemo-mime-actions.c
+++ b/src/nemo-mime-actions.c
@@ -258,7 +258,7 @@ filter_nemo_handler (GList *apps)
 		id = g_app_info_get_id (application);
 		if (id != NULL &&
 		    strcmp (id,
-			    "org.Nemo.desktop") == 0) {
+			    "nemo.desktop") == 0) {
 			g_object_unref (application);
 			apps = g_list_delete_link (apps, l);
 		}