diff --git a/inventory/host_vars/virt26.qa.fedoraproject.org b/inventory/host_vars/taskotron-client26.qa.fedoraproject.org
similarity index 81%
rename from inventory/host_vars/virt26.qa.fedoraproject.org
rename to inventory/host_vars/taskotron-client26.qa.fedoraproject.org
index c7d52577c6..105f843c14 100644
--- a/inventory/host_vars/virt26.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-client26.qa.fedoraproject.org
@@ -9,6 +9,6 @@ eth0_ip: 10.5.124.187
 vmhost: qa07.qa.fedoraproject.org
 datacenter: phx2
 
-short_hostname: virt26.qa
-buildslave_name: virt26
+short_hostname: taskotron-client26.qa
+buildslave_name: taskotron-client26
 fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/virt27.qa.fedoraproject.org b/inventory/host_vars/taskotron-client27.qa.fedoraproject.org
similarity index 82%
rename from inventory/host_vars/virt27.qa.fedoraproject.org
rename to inventory/host_vars/taskotron-client27.qa.fedoraproject.org
index 6890d2b8f2..1a7edad472 100644
--- a/inventory/host_vars/virt27.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-client27.qa.fedoraproject.org
@@ -10,6 +10,6 @@ vmhost: qa07.qa.fedoraproject.org
 datacenter: phx2
 libdir: /usr/lib
 
-short_hostname: virt27.qa
-buildslave_name: virt27
+short_hostname: taskotron-client27.qa
+buildslave_name: taskotron-client27
 fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/virt28.qa.fedoraproject.org b/inventory/host_vars/taskotron-client28.qa.fedoraproject.org
similarity index 81%
rename from inventory/host_vars/virt28.qa.fedoraproject.org
rename to inventory/host_vars/taskotron-client28.qa.fedoraproject.org
index 0c77421685..a70bcc1da5 100644
--- a/inventory/host_vars/virt28.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-client28.qa.fedoraproject.org
@@ -9,6 +9,6 @@ eth0_ip: 10.5.124.189
 vmhost: qa07.qa.fedoraproject.org
 datacenter: phx2
 
-short_hostname: virt28.qa
-buildslave_name: virt28
+short_hostname: taskotron-client28.qa
+buildslave_name: taskotron-client28
 fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/virt29.qa.fedoraproject.org b/inventory/host_vars/taskotron-client29.qa.fedoraproject.org
similarity index 82%
rename from inventory/host_vars/virt29.qa.fedoraproject.org
rename to inventory/host_vars/taskotron-client29.qa.fedoraproject.org
index f3f2716329..783c615033 100644
--- a/inventory/host_vars/virt29.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-client29.qa.fedoraproject.org
@@ -10,6 +10,6 @@ vmhost: qa07.qa.fedoraproject.org
 datacenter: phx2
 libdir: /usr/lib
 
-short_hostname: virt29.qa
-buildslave_name: virt29
+short_hostname: taskotron-client29.qa
+buildslave_name: taskotron-client29
 fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index fd91d34be7..638584a92e 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -23,13 +23,13 @@ public_hostname: taskotron-dev.fedoraproject.org
 fake_fedorainfra_endpoint: fakefedorainfra
 buildmaster: 10.5.124.181
 buildslaves:
-    - virt26
-    - virt27
-    - virt28
-    - virt29
+    - taskotron-client26
+    - taskotron-client27
+    - taskotron-client28
+    - taskotron-client29
 i386_buildslaves:
-    - virt27
-    - virt29
+    - taskotron-client27
+    - taskotron-client29
 x86_64_buildslaves:
-    - virt26
-    - virt28
+    - taskotron-client26
+    - taskotron-client28
diff --git a/inventory/inventory b/inventory/inventory
index d756e5472e..65c96ee5c4 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -490,10 +490,10 @@ taskotron-stg
 taskotron-dev01.qa.fedoraproject.org
 
 [taskotron-dev-clients]
-virt26.qa.fedoraproject.org
-virt27.qa.fedoraproject.org
-virt28.qa.fedoraproject.org
-virt29.qa.fedoraproject.org
+taskotron-client26.qa.fedoraproject.org
+taskotron-client27.qa.fedoraproject.org
+taskotron-client28.qa.fedoraproject.org
+taskotron-client29.qa.fedoraproject.org
 
 [taskotron-stg]
 taskotron-stg01.qa.fedoraproject.org