diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index b14932beacd5..da424e65e328 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.25 2000/02/29 21:37:01 augustss Exp $	*/
+/*	$NetBSD: umass.c,v 1.26 2000/03/24 22:16:42 augustss Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -235,7 +235,7 @@ USB_MATCH(umass)
 	if (id != NULL
 	    && id->bInterfaceClass == UICLASS_MASS
 	    && id->bInterfaceSubClass == UISUBCLASS_SCSI
-	    && id->bInterfaceProtocol == UIPROTO_MASS_BULK_P)
+	    && id->bInterfaceProtocol == UIPROTO_MASS_BBB_P)
 		return(UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO);
 
 	return(UMATCH_NONE);
@@ -283,8 +283,8 @@ USB_ATTACH(umass)
 	case UIPROTO_MASS_CBI_I:	protocol = "CBI with CCI"; break;
 	case UIPROTO_MASS_CBI:		protocol = "CBI";	break;
 #endif
-	case UIPROTO_MASS_BULK:		/* XXX Is this really right? */
-	case UIPROTO_MASS_BULK_P:	protocol = "Bulk-Only";	break;
+	case UIPROTO_MASS_BBB:		/* XXX Is this really right? */
+	case UIPROTO_MASS_BBB_P:	protocol = "Bulk-Only";	break;
 	default:
 		panic("umass_attach: impossible protocol");
 	}
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index d404a07507e6..49c7f3819648 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.h,v 1.42 2000/03/19 22:23:28 augustss Exp $	*/
+/*	$NetBSD: usb.h,v 1.43 2000/03/24 22:16:42 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $	*/
 
 /*
@@ -381,8 +381,8 @@ typedef struct {
 #define  UISUBCLASS_SCSI	6
 #define  UIPROTO_MASS_CBI_I	0
 #define  UIPROTO_MASS_CBI	1
-#define  UIPROTO_MASS_BULK	2
-#define  UIPROTO_MASS_BULK_P	80	/* 'P' for the Iomega Zip drive */
+#define  UIPROTO_MASS_BBB	2
+#define  UIPROTO_MASS_BBB_P	80	/* 'P' for the Iomega Zip drive */
 
 #define UICLASS_HUB		0x09
 #define  UISUBCLASS_HUB		0