diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 17347321823f..ea4f23f4b9b2 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id$
+ * $Id: ffs_alloc.c,v 1.30 1997/02/22 09:47:00 peter Exp $
  */
 
 #include "opt_quota.h"
@@ -228,7 +228,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
 	bno = ffs_fragextend(ip, cg, (long)bprev, osize, nsize);
 	if (bno) {
 		if (bp->b_blkno != fsbtodb(fs, bno))
-			panic("bad blockno");
+			panic("ffs_realloccg: bad blockno");
 		ip->i_blocks += btodb(nsize - osize);
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
 		allocbuf(bp, nsize);
@@ -1271,7 +1271,7 @@ ffs_blkfree(ip, bno, size)
 	if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) {
 		printf("dev = 0x%lx, bsize = %ld, size = %ld, fs = %s\n",
 		    (u_long)ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
-		panic("blkfree: bad size");
+		panic("ffs_blkfree: bad size");
 	}
 	cg = dtog(fs, bno);
 	if ((u_int)bno >= fs->fs_size) {
@@ -1297,7 +1297,7 @@ ffs_blkfree(ip, bno, size)
 		if (ffs_isblock(fs, cg_blksfree(cgp), blkno)) {
 			printf("dev = 0x%lx, block = %ld, fs = %s\n",
 			    (u_long) ip->i_dev, bno, fs->fs_fsmnt);
-			panic("blkfree: freeing free block");
+			panic("ffs_blkfree: freeing free block");
 		}
 		ffs_setblock(fs, cg_blksfree(cgp), blkno);
 		ffs_clusteracct(fs, cgp, blkno, 1);
@@ -1322,7 +1322,7 @@ ffs_blkfree(ip, bno, size)
 			if (isset(cg_blksfree(cgp), bno + i)) {
 				printf("dev = 0x%lx, block = %ld, fs = %s\n",
 				    (u_long) ip->i_dev, bno + i, fs->fs_fsmnt);
-				panic("blkfree: freeing free frag");
+				panic("ffs_blkfree: freeing free frag");
 			}
 			setbit(cg_blksfree(cgp), bno + i);
 		}
@@ -1425,7 +1425,7 @@ ffs_vfree(ap)
 	pip = VTOI(ap->a_pvp);
 	fs = pip->i_fs;
 	if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
-		panic("ifree: range: dev = 0x%x, ino = %d, fs = %s",
+		panic("ffs_vfree: range: dev = 0x%x, ino = %d, fs = %s",
 		    pip->i_dev, ino, fs->fs_fsmnt);
 	cg = ino_to_cg(fs, ino);
 	error = bread(pip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
@@ -1445,7 +1445,7 @@ ffs_vfree(ap)
 		printf("dev = 0x%lx, ino = %ld, fs = %s\n",
 		    (u_long)pip->i_dev, ino, fs->fs_fsmnt);
 		if (fs->fs_ronly == 0)
-			panic("ifree: freeing free inode");
+			panic("ffs_vfree: freeing free inode");
 	}
 	clrbit(cg_inosused(cgp), ino);
 	if (ino < cgp->cg_irotor)
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index e211797856e8..1387b2059a41 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $Id$
+ * $Id: ffs_subr.c,v 1.11 1997/02/22 09:47:04 peter Exp $
  */
 
 #include <sys/param.h>
@@ -154,7 +154,7 @@ ffs_checkoverlap(bp, ip)
 		(void)printf("\tstart %lu, end %lu overlap start %lu, end %lu\n",
 			(u_long)start, (u_long)last, (u_long)ep->b_blkno,
 			(u_long)(ep->b_blkno + btodb(ep->b_bcount) - 1));
-		panic("Disk buffer overlap");
+		panic("ffs_checkoverlap: Disk buffer overlap");
 	}
 }
 #endif /* DIAGNOSTIC */
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 8b86e71271f7..eded9689980a 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id$
+ * $Id: ffs_vfsops.c,v 1.45 1997/02/22 09:47:08 peter Exp $
  */
 
 #include "opt_quota.h"
@@ -818,7 +818,7 @@ ffs_sync(mp, waitfor, cred, p)
 	fs = ump->um_fs;
 	if (fs->fs_fmod != 0 && fs->fs_ronly != 0) {		/* XXX */
 		printf("fs = %s\n", fs->fs_fsmnt);
-		panic("update: rofs mod");
+		panic("ffs_sync: rofs mod");
 	}
 	/*
 	 * Write back each (modified) inode.