diff --git a/qubesadmin/device_protocol.py b/qubesadmin/device_protocol.py
index c72d8a65..06306cda 100644
--- a/qubesadmin/device_protocol.py
+++ b/qubesadmin/device_protocol.py
@@ -647,16 +647,16 @@ class DeviceCategory(Enum):
 
     # modems, WiFi and Ethernet adapters
     Network = ("u02****", "p0703**", "p02****", "ue0****")
-    Input = ("u03****", "p09****")  # HID etc.
     Keyboard = ("u03**01", "p0900**")
     Mouse = ("u03**02", "p0902**")
+    Input = ("u03****", "p09****")  # HID etc.
     Printer = ("u07****",)
-    Image_Input = ("p0903**", "u06****", "u0e****") # cameras and scanners
+    Camera = ("p0903**", "u06****", "u0e****") # cameras and scanners
 
+    Microphone = ("m******",)
     Audio = ("p0403**", "p0401**", "p0408**", "u01****", "m******")
     # Multimedia = Audio, Video, Displays etc.
     Multimedia = ("u10****", "p03****", "p04****")
-    Microphone = ("m******",)
     USB_Storage = ("u08****", )
     Block_Storage = ("b******", )
     Storage = ("b******", "u08****", "p01****")
@@ -1019,7 +1019,7 @@ def description(self) -> str:
         else:
             for interface in self.interfaces:
                 if str(interface) != f"{self.devclass.upper()} device":
-                    cat = str(interface)
+                    cat = str(interface).replace("_", " ")
                     break
             else:
                 cat = f"{self.devclass.upper()} device"
@@ -1167,13 +1167,13 @@ def _deserialize(
             interfaces = properties["interfaces"]
             properties["interfaces"] = DeviceInterface.from_str_bulk(interfaces)
 
-        if "parent_ident" in properties:
+        if "parent_port_id" in properties:
             properties["parent"] = Port(
                 backend_domain=expected_device.backend_domain,
-                port_id=properties["parent_ident"],
+                port_id=properties["parent_port_id"],
                 devclass=properties["parent_devclass"],
             )
-            del properties["parent_ident"]
+            del properties["parent_port_id"]
             del properties["parent_devclass"]
 
         return cls(**properties)