diff --git a/configs/ea3131/src/ea3131.h b/configs/ea3131/src/ea3131.h
index e69ed4cce6c..3a0698ef8a9 100644
--- a/configs/ea3131/src/ea3131.h
+++ b/configs/ea3131/src/ea3131.h
@@ -90,14 +90,14 @@ void lpc31_meminitialize(void);
 #endif
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the EA3131 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void);
+void weak_function lpc31_spidev_intialize(void);
 
 /************************************************************************************
  * Name: lpc31_usbdev_initialize
diff --git a/configs/ea3131/src/lpc31_boot.c b/configs/ea3131/src/lpc31_boot.c
index 703e4b0c34c..1b48f190905 100644
--- a/configs/ea3131/src/lpc31_boot.c
+++ b/configs/ea3131/src/lpc31_boot.c
@@ -80,13 +80,13 @@ void lpc31_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * lpc31_spiinitialize() has been brought into the link.
+   * lpc31_spidev_intialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC31_SPI)
-  if (lpc31_spiinitialize)
+  if (lpc31_spidev_intialize)
     {
-      lpc31_spiinitialize();
+      lpc31_spidev_intialize();
     }
 #endif
 
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 8bac73d7875..3ca97433cf0 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -304,7 +304,7 @@ static inline void lpc31_initsrc(void)
 
       /* First get an instance of the SPI device interface */
 
-      spi = up_spiinitialize(CONFIG_EA3131_PAGING_SPIPORT);
+      spi = lpc31_spibus_initialize(CONFIG_EA3131_PAGING_SPIPORT);
       DEBUGASSERT(spi != NULL);
 
       /* Then bind the SPI interface to the MTD driver */
@@ -506,7 +506,7 @@ void weak_function lpc31_pginitialize(void)
    *
    * - Initialize and configure a mass storage device to support on-demand paging.
    *   This might be, perhaps an SD card or NAND memory.  An SPI FLASH would probably
-   *   already have been configured by lpc31_spiinitialize(void);
+   *   already have been configured by lpc31_spidev_intialize(void);
    * - Set up resources to support up_fillpage() operation.  For example, perhaps the
    *   the text image is stored in a named binary file.  In this case, the virtual
    *   text addresses might map to offsets into that file.
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index 70066858686..cda79ac9e63 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -86,14 +86,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the EA3131 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void)
+void weak_function lpc31_spidev_intialize(void)
 {
   /* NOTE: Clocking for SPI has already been provided. Pin configuration is performed
    * on-the-fly, so no additional setup is required.
@@ -107,7 +107,7 @@ void weak_function lpc31_spiinitialize(void)
  *   The external functions, lpc31_spiselect and lpc31_spistatus 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 lpc31_spibus_initialize())
  *   are provided by common LPC31XX logic.  To use this common SPI logic on your
  *   board:
  *
@@ -116,9 +116,9 @@ void weak_function lpc31_spiinitialize(void)
  *   2. Provide lpc31_spiselect() and lpc31_spistatus() 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 lpc31_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 lpc31_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/ea3152/src/ea3152.h b/configs/ea3152/src/ea3152.h
index 8e398618215..dc668830023 100644
--- a/configs/ea3152/src/ea3152.h
+++ b/configs/ea3152/src/ea3152.h
@@ -90,14 +90,14 @@ void lpc31_meminitialize(void);
 #endif
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the EA3152 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void);
+void weak_function lpc31_spidev_intialize(void);
 
 /************************************************************************************
  * Name: lpc31_usbinitialize
diff --git a/configs/ea3152/src/lpc31_boot.c b/configs/ea3152/src/lpc31_boot.c
index 053ddcd195b..4d972e9ad33 100644
--- a/configs/ea3152/src/lpc31_boot.c
+++ b/configs/ea3152/src/lpc31_boot.c
@@ -80,13 +80,13 @@ void lpc31_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * lpc31_spiinitialize() has been brought into the link.
+   * lpc31_spidev_intialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC31_SPI)
-  if (lpc31_spiinitialize)
+  if (lpc31_spidev_intialize)
     {
-      lpc31_spiinitialize();
+      lpc31_spidev_intialize();
     }
 #endif
 
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index 25b4d500f72..647960cfa35 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -304,7 +304,7 @@ static inline void lpc31_initsrc(void)
 
       /* First get an instance of the SPI device interface */
 
-      spi = up_spiinitialize(CONFIG_EA3152_PAGING_SPIPORT);
+      spi = lpc31_spibus_initialize(CONFIG_EA3152_PAGING_SPIPORT);
       DEBUGASSERT(spi != NULL);
 
       /* Then bind the SPI interface to the MTD driver */
@@ -506,7 +506,7 @@ void weak_function lpc31_pginitialize(void)
    *
    * - Initialize and configure a mass storage device to support on-demand paging.
    *   This might be, perhaps an SD card or NAND memory.  An SPI FLASH would probably
-   *   already have been configured by lpc31_spiinitialize(void);
+   *   already have been configured by lpc31_spidev_intialize(void);
    * - Set up resources to support up_fillpage() operation.  For example, perhaps the
    *   the text image is stored in a named binary file.  In this case, the virtual
    *   text addresses might map to offsets into that file.
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 7c0608003ee..5e81cc398da 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -86,14 +86,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the EA3152 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void)
+void weak_function lpc31_spidev_intialize(void)
 {
   /* NOTE: Clocking for SPI has already been provided. Pin configuration is performed
    * on-the-fly, so no additional setup is required.
@@ -107,7 +107,7 @@ void weak_function lpc31_spiinitialize(void)
  *   The external functions, lpc31_spiselect and lpc31_spistatus 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 lpc31_spibus_initialize())
  *   are provided by common LPC31XX logic.  To use this common SPI logic on your
  *   board:
  *
@@ -116,9 +116,9 @@ void weak_function lpc31_spiinitialize(void)
  *   2. Provide lpc31_spiselect() and lpc31_spistatus() 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 lpc31_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 lpc31_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/lm4f120-launchpad/src/lm4f_boot.c b/configs/lm4f120-launchpad/src/lm4f_boot.c
index e85c8c0fd22..0d64706d50e 100644
--- a/configs/lm4f120-launchpad/src/lm4f_boot.c
+++ b/configs/lm4f120-launchpad/src/lm4f_boot.c
@@ -79,9 +79,9 @@ void tiva_boardinitialize(void)
   /* The LM4F LaunchPad microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
 #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
-  if (lm4f_ssiinitialize)
+  if (lm4f_spidev_initialize)
     {
-      lm4f_ssiinitialize();
+      lm4f_spidev_initialize();
     }
 #endif
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index a3a87490080..dfbff754638 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -87,14 +87,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm4f_ssiinitialize
+ * Name: lm4f_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM4F LaunchPad.
  *
  ************************************************************************************/
 
-void weak_function lm4f_ssiinitialize(void)
+void weak_function lm4f_spidev_initialize(void)
 {
 }
 
@@ -102,15 +102,15 @@ void weak_function lm4f_ssiinitialize(void)
  * The external functions, tiva_spiselect and tiva_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
  * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
- * All othermethods (including tiva_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to tiva_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by tiva_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_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/lm4f120-launchpad/src/lmf4120-launchpad.h b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
index 61e7765bbcd..433358b9899 100644
--- a/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+++ b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
@@ -127,14 +127,14 @@
 #ifndef __ASSEMBLY__
 
 /************************************************************************************
- * Name: lm4f_ssiinitialize
+ * Name: lm4f_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM4F LaunchPad.
  *
  ************************************************************************************/
 
-void weak_function lm4f_ssiinitialize(void);
+void weak_function lm4f_spidev_initialize(void);
 
 /****************************************************************************
  * Name: lm4f_led_initialize
diff --git a/configs/olimex-lpc-h3131/src/lpc31_boot.c b/configs/olimex-lpc-h3131/src/lpc31_boot.c
index 77f2ae79dc3..8db90d9f948 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_boot.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_boot.c
@@ -80,13 +80,13 @@ void lpc31_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * lpc31_spiinitialize() has been brought into the link.
+   * lpc31_spidev_intialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC31_SPI)
-  if (lpc31_spiinitialize)
+  if (lpc31_spidev_intialize)
     {
-      lpc31_spiinitialize();
+      lpc31_spidev_intialize();
     }
 #endif
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index 692a1256f46..91145242edd 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -86,14 +86,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPC-H3131 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void)
+void weak_function lpc31_spidev_intialize(void)
 {
   /* NOTE: Clocking for SPI has already been provided. Pin configuration is performed
    * on-the-fly, so no additional setup is required.
@@ -107,7 +107,7 @@ void weak_function lpc31_spiinitialize(void)
  *   The external functions, lpc31_spiselect and lpc31_spistatus 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 lpc31_spibus_initialize())
  *   are provided by common LPC31XX logic.  To use this common SPI logic on your
  *   board:
  *
@@ -116,9 +116,9 @@ void weak_function lpc31_spiinitialize(void)
  *   2. Provide lpc31_spiselect() and lpc31_spistatus() 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 lpc31_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 lpc31_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/olimex-lpc-h3131/src/lpc_h3131.h b/configs/olimex-lpc-h3131/src/lpc_h3131.h
index fffb9180664..895b5ca596f 100644
--- a/configs/olimex-lpc-h3131/src/lpc_h3131.h
+++ b/configs/olimex-lpc-h3131/src/lpc_h3131.h
@@ -145,14 +145,14 @@ void lpc31_meminitialize(void);
 #endif
 
 /************************************************************************************
- * Name: lpc31_spiinitialize
+ * Name: lpc31_spidev_intialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPC-H3131 board.
  *
  ************************************************************************************/
 
-void weak_function lpc31_spiinitialize(void);
+void weak_function lpc31_spidev_intialize(void);
 
 /************************************************************************************
  * Name: lpc31_usbdev_initialize