diff --git a/fabric/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java b/fabric/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
index 4db1ef980..6b05b1e62 100644
--- a/fabric/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
+++ b/fabric/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
@@ -5,22 +5,24 @@
 import org.spongepowered.asm.mixin.MixinEnvironment;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 
 public class FlywheelTestModClient implements ClientModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger("Flywheel Test Mod");
+	public static final String NAME = "Flywheel Test Mod";
+	private static final Logger LOGGER = LoggerFactory.getLogger(NAME);
 
 	@Override
 	public void onInitializeClient() {
-		LOGGER.info("Starting Test Mod, on Env: {}", FabricLoader.getInstance().getEnvironmentType());
+		LOGGER.info("Starting {} on EnvType: {}", NAME, FabricLoader.getInstance()
+				.getEnvironmentType());
 
-		ClientTickEvents.END_CLIENT_TICK.register(client -> {
+		ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
 			LOGGER.info("Running mixin audit");
 			MixinEnvironment.getCurrentEnvironment()
 					.audit();
 
-			LOGGER.info("Ran mixin audit, stopping client.");
+			LOGGER.info("Stopping client");
 			client.stop();
 		});
 	}
diff --git a/fabric/src/testMod/resources/fabric.mod.json b/fabric/src/testMod/resources/fabric.mod.json
index e7059786b..11bd545a1 100644
--- a/fabric/src/testMod/resources/fabric.mod.json
+++ b/fabric/src/testMod/resources/fabric.mod.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "${mod_id}-testmod",
+  "id" : "${mod_id}_testmod",
   "name": "${mod_name} Test Mod",
   "version": "1.0.0",
   "environment": "*",
diff --git a/forge/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java b/forge/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
index a2fcbcf4e..f04eb604f 100644
--- a/forge/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
+++ b/forge/src/testMod/java/dev/engine_room/flywheel/FlywheelTestModClient.java
@@ -12,10 +12,11 @@
 
 @Mod("flywheel_testmod")
 public class FlywheelTestModClient {
-	private static final Logger LOGGER = LoggerFactory.getLogger("Flywheel Test Mod");
+	public static final String NAME = "Flywheel Test Mod";
+	private static final Logger LOGGER = LoggerFactory.getLogger(NAME);
 
 	public FlywheelTestModClient() {
-		LOGGER.info("Starting Test Mod, on Dist: {}", FMLLoader.getDist());
+		LOGGER.info("Starting {} on Dist: {}", NAME, FMLLoader.getDist());
 
 		MinecraftForge.EVENT_BUS.addListener((TickEvent.ClientTickEvent e) -> {
 			if (e.phase == TickEvent.Phase.END) {
@@ -23,7 +24,7 @@ public FlywheelTestModClient() {
 				MixinEnvironment.getCurrentEnvironment()
 						.audit();
 
-				LOGGER.info("Ran mixin audit, stopping client.");
+				LOGGER.info("Stopping client");
 				Minecraft.getInstance()
 						.stop();
 			}