Index: usb-busclass.xml
===================================================================
--- usb-busclass.xml	(revision 1235)
+++ usb-busclass.xml	(working copy)
@@ -3,13 +3,13 @@
 <!-- $Progeny$ -->
 
 <busclass_list bus="usb">
-  <busclass id="0000" name="miscellaneous"/>
+  <busclass id="0000" name="unknown"/>
   <busclass id="0101" name="printer"/>
   <busclass id="0202" name="modem"/>
-  <busclass id="0206" name="network"/>
-  <busclass id="0300" name="bridge"/>
-  <busclass id="0804" name="removabledisk"/>
-  <busclass id="1030" name="broadband"/>
-  <busclass id="ff00" name="video"/>
-  <busclass id="ffff" name="imaging"/>
+  <busclass id="0206" name="ethernet"/>
+  <busclass id="0300" name="joystick"/>
+  <busclass id="0804" name="floppy"/>
+  <busclass id="1030" name="isdn"/>
+  <busclass id="ff00" name="webcam"/>
+  <busclass id="ffff" name="scanner"/>
 </busclass_list>
Index: pcmcia-busclass.xml
===================================================================
--- pcmcia-busclass.xml	(revision 1235)
+++ pcmcia-busclass.xml	(working copy)
@@ -5,11 +5,11 @@
 <busclass_list bus="pcmcia">
   <busclass id="modem" name="modem"/>
   <busclass id="isdn" name="broadband"/>
-  <busclass id="network" name="network"/>
+  <busclass id="network" name="ethernet"/>
   <busclass id="gameport" name="bridge"/>
   <busclass id="multimedia" name="video"/>
   <busclass id="video" name="display"/>
-  <busclass id="unknown" name="miscellaneous"/>
+  <busclass id="unknown" name="unknown"/>
   <busclass id="sound" name="audio"/>
   <busclass id="bridge" name="bridge"/>
 </busclass_list>