diff --git a/Manual.org b/Manual.org
index e30419b..d2e69e4 100644
--- a/Manual.org
+++ b/Manual.org
@@ -4190,7 +4190,8 @@ def format_gpu_device_list(iterator):
     def get_entries(iterator):
         for d in iterator:
             if d.idClass == 0x030000:
-                yield (vendor_dict.get(d.idVendor, "unknown"), "{:04x}:{:04x}".format(d.idVendor, d.idProduct))
+                yield {"VendorName": vendor_dict.get(d.idVendor, "unknown"),
+                       "VendorID": d.idVendor, "ProductID": d.idProduct}
     return [entry for entry in get_entries(iterator)]
 
 arg_specs = {
diff --git a/library/hardware_facts.py b/library/hardware_facts.py
index e6a1e5f..5ca2e82 100755
--- a/library/hardware_facts.py
+++ b/library/hardware_facts.py
@@ -93,7 +93,8 @@ def format_gpu_device_list(iterator):
     def get_entries(iterator):
         for d in iterator:
             if d.idClass == 0x030000:
-                yield (vendor_dict.get(d.idVendor, "unknown"), "{:04x}:{:04x}".format(d.idVendor, d.idProduct))
+                yield {"VendorName": vendor_dict.get(d.idVendor, "unknown"),
+                       "VendorID": d.idVendor, "ProductID": d.idProduct}
     return [entry for entry in get_entries(iterator)]
 
 arg_specs = {