diff --git a/CMake/Modules/FindNF_CoreCLR.cmake b/CMake/Modules/FindNF_CoreCLR.cmake
index a262beb9ff..8a9fd4d949 100644
--- a/CMake/Modules/FindNF_CoreCLR.cmake
+++ b/CMake/Modules/FindNF_CoreCLR.cmake
@@ -122,7 +122,7 @@ set(NF_CoreCLR_SRCS
     # Runtime.Native
     nf_rt_native.cpp
     nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
-    nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp
+    nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
     nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp
     nf_rt_native_nanoFramework_Runtime_Native_Power.cpp
     nf_rt_native_nanoFramework_Runtime_Native_Rtc_stubs.cpp
diff --git a/src/nanoFramework.Runtime.Native/nf_rt_native.cpp b/src/nanoFramework.Runtime.Native/nf_rt_native.cpp
index f397612609..f7f662b2e1 100644
--- a/src/nanoFramework.Runtime.Native/nf_rt_native.cpp
+++ b/src/nanoFramework.Runtime.Native/nf_rt_native.cpp
@@ -10,9 +10,9 @@
 static const CLR_RT_MethodHandler method_lookup[] =
 {
     NULL,
-    Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4__BOOLEAN,
-    Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::EnableGCMessages___STATIC__VOID__BOOLEAN,
     Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint::Install___STATIC__VOID__I4__I4,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_GC::Run___STATIC__U4__BOOLEAN,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_GC::EnableGCMessages___STATIC__VOID__BOOLEAN,
     NULL,
     NULL,
     NULL,
@@ -40,7 +40,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
 {
     "nanoFramework.Runtime.Native",
-    0xE79F9BC2,
+    0x2307A8F3,
     method_lookup,
-    { 100, 0, 7, 0 }
+    { 100, 0, 8, 0 }
 };
diff --git a/src/nanoFramework.Runtime.Native/nf_rt_native.h b/src/nanoFramework.Runtime.Native/nf_rt_native.h
index 71b691df53..c9d159e4ac 100644
--- a/src/nanoFramework.Runtime.Native/nf_rt_native.h
+++ b/src/nanoFramework.Runtime.Native/nf_rt_native.h
@@ -24,23 +24,23 @@ enum FloatingPoint
     FloatingPoint_DoublePrecisionHardware = 4,
 };
 
-struct Library_nf_rt_native_nanoFramework_Runtime_Native_Debug
+struct Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint
 {
-    NANOCLR_NATIVE_DECLARE(GC___STATIC__U4__BOOLEAN);
-    NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);
+    NANOCLR_NATIVE_DECLARE(Install___STATIC__VOID__I4__I4);
 
     //--//
 
 };
 
-struct Library_nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint
+struct Library_nf_rt_native_nanoFramework_Runtime_Native_GC
 {
-    NANOCLR_NATIVE_DECLARE(Install___STATIC__VOID__I4__I4);
+    NANOCLR_NATIVE_DECLARE(GC___STATIC__U4__BOOLEAN);
+    NANOCLR_NATIVE_DECLARE(EnableGCMessages___STATIC__VOID__BOOLEAN);
 
     //--//
 
 };
- 
+
 struct Library_nf_rt_native_nanoFramework_Runtime_Native_Power
 {
     static const int FIELD_STATIC__OnRebootEvent = 0;
diff --git a/src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp b/src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
similarity index 82%
rename from src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp
rename to src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
index c75fa04183..92528d1248 100644
--- a/src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp
+++ b/src/nanoFramework.Runtime.Native/nf_rt_native_nanoFramework_Runtime_Native_GC.cpp
@@ -9,7 +9,7 @@
 
 
 
-HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4__BOOLEAN( CLR_RT_StackFrame& stack )
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_GC::Run___STATIC__U4__BOOLEAN( CLR_RT_StackFrame& stack )
 {
     NATIVE_PROFILE_CLR_CORE();
 
@@ -37,7 +37,7 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::GC___STATIC__U4
     NANOCLR_NOCLEANUP_NOLABEL();
 }
 
-HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_Debug::EnableGCMessages___STATIC__VOID__BOOLEAN( CLR_RT_StackFrame& stack )
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_GC::EnableGCMessages___STATIC__VOID__BOOLEAN( CLR_RT_StackFrame& stack )
 {
     NATIVE_PROFILE_CLR_CORE();