diff --git a/sys/dev/scsipi/scsi_base.c b/sys/dev/scsipi/scsi_base.c
index 66edb046f2dc..d7f5ee27de2a 100644
--- a/sys/dev/scsipi/scsi_base.c
+++ b/sys/dev/scsipi/scsi_base.c
@@ -1,6 +1,6 @@
 /*
  * Written by Julian Elischer (julian@dialix.oz.au)
- *      $Id: scsi_base.c,v 1.6 1994/02/01 20:05:19 mycroft Exp $
+ *      $Id: scsi_base.c,v 1.7 1994/02/14 21:44:13 mycroft Exp $
  */
 
 #include <sys/types.h>
@@ -399,10 +399,10 @@ scsi_scsi_cmd(sc_link, scsi_cmd, cmdlen, data_addr, datalen,
 	}
 retry:
 	xs->error = XS_NOERROR;
-#ifdef	PARANOID
+#ifdef	DIAGNOSTIC
 	if (datalen && ((caddr_t) xs->data < (caddr_t) KERNBASE))
 		printf("It's still wrong!\n");
-#endif	/*PARANOID*/
+#endif	/* DIAGNOSTIC */
 #ifdef	SCSIDEBUG
 	if (sc_link->flags & SDEV_DB3)
 		show_scsi_xs(xs);
diff --git a/sys/isofs/isofs_lookup.c b/sys/isofs/isofs_lookup.c
index e6b17a4bab3d..e7f413855acf 100644
--- a/sys/isofs/isofs_lookup.c
+++ b/sys/isofs/isofs_lookup.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
- *	$Id: isofs_lookup.c,v 1.14 1994/02/06 20:38:42 ws Exp $
+ *	$Id: isofs_lookup.c,v 1.15 1994/02/14 21:47:10 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -139,7 +139,7 @@ isofs_lookup(vdp, ndp, p)
 		
 		if (error == ENOENT)
 			return (error);
-#ifdef PARANOID
+#ifdef DIAGNOSTIC
 		if (vdp == ndp->ni_rootdir && ndp->ni_isdotdot)
 			panic("ufs_lookup: .. through root");
 #endif
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index e5eefa7c015e..3aea02a82bb8 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -13,7 +13,7 @@
  * 
  * October 1992
  * 
- *	$Id: msdosfs_lookup.c,v 1.5 1993/12/18 00:51:09 mycroft Exp $
+ *	$Id: msdosfs_lookup.c,v 1.6 1994/02/14 21:46:31 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -106,7 +106,7 @@ msdosfs_lookup(vdp, ndp, p)
 
 		if (error == ENOENT)
 			return error;
-#ifdef PARANOID
+#ifdef DIAGNOSTIC
 		if (vdp == ndp->ni_rootdir && ndp->ni_isdotdot)
 			panic("msdosfs_lookup: .. thru root");
 #endif				/* PARANOID */
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 6255edfd3e24..0259464218d1 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ip_input.c	7.19 (Berkeley) 5/25/91
- *	$Id: ip_input.c,v 1.11 1994/02/02 05:59:04 hpeyerl Exp $
+ *	$Id: ip_input.c,v 1.12 1994/02/14 21:45:53 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -148,7 +148,7 @@ ipintr()
 	register struct ipq *fp;
 	register struct in_ifaddr *ia;
 	int hlen, s;
-#ifdef PARANOID
+#ifdef DIAGNOSTIC
 	static int busy = 0;
 
 	if (busy)
@@ -164,7 +164,7 @@ next:
 	IF_DEQUEUE(&ipintrq, m);
 	splx(s);
 	if (m == 0) {
-#ifdef PARANOID
+#ifdef DIAGNOSTIC
 		--busy;
 #endif
 		return;
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 66edb046f2dc..d7f5ee27de2a 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,6 +1,6 @@
 /*
  * Written by Julian Elischer (julian@dialix.oz.au)
- *      $Id: scsi_base.c,v 1.6 1994/02/01 20:05:19 mycroft Exp $
+ *      $Id: scsi_base.c,v 1.7 1994/02/14 21:44:13 mycroft Exp $
  */
 
 #include <sys/types.h>
@@ -399,10 +399,10 @@ scsi_scsi_cmd(sc_link, scsi_cmd, cmdlen, data_addr, datalen,
 	}
 retry:
 	xs->error = XS_NOERROR;
-#ifdef	PARANOID
+#ifdef	DIAGNOSTIC
 	if (datalen && ((caddr_t) xs->data < (caddr_t) KERNBASE))
 		printf("It's still wrong!\n");
-#endif	/*PARANOID*/
+#endif	/* DIAGNOSTIC */
 #ifdef	SCSIDEBUG
 	if (sc_link->flags & SDEV_DB3)
 		show_scsi_xs(xs);
diff --git a/sys/ufs/ufs_lookup.c b/sys/ufs/ufs_lookup.c
index 0130e1a55e5f..b513f38ec239 100644
--- a/sys/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs_lookup.c
@@ -1 +1 @@
-revision 1.5 intentionally removed
+revision 1.6 intentionally removed