diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 789e2640f6..4422c2ee35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Run Auto test Client
         uses: modmuss50/xvfb-action@v1
         with:
-          run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
+          run: ./gradlew runProductionClientGametest --stacktrace --warning-mode=fail
       - uses: actions/upload-artifact@v4
         if: always()
         with:
diff --git a/build.gradle b/build.gradle
index a00199f6bd..24cfcb4c21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -417,9 +417,9 @@ loom {
 			name  "Auto Test Server"
 			vmArg "-Dfabric.autoTest"
 		}
-		autoTestClient {
+		clientGametest {
 			inherit testmodClient
-			name "Auto Test Client"
+			name "Client Game Test"
 			vmArg "-Dfabric.client.gametest"
 			vmArg "-Dfabric-tag-conventions-v2.missingTagTranslationWarning=fail"
 			vmArg "-Dfabric-tag-conventions-v1.legacyTagWarning=fail"
@@ -432,9 +432,9 @@ loom {
 			ideConfigGenerated = false
 		}
 
-		autoTestClientCoverage {
-			inherit autoTestClient
-			name "Auto Test Client Coverage"
+		clientGametestCoverage {
+			inherit clientGametest
+			name "Client Game Test Coverage"
 			ideConfigGenerated = false
 		}
 	}
@@ -448,7 +448,7 @@ test.dependsOn runGametest
 
 def coverageTasks = [
 	runGametestCoverage,
-	runAutoTestClientCoverage
+	runClientGametestCoverage
 ]
 
 jacoco {
@@ -502,7 +502,7 @@ import net.fabricmc.loom.util.Platform
 def productionMods = project.files(configurations.productionMods, remapJar.archiveFile, remapTestmodJar.archiveFile)
 
 // This is very far beyond loom's API if you copy this, you're on your own.
-tasks.register('runProductionAutoTestClient', JavaExec) {
+tasks.register('runProductionClientGametest', JavaExec) {
 	dependsOn productionMods, downloadAssets
 	classpath.from configurations.productionRuntime
 	mainClass = "net.fabricmc.loader.impl.launch.knot.KnotClient"