diff --git a/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java b/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java
index 6dce25d..bd06f2c 100644
--- a/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java
+++ b/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java
@@ -36,9 +36,9 @@ public class OpenGradlePlugin extends AbstractPlugin {
 
 		makeTask("download", DownloadTask.class);
 		makeTask("mergeJars", MergeJarsTask.class).dependsOn("download");
-		makeTask("mapJars", MapJarsTask.class).dependsOn("mergeJars");
-		makeTask("processMods", ProcessModsTask.class).dependsOn("mapJars");
-		makeTask("setup", DefaultTask.class).dependsOn("processMods").setGroup("openmodloader");
+		makeTask("processMods", ProcessModsTask.class).dependsOn("mergeJars");
+		makeTask("mapJars", MapJarsTask.class).dependsOn("processMods");
+		makeTask("setup", DefaultTask.class).dependsOn("mapJars").setGroup("openmodloader");
 
 		makeTask("extractNatives", ExtractNativesTask.class).dependsOn("download");
 		makeTask("genIdeaWorkspace", GenIdeaProjectTask.class).dependsOn("idea").setGroup("ide");
diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
index 141bd81..cd9fc24 100644
--- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java
+++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
@@ -252,7 +252,7 @@ public class AbstractPlugin implements Plugin<Project> {
 			}
 		});
 
-		project.getTasks().getByName("build").doLast(task -> {
+		project.getTasks().getByName("jar").doLast(task -> {
 			project.getLogger().lifecycle(":remapping mods");
 			LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
 			try {
diff --git a/src/main/java/net/fabricmc/loom/util/proccessing/PreBakeMixins.java b/src/main/java/net/fabricmc/loom/util/proccessing/PreBakeMixins.java
index 9be07f4..1ef5228 100644
--- a/src/main/java/net/fabricmc/loom/util/proccessing/PreBakeMixins.java
+++ b/src/main/java/net/fabricmc/loom/util/proccessing/PreBakeMixins.java
@@ -40,13 +40,13 @@ public class PreBakeMixins {
 		String[] args = new String[mods.size() + 4];
 		args[0] = "-m";
 		args[1] = Constants.MAPPINGS_TINY.get(extension).getAbsolutePath();
-		args[2] = Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath();
-		args[3] = Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath();
+		args[2] = Constants.MINECRAFT_MERGED_JAR.get(extension).getAbsolutePath();
+		args[3] = Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath();
 		for (int i = 0; i < mods.size(); i++) {
 			args[i + 4] = mods.get(i).getAbsolutePath();
 		}
 		project.getLogger().lifecycle(":preBaking mixins");
-		ProcessModsTask.addFile(Constants.MINECRAFT_MAPPED_JAR.get(extension), this);
+		ProcessModsTask.addFile(Constants.MINECRAFT_MERGED_JAR.get(extension), this);
 		MixinPrebaker.main(args);
 	}