diff --git a/Makefile b/Makefile
index c0c3a6c1d3..8f162a436c 100644
--- a/Makefile
+++ b/Makefile
@@ -239,21 +239,21 @@ install: $(TARGET)
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
-	cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
-	cp org.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
+	cp com.libretro.RetroArch.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
+	cp com.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
 	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
-	cp media/retroarch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
+	cp media/com.libretro.RetroArch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
 	cp COPYING $(DESTDIR)$(DOC_DIR)
 	cp README.md $(DESTDIR)$(DOC_DIR)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/$(TARGET)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/org.libretro.RetroArch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
+	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/com.libretro.RetroArch.desktop
+	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
+	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.RetroArch.svg
 	@if test -d media/assets && test $(HAVE_ASSETS); then \
 		echo "Installing media assets..."; \
 		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
@@ -274,9 +274,9 @@ uninstall:
 	rm -f $(DESTDIR)$(BIN_DIR)/$(TARGET)
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	rm -f $(DESTDIR)$(DATA_DIR)/applications/org.libretro.RetroArch.desktop
-	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
-	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
+	rm -f $(DESTDIR)$(DATA_DIR)/applications/com.libretro.RetroArch.desktop
+	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
+	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.RetroArch.svg
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets
 	rm -f $(DESTDIR)$(DOC_DIR)/README.md
diff --git a/Makefile.lfx000 b/Makefile.lfx000
index 234194e917..05b7920936 100644
--- a/Makefile.lfx000
+++ b/Makefile.lfx000
@@ -213,21 +213,21 @@ install: $(TARGET)
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
-	cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
-	cp org.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
+	cp com.libretro.RetroArch.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
+	cp com.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
 	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
-	cp media/retroarch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
+	cp media/com.libretro.RetroArch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
 	cp COPYING $(DESTDIR)$(DOC_DIR)
 	cp README.md $(DESTDIR)$(DOC_DIR)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/$(TARGET)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/org.libretro.RetroArch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
+	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/com.libretro.RetroArch.desktop
+	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
+	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.RetroArch.svg
 	@if test -d media/assets && test $(HAVE_ASSETS); then \
 		echo "Installing media assets..."; \
 		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
diff --git a/org.libretro.RetroArch.desktop b/com.libretro.RetroArch.desktop
similarity index 95%
rename from org.libretro.RetroArch.desktop
rename to com.libretro.RetroArch.desktop
index 4228a399ab..60be5abbfa 100644
--- a/org.libretro.RetroArch.desktop
+++ b/com.libretro.RetroArch.desktop
@@ -7,7 +7,7 @@ Comment=Frontend for emulators, game engines and media players
 Comment[ru]=Графический интерфейс для эмуляторов, игровых движков и медиаплееров
 Comment[fr]=Interface graphique pour émulateurs, moteurs de jeu et lecteurs multimédia
 Comment[de]=Front-End für Emulatoren, Spiel-Engines und Mediaplayer
-Icon=retroarch
+Icon=com.libretro.RetroArch
 Exec=retroarch
 Terminal=false
 StartupNotify=false
diff --git a/com.libretro.RetroArch.appdata.xml b/com.libretro.RetroArch.metainfo.xml
similarity index 99%
rename from com.libretro.RetroArch.appdata.xml
rename to com.libretro.RetroArch.metainfo.xml
index 54a133cc46..8d29cd4726 100644
--- a/com.libretro.RetroArch.appdata.xml
+++ b/com.libretro.RetroArch.metainfo.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2019 Rob Loach <robloach@gmail.com> -->
 <component type="desktop-application">
   <id>com.libretro.RetroArch</id>
-  <launchable type="desktop-id">org.libretro.RetroArch.desktop</launchable>
+  <launchable type="desktop-id">com.libretro.RetroArch.desktop</launchable>
   <name>RetroArch</name>
   <summary>Frontend for emulators, game engines and media players</summary>
   <developer_name>libretro</developer_name>
diff --git a/gfx/common/wayland_common.h b/gfx/common/wayland_common.h
index 8a187927ce..b7fb3771ed 100644
--- a/gfx/common/wayland_common.h
+++ b/gfx/common/wayland_common.h
@@ -25,7 +25,7 @@
 #define SPLASH_WINDOW_WIDTH 240
 #define SPLASH_WINDOW_HEIGHT 256
 
-#define WAYLAND_APP_ID "org.libretro.RetroArch"
+#define WAYLAND_APP_ID "com.libretro.RetroArch"
 
 typedef struct toplevel_listener
 {
diff --git a/media/retroarch.svg b/media/com.libretro.RetroArch.svg
similarity index 100%
rename from media/retroarch.svg
rename to media/com.libretro.RetroArch.svg
diff --git a/media/render-ios-icons.sh b/media/render-ios-icons.sh
index 8c32aa7dcf..caca1c5760 100755
--- a/media/render-ios-icons.sh
+++ b/media/render-ios-icons.sh
@@ -6,6 +6,6 @@ DEST=${1:-../pkg/apple/iOS/Resources/Media.xcassets/AppIcon.appiconset}
 for pt in 29 40 57 60 50 72 76 ; do
     for scale in 1 2 3 ; do
         side=$(expr $pt \* $scale)
-        convert retroarch.svg -resize ${side}x${side} -negate ${DEST}/Icon-${pt}-${scale}.png
+        convert com.libretro.RetroArch.svg -resize ${side}x${side} -negate ${DEST}/Icon-${pt}-${scale}.png
     done
 done
diff --git a/pkg/sailfishos/retroarch-sailfishos.spec b/pkg/sailfishos/retroarch-sailfishos.spec
index aa9010eaab..e619f6dd1e 100644
--- a/pkg/sailfishos/retroarch-sailfishos.spec
+++ b/pkg/sailfishos/retroarch-sailfishos.spec
@@ -63,19 +63,19 @@ sed -i \
 
 sed -i \
   's|^Exec=retroarch|Exec=retroarch --menu|' \
-  %{buildroot}/usr/share/applications/org.libretro.RetroArch.desktop
+  %{buildroot}/usr/share/applications/com.libretro.RetroArch.desktop
 
   # Install icon file in the correct place
   mkdir -p %{buildroot}/usr/share/icons/hicolor/86x86/apps
   install -m 644 "./media/retroarch-96x96.png" "%{buildroot}/usr/share/icons/hicolor/86x86/apps/retroarch.png"
-  rm "%{buildroot}/usr/share/pixmaps/retroarch.svg"
+  rm "%{buildroot}/usr/share/pixmaps/com.libretro.RetroArch.svg"
   rmdir "%{buildroot}/usr/share/pixmaps"
 
 %files
 %doc README.md
 %config /etc/retroarch.cfg
 %{_prefix}/bin/retroarch
-%{_prefix}/share/applications/org.libretro.RetroArch.desktop
+%{_prefix}/share/applications/com.libretro.RetroArch.desktop
 %{_prefix}/share/man/man6/*.6*
 %{_prefix}/share/icons/hicolor/86x86/apps/retroarch.*
 %{_prefix}/share/doc/retroarch/*
diff --git a/webos/build-icon.sh b/webos/build-icon.sh
index 0ae88daca9..ccc5959938 100644
--- a/webos/build-icon.sh
+++ b/webos/build-icon.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-convert -background none media/retroarch.svg -resize 160x160 -negate webos/icon160.png
+convert -background none media/com.libretro.RetroArch.svg -resize 160x160 -negate webos/icon160.png