Index: amd64/acpica/madt.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/amd64/acpica/madt.c,v
retrieving revision 1.16
diff -u -r1.16 madt.c
--- amd64/acpica/madt.c	15 Apr 2005 18:44:53 -0000	1.16
+++ amd64/acpica/madt.c	17 Jul 2005 20:30:21 -0000
@@ -74,7 +74,7 @@
 static vm_paddr_t madt_physaddr;
 static vm_offset_t madt_length;
 
-MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items");
+MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items");
 
 static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source);
 static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source);
Index: amd64/amd64/io_apic.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/amd64/amd64/io_apic.c,v
retrieving revision 1.15
diff -u -r1.15 io_apic.c
--- amd64/amd64/io_apic.c	15 Apr 2005 18:44:53 -0000	1.15
+++ amd64/amd64/io_apic.c	17 Jul 2005 20:30:53 -0000
@@ -64,7 +64,7 @@
 
 #define	TODO		printf("%s: not implemented!\n", __func__)
 
-static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures");
+static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures");
 
 /*
  * New interrupt support code..
Index: amd64/amd64/mptable.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/amd64/amd64/mptable.c,v
retrieving revision 1.236
diff -u -r1.236 mptable.c
--- amd64/amd64/mptable.c	15 Apr 2005 18:44:53 -0000	1.236
+++ amd64/amd64/mptable.c	17 Jul 2005 20:31:23 -0000
@@ -141,7 +141,7 @@
 static int mptable_nioapics, mptable_nbusses, mptable_maxbusid;
 static int pci0 = -1;
 
-static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items");
+static MALLOC_DEFINE(M_MPTABLE, "mp_table", "MP Table Items");
 
 static enum intr_polarity conforming_polarity(u_char src_bus,
 	    u_char src_bus_irq);
Index: arm/arm/vm_machdep.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/arm/arm/vm_machdep.c,v
retrieving revision 1.17
diff -u -r1.17 vm_machdep.c
--- arm/arm/vm_machdep.c	10 Jul 2005 23:31:10 -0000	1.17
+++ arm/arm/vm_machdep.c	17 Jul 2005 20:32:00 -0000
@@ -378,7 +378,7 @@
 
 struct mtx smallalloc_mtx;
 
-MALLOC_DEFINE(M_VMSMALLALLOC, "VM Small alloc", "VM Small alloc data");
+MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data");
 
 vm_offset_t alloc_curaddr;
 vm_offset_t alloc_firstaddr;
Index: cam/cam_periph.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/cam_periph.c,v
retrieving revision 1.60
diff -u -r1.60 cam_periph.c
--- cam/cam_periph.c	1 Jul 2005 15:21:29 -0000	1.60
+++ cam/cam_periph.c	17 Jul 2005 20:06:31 -0000
@@ -84,7 +84,7 @@
 static int nperiph_drivers;
 struct periph_driver **periph_drivers;
 
-MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers");
+MALLOC_DEFINE(M_CAMPERIPH, "cam_periph", "CAM peripheral buffers");
 
 void
 periphdriver_register(void *data)
Index: cam/cam_queue.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/cam_queue.c,v
retrieving revision 1.9
diff -u -r1.9 cam_queue.c
--- cam/cam_queue.c	1 Jul 2005 15:21:29 -0000	1.9
+++ cam/cam_queue.c	17 Jul 2005 20:07:15 -0000
@@ -40,9 +40,9 @@
 #include <cam/cam_queue.h>
 #include <cam/cam_debug.h>
 
-MALLOC_DEFINE(M_CAMQ, "CAM queue", "CAM queue buffers");
-MALLOC_DEFINE(M_CAMDEVQ, "CAM dev queue", "CAM dev queue buffers");
-MALLOC_DEFINE(M_CAMCCBQ, "CAM ccb queue", "CAM ccb queue buffers");
+MALLOC_DEFINE(M_CAMQ, "cam_queue", "CAM queue buffers");
+MALLOC_DEFINE(M_CAMDEVQ, "cam_dev_queue", "CAM dev queue buffers");
+MALLOC_DEFINE(M_CAMCCBQ, "cam_ccb_queue", "CAM ccb queue buffers");
 
 static __inline int
 		queue_cmp(cam_pinfo **queue_array, int i, int j);
Index: cam/cam_sim.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/cam_sim.c,v
retrieving revision 1.9
diff -u -r1.9 cam_sim.c
--- cam/cam_sim.c	1 Jul 2005 15:21:29 -0000	1.9
+++ cam/cam_sim.c	17 Jul 2005 20:07:37 -0000
@@ -41,7 +41,7 @@
 
 #define CAM_PATH_ANY (u_int32_t)-1
 
-MALLOC_DEFINE(M_CAMSIM, "CAM SIM", "CAM SIM buffers");
+MALLOC_DEFINE(M_CAMSIM, "cam_sim", "CAM SIM buffers");
 
 struct cam_devq *
 cam_simq_alloc(u_int32_t max_sim_transactions)
Index: cam/cam_xpt.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/cam_xpt.c,v
retrieving revision 1.155
diff -u -r1.155 cam_xpt.c
--- cam/cam_xpt.c	1 Jul 2005 15:21:29 -0000	1.155
+++ cam/cam_xpt.c	17 Jul 2005 20:07:49 -0000
@@ -65,7 +65,7 @@
 #include "opt_cam.h"
 
 /* Datastructures internal to the xpt layer */
-MALLOC_DEFINE(M_CAMXPT, "CAM XPT", "CAM XPT buffers");
+MALLOC_DEFINE(M_CAMXPT, "cam_xpt", "CAM XPT buffers");
 
 /*
  * Definition of an async handler callback block.  These are used to add
Index: cam/scsi/scsi_low.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/scsi/scsi_low.c,v
retrieving revision 1.24
diff -u -r1.24 scsi_low.c
--- cam/scsi/scsi_low.c	1 Jul 2005 15:21:30 -0000	1.24
+++ cam/scsi/scsi_low.c	17 Jul 2005 20:34:04 -0000
@@ -145,7 +145,7 @@
 #define	SCSI_LOW_DISK_LFLAGS	0x0000ffff
 #define	SCSI_LOW_DISK_TFLAGS	0xffff0000
 
-MALLOC_DEFINE(M_SCSILOW, "SCSI low", "SCSI low buffers");
+MALLOC_DEFINE(M_SCSILOW, "scsi_low", "SCSI low buffers");
 
 /**************************************************************
  * Declarations
Index: cam/scsi/scsi_sa.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/cam/scsi/scsi_sa.c,v
retrieving revision 1.105
diff -u -r1.105 scsi_sa.c
--- cam/scsi/scsi_sa.c	1 Jul 2005 15:21:30 -0000	1.105
+++ cam/scsi/scsi_sa.c	17 Jul 2005 20:34:16 -0000
@@ -101,7 +101,7 @@
  * Driver states
  */
 
-MALLOC_DEFINE(M_SCSISA, "SCSI sa", "SCSI sequential access buffers");
+MALLOC_DEFINE(M_SCSISA, "scsi_sa", "SCSI sequential access buffers");
 
 typedef enum {
 	SA_STATE_NORMAL, SA_STATE_ABNORMAL
Index: coda/coda_vfsops.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/coda/coda_vfsops.c,v
retrieving revision 1.59
diff -u -r1.59 coda_vfsops.c
--- coda/coda_vfsops.c	24 Mar 2005 07:39:03 -0000	1.59
+++ coda/coda_vfsops.c	17 Jul 2005 20:29:16 -0000
@@ -60,7 +60,7 @@
 #include <coda/coda_subr.h>
 #include <coda/coda_opstats.h>
 
-MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures");
+MALLOC_DEFINE(M_CODA, "coda_storage", "Various Coda Structures");
 
 int codadebug = 0;
 int coda_vfsop_print_entry = 0;
Index: ufs/ufs/ufs_dirhash.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/ufs/ufs/ufs_dirhash.c,v
retrieving revision 1.21
diff -u -r1.21 ufs_dirhash.c
--- ufs/ufs/ufs_dirhash.c	10 Feb 2005 12:20:08 -0000	1.21
+++ ufs/ufs/ufs_dirhash.c	17 Jul 2005 20:01:50 -0000
@@ -62,7 +62,7 @@
 #define OFSFMT(vp)		((vp)->v_mount->mnt_maxsymlinklen <= 0)
 #define BLKFREE2IDX(n)		((n) > DH_NFSTATS ? DH_NFSTATS : (n))
 
-static MALLOC_DEFINE(M_DIRHASH, "UFS dirhash", "UFS directory hash tables");
+static MALLOC_DEFINE(M_DIRHASH, "ufs_dirhash", "UFS directory hash tables");
 
 static SYSCTL_NODE(_vfs, OID_AUTO, ufs, CTLFLAG_RD, 0, "UFS filesystem");
 
Index: ufs/ufs/ufs_quota.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/ufs/ufs/ufs_quota.c,v
retrieving revision 1.74
diff -u -r1.74 ufs_quota.c
--- ufs/ufs/ufs_quota.c	7 Jan 2005 02:29:26 -0000	1.74
+++ ufs/ufs/ufs_quota.c	17 Jul 2005 20:02:16 -0000
@@ -62,7 +62,7 @@
     &unprivileged_get_quota, 0,
     "Unprivileged processes may retrieve quotas for other uids and gids");
 
-static MALLOC_DEFINE(M_DQUOT, "UFS quota", "UFS quota entries");
+static MALLOC_DEFINE(M_DQUOT, "ufs_quota", "UFS quota entries");
 
 /*
  * Quota name to error message mapping.
Index: ufs/ufs/ufs_vfsops.c
===================================================================
RCS file: /home/cvs/fbsd/src/sys/ufs/ufs/ufs_vfsops.c,v
retrieving revision 1.45
diff -u -r1.45 ufs_vfsops.c
--- ufs/ufs/ufs_vfsops.c	24 Mar 2005 07:32:50 -0000	1.45
+++ ufs/ufs/ufs_vfsops.c	17 Jul 2005 19:54:15 -0000
@@ -60,7 +60,7 @@
 #include <ufs/ufs/dirhash.h>
 #endif
 
-MALLOC_DEFINE(M_UFSMNT, "UFS mount", "UFS mount structure");
+MALLOC_DEFINE(M_UFSMNT, "ufs_mount", "UFS mount structure");
 
 /*
  * Return the root of a filesystem.