diff --git a/Modules/@babylonjs/react-native-iosandroid/android/src/main/cpp/BabylonNativeInterop.cpp b/Modules/@babylonjs/react-native-iosandroid/android/src/main/cpp/BabylonNativeInterop.cpp
index 9b55c9c06..e065dc6d3 100644
--- a/Modules/@babylonjs/react-native-iosandroid/android/src/main/cpp/BabylonNativeInterop.cpp
+++ b/Modules/@babylonjs/react-native-iosandroid/android/src/main/cpp/BabylonNativeInterop.cpp
@@ -1,6 +1,6 @@
 #include <jni.h>
 
-#include <Babylon/Graphics.h>
+#include <Babylon/Graphics/Device.h>
 #include <Babylon/JsRuntime.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/NativeInput.h>
diff --git a/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative b/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
index 55b26dd26..18044bf2e 160000
--- a/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
+++ b/Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
@@ -1 +1 @@
-Subproject commit 55b26dd26f289b826d9cb352766b8177b21f2398
+Subproject commit 18044bf2e1efa16a92606f8e0a9e4b26968a5ee0
diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp
index 4e6bce990..b896e3883 100644
--- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp
+++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp
@@ -1,6 +1,6 @@
 #include "BabylonNative.h"
 
-#include <Babylon/Graphics.h>
+#include <Babylon/Graphics/Device.h>
 #include <Babylon/JsRuntime.h>
 #include <Babylon/Plugins/NativeCapture.h>
 #include <Babylon/Plugins/NativeEngine.h>
@@ -22,8 +22,8 @@ namespace BabylonNative
     namespace
     {
         Dispatcher g_inlineDispatcher{ [](const std::function<void()>& func) { func(); } };
-        std::unique_ptr<Babylon::Graphics> g_graphics{};
-        std::unique_ptr<Babylon::Graphics::Update> g_update{};
+        std::unique_ptr<Babylon::Graphics::Device> g_graphics{};
+        std::unique_ptr<Babylon::Graphics::DeviceUpdate> g_update{};
         std::unique_ptr<Babylon::Polyfills::Canvas> g_nativeCanvas{};
     }
 
@@ -73,15 +73,15 @@ namespace BabylonNative
 
         void UpdateView(WindowType window, size_t width, size_t height)
         {
-            Babylon::WindowConfiguration windowConfig{};
+            Babylon::Graphics::WindowConfiguration windowConfig{};
             windowConfig.Window = window;
             windowConfig.Width = width;
             windowConfig.Height = height;
 
             if (!g_graphics)
             {
-                g_graphics = Babylon::Graphics::CreateGraphics(windowConfig);
-                g_update = std::make_unique<Babylon::Graphics::Update>(g_graphics->GetUpdate("update"));
+                g_graphics = Babylon::Graphics::Device::Create(windowConfig);
+                g_update = std::make_unique<Babylon::Graphics::DeviceUpdate>(g_graphics->GetUpdate("update"));
             }
             else
             {