diff --git a/xml/session/linux515.xml b/session/linux515.xml
similarity index 99%
rename from xml/session/linux515.xml
rename to session/linux515.xml
index 3805923..f11c4a0 100644
--- a/xml/session/linux515.xml
+++ b/session/linux515.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>Linux5.15</name>
+  <name>linux515</name>
   <memory unit='KiB'>4194304</memory>
   <description>Rootless QEMU virtual machine model optimized for Linux guests running at least kernel 5.15. Secure boot is disabled</description>
   <memory unit="KiB">4194304</memory>
diff --git a/xml/session/linux54.xml b/session/linux54.xml
similarity index 99%
rename from xml/session/linux54.xml
rename to session/linux54.xml
index ab62dc8..ec1274c 100644
--- a/xml/session/linux54.xml
+++ b/session/linux54.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>Linux5.4</name>
+  <name>linux54</name>
   <memory unit='KiB'>4194304</memory>
   <description>Rootless QEMU virtual machine model optimized for Linux guests running at least kernel 5.4. Secure boot is disabled</description>
   <memory unit="KiB">4194304</memory>
diff --git a/xml/system/linux515.xml b/system/linux515.xml
similarity index 99%
rename from xml/system/linux515.xml
rename to system/linux515.xml
index 03871cd..d51d96f 100644
--- a/xml/system/linux515.xml
+++ b/system/linux515.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>Linux5.15</name>
+  <name>linux515</name>
   <memory unit='KiB'>4194304</memory>
   <description>QEMU Virtual machine model optimized for Linux guests running at least kernel 5.15. Secure boot is disabled</description>
   <memory unit="KiB">4194304</memory>
diff --git a/xml/system/linux54.xml b/system/linux54.xml
similarity index 99%
rename from xml/system/linux54.xml
rename to system/linux54.xml
index 1ff31ed..1a5ec67 100644
--- a/xml/system/linux54.xml
+++ b/system/linux54.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>Linux5.4</name>
+  <name>linux54</name>
   <memory unit='KiB'>4194304</memory>
   <description>QEMU Virtual machine model optimized for Linux guests running at least kernel 5.4. Secure boot is disabled</description>
   <memory unit="KiB">4194304</memory>
diff --git a/xml/system/windows10.xml b/system/windows10.xml
similarity index 99%
rename from xml/system/windows10.xml
rename to system/windows10.xml
index 4b586b4..345bbc3 100644
--- a/xml/system/windows10.xml
+++ b/system/windows10.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>WindowsNT10</name>
+  <name>windows10</name>
   <memory unit='KiB'>4194304</memory>
   <description>QEMU virtual machine model optimized for Windows NT 10 guests such as Windows 10. Secure boot is disabled</description>
   <currentMemory unit='KiB'>4194304</currentMemory>
diff --git a/xml/system/windows11.xml b/system/windows11.xml
similarity index 99%
rename from xml/system/windows11.xml
rename to system/windows11.xml
index 8f95fe5..c06f7e9 100644
--- a/xml/system/windows11.xml
+++ b/system/windows11.xml
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>WindowsNT11</name>
+  <name>windows11</name>
   <memory unit='KiB'>4194304</memory>
   <description>QEMU virtual machine model optimized for Windows NT 11 guests such as Windows 11. Secure boot is enabled</description>
   <currentMemory unit='KiB'>4194304</currentMemory>