diff --git a/samples/subsys/fs/littlefs/src/main.c b/samples/subsys/fs/littlefs/src/main.c
index 83ffdae9255..e89075cfc25 100644
--- a/samples/subsys/fs/littlefs/src/main.c
+++ b/samples/subsys/fs/littlefs/src/main.c
@@ -247,7 +247,7 @@ static int littlefs_flash_erase(unsigned int id)
 	}
 
 	LOG_PRINTK("Area %u at 0x%x on %s for %u bytes\n",
-		   id, (unsigned int)pfa->fa_off, pfa->fa_dev_name,
+		   id, (unsigned int)pfa->fa_off, pfa->fa_dev->name,
 		   (unsigned int)pfa->fa_size);
 
 	/* Optional wipe flash contents */
diff --git a/samples/subsys/usb/mass/src/main.c b/samples/subsys/usb/mass/src/main.c
index edda42cd708..b43fe2e2df4 100644
--- a/samples/subsys/usb/mass/src/main.c
+++ b/samples/subsys/usb/mass/src/main.c
@@ -40,7 +40,7 @@ static int setup_flash(struct fs_mount_t *mnt)
 
 	rc = flash_area_open(id, &pfa);
 	printk("Area %u at 0x%x on %s for %u bytes\n",
-	       id, (unsigned int)pfa->fa_off, pfa->fa_dev_name,
+	       id, (unsigned int)pfa->fa_off, pfa->fa_dev->name,
 	       (unsigned int)pfa->fa_size);
 
 	if (rc < 0 && IS_ENABLED(CONFIG_APP_WIPE_STORAGE)) {
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index d6de2a4c125..eba34b6abf4 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -640,7 +640,7 @@ static int littlefs_flash_init(struct fs_mount_t *mountp)
 	dev = flash_area_get_device(*fap);
 	if (dev == NULL) {
 		LOG_ERR("can't get flash device: %s",
-			(*fap)->fa_dev_name);
+			(*fap)->fa_dev->name);
 		return -ENODEV;
 	}
 
diff --git a/subsys/settings/src/settings_nvs.c b/subsys/settings/src/settings_nvs.c
index c87b32e5c88..42abd8dea39 100644
--- a/subsys/settings/src/settings_nvs.c
+++ b/subsys/settings/src/settings_nvs.c
@@ -315,7 +315,7 @@ int settings_backend_init(void)
 	default_settings_nvs.cf_nvs.sector_size = nvs_sector_size;
 	default_settings_nvs.cf_nvs.sector_count = cnt;
 	default_settings_nvs.cf_nvs.offset = fa->fa_off;
-	default_settings_nvs.flash_dev_name = fa->fa_dev_name;
+	default_settings_nvs.flash_dev_name = fa->fa_dev->name;
 
 	rc = settings_nvs_backend_init(&default_settings_nvs);
 	if (rc) {
diff --git a/subsys/storage/flash_map/flash_map_shell.c b/subsys/storage/flash_map/flash_map_shell.c
index cf4fe05ec7e..95ffd453e78 100644
--- a/subsys/storage/flash_map/flash_map_shell.c
+++ b/subsys/storage/flash_map/flash_map_shell.c
@@ -24,7 +24,7 @@ static void fa_cb(const struct flash_area *fa, void *user_data)
 	struct shell *shell = user_data;
 
 	shell_print(shell, "%-4d %-8d %-20s  0x%-10x 0x%-12x",
-		    fa->fa_id, fa->fa_device_id, fa->fa_dev_name,
+		    fa->fa_id, fa->fa_device_id, fa->fa_dev->name,
 		    fa->fa_off, fa->fa_size);
 }