diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp b/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
index 9943f82e83..0c9ee3b525 100644
--- a/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
+++ b/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
@@ -57,7 +57,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::DisposeNative___VOID,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::NativeTransfer___VOID__SZARRAY_U1__SZARRAY_U1__BOOLEAN,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::NativeTransfer___VOID__SZARRAY_U2__SZARRAY_U2__BOOLEAN,
@@ -73,7 +72,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices_Spi =
 {
     "Windows.Devices.Spi", 
-    0x3DE083A4,
+    0x083DBB79,
     method_lookup,
-    { 1, 1, 2, 2 }
+    { 1, 1, 3, 0 }
 };
diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h b/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
index a7ecffc839..c9ffaebf39 100644
--- a/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
+++ b/targets/CMSIS-OS/ChibiOS/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
@@ -16,7 +16,7 @@
 
 struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiBusInfo
 {
-    static const int FIELD___ChipSelectLineCount = 1;
+    static const int FIELD___chipSelectLineCount = 1;
 
     NANOCLR_NATIVE_DECLARE(get_MaxClockFrequency___I4);
     NANOCLR_NATIVE_DECLARE(get_MinClockFrequency___I4);
@@ -53,7 +53,7 @@ struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiController
 
 struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiControllerManager
 {
-    static const int FIELD_STATIC___syncLock = 0;
+    static const int FIELD_STATIC__s_syncLock = 0;
     static const int FIELD_STATIC__s_controllersCollection = 1;
 
 
diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
index 9943f82e83..0c9ee3b525 100644
--- a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
+++ b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.cpp
@@ -57,7 +57,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::DisposeNative___VOID,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::NativeTransfer___VOID__SZARRAY_U1__SZARRAY_U1__BOOLEAN,
     Library_win_dev_spi_native_Windows_Devices_Spi_SpiDevice::NativeTransfer___VOID__SZARRAY_U2__SZARRAY_U2__BOOLEAN,
@@ -73,7 +72,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices_Spi =
 {
     "Windows.Devices.Spi", 
-    0x3DE083A4,
+    0x083DBB79,
     method_lookup,
-    { 1, 1, 2, 2 }
+    { 1, 1, 3, 0 }
 };
diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
index 2d6073d8ca..52acfd22a5 100644
--- a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
+++ b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/nanoCLR/Windows.Devices.Spi/win_dev_spi_native.h
@@ -29,7 +29,7 @@ struct nfSpiBusConfig
 
 struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiBusInfo
 {
-    static const int FIELD___ChipSelectLineCount = 1;
+    static const int FIELD___chipSelectLineCount = 1;
 
     NANOCLR_NATIVE_DECLARE(get_MaxClockFrequency___I4);
     NANOCLR_NATIVE_DECLARE(get_MinClockFrequency___I4);
@@ -66,7 +66,7 @@ struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiController
 
 struct Library_win_dev_spi_native_Windows_Devices_Spi_SpiControllerManager
 {
-    static const int FIELD_STATIC___syncLock = 0;
+    static const int FIELD_STATIC__s_syncLock = 0;
     static const int FIELD_STATIC__s_controllersCollection = 1;