diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
index 28e6d0217..753eda928 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>vm-aarch64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -42,7 +42,7 @@
   </devices>
 </domain>
 <domain type="qemu">
-  <name>foobar</name>
+  <name>vm-aarch64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml b/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
index 0bf131703..d6972aff3 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml b/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
index 1b930dfd4..6bf62e3f1 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
index 586720dd5..bf244b7ce 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora22</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -23,7 +23,7 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/foobar.qcow2"/>
+      <source file="/var/lib/libvirt/images/None.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <controller type="scsi" index="0" model="virtio-scsi">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
index 573b1f92f..2ec1e7c59 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
index 20fed5770..677f7e7a4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>vm-aarch64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
index 20fed5770..677f7e7a4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>vm-aarch64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
index d100aec8e..6281d823c 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora20-arm</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
index 8198547e8..acd49a5da 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora20</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml b/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
index 395124de0..995ea4251 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>vm-arm</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
index 147fad1b9..056668763 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora20-arm</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml b/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
index 50fb481f5..c36e29466 100644
--- a/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
+++ b/tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-boot-uefi.xml b/tests/cli-test-xml/compare/virt-install-boot-uefi.xml
index c0b889d31..b71eb82db 100644
--- a/tests/cli-test-xml/compare/virt-install-boot-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-boot-uefi.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml b/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
index 890527cd5..cba1cae5b 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
+++ b/tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>centos6.5</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -79,7 +79,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>centos6.5</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-double.xml b/tests/cli-test-xml/compare/virt-install-cdrom-double.xml
index 1c04c49b8..9991baf32 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-double.xml
+++ b/tests/cli-test-xml/compare/virt-install-cdrom-double.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -20,7 +20,7 @@
   <devices>
     <emulator>/usr/bin/test-hv</emulator>
     <disk type="file" device="disk">
-      <source file="/var/lib/libvirt/images/foobar.qcow2"/>
+      <source file="/var/lib/libvirt/images/None.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <disk type="file" device="cdrom">
@@ -51,7 +51,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -70,7 +70,7 @@
   <devices>
     <emulator>/usr/bin/test-hv</emulator>
     <disk type="file" device="disk">
-      <source file="/var/lib/libvirt/images/foobar.qcow2"/>
+      <source file="/var/lib/libvirt/images/None.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <disk type="file" device="cdrom">
diff --git a/tests/cli-test-xml/compare/virt-install-cdrom-url.xml b/tests/cli-test-xml/compare/virt-install-cdrom-url.xml
index 6ba44553c..695ca9636 100644
--- a/tests/cli-test-xml/compare/virt-install-cdrom-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-cdrom-url.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -43,7 +43,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml b/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
index ffb2b7bfb..c50ff63d5 100644
--- a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
+++ b/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -45,7 +45,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml b/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
index e483c3889..ff52e5ca4 100644
--- a/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -47,7 +47,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml b/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
index b7514628e..df5d30aed 100644
--- a/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
+++ b/tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -37,7 +37,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
index 9db845906..31b5fa667 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-fake-ftp.xml b/tests/cli-test-xml/compare/virt-install-fake-ftp.xml
index 15a0e02b1..2325d24bf 100644
--- a/tests/cli-test-xml/compare/virt-install-fake-ftp.xml
+++ b/tests/cli-test-xml/compare/virt-install-fake-ftp.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>rhel6.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -44,7 +44,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>rhel6.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-fake-http.xml b/tests/cli-test-xml/compare/virt-install-fake-http.xml
index 4e706e7fc..5a76dbe9c 100644
--- a/tests/cli-test-xml/compare/virt-install-fake-http.xml
+++ b/tests/cli-test-xml/compare/virt-install-fake-http.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>rhel6.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -44,7 +44,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>rhel6.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
index 140cf8847..6baaf1695 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>centos7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -67,7 +67,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>centos7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml b/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
index 4b03c2078..1a89ce74c 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -69,7 +69,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml b/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
index 49a838a61..71c19de80 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -57,7 +57,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml b/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
index 7128a68ce..a01453ada 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -76,7 +76,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml b/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
index d7e233b38..7611430a4 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm-i686</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -55,7 +55,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm-i686</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
index bc6fd4b74..e5a715842 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel5.4</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -64,7 +64,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel5.4</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
index 37f73de02..554307df5 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel6.4</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -73,7 +73,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel6.4</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
index e6bb68121..7586bb52a 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -67,7 +67,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>rhel7.0</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
index cee1e5130..eba2a4dbf 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -34,7 +34,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
-      <source file="/tmp/.local/share/libvirt/images/foobar.qcow2"/>
+      <source file="/tmp/.local/share/libvirt/images/None.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <disk type="file" device="cdrom">
@@ -72,7 +72,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -105,7 +105,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
-      <source file="/tmp/.local/share/libvirt/images/foobar.qcow2"/>
+      <source file="/tmp/.local/share/libvirt/images/None.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <disk type="file" device="cdrom">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
index 32cde7401..42adb1bad 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win10</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -69,7 +69,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win10</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
index 108ba530b..3ee873422 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win2k3</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -69,7 +69,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win2k3</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/cli-test-xml/compare/virt-install-location-iso.xml
index 2604f837a..808afc2b8 100644
--- a/tests/cli-test-xml/compare/virt-install-location-iso.xml
+++ b/tests/cli-test-xml/compare/virt-install-location-iso.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora17</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -77,7 +77,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora17</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml b/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
index ea0aded6a..91f71dfaf 100644
--- a/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
+++ b/tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -61,7 +61,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml
index 566a11a7a..c4a8fc987 100644
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -67,7 +67,7 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/foobar.qcow2"/>
+      <source file="/var/lib/libvirt/images/None.qcow2"/>
       <target dev="vdc" bus="virtio"/>
     </disk>
     <disk type="block" device="lun" sgio="unfiltered" rawio="yes">
@@ -114,7 +114,7 @@
       <auth username="admin">
         <secret type="ceph" uuid="f65cc5a8-b77b-4254-9030-d50a528fb456"/>
       </auth>
-      <source protocol="rbd" name="rbd-sourcename/foobar">
+      <source protocol="rbd" name="rbd-sourcename/None">
         <host name="ceph-mon-1.example.com" port="6789"/>
         <host name="ceph-mon-2.example.com" port="6789"/>
         <host name="ceph-mon-3.example.com" port="6789"/>
diff --git a/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml b/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
index e7a347974..84c283091 100644
--- a/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
+++ b/tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <maxMemory slots="2">2097152</maxMemory>
   <os>
@@ -63,7 +63,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <maxMemory slots="2">2097152</maxMemory>
   <os>
diff --git a/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml b/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
index 0cc0369fb..66f2aa4ca 100644
--- a/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
+++ b/tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <maxMemory slots="1">409600</maxMemory>
   <memory>307200</memory>
@@ -37,7 +37,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <maxMemory slots="1">409600</maxMemory>
   <memory>307200</memory>
diff --git a/tests/cli-test-xml/compare/virt-install-network-install-resources.xml b/tests/cli-test-xml/compare/virt-install-network-install-resources.xml
index a08cc4491..57653ff6f 100644
--- a/tests/cli-test-xml/compare/virt-install-network-install-resources.xml
+++ b/tests/cli-test-xml/compare/virt-install-network-install-resources.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>silverblue29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -49,7 +49,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>silverblue29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-noargs-fail.xml b/tests/cli-test-xml/compare/virt-install-noargs-fail.xml
index c022bb3ba..ac4811315 100644
--- a/tests/cli-test-xml/compare/virt-install-noargs-fail.xml
+++ b/tests/cli-test-xml/compare/virt-install-noargs-fail.xml
@@ -1,3 +1,4 @@
+Using default --name vm1
 ERROR    
 --disk storage must be specified (override with --disk none)
 An install method must be specified
diff --git a/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml b/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
index 6d33e7e54..c34f16cef 100644
--- a/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>openbsd4.9</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -31,7 +31,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/foobar.qcow2"/>
+      <source file="/var/lib/libvirt/images/None.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <controller type="usb" index="0" model="ich9-ehci1"/>
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml b/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
index 64087a176..cc4ead489 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -55,7 +55,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml b/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
index 62c7b7477..0e1d169ad 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -49,7 +49,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-url.xml b/tests/cli-test-xml/compare/virt-install-osinfo-url.xml
index d30cb2cee..5b82be595 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-url.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -49,7 +49,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora26</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml b/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
index f075c6fcd..55f4ea6a1 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win7</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -67,7 +67,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win7</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml b/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
index 236de7380..f5ed6f883 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml b/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
index 24b794655..a1f56b260 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
index 67793929b..199a21761 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora20-ppc64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
index 7f4895af8..2e90c998a 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora20-ppc64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
index 51bd3c811..4f6ad26c0 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora20</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
index 981f84ec9..913df1a10 100644
--- a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -66,7 +66,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
index 6e912416e..47336f728 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora20-i686</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
index 3d8fc8293..48ff1651e 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>ubuntu13.10</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml b/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
index 01c560948..61d2e7e63 100644
--- a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora29-riscv64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml b/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
index 53c20085f..cc2b0ed8c 100644
--- a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
@@ -1,5 +1,5 @@
 <domain type="qemu">
-  <name>foobar</name>
+  <name>fedora29-riscv64</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
index 342ce80d1..7ebca4584 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
index 06e2f6e82..b5e9f66dc 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora21</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml b/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
index e647a05ab..82f303cf1 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml b/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
index c13f35ab3..1a8f91120 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-headless.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml b/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
index c9b8956ef..de71c9d56 100644
--- a/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
+++ b/tests/cli-test-xml/compare/virt-install-simple-pxe.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
@@ -36,7 +36,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
index 79e38f6cc..e30a10a49 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>12345678-12F4-1234-1234-123456789AFA</uuid>
   <genid/>
   <description>foobar &amp; baz</description>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
index e8d75b3bb..5cfb469da 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <genid>e9392370-2917-565e-692b-d057f46512d6</genid>
   <title>my-title</title>
@@ -213,7 +213,7 @@
   </cputune>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <genid>e9392370-2917-565e-692b-d057f46512d6</genid>
   <title>my-title</title>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
index f9e5f5bae..dcd756d76 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml b/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
index 4e6bd40ba..b8ba6f6fd 100644
--- a/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
+++ b/tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
@@ -1,5 +1,5 @@
 <domain type="vz">
-  <name>foobar</name>
+  <name>container1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
index 1aba67a5d..f50561ee0 100644
--- a/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
@@ -1,5 +1,5 @@
 <domain type="test">
-  <name>foobar</name>
+  <name>win2k3</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -51,7 +51,7 @@
   </devices>
 </domain>
 <domain type="test">
-  <name>foobar</name>
+  <name>win2k3</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
index b7860775c..ebf7201af 100644
--- a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win7</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -74,7 +74,7 @@
   </devices>
 </domain>
 <domain type="kvm">
-  <name>foobar</name>
+  <name>win7</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml b/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
index fb2cded63..d03904016 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml b/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
index 57a349f0b..0a2d14a25 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
+++ b/tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>fedora29</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml b/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
index a85b3a57f..cd3e1cabe 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
+++ b/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml b/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
index 84dc9cb93..5d2e4a565 100644
--- a/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
+++ b/tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
@@ -1,5 +1,5 @@
 <domain type="kvm">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-default.xml b/tests/cli-test-xml/compare/virt-install-xen-default.xml
index 4cc6d00fb..4cac5d669 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-default.xml
@@ -1,5 +1,5 @@
 <domain type="xen">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml b/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
index 5de4b9328..adef11a0e 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
@@ -1,5 +1,5 @@
 <domain type="xen">
-  <name>foobar</name>
+  <name>vm1</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-pv.xml b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
index e6e009686..4aa080b29 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
@@ -1,5 +1,5 @@
 <domain type="xen">
-  <name>foobar</name>
+  <name>fedora17</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@@ -32,7 +32,7 @@
   </devices>
 </domain>
 <domain type="xen">
-  <name>foobar</name>
+  <name>fedora17</name>
   <uuid>00000000-1111-2222-3333-444444444444</uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
diff --git a/tests/clitest.py b/tests/clitest.py
index 65b53ed4b..9e81bd106 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -377,8 +377,6 @@ class App(object):
             args += " --connect %s" % uri
 
         if self.appname in ["virt-install"]:
-            if "--name " not in cli:
-                args += " --name foobar"
             if "--ram " not in cli:
                 args += " --ram 64"
 
diff --git a/virt-install b/virt-install
index bb1c06e96..346577af3 100755
--- a/virt-install
+++ b/virt-install
@@ -321,9 +321,6 @@ def validate_required_options(options, guest, installer):
     # aggregate the errors to help first time users get it right
     msg = ""
 
-    if not guest.name:
-        msg += "\n" + _("--name is required")
-
     if not memory_specified(guest):
         msg += "\n" + _("--memory amount in MiB is required")
 
@@ -525,7 +522,13 @@ def build_installer(options, guest):
     return installer
 
 
-def set_resources_from_osinfo(options, guest):
+def set_cli_defaults(options, guest):
+    if not guest.name:
+        default_name = virtinst.Guest.generate_name(guest)
+        cli.print_stdout(_("Using default --name {vm_name}").format(
+            vm_name=default_name))
+        guest.name = default_name
+
     if guest.os.is_container():
         return
 
@@ -580,7 +583,7 @@ def build_guest_instance(conn, options):
     # we are operating on any arch/os/type values passed in with --boot
     guest.set_capabilities_defaults()
     installer = build_installer(options, guest)
-    set_resources_from_osinfo(options, guest)
+    set_cli_defaults(options, guest)
 
     if installer:
         installer.set_install_defaults(guest)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 581c63ddd..6686e104f 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -146,6 +146,9 @@ class Guest(XMLBuilder):
 
         force_num = False
         basename = guest.osinfo.name
+        if basename.endswith("-unknown"):
+            basename = basename.rsplit("-", 1)[0]
+
         if guest.osinfo.name == "generic":
             force_num = True
             if guest.os.is_container():