diff --git a/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-pcb.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png
similarity index 100%
rename from resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-pcb.png
rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png
diff --git a/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-project.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png
similarity index 100%
rename from resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-project.png
rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png
diff --git a/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-schematic.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png
similarity index 100%
rename from resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad6-schematic.png
rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png
diff --git a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-pcb.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg
similarity index 100%
rename from resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-pcb.svg
rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg
diff --git a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-project.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg
similarity index 100%
rename from resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-project.svg
rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg
diff --git a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-schematic.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
similarity index 100%
rename from resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad6-schematic.svg
rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
diff --git a/resources/linux/launchers/org.kicad.eeschema.desktop.in b/resources/linux/launchers/org.kicad.eeschema.desktop.in
index bd194e2584..6fc88004ac 100644
--- a/resources/linux/launchers/org.kicad.eeschema.desktop.in
+++ b/resources/linux/launchers/org.kicad.eeschema.desktop.in
@@ -5,7 +5,7 @@ Icon=eeschema
 Type=Application
 Categories=Science;Electronics;
 Exec=eeschema %f
-MimeType=application/x-kicad6-schematic;
+MimeType=application/x-kicad-schematic;
 Name=KiCad Schematic Editor (Standalone)
 GenericName=Schematic Capture Tool
 Comment=Standalone schematic editor for KiCad schematics
diff --git a/resources/linux/launchers/org.kicad.kicad.desktop.in b/resources/linux/launchers/org.kicad.kicad.desktop.in
index 62d94c4525..cadf381887 100644
--- a/resources/linux/launchers/org.kicad.kicad.desktop.in
+++ b/resources/linux/launchers/org.kicad.kicad.desktop.in
@@ -5,7 +5,7 @@ Icon=kicad
 Type=Application
 Categories=Science;Electronics;
 Exec=kicad %f
-MimeType=application/x-kicad6-project;
+MimeType=application/x-kicad-project;
 Name=KiCad
 GenericName=EDA Suite
 Comment=Suite of tools for schematic design and circuit board layout
diff --git a/resources/linux/launchers/org.kicad.pcbnew.desktop.in b/resources/linux/launchers/org.kicad.pcbnew.desktop.in
index 46dc1c45c3..844ba42b3f 100644
--- a/resources/linux/launchers/org.kicad.pcbnew.desktop.in
+++ b/resources/linux/launchers/org.kicad.pcbnew.desktop.in
@@ -5,7 +5,7 @@ Icon=pcbnew
 Type=Application
 Categories=Science;Electronics;
 Exec=pcbnew %f
-MimeType=application/x-kicad6-pcb;
+MimeType=application/x-kicad-pcb;
 Name=KiCad PCB Editor (Standalone)
 GenericName=PCB layout editor
 Comment=Standalone circuit board editor for KiCad boards
diff --git a/resources/linux/metainfo/org.kicad.kicad.metainfo.xml.in b/resources/linux/metainfo/org.kicad.kicad.metainfo.xml.in
index 2cfd78e3f7..95ad0f2dd5 100644
--- a/resources/linux/metainfo/org.kicad.kicad.metainfo.xml.in
+++ b/resources/linux/metainfo/org.kicad.kicad.metainfo.xml.in
@@ -22,9 +22,9 @@
         <binary>pcb_calculator</binary>
         <mediatype>application/x-gerber</mediatype>
         <mediatype>application/x-excellon</mediatype>
-        <mediatype>application/x-kicad6-project</mediatype>
-        <mediatype>application/x-kicad6-schematic</mediatype>
-        <mediatype>application/x-kicad6-pcb</mediatype>
+        <mediatype>application/x-kicad-project</mediatype>
+        <mediatype>application/x-kicad-schematic</mediatype>
+        <mediatype>application/x-kicad-pcb</mediatype>
     </provides>
 
     <translation type="gettext">kicad</translation>
diff --git a/resources/linux/mime/kicad-kicad.xml.in b/resources/linux/mime/kicad-kicad.xml.in
index 5febf38aea..5eef3f304e 100644
--- a/resources/linux/mime/kicad-kicad.xml.in
+++ b/resources/linux/mime/kicad-kicad.xml.in
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-    <mime-type type="application/x-kicad6-project">
+    <mime-type type="application/x-kicad-project">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Project</comment>
-        <generic-icon name="application-x-kicad6-project"/>
+        <comment>KiCad Project</comment>
+        <generic-icon name="application-x-kicad-project"/>
         <glob pattern="*.pro" weight="40"/>
         <glob pattern="*.kicad_pro" weight="50"/>
     </mime-type>
-    <mime-type type="application/x-kicad6-schematic">
+    <mime-type type="application/x-kicad-schematic">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Schematic</comment>
-        <generic-icon name="application-x-kicad6-schematic"/>
+        <comment>KiCad Schematic</comment>
+        <generic-icon name="application-x-kicad-schematic"/>
         <glob pattern="*.sch" weight="40"/>
         <glob pattern="*.kicad_sch" weight="50"/>
         <magic priority="50">
@@ -22,10 +22,10 @@
             <match type="string" offset="0" value="EESchema Schematic File"/>
         </magic>
     </mime-type>
-    <mime-type type="application/x-kicad6-pcb">
+    <mime-type type="application/x-kicad-pcb">
         <sub-class-of type="text/plain"/>
-        <comment>KiCad 6 Printed Circuit Board</comment>
-        <generic-icon name="application-x-kicad6-pcb"/>
+        <comment>KiCad Printed Circuit Board</comment>
+        <generic-icon name="application-x-kicad-pcb"/>
         <glob pattern="*.kicad_pcb" weight="50"/>
         <magic priority="50">
             <!--The new board file (.kicad_pcb) header-->