diff --git a/src/core/examples/boids/main.zig b/src/core/examples/boids/main.zig
index 1f09e8b1..e0489b38 100644
--- a/src/core/examples/boids/main.zig
+++ b/src/core/examples/boids/main.zig
@@ -1,8 +1,10 @@
 /// A port of Austin Eng's "computeBoids" webgpu sample.
 /// https://github.com/austinEng/webgpu-samples/blob/main/src/sample/computeBoids/main.ts
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 title_timer: core.Timer,
 timer: core.Timer,
diff --git a/src/core/examples/clear-color/main.zig b/src/core/examples/clear-color/main.zig
index 7747efd7..9f2f183c 100644
--- a/src/core/examples/clear-color/main.zig
+++ b/src/core/examples/clear-color/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const renderer = @import("renderer.zig");
 
 pub const App = @This();
diff --git a/src/core/examples/clear-color/renderer.zig b/src/core/examples/clear-color/renderer.zig
index 1ad7924a..51c84b69 100644
--- a/src/core/examples/clear-color/renderer.zig
+++ b/src/core/examples/clear-color/renderer.zig
@@ -1,5 +1,6 @@
-const core = @import("mach").core;
-const gpu = core.gpu;
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const Renderer = @This();
 
diff --git a/src/core/examples/cubemap/main.zig b/src/core/examples/cubemap/main.zig
index 1ef2d54c..ce970649 100644
--- a/src/core/examples/cubemap/main.zig
+++ b/src/core/examples/cubemap/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/deferred-rendering/main.zig b/src/core/examples/deferred-rendering/main.zig
index 80070e19..3c93009b 100644
--- a/src/core/examples/deferred-rendering/main.zig
+++ b/src/core/examples/deferred-rendering/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const m3d = @import("model3d");
 const zm = @import("zmath");
 const assets = @import("assets");
diff --git a/src/core/examples/fractal-cube/main.zig b/src/core/examples/fractal-cube/main.zig
index e793e6e4..fe5eb6c2 100755
--- a/src/core/examples/fractal-cube/main.zig
+++ b/src/core/examples/fractal-cube/main.zig
@@ -9,8 +9,11 @@
 //! for opengl
 
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/gen-texture-light/main.zig b/src/core/examples/gen-texture-light/main.zig
index db4ebf7d..cae11f65 100755
--- a/src/core/examples/gen-texture-light/main.zig
+++ b/src/core/examples/gen-texture-light/main.zig
@@ -7,10 +7,12 @@
 // move camera with arrows or wasd
 
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
-const zm = @import("zmath");
 
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
+const zm = @import("zmath");
 const Vec = zm.Vec;
 const Mat = zm.Mat;
 const Quat = zm.Quat;
diff --git a/src/core/examples/image-blur/main.zig b/src/core/examples/image-blur/main.zig
index 2d39a48a..7851d85a 100644
--- a/src/core/examples/image-blur/main.zig
+++ b/src/core/examples/image-blur/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/image/main.zig b/src/core/examples/image/main.zig
index fafe1b75..a9a3800d 100644
--- a/src/core/examples/image/main.zig
+++ b/src/core/examples/image/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/instanced-cube/main.zig b/src/core/examples/instanced-cube/main.zig
index f0babde7..3f0eabe8 100755
--- a/src/core/examples/instanced-cube/main.zig
+++ b/src/core/examples/instanced-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/map-async/main.zig b/src/core/examples/map-async/main.zig
index fc323a35..594e2ae7 100644
--- a/src/core/examples/map-async/main.zig
+++ b/src/core/examples/map-async/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/pbr-basic/main.zig b/src/core/examples/pbr-basic/main.zig
index b5ca6e16..a90bd715 100644
--- a/src/core/examples/pbr-basic/main.zig
+++ b/src/core/examples/pbr-basic/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const m3d = @import("model3d");
 const zm = @import("zmath");
 const assets = @import("assets");
diff --git a/src/core/examples/pixel-post-process/main.zig b/src/core/examples/pixel-post-process/main.zig
index b39b7410..56f10949 100644
--- a/src/core/examples/pixel-post-process/main.zig
+++ b/src/core/examples/pixel-post-process/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/procedural-primitives/main.zig b/src/core/examples/procedural-primitives/main.zig
index c0b24e31..e8a570f9 100644
--- a/src/core/examples/procedural-primitives/main.zig
+++ b/src/core/examples/procedural-primitives/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const renderer = @import("renderer.zig");
 
 pub const App = @This();
diff --git a/src/core/examples/procedural-primitives/renderer.zig b/src/core/examples/procedural-primitives/renderer.zig
index 9fcd6df3..11be2b57 100644
--- a/src/core/examples/procedural-primitives/renderer.zig
+++ b/src/core/examples/procedural-primitives/renderer.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const primitives = @import("procedural-primitives.zig");
 const Primitive = primitives.Primitive;
diff --git a/src/core/examples/rgb-quad/main.zig b/src/core/examples/rgb-quad/main.zig
index 7cd36fa3..50cbfdff 100644
--- a/src/core/examples/rgb-quad/main.zig
+++ b/src/core/examples/rgb-quad/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 const Vertex = extern struct {
     pos: @Vector(2, f32),
diff --git a/src/core/examples/rotating-cube/main.zig b/src/core/examples/rotating-cube/main.zig
index bc4e4e77..2b119b4a 100755
--- a/src/core/examples/rotating-cube/main.zig
+++ b/src/core/examples/rotating-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/sprite2d/main.zig b/src/core/examples/sprite2d/main.zig
index cddc0447..efb8132d 100644
--- a/src/core/examples/sprite2d/main.zig
+++ b/src/core/examples/sprite2d/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const assets = @import("assets");
diff --git a/src/core/examples/sysgpu/boids/main.zig b/src/core/examples/sysgpu/boids/main.zig
index bc5e80c6..ef86aa12 100644
--- a/src/core/examples/sysgpu/boids/main.zig
+++ b/src/core/examples/sysgpu/boids/main.zig
@@ -1,7 +1,9 @@
 /// A port of Austin Eng's "computeBoids" webgpu sample.
 /// https://github.com/austinEng/webgpu-samples/blob/main/src/sample/computeBoids/main.ts
 const std = @import("std");
-const core = @import("mach").core;
+
+const mach = @import("mach");
+const core = mach.core;
 const gpu = core.gpu;
 
 title_timer: core.Timer,
diff --git a/src/core/examples/sysgpu/clear-color/main.zig b/src/core/examples/sysgpu/clear-color/main.zig
index 84aae5ea..7eb60d68 100644
--- a/src/core/examples/sysgpu/clear-color/main.zig
+++ b/src/core/examples/sysgpu/clear-color/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
+
+const mach = @import("mach");
+const core = mach.core;
 const gpu = core.gpu;
+
 const renderer = @import("renderer.zig");
 
 pub const App = @This();
diff --git a/src/core/examples/sysgpu/clear-color/renderer.zig b/src/core/examples/sysgpu/clear-color/renderer.zig
index 1ad7924a..51c84b69 100644
--- a/src/core/examples/sysgpu/clear-color/renderer.zig
+++ b/src/core/examples/sysgpu/clear-color/renderer.zig
@@ -1,5 +1,6 @@
-const core = @import("mach").core;
-const gpu = core.gpu;
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const Renderer = @This();
 
diff --git a/src/core/examples/sysgpu/cubemap/main.zig b/src/core/examples/sysgpu/cubemap/main.zig
index 603d641c..ae82fda2 100644
--- a/src/core/examples/sysgpu/cubemap/main.zig
+++ b/src/core/examples/sysgpu/cubemap/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/sysgpu/deferred-rendering/main.zig b/src/core/examples/sysgpu/deferred-rendering/main.zig
index a793c0c0..d390a795 100644
--- a/src/core/examples/sysgpu/deferred-rendering/main.zig
+++ b/src/core/examples/sysgpu/deferred-rendering/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const m3d = @import("model3d");
 const zm = @import("zmath");
 const assets = @import("assets");
diff --git a/src/core/examples/sysgpu/fractal-cube/main.zig b/src/core/examples/sysgpu/fractal-cube/main.zig
index d18b7413..1b8bad23 100644
--- a/src/core/examples/sysgpu/fractal-cube/main.zig
+++ b/src/core/examples/sysgpu/fractal-cube/main.zig
@@ -9,8 +9,11 @@
 //! for opengl
 
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/sysgpu/gen-texture-light/main.zig b/src/core/examples/sysgpu/gen-texture-light/main.zig
index 20a58ad5..67864ca4 100644
--- a/src/core/examples/sysgpu/gen-texture-light/main.zig
+++ b/src/core/examples/sysgpu/gen-texture-light/main.zig
@@ -7,10 +7,12 @@
 // move camera with arrows or wasd
 
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
-const zm = @import("zmath");
 
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
+const zm = @import("zmath");
 const Vec = zm.Vec;
 const Mat = zm.Mat;
 const Quat = zm.Quat;
diff --git a/src/core/examples/sysgpu/image-blur/main.zig b/src/core/examples/sysgpu/image-blur/main.zig
index cb9eedfd..977a1c28 100644
--- a/src/core/examples/sysgpu/image-blur/main.zig
+++ b/src/core/examples/sysgpu/image-blur/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/sysgpu/image/main.zig b/src/core/examples/sysgpu/image/main.zig
index b605e677..d31a4795 100644
--- a/src/core/examples/sysgpu/image/main.zig
+++ b/src/core/examples/sysgpu/image/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/sysgpu/instanced-cube/main.zig b/src/core/examples/sysgpu/instanced-cube/main.zig
index 8fbfe7f4..db7a4642 100644
--- a/src/core/examples/sysgpu/instanced-cube/main.zig
+++ b/src/core/examples/sysgpu/instanced-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/sysgpu/map-async/main.zig b/src/core/examples/sysgpu/map-async/main.zig
index 7da9e212..8bea8a00 100644
--- a/src/core/examples/sysgpu/map-async/main.zig
+++ b/src/core/examples/sysgpu/map-async/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/sysgpu/pbr-basic/main.zig b/src/core/examples/sysgpu/pbr-basic/main.zig
index 024b5928..a4c26a7d 100644
--- a/src/core/examples/sysgpu/pbr-basic/main.zig
+++ b/src/core/examples/sysgpu/pbr-basic/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const m3d = @import("model3d");
 const zm = @import("zmath");
 const assets = @import("assets");
diff --git a/src/core/examples/sysgpu/pixel-post-process/main.zig b/src/core/examples/sysgpu/pixel-post-process/main.zig
index b3796fb2..c819dfad 100644
--- a/src/core/examples/sysgpu/pixel-post-process/main.zig
+++ b/src/core/examples/sysgpu/pixel-post-process/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/sysgpu/procedural-primitives/main.zig b/src/core/examples/sysgpu/procedural-primitives/main.zig
index f0c51f2f..2dbdf022 100644
--- a/src/core/examples/sysgpu/procedural-primitives/main.zig
+++ b/src/core/examples/sysgpu/procedural-primitives/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const renderer = @import("renderer.zig");
 
 pub const App = @This();
diff --git a/src/core/examples/sysgpu/procedural-primitives/renderer.zig b/src/core/examples/sysgpu/procedural-primitives/renderer.zig
index 0ad0d558..dc45faea 100644
--- a/src/core/examples/sysgpu/procedural-primitives/renderer.zig
+++ b/src/core/examples/sysgpu/procedural-primitives/renderer.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const primitives = @import("procedural-primitives.zig");
 const Primitive = primitives.Primitive;
diff --git a/src/core/examples/sysgpu/rgb-quad/main.zig b/src/core/examples/sysgpu/rgb-quad/main.zig
index 791b53f7..c46aadcd 100644
--- a/src/core/examples/sysgpu/rgb-quad/main.zig
+++ b/src/core/examples/sysgpu/rgb-quad/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 const Vertex = extern struct {
     pos: @Vector(2, f32),
diff --git a/src/core/examples/sysgpu/rotating-cube/main.zig b/src/core/examples/sysgpu/rotating-cube/main.zig
index 42e7a561..41fa61e5 100644
--- a/src/core/examples/sysgpu/rotating-cube/main.zig
+++ b/src/core/examples/sysgpu/rotating-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/sysgpu/sprite2d/main.zig b/src/core/examples/sysgpu/sprite2d/main.zig
index 0bc8d6a5..03dd2cc4 100644
--- a/src/core/examples/sysgpu/sprite2d/main.zig
+++ b/src/core/examples/sysgpu/sprite2d/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const assets = @import("assets");
diff --git a/src/core/examples/sysgpu/textured-cube/main.zig b/src/core/examples/sysgpu/textured-cube/main.zig
index b9119965..77f5831b 100644
--- a/src/core/examples/sysgpu/textured-cube/main.zig
+++ b/src/core/examples/sysgpu/textured-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/sysgpu/textured-quad/main.zig b/src/core/examples/sysgpu/textured-quad/main.zig
index a27f5da7..ed0e8efe 100644
--- a/src/core/examples/sysgpu/textured-quad/main.zig
+++ b/src/core/examples/sysgpu/textured-quad/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/sysgpu/triangle-msaa/main.zig b/src/core/examples/sysgpu/triangle-msaa/main.zig
index eac21780..aceaf3be 100644
--- a/src/core/examples/sysgpu/triangle-msaa/main.zig
+++ b/src/core/examples/sysgpu/triangle-msaa/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/sysgpu/triangle/main.zig b/src/core/examples/sysgpu/triangle/main.zig
index 328e7688..92d74f55 100644
--- a/src/core/examples/sysgpu/triangle/main.zig
+++ b/src/core/examples/sysgpu/triangle/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/sysgpu/two-cubes/main.zig b/src/core/examples/sysgpu/two-cubes/main.zig
index d3ad509e..476f6956 100644
--- a/src/core/examples/sysgpu/two-cubes/main.zig
+++ b/src/core/examples/sysgpu/two-cubes/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
+
+const mach = @import("mach");
+const core = mach.core;
 const gpu = core.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/textured-cube/main.zig b/src/core/examples/textured-cube/main.zig
index 7b0f2347..0c6a1251 100644
--- a/src/core/examples/textured-cube/main.zig
+++ b/src/core/examples/textured-cube/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const zigimg = @import("zigimg");
 const Vertex = @import("cube_mesh.zig").Vertex;
diff --git a/src/core/examples/textured-quad/main.zig b/src/core/examples/textured-quad/main.zig
index 225986dc..dc1cfa4e 100644
--- a/src/core/examples/textured-quad/main.zig
+++ b/src/core/examples/textured-quad/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zigimg = @import("zigimg");
 const assets = @import("assets");
 
diff --git a/src/core/examples/triangle-msaa/main.zig b/src/core/examples/triangle-msaa/main.zig
index d28103ed..7c0e837e 100644
--- a/src/core/examples/triangle-msaa/main.zig
+++ b/src/core/examples/triangle-msaa/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/triangle/main.zig b/src/core/examples/triangle/main.zig
index a348e9f2..f86bb47b 100644
--- a/src/core/examples/triangle/main.zig
+++ b/src/core/examples/triangle/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();
 
diff --git a/src/core/examples/two-cubes/main.zig b/src/core/examples/two-cubes/main.zig
index 4f9a95f5..7a1df3aa 100755
--- a/src/core/examples/two-cubes/main.zig
+++ b/src/core/examples/two-cubes/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
+
 const zm = @import("zmath");
 const Vertex = @import("cube_mesh.zig").Vertex;
 const vertices = @import("cube_mesh.zig").vertices;
diff --git a/src/core/examples/wasm-test/main.zig b/src/core/examples/wasm-test/main.zig
index aaa3a640..c23c3d89 100644
--- a/src/core/examples/wasm-test/main.zig
+++ b/src/core/examples/wasm-test/main.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
-const core = @import("mach").core;
-const gpu = core.gpu;
+
+const mach = @import("mach");
+const core = mach.core;
+const gpu = mach.gpu;
 
 pub const App = @This();