diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index 20209d121f1a..c18b9849cb03 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -182,7 +182,7 @@ readdisklabel(dev, lp)
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	if (biowait(bp))
 		msg = "I/O error";
 	else for (dlp = (struct disklabel *)bp->b_data;
@@ -285,7 +285,7 @@ writedisklabel(dev, lp)
 	 */
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	error = biowait(bp);
 	if (error)
 		goto done;
@@ -314,7 +314,7 @@ done:
 	*dlp = *lp;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_WRITE;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	error = biowait(bp);
 #endif
 	bp->b_flags |= B_INVAL | B_AGE;
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 9802d9f5aee5..f9e2ebafae6c 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -188,7 +188,7 @@ reread_mbr:
 	bp->b_blkno = mbr_offset;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
 		diskerr(bp, "reading primary partition table: error",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
@@ -404,7 +404,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	bp->b_blkno = ext_offset;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
 		diskerr(bp, "reading extended partition table: error",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 1528a460fc3e..e7447036f708 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -137,7 +137,7 @@ typedef void devfs_remove_t __P((dev_t dev));
  * of surgery, reset the flag and restart all the stuff on the stall
  * queue.
  */
-#define BUF_STRATEGY(bp, dummy)			\
+#define DEV_STRATEGY(bp, dummy)			\
 	do {					\
 	if ((!(bp)->b_iocmd) || ((bp)->b_iocmd & ((bp)->b_iocmd - 1)))	\
 		Debugger("d_iocmd botch");	\
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 1528a460fc3e..e7447036f708 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -137,7 +137,7 @@ typedef void devfs_remove_t __P((dev_t dev));
  * of surgery, reset the flag and restart all the stuff on the stall
  * queue.
  */
-#define BUF_STRATEGY(bp, dummy)			\
+#define DEV_STRATEGY(bp, dummy)			\
 	do {					\
 	if ((!(bp)->b_iocmd) || ((bp)->b_iocmd & ((bp)->b_iocmd - 1)))	\
 		Debugger("d_iocmd botch");	\
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 20209d121f1a..c18b9849cb03 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -182,7 +182,7 @@ readdisklabel(dev, lp)
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	if (biowait(bp))
 		msg = "I/O error";
 	else for (dlp = (struct disklabel *)bp->b_data;
@@ -285,7 +285,7 @@ writedisklabel(dev, lp)
 	 */
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	error = biowait(bp);
 	if (error)
 		goto done;
@@ -314,7 +314,7 @@ done:
 	*dlp = *lp;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_WRITE;
-	BUF_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp, 1);
 	error = biowait(bp);
 #endif
 	bp->b_flags |= B_INVAL | B_AGE;