diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 40239fe15d..8fea59243a 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -13,7 +13,7 @@ Contents
   o Development Environment
   o GNU Toolchain Options
 
-Kinetis TWR-K60N512 Features:
+Kinetis Freedom K64F Features:
 =============================
 
   The features of the FRDM-K64F hardware are as follows:
@@ -247,8 +247,8 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_UART3    -- Support UART3
     CONFIG_KINETIS_UART4    -- Support UART4
     CONFIG_KINETIS_UART5    -- Support UART5
-    CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
-    CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
+    CONFIG_KINETIS_ENET     -- Support Ethernet (K5x, K6x, and K7x only)
+    CONFIG_KINETIS_RNGB     -- Support the random number generator(K6x only)
     CONFIG_KINETIS_FLEXCAN0 -- Support FlexCAN0
     CONFIG_KINETIS_FLEXCAN1 -- Support FlexCAN1
     CONFIG_KINETIS_SPI0     -- Support SPI0
@@ -269,7 +269,7 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_FTM2     -- Support FlexTimer 2
     CONFIG_KINETIS_LPTIMER  -- Support the low power timer
     CONFIG_KINETIS_RTC      -- Support RTC
-    CONFIG_KINETIS_SLCD     -- Support the segment LCD (K60 only)
+    CONFIG_KINETIS_SLCD     -- Support the segment LCD (K3x, K4x, and K5x only)
     CONFIG_KINETIS_EWM      -- Support the external watchdog
     CONFIG_KINETIS_CMT      -- Support Carrier Modulator Transmitter
     CONFIG_KINETIS_USBOTG   -- Support USB OTG (see also CONFIG_USBHOST and CONFIG_USBDEV)
@@ -311,7 +311,7 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_PORTDINTS -- Support 32 Port D interrupts
     CONFIG_KINETIS_PORTEINTS -- Support 32 Port E interrupts
 
-  Kinetis K60 specific device driver settings
+  Kinetis K64 specific device driver settings
 
     CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
       console and ttys0 (default is the UART0).
@@ -335,11 +335,11 @@ Freedom K64F Configuration Options
 Configurations
 ==============
 
-Each TWR-K60N512 configuration is maintained in a sub-directory and
+Each Freedom K64F configuration is maintained in a sub-directory and
 can be selected as follow:
 
     cd tools
-    ./configure.sh twr-k60n512/<subdir>
+    ./configure.sh freedom-k64f/<subdir>
     cd -
     . ./setenv.sh
 
diff --git a/configs/freedom-k64f/nsh/Make.defs b/configs/freedom-k64f/nsh/Make.defs
index 1d02938622..c0f3c57b41 100644
--- a/configs/freedom-k64f/nsh/Make.defs
+++ b/configs/freedom-k64f/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/freedom-k64f/nsh/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/freedom-k64f/nsh/setenv.sh b/configs/freedom-k64f/nsh/setenv.sh
index 43bab49e0a..45d7f9dd11 100644
--- a/configs/freedom-k64f/nsh/setenv.sh
+++ b/configs/freedom-k64f/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/freedom-k64f/nsh/setenv.sh
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/freedom-k64f/scripts/flash.ld b/configs/freedom-k64f/scripts/flash.ld
index 7d2da03a9d..f60e7d330e 100644
--- a/configs/freedom-k64f/scripts/flash.ld
+++ b/configs/freedom-k64f/scripts/flash.ld
@@ -37,7 +37,7 @@
  * 128Kb of SRAM beginning at address 0x1800:0000 (SRAM_L) and 0x2000:000
  * (SRAM_U).
  *
- * NOTE: that the first part of the K40 FLASH region is reserved for
+ * NOTE: that the first part of the K64 FLASH region is reserved for
  *       interrupt vectflash and, following that, is a region from 0x0000:0400
  *       to 0x0000:040f that is reserved for the FLASH control fields (FCF).
  *
diff --git a/configs/freedom-k64f/src/k64_usbmsc.c b/configs/freedom-k64f/src/k64_usbmsc.c
index 06ff717d63..0c5ff493c0 100644
--- a/configs/freedom-k64f/src/k64_usbmsc.c
+++ b/configs/freedom-k64f/src/k64_usbmsc.c
@@ -87,7 +87,7 @@
 int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see k60_appinit.c).
+   * already have been initialized in board_app_initialize() (see k64_appinit.c).
    * In this case, there is nothing further to be done here.
    */