diff --git a/base/scripts/mount.tb b/base/scripts/mount.tb
index 535d4a3..c2ed8a8 100644
--- a/base/scripts/mount.tb
+++ b/base/scripts/mount.tb
@@ -1,6 +1,6 @@
 print 'Mounting filesystems...\n'
 setlogcmds yes
 
-#         MOUNTPOINT FILESYSTEM  DEVICE NAME            DO FORMATTING
+#         MOUNTPOINT FILESYSTEM  DEVICE NAME    DO FORMATTING
 
-$fs mount -mp uhome -fs LittleFS -dev atasd-ch0-M-part2 -fmt no
+$fs mount -mp uhome -fs LittleFS -dev atasd0mp2 -fmt no
diff --git a/kernel/diskpart/mbr.c b/kernel/diskpart/mbr.c
index a07a1de..dd5d9c7 100644
--- a/kernel/diskpart/mbr.c
+++ b/kernel/diskpart/mbr.c
@@ -52,7 +52,7 @@ void diskpart_mbr_expose_partitions(StoreDev *sd, MBR *mbr) {
     };
 
     char name1[100];
-    ksprintf(name1, "%s-part%zu", name, i+1);
+    ksprintf(name1, "%sp%zu", name, i+1);
     kprintf("%s\n", name1);
     storedev_create(STOREDEV_PARTSD, name1, &extra);
   }
diff --git a/kernel/storedev/atasd.c b/kernel/storedev/atasd.c
index fa37e61..24c1489 100644
--- a/kernel/storedev/atasd.c
+++ b/kernel/storedev/atasd.c
@@ -121,7 +121,7 @@ void ata_probe(void) {
       .iobase = 0x1F0,
       .ctrlbase = 0x3F6,
     };
-    storedev_create(STOREDEV_ATASD, "atasd-ch0-M", (void *)&extra);
+    storedev_create(STOREDEV_ATASD, "atasd0m", (void *)&extra);
   }
 
   probesize = ata_probesize_bytes(0x1F0, 0x3F6, ATA_SLAVE);
@@ -135,7 +135,7 @@ void ata_probe(void) {
       .iobase = 0x1F0,
       .ctrlbase = 0x3F6,
     };
-    storedev_create(STOREDEV_ATASD, "atasd-ch0-S", (void *)&extra);
+    storedev_create(STOREDEV_ATASD, "atasd0s", (void *)&extra);
   }
   
   probesize = ata_probesize_bytes(0x170, 0x376, ATA_MASTER);
@@ -149,7 +149,7 @@ void ata_probe(void) {
       .iobase = 0x170,
       .ctrlbase = 0x376,
     };
-    storedev_create(STOREDEV_ATASD, "atasd-ch1-M", (void *)&extra);
+    storedev_create(STOREDEV_ATASD, "atasd1m", (void *)&extra);
   }
 
   probesize = ata_probesize_bytes(0x170, 0x376, ATA_SLAVE);
@@ -163,7 +163,7 @@ void ata_probe(void) {
       .iobase = 0x170,
       .ctrlbase = 0x376,
     };
-    storedev_create(STOREDEV_ATASD, "atasd-ch1-S", (void *)&extra);
+    storedev_create(STOREDEV_ATASD, "atasd1s", (void *)&extra);
   }
 }
 
diff --git a/kernel/vfs/vfs.c b/kernel/vfs/vfs.c
index 3e31c9c..69c26ea 100644
--- a/kernel/vfs/vfs.c
+++ b/kernel/vfs/vfs.c
@@ -230,7 +230,7 @@ void vfs_init(void) {
 
   {
     RamSdInitExtra extra = { .capacity = baseimg_getsize(), .preallocbuffer = (uint8_t *)baseimg_getaddr() };
-    StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd-0", &extra);
+    StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd0", &extra);
     if (backingsd == NULL) {
       return;
     }
@@ -239,7 +239,7 @@ void vfs_init(void) {
 
   {
     RamSdInitExtra extra = { .capacity = (1024*1024*10) };
-    StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd-1", &extra);
+    StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd1", &extra);
     if (backingsd == NULL) {
       return;
     }