Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 70586)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 70587)
@@ -1991,15 +1991,15 @@
             RTPrintf("usb=\"%s\"\n", fOhciEnabled ? "on" : "off");
         else
-            RTPrintf("USB:             %s\n", fOhciEnabled ? "enabled" : "disabled");
+            RTPrintf("OHCI USB:        %s\n", fOhciEnabled ? "enabled" : "disabled");
 
         if (details == VMINFO_MACHINEREADABLE)
             RTPrintf("ehci=\"%s\"\n", fEhciEnabled ? "on" : "off");
         else
-            RTPrintf("EHCI:            %s\n", fEhciEnabled ? "enabled" : "disabled");
+            RTPrintf("EHCI USB:        %s\n", fEhciEnabled ? "enabled" : "disabled");
 
         if (details == VMINFO_MACHINEREADABLE)
             RTPrintf("xhci=\"%s\"\n", fXhciEnabled ? "on" : "off");
         else
-            RTPrintf("XHCI:            %s\n", fXhciEnabled ? "enabled" : "disabled");
+            RTPrintf("xHCI USB:        %s\n", fXhciEnabled ? "enabled" : "disabled");
     }
 
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 70586)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 70587)
@@ -179,5 +179,5 @@
     MODIFYVM_USBXHCI,
     MODIFYVM_USBEHCI,
-    MODIFYVM_USB,
+    MODIFYVM_USBOHCI,
     MODIFYVM_SNAPSHOTFOLDER,
     MODIFYVM_TELEPORTER_ENABLED,
@@ -361,5 +361,6 @@
     { "--usbxhci",                  MODIFYVM_USBXHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--usbehci",                  MODIFYVM_USBEHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
-    { "--usb",                      MODIFYVM_USB,                       RTGETOPT_REQ_BOOL_ONOFF },
+    { "--usbohci",                  MODIFYVM_USBOHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
+    { "--usb",                      MODIFYVM_USBOHCI,                   RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */
     { "--snapshotfolder",           MODIFYVM_SNAPSHOTFOLDER,            RTGETOPT_REQ_STRING },
     { "--teleporter",               MODIFYVM_TELEPORTER_ENABLED,        RTGETOPT_REQ_BOOL_ONOFF },
@@ -2704,5 +2705,5 @@
             }
 
-            case MODIFYVM_USB:
+            case MODIFYVM_USBOHCI:
             {
                 ULONG cOhciCtrls = 0;