diff --git a/incremental/graphics/native/platform/cpp/NativeRenderer.h b/incremental/graphics/native/platform/cpp/NativeRenderer.h
index fea1aacddfa1a9272a32cbebf458cec094ff729a..01174e66ffd9788856da12e9b9663c7134503414 100644
--- a/incremental/graphics/native/platform/cpp/NativeRenderer.h
+++ b/incremental/graphics/native/platform/cpp/NativeRenderer.h
@@ -16,18 +16,18 @@
 #include "SkData.h"
 #include "SkSurface.h"
 #include "common-interop.h"
-#include "skoala.h"
+#include "graphics.h"
 
 enum {
-    SkoalaNativeRendererIdFBO = 0,
-    SkoalaNativeRendererIdMove = 1,
-    SkoalaNativeRendererIdPointerPressed = 2,
-    SkoalaNativeRendererIdPointerReleased = 3,
-    SkoalaNativeRendererIdScroll = 4,
-    SkoalaNativeRendererIdTick = 5,
-    SkoalaNativeRendererIdRotate = 6,
-    SkoalaNativeRendererIdPause = -1,
-    SkoalaNativeRendererIdPixels = -2,
+    GraphicsNativeRendererIdFBO = 0,
+    GraphicsNativeRendererIdMove = 1,
+    GraphicsNativeRendererIdPointerPressed = 2,
+    GraphicsNativeRendererIdPointerReleased = 3,
+    GraphicsNativeRendererIdScroll = 4,
+    GraphicsNativeRendererIdTick = 5,
+    GraphicsNativeRendererIdRotate = 6,
+    GraphicsNativeRendererIdPause = -1,
+    GraphicsNativeRendererIdPixels = -2,
 };
 
 class NativeRenderer {
@@ -35,10 +35,10 @@ protected:
     sk_sp<SkSurface> drawSurface;
     int width = 0;
     int height = 0;
-    SkoalaNativeRenderer* renderer = nullptr;
+    GraphicsNativeRenderer* renderer = nullptr;
 
 public:
-    NativeRenderer(int width, int height, SkoalaNativeRenderer* renderer)
+    NativeRenderer(int width, int height, GraphicsNativeRenderer* renderer)
         : width(width), height(height), renderer(renderer)
     {}
 
diff --git a/incremental/graphics/native/platform/cpp/NativeRenderers.cc b/incremental/graphics/native/platform/cpp/NativeRenderers.cc
index fc0075c977127a6c6d66abfa1a5fc2f0622a3bb9..eabc504e582976f4a03955cc708bf5e1176e014e 100644
--- a/incremental/graphics/native/platform/cpp/NativeRenderers.cc
+++ b/incremental/graphics/native/platform/cpp/NativeRenderers.cc
@@ -14,8 +14,8 @@
  */
 
 #include "NativeRenderer.h"
-#include "skoala-interop.h"
-#include "skoala.h"
+#include "graphics-interop.h"
+#include "graphics.h"
 
 #include <cmath>
 
@@ -74,19 +74,19 @@ struct DefaultNativeRendererState {
     {}
 };
 
-static void defaultRendererOnInit(SkoalaNativeRenderer* renderer, void* window, int width, int height)
+static void defaultRendererOnInit(GraphicsNativeRenderer* renderer, void* window, int width, int height)
 {
     static int count = 0;
     renderer->context = new DefaultNativeRendererState(count++, width, height);
 }
 
-static void defaultRendererOnDeinit(SkoalaNativeRenderer* renderer)
+static void defaultRendererOnDeinit(GraphicsNativeRenderer* renderer)
 {
     delete reinterpret_cast<DefaultNativeRendererState*>(renderer->context);
     delete renderer;
 }
 
-static void defaultRendererOnDraw(SkoalaNativeRenderer* renderer, int width, int height)
+static void defaultRendererOnDraw(GraphicsNativeRenderer* renderer, int width, int height)
 {
     auto* state = reinterpret_cast<DefaultNativeRendererState*>(renderer->context);
 #ifndef SKOALA_USE_METAL
@@ -109,7 +109,7 @@ static void defaultRendererOnDraw(SkoalaNativeRenderer* renderer, int width, int
     }
 }
 
-static int defaultRendererCheckRedraw(SkoalaNativeRenderer* renderer)
+static int defaultRendererCheckRedraw(GraphicsNativeRenderer* renderer)
 {
     double time = timestamp();
     auto* state = reinterpret_cast<DefaultNativeRendererState*>(renderer->context);
@@ -128,13 +128,13 @@ T* asPointer(unsigned int p1, unsigned int p2)
 }
 
 static int defaultRendererSendMessage(
-    SkoalaNativeRenderer* renderer, int id, int data1, int data2, int data3, int data4, int data5, int data6)
+    GraphicsNativeRenderer* renderer, int id, int data1, int data2, int data3, int data4, int data5, int data6)
 {
     auto* state = reinterpret_cast<DefaultNativeRendererState*>(renderer->context);
-    if (id == SkoalaNativeRendererIdFBO) {
+    if (id == GraphicsNativeRendererIdFBO) {
         state->mode = OpenGLMode;
     }
-    if (id == SkoalaNativeRendererIdPixels) {
+    if (id == GraphicsNativeRendererIdPixels) {
         state->mode = SoftMode;
         state->softPixels = asPointer<uint32_t>(data1, data2);
         memset(state->softPixels, 0, state->width * state->height * 4);
@@ -142,9 +142,9 @@ static int defaultRendererSendMessage(
     return 0;
 }
 
-KNativePointer impl_skoala_SkoalaNativeRenderer__1nDefaultNativeRenderer()
+KNativePointer impl_skoala_GraphicsNativeRenderer__1nDefaultNativeRenderer()
 {
-    SkoalaNativeRenderer* result = new SkoalaNativeRenderer();
+    GraphicsNativeRenderer* result = new GraphicsNativeRenderer();
     result->context = nullptr;
     result->onInit = defaultRendererOnInit;
     result->onDeinit = defaultRendererOnDeinit;
@@ -154,15 +154,15 @@ KNativePointer impl_skoala_SkoalaNativeRenderer__1nDefaultNativeRenderer()
 
     return result;
 }
-KOALA_INTEROP_0(skoala_SkoalaNativeRenderer__1nDefaultNativeRenderer, KNativePointer)
+KOALA_INTEROP_0(skoala_GraphicsNativeRenderer__1nDefaultNativeRenderer, KNativePointer)
 
 struct LibraryRendererState {
     void* module;
-    void (*onDeinit)(SkoalaNativeRenderer*);
-    LibraryRendererState(void* module, void (*onDeinit)(SkoalaNativeRenderer*)) : module(module), onDeinit(onDeinit) {}
+    void (*onDeinit)(GraphicsNativeRenderer*);
+    LibraryRendererState(void* module, void (*onDeinit)(GraphicsNativeRenderer*)) : module(module), onDeinit(onDeinit) {}
 };
 
-static void libraryRendererOnDeinit(SkoalaNativeRenderer* renderer)
+static void libraryRendererOnDeinit(GraphicsNativeRenderer* renderer)
 {
     LibraryRendererState* state = reinterpret_cast<LibraryRendererState*>(renderer->context);
     auto module = state->module;
@@ -185,23 +185,23 @@ public:
             return;
         ;
 
-        auto* onInit = reinterpret_cast<void (*)(SkoalaNativeRenderer*, void*, int, int)>(
+        auto* onInit = reinterpret_cast<void (*)(GraphicsNativeRenderer*, void*, int, int)>(
             findFunction(library, "SkoalaRenderer_onInit"));
         auto* onDeinit =
-            reinterpret_cast<void (*)(SkoalaNativeRenderer*)>(findFunction(library, "SkoalaRenderer_onDeinit"));
+            reinterpret_cast<void (*)(GraphicsNativeRenderer*)>(findFunction(library, "SkoalaRenderer_onDeinit"));
         auto* onDraw =
-            reinterpret_cast<void (*)(SkoalaNativeRenderer*, int, int)>(findFunction(library, "SkoalaRenderer_onDraw"));
+            reinterpret_cast<void (*)(GraphicsNativeRenderer*, int, int)>(findFunction(library, "SkoalaRenderer_onDraw"));
         auto* checkRedraw =
-            reinterpret_cast<int (*)(SkoalaNativeRenderer*)>(findFunction(library, "SkoalaRenderer_checkRedraw"));
-        auto* sendMessage = reinterpret_cast<int (*)(SkoalaNativeRenderer*, int, int, int, int, int, int, int)>(
+            reinterpret_cast<int (*)(GraphicsNativeRenderer*)>(findFunction(library, "SkoalaRenderer_checkRedraw"));
+        auto* sendMessage = reinterpret_cast<int (*)(GraphicsNativeRenderer*, int, int, int, int, int, int, int)>(
             findFunction(library, "SkoalaRenderer_sendMessage"));
         auto* onLoad =
-            reinterpret_cast<void (*)(SkoalaNativeRenderer*)>(findFunction(library, "SkoalaRenderer_onLoad"));
+            reinterpret_cast<void (*)(GraphicsNativeRenderer*)>(findFunction(library, "SkoalaRenderer_onLoad"));
 
         if (!onInit || !onDeinit || !onDraw || !checkRedraw || !sendMessage)
             return;
 
-        this->result = new SkoalaNativeRenderer();
+        this->result = new GraphicsNativeRenderer();
         result->context = new LibraryRendererState(library, onDeinit);
         result->onInit = onInit;
         result->onDeinit = libraryRendererOnDeinit;
@@ -221,10 +221,10 @@ public:
 
 private:
     SkString path;
-    SkoalaNativeRenderer* result;
+    GraphicsNativeRenderer* result;
 };
 
-Napi::Value Node_skoala_SkoalaNativeRenderer__1nLibraryNativeRenderer(const Napi::CallbackInfo& info)
+Napi::Value Node_skoala_GraphicsNativeRenderer__1nLibraryNativeRenderer(const Napi::CallbackInfo& info)
 {
     if (2 != info.Length()) {
         Napi::Error::New(info.Env(), "Wrong arg count").ThrowAsJavaScriptException();
@@ -237,7 +237,7 @@ Napi::Value Node_skoala_SkoalaNativeRenderer__1nLibraryNativeRenderer(const Napi
     job->Queue();
     return makeVoid(info);
 }
-MAKE_INTEROP_NODE_EXPORT(skoala_SkoalaNativeRenderer__1nLibraryNativeRenderer)
+MAKE_INTEROP_NODE_EXPORT(skoala_GraphicsNativeRenderer__1nLibraryNativeRenderer)
 
 struct NativeModuleState {
     void* module;
diff --git a/incremental/graphics/native/platform/cpp/SoftwareNativeRenderer.cc b/incremental/graphics/native/platform/cpp/SoftwareNativeRenderer.cc
index cc0a8434032c6586429507651b921aeb832c52e7..55ab0f8ff0863ba66043d78c4cfccb7a9e343b2d 100644
--- a/incremental/graphics/native/platform/cpp/SoftwareNativeRenderer.cc
+++ b/incremental/graphics/native/platform/cpp/SoftwareNativeRenderer.cc
@@ -18,14 +18,14 @@
 
 class NativeSoftwareRenderer : public NativeRenderer {
 public:
-    NativeSoftwareRenderer(int width, int height, SkoalaNativeRenderer* renderer)
+    NativeSoftwareRenderer(int width, int height, GraphicsNativeRenderer* renderer)
         : NativeRenderer(width, height, renderer)
     {
         if (makeSurface()) {
             if (renderer) {
                 renderer->onInit(renderer, nullptr, width, height);
                 uintptr_t pixelsPtr = reinterpret_cast<uintptr_t>(pixels->writable_data());
-                renderer->sendMessage(renderer, SkoalaNativeRendererIdPixels, (pixelsPtr & 0xffffffff),
+                renderer->sendMessage(renderer, GraphicsNativeRendererIdPixels, (pixelsPtr & 0xffffffff),
                     (pixelsPtr >> 32), colorType, 0, 0, 0);
             }
         }
@@ -68,7 +68,7 @@ KOALA_INTEROP_1(skoala_TexturedImage__1nGetSurface, KNativePointer, KNativePoint
 KNativePointer impl_skoala_TexturedImage__1nMakeNativeSoftwareRenderer(
     KInt width, KInt height, KNativePointer nativeRendererPtr)
 {
-    SkoalaNativeRenderer* nativeRenderer = reinterpret_cast<SkoalaNativeRenderer*>(nativeRendererPtr);
+    GraphicsNativeRenderer* nativeRenderer = reinterpret_cast<GraphicsNativeRenderer*>(nativeRendererPtr);
     NativeSoftwareRenderer* renderer = new NativeSoftwareRenderer(width, height, nativeRenderer);
     return renderer;
 }
diff --git a/incremental/graphics/native/platform/cpp/android/engine.h b/incremental/graphics/native/platform/cpp/android/engine.h
index 3727ae210810a887f340ce57aba7298e5b341189..9479e24752ff0286f245313e4c057d0890512a41 100644
--- a/incremental/graphics/native/platform/cpp/android/engine.h
+++ b/incremental/graphics/native/platform/cpp/android/engine.h
@@ -17,7 +17,7 @@
 
 #include "jni-bridge.h"
 #include "node-interop.h"
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #include <EGL/egl.h>
 #include <GLES/gl.h>
diff --git a/incremental/graphics/native/platform/cpp/android/main.cc b/incremental/graphics/native/platform/cpp/android/main.cc
index 83d696c1b3050c19e2a127bbf5a615c06426c9c5..bc8951fedadd53e61718af07e8ddd659ce75bfb6 100644
--- a/incremental/graphics/native/platform/cpp/android/main.cc
+++ b/incremental/graphics/native/platform/cpp/android/main.cc
@@ -17,7 +17,7 @@
 #include "engine.h"
 #include "logdefs.h"
 #include "node-interop.h"
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #include <EGL/egl.h>
 #include <GLES/gl.h>
diff --git a/incremental/graphics/native/platform/cpp/clipboard.cc b/incremental/graphics/native/platform/cpp/clipboard.cc
index 1480c4974ffb9fa7e06381a5c0d1a4ca38ec4366..689cf554c6d25e5946ad1bc4b72c6841f429fec5 100644
--- a/incremental/graphics/native/platform/cpp/clipboard.cc
+++ b/incremental/graphics/native/platform/cpp/clipboard.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 KNativePointer impl_skoala_NodeClipboard__1nReadText(KNativePointer peerPtr, KNativePointer context)
 {
diff --git a/incremental/graphics/native/platform/cpp/frame.cc b/incremental/graphics/native/platform/cpp/frame.cc
index 70f0479fb506dba4bb8395496ea61a79605f97d4..1ef5121284617c8ff0489dda212986c636d536af 100644
--- a/incremental/graphics/native/platform/cpp/frame.cc
+++ b/incremental/graphics/native/platform/cpp/frame.cc
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "SkoalaCursor.h"
-#include "skoala-interop.h"
+#include "GraphicsCursor.h"
+#include "graphics-interop.h"
 
 #include <stdlib.h>
 
@@ -121,7 +121,7 @@ void impl_skoala_setCursor(KNativePointer peerPtr, KNativePointer frame, KInt cu
 {
     RedrawerPeerBase* peer = reinterpret_cast<RedrawerPeerBase*>(peerPtr);
     if (peer->setCursor)
-        peer->setCursor(peer->engine, frame, static_cast<SkoalaCursor>(cursor));
+        peer->setCursor(peer->engine, frame, static_cast<GraphicsCursor>(cursor));
 }
 KOALA_INTEROP_V3(skoala_setCursor, KNativePointer, KNativePointer, KInt)
 
diff --git a/incremental/graphics/native/platform/cpp/glfw/GLNativeRenderer.cc b/incremental/graphics/native/platform/cpp/glfw/GLNativeRenderer.cc
index 4344440363ee690c2ca47d24e44aef81d7ce3334..8c51dad0ea96b50a167ad32a5d0715ce2444d26e 100644
--- a/incremental/graphics/native/platform/cpp/glfw/GLNativeRenderer.cc
+++ b/incremental/graphics/native/platform/cpp/glfw/GLNativeRenderer.cc
@@ -23,7 +23,7 @@
 #include "common-interop.h"
 #include "ganesh/SkSurfaceGanesh.h"
 #include "ganesh/gl/GrGLBackendSurface.h"
-#include "skoala.h"
+#include "graphics.h"
 
 #ifdef SK_BUILD_FOR_WIN
 #include <windows.h>
@@ -165,7 +165,7 @@ public:
     GLuint texture = 0;
     GLuint framebuffer = 0;
     NativeGLRenderer(
-        int width, int height, GrDirectContext* context, GLFWwindow* window, SkoalaNativeRenderer* renderer)
+        int width, int height, GrDirectContext* context, GLFWwindow* window, GraphicsNativeRenderer* renderer)
         : NativeRenderer(width, height, renderer)
     {
         this->context = context;
@@ -221,9 +221,9 @@ KNativePointer impl_skoala_TexturedImage__1nMakeNativeGLRenderer(
 {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(contextPtr);
     GLFWwindow* window = reinterpret_cast<GLFWwindow*>(windowPtr);
-    SkoalaNativeRenderer* nativeRenderer = reinterpret_cast<SkoalaNativeRenderer*>(nativeRendererPtr);
+    GraphicsNativeRenderer* nativeRenderer = reinterpret_cast<GraphicsNativeRenderer*>(nativeRendererPtr);
     NativeGLRenderer* renderer = new NativeGLRenderer(width, height, context, window, nativeRenderer);
-    nativeRenderer->sendMessage(nativeRenderer, SkoalaNativeRendererIdFBO, renderer->framebuffer, 0, 0, 0, 0, 0);
+    nativeRenderer->sendMessage(nativeRenderer, GraphicsNativeRendererIdFBO, renderer->framebuffer, 0, 0, 0, 0, 0);
     return renderer;
 }
 KOALA_INTEROP_5(skoala_TexturedImage__1nMakeNativeGLRenderer, KNativePointer, KInt, KInt, KNativePointer,
diff --git a/incremental/graphics/native/platform/cpp/glfw/glfw-metal.mm b/incremental/graphics/native/platform/cpp/glfw/glfw-metal.mm
index f08984537cebfc05cdd7bcd480bbfe2fefd1f15a..ea938f3c7ba3234655e5ffafcac807dbb98a98b0 100644
--- a/incremental/graphics/native/platform/cpp/glfw/glfw-metal.mm
+++ b/incremental/graphics/native/platform/cpp/glfw/glfw-metal.mm
@@ -29,7 +29,7 @@
 #import <mtl/GrMtlBackendContext.h>
 #import <mtl/GrMtlTypes.h>
 
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 void globalPointer(int &x, int &y) {
     NSPoint p = [NSEvent mouseLocation];
diff --git a/incremental/graphics/native/platform/cpp/glfw/glfw.cc b/incremental/graphics/native/platform/cpp/glfw/glfw.cc
index e9e4e86798af1855671c2a3eda3a2d9bc75b7f52..f9741904f972d8989ce60248e2931ca1f71556e6 100644
--- a/incremental/graphics/native/platform/cpp/glfw/glfw.cc
+++ b/incremental/graphics/native/platform/cpp/glfw/glfw.cc
@@ -36,7 +36,7 @@
 #include <GL/gl.h>
 #endif
 
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #ifdef KOALA_NAPI
 #include "node-interop.h"
@@ -46,7 +46,7 @@
 #include <X11/Xlib.h>
 #endif
 
-#include "SkoalaCursor.h"
+#include "GraphicsCursor.h"
 
 #ifndef SK_BUILD_FOR_MAC
 void globalPointer(int& x, int& y)
@@ -423,7 +423,7 @@ void mouse_scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
 
 class GLFWCursorFactory {
 public:
-    static GLFWcursor* getCursor(SkoalaCursor cursor)
+    static GLFWcursor* getCursor(GraphicsCursor cursor)
     {
         return _instance.getCursorPriv(cursor);
     }
@@ -431,29 +431,29 @@ public:
 private:
     static GLFWCursorFactory _instance;
 
-    GLFWcursor* cache[static_cast<int>(SkoalaCursor::MaxValue)];
+    GLFWcursor* cache[static_cast<int>(GraphicsCursor::MaxValue)];
 
-    GLFWcursor* createCursor(SkoalaCursor cursor)
+    GLFWcursor* createCursor(GraphicsCursor cursor)
     {
         switch (cursor) {
-            case SkoalaCursor::Pointer:
+            case GraphicsCursor::Pointer:
                 return glfwCreateStandardCursor(GLFW_HAND_CURSOR);
-            case SkoalaCursor::Text:
+            case GraphicsCursor::Text:
                 return glfwCreateStandardCursor(GLFW_IBEAM_CURSOR);
-            case SkoalaCursor::ResizeX:
+            case GraphicsCursor::ResizeX:
                 return glfwCreateStandardCursor(GLFW_HRESIZE_CURSOR);
-            case SkoalaCursor::ResizeY:
+            case GraphicsCursor::ResizeY:
                 return glfwCreateStandardCursor(GLFW_VRESIZE_CURSOR);
-            case SkoalaCursor::ResizeXY:
+            case GraphicsCursor::ResizeXY:
                 return glfwCreateStandardCursor(GLFW_CROSSHAIR_CURSOR);
             default:
                 return nullptr;
         }
     }
 
-    GLFWcursor* getCursorPriv(SkoalaCursor cursor)
+    GLFWcursor* getCursorPriv(GraphicsCursor cursor)
     {
-        if (cursor == SkoalaCursor::Default) {
+        if (cursor == GraphicsCursor::Default) {
             return nullptr;
         }
 
@@ -856,7 +856,7 @@ struct GLFWEngine {
         recordState.mode = mode;
     }
 
-    void setCursor(GLFWwindow* window, SkoalaCursor cursor)
+    void setCursor(GLFWwindow* window, GraphicsCursor cursor)
     {
         glfwSetCursor(window, GLFWCursorFactory::getCursor(cursor));
     }
@@ -1000,7 +1000,7 @@ static void send_request(void* enginePtr, void* context, KInt type, KInt data1,
     }
 }
 
-static void set_cursor(void* enginePtr, void* context, SkoalaCursor cursor)
+static void set_cursor(void* enginePtr, void* context, GraphicsCursor cursor)
 {
     GLFWEngine* engine = reinterpret_cast<GLFWEngine*>(enginePtr);
     GLFWwindow* window = reinterpret_cast<GLFWwindow*>(context);
diff --git a/incremental/graphics/native/platform/cpp/ios/engine.h b/incremental/graphics/native/platform/cpp/ios/engine.h
index 360f39fa72a4f74caa07e3a9d159f399c9cb2a55..86e7b8af96a65e074cf4e9002ca9709a4e57f1e4 100644
--- a/incremental/graphics/native/platform/cpp/ios/engine.h
+++ b/incremental/graphics/native/platform/cpp/ios/engine.h
@@ -54,7 +54,7 @@ struct IosEngine {
     void requestHaptic(int p1, int p2);
     void softKeyboard(bool show);
     void commitInput();
-    void setCursor(UIWindow* window, SkoalaCursor cursor);
+    void setCursor(UIWindow* window, GraphicsCursor cursor);
     void setMousePoint(CGPoint point);
     void globalPointer(int &x, int &y);
 };
diff --git a/incremental/graphics/native/platform/cpp/ios/engine.mm b/incremental/graphics/native/platform/cpp/ios/engine.mm
index fa1b9094dda8cfe986a4a79dd106e8293c1171be..a101315d63bbae639c676590466b130bfcff1b5a 100644
--- a/incremental/graphics/native/platform/cpp/ios/engine.mm
+++ b/incremental/graphics/native/platform/cpp/ios/engine.mm
@@ -254,7 +254,7 @@ void IosEngine::commitInput() {
     [theKoalaView cleanEnteredText];
 }
 
-void IosEngine::setCursor(UIWindow* window, SkoalaCursor cursor) {
+void IosEngine::setCursor(UIWindow* window, GraphicsCursor cursor) {
     return;
 }
 
@@ -326,7 +326,7 @@ static void commit_input(void* enginePtr) {
     return engine->commitInput();
 }
 
-static void set_cursor(void* enginePtr, void* context, SkoalaCursor cursor) {
+static void set_cursor(void* enginePtr, void* context, GraphicsCursor cursor) {
     IosEngine* engine = reinterpret_cast<IosEngine*>(enginePtr);
     UIWindow* window = (__bridge UIWindow*)context;
     return engine->setCursor(window, cursor);
diff --git a/incremental/graphics/native/platform/cpp/jsc/jsc-interop.h b/incremental/graphics/native/platform/cpp/jsc/jsc-interop.h
index 53cb3ae15fac7c450dbfdb52be26b245ce19117e..36a696fbc0088e4f5f1acd111941a35de64067c1 100644
--- a/incremental/graphics/native/platform/cpp/jsc/jsc-interop.h
+++ b/incremental/graphics/native/platform/cpp/jsc/jsc-interop.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include "Event.h"
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #include <deque>
 #include <iostream>
diff --git a/incremental/graphics/native/platform/cpp/jsc/platform-api.cc b/incremental/graphics/native/platform/cpp/jsc/platform-api.cc
index b3ba76b6e82d3c873113840b2ee694be7a190e4d..8e4a7e0679dffd1eb6442684641eea45bb88b6da 100644
--- a/incremental/graphics/native/platform/cpp/jsc/platform-api.cc
+++ b/incremental/graphics/native/platform/cpp/jsc/platform-api.cc
@@ -16,7 +16,7 @@
 #include "common-interop.h"
 #include "common-redrawer.h"
 #include "jsc-interop.h"
-#include "skoala.h"
+#include "graphics.h"
 
 #include <iostream>
 
diff --git a/incremental/graphics/native/platform/cpp/jsc/platform-api.mm b/incremental/graphics/native/platform/cpp/jsc/platform-api.mm
index 09b7ce19eb42848699ddcd0d9527360569735e3a..1904ad88c013342f2597e1caa7bc659665b0112f 100644
--- a/incremental/graphics/native/platform/cpp/jsc/platform-api.mm
+++ b/incremental/graphics/native/platform/cpp/jsc/platform-api.mm
@@ -27,7 +27,7 @@
 
 #include "common-interop.h"
 #include "jsc-interop.h"
-#include "skoala.h"
+#include "graphics.h"
 #include "SkString.h"
 
 #include <mach/mach.h>
diff --git a/incremental/graphics/native/platform/cpp/node/platform-api.cc b/incremental/graphics/native/platform/cpp/node/platform-api.cc
index 6b94731509d47ccff6e32a83dc7d40e1f75b1ec7..f7fcecff2420fd1c808b2814638455513362521a 100644
--- a/incremental/graphics/native/platform/cpp/node/platform-api.cc
+++ b/incremental/graphics/native/platform/cpp/node/platform-api.cc
@@ -15,8 +15,8 @@
 
 #include "common-redrawer.h"
 #include "node-interop.h"
-#include "skoala-interop.h"
-#include "skoala.h"
+#include "graphics-interop.h"
+#include "graphics.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/incremental/graphics/native/platform/cpp/ohos/engine.h b/incremental/graphics/native/platform/cpp/ohos/engine.h
index 2f7a0dcac2cca7242dfc3f6dd60a4e42a04940ff..a958556fa5cafcf8e9c8988f74c9e2db62740bad 100644
--- a/incremental/graphics/native/platform/cpp/ohos/engine.h
+++ b/incremental/graphics/native/platform/cpp/ohos/engine.h
@@ -17,7 +17,7 @@
 
 #include "ark-interop.h"
 #include "oh_sk_log.h"
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/incremental/graphics/native/platform/cpp/resources.cc b/incremental/graphics/native/platform/cpp/resources.cc
index 1278864c381c23b7434bebe86a13c0bbb989259d..f1c5a4836774b9a81853a35af1ddf07c66499201 100644
--- a/incremental/graphics/native/platform/cpp/resources.cc
+++ b/incremental/graphics/native/platform/cpp/resources.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "skoala-interop.h"
+#include "graphics-interop.h"
 
 #include <iostream>