diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PeripheralNames.h
index a2d80f0942..870ef09dda 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PeripheralNames.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PeripheralNames.h
@@ -86,7 +86,7 @@ typedef enum {
 } CANName;
 
 typedef enum {
-    QSPI_1 = (int)QSPI_BASE
+    QSPI_1 = (int)QSPI_R_BASE
 } QSPIName;
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h
index b60b0ec151..d1eaefc41e 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h
@@ -346,8 +346,8 @@ typedef enum {
     QSPI_FLASH1_IO1 = PB_0,
     QSPI_FLASH1_IO2 = PA_7,
     QSPI_FLASH1_IO3 = PA_6,
-    QSPI_FLASH1_SCK = PB_11,
-    QSPI_FLASH1_CSN = PA_3,
+    QSPI_FLASH1_SCK = PA_3,
+    QSPI_FLASH1_CSN = PB_11,
 
     // Not connected
     NC = (int)0xFFFFFFFF
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/objects.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/objects.h
index ece5f1679f..cd0f1a783c 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/objects.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/objects.h
@@ -58,6 +58,16 @@ struct trng_s {
     RNG_HandleTypeDef handle;
 };
 
+struct qspi_s {
+    QSPI_HandleTypeDef handle;
+    PinName io0;
+    PinName io1;
+    PinName io2;
+    PinName io3;
+    PinName sclk;
+    PinName ssel;
+};
+
 #include "common_objects.h"
 
 #ifdef __cplusplus