diff --git a/configs/kwikstik-k40/src/k40_boot.c b/configs/kwikstik-k40/src/k40_boot.c
index 9b22a514b80..1de6741cf0c 100644
--- a/configs/kwikstik-k40/src/k40_boot.c
+++ b/configs/kwikstik-k40/src/k40_boot.c
@@ -72,13 +72,13 @@
 void kinetis_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kinetis_spiinitialize() has been brought into the link.
+   * kinetis_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
-  if (kinetis_spiinitialize)
+  if (kinetis_spidev_initialize)
     {
-      kinetis_spiinitialize();
+      kinetis_spidev_initialize();
     }
 #endif
 
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 77c36022001..7b14ea57b8b 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -81,14 +81,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
  *
  ************************************************************************************/
 
-void weak_function kinetis_spiinitialize(void)
+void weak_function kinetis_spidev_initialize(void)
 {
 # warning "Missing logic"
 }
@@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
  *   The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
  *   are provided by common Kinetis logic.  To use this common SPI logic on your
  *   board:
  *
@@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
  *   2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
  *      board-specific logic.  These functions will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to up_spiinitialize() in your low level application
+ *   3. Add a calls to kinetis_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
diff --git a/configs/kwikstik-k40/src/kwikstik-k40.h b/configs/kwikstik-k40/src/kwikstik-k40.h
index 1ab985c7a0d..9460857888c 100644
--- a/configs/kwikstik-k40/src/kwikstik-k40.h
+++ b/configs/kwikstik-k40/src/kwikstik-k40.h
@@ -160,14 +160,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
  *
  ************************************************************************************/
 
-extern void weak_function kinetis_spiinitialize(void);
+extern void weak_function kinetis_spidev_initialize(void);
 
 /************************************************************************************
  * Name: kinetis_usbinitialize
diff --git a/configs/teensy-3.x/src/k20_boot.c b/configs/teensy-3.x/src/k20_boot.c
index d0c65de2a19..6bd0282ddf4 100644
--- a/configs/teensy-3.x/src/k20_boot.c
+++ b/configs/teensy-3.x/src/k20_boot.c
@@ -73,12 +73,12 @@ void kinetis_boardinitialize(void)
 {
 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kinetis_spiinitialize() has been brought into the link.
+   * kinetis_spidev_initialize() has been brought into the link.
    */
 
-  if (kinetis_spiinitialize)
+  if (kinetis_spidev_initialize)
     {
-      kinetis_spiinitialize();
+      kinetis_spidev_initialize();
     }
 #endif
 
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index 7b6ae3ebbcd..edd63b41354 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -81,14 +81,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
  *
  ************************************************************************************/
 
-void weak_function kinetis_spiinitialize(void)
+void weak_function kinetis_spidev_initialize(void)
 {
 # warning "Missing logic"
 }
@@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
  *   The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
  *   are provided by common Kinetis logic.  To use this common SPI logic on your
  *   board:
  *
@@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
  *   2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
  *      board-specific logic.  These functions will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to up_spiinitialize() in your low level application
+ *   3. Add a calls to kinetis_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
diff --git a/configs/teensy-3.x/src/teensy-3x.h b/configs/teensy-3.x/src/teensy-3x.h
index d62beddc525..0e0b16b2599 100644
--- a/configs/teensy-3.x/src/teensy-3x.h
+++ b/configs/teensy-3.x/src/teensy-3x.h
@@ -83,14 +83,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the KwikStik-K40 board.
  *
  ************************************************************************************/
 
-extern void weak_function kinetis_spiinitialize(void);
+extern void weak_function kinetis_spidev_initialize(void);
 
 /************************************************************************************
  * Name: kinetis_usbinitialize
diff --git a/configs/twr-k60n512/src/k60_boot.c b/configs/twr-k60n512/src/k60_boot.c
index d22fb9ea4be..e9c814123b3 100644
--- a/configs/twr-k60n512/src/k60_boot.c
+++ b/configs/twr-k60n512/src/k60_boot.c
@@ -72,13 +72,13 @@
 void kinetis_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kinetis_spiinitialize() has been brought into the link.
+   * kinetis_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
-  if (kinetis_spiinitialize)
+  if (kinetis_spidev_initialize)
     {
-      kinetis_spiinitialize();
+      kinetis_spidev_initialize();
     }
 #endif
 
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 371dcf2acd0..8aa48e369bc 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -81,14 +81,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the TWR-K60N512 board.
  *
  ************************************************************************************/
 
-void weak_function kinetis_spiinitialize(void)
+void weak_function kinetis_spidev_initialize(void)
 {
 # warning "Missing logic"
 }
@@ -100,7 +100,7 @@ void weak_function kinetis_spiinitialize(void)
  *   The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including kinetis_spibus_initialize())
  *   are provided by common Kinetis logic.  To use this common SPI logic on your
  *   board:
  *
@@ -109,9 +109,9 @@ void weak_function kinetis_spiinitialize(void)
  *   2. Provide kinetis_spi1/2/3select() and kinetis_spi1/2/3status() functions in your
  *      board-specific logic.  These functions will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to up_spiinitialize() in your low level application
+ *   3. Add a calls to kinetis_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by kinetis_spibus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
diff --git a/configs/twr-k60n512/src/twr-k60n512.h b/configs/twr-k60n512/src/twr-k60n512.h
index f521798fce2..0cf1ea1432f 100644
--- a/configs/twr-k60n512/src/twr-k60n512.h
+++ b/configs/twr-k60n512/src/twr-k60n512.h
@@ -273,14 +273,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: kinetis_spiinitialize
+ * Name: kinetis_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the TWR-K60N512 board.
  *
  ************************************************************************************/
 
-void weak_function kinetis_spiinitialize(void);
+void weak_function kinetis_spidev_initialize(void);
 
 /************************************************************************************
  * Name: kinetis_usbinitialize