diff --git a/MANIFEST.in b/MANIFEST.in
index 94564972ae7fe6789ab9e55a4e842f1c0802ea7c..c044f47f70bf835236d6f454f82ebf079bd39dd6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,10 +8,10 @@ recursive-include help *.page *.xml *.po
 
 include MANIFEST.in
 include meld.doap
-include data/meld.appdata.xml.in
+include data/org.gnome.meld.appdata.xml.in
 include data/meld.css
-include data/meld.desktop.in
-include data/mime/meld.xml.in
+include data/org.gnome.meld.desktop.in
+include data/mime/org.gnome.meld.xml.in
 include data/org.gnome.meld.gschema.xml
 include meld/ui/catalog.xml
 include setup_win32.py
diff --git a/data/icons/HighContrast/scalable/apps/meld.svg b/data/icons/HighContrast/scalable/apps/org.gnome.meld.svg
similarity index 100%
rename from data/icons/HighContrast/scalable/apps/meld.svg
rename to data/icons/HighContrast/scalable/apps/org.gnome.meld.svg
diff --git a/data/icons/Makefile b/data/icons/Makefile
index 3e248b889cb1da4c4da7fe445888f4e42b0c75c6..ed520fc8a7a23603ecf6ec9f032cc18c3ff57240 100644
--- a/data/icons/Makefile
+++ b/data/icons/Makefile
@@ -1,4 +1,4 @@
 
 all:
-	inkscape hicolor/scalable/apps/meld.svg -w 48 -h 48 -e hicolor/48x48/apps/meld.png
-	convert -background transparent hicolor/48x48/apps/meld.png -define icon:auto-resize=16,22,32,48 meld.ico
+	inkscape hicolor/scalable/apps/org.gnome.meld.svg -w 48 -h 48 -e hicolor/48x48/apps/org.gnome.meld.png
+	convert -background transparent hicolor/48x48/apps/org.gnome.meld.png -define icon:auto-resize=16,22,32,48 org.gnome.meld.ico
diff --git a/data/icons/hicolor/16x16/apps/meld.png b/data/icons/hicolor/16x16/apps/org.gnome.meld.png
similarity index 100%
rename from data/icons/hicolor/16x16/apps/meld.png
rename to data/icons/hicolor/16x16/apps/org.gnome.meld.png
diff --git a/data/icons/hicolor/22x22/apps/meld.png b/data/icons/hicolor/22x22/apps/org.gnome.meld.png
similarity index 100%
rename from data/icons/hicolor/22x22/apps/meld.png
rename to data/icons/hicolor/22x22/apps/org.gnome.meld.png
diff --git a/data/icons/hicolor/32x32/apps/meld.png b/data/icons/hicolor/32x32/apps/org.gnome.meld.png
similarity index 100%
rename from data/icons/hicolor/32x32/apps/meld.png
rename to data/icons/hicolor/32x32/apps/org.gnome.meld.png
diff --git a/data/icons/hicolor/32x32/apps/meld.svg b/data/icons/hicolor/32x32/apps/org.gnome.meld.svg
similarity index 100%
rename from data/icons/hicolor/32x32/apps/meld.svg
rename to data/icons/hicolor/32x32/apps/org.gnome.meld.svg
diff --git a/data/icons/hicolor/48x48/apps/meld.png b/data/icons/hicolor/48x48/apps/org.gnome.meld.png
similarity index 100%
rename from data/icons/hicolor/48x48/apps/meld.png
rename to data/icons/hicolor/48x48/apps/org.gnome.meld.png
diff --git a/data/icons/hicolor/scalable/apps/meld.svg b/data/icons/hicolor/scalable/apps/org.gnome.meld.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/meld.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.meld.svg
diff --git a/data/icons/meld.ico b/data/icons/org.gnome.meld.ico
similarity index 100%
rename from data/icons/meld.ico
rename to data/icons/org.gnome.meld.ico
diff --git a/data/mime/meld.xml.in b/data/mime/org.gnome.meld.xml.in
similarity index 88%
rename from data/mime/meld.xml.in
rename to data/mime/org.gnome.meld.xml.in
index b6d1faee831723187232f7476d4490925ec123de..365b9b800740612316536b362051384bd26c40bc 100644
--- a/data/mime/meld.xml.in
+++ b/data/mime/org.gnome.meld.xml.in
@@ -3,6 +3,6 @@
    <mime-type type="application/x-meld-comparison">
      <_comment>Meld comparison description</_comment>
      <glob pattern="*.meldcmp"/>
-     <icon name="meld"/>
+     <icon name="org.gnome.meld"/>
    </mime-type>
 </mime-info>
diff --git a/data/org.gnome.meld-devel.json b/data/org.gnome.meld-devel.json
index cf07588ac4c13f1916172960ec2c598db4034dd6..c52b2d05e9e545202cdaec6b7e21b6df89d5f11e 100644
--- a/data/org.gnome.meld-devel.json
+++ b/data/org.gnome.meld-devel.json
@@ -25,9 +25,6 @@
       "V": "1"
     }
   },
-  "rename-appdata-file": "meld.appdata.xml",
-  "rename-desktop-file": "meld.desktop",
-  "rename-icon": "meld",
   "finish-args": [
     /* X11 + XShm */
     "--share=ipc", "--socket=x11",
diff --git a/data/meld.appdata.xml.in b/data/org.gnome.meld.appdata.xml.in
similarity index 98%
rename from data/meld.appdata.xml.in
rename to data/org.gnome.meld.appdata.xml.in
index ab3522f578c968a7f78f6f944e10c32d89789cc8..c1dac916af02088dcc5fcabed18fa9f23847bc78 100644
--- a/data/meld.appdata.xml.in
+++ b/data/org.gnome.meld.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013-2014 Kai Willadsen <kai.willadsen@gmail.com> -->
 <component type="desktop">
-  <id>meld.desktop</id>
+  <id>org.gnome.meld.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
   <_name>Meld</_name>
diff --git a/data/meld.desktop.in b/data/org.gnome.meld.desktop.in
similarity index 95%
rename from data/meld.desktop.in
rename to data/org.gnome.meld.desktop.in
index 4939b6f2098e27ba56d2a09ed11dbb8e04a44929..64466de34bc394fe00f112ecf6817cd32d5e44c0 100644
--- a/data/meld.desktop.in
+++ b/data/org.gnome.meld.desktop.in
@@ -8,7 +8,7 @@ _Keywords=diff;merge;
 Exec=meld %F
 Terminal=false
 Type=Application
-Icon=meld
+Icon=org.gnome.meld
 MimeType=application/x-meld-comparison;
 StartupNotify=true
 Categories=GTK;Development;
diff --git a/data/ui/application.ui b/data/ui/application.ui
index a16ed27385d7cff14e2a06d0cf9fde6122561fe6..d4a6c14ea3e6b1c3e2df079783ccf5bd9079a93d 100644
--- a/data/ui/application.ui
+++ b/data/ui/application.ui
@@ -6,7 +6,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About Meld</property>
-    <property name="icon_name">meld</property>
+    <property name="icon_name">org.gnome.meld</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Meld</property>
     <property name="copyright" translatable="yes">Copyright © 2002-2009 Stephen Kennedy
@@ -19,7 +19,7 @@ Vincent Legoll</property>
     <property name="translator_credits" translatable="yes">translator-credits</property>
     <property name="artists">GNOME Project
 Josef Vybíral</property>
-    <property name="logo_icon_name">meld</property>
+    <property name="logo_icon_name">org.gnome.meld</property>
     <property name="license_type">gpl-2-0</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="aboutdialog-vbox1">
diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui
index f112cff4271119647c08e700658cb154b7ea9063..56a2d56f41a8d80d53f11676661feca6d4700c1a 100644
--- a/data/ui/meldapp.ui
+++ b/data/ui/meldapp.ui
@@ -5,7 +5,7 @@
     <property name="height_request">400</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Meld</property>
-    <property name="icon_name">meld</property>
+    <property name="icon_name">org.gnome.meld</property>
     <signal name="delete-event" handler="on_delete_event" swapped="no"/>
     <child>
       <object class="GtkVBox" id="appvbox">
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fc4b05916f2be1fc102d7c8af7b6dcce6b44870c..ac27c3c0fb568b2b7b0bf64790de2275a4dc4287 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 bin/meld
-data/meld.desktop.in
-[type: gettext/xml]data/meld.appdata.xml.in
-[type: gettext/xml]data/mime/meld.xml.in
+data/org.gnome.meld.desktop.in
+[type: gettext/xml]data/org.gnome.meld.appdata.xml.in
+[type: gettext/xml]data/mime/org.gnome.meld.xml.in
 data/org.gnome.meld.gschema.xml
 [type: gettext/xml]data/styles/meld-base.xml
 [type: gettext/xml]data/styles/meld-dark.xml