diff --git a/examples/core-custom-entrypoint/Game.zig b/examples/core-custom-entrypoint/App.zig
similarity index 99%
rename from examples/core-custom-entrypoint/Game.zig
rename to examples/core-custom-entrypoint/App.zig
index a99a5dfe..ce897cce 100644
--- a/examples/core-custom-entrypoint/Game.zig
+++ b/examples/core-custom-entrypoint/App.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const mach = @import("mach");
 const gpu = mach.gpu;
 
-pub const name = .game;
+pub const name = .app;
 pub const Mod = mach.Mod(@This());
 
 pub const global_events = .{
diff --git a/examples/core-custom-entrypoint/main.zig b/examples/core-custom-entrypoint/main.zig
index 2601f4ef..0a44b180 100644
--- a/examples/core-custom-entrypoint/main.zig
+++ b/examples/core-custom-entrypoint/main.zig
@@ -3,7 +3,7 @@ const mach = @import("mach");
 // The global list of Mach modules registered for use in our application.
 pub const modules = .{
     mach.Core,
-    @import("Game.zig"),
+    @import("App.zig"),
 };
 
 pub fn main() !void {
diff --git a/examples/custom-renderer/Game.zig b/examples/custom-renderer/App.zig
similarity index 98%
rename from examples/custom-renderer/Game.zig
rename to examples/custom-renderer/App.zig
index c559eebd..637d8f45 100644
--- a/examples/custom-renderer/Game.zig
+++ b/examples/custom-renderer/App.zig
@@ -30,7 +30,7 @@ pub const global_events = .{
 
 // Define the globally unique name of our module. You can use any name here, but keep in mind no
 // two modules in the program can have the same name.
-pub const name = .game;
+pub const name = .app;
 
 // The mach.Mod type corresponding to our module struct (this file.) This provides methods for
 // working with this module (e.g. sending events, working with its components, etc.)
@@ -147,7 +147,7 @@ fn tick(
     // Query all the entities that have the .follower tag indicating they should follow the player.
     // TODO(important): better querying API
     var archetypes_iter = core.entities.query(.{ .all = &.{
-        .{ .game = &.{.follower} },
+        .{ .app = &.{.follower} },
     } });
     while (archetypes_iter.next()) |archetype| {
         // Iterate the ID and position of each entity
@@ -161,7 +161,7 @@ fn tick(
             var avoidance = Vec3.splat(0);
             var avoidance_div: f32 = 1.0;
             var archetypes_iter_2 = core.entities.query(.{ .all = &.{
-                .{ .game = &.{.follower} },
+                .{ .app = &.{.follower} },
             } });
             while (archetypes_iter_2.next()) |archetype_2| {
                 const other_ids = archetype_2.slice(.entity, .id);
diff --git a/examples/custom-renderer/main.zig b/examples/custom-renderer/main.zig
index 07c27a5d..c912b238 100644
--- a/examples/custom-renderer/main.zig
+++ b/examples/custom-renderer/main.zig
@@ -1,14 +1,12 @@
 const std = @import("std");
 
 const mach = @import("mach");
-const Renderer = @import("Renderer.zig");
-const Game = @import("Game.zig");
 
 // The global list of Mach modules registered for use in our application.
 pub const modules = .{
     mach.Core,
-    Renderer,
-    Game,
+    @import("App.zig"),
+    @import("Renderer.zig"),
 };
 
 // TODO: move this to a mach "entrypoint" zig module
diff --git a/examples/glyphs/Game.zig b/examples/glyphs/App.zig
similarity index 99%
rename from examples/glyphs/Game.zig
rename to examples/glyphs/App.zig
index ac20f307..1bd9e6f0 100644
--- a/examples/glyphs/Game.zig
+++ b/examples/glyphs/App.zig
@@ -29,7 +29,7 @@ frame_render_pass: *gpu.RenderPassEncoder = undefined,
 
 // Define the globally unique name of our module. You can use any name here, but keep in mind no
 // two modules in the program can have the same name.
-pub const name = .game;
+pub const name = .app;
 pub const Mod = mach.Mod(@This());
 
 pub const global_events = .{
diff --git a/examples/glyphs/main.zig b/examples/glyphs/main.zig
index 4638e141..b5764514 100644
--- a/examples/glyphs/main.zig
+++ b/examples/glyphs/main.zig
@@ -5,8 +5,8 @@ pub const modules = .{
     mach.Core,
     mach.gfx.Sprite,
     mach.gfx.SpritePipeline,
+    @import("App.zig"),
     @import("Glyphs.zig"),
-    @import("Game.zig"),
 };
 
 // TODO(important): use standard entrypoint instead
diff --git a/examples/piano/Piano.zig b/examples/piano/App.zig
similarity index 99%
rename from examples/piano/Piano.zig
rename to examples/piano/App.zig
index 05230cf9..4795c12b 100644
--- a/examples/piano/Piano.zig
+++ b/examples/piano/App.zig
@@ -20,7 +20,7 @@ pub const App = @This();
 
 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
 
-pub const name = .piano;
+pub const name = .app;
 pub const Mod = mach.Mod(@This());
 
 pub const global_events = .{
diff --git a/examples/piano/main.zig b/examples/piano/main.zig
index 64859dfe..17065b6b 100644
--- a/examples/piano/main.zig
+++ b/examples/piano/main.zig
@@ -4,7 +4,7 @@ const mach = @import("mach");
 pub const modules = .{
     mach.Core,
     mach.Audio,
-    @import("Piano.zig"),
+    @import("App.zig"),
 };
 
 // TODO(important): use standard entrypoint instead
diff --git a/examples/sprite/Game.zig b/examples/sprite/App.zig
similarity index 99%
rename from examples/sprite/Game.zig
rename to examples/sprite/App.zig
index 7f4a0f8c..f3737ff7 100644
--- a/examples/sprite/Game.zig
+++ b/examples/sprite/App.zig
@@ -33,7 +33,7 @@ frame_render_pass: *gpu.RenderPassEncoder = undefined,
 
 // Define the globally unique name of our module. You can use any name here, but keep in mind no
 // two modules in the program can have the same name.
-pub const name = .game;
+pub const name = .app;
 pub const Mod = mach.Mod(@This());
 
 pub const global_events = .{
diff --git a/examples/sprite/main.zig b/examples/sprite/main.zig
index 8dfdd6cb..acc8509d 100644
--- a/examples/sprite/main.zig
+++ b/examples/sprite/main.zig
@@ -5,7 +5,7 @@ pub const modules = .{
     mach.Core,
     mach.gfx.Sprite,
     mach.gfx.SpritePipeline,
-    @import("Game.zig"),
+    @import("App.zig"),
 };
 
 // TODO(important): use standard entrypoint instead
diff --git a/examples/text/Game.zig b/examples/text/App.zig
similarity index 100%
rename from examples/text/Game.zig
rename to examples/text/App.zig
diff --git a/examples/text/main.zig b/examples/text/main.zig
index 12e5676a..c5f962f8 100644
--- a/examples/text/main.zig
+++ b/examples/text/main.zig
@@ -6,7 +6,7 @@ pub const modules = .{
     mach.gfx.Text,
     mach.gfx.TextPipeline,
     mach.gfx.TextStyle,
-    @import("Game.zig"),
+    @import("App.zig"),
 };
 
 // TODO(important): use standard entrypoint instead