Index: src/sys/nfsserver/nfs_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_syscalls.c,v
retrieving revision 1.110
diff -u -r1.110 nfs_syscalls.c
--- src/sys/nfsserver/nfs_syscalls.c	4 Mar 2007 22:36:47 -0000	1.110
+++ src/sys/nfsserver/nfs_syscalls.c	5 Mar 2007 00:01:10 -0000
@@ -76,11 +76,10 @@
 
 #include <security/mac/mac_framework.h>
 
-static MALLOC_DEFINE(M_NFSSVC, "nfsserver_srvsock", "Nfs server structure");
-
-MALLOC_DEFINE(M_NFSRVDESC, "nfsserver_srvdesc", "NFS server socket descriptor");
-MALLOC_DEFINE(M_NFSD, "nfsserver_daemon", "Nfs server daemon structure");
+static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure");
 
+MALLOC_DEFINE(M_NFSRVDESC, "nfss_srvdesc", "NFS server socket descriptor");
+MALLOC_DEFINE(M_NFSD, "nfss_daemon", "Nfs server daemon structure");
 
 #define	TRUE	1
 #define	FALSE	0
Index: src/sys/kern/vfs_cluster.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/vfs_cluster.c,v
retrieving revision 1.174
diff -u -r1.174 vfs_cluster.c
--- src/sys/kern/vfs_cluster.c	22 Oct 2006 04:28:13 -0000	1.174
+++ src/sys/kern/vfs_cluster.c	5 Mar 2007 00:01:11 -0000
@@ -58,7 +58,7 @@
     "Debug VFS clustering code");
 #endif
 
-static MALLOC_DEFINE(M_SEGMENT, "cluster_save_buffer", "cluster_save buffer");
+static MALLOC_DEFINE(M_SEGMENT, "cl_savebuf", "cluster_save buffer");
 
 static struct cluster_save *
 	cluster_collectbufs(struct vnode *vp, struct buf *last_bp);