9 files changed, 9 insertions, 9 deletions

diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 023e41dc5d77a..41fe0bf58e3f4 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -73,7 +73,7 @@ static void btrim(int8_t *, int);
 static void bpack(int8_t *, int8_t *, int);
 
 /* global vars */
-MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer");
+MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer");
 int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL;
 devclass_t ata_devclass;
 uma_zone_t ata_request_zone;
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 1a79dc1cbb184..a71c0dbe9059b 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -65,7 +65,7 @@ static disk_ioctl_t ad_ioctl;
 static dumper_t ad_dump;
 
 /* local vars */
-static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver");
+static MALLOC_DEFINE(M_AD, "ad_driver", "ATA disk driver");
 
 static int
 ad_probe(device_t dev)
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 4032a48f6fc2b..2526fcc790f94 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -54,7 +54,7 @@ static int ata_dmaload(device_t, caddr_t, int32_t, int, void *, int *);
 static int ata_dmaunload(device_t);
 
 /* local vars */
-static MALLOC_DEFINE(M_ATADMA, "ATA DMA", "ATA driver DMA");
+static MALLOC_DEFINE(M_ATADMA, "ata_dma", "ATA driver DMA");
 
 /* misc defines */
 #define MAXTABSZ        PAGE_SIZE
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 43a0a0a3f29ac..7eb356d21beeb 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <ata_if.h>
 
 /* local vars */
-static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI");
+static MALLOC_DEFINE(M_ATAPCI, "ata_pci", "ATA driver PCI");
 
 /* misc defines */
 #define IOMASK                  0xfffffffc
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index d9ac7c098398f..369ba94a306a0 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -101,7 +101,7 @@ static void ata_raid_via_print_meta(struct via_raid_conf *meta);
 
 /* internal vars */   
 static struct ar_softc *ata_raid_arrays[MAX_ARRAYS];
-static MALLOC_DEFINE(M_AR, "AR driver", "ATA PseudoRAID driver");
+static MALLOC_DEFINE(M_AR, "ar_driver", "ATA PseudoRAID driver");
 static devclass_t ata_raid_sub_devclass;
 static int testing = 0;
 
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index 34938373a73db..386de14ec7d93 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -115,7 +115,7 @@ static struct atapi_hcb *allocate_hcb(struct atapi_xpt_softc *, int, int, union
 static void free_hcb(struct atapi_hcb *hcb);
 static void free_softc(struct atapi_xpt_softc *scp);
 
-static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer");
+static MALLOC_DEFINE(M_ATACAM, "ata_cam", "ATA driver CAM-XPT layer");
 
 static device_method_t atapi_cam_methods[] = {
 	DEVMETHOD(device_identify,      atapi_cam_identify),
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index f2618fd272d5b..c33b2349bd736 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -94,7 +94,7 @@ static int acd_format(device_t, struct cdr_format_params *);
 static int acd_test_ready(device_t);
 
 /* internal vars */
-static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers");
+static MALLOC_DEFINE(M_ACD, "acd_driver", "ATAPI CD driver buffers");
 static struct g_class acd_class = {
 	.name = "ACD",
 	.version = G_VERSION,
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 00c53ac39d5f4..c9b35227625d0 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -61,7 +61,7 @@ static int afd_prevent_allow(device_t, int);
 static int afd_test_ready(device_t);
 
 /* internal vars */
-static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers");
+static MALLOC_DEFINE(M_AFD, "afd_driver", "ATAPI floppy driver buffers");
 
 static int 
 afd_probe(device_t dev)
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index b06ce47dea945..780f93d1e7c10 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -85,7 +85,7 @@ static int ast_wait_dsc(device_t, int);
 
 /* internal vars */
 static u_int64_t ast_total = 0;
-static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers");
+static MALLOC_DEFINE(M_AST, "ast_driver", "ATAPI tape driver buffers");
 
 static int
 ast_probe(device_t dev)