diff --git a/TESTS/block_device/spif/main.cpp b/TESTS/block_device/spif/main.cpp
index c3fccbbfb5..6ba06c9e64 100644
--- a/TESTS/block_device/spif/main.cpp
+++ b/TESTS/block_device/spif/main.cpp
@@ -91,7 +91,8 @@ void test_spif_random_program_read_erase()
 {
     utest_printf("\nTest Random Program Read Erase Starts..\n");
 
-    SPIFBlockDevice blockD(MBED_CONF_SPIF_SPI_MOSI, MBED_CONF_SPIF_SPI_MISO, MBED_CONF_SPIF_SPI_CLK, MBED_CONF_SPIF_SPI_CS);
+    SPIFBlockDevice blockD(MBED_CONF_SPIF_DRIVER_SPI_MOSI, MBED_CONF_SPIF_DRIVER_SPI_MISO, MBED_CONF_SPIF_DRIVER_SPI_CLK,
+                           MBED_CONF_SPIF_DRIVER_SPI_CS);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);
@@ -134,7 +135,8 @@ void test_spif_unaligned_program()
 {
     utest_printf("\nTest Unaligned Program Starts..\n");
 
-    SPIFBlockDevice blockD(MBED_CONF_SPIF_SPI_MOSI, MBED_CONF_SPIF_SPI_MISO, MBED_CONF_SPIF_SPI_CLK, MBED_CONF_SPIF_SPI_CS);
+    SPIFBlockDevice blockD(MBED_CONF_SPIF_DRIVER_SPI_MOSI, MBED_CONF_SPIF_DRIVER_SPI_MISO, MBED_CONF_SPIF_DRIVER_SPI_CLK,
+                           MBED_CONF_SPIF_DRIVER_SPI_CS);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);
@@ -230,7 +232,8 @@ void test_spif_multi_threads()
 {
     utest_printf("\nTest Multi Threaded Erase/Program/Read Starts..\n");
 
-    SPIFBlockDevice blockD(MBED_CONF_SPIF_SPI_MOSI, MBED_CONF_SPIF_SPI_MISO, MBED_CONF_SPIF_SPI_CLK, MBED_CONF_SPIF_SPI_CS);
+    SPIFBlockDevice blockD(MBED_CONF_SPIF_DRIVER_SPI_MOSI, MBED_CONF_SPIF_DRIVER_SPI_MISO, MBED_CONF_SPIF_DRIVER_SPI_CLK,
+                           MBED_CONF_SPIF_DRIVER_SPI_CS);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);
diff --git a/mbed_lib.json b/mbed_lib.json
index 40971a8da4..07fc85b1a4 100644
--- a/mbed_lib.json
+++ b/mbed_lib.json
@@ -1,5 +1,5 @@
 {
-    "name": "spif",
+    "name": "spif-driver",
     "config": {
         "SPI_MOSI": "NC",
         "SPI_MISO": "NC",