diff --git a/configs/freedom-kl25z/src/freedom-kl25z.h b/configs/freedom-kl25z/src/freedom-kl25z.h
index 008770eada3..ca5ce242d81 100644
--- a/configs/freedom-kl25z/src/freedom-kl25z.h
+++ b/configs/freedom-kl25z/src/freedom-kl25z.h
@@ -103,14 +103,14 @@
  ****************************************************************************************************/
 
 /****************************************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Freedom KL25Z board.
  *
  ****************************************************************************************************/
 
-void weak_function kl_spiinitialize(void);
+void weak_function kl_spidev_initialize(void);
 
 /****************************************************************************************************
  * Name: kl_usbinitialize
diff --git a/configs/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c
index a8a39f46701..8e7d49ed558 100644
--- a/configs/freedom-kl25z/src/kl_adxl345.c
+++ b/configs/freedom-kl25z/src/kl_adxl345.c
@@ -272,7 +272,7 @@ int adxl345_archinitialize(int minor)
 
       /* Get an instance of the I2C interface */
 
-      dev = up_spiinitialize(CONFIG_ADXL345_SPIDEV);
+      dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV);
       if (!dev)
         {
           sndbg("Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV);
diff --git a/configs/freedom-kl25z/src/kl_boardinitialize.c b/configs/freedom-kl25z/src/kl_boardinitialize.c
index 94314a3180a..3775bf2315d 100644
--- a/configs/freedom-kl25z/src/kl_boardinitialize.c
+++ b/configs/freedom-kl25z/src/kl_boardinitialize.c
@@ -73,13 +73,13 @@
 void kl_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kl_spiinitialize() has been brought into the link.
+   * kl_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_KL_SPI0) || defined(CONFIG_KL_SPI1)
-  if (kl_spiinitialize)
+  if (kl_spidev_initialize)
     {
-      kl_spiinitialize();
+      kl_spidev_initialize();
     }
 #endif
 
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 53fd7af306b..c674bd45278 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -78,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the FRDM-KL25Z board.
  *
  ****************************************************************************/
 
-void weak_function kl_spiinitialize(void)
+void weak_function kl_spidev_initialize(void)
 {
   /* Configure SPI0 chip selects */
 
@@ -114,7 +114,7 @@ void weak_function kl_spiinitialize(void)
  *   These external functions must be provided by board-specific logic.  They
  *   are implementations of the select, status, and cmddata methods of the SPI
  *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All
- *   other methods including up_spiinitialize()) are provided by common
+ *   other methods including kl_spibus_initialize()) are provided by common
  *   Kinetis logic.  To use this common SPI logic on your board:
  *
  *   1. Provide logic in kl_boardinitialize() to configure SPI chip select
@@ -127,9 +127,9 @@ void weak_function kl_spiinitialize(void)
  *      kl_spi[n]cmddata() functions in your board-specific logic.  These
  *      functions will perform cmd/data selection operations using GPIOs in
  *      the way your board is configured.
- *   3. Add a call to up_spiinitialize() in your low level application
+ *   3. Add a call to kl_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind
+ *   4. The handle returned by kl_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/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c
index f439d5b523e..77788b2b7f5 100644
--- a/configs/freedom-kl25z/src/kl_wifi.c
+++ b/configs/freedom-kl25z/src/kl_wifi.c
@@ -301,7 +301,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Get an instance of the SPI interface */
 
-  spi = up_spiinitialize(CONFIG_CC3000_SPIDEV);
+  spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
       idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
diff --git a/configs/freedom-kl26z/src/freedom-kl26z.h b/configs/freedom-kl26z/src/freedom-kl26z.h
index 42a656e8482..053101db5b9 100644
--- a/configs/freedom-kl26z/src/freedom-kl26z.h
+++ b/configs/freedom-kl26z/src/freedom-kl26z.h
@@ -102,14 +102,14 @@
  ****************************************************************************************************/
 
 /****************************************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Freedom KL26Z board.
  *
  ****************************************************************************************************/
 
-void weak_function kl_spiinitialize(void);
+void weak_function kl_spidev_initialize(void);
 
 /****************************************************************************************************
  * Name: kl_usbinitialize
diff --git a/configs/freedom-kl26z/src/kl_boardinitialize.c b/configs/freedom-kl26z/src/kl_boardinitialize.c
index 92a66d47a8c..8cedfc4b25c 100644
--- a/configs/freedom-kl26z/src/kl_boardinitialize.c
+++ b/configs/freedom-kl26z/src/kl_boardinitialize.c
@@ -72,13 +72,13 @@
 void kl_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kl_spiinitialize() has been brought into the link.
+   * kl_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_KL_SPI0) || defined(CONFIG_KL_SPI1)
-  if (kl_spiinitialize)
+  if (kl_spidev_initialize)
     {
-      kl_spiinitialize();
+      kl_spidev_initialize();
     }
 #endif
 
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index a510f18e9a2..21d4052e82b 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -78,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the FRDM-KL26Z board.
  *
  ****************************************************************************/
 
-void weak_function kl_spiinitialize(void)
+void weak_function kl_spidev_initialize(void)
 {
   /* Configure SPI0 chip selects */
 
@@ -105,7 +105,7 @@ void weak_function kl_spiinitialize(void)
  *   These external functions must be provided by board-specific logic.  They
  *   are implementations of the select, status, and cmddata methods of the SPI
  *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All
- *   other methods including up_spiinitialize()) are provided by common
+ *   other methods including kl_spibus_initialize()) are provided by common
  *   Kinetis logic.  To use this common SPI logic on your board:
  *
  *   1. Provide logic in kl_boardinitialize() to configure SPI chip select
@@ -118,9 +118,9 @@ void weak_function kl_spiinitialize(void)
  *      kl_spi[n]cmddata() functions in your board-specific logic.  These
  *      functions will perform cmd/data selection operations using GPIOs in
  *      the way your board is configured.
- *   3. Add a call to up_spiinitialize() in your low level application
+ *   3. Add a call to kl_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind
+ *   4. The handle returned by kl_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-lc/src/kl_boardinitialize.c b/configs/teensy-lc/src/kl_boardinitialize.c
index 45e88ba5234..0f3da306449 100644
--- a/configs/teensy-lc/src/kl_boardinitialize.c
+++ b/configs/teensy-lc/src/kl_boardinitialize.c
@@ -84,13 +84,13 @@ void kl_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * kl_spiinitialize() has been brought into the link.
+   * kl_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_KL_SPI0) || defined(CONFIG_KL_SPI1)
-  if (kl_spiinitialize)
+  if (kl_spidev_initialize)
     {
-      kl_spiinitialize();
+      kl_spidev_initialize();
     }
 #endif
 
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 879b94da266..4227fea056a 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -78,14 +78,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the FRDM-KL25Z board.
  *
  ****************************************************************************/
 
-void weak_function kl_spiinitialize(void)
+void weak_function kl_spidev_initialize(void)
 {
   /* Configure SPI0 chip selects */
 
@@ -105,7 +105,7 @@ void weak_function kl_spiinitialize(void)
  *   These external functions must be provided by board-specific logic.  They
  *   are implementations of the select, status, and cmddata methods of the SPI
  *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All
- *   other methods including up_spiinitialize()) are provided by common
+ *   other methods including kl_spibus_initialize()) are provided by common
  *   Kinetis logic.  To use this common SPI logic on your board:
  *
  *   1. Provide logic in kl_boardinitialize() to configure SPI chip select
@@ -118,9 +118,9 @@ void weak_function kl_spiinitialize(void)
  *      kl_spi[n]cmddata() functions in your board-specific logic.  These
  *      functions will perform cmd/data selection operations using GPIOs in
  *      the way your board is configured.
- *   3. Add a call to up_spiinitialize() in your low level application
+ *   3. Add a call to kl_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind
+ *   4. The handle returned by kl_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-lc/src/teensy-lc.h b/configs/teensy-lc/src/teensy-lc.h
index bcd2c576253..048fcaeab43 100644
--- a/configs/teensy-lc/src/teensy-lc.h
+++ b/configs/teensy-lc/src/teensy-lc.h
@@ -70,14 +70,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: kl_spiinitialize
+ * Name: kl_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Freedom KL25Z board.
  *
  ****************************************************************************/
 
-void weak_function kl_spiinitialize(void);
+void weak_function kl_spidev_initialize(void);
 
 /****************************************************************************
  * Name: kl_led_initialize