diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c
index 65f92f751f6..78fe70bd7f6 100644
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@@ -87,7 +87,7 @@ static int load_default_priority(FAR struct binary_s *bin)
  * Name: load_absmodule
  *
  * Description:
- *   Load a module into memory, bind it to an exported symbol take, and
+ *   Load a module into memory, bind it to an exported symbol table, and
  *   prep the module for execution.  filename is known to be an absolute
  *   path to the file to be loaded.
  *
@@ -140,7 +140,7 @@ static int load_absmodule(FAR struct binary_s *bin, FAR const char *filename,
  * Name: load_module
  *
  * Description:
- *   Load a module into memory, bind it to an exported symbol take, and
+ *   Load a module into memory, bind it to an exported symbol table, and
  *   prep the module for execution.
  *
  * Returned Value:
diff --git a/include/nuttx/addrenv.h b/include/nuttx/addrenv.h
index 686723255eb..97160ca07e6 100644
--- a/include/nuttx/addrenv.h
+++ b/include/nuttx/addrenv.h
@@ -280,7 +280,7 @@ typedef CODE void (*addrenv_sigtramp_t)(_sa_sigaction_t sighand, int signo,
                                         FAR siginfo_t *info,
                                         FAR void *ucontext);
 
-struct mm_heaps_s; /* Forward reference */
+struct mm_heap_s; /* Forward reference */
 
 /* This structure describes the format of the .bss/.data reserved area */
 
diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h
index 657fe68aab1..506f8dbea32 100644
--- a/include/nuttx/userspace.h
+++ b/include/nuttx/userspace.h
@@ -75,7 +75,7 @@
  * Public Type Definitions
  ****************************************************************************/
 
-struct mm_heaps_s; /* Forward reference */
+struct mm_heap_s; /* Forward reference */
 
 /* Every user-space blob starts with a header that provides information about
  * the blob.  The form of that header is provided by struct userspace_s. An