diff --git a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
index da7fad430e1..4da3c1a326f 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c
@@ -48,7 +48,7 @@
 #define CXD56CPU1_CPUID          1
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct cxd56_sigtype_s
diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c
index ebc2ae20de4..ab7514616ed 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapi.c
+++ b/arch/arm/src/cxd56xx/cxd56_farapi.c
@@ -57,7 +57,7 @@ int fw_pm_wakeupcpu(int cpuid);
 #define CPU_ID (CXD56_CPU_BASE + 0x40)
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 typedef int farapicallback(void *data);
diff --git a/arch/arm/src/mx8mp/mx8mp_gpio.c b/arch/arm/src/mx8mp/mx8mp_gpio.c
index a48d1cdcee9..e92a57f9a12 100644
--- a/arch/arm/src/mx8mp/mx8mp_gpio.c
+++ b/arch/arm/src/mx8mp/mx8mp_gpio.c
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 /* GPIO context for IRQ management */
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
index 3922ab9becc..6bccbab966a 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
@@ -61,7 +61,7 @@
   (((VOL_TO_REG(vol) - MUTE_VOL_REG) & 0xff) * (n_cycle + 1) * 4 / 48 * 1000)
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct set_vol_prm_s
diff --git a/fs/binfs/fs_binfs.c b/fs/binfs/fs_binfs.c
index 2d02569648d..8ec7226b511 100644
--- a/fs/binfs/fs_binfs.c
+++ b/fs/binfs/fs_binfs.c
@@ -45,7 +45,7 @@
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_BINFS)
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct binfs_dir_s
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index 366208b77d0..49b5414bc87 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -102,7 +102,7 @@
 #define CH_STAT_SIZE            (1 << 7)
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct nfs_dir_s
diff --git a/fs/nxffs/nxffs_dirent.c b/fs/nxffs/nxffs_dirent.c
index 64cd5931525..cc3c1ac0565 100644
--- a/fs/nxffs/nxffs_dirent.c
+++ b/fs/nxffs/nxffs_dirent.c
@@ -37,7 +37,7 @@
 #include "nxffs.h"
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct nxffs_dir_s
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index d03c88b8d47..48d60a0e3ba 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -44,7 +44,7 @@
 #include "fs_romfs.h"
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 /* This structure represents one entry node in the romfs file system */
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index a8ee87d61f1..b0ec7ac2a19 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -47,7 +47,7 @@
 #include "smartfs.h"
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct smartfs_dir_s
diff --git a/fs/spiffs/src/spiffs_vfs.c b/fs/spiffs/src/spiffs_vfs.c
index bb32695cdf2..449a038a724 100644
--- a/fs/spiffs/src/spiffs_vfs.c
+++ b/fs/spiffs/src/spiffs_vfs.c
@@ -74,7 +74,7 @@
 #define spiffs_unlock_volume(fs)     (nxrmutex_unlock(&fs->lock))
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct spiffs_dir_s
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 01fae27f5ac..f465cd529d2 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -71,7 +71,7 @@
            nxrmutex_unlock(&tdo->tdo_lock)
 
 /****************************************************************************
- * Private Type
+ * Private Types
  ****************************************************************************/
 
 struct tmpfs_dir_s