diff --git a/doc/guides/dts/flash_partitions.inc b/doc/guides/dts/flash_partitions.inc
index eb2c10397a8..11892f29b57 100644
--- a/doc/guides/dts/flash_partitions.inc
+++ b/doc/guides/dts/flash_partitions.inc
@@ -228,4 +228,4 @@ File System Partitions
 ======================
 
 **storage_partition**
-  This is the area where e.g. NFFS expects its partition.
+  This is the area where e.g. LittleFS or NVS or FCB expects its partition.
diff --git a/doc/introduction/index.rst b/doc/introduction/index.rst
index 1a10a00643e..62d5249d8d2 100644
--- a/doc/introduction/index.rst
+++ b/doc/introduction/index.rst
@@ -135,8 +135,8 @@ Zephyr offers a large and ever growing number of features including:
    systems. A native POSIX port, lets you build and run Zephyr as a native
    application on Linux and other OSes, aiding development and testing.
 
-**Virtual File System Interface with NFFS and FATFS Support**
-   Newtron Flash Filesystem (NFFS) and FATFS Support,
+**Virtual File System Interface with LittleFS and FATFS Support**
+   LittleFS and FATFS Support,
    FCB (Flash Circular Buffer) for memory constrained applications, and
    file system enhancements for logging and configuration.
 
diff --git a/doc/reference/file_system/index.rst b/doc/reference/file_system/index.rst
index fb81ed429cd..fe33bef163e 100644
--- a/doc/reference/file_system/index.rst
+++ b/doc/reference/file_system/index.rst
@@ -4,7 +4,7 @@ File Systems
 ############
 
 Zephyr RTOS Virtual Filesystem Switch (VFS) allows applications to mount multiple
-file systems at different mount points (e.g., ``/fatfs`` and ``/nffs``). The
+file systems at different mount points (e.g., ``/fatfs`` and ``/lfs``). The
 mount point data structure contains all the necessary information required
 to instantiate, mount, and operate on a file system. The File system Switch
 decouples the applications from directly accessing an individual file system's
@@ -36,15 +36,10 @@ A file system is declared as:
 
 where
 
-- ``FS_FATFS`` is the file system type like FATFS or NFFS.
+- ``FS_FATFS`` is the file system type like FATFS or LittleFS.
 - ``FATFS_MNTP`` is the mount point where the file system will be mounted.
 - ``fat_fs`` is the file system data which will be used by fs_mount() API.
 
-Known Limitations
-*****************
-
-NFFS supports only one instance of file system due to the library's internal
-implementation limitation.
 
 
 Sample
diff --git a/drivers/flash/Kconfig.sam0 b/drivers/flash/Kconfig.sam0
index 1720fefb75b..8c49d16c195 100644
--- a/drivers/flash/Kconfig.sam0
+++ b/drivers/flash/Kconfig.sam0
@@ -18,6 +18,6 @@ config SOC_FLASH_SAM0_EMULATE_BYTE_PAGES
 	depends on SOC_FLASH_SAM0
 	help
 	  Emulate a device with byte-sized pages by doing a
-	  read/modify/erase/write.  Needed for NFFS.
+	  read/modify/erase/write.
 
 endif
diff --git a/include/settings/settings.h b/include/settings/settings.h
index 4260e43b494..091f90c2f46 100644
--- a/include/settings/settings.h
+++ b/include/settings/settings.h
@@ -191,7 +191,7 @@ struct settings_handler_static {
  * Initialization of settings and backend
  *
  * Can be called at application startup.
- * In case the backend is NFFS Remember to call it after FS was mounted.
+ * In case the backend is a FS Remember to call it after the FS was mounted.
  * For FCB backend it can be called without such a restriction.
  *
  * @return 0 on success, non-zero on failure.