From 177612938a4250ee01230523e58318f0c33a9e5c Mon Sep 17 00:00:00 2001
From: Marc Hermans <marc.hermans@ldtteam.com>
Date: Fri, 21 Jun 2024 19:23:16 +0200
Subject: [PATCH] Initial work on a bunch of improvements with respects to
 handling of Definition, Specification, and NeoForm

---
 .../gradle/common/CommonProjectPlugin.java    |   5 +-
 .../AccessTransformersExtension.java          |   2 +-
 .../extensions/DefaultJarJarFeature.java      |   4 +-
 .../common/extensions/ExtensionManager.java   |   2 +-
 .../MinecraftArtifactCacheExtension.java      |  26 +--
 .../replacement/ReplacementLogic.java         |  14 +-
 .../repository/IvyModuleWriter.java           |   8 +-
 .../extensions/repository/IvyRepository.java  |   2 +-
 .../runs/ide/IdeRunIntegrationManager.java    |   2 +-
 .../definition/CommonRuntimeDefinition.java   |   2 +-
 .../extensions/CommonRuntimeExtension.java    |   4 +-
 .../extensions/DefaultRuntimesContainer.java  |  15 +-
 .../OfficialNamingChannelConfigurator.java    |   8 +-
 .../runtime/naming/renamer/ITypeRenamer.java  |   4 +-
 .../renamer/RegexBasedSourceRenamer.java      |  16 +-
 .../tasks/GenerateDebuggingMappings.java      |   2 +-
 .../CommonRuntimeSpecification.java           |   4 +-
 .../common/runtime/tasks/DefaultRuntime.java  |   8 +-
 .../MinecraftArtifactFileCacheProvider.java   |  13 +-
 .../MinecraftGameArtifactProvidingTask.java   |  10 +
 ...craftVersionManifestFileCacheProvider.java |  15 +-
 .../common/util/TaskDependencyUtils.java      |   2 +-
 .../gradle/common/util/VersionJson.java       |   2 +-
 .../gradle/common/util/run/RunsUtil.java      |   2 +-
 .../gradle/common/util/run/TypesUtil.java     |   2 +-
 .../common/dependency/DependencyFilter.groovy |  12 +-
 .../DependencyManagementObject.groovy         |  16 +-
 ...DependencyVersionInformationHandler.groovy |  16 +-
 .../extensions/AccessTransformers.groovy      |   4 +-
 .../dsl/common/extensions/JarJar.groovy       |   4 +-
 .../dsl/common/extensions/Minecraft.groovy    |   2 +-
 .../extensions/MinecraftArtifactCache.groovy  |   3 +-
 .../replacement/ReplacementResult.groovy      |   2 +-
 .../common/extensions/repository/Entry.groovy |   4 +-
 .../extensions/repository/Repository.groovy   |   2 +-
 .../repository/RepositoryEntryLegacy.groovy   |  40 ++--
 .../repository/RepositoryReference.groovy     |  16 +-
 .../extensions/subsystems/DevLogin.groovy     |   2 +-
 .../conventions/Configurations.groovy         |   6 +-
 .../ide/extensions/IdeaRunExtension.groovy    |   2 +-
 .../common/runs/run/DependencyHandler.groovy  |   4 +-
 .../gradle/dsl/common/runs/run/Run.groovy     |  10 +-
 .../dsl/common/runs/run/RunDevLogin.groovy    |   2 +-
 .../dsl/common/runs/run/RunSourceSets.groovy  |   6 +-
 .../dsl/common/runs/type/RunType.groovy       |  12 +-
 .../common/runtime/CommonRuntimeBuilder.java  |  41 ++++
 .../common/runtime/definition/Definition.java |   8 +-
 .../runtime/definition/DependencyHandler.java |  15 ++
 .../definition/LegacyDefinition.groovy        |  10 +-
 .../common/runtime/definition/Outputs.java    |  37 ++++
 .../runtime/definition/TaskHandler.java       |  26 +--
 .../runtime/extensions/CommonRuntimes.groovy  |  16 +-
 .../GenerationTaskBuildingContext.groovy      |   8 +-
 .../runtime/naming/NamingChannel.groovy       |   4 +-
 .../runtime/naming/TaskBuildingContext.groovy |   8 +-
 .../runtime/spec/LegacySpecification.groovy   |  30 +--
 .../common/runtime/spec/Specification.java    |  38 ++--
 .../common/runtime/spec/TaskTreeBuilder.java  |  19 +-
 .../dsl/common/runtime/tasks/Runtime.groovy   |  83 +-------
 .../runtime/tasks/tree/TaskCustomizer.java    |   2 +-
 .../runtime/tasks/tree/TaskTreeAdapter.groovy |   2 +-
 .../specifications/OutputSpecification.groovy |  18 +-
 .../RuntimeSpecification.groovy               |  19 ++
 .../gradle/dsl/common/util/Artifact.groovy    |   2 +-
 .../dsl/common/util/ConfigurationUtils.groovy |  48 +++--
 .../dsl/common/util/DistributionType.groovy   |  22 +-
 .../common/util/MinecraftArtifactType.java    |   3 +-
 .../common/util/MinecraftVersionAndUrl.groovy |   6 +-
 ...ationSpecV1.java => LegacyNeoFormSdk.java} | 111 ++++++++--
 ...nfigurationSpecV2.java => NeoFormSdk.java} |  21 +-
 .../definition/NeoFormDefinition.groovy       |   4 +-
 .../specification/NeoFormSpecification.groovy |   4 +-
 .../gradle/dsl/platform/model/Library.groovy  |   4 +-
 .../dsl/platform/model/OsCondition.groovy     |   4 +-
 .../specification/UserDevSpecification.groovy |   8 +-
 .../gradle/neoform/FunctionalTests.groovy     |   8 +-
 .../gradle/neoform/NeoFormPluginTests.groovy  |   2 +-
 .../NeoformDependencyManagerTest.groovy       |   8 +-
 .../gradle/neoform/NeoFormProjectPlugin.java  |   2 +-
 .../dependency/NeoFormDependencyManager.java  |  77 +++----
 .../naming/renamer/NeoFormSourceRenamer.java  |   2 +-
 .../runtime/NeoFormPublishingUtils.java       |  75 +++++++
 .../neoform/runtime/NeoFormRuntime.java       |  43 ----
 .../runtime/NeoFormRuntimeBuilder.java        | 190 ++++++++++++++++++
 .../definition/NeoFormRuntimeDefinition.java  |  11 +-
 .../extensions/NeoFormRuntimeExtension.java   | 104 ++--------
 .../NeoFormRuntimeSpecification.java          |  15 +-
 .../gradle/neoform/runtime/tasks/PackJar.java |  12 +-
 .../runtime/tasks/RecompileSourceJar.java     |   3 +-
 .../neoform/util/NeoFormRuntimeUtils.java     |   6 +-
 .../RuntimeDevRuntimeSpecification.java       |   6 +-
 .../userdev/AccessTransformerTests.groovy     |  12 +-
 .../gradle/userdev/CentralCacheTests.groovy   |  14 +-
 .../userdev/ConfigurationCacheTests.groovy    |   4 +-
 .../gradle/userdev/ConfigurationTests.groovy  |  16 +-
 .../gradle/userdev/DepreciationTests.groovy   |   2 +-
 .../gradle/userdev/FunctionalTests.groovy     |  30 +--
 .../gradle/userdev/MultiProjectTests.groovy   |  32 +--
 .../neoforged/gradle/userdev/RunTests.groovy  |  22 +-
 .../gradle/userdev/UserDevPluginTests.groovy  |   6 +-
 .../convention/IDEAIDEConventionTests.groovy  |  22 +-
 .../convention/RunConventionTests.groovy      |  44 ++--
 .../SourceSetConventionTests.groovy           |  74 +++----
 .../dependency/UserDevDependencyManager.java  |   2 +-
 .../dependency/UserDevReplacementResult.java  |   2 +-
 .../UserDevRuntimeSpecification.java          |   6 +-
 .../neoforged/gradle/util/NamedRecord.java    |   8 +-
 .../gradle/util/TransformerUtils.java         |  24 +++
 .../vanilla/AccessTransformerTests.groovy     |  10 +-
 .../gradle/vanilla/VanillaProjectPlugin.java  |   2 +-
 .../spec/VanillaRuntimeSpecification.java     |  10 +-
 111 files changed, 1095 insertions(+), 771 deletions(-)
 create mode 100644 common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftGameArtifactProvidingTask.java
 create mode 100644 dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/CommonRuntimeBuilder.java
 create mode 100644 dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/DependencyHandler.java
 create mode 100644 dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Outputs.java
 create mode 100644 dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/RuntimeSpecification.groovy
 rename dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/{NeoFormConfigConfigurationSpecV1.java => LegacyNeoFormSdk.java} (60%)
 rename dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/{NeoFormConfigConfigurationSpecV2.java => NeoFormSdk.java} (79%)
 create mode 100644 neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormPublishingUtils.java
 delete mode 100644 neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntime.java
 create mode 100644 neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntimeBuilder.java

diff --git a/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java b/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java
index 7e4040d2b..53a52d426 100644
--- a/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java
+++ b/common/src/main/java/net/neoforged/gradle/common/CommonProjectPlugin.java
@@ -10,6 +10,7 @@
 import net.neoforged.gradle.common.runs.run.RunImpl;
 import net.neoforged.gradle.common.runs.tasks.RunsReport;
 import net.neoforged.gradle.common.runtime.definition.CommonRuntimeDefinition;
+import net.neoforged.gradle.common.runtime.extensions.DefaultRuntimesContainer;
 import net.neoforged.gradle.common.runtime.extensions.RuntimesExtension;
 import net.neoforged.gradle.common.runtime.naming.OfficialNamingChannelConfigurator;
 import net.neoforged.gradle.common.tasks.CleanCache;
@@ -35,6 +36,7 @@
 import net.neoforged.gradle.dsl.common.runs.run.Run;
 import net.neoforged.gradle.dsl.common.runs.run.RunDevLogin;
 import net.neoforged.gradle.dsl.common.runs.type.RunType;
+import net.neoforged.gradle.dsl.common.runtime.extensions.RuntimesContainer;
 import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
 import net.neoforged.gradle.dsl.common.util.NamingConstants;
 import net.neoforged.gradle.util.UrlConstants;
@@ -70,8 +72,6 @@ public class CommonProjectPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
-        project.getObjects().
-
         //Apply the evaluation extension to monitor immediate execution of indirect tasks when evaluation already happened.
         project.getExtensions().create(NamingConstants.Extension.EVALUATION, ProjectEvaluationExtension.class, project);
 
@@ -92,6 +92,7 @@ public void apply(Project project) {
 
         final ExtensionManager extensionManager = project.getExtensions().getByType(ExtensionManager.class);
         extensionManager.registerExtension("subsystems", Subsystems.class, (p) -> p.getObjects().newInstance(SubsystemsExtension.class, p));
+        extensionManager.registerExtension("runtimes", RuntimesContainer.class, (p) -> p.getObjects().newInstance(DefaultRuntimesContainer.class, p));
 
         project.getExtensions().create(IdeManagementExtension.class, "ideManager", IdeManagementExtension.class, project);
         project.getExtensions().create("allRuntimes", RuntimesExtension.class);
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java b/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java
index d7198e10d..1caee4c53 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java
@@ -24,7 +24,7 @@ public AccessTransformersExtension(Project project) {
         this.projectDependencies = project.getDependencies();
         this.projectArtifacts = project.getArtifacts();
 
-        // We have to add these after project evaluation because of dependency replacement making configurations non-lazy; adding them earlier would prevent further addition of dependencies
+        // We have to add these after project evaluation because of dependency replacement making configurations non-lazy; adding them earlier would prevent further addition of compileDependencies
         project.afterEvaluate(p -> {
             p.getConfigurations().maybeCreate(CommonProjectPlugin.ACCESS_TRANSFORMER_CONFIGURATION).fromDependencyCollector(getConsume());
             p.getConfigurations().maybeCreate(CommonProjectPlugin.ACCESS_TRANSFORMER_API_CONFIGURATION).fromDependencyCollector(getConsumeApi());
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/DefaultJarJarFeature.java b/common/src/main/java/net/neoforged/gradle/common/extensions/DefaultJarJarFeature.java
index 75a9a4231..5a36b3c50 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/DefaultJarJarFeature.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/DefaultJarJarFeature.java
@@ -130,7 +130,7 @@ public void createTaskAndConfiguration() {
             // Unfortunately, while we can hopefully rely on disambiguation rules to get us some of these, others run
             // into issues. The target JVM version is the most worrying - we don't want to pull in a variant for a newer
             // jvm version. We could copy DefaultJvmFeature, and search for the target version of the compile task,
-            // but this is difficult - we only have a feature name, not the linked source set. For this reason, we use
+            // but this is difficult - we only have a feature identifier, not the linked source set. For this reason, we use
             // the toolchain version, which is the most likely to be correct.
             attributes.attributeProvider(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, javaPlugin.getToolchain().getLanguageVersion().map(JavaLanguageVersion::asInt));
             attributes.attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, Usage.JAVA_RUNTIME));
@@ -141,7 +141,7 @@ public void createTaskAndConfiguration() {
 
         TaskProvider<JarJar> jarJarTask = project.getTasks().register(withPrefix(JAR_JAR_TASK_NAME), net.neoforged.gradle.common.tasks.JarJar.class, jarJar -> {
             jarJar.setGroup(JAR_JAR_GROUP);
-            jarJar.setDescription("Create a combined JAR of project and selected dependencies");
+            jarJar.setDescription("Create a combined JAR of project and selected compileDependencies");
             jarJar.getArchiveClassifier().convention(prefix.isEmpty() ? "all" : prefix + "-all");
 
             if (!this.getDefaultSourcesDisabled()) {
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/ExtensionManager.java b/common/src/main/java/net/neoforged/gradle/common/extensions/ExtensionManager.java
index 4779bbbe4..f5b97efe0 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/ExtensionManager.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/ExtensionManager.java
@@ -73,7 +73,7 @@ public <T> void registerExtension(String name, Class<T> publicFacingType, IExten
             }
         }
 
-        throw new IllegalArgumentException("Property '" + String.format(EXTENSION_CHECK_PROPERTY_NAME, name) + "' is not a valid extension creator. It must be either a string of a class name implementing IExtensionCreator, or an instance of IExtensionCreator.");
+        throw new IllegalArgumentException("Property '" + String.format(EXTENSION_CHECK_PROPERTY_NAME, name) + "' is not a valid extension creator. It must be either a string of a class identifier implementing IExtensionCreator, or an instance of IExtensionCreator.");
     }
 
     public static void registerOverride(final Project project, final String name, final IExtensionCreator<?> creator) {
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/MinecraftArtifactCacheExtension.java b/common/src/main/java/net/neoforged/gradle/common/extensions/MinecraftArtifactCacheExtension.java
index 6699fc2ad..9cd55fb4e 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/MinecraftArtifactCacheExtension.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/MinecraftArtifactCacheExtension.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import net.minecraftforge.gdi.ConfigurableDSLElement;
 import net.neoforged.gradle.common.tasks.MinecraftArtifactFileCacheProvider;
+import net.neoforged.gradle.common.tasks.MinecraftGameArtifactProvidingTask;
 import net.neoforged.gradle.common.tasks.MinecraftVersionManifestFileCacheProvider;
 import net.neoforged.gradle.common.util.FileCacheUtils;
 import net.neoforged.gradle.common.util.FileDownloadingUtils;
@@ -31,6 +32,7 @@
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.SortedSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class MinecraftArtifactCacheExtension implements ConfigurableDSLElement<MinecraftArtifactCache>, MinecraftArtifactCache {
@@ -127,20 +129,18 @@ public final Map<GameArtifact, TaskProvider<? extends WithOutput>> cacheGameVers
 
     @NotNull
     @Override
-    public NamedDomainObjectProvider<? extends WithOutput> gameArtifactTask(@NotNull NamedDomainObjectCollection<WithOutput> tasks, @NotNull GameArtifact artifact, @NotNull final String minecraftVersion) {
-        final MinecraftVersionAndUrl resolvedVersion = resolveVersion(minecraftVersion);
-
-        if (artifact == GameArtifact.VERSION_MANIFEST) {
-            return tasks.named(NamingConstants.Task.CACHE_VERSION_MANIFEST + resolvedVersion.getVersion(), MinecraftVersionManifestFileCacheProvider.class);
+    public NamedDomainObjectProvider<? extends WithOutput> gameArtifactTask(@NotNull NamedDomainObjectCollection<WithOutput> tasks, @NotNull GameArtifact artifact) {
+        final NamedDomainObjectCollection<? extends MinecraftGameArtifactProvidingTask> matchingTasks = tasks.withType(MinecraftGameArtifactProvidingTask.class)
+                .matching(task -> task.gameArtifact().equals(artifact));
+
+        final SortedSet<String> matchingTaskNames = matchingTasks.getNames();
+        if (matchingTaskNames.size() == 1) {
+            return matchingTasks.named(matchingTaskNames.first());
+        } else if (matchingTaskNames.size() > 1) {
+            throw new IllegalStateException("Found multiple tasks for game artifact: " + artifact);
+        } else {
+            throw new IllegalStateException("Could not find task for game artifact: " + artifact);
         }
-
-        final String taskName = "%s%s%s%s".formatted(
-                NamingConstants.Task.CACHE_VERSION_PREFIX,
-                StringUtils.capitalize(artifact.getType().orElseThrow().name().toLowerCase()),
-                StringUtils.capitalize(artifact.getDistributionType().orElseThrow().getName().toLowerCase()),
-                resolvedVersion.getVersion());
-
-        return tasks.named(taskName, MinecraftArtifactFileCacheProvider.class);
     }
 
     @Override
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/dependency/replacement/ReplacementLogic.java b/common/src/main/java/net/neoforged/gradle/common/extensions/dependency/replacement/ReplacementLogic.java
index 910f73158..5b66ab549 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/dependency/replacement/ReplacementLogic.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/dependency/replacement/ReplacementLogic.java
@@ -59,7 +59,7 @@ public ReplacementLogic(Project project) {
     @Override
     public void handleConfiguration(Configuration configuration) {
         //TODO: Figure out if there is any way to do this lazily.
-        //TODO: Configure each runs in an immutable context, so we can't add a listener to the dependencies.
+        //TODO: Configure each runs in an immutable context, so we can't add a listener to the compileDependencies.
         configuration.getDependencies().whenObjectAdded(dependency -> {
             //We need to check if our configuration is unhandled, we can only do this here and not in the register because of way we register unhandled configurations after their creation:
             //TODO: Find a better way to handle this.
@@ -68,7 +68,7 @@ public void handleConfiguration(Configuration configuration) {
                 return;
             }
 
-            //We only support module based dependencies.
+            //We only support module based compileDependencies.
             if (dependency instanceof ModuleDependency) {
                 final ModuleDependency moduleDependency = (ModuleDependency) dependency;
                 //Try replacing the dependency.
@@ -232,7 +232,7 @@ void handleDependencyReplacement(Configuration configuration, Dependency depende
             }
         }
 
-        //For each configuration that we target we now need to add the new dependencies to.
+        //For each configuration that we target we now need to add the new compileDependencies to.
         for (Configuration targetConfiguration : targetConfigurations) {
             //Create a dependency from the tasks that copies the raw jar to the repository.
             //The sources jar is not needed here.
@@ -254,7 +254,7 @@ void handleDependencyReplacement(Configuration configuration, Dependency depende
      *
      * @param dependency The dependency that is being replaced.
      * @param result The replacement result from one of the handlers.
-     * @param sourceArtifactSelectorName The name of the task that selects the source artifact.
+     * @param sourceArtifactSelectorName The identifier of the task that selects the source artifact.
      * @param newRepoEntry The new repository entry that the dependency is being replaced with.
      * @return The task that selects the source artifact from the dependency and puts it in the Ivy repository.
      */
@@ -268,7 +268,7 @@ private TaskProvider<? extends WithOutput> createOrLookupSourcesTask(Dependency
         //Create a new task, using the repository to create the output.
         final Repository repository = project.getExtensions().getByType(Repository.class);
         return project.getTasks().register(sourceArtifactSelectorName, ArtifactFromOutput.class, artifactFromOutput -> {
-            artifactFromOutput.setGroup("neogradle/dependencies");
+            artifactFromOutput.setGroup("neogradle/compileDependencies");
             artifactFromOutput.setDescription(String.format("Selects the source artifact from the %s dependency and puts it in the Ivy repository", dependency));
 
             artifactFromOutput.getInput().set(result.getSourcesJar().flatMap(WithOutput::getOutput));
@@ -282,7 +282,7 @@ private TaskProvider<? extends WithOutput> createOrLookupSourcesTask(Dependency
      *
      * @param dependency The dependency that is being replaced.
      * @param result The replacement result from one of the handlers.
-     * @param rawArtifactSelectorName The name of the task that selects the raw artifact.
+     * @param rawArtifactSelectorName The identifier of the task that selects the raw artifact.
      * @param newRepoEntry The new repository entry that the dependency is being replaced with.
      * @return The task that selects the raw artifact from the dependency and puts it in the Ivy repository.
      */
@@ -296,7 +296,7 @@ private TaskProvider<? extends WithOutput> createOrLookupRawTask(Dependency depe
         // Create a new task, using the repository to create the output.
         final Repository repository = project.getExtensions().getByType(Repository.class);
         return project.getTasks().register(rawArtifactSelectorName, ArtifactFromOutput.class, artifactFromOutput -> {
-            artifactFromOutput.setGroup("neogradle/dependencies");
+            artifactFromOutput.setGroup("neogradle/compileDependencies");
             artifactFromOutput.setDescription(String.format("Selects the raw artifact from the %s dependency and puts it in the Ivy repository", dependency));
 
             artifactFromOutput.getInput().set(result.getRawJar().flatMap(WithOutput::getOutput));
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyModuleWriter.java b/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyModuleWriter.java
index ca3cbe8c5..0bbf52c3e 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyModuleWriter.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyModuleWriter.java
@@ -92,7 +92,7 @@ private void writeInfo(final Dependency entry) throws XMLStreamException {
         // License
         // TODO: deal with custom projects?
         this.writer.writeEmptyElement("license");
-        this.writer.writeAttribute("name", "Minecraft EULA");
+        this.writer.writeAttribute("identifier", "Minecraft EULA");
         this.writer.writeAttribute("url", "https://www.minecraft.net/en-us/eula");
 
         // End
@@ -100,7 +100,7 @@ private void writeInfo(final Dependency entry) throws XMLStreamException {
     }
 
     private void writeDependencies(final Configuration dependencies) throws XMLStreamException {
-        this.writer.writeStartElement("dependencies");
+        this.writer.writeStartElement("compileDependencies");
 
         for (final ResolvedArtifact extra : dependencies.getResolvedConfiguration().getResolvedArtifacts()) {
             this.writeDependency(extra);
@@ -120,13 +120,13 @@ private void writeDependency(final ResolvedArtifact dep) throws XMLStreamExcepti
         }
 
         this.writer.writeAttribute("org", dep.getModuleVersion().getId().getGroup());
-        this.writer.writeAttribute("name", dep.getModuleVersion().getId().getName());
+        this.writer.writeAttribute("identifier", dep.getModuleVersion().getId().getName());
         this.writer.writeAttribute("rev", dep.getModuleVersion().getId().getVersion());
         this.writer.writeAttribute("transitive", "false");
 
         if (hasClassifier) {
             this.writer.writeEmptyElement("artifact");
-            this.writer.writeAttribute("name", dep.getModuleVersion().getId().getName());
+            this.writer.writeAttribute("identifier", dep.getModuleVersion().getId().getName());
             this.writer.writeAttribute("classifier", classifier);
             this.writer.writeAttribute("ext", "jar");
             this.writer.writeEndElement();
diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyRepository.java b/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyRepository.java
index 5783a1507..11c48e718 100644
--- a/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyRepository.java
+++ b/common/src/main/java/net/neoforged/gradle/common/extensions/repository/IvyRepository.java
@@ -190,7 +190,7 @@ private void writeDummyDataIfNeeded(
             final Configuration dependencies,
             final boolean hasSource
     ) throws IOException, XMLStreamException {
-        //Construct all paths, ensuring that the metadata file name matches the pattern we configured above in the repo metadata.
+        //Construct all paths, ensuring that the metadata file identifier matches the pattern we configured above in the repo metadata.
         final Path jarFile = buildArtifactPath(entry);
         final Path baseDir = jarFile.getParent();
         final Path metaFile = baseDir.resolve(String.format("ivy-%s-ng%d.xml", entry.getVersion(), METADATA_VERSION));
diff --git a/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java b/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java
index 2a2f99744..a62b5abab 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java
@@ -110,7 +110,7 @@ public void configureIdeaConventions(Project project, IDEA ideaConventions) {
 
                             final File DotIdeaDirectory = new File(project.getProjectDir(), ".idea");
                             final File GradleXml = new File(DotIdeaDirectory, "gradle.xml");
-                            return FileUtils.contains(GradleXml, "<option name=\"delegatedBuild\" value=\"false\" />");
+                            return FileUtils.contains(GradleXml, "<option identifier=\"delegatedBuild\" value=\"false\" />");
                         })
         );
 
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java b/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java
index 61ab3df9e..12c078a9a 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java
@@ -78,7 +78,7 @@ protected CommonRuntimeDefinition(
     public final TaskProvider<? extends WithOutput> getTask(String name) {
         final String taskName = CommonRuntimeUtils.buildTaskName(this, name);
         if (!taskOutputs.containsKey(taskName)) {
-            throw new IllegalArgumentException("No task with name " + name + " found in runtime " + specification.getVersionedName());
+            throw new IllegalArgumentException("No task with identifier " + name + " found in runtime " + specification.getVersionedName());
         }
 
         return taskOutputs.get(taskName);
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/CommonRuntimeExtension.java b/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/CommonRuntimeExtension.java
index 88ddc2e2e..4d0be37d9 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/CommonRuntimeExtension.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/CommonRuntimeExtension.java
@@ -45,7 +45,7 @@ protected CommonRuntimeExtension(Project project) {
 
     public static void configureCommonRuntimeTaskParameters(Runtime runtimeTask, Map<String, String> symbolicDataSources, String step, LegacySpecification spec, File runtimeDirectory) {
         runtimeTask.getSymbolicDataSources().set(symbolicDataSources);
-        runtimeTask.getStepName().set(step);
+        runtimeTask.getStep().set(step);
         runtimeTask.getDistribution().set(spec.getDistribution());
         runtimeTask.getMinecraftVersion().set(CacheableMinecraftVersion.from(spec.getMinecraftVersion(), spec.getProject()).getFull());
         runtimeTask.getRuntimeDirectory().set(runtimeDirectory);
@@ -140,7 +140,7 @@ private S createSpec(Action<B> configurator) {
     @NotNull
     public final D getByName(final String name) {
         return this.definitions.computeIfAbsent(name, (n) -> {
-            throw new RuntimeException(String.format("Failed to find runtime with name: %s", n));
+            throw new RuntimeException(String.format("Failed to find runtime with identifier: %s", n));
         });
     }
 
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/DefaultRuntimesContainer.java b/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/DefaultRuntimesContainer.java
index 2c22cb1d5..a4d8f3935 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/DefaultRuntimesContainer.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/extensions/DefaultRuntimesContainer.java
@@ -2,14 +2,21 @@
 
 import net.neoforged.gradle.common.util.DelegatingDomainObjectContainer;
 import net.neoforged.gradle.dsl.common.runtime.definition.Definition;
+import net.neoforged.gradle.dsl.common.runtime.definition.DependencyHandler;
+import net.neoforged.gradle.dsl.common.runtime.definition.Outputs;
 import net.neoforged.gradle.dsl.common.runtime.extensions.RuntimesContainer;
 import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
 import net.neoforged.gradle.dsl.common.runtime.spec.TaskTreeBuilder;
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.Project;
+import org.gradle.api.tasks.TaskProvider;
 
-public class DefaultRuntimesContainer extends DelegatingDomainObjectContainer<Definition> implements RuntimesContainer {
+import javax.inject.Inject;
 
+public abstract class DefaultRuntimesContainer extends DelegatingDomainObjectContainer<Definition> implements RuntimesContainer {
+
+    @Inject
     public DefaultRuntimesContainer(Project project) {
         super(project, Definition.class, name -> {
             throw new InvalidUserDataException("Cannot create a runtime definition without a specification. Use register(Specification, TaskTreeBuilder) instead.");
@@ -19,7 +26,11 @@ public DefaultRuntimesContainer(Project project) {
     @Override
     public Definition register(Specification specification, TaskTreeBuilder builder) throws InvalidUserDataException {
         final TaskTreeBuilder.BuildResult buildResult = builder.build(specification);
-        final Definition definition = new Definition(specification, buildResult.dependencies(), buildResult.handler());
+        final Definition definition = new Definition(
+                specification,
+                new DependencyHandler(buildResult.compileDependencies(), buildResult.runtimeDependencies()),
+                buildResult.handler(),
+                buildResult.outputs());
 
         add(definition);
 
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/OfficialNamingChannelConfigurator.java b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/OfficialNamingChannelConfigurator.java
index e7be6874f..6ac295d6a 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/OfficialNamingChannelConfigurator.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/OfficialNamingChannelConfigurator.java
@@ -1,14 +1,10 @@
 package net.neoforged.gradle.common.runtime.naming;
 
-import net.neoforged.gradle.common.runtime.extensions.CommonRuntimeExtension;
 import net.neoforged.gradle.common.runtime.naming.tasks.ApplyOfficialMappingsToCompiledJar;
 import net.neoforged.gradle.common.runtime.naming.tasks.ApplyOfficialMappingsToSourceJar;
 import net.neoforged.gradle.common.util.MappingUtils;
-import net.minecraftforge.srgutils.IMappingFile;
 import net.neoforged.gradle.common.runtime.extensions.RuntimesExtension;
-import net.neoforged.gradle.common.runtime.naming.tasks.*;
 import net.neoforged.gradle.common.util.StreamUtils;
-import net.neoforged.gradle.common.util.MappingUtils;
 import net.neoforged.gradle.common.util.TaskDependencyUtils;
 import net.neoforged.gradle.common.util.exceptions.MultipleDefinitionsFoundException;
 import net.neoforged.gradle.common.util.exceptions.NoDefinitionsFoundException;
@@ -19,10 +15,8 @@
 import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.util.*;
-import net.neoforged.gradle.util.TransformerUtils;
 import org.gradle.api.Project;
 import org.gradle.api.Transformer;
-import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.reflect.TypeOf;
@@ -83,7 +77,7 @@ public void configure(final Project project) {
 
             applyOfficialMappingsToSourceJar.dependsOn(context.getGameArtifactTask(GameArtifact.CLIENT_MAPPINGS));
             applyOfficialMappingsToSourceJar.dependsOn(context.getGameArtifactTask(GameArtifact.SERVER_MAPPINGS));
-            applyOfficialMappingsToSourceJar.getStepName().set("applyOfficialMappings");
+            applyOfficialMappingsToSourceJar.getStep().set("applyOfficialMappings");
         });
     }
     
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/ITypeRenamer.java b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/ITypeRenamer.java
index 1860d251c..d4886d0fb 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/ITypeRenamer.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/ITypeRenamer.java
@@ -16,7 +16,7 @@ public interface ITypeRenamer extends Serializable {
      * Renames a field.
      *
      * @param owner The owner of the field.
-     * @param name The name of the field.
+     * @param name The identifier of the field.
      * @return The renamed field.
      */
     String renameField(String owner, String name);
@@ -25,7 +25,7 @@ public interface ITypeRenamer extends Serializable {
      * Renames a method.
      *
      * @param owner The owner of the method.
-     * @param name The name of the method.
+     * @param name The identifier of the method.
      * @param desc The descriptor of the method.
      * @return The renamed method.
      */
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/RegexBasedSourceRenamer.java b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/RegexBasedSourceRenamer.java
index b4bebe869..0197bc40e 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/RegexBasedSourceRenamer.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/renamer/RegexBasedSourceRenamer.java
@@ -66,7 +66,7 @@ public byte[] rename(byte[] classFile, boolean javadocs, boolean lambdas, Charse
             input.add("");
 
         List<String> lines = new ArrayList<>();
-        Deque<Pair<String, Integer>> innerClasses = new LinkedList<>(); //pair of inner class name & indentation
+        Deque<Pair<String, Integer>> innerClasses = new LinkedList<>(); //pair of inner class identifier & indentation
         String _package = ""; //default package
         Set<String> blacklist = null;
 
@@ -83,7 +83,7 @@ public byte[] rename(byte[] classFile, boolean javadocs, boolean lambdas, Charse
         for (String line : input) {
             Matcher m = PACKAGE_DECL.matcher(line);
             if (m.find())
-                _package = m.group("name") + ".";
+                _package = m.group("identifier") + ".";
 
             if (javadocs) {
                 if (!injectJavadoc(lines, line, _package, innerClasses))
@@ -100,19 +100,19 @@ public byte[] rename(byte[] classFile, boolean javadocs, boolean lambdas, Charse
      *
      * @param lines        The current file content (to be modified by this method)
      * @param line         The line that was just read (will not be in the list)
-     * @param _package     the name of the package this file is declared to be in, in com.example format;
+     * @param _package     the identifier of the package this file is declared to be in, in com.example format;
      * @param innerClasses current position in inner class
      */
     private boolean injectJavadoc(List<String> lines, String line, String _package, Deque<Pair<String, Integer>> innerClasses) {
         // constructors
         Matcher matcher = CONSTRUCTOR_JAVADOC_PATTERN.matcher(line);
-        boolean isConstructor = matcher.find() && !innerClasses.isEmpty() && innerClasses.peek().getLeft().contains(matcher.group("name"));
+        boolean isConstructor = matcher.find() && !innerClasses.isEmpty() && innerClasses.peek().getLeft().contains(matcher.group("identifier"));
         // methods
         if (!isConstructor)
             matcher = METHOD_JAVADOC_PATTERN.matcher(line);
 
         if (isConstructor || matcher.find()) {
-            String name = isConstructor ? "<init>" : matcher.group("name");
+            String name = isConstructor ? "<init>" : matcher.group("identifier");
             String javadoc = getDocs().get(name);
             if (javadoc == null && !innerClasses.isEmpty() && !name.startsWith("func_") && !name.startsWith("m_")) {
                 String currentClass = innerClasses.peek().getLeft();
@@ -128,7 +128,7 @@ private boolean injectJavadoc(List<String> lines, String line, String _package,
         // fields
         matcher = FIELD_JAVADOC_PATTERN.matcher(line);
         if (matcher.find()) {
-            String name = matcher.group("name");
+            String name = matcher.group("identifier");
             String javadoc = getDocs().get(name);
             if (javadoc == null && !innerClasses.isEmpty() && !name.startsWith("field_") && !name.startsWith("f_")) {
                 String currentClass = innerClasses.peek().getLeft();
@@ -145,7 +145,7 @@ private boolean injectJavadoc(List<String> lines, String line, String _package,
         if (matcher.find()) {
             //we maintain a stack of the current (inner) class in com.example.ClassName$Inner format (along with indentation)
             //if the stack is not empty we are entering a new inner class
-            String currentClass = (innerClasses.isEmpty() ? _package : innerClasses.peek().getLeft() + "$") + matcher.group("name");
+            String currentClass = (innerClasses.isEmpty() ? _package : innerClasses.peek().getLeft() + "$") + matcher.group("identifier");
             innerClasses.push(Pair.of(currentClass, matcher.group("indent").length()));
             String javadoc = getDocs().get(currentClass);
             if (javadoc != null) {
@@ -173,7 +173,7 @@ private boolean injectJavadoc(List<String> lines, String line, String _package,
     }
 
     /*
-     * There are certain times, such as Mixin Accessors that we wish to have the name of this method with the first character upper case.
+     * There are certain times, such as Mixin Accessors that we wish to have the identifier of this method with the first character upper case.
      */
     private String getMapped(String srg, @Nullable Set<String> blacklist) {
         if (blacklist != null && blacklist.contains(srg))
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/tasks/GenerateDebuggingMappings.java b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/tasks/GenerateDebuggingMappings.java
index 4665a0c41..eccd2f031 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/naming/tasks/GenerateDebuggingMappings.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/naming/tasks/GenerateDebuggingMappings.java
@@ -55,7 +55,7 @@ public void generate() throws Exception {
             }
         }
 
-        String[] header = new String[]{"searge", "name", "side", "desc"};
+        String[] header = new String[]{"searge", "identifier", "side", "desc"};
         List<String[]> fields = new ArrayList<>();
         List<String[]> methods = new ArrayList<>();
         fields.add(header);
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/specification/CommonRuntimeSpecification.java b/common/src/main/java/net/neoforged/gradle/common/runtime/specification/CommonRuntimeSpecification.java
index 403ab2a71..f69fbff0f 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/specification/CommonRuntimeSpecification.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/specification/CommonRuntimeSpecification.java
@@ -141,7 +141,7 @@ public int hashCode() {
     public String toString() {
         return "CommonSpecification{" +
                 "project=" + project +
-                ", name='" + name + '\'' +
+                ", identifier='" + name + '\'' +
                 ", distribution=" + distribution +
                 ", preTaskTypeAdapters=" + preTaskTypeAdapters +
                 ", postTypeAdapters=" + postTypeAdapters +
@@ -205,7 +205,7 @@ public final B withDistributionType(final Provider<DistributionType> distributio
         @Override
         @NotNull
         public final B withDistributionType(final DistributionType distributionType) {
-            if (distributionType == null) // Additional null check for convenient loading of sides from dependencies.
+            if (distributionType == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withDistributionType(project.provider(() -> distributionType));
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java
index f4f4d8755..03c9de5a3 100644
--- a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java
+++ b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java
@@ -6,7 +6,6 @@
 import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeMultiArguments;
 import net.neoforged.gradle.dsl.common.util.DistributionType;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.*;
@@ -31,11 +30,8 @@ public DefaultRuntime() {
         //All of these taskOutputs belong to the MCP group
         setGroup("NeoGradle/runtimes");
 
-        //Sets up the base configuration for directories and outputs.
-        getStepsDirectory().convention(getRuntimeDirectory().dir("steps"));
-
         //And configure output default locations.
-        getOutputDirectory().convention(getStepsDirectory().flatMap(d -> getStepName().map(d::dir)));
+        getOutputDirectory().convention();
         getOutputFileName().convention(getArguments().getOrDefault("outputExtension", getProviderFactory().provider(() -> "jar")).map(extension -> String.format("output.%s", extension)).orElse("output.jar"));
         getOutput().convention(getOutputDirectory().flatMap(d -> getOutputFileName().orElse("output.jar").map(d::file)));
 
@@ -89,7 +85,7 @@ protected void buildRuntimeArguments(final Map<String, Provider<String>> argumen
         arguments.computeIfAbsent("outputExtension", key -> newProvider(getOutputFileName().get().substring(getOutputFileName().get().lastIndexOf('.') + 1)));
         arguments.computeIfAbsent("outputFileName", key -> newProvider(getOutputFileName().get()));
         arguments.computeIfAbsent("stepsDir", key -> newProvider(getStepsDirectory().get().getAsFile().getAbsolutePath()));
-        arguments.computeIfAbsent("stepName", key -> getStepName());
+        arguments.computeIfAbsent("stepName", key -> getStep());
         arguments.computeIfAbsent("side", key -> getDistribution().map(DistributionType::getName));
         arguments.computeIfAbsent("minecraftVersion", key -> getMinecraftVersion().map(Object::toString));
         arguments.computeIfAbsent("javaVersion", key -> getJavaLauncher().map(launcher -> launcher.getMetadata().getLanguageVersion().toString()));
diff --git a/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftArtifactFileCacheProvider.java b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftArtifactFileCacheProvider.java
index c627216e3..56bee0b3c 100644
--- a/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftArtifactFileCacheProvider.java
+++ b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftArtifactFileCacheProvider.java
@@ -2,6 +2,7 @@
 
 import net.neoforged.gradle.common.CommonProjectPlugin;
 import net.neoforged.gradle.common.caching.CentralCacheService;
+import net.neoforged.gradle.dsl.common.util.GameArtifact;
 import net.neoforged.gradle.dsl.common.util.MinecraftArtifactType;
 import net.neoforged.gradle.dsl.common.util.DistributionType;
 import org.gradle.api.file.RegularFileProperty;
@@ -9,8 +10,10 @@
 import org.gradle.api.services.ServiceReference;
 import org.gradle.api.tasks.*;
 
+import java.util.Arrays;
+
 @CacheableTask
-public abstract class MinecraftArtifactFileCacheProvider extends FileCacheProviding {
+public abstract class MinecraftArtifactFileCacheProvider extends FileCacheProviding implements MinecraftGameArtifactProvidingTask {
     
     public MinecraftArtifactFileCacheProvider() { }
     
@@ -39,4 +42,12 @@ public void doRun() throws Throwable {
     @InputFile
     @PathSensitive(PathSensitivity.NONE)
     public abstract RegularFileProperty getManifest();
+
+    @Override
+    public GameArtifact gameArtifact() {
+        return Arrays.stream(GameArtifact.values())
+                .filter(artifact -> artifact.getDistributionType().map(distributionType -> distributionType.equals(getDistributionType().get())).orElse(false))
+                .filter(artifact -> artifact.getType().map(artifactType -> artifactType.equals(getArtifactType().get())).orElse(false))
+                .findFirst().orElseThrow();
+    }
 }
diff --git a/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftGameArtifactProvidingTask.java b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftGameArtifactProvidingTask.java
new file mode 100644
index 000000000..d5e6c5079
--- /dev/null
+++ b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftGameArtifactProvidingTask.java
@@ -0,0 +1,10 @@
+package net.neoforged.gradle.common.tasks;
+
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
+import net.neoforged.gradle.dsl.common.util.GameArtifact;
+import org.gradle.api.provider.Provider;
+
+public interface MinecraftGameArtifactProvidingTask extends WithOutput {
+
+    GameArtifact gameArtifact();
+}
diff --git a/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftVersionManifestFileCacheProvider.java b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftVersionManifestFileCacheProvider.java
index b61bde3f3..2098c4543 100644
--- a/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftVersionManifestFileCacheProvider.java
+++ b/common/src/main/java/net/neoforged/gradle/common/tasks/MinecraftVersionManifestFileCacheProvider.java
@@ -1,13 +1,15 @@
 package net.neoforged.gradle.common.tasks;
 
-import net.neoforged.gradle.dsl.common.extensions.MinecraftArtifactCache;
 import net.neoforged.gradle.dsl.common.util.CacheFileSelector;
-import net.neoforged.gradle.dsl.common.util.MinecraftVersionAndUrl;
+import net.neoforged.gradle.dsl.common.util.GameArtifact;
 import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.*;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.TaskAction;
 
 @CacheableTask
-public abstract class MinecraftVersionManifestFileCacheProvider extends FileCacheProviding {
+public abstract class MinecraftVersionManifestFileCacheProvider extends FileCacheProviding implements MinecraftGameArtifactProvidingTask {
 
     public MinecraftVersionManifestFileCacheProvider() {
         getSelector().set(getMinecraftVersion().map(CacheFileSelector::forVersionJson));
@@ -29,4 +31,9 @@ public void doDownload() {
     private void downloadVersionManifestToCache() {
         downloadJsonTo(getDownloadUrl().get());
     }
+
+    @Override
+    public GameArtifact gameArtifact() {
+        return GameArtifact.VERSION_MANIFEST;
+    }
 }
diff --git a/common/src/main/java/net/neoforged/gradle/common/util/TaskDependencyUtils.java b/common/src/main/java/net/neoforged/gradle/common/util/TaskDependencyUtils.java
index 339371e75..f7a9178be 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/TaskDependencyUtils.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/TaskDependencyUtils.java
@@ -235,7 +235,7 @@ private void processTask(Task task) {
         private void processConfiguration(Configuration configuration) {
             DependencySet dependencies = configuration.getAllDependencies();
 
-            //Grab the original dependencies if we have a replacement extension
+            //Grab the original compileDependencies if we have a replacement extension
             final DependencyReplacement replacement = project.getExtensions().findByType(DependencyReplacement.class);
             final Set<Dependency> operatingSet = replacement == null ? dependencies : dependencies.stream()
                     .map(dependency -> replacement.optionallyConvertBackToOriginal(dependency, configuration))
diff --git a/common/src/main/java/net/neoforged/gradle/common/util/VersionJson.java b/common/src/main/java/net/neoforged/gradle/common/util/VersionJson.java
index 19209b939..6c61ff6c3 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/VersionJson.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/VersionJson.java
@@ -400,7 +400,7 @@ public String getName() {
         }
 
         public static OS getCurrent() {
-            String prop = System.getProperty("os.name").toLowerCase(Locale.ROOT);
+            String prop = System.getProperty("os.identifier").toLowerCase(Locale.ROOT);
             for (OS os : OS.values()) {
                 for (String key : os.keys) {
                     if (prop.contains(key)) {
diff --git a/common/src/main/java/net/neoforged/gradle/common/util/run/RunsUtil.java b/common/src/main/java/net/neoforged/gradle/common/util/run/RunsUtil.java
index 3a34f4230..41aaf8d33 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/run/RunsUtil.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/run/RunsUtil.java
@@ -186,7 +186,7 @@ public static void addRunSourcesDependenciesToTask(Task task, Run run) {
         for (SourceSet sourceSet : run.getModSources().all().get().values()) {
             final Project sourceSetProject = SourceSetUtils.getProject(sourceSet);
 
-            //The following tasks are not guaranteed to be in the source sets build dependencies
+            //The following tasks are not guaranteed to be in the source sets build compileDependencies
             //We however need at least the classes as well as the resources of the source set to be run
             task.dependsOn(sourceSetProject.getTasks().named(sourceSet.getProcessResourcesTaskName()));
             task.dependsOn(sourceSetProject.getTasks().named(sourceSet.getCompileJavaTaskName()));
diff --git a/common/src/main/java/net/neoforged/gradle/common/util/run/TypesUtil.java b/common/src/main/java/net/neoforged/gradle/common/util/run/TypesUtil.java
index 59d0f5b3f..69a271070 100644
--- a/common/src/main/java/net/neoforged/gradle/common/util/run/TypesUtil.java
+++ b/common/src/main/java/net/neoforged/gradle/common/util/run/TypesUtil.java
@@ -17,7 +17,7 @@ public static NamedDomainObjectProvider<RunType> registerWithPotentialPrefix(Nam
         }
         
         if (runTypes.getNames().contains(nameToRegister)) {
-            throw new InvalidUserDataException("There is already a type with the name " + nameToRegister);
+            throw new InvalidUserDataException("There is already a type with the identifier " + nameToRegister);
         }
         
         return runTypes.register(nameToRegister, configurationAction);
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy
index 1ee147c4e..ceb7e1382 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy
@@ -7,19 +7,19 @@ import org.gradle.api.specs.Spec
 interface DependencyFilter extends DependencyManagementObject {
 
     /**
-     * Exclude dependencies that match the provided spec.
-     * If at least one exclude spec is provided, only the dependencies which fail the check will be excluded.
+     * Exclude compileDependencies that match the provided spec.
+     * If at least one exclude spec is provided, only the compileDependencies which fail the check will be excluded.
      *
-     * @param spec The spec to exclude dependencies that match.
+     * @param spec The spec to exclude compileDependencies that match.
      * @return The filter (this object).
      */
     DependencyFilter exclude(Spec<? super ArtifactIdentifier> spec);
 
     /**
-     * Include dependencies that match the provided spec.
-     * If at least one include spec is supplied then only dependencies that match the include-spec will be included.
+     * Include compileDependencies that match the provided spec.
+     * If at least one include spec is supplied then only compileDependencies that match the include-spec will be included.
      *
-     * @param spec The spec to include dependencies that match.
+     * @param spec The spec to include compileDependencies that match.
      * @return The filter (this object)
      */
     DependencyFilter include(Spec<? super ArtifactIdentifier> spec);
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy
index b466b403c..0af297964 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy
@@ -15,7 +15,7 @@ import javax.annotation.Nullable
 @CompileStatic
 interface DependencyManagementObject {
     /**
-     * Create a spec that matches dependencies using the provided notation on group, name, and version
+     * Create a spec that matches compileDependencies using the provided notation on group, identifier, and version
      *
      * @param notation The dependency notation to parse.
      * @return The spec that matches the dependency notation.
@@ -23,7 +23,7 @@ interface DependencyManagementObject {
     Spec<? super ArtifactIdentifier> dependency(CharSequence dependencyNotation);
 
     /**
-     * Create a spec that matches dependencies on the provided group, name, and version
+     * Create a spec that matches compileDependencies on the provided group, identifier, and version
      *
      * @param notation The dependency notation to parse.
      * @return The spec that matches the dependency notation.
@@ -31,7 +31,7 @@ interface DependencyManagementObject {
     Spec<? super ArtifactIdentifier> dependency(@Nullable String group, String name, @Nullable String version);
 
     /**
-     * Create a spec that matches dependencies using the provided project's group, name, and version
+     * Create a spec that matches compileDependencies using the provided project's group, identifier, and version
      *
      * @param notation The dependency notation to parse.
      * @return The spec that matches the dependency notation.
@@ -39,7 +39,7 @@ interface DependencyManagementObject {
     Spec<? super ArtifactIdentifier> dependency(Project project);
 
     /**
-     * Create a spec that matches the provided dependency on group, name, and version
+     * Create a spec that matches the provided dependency on group, identifier, and version
      *
      * @param dependency The dependency to match.
      * @return The spec that matches the dependency.
@@ -55,7 +55,7 @@ interface DependencyManagementObject {
     Spec<? super ArtifactIdentifier> dependency(Closure<Boolean> spec);
 
     /**
-     * Simple artifact identifier class which only references group, name and version.
+     * Simple artifact identifier class which only references group, identifier and version.
      */
     @CompileStatic
     @EqualsAndHashCode(includeFields = true)
@@ -68,7 +68,7 @@ interface DependencyManagementObject {
          * Creates a new instance of the given artifact details.
          *
          * @param group   The group of the artifact to identify.
-         * @param name    The name of the artifact to identify.
+         * @param name    The identifier of the artifact to identify.
          * @param version The version of the artifact to identify.
          */
         ArtifactIdentifier(String group, String name, String version) {
@@ -87,9 +87,9 @@ interface DependencyManagementObject {
         }
 
         /**
-         * Gets the name of the artifact.
+         * Gets the identifier of the artifact.
          *
-         * @return The name of the artifact.
+         * @return The identifier of the artifact.
          */
         String getName() {
             return name
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy
index cc138dedc..0708449bc 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy
@@ -9,31 +9,31 @@ import org.gradle.api.specs.Spec
 interface DependencyVersionInformationHandler extends DependencyManagementObject {
 
     /**
-     * Sets the supported version range for dependencies which match the spec.
+     * Sets the supported version range for compileDependencies which match the spec.
      *
-     * @param spec The spec to match dependencies.
+     * @param spec The spec to match compileDependencies.
      * @param range The string representation to match the version range.
      */
     void ranged(final Spec<? super ArtifactIdentifier> spec, final String range);
 
     /**
-     * Sets the supported version range for dependencies which match the spec.
+     * Sets the supported version range for compileDependencies which match the spec.
      *
-     * @param spec The spec to match dependencies.
+     * @param spec The spec to match compileDependencies.
      * @param range The version range to match.
      */
     void ranged(final Spec<? super ArtifactIdentifier> spec, final VersionRange range);
 
     /**
-     * Sets the supported version range for dependencies which match the spec, but limits it to exactly the given version.
+     * Sets the supported version range for compileDependencies which match the spec, but limits it to exactly the given version.
      *
-     * @param spec The spec to match dependencies.
+     * @param spec The spec to match compileDependencies.
      * @param version The version to match.
      */
     void ranged(final Spec<? super ArtifactIdentifier> spec, final ArtifactVersion version);
 
     /**
-     * Sets the fixed version of the dependencies matching the spec.
+     * Sets the fixed version of the compileDependencies matching the spec.
      *
      * @param spec The spec to match.
      * @param version The string representation of the version.
@@ -41,7 +41,7 @@ interface DependencyVersionInformationHandler extends DependencyManagementObject
     void pin(final Spec<? super ArtifactIdentifier> spec, final String version);
 
     /**
-     * Sets the fixed version of the dependencies matching the spec.
+     * Sets the fixed version of the compileDependencies matching the spec.
      *
      * @param spec The spec to match.
      * @param version The version to set.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy
index 33bfe32bd..bc7e7a435 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy
@@ -14,12 +14,12 @@ import org.gradle.api.artifacts.dsl.DependencyCollector
 @CompileStatic
 interface AccessTransformers extends BaseDSLElementWithFilesAndEntries<AccessTransformers>, Dependencies {
     /**
-     * {@return access transformers to add as dependencies}
+     * {@return access transformers to add as compileDependencies}
      */
     DependencyCollector getConsume()
 
     /**
-     * {@return access transformers to add as dependencies and also expose to consumers}
+     * {@return access transformers to add as compileDependencies and also expose to consumers}
      */
     DependencyCollector getConsumeApi()
 
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/JarJar.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/JarJar.groovy
index 3d619bbb1..09e1c243a 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/JarJar.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/JarJar.groovy
@@ -31,9 +31,9 @@ interface JarJar extends JarJarFeature {
     void ranged(Dependency dependency, String range);
 
     /**
-     * Configure jarJar for a library feature with the given name, as created by {@link JavaPluginExtension#registerFeature(String,Action)}.
+     * Configure jarJar for a library feature with the given identifier, as created by {@link JavaPluginExtension#registerFeature(String,Action)}.
      * Creates a featureJarJar task and configuration for the feature if they are missing.
-     * @param featureName the name of the feature to configure
+     * @param featureName the identifier of the feature to configure
      * @return the configuration for jarJar for the feature
      */
     JarJarFeature forFeature(String featureName);
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/Minecraft.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/Minecraft.groovy
index 7d69592e9..899806c90 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/Minecraft.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/Minecraft.groovy
@@ -14,7 +14,7 @@ interface Minecraft extends BaseDSLElement<Minecraft> {
     /**
      * The mod identifier of the current project.
      * <p>
-     * Defaults to a sanitized version of the project's {@linkplain org.gradle.api.Project#getName name}.
+     * Defaults to a sanitized version of the project's {@linkplain org.gradle.api.Project#getName identifier}.
      *
      * @return The mod identifier of the current project.
      */
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/MinecraftArtifactCache.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/MinecraftArtifactCache.groovy
index 8589d08ff..47add9b1b 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/MinecraftArtifactCache.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/MinecraftArtifactCache.groovy
@@ -64,11 +64,10 @@ interface MinecraftArtifactCache extends BaseDSLElement<MinecraftArtifactCache>
      *
      * @param tasks The tasks collection to extract from.
      * @param artifact The game artifact to extract.
-     * @param minecraftVersion The minecraft version to extract for.
      * @return The extracted task.
      */
     @NotNull
-    NamedDomainObjectProvider<? extends WithOutput> gameArtifactTask(@NotNull NamedDomainObjectCollection<WithOutput> tasks, @NotNull final GameArtifact artifact, @NotNull final String minecraftVersion);
+    NamedDomainObjectProvider<? extends WithOutput> gameArtifactTask(@NotNull NamedDomainObjectCollection<WithOutput> tasks, @NotNull final GameArtifact artifact);
 
     /**
      * Eagerly caches the launcher metadata.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/dependency/replacement/ReplacementResult.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/dependency/replacement/ReplacementResult.groovy
index 65e7ce9eb..7e5d76639 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/dependency/replacement/ReplacementResult.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/dependency/replacement/ReplacementResult.groovy
@@ -75,7 +75,7 @@ class ReplacementResult {
     }
 
     /**
-     * @returns The configuration in which additional dependencies are added.
+     * @returns The configuration in which additional compileDependencies are added.
      */
     @NotNull
     Configuration getDependencies() {
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Entry.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Entry.groovy
index 6bba17940..d9633722c 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Entry.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Entry.groovy
@@ -43,10 +43,10 @@ interface Entry extends BaseDSLElement<Entry> {
         Builder from(Dependency dependency)
 
         /**
-         * Configures the entry that is about to be created from the given dependency and dependencies.
+         * Configures the entry that is about to be created from the given dependency and compileDependencies.
          *
          * @param dependency The dependency to set.
-         * @param dependencies The dependencies to set.
+         * @param dependencies The compileDependencies to set.
          * @return The builder.
          */
         Builder from(Dependency dependency, Configuration dependencies);
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Repository.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Repository.groovy
index 43884a3e5..d26fd5cce 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Repository.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/Repository.groovy
@@ -11,7 +11,7 @@ import org.gradle.api.file.RegularFileProperty
 
 /**
  * Defines a dummy repository extension which allows for the specification of dummy repository entries
- * which can then be used to dynamically generate dependencies for the project.
+ * which can then be used to dynamically generate compileDependencies for the project.
  */
 @CompileStatic
 interface Repository extends BaseDSLElement<Repository> {
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryEntryLegacy.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryEntryLegacy.groovy
index 51e8a70df..39145a6c4 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryEntryLegacy.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryEntryLegacy.groovy
@@ -16,7 +16,7 @@ import java.util.function.Consumer
  * Defines an entry for a dummy repository.
  *
  * @param <TSelf> The self-reference type of the entry.
- * @param <TDependency> The type for the dependencies of the entry.
+ * @param <TDependency> The type for the compileDependencies of the entry.
  */
 @CompileStatic
 interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDependency>, TDependency extends RepositoryReference> extends Serializable, RepositoryReference {
@@ -76,9 +76,9 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
     String getGroup()
 
     /**
-     * Defines the name of the entry.
+     * Defines the identifier of the entry.
      *
-     * @return The name of the entry.
+     * @return The identifier of the entry.
      */
     @NotNull
     String getName()
@@ -110,9 +110,9 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
     String getExtension()
 
     /**
-     * Defines the dependencies of the entry.
+     * Defines the compileDependencies of the entry.
      *
-     * @return The dependencies of the entry.
+     * @return The compileDependencies of the entry.
      */
     @NotNull
     Collection<? extends RepositoryReference> getDependencies()
@@ -121,7 +121,7 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
      * Defines a builder for the repository entry.
      *
      * @param <TSelf> The self-reference type of the builder.
-     * @param <TDependency> The type for the dependencies of the entry.
+     * @param <TDependency> The type for the compileDependencies of the entry.
      * @param <TDependencyBuilder> The type for the dependency builders.
      */
     @CompileStatic
@@ -136,9 +136,9 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
         String getGroup();
 
         /**
-         * The currently configured name in the builder.
+         * The currently configured identifier in the builder.
          *
-         * @return The currently configured name in the builder.
+         * @return The currently configured identifier in the builder.
          */
         @NotNull
         String getName();
@@ -168,9 +168,9 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
         String getExtension();
 
         /**
-         * The currently configured dependencies in the builder.
+         * The currently configured compileDependencies in the builder.
          *
-         * @return The currently configured dependencies in the builder.
+         * @return The currently configured compileDependencies in the builder.
          */
         @NotNull
         ImmutableSet<? extends RepositoryReference> getDependencies();
@@ -185,9 +185,9 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
         TSelf setGroup(@NotNull String group);
 
         /**
-         * Sets the name of the entry.
+         * Sets the identifier of the entry.
          *
-         * @param name The new name for the entry.
+         * @param name The new identifier for the entry.
          * @return The builder invoked on.
          */
         @NotNull
@@ -239,36 +239,36 @@ interface RepositoryEntryLegacy<TSelf extends RepositoryEntryLegacy<TSelf, TDepe
         TSelf from(@NotNull ResolvedDependency resolvedDependency);
 
         /**
-         * Adds a dependencies to the entry.
+         * Adds a compileDependencies to the entry.
          *
-         * @param dependency The dependencies to add.
+         * @param dependency The compileDependencies to add.
          * @return The builder invoked on.
          */
         @NotNull
         TSelf setDependencies(@NotNull Collection<? extends RepositoryReference> dependencies);
 
         /**
-         * Adds a dependencies to the entry.
+         * Adds a compileDependencies to the entry.
          *
-         * @param dependency The dependencies to add.
+         * @param dependency The compileDependencies to add.
          * @return The builder invoked on.
          */
         @NotNull
         TSelf setDependencies(@NotNull RepositoryReference... dependencies);
 
         /**
-         * Adds a dependencies to the entry.
+         * Adds a compileDependencies to the entry.
          *
-         * @param dependency The dependencies to add.
+         * @param dependency The compileDependencies to add.
          * @return The builder invoked on.
          */
         @NotNull
         TSelf withDependency(@NotNull Consumer<TDependencyBuilder> consumer);
 
         /**
-         * Adds a dependencies to the entry, in such a way that it is considered a processed dependency and that dependency replacement logic needs to be considered.
+         * Adds a compileDependencies to the entry, in such a way that it is considered a processed dependency and that dependency replacement logic needs to be considered.
          *
-         * @param dependency The dependencies to add.
+         * @param dependency The compileDependencies to add.
          * @return The builder invoked on.
          */
         @NotNull
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryReference.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryReference.groovy
index 736b94761..793ab60ae 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryReference.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/repository/RepositoryReference.groovy
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable
 
 /**
  * Defines a reference to an entry in a repository.
- * Generally used as a list of dependencies in a dummy repository entry.
+ * Generally used as a list of compileDependencies in a dummy repository entry.
  *
  * @param <TSelf> The self-reference type of the entry.
  */
@@ -28,9 +28,9 @@ interface RepositoryReference {
     String getGroup()
 
     /**
-     * Gives access to the name of the dependency.
+     * Gives access to the identifier of the dependency.
      *
-     * @return The name.
+     * @return The identifier.
      */
     @NotNull
     String getName()
@@ -80,7 +80,7 @@ interface RepositoryReference {
      * Defines a builder which can be used to create a repository reference.
      *
      * @param <TSelf> The self-reference type of the builder.
-     * @param <TDependency> The type for the dependencies of the entry.
+     * @param <TDependency> The type for the compileDependencies of the entry.
      */
     @CompileStatic
     interface Builder<TSelf extends Builder<TSelf, TDependency>, TDependency extends RepositoryReference> extends BaseDSLElement<TSelf> {
@@ -94,9 +94,9 @@ interface RepositoryReference {
         String getGroup();
 
         /**
-         * The currently configured name in the builder.
+         * The currently configured identifier in the builder.
          *
-         * @return The currently configured name in the builder.
+         * @return The currently configured identifier in the builder.
          */
         @NotNull
         String getName();
@@ -135,9 +135,9 @@ interface RepositoryReference {
         TSelf setGroup(@NotNull String group);
 
         /**
-         * Sets the name of the reference.
+         * Sets the identifier of the reference.
          *
-         * @param name The new name for the reference.
+         * @param name The new identifier for the reference.
          * @return The builder invoked on.
          */
         @NotNull
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/DevLogin.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/DevLogin.groovy
index 042fe5f1a..94473f660 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/DevLogin.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/DevLogin.groovy
@@ -30,7 +30,7 @@ interface DevLogin extends ConfigurableDSLElement<DevLogin> {
     Property<String> getMainClass();
 
     /**
-     * @return The suffix for the configuration name to use when adding the dev login configuration.
+     * @return The suffix for the configuration identifier to use when adding the dev login configuration.
      */
     @Input
     @Optional
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/conventions/Configurations.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/conventions/Configurations.groovy
index 5d3f92d1c..302f552cd 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/conventions/Configurations.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/subsystems/conventions/Configurations.groovy
@@ -26,20 +26,20 @@ interface Configurations extends BaseDSLElement<Configurations> {
     Property<String> getLocalRuntimeConfigurationPostFix();
 
     /**
-     * The post-fix to apply to the per-source-set runtime configuration added to a runs dependencies
+     * The post-fix to apply to the per-source-set runtime configuration added to a runs compileDependencies
      * Note: this can be configured via the buildscript, however any sourcesets created earlier then the setting statement will not have the post-fix correctly applied, it is as such recommended to use the gradle.properties file.
      */
     @DSLProperty
     Property<String> getRunRuntimeConfigurationPostFix();
 
     /**
-     * The post-fix to apply to the per-run configuration added to a runs dependencies
+     * The post-fix to apply to the per-run configuration added to a runs compileDependencies
      */
     @DSLProperty
     Property<String> getPerRunRuntimeConfigurationPostFix();
 
     /**
-     * The name of the runtime configuration that will be used for the local runtime configuration.
+     * The identifier of the runtime configuration that will be used for the local runtime configuration.
      * Note: this can not be configured via the buildscript and needs to be set in the gradle.properties file.
      */
     @DSLProperty
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/ide/extensions/IdeaRunExtension.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/ide/extensions/IdeaRunExtension.groovy
index 8522ce105..31ea0b4d3 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/ide/extensions/IdeaRunExtension.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/ide/extensions/IdeaRunExtension.groovy
@@ -14,7 +14,7 @@ interface IdeaRunExtension extends BaseDSLElement<IdeaRunExtension> {
 
     /**
      * The primary source set to which the reference is made for the run.
-     * IDEA pull dependencies and compile information from this.
+     * IDEA pull compileDependencies and compile information from this.
      *
      * @return The primary source set.
      * @implNote The default value of this is always the main source set of the project that owns the run.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/DependencyHandler.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/DependencyHandler.groovy
index 32629dafa..48f7a9c1e 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/DependencyHandler.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/DependencyHandler.groovy
@@ -8,12 +8,12 @@ import org.gradle.api.artifacts.dsl.DependencyCollector
 import org.gradle.api.tasks.Internal
 
 /**
- * A custom dependency handler which manages runtime dependencies for a run configuration.
+ * A custom dependency handler which manages runtime compileDependencies for a run configuration.
  */
 @CompileStatic
 interface DependencyHandler extends BaseDSLElement<DependencyHandler>, Dependencies {
     /**
-     * The dependency configuration that contains all the declared runtime dependencies.
+     * The dependency configuration that contains all the declared runtime compileDependencies.
      */
     @Internal
     Configuration getRuntimeConfiguration();
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/Run.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/Run.groovy
index 95741a1fb..54e809ea0 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/Run.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/Run.groovy
@@ -255,9 +255,9 @@ interface Run extends BaseDSLElement<Run>, NamedDSLElement {
     abstract Property<Boolean> getConfigureAutomatically();
 
     /**
-     * Indicates if this run should automatically be configured by the type of the same name.
+     * Indicates if this run should automatically be configured by the type of the same identifier.
      *
-     * @return The property which indicates if this run should automatically be configured by the type of the same name.
+     * @return The property which indicates if this run should automatically be configured by the type of the same identifier.
      */
     @Input
     @DSLProperty
@@ -277,15 +277,15 @@ interface Run extends BaseDSLElement<Run>, NamedDSLElement {
     /**
      * Configures the run using the settings of the associated run type.
      * <p/>
-     * Picks a run type using the name of this run, if no specific run type has been set.
+     * Picks a run type using the identifier of this run, if no specific run type has been set.
      */
     abstract void configure();
 
     /**
-     * Configures the run using the type with the specified name.
+     * Configures the run using the type with the specified identifier.
      * Throwing an exception if no type could be found.
      *
-     * @param type The name of the type to use to configure the run.
+     * @param type The identifier of the type to use to configure the run.
      */
     abstract void configure(@NotNull final String type);
 
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunDevLogin.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunDevLogin.groovy
index 8795aa58f..0da3116eb 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunDevLogin.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunDevLogin.groovy
@@ -25,7 +25,7 @@ interface RunDevLogin extends ConfigurableDSLElement<RunDevLogin> {
     Property<Boolean> getIsEnabled()
 
     /**
-     * This is the profile name that is used when launching the game through dev login.
+     * This is the profile identifier that is used when launching the game through dev login.
      * It is used as the key for looking up credentials in the credentials file, or for creating a new profile.
      */
     @Input
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunSourceSets.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunSourceSets.groovy
index 9833e860d..7a3fa9f3d 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunSourceSets.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/run/RunSourceSets.groovy
@@ -41,7 +41,7 @@ interface RunSourceSets extends ConfigurableDSLElement<RunSourceSets> {
 
     /**
      * Adds a source set to this run
-     * The group id used is derived from the local project name if it is not set.
+     * The group id used is derived from the local project identifier if it is not set.
      *
      * @param sourceSet The source set to add
      */
@@ -49,7 +49,7 @@ interface RunSourceSets extends ConfigurableDSLElement<RunSourceSets> {
 
     /**
      * Adds multiple source sets to this run
-     * The group id used is derived from the local project name if it is not set.
+     * The group id used is derived from the local project identifier if it is not set.
      *
      * @param sourceSets The source sets to add
      */
@@ -57,7 +57,7 @@ interface RunSourceSets extends ConfigurableDSLElement<RunSourceSets> {
 
     /**
      * Adds multiple source sets to this run
-     * The group id used is derived from the local project name if it is not set.
+     * The group id used is derived from the local project identifier if it is not set.
      *
      * @param sourceSets The source sets to add
      */
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/type/RunType.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/type/RunType.groovy
index 84e5b2d48..e418fc99f 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/type/RunType.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runs/type/RunType.groovy
@@ -60,9 +60,9 @@ abstract class RunType implements ConfigurableDSLElement<RunType>, NamedDSLEleme
     abstract Property<Boolean> getIsSingleInstance();
 
     /**
-     * Gives access to the name of the main class on the run type.
+     * Gives access to the identifier of the main class on the run type.
      *
-     * @return The property which holds the main class name.
+     * @return The property which holds the main class identifier.
      */
     @DSLProperty
     @Input
@@ -215,11 +215,11 @@ abstract class RunType implements ConfigurableDSLElement<RunType>, NamedDSLEleme
             }
 
             final JsonObject object = jsonElement.getAsJsonObject()
-            if (!object.has("name")) {
-                throw new JsonParseException("Expected a 'name' property, but got " + object)
+            if (!object.has("identifier")) {
+                throw new JsonParseException("Expected a 'identifier' property, but got " + object)
             }
 
-            final String name = object.get("name").getAsString()
+            final String name = object.get("identifier").getAsString()
 
             return deserializeNamed(objectFactory, name, object, jsonDeserializationContext)
         }
@@ -245,7 +245,7 @@ abstract class RunType implements ConfigurableDSLElement<RunType>, NamedDSLEleme
         @Override
         JsonElement serialize(RunType runType, Type type, JsonSerializationContext jsonSerializationContext) {
             JsonObject object = serializedNamed(runType, jsonSerializationContext)
-            object.addProperty("name", runType.getName())
+            object.addProperty("identifier", runType.getName())
             return object
         }
 
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/CommonRuntimeBuilder.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/CommonRuntimeBuilder.java
new file mode 100644
index 000000000..2036400fb
--- /dev/null
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/CommonRuntimeBuilder.java
@@ -0,0 +1,41 @@
+package net.neoforged.gradle.dsl.common.runtime;
+
+import net.neoforged.gradle.dsl.common.runtime.extensions.RuntimesContainer;
+import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
+import net.neoforged.gradle.dsl.common.runtime.spec.TaskTreeBuilder;
+import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
+import org.apache.commons.lang3.StringUtils;
+
+public class CommonRuntimeBuilder {
+
+    protected final Specification specification;
+
+    public CommonRuntimeBuilder(Specification specification) {
+        this.specification = specification;
+    }
+
+    public TaskTreeBuilder.BuildResult build() {
+        throw new IllegalStateException("Not implemented");
+    }
+
+    /**
+     * Creates a unique task name for a task in the runtime.
+     *
+     * @param nonePrefixedName The name of the task without the prefix.
+     * @return The unique task name.
+     * @implNote Will return a simpler name if at the time of calling there is only one runtime with the same identifier.
+     */
+    protected String createTaskName(String nonePrefixedName) {
+        //In case we have multiple runtimes with the same identifier, we need to use the name instead
+        //The name holds the full version and distribution type, so it should be unique
+        final RuntimesContainer runtimesContainer = specification.project().getExtensions().getByType(RuntimesContainer.class);
+        if (runtimesContainer.matching(definition ->
+                definition.specification().identifier().equals(specification.identifier()) &&
+                        definition.specification() != specification
+        ).size() > 1) {
+            return specification.name() + StringUtils.capitalize(nonePrefixedName);
+        }
+
+        return specification.identifier() + StringUtils.capitalize(nonePrefixedName);
+    }
+}
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Definition.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Definition.java
index 88800e510..533bf0d15 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Definition.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Definition.java
@@ -2,17 +2,17 @@
 
 import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
 import net.neoforged.gradle.util.NamedRecord;
-import org.gradle.api.artifacts.Configuration;
 import org.jetbrains.annotations.NotNull;
 
 public record Definition(
         Specification specification,
-        Configuration dependencies,
-        TaskHandler taskHandler
+        DependencyHandler dependencies,
+        TaskHandler taskHandler,
+        Outputs outputs
 ) implements NamedRecord {
 
     @Override
     public @NotNull String name() {
-        return specification.name();
+        return specification.identifier();
     }
 }
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/DependencyHandler.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/DependencyHandler.java
new file mode 100644
index 000000000..ca5b19c2e
--- /dev/null
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/DependencyHandler.java
@@ -0,0 +1,15 @@
+package net.neoforged.gradle.dsl.common.runtime.definition;
+
+import org.gradle.api.artifacts.Configuration;
+
+/**
+ * Handles the configurations of a runtime.
+ *
+ * @param apiElements The API elements configuration that contains the API of the runtime.
+ * @param runtimeElements The runtime elements configuration that contains the runtime of the runtime.
+ */
+public record DependencyHandler(
+        Configuration apiElements,
+        Configuration runtimeElements
+) {
+}
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/LegacyDefinition.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/LegacyDefinition.groovy
index 047a42f69..4c7981ddb 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/LegacyDefinition.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/LegacyDefinition.groovy
@@ -13,11 +13,11 @@ import org.jetbrains.annotations.NotNull
 @CompileStatic
 interface LegacyDefinition<S extends LegacySpecification> {
     /**
-     * Returns the runtimes task with the given name.
-     * The given name is prefixed with the name of the runtime, if needed.
-     * Invoking this method with the name of a task that is not part of the runtime will result in an {@link IllegalArgumentException exception}.
+     * Returns the runtimes task with the given identifier.
+     * The given identifier is prefixed with the identifier of the runtime, if needed.
+     * Invoking this method with the identifier of a task that is not part of the runtime will result in an {@link IllegalArgumentException exception}.
      *
-     * @param name The name of the task to get.
+     * @param name The identifier of the task to get.
      * @return The named task.
      */
     @NotNull TaskProvider<? extends WithOutput> getTask(String name);
@@ -59,7 +59,7 @@ interface LegacyDefinition<S extends LegacySpecification> {
     @NotNull Map<GameArtifact, TaskProvider<? extends WithOutput>> getGameArtifactProvidingTasks();
 
     /**
-     * Gives access to a detached configuration which contains the dependencies of the minecraft dependency.
+     * Gives access to a detached configuration which contains the compileDependencies of the minecraft dependency.
      *
      * @return The minecraft dependency configuration.
      */
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Outputs.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Outputs.java
new file mode 100644
index 000000000..0de7c84ec
--- /dev/null
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/Outputs.java
@@ -0,0 +1,37 @@
+package net.neoforged.gradle.dsl.common.runtime.definition;
+
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
+import org.gradle.api.tasks.TaskProvider;
+
+/**
+ * Represents the outputs of a runtime.
+ */
+public interface Outputs {
+
+    /**
+     * @return The outputs instance that indicates that neither the sources nor binaries are known.
+     */
+    static Outputs unknown() {
+        return new Outputs() {
+            @Override
+            public TaskProvider<? extends WithOutput> sources() {
+                throw new IllegalStateException("The sources output is unknown");
+            }
+
+            @Override
+            public TaskProvider<? extends WithOutput> binaries() {
+                throw new IllegalStateException("The binaries output is unknown");
+            }
+        };
+    }
+
+    /**
+     * @return The task that produces the sources jar of the runtime.
+     */
+    TaskProvider<? extends WithOutput> sources();
+
+    /**
+     * @return The task that produces the binary jar of the runtime.
+     */
+    TaskProvider<? extends WithOutput> binaries();
+}
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/TaskHandler.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/TaskHandler.java
index d1c144f00..b4b647348 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/TaskHandler.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/definition/TaskHandler.java
@@ -1,38 +1,38 @@
 package net.neoforged.gradle.dsl.common.runtime.definition;
 
 import net.neoforged.gradle.dsl.common.extensions.MinecraftArtifactCache;
-import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
 import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.util.GameArtifact;
 import org.gradle.api.*;
-import org.gradle.api.provider.Provider;
 
 public record TaskHandler(
-        NamedDomainObjectCollection<WithOutput> tasks,
-        Specification specification,
+        Project project,
+        NamedDomainObjectCollection<Runtime> tasks,
         Action<Runtime> taskConfigurator
 ) {
+    public TaskHandler(Project project, Action<Runtime> taskConfigurator) {
+        this(project, project.getObjects().namedDomainObjectList(Runtime.class), taskConfigurator);
+    }
 
-    <T extends Runtime> NamedDomainObjectProvider<T> register(String name, Class<T> type, Action<? super T> configurationAction) throws InvalidUserDataException {
-        final NamedDomainObjectProvider<T> taskProvider = specification.project().getTasks().register(name, type, task -> {
+    public <T extends Runtime> NamedDomainObjectProvider<T> register(String name, Class<T> type, Action<? super T> configurationAction) throws InvalidUserDataException {
+        final NamedDomainObjectProvider<T> taskProvider = project.getTasks().register(name, type, task -> {
             taskConfigurator().execute(task);
             configurationAction.execute(task);
         });
 
-        tasks.addLater(taskProvider);
+        tasks().addLater(taskProvider);
 
         return taskProvider;
     }
 
-    <T extends Runtime> NamedDomainObjectProvider<T> register(String name, Class<T> type) throws InvalidUserDataException {
+    public <T extends Runtime> NamedDomainObjectProvider<T> register(String name, Class<T> type) throws InvalidUserDataException {
         return register(name, type, t -> {});
     }
 
-    public Provider<WithOutput> gameArtifactTask(GameArtifact artifact) {
-        final MinecraftArtifactCache cache = specification.project().getExtensions().getByType(MinecraftArtifactCache.class);
-
-        return specification.minecraftVersion()
-                .flatMap(minecraftVersion -> cache.gameArtifactTask(tasks, artifact, minecraftVersion));
+    public NamedDomainObjectProvider<? extends WithOutput> task(GameArtifact artifact) {
+        final MinecraftArtifactCache cache = project.getExtensions().getByType(MinecraftArtifactCache.class);
+        //return cache.gameArtifactTask(tasks, artifact);
+        return null;
     }
 }
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/extensions/CommonRuntimes.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/extensions/CommonRuntimes.groovy
index 1190e6a54..0ca1e0e3a 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/extensions/CommonRuntimes.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/extensions/CommonRuntimes.groovy
@@ -47,7 +47,7 @@ interface CommonRuntimes<S extends LegacySpecification, B extends LegacySpecific
 
     /**
      * Potentially creates a new runtime based on the specification created by the given builder.
-     * If a runtime with the same name already exists, the existing runtime is returned.
+     * If a runtime with the same identifier already exists, the existing runtime is returned.
      * If the specification of the existing runtime, and the one configured via the builder do not line up, an exception is thrown.
      *
      * @param configurator The configurator which consumes a builder that will create the specification which defines the runtime.
@@ -58,7 +58,7 @@ interface CommonRuntimes<S extends LegacySpecification, B extends LegacySpecific
 
     /**
      * Potentially creates a new runtime based on the specification created by the given builder.
-     * If a runtime with the same name already exists, the existing runtime is returned.
+     * If a runtime with the same identifier already exists, the existing runtime is returned.
      * If the specification of the existing runtime, and the one configured via the builder do not line up, an exception is thrown.
      *
      * @param dependency The dependency to create the runtime for.
@@ -70,7 +70,7 @@ interface CommonRuntimes<S extends LegacySpecification, B extends LegacySpecific
 
     /**
      * Creates a new runtime based on the specification created by the given builder.
-     * If a runtime with the same name already exists, an exception is thrown.
+     * If a runtime with the same identifier already exists, an exception is thrown.
      *
      * @param configurator The configurator which consumes a builder that will create the specification which defines the runtime.
      * @return The runtime definition, unbaked.
@@ -80,7 +80,7 @@ interface CommonRuntimes<S extends LegacySpecification, B extends LegacySpecific
 
     /**
      * Creates a new runtime based on the specification created by the given builder.
-     * If a runtime with the same name already exists, an exception is thrown.
+     * If a runtime with the same identifier already exists, an exception is thrown.
      *
      * @param dependency The dependency to create the runtime for.
      * @param configurator The configurator which consumes a builder that will create the specification which defines the runtime.
@@ -90,18 +90,18 @@ interface CommonRuntimes<S extends LegacySpecification, B extends LegacySpecific
     D create(Dependency dependency, Action<B> configurator);
 
     /**
-     * Looks up a runtime definition by name.
+     * Looks up a runtime definition by identifier.
      * Throws an exception of not found.
      *
-     * @param name The name of the runtime definition.
+     * @param name The identifier of the runtime definition.
      * @return The runtime definition.
      */
     D getByName(String name);
 
     /**
-     * Looks up a runtime definition by name.
+     * Looks up a runtime definition by identifier.
      *
-     * @param name The name of the runtime definition.
+     * @param name The identifier of the runtime definition.
      * @return The runtime definition, or null if not found.
      */
     @Nullable
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/GenerationTaskBuildingContext.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/GenerationTaskBuildingContext.groovy
index cac746f9c..bfdb56b44 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/GenerationTaskBuildingContext.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/GenerationTaskBuildingContext.groovy
@@ -64,9 +64,9 @@ class GenerationTaskBuildingContext {
     }
 
     /**
-     * The name of the environment that is being configured.
+     * The identifier of the environment that is being configured.
      *
-     * @return The name of the environment.
+     * @return The identifier of the environment.
      */
     @NotNull
     String getEnvironmentName() {
@@ -74,9 +74,9 @@ class GenerationTaskBuildingContext {
     }
 
     /**
-     * A function that can be used to build a task name for a given task type.
+     * A function that can be used to build a task identifier for a given task type.
      *
-     * @return A function that can be used to build a task name for a given task type.
+     * @return A function that can be used to build a task identifier for a given task type.
      */
     @NotNull
     Function<String, String> getTaskNameBuilder() {
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/NamingChannel.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/NamingChannel.groovy
index bb277d7d3..0813cbb37 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/NamingChannel.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/NamingChannel.groovy
@@ -14,9 +14,9 @@ import org.jetbrains.annotations.NotNull;
 interface NamingChannel extends BaseDSLElement<NamingChannel> {
 
     /**
-     * The name of the naming channel.
+     * The identifier of the naming channel.
      *
-     * @return The name.
+     * @return The identifier.
      */
     @NotNull
     String getName();
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/TaskBuildingContext.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/TaskBuildingContext.groovy
index 09639d17f..c42faab91 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/TaskBuildingContext.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/naming/TaskBuildingContext.groovy
@@ -93,9 +93,9 @@ class TaskBuildingContext {
     }
 
     /**
-     * The name of the environment that is being configured.
+     * The identifier of the environment that is being configured.
      *
-     * @return The name of the environment.
+     * @return The identifier of the environment.
      */
     @NotNull
     String getEnvironmentName() {
@@ -103,9 +103,9 @@ class TaskBuildingContext {
     }
 
     /**
-     * A function that can be used to build a task name for a given task type.
+     * A function that can be used to build a task identifier for a given task type.
      *
-     * @return A function that can be used to build a task name for a given task type.
+     * @return A function that can be used to build a task identifier for a given task type.
      */
     @NotNull
     Function<String, String> getTaskNameBuilder() {
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/LegacySpecification.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/LegacySpecification.groovy
index cb313d4ac..19664f45d 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/LegacySpecification.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/LegacySpecification.groovy
@@ -22,32 +22,32 @@ interface LegacySpecification {
     @NotNull Project getProject();
 
     /**
-     * The name of the specification.
+     * The identifier of the specification.
      * Is not unique within the project.
      *
-     * @return The name.
+     * @return The identifier.
      */
     @NotNull String getName();
 
     /**
-     * The name of the specification.
+     * The identifier of the specification.
      * Is unique within the project.
      *
-     * Generally combines the name with a unique version.
+     * Generally combines the identifier with a unique version.
      *
      * @return The identifier.
      */
     @NotNull String getIdentifier();
 
     /**
-     * The versioned name of the specification.
-     * This is unique in the project, it is derived from the name or the identifier.
+     * The versioned identifier of the specification.
+     * This is unique in the project, it is derived from the identifier or the identifier.
      *
-     * If this specification is the only one registered then it will return the normal name, else the identifier.
+     * If this specification is the only one registered then it will return the normal identifier, else the identifier.
      * The idea of this method is to improve the readability of the task tree and logs, in the default case that only
      * a single runtime of that type is registered to any given project.
      *
-     * @return The versioned name.
+     * @return The versioned identifier.
      */
     @NotNull String getVersionedName();
 
@@ -66,16 +66,16 @@ interface LegacySpecification {
     @NotNull DistributionType getDistribution();
 
     /**
-     * The task tree adapters which are invoked before the step (who's name is used as a key) task is being build.
-     * These task tree adapters allow for the modification of the input of the steps task with the given name.
+     * The task tree adapters which are invoked before the step (who's identifier is used as a key) task is being build.
+     * These task tree adapters allow for the modification of the input of the steps task with the given identifier.
      *
      * @return The pre task tree adapters.
      */
     @NotNull Multimap<String, TaskTreeAdapter> getPreTaskTypeAdapters();
 
     /**
-     * The task tree adapters which are invoked after the step (who's name is used as a key) task has being build.
-     * These task tree adapters allow for the modification of the output of the steps task with the given name.
+     * The task tree adapters which are invoked after the step (who's identifier is used as a key) task has being build.
+     * These task tree adapters allow for the modification of the output of the steps task with the given identifier.
      *
      * @return THe post task tree adapters.
      */
@@ -121,7 +121,7 @@ interface LegacySpecification {
         /**
          * Adds a pre task tree adapter to the specification which is about to be build.
          *
-         * @param taskTypeName The name of the task type or specification step before which the task tree adapter should be invoked.
+         * @param taskTypeName The identifier of the task type or specification step before which the task tree adapter should be invoked.
          * @param adapter      The task tree adapter.
          * @return The builder instance.
          */
@@ -130,7 +130,7 @@ interface LegacySpecification {
         /**
          * Adds a post task tree adapter to the specification which is about to be build.
          *
-         * @param taskTypeName The name of the task type or specification step after which the task tree adapter should be invoked.
+         * @param taskTypeName The identifier of the task type or specification step after which the task tree adapter should be invoked.
          * @param adapter      The task tree adapter.
          * @return The builder instance.
          */
@@ -139,7 +139,7 @@ interface LegacySpecification {
         /**
          * Adds a task customizer to the specification which is about to be build.
          *
-         * @param taskTypeName The name of the task type or specification step to which the customization should be applied.
+         * @param taskTypeName The identifier of the task type or specification step to which the customization should be applied.
          * @param taskType     The expected Gradle task type of the task.
          * @param customizer   The function to apply to the task via {@link Task#configure}.
          * @return The builder instance.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/Specification.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/Specification.java
index 81037da17..359e5c229 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/Specification.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/Specification.java
@@ -1,35 +1,37 @@
 package net.neoforged.gradle.dsl.common.runtime.spec;
 
 import net.neoforged.gradle.dsl.common.util.DistributionType;
+import net.neoforged.gradle.util.NamedRecord;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Project;
-import org.gradle.api.provider.Provider;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Locale;
 
 /**
  * Defines a specification of a runtime in a project.
  *
  * @param project The project this specification is for.
- * @param name The lazy provider for the name of the runtime.
- * @param version The lazy provider for the version of the runtime.
- * @param minecraftVersion The lazy provider for the Minecraft version of the runtime.
- * @param distribution The lazy provider for the distribution type of the runtime.
+ * @param identifier The identifier of the runtime.
+ * @param version The version of the runtime.
+ * @param minecraftVersion The minecraft version of the runtime.
+ * @param distribution The distribution type of the runtime.
  */
 public record Specification(
         Project project,
-        String name,
-        Provider<String> version,
-        Provider<String> minecraftVersion,
-        Provider<DistributionType> distribution
-) {
+        String identifier,
+        String version,
+        String minecraftVersion,
+        DistributionType distribution
+) implements NamedRecord {
 
-    public Provider<String> identifier() {
-        // Capitalize the first letter of the distribution type name
-        final Provider<String> distributionTypeName = distribution()
-                .map(DistributionType::getName)
-                .map(String::toLowerCase)
-                .map(StringUtils::capitalize);
+    public @NotNull String name() {
+        // Capitalize the first letter of the distribution type identifier
+        final String type = StringUtils.capitalize(distribution()
+                .getName()
+                .toLowerCase(Locale.ROOT));
 
-        // Combine the name, distribution type name, and version
-        return distributionTypeName.zip(version(), (type, version) -> "%s%s%s".formatted(name(), type, version));
+        // Combine the identifier, distribution type identifier, and version
+        return "%s%s%s".formatted(identifier(), type, version());
     }
 }
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/TaskTreeBuilder.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/TaskTreeBuilder.java
index c5bb2fbdb..fa6d41419 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/TaskTreeBuilder.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/spec/TaskTreeBuilder.java
@@ -1,5 +1,6 @@
 package net.neoforged.gradle.dsl.common.runtime.spec;
 
+import net.neoforged.gradle.dsl.common.runtime.definition.Outputs;
 import net.neoforged.gradle.dsl.common.runtime.definition.TaskHandler;
 import org.gradle.api.artifacts.Configuration;
 
@@ -10,18 +11,22 @@
 public interface TaskTreeBuilder {
 
     /**
-     * Builds a task tree from the given specification.
-     *
-     * @param specification The specification to build the task tree from.
-     * @return The task tree.
+     * @return The built task tree.
      */
-    BuildResult build(Specification specification);
+    BuildResult build();
 
     /**
      * A record representing the result of building a task tree.
      *
-     * @param dependencies The dependencies of the task tree.
+     * @param compileDependencies The compile dependencies of the task tree.
+     * @param runtimeDependencies The runtime dependencies of the task tree.
      * @param handler The task handler for the task tree.
+     * @param outputs The outputs of the task tree.
      */
-    record BuildResult(Configuration dependencies, TaskHandler handler) {}
+    record BuildResult(
+            Configuration compileDependencies,
+            Configuration runtimeDependencies,
+            TaskHandler handler,
+            Outputs outputs
+    ) {}
 }
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/Runtime.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/Runtime.groovy
index 296c28990..833ea36e5 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/Runtime.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/Runtime.groovy
@@ -5,11 +5,7 @@ import net.minecraftforge.gdi.annotations.DSLProperty
 import net.neoforged.gradle.dsl.common.tasks.WithJavaVersion
 import net.neoforged.gradle.dsl.common.tasks.WithOutput
 import net.neoforged.gradle.dsl.common.tasks.WithWorkspace
-import net.neoforged.gradle.dsl.common.util.CacheableMinecraftVersion
-import net.neoforged.gradle.dsl.common.util.DistributionType
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.FileTree
+import net.neoforged.gradle.dsl.common.tasks.specifications.RuntimeSpecification
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -21,67 +17,11 @@ import org.gradle.api.tasks.Nested
  * By default, it has an output.
  */
 @CompileStatic
-trait Runtime implements WithOutput, WithWorkspace, WithJavaVersion {
-
-    /**
-     * The runtime name, it is the overarching identifier of the runtime that this task is
-     * part of.
-     * @return The runtime name
-     */
-    @Internal
-    abstract Property<String> getRuntimeName();
-
-    /**
-     * The runtime directory, it is the location of the runtime working directory.
-     * @return The mcp working directory.
-     */
-    @Internal
-    abstract DirectoryProperty getRuntimeDirectory();
-
-    /**
-     * The unpacked mcp directory in the global cache.
-     * @return The unpacked mcp directory.
-     */
-    @Internal
-    abstract ConfigurableFileCollection getNeoFormArchive();
-
-    /**
-     * The steps directory, it is the location of the steps working directory.
-     *
-     * @return The steps directory.
-     */
-    @Internal
-    abstract DirectoryProperty getStepsDirectory();
-
-    /**
-     * The name of the step.
-     * @return The name of the step.
-     */
-    @Input
-    @DSLProperty
-    abstract Property<String> getStepName();
-
-    /**
-     * The requested distribution.
-     *
-     * @return The requested distribution.
-     */
-    @Input
-    @DSLProperty
-    abstract Property<DistributionType> getDistribution();
-
-    /**
-     * The requested minecraft version.
-     *
-     * @return The requested minecraft version.
-     */
-    @Input
-    @DSLProperty
-    abstract Property<String> getMinecraftVersion();
+trait Runtime implements WithOutput, WithWorkspace, WithJavaVersion, RuntimeSpecification {
 
     /**
      * Symbolic data source references defined by the NeoForm package, already adjusted for the
-     * current {@link #getDistribution()}.
+     * current distribution.
      */
     @Internal
     abstract MapProperty<String, String> getSymbolicDataSources();
@@ -103,21 +43,4 @@ trait Runtime implements WithOutput, WithWorkspace, WithJavaVersion {
     @Nested
     @DSLProperty
     abstract RuntimeMultiArguments getMultiArguments();
-
-    /**
-     * The name of the output file name for this step.
-     *
-     * @return The name of the output file.
-     */
-    @Input
-    @DSLProperty
-    abstract Property<String> getOutputFileName();
-
-    /**
-     * The output directory for this step, also doubles as working directory for this step.
-     *
-     * @return The output and working directory for this step.
-     */
-    @Internal
-    abstract DirectoryProperty getOutputDirectory();
 }
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskCustomizer.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskCustomizer.java
index 15a9a5d9b..5b856cc2d 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskCustomizer.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskCustomizer.java
@@ -33,7 +33,7 @@ public Consumer<T> getTaskCustomizer() {
 
     public void apply(Runtime task) {
         if (!taskClass.isInstance(task)) {
-            throw new IllegalArgumentException("Customization for step " + task.getStepName()
+            throw new IllegalArgumentException("Customization for step " + task.getStep()
                     + " requires task type " + taskClass + " but actual task is " + task.getClass());
         }
         taskCustomizer.accept(taskClass.cast(task));
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskTreeAdapter.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskTreeAdapter.groovy
index c475b991f..f132e5995 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskTreeAdapter.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/TaskTreeAdapter.groovy
@@ -34,7 +34,7 @@ interface TaskTreeAdapter {
     /**
      * Runs the given task adapter after the current one.
      * Implicitly chaining the build output of this adapters task as the input for the given adapters task.
-     * Automatically configures the task tree dependencies.
+     * Automatically configures the task tree compileDependencies.
      *
      * @param after The task tree adapter to run afterwards.
      * @return The combined task tree adapter.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/OutputSpecification.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/OutputSpecification.groovy
index 4e518c877..937ec7be9 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/OutputSpecification.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/OutputSpecification.groovy
@@ -1,10 +1,12 @@
 package net.neoforged.gradle.dsl.common.tasks.specifications
 
 import net.minecraftforge.gdi.annotations.DSLProperty
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
 
 /**
@@ -12,10 +14,20 @@ import org.gradle.api.tasks.OutputFile
  */
 trait OutputSpecification implements ProjectSpecification {
 
+    /**
+     * The output directory of this task as configured.
+     * If not set, then it is derived from the output directory identifier and the working directory of the task.
+     *
+     * @return The output directory.
+     */
+    @DSLProperty
+    @OutputDirectory
+    @Optional
+    abstract DirectoryProperty getOutputDirectory();
 
     /**
      * The output file of this task as configured.
-     * If not set, then it is derived from the output file name and the working directory of the task.
+     * If not set, then it is derived from the output file identifier and the working directory of the task.
      *
      * @return The output file.
      */
@@ -25,10 +37,10 @@ trait OutputSpecification implements ProjectSpecification {
     abstract RegularFileProperty getOutput();
 
     /**
-     * The name of the output file name for this step.
+     * The identifier of the output file identifier for this step.
      * Can be left out, if and only if the output is set directly.
      *
-     * @return The name of the output file.
+     * @return The identifier of the output file.
      */
     @Input
     @Optional
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/RuntimeSpecification.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/RuntimeSpecification.groovy
new file mode 100644
index 000000000..52c9d0cf6
--- /dev/null
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/RuntimeSpecification.groovy
@@ -0,0 +1,19 @@
+package net.neoforged.gradle.dsl.common.tasks.specifications
+
+import net.minecraftforge.gdi.annotations.DSLProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+
+/**
+ * Defines a task that has a runtime specification.
+ */
+trait RuntimeSpecification {
+
+    /**
+     * The identifier of the step.
+     * @return The identifier of the step.
+     */
+    @Input
+    @DSLProperty
+    abstract Property<String> getStep();
+}
\ No newline at end of file
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/Artifact.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/Artifact.groovy
index bafeae4f8..08070c62d 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/Artifact.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/Artifact.groovy
@@ -38,7 +38,7 @@ import java.util.function.Predicate
 @CompileStatic
 class Artifact implements Comparable<Artifact>, Serializable {
 
-    // group:name:version[:classifier][@extension]
+    // group:identifier:version[:classifier][@extension]
     private final String group;
     private final String name;
     private final String version;
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/ConfigurationUtils.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/ConfigurationUtils.groovy
index bc6c2c6bd..d53637e94 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/ConfigurationUtils.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/ConfigurationUtils.groovy
@@ -30,7 +30,7 @@ class ConfigurationUtils {
      *
      * @param project The project to create the configuration for
      * @param context The context of the configuration
-     * @param dependencies The dependencies to add to the configuration
+     * @param dependencies The compileDependencies to add to the configuration
      * @return The detached configuration
      */
     static Configuration temporaryConfiguration(final Project project, final String context, final Dependency... dependencies) {
@@ -91,7 +91,7 @@ class ConfigurationUtils {
      *
      * @param configurations The configuration handler.
      * @param context The context of the configuration
-     * @param dependencies The dependencies to add to the configuration
+     * @param dependencies The compileDependencies to add to the configuration
      * @return The detached configuration
      */
     static Configuration temporaryUnhandledConfiguration(final ConfigurationContainer configurations, final String context, final Dependency... dependencies) {
@@ -109,11 +109,35 @@ class ConfigurationUtils {
     }
 
     /**
-     * Creates a configuration that can be resolved, but not consumed, and does not report its dependencies as transitive.
+     * Creates a configuration that can be resolved, but not consumed, but on which no dependency replacement is applied.
+     *
+     * @param configurations The configuration handler.
+     * @param context The context of the configuration
+     * @param dependencies The compileDependencies to add to the configuration
+     * @return The detached configuration
+     */
+    static Configuration temporaryUnhandledConfiguration(final ConfigurationContainer configurations, final String context, final Action<Configuration> configurationAction, final Dependency... dependencies) {
+        final Configuration configuration = configurations.maybeCreate("neoGradleInternalUnhandled${context.capitalize()}")
+        UNHANDLED_CONFIGURATIONS.add(configuration)
+
+        if (configuration.getDependencies().isEmpty()) {
+            configurationAction.execute(configuration)
+
+            configuration.getDependencies().addAll(dependencies)
+
+            configuration.setCanBeConsumed(false)
+            configuration.setCanBeResolved(true)
+        }
+
+        return configuration
+    }
+
+    /**
+     * Creates a configuration that can be resolved, but not consumed, and does not report its compileDependencies as transitive.
      *
      * @param configurations The configuration handler.
      * @param context The context of the configuration
-     * @param dependencies The dependencies to add to the configuration
+     * @param dependencies The compileDependencies to add to the configuration
      * @return The detached configuration
      */
     static Configuration temporaryUnhandledNotTransitiveConfiguration(final ConfigurationContainer configurations, final String context, final Dependency... dependencies) {
@@ -233,11 +257,11 @@ class ConfigurationUtils {
     }
 
     /**
-     * Gets the name of the source set with the given post fix
+     * Gets the identifier of the source set with the given post fix
      *
-     * @param sourceSet The source set to get the name of
-     * @param postFix The post fix to append to the source set name
-     * @return The name of the source set with the post fix
+     * @param sourceSet The source set to get the identifier of
+     * @param postFix The post fix to append to the source set identifier
+     * @return The identifier of the source set with the post fix
      */
     static String getSourceSetName(SourceSet sourceSet, String postFix) {
         final String capitalized = postFix.capitalize()
@@ -247,11 +271,11 @@ class ConfigurationUtils {
     }
 
     /**
-     * Gets the name of the source set with the given post fix
+     * Gets the identifier of the source set with the given post fix
      *
-     * @param sourceSet The source set to get the name of
-     * @param postFix The post fix to append to the source set name
-     * @return The name of the source set with the post fix
+     * @param sourceSet The source set to get the identifier of
+     * @param postFix The post fix to append to the source set identifier
+     * @return The identifier of the source set with the post fix
      */
     static String getRunName(Run sourceSet, String postFix) {
         final String capitalized = postFix.capitalize()
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/DistributionType.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/DistributionType.groovy
index a1f90d261..53ed06a50 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/DistributionType.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/DistributionType.groovy
@@ -16,32 +16,30 @@ enum DistributionType {
     /**
      * Defines the client distribution type, generally contains the game code, including rendering logic and all its assets.
      */
-    CLIENT("client", GameArtifact.CLIENT_JAR, true, false),
+    CLIENT("client", true, false),
     /**
      * Defines the server distribution type, generally contains only the game logic code and game logic (data) assets.
      */
-    SERVER("server", GameArtifact.SERVER_JAR, false, true),
+    SERVER("server", false, true),
     /**
      * Defines the common distribution type, is a merged version of client and server distribution types, generally the client overrides the server.
      */
-    JOINED("joined", GameArtifact.CLIENT_JAR, true, true);
+    JOINED("joined", true, true);
 
     private final String side
-    private final GameArtifact gameArtifact
     private final boolean client
     private final boolean server
 
-    DistributionType(String side, GameArtifact gameArtifact, boolean client, boolean server) {
+    DistributionType(String side, boolean client, boolean server) {
         this.side = side
-        this.gameArtifact = gameArtifact
         this.client = client
         this.server = server
     }
 
     /**
-     * Gets the distribution type name.
+     * Gets the distribution type identifier.
      *
-     * @return The distribution type name.
+     * @return The distribution type identifier.
      */
     String getName() {
         return this.side
@@ -53,7 +51,7 @@ enum DistributionType {
      * @return The game artifact associated with this distribution type.
      */
     GameArtifact getGameArtifact() {
-        return gameArtifact
+        return this == SERVER ? GameArtifact.SERVER_JAR : GameArtifact.CLIENT_JAR
     }
 
     /**
@@ -75,10 +73,10 @@ enum DistributionType {
     }
 
     /**
-     * Creates a task name where the distribution type is sandwiched between the given prefix and suffix.
+     * Creates a task identifier where the distribution type is sandwiched between the given prefix and suffix.
      *
-     * @param prefix The prefix for the task name.
-     * @param suffix The suffix for the task name.
+     * @param prefix The prefix for the task identifier.
+     * @param suffix The suffix for the task identifier.
      */
     String createTaskName(final String prefix, final String suffix) {
         return "${StringUtils.uncapitalize(prefix)}${StringUtils.capitalize(this.name().toLowerCase(Locale.ROOT))}${StringUtils.capitalize(suffix)}".toString();
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftArtifactType.java b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftArtifactType.java
index b2f90d4bf..bebd5d6f1 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftArtifactType.java
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftArtifactType.java
@@ -1,7 +1,8 @@
 package net.neoforged.gradle.dsl.common.util;
 
 public enum MinecraftArtifactType {
-    
+
+    VERSION_JSON("version.json"),
     EXECUTABLE("%s"),
     MAPPINGS("%s_mappings");
     
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftVersionAndUrl.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftVersionAndUrl.groovy
index 39546883f..aadef2d0a 100644
--- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftVersionAndUrl.groovy
+++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/util/MinecraftVersionAndUrl.groovy
@@ -1,7 +1,7 @@
 package net.neoforged.gradle.dsl.common.util
 
 /**
- * Defines a full minecraft version name and url.
+ * Defines a full minecraft version identifier and url.
  */
 class MinecraftVersionAndUrl {
 
@@ -15,9 +15,9 @@ class MinecraftVersionAndUrl {
     }
 
     /**
-     * The full version name of the minecraft version.
+     * The full version identifier of the minecraft version.
      *
-     * @return The full version name of the minecraft version.
+     * @return The full version identifier of the minecraft version.
      */
     String getVersion() {
         return version
diff --git a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV1.java b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/LegacyNeoFormSdk.java
similarity index 60%
rename from dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV1.java
rename to dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/LegacyNeoFormSdk.java
index 79a765287..ce6b41d19 100644
--- a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV1.java
+++ b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/LegacyNeoFormSdk.java
@@ -41,15 +41,16 @@
 
 import javax.annotation.Nullable;
 
-public class NeoFormConfigConfigurationSpecV1 extends VersionedConfiguration {
+public class LegacyNeoFormSdk extends VersionedConfiguration {
     protected static final Gson GSON = new GsonBuilder()
-            .registerTypeAdapter(NeoFormConfigConfigurationSpecV1.Step.class, new NeoFormConfigConfigurationSpecV1.Step.Deserializer())
+            .registerTypeAdapter(LegacyNeoFormSdk.Step.class, new LegacyNeoFormSdk.Step.Deserializer())
+            .registerTypeAdapter(LegacyNeoFormSdk.StepType.class, new LegacyNeoFormSdk.StepType.Deserializer())
             .setPrettyPrinting().create();
 
-    public static NeoFormConfigConfigurationSpecV1 get(InputStream stream) {
-        return GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), NeoFormConfigConfigurationSpecV1.class);
+    public static LegacyNeoFormSdk get(InputStream stream) {
+        return GSON.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), LegacyNeoFormSdk.class);
     }
-    public static NeoFormConfigConfigurationSpecV1 get(byte[] data) {
+    public static LegacyNeoFormSdk get(byte[] data) {
         return get(new ByteArrayInputStream(data));
     }
 
@@ -64,7 +65,7 @@ public static NeoFormConfigConfigurationSpecV1 get(byte[] data) {
     protected Map<String, List<String>> libraries;
 
     @Input
-    public String getVersion() {
+    public String minecraftVersion() {
         return version;
     }
 
@@ -127,23 +128,87 @@ public Map<String, List<String>> getLibraries() {
         return libraries;
     }
 
+    public enum StepType {
+        DOWNLOAD_MANIFEST,
+        DOWNLOAD_JSON,
+        DOWNLOAD_CLIENT,
+        DOWNLOAD_SERVER,
+        STRIP,
+        LIST_LIBRARIES,
+        INJECT,
+        PATCH,
+        DOWNLOAD_CLIENT_MAPPINGS,
+        DOWNLOAD_SERVER_MAPPINGS,
+        FUNCTION;
+
+        public String toString() {
+            final String name = name();
+            final String[] sections = name.split("_");
+            if (sections.length == 1)
+                return name.toLowerCase();
+                        
+            final StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < sections.length; i++) {
+                String section = sections[i];
+                if (i == 0) {
+                    sb.append(section.toLowerCase());
+                } else {
+                    sb.append(section.charAt(0));
+                    sb.append(section.substring(1).toLowerCase());
+                }
+            }
+            return sb.toString();
+        }
+        
+        public static final class Deserializer implements JsonDeserializer<StepType> {
+
+            @Override
+            public StepType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                if (!json.isJsonPrimitive())
+                    throw new JsonParseException("Could not parse step type: Expected a string");
+
+                String value = json.getAsString();
+                if (value.equals("function"))
+                    throw new JsonParseException("Could not parse step type: Expected a valid type, not a function reference!");
+
+                for (StepType type : StepType.values()) {
+                    if (type.toString().equalsIgnoreCase(value))
+                        return type;
+                }
+
+                //If we do not know the type, it will always be a function
+                return FUNCTION;
+            }
+        }
+    }
+    
     public static class Step {
-        private final String type;
+        private final StepType type;
+        @Nullable
+        private final String function;
         private final String name;
         @Nullable
         private final Map<String, String> values;
 
-        private Step(String type, String name, @Nullable Map<String, String> values) {
+        private Step(StepType type, @Nullable String function, String name, @Nullable Map<String, String> values) {
             this.type = type;
+            this.function = function;
             this.name = name;
             this.values = values;
         }
 
         @Input
-        public String getType() {
+        public StepType getType() {
             return type;
         }
 
+        @Input
+        @Optional
+        @Nullable
+        public String getFunction() {
+            return function;
+        }
+
         @Input
         public String getName() {
             return name;
@@ -165,12 +230,32 @@ public Step deserialize(JsonElement json, Type typeOfT, JsonDeserializationConte
                 JsonObject obj = json.getAsJsonObject();
                 if (!obj.has("type"))
                     throw new JsonParseException("Could not parse step: Missing 'type'");
-                String type = obj.get("type").getAsString();
-                String name = obj.has("name") ? obj.get("name").getAsString() : type;
+                //Deserialize the type string field to an enum entry.
+                StepType type = context.deserialize(obj.get("type"), StepType.class);
+
+                //See if we have a function in the first place.
+                String function = obj.has("function") ? obj.get("function").getAsString() : null;
+
+                //Functions are special their type is a direct reference to the function.
+                //We however make that explicit, so unwrap the function key again, so we keep track of what function to pass in.
+                if (type == StepType.FUNCTION)
+                    function = obj.get("type").getAsString();
+
+                //If an identifier is given use that
+                //If not check, if we have a function key, if that is present use it
+                //Else use the display key for the step type (which is its toString value)
+                String name = obj.has("identifier") ?
+                        obj.get("identifier").getAsString() :
+                        function == null ?
+                                type.toString() :
+                                function;
+
+                //Get the values.
                 Map<String, String> values = obj.entrySet().stream()
-                        .filter(e -> !"type".equals(e.getKey()) && !"name".equals(e.getKey()))
+                        .filter(e -> !"type".equals(e.getKey()) && !"identifier".equals(e.getKey()))
                         .collect(Collectors.toMap(Entry::getKey, e -> e.getValue().getAsString()));
-                return new Step(type, name, values);
+
+                return new Step(type, function, name, values);
             }
         }
     }
diff --git a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV2.java b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormSdk.java
similarity index 79%
rename from dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV2.java
rename to dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormSdk.java
index 3e371694b..ab3726075 100644
--- a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormConfigConfigurationSpecV2.java
+++ b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/configuration/NeoFormSdk.java
@@ -26,33 +26,34 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
 import javax.annotation.Nullable;
 
-public class NeoFormConfigConfigurationSpecV2 extends NeoFormConfigConfigurationSpecV1 {
+public class NeoFormSdk extends LegacyNeoFormSdk {
 
-    public static NeoFormConfigConfigurationSpecV2 get(File file) {
+    public static NeoFormSdk get(File file) {
         try (final InputStream stream = new FileInputStream(file)) {
             return get(stream);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
     }
-    public static NeoFormConfigConfigurationSpecV2 get(InputStream stream) {
+
+    public static NeoFormSdk get(InputStream stream) {
         try (final InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
-            return GSON.fromJson(reader, NeoFormConfigConfigurationSpecV2.class);
+            return GSON.fromJson(reader, NeoFormSdk.class);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
         
     }
-    public static NeoFormConfigConfigurationSpecV2 get(byte[] data) {
+
+    public static NeoFormSdk get(byte[] data) {
         return get(new ByteArrayInputStream(data));
     }
 
-    public static NeoFormConfigConfigurationSpecV2 getFromArchive(File path) {
+    public static NeoFormSdk getFromArchive(File path) {
         try (ZipFile zip = new ZipFile(path)) {
             ZipEntry entry = zip.getEntry("config.json");
             if (entry == null)
@@ -61,9 +62,9 @@ public static NeoFormConfigConfigurationSpecV2 getFromArchive(File path) {
             byte[] data = IOUtils.toByteArray(zip.getInputStream(entry));
             int spec = getSpec(data);
             if (spec == 2 || spec == 3)
-                return NeoFormConfigConfigurationSpecV2.get(data);
+                return NeoFormSdk.get(data);
             if (spec == 1)
-                return new NeoFormConfigConfigurationSpecV2(NeoFormConfigConfigurationSpecV1.get(data));
+                return new NeoFormSdk(LegacyNeoFormSdk.get(data));
 
             throw new IllegalStateException("Invalid NeoForm Config: " + path.getAbsolutePath() + " Unknown spec: " + spec);
         } catch (IOException e) {
@@ -91,7 +92,7 @@ public String getEncoding() {
         return this.encoding == null ? "UTF-8" : this.encoding;
     }
 
-    public NeoFormConfigConfigurationSpecV2(NeoFormConfigConfigurationSpecV1 old) {
+    public NeoFormSdk(LegacyNeoFormSdk old) {
         this.version = old.version;
         this.data = old.data;
         this.steps = old.steps;
diff --git a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/definition/NeoFormDefinition.groovy b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/definition/NeoFormDefinition.groovy
index 6ded5087f..8100b4f0b 100644
--- a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/definition/NeoFormDefinition.groovy
+++ b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/definition/NeoFormDefinition.groovy
@@ -2,7 +2,7 @@ package net.neoforged.gradle.dsl.neoform.runtime.definition
 
 import groovy.transform.CompileStatic;
 import net.neoforged.gradle.dsl.common.runtime.definition.LegacyDefinition
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk
 import net.neoforged.gradle.dsl.neoform.runtime.specification.NeoFormSpecification;
 import org.jetbrains.annotations.NotNull
 
@@ -19,5 +19,5 @@ interface NeoFormDefinition<S extends NeoFormSpecification> extends LegacyDefini
      *
      * @return The deserialized NeoForm configuration.
      */
-    @NotNull NeoFormConfigConfigurationSpecV2 getNeoFormConfig();
+    @NotNull NeoFormSdk getNeoFormConfig();
 }
diff --git a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy
index c53d83393..b85552c14 100644
--- a/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy
+++ b/dsl/neoform/src/main/groovy/net/neoforged/gradle/dsl/neoform/runtime/specification/NeoFormSpecification.groovy
@@ -55,9 +55,9 @@ interface NeoFormSpecification extends LegacySpecification {
         B withNeoFormDependency(@NotNull final Object dependencyNotation);
 
         /**
-         * Configures the specification to use the given file collection as additional recompile dependencies.
+         * Configures the specification to use the given file collection as additional recompile compileDependencies.
          *
-         * @param files The file collection with the additional recompile dependencies.
+         * @param files The file collection with the additional recompile compileDependencies.
          * @return The builder.
          */
         @NotNull
diff --git a/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/Library.groovy b/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/Library.groovy
index 3814e3ed5..fb3a36180 100644
--- a/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/Library.groovy
+++ b/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/Library.groovy
@@ -90,7 +90,7 @@ abstract class Library extends WithRules<Library> {
         Library deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             def result = super.deserialize(jsonElement, type, jsonDeserializationContext) as Library
 
-            PropertyUtils.deserializeString(result.getName(), jsonElement.getAsJsonObject(), "name")
+            PropertyUtils.deserializeString(result.getName(), jsonElement.getAsJsonObject(), "identifier")
             PropertyUtils.deserialize(result.getDownload(), jsonElement.getAsJsonObject(), "downloads", LibraryDownload.class, jsonDeserializationContext)
 
             return result;
@@ -100,7 +100,7 @@ abstract class Library extends WithRules<Library> {
         JsonObject serialize(Library library, Type type, JsonSerializationContext jsonSerializationContext) {
             def result = super.serialize(library, type, jsonSerializationContext) as JsonObject
 
-            PropertyUtils.serializeString(library.getName(), result, "name")
+            PropertyUtils.serializeString(library.getName(), result, "identifier")
             PropertyUtils.serializeObject(library.getDownload(), result, "downloads", jsonSerializationContext)
 
             return result;
diff --git a/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/OsCondition.groovy b/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/OsCondition.groovy
index c8b8c9c65..36dc71788 100644
--- a/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/OsCondition.groovy
+++ b/dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/OsCondition.groovy
@@ -53,7 +53,7 @@ abstract class OsCondition implements ConfigurableDSLElement<OsCondition> {
             final JsonObject payload = jsonElement.getAsJsonObject();
             final OsCondition instance = factory.newInstance(OsCondition.class);
 
-            PropertyUtils.deserializeString(instance.getName(), payload, "name")
+            PropertyUtils.deserializeString(instance.getName(), payload, "identifier")
             PropertyUtils.deserializeString(instance.getArch(), payload, "arch")
             PropertyUtils.deserializeString(instance.getVersion(), payload, "version")
 
@@ -64,7 +64,7 @@ abstract class OsCondition implements ConfigurableDSLElement<OsCondition> {
         JsonElement serialize(OsCondition osCondition, Type type, JsonSerializationContext jsonSerializationContext) {
             final JsonObject result = new JsonObject();
 
-            PropertyUtils.serializeString(osCondition.getName(), result, "name")
+            PropertyUtils.serializeString(osCondition.getName(), result, "identifier")
             PropertyUtils.serializeString(osCondition.getArch(), result, "arch")
             PropertyUtils.serializeString(osCondition.getVersion(), result, "version")
 
diff --git a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/runtime/specification/UserDevSpecification.groovy b/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/runtime/specification/UserDevSpecification.groovy
index ca8b1ef00..508472d40 100644
--- a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/runtime/specification/UserDevSpecification.groovy
+++ b/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/runtime/specification/UserDevSpecification.groovy
@@ -46,18 +46,18 @@ interface UserDevSpecification extends LegacySpecification {
         B withForgeGroup(String forgeGroup);
 
         /**
-         * Configures the forge name to use.
+         * Configures the forge identifier to use.
          * Pulls the value lazily from the given provider.
          *
-         * @param forgeName The forge name to use.
+         * @param forgeName The forge identifier to use.
          * @return The builder.
          */
         B withForgeName(Provider<String> forgeName);
 
         /**
-         * Configures the forge name to use.
+         * Configures the forge identifier to use.
          *
-         * @param forgeName The forge name to use.
+         * @param forgeName The forge identifier to use.
          * @return The builder.
          */
         B withForgeName(String forgeName);
diff --git a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/FunctionalTests.groovy b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/FunctionalTests.groovy
index 317584372..4b0e2afd6 100644
--- a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/FunctionalTests.groovy
+++ b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/FunctionalTests.groovy
@@ -25,7 +25,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:neoform_client:${NEOFORM_VERSION}'
             }
             """)
@@ -52,7 +52,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:neoform_client:${NEOFORM_VERSION}'
             }
             """)
@@ -86,7 +86,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:neoform_client:${NEOFORM_VERSION}'
             }
             """)
@@ -124,7 +124,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:neoform_client:${NEOFORM_VERSION}'
             }
             """)
diff --git a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/NeoFormPluginTests.groovy b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/NeoFormPluginTests.groovy
index 53c892c24..a90f579b6 100644
--- a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/NeoFormPluginTests.groovy
+++ b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/NeoFormPluginTests.groovy
@@ -34,7 +34,7 @@ class NeoFormPluginTests extends BuilderBasedTestSpecification {
             it.build("""
             tasks.register('plugins') {
                 doLast {
-                    project.getPlugins().forEach { plugin -> project.logger.lifecycle plugin.class.name }
+                    project.getPlugins().forEach { plugin -> project.logger.lifecycle plugin.class.identifier }
                 }
             }
             """)
diff --git a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/dependency/NeoformDependencyManagerTest.groovy b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/dependency/NeoformDependencyManagerTest.groovy
index ef3215ffd..badb5843e 100644
--- a/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/dependency/NeoformDependencyManagerTest.groovy
+++ b/neoform/src/functionalTest/groovy/net/neoforged/gradle/neoform/dependency/NeoformDependencyManagerTest.groovy
@@ -6,13 +6,13 @@ class NeoformDependencyManagerTest extends SimpleTestSpecification {
 
     def "adding a dependency to something other then neoform minecraft works"() {
         given:
-        settingsFile << "rootProject.name = 'neoform-plugin-apply-succeeds'"
+        settingsFile << "rootProject.identifier = 'neoform-plugin-apply-succeeds'"
         buildFile << """
             plugins {
                 id 'net.neoforged.gradle.neoform'
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'com.google.guava:guava:30.1.1-jre'
             }
         """
@@ -26,13 +26,13 @@ class NeoformDependencyManagerTest extends SimpleTestSpecification {
 
     def "adding a dependency on neoform minecraft with exact version works"() {
         given:
-        settingsFile << "rootProject.name = 'neoform-plugin-apply-succeeds'"
+        settingsFile << "rootProject.identifier = 'neoform-plugin-apply-succeeds'"
         buildFile << """
             plugins {
                 id 'net.neoforged.gradle.neoform'
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:neoform_client:+'
             }
         """
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/NeoFormProjectPlugin.java b/neoform/src/main/java/net/neoforged/gradle/neoform/NeoFormProjectPlugin.java
index 4e8a7dc4f..a26b0ac39 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/NeoFormProjectPlugin.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/NeoFormProjectPlugin.java
@@ -46,7 +46,7 @@ public void apply(@Nonnull Project project) {
 
         NeoFormOfficialNamingChannelConfigurator.getInstance().configure(project);
 
-        // Setup handling of the dependencies
+        // Setup handling of the compileDependencies
         NeoFormDependencyManager.apply(project);
 
         // Add Known repos
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java b/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java
index b577cc4e0..45e3fc720 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/dependency/NeoFormDependencyManager.java
@@ -1,35 +1,26 @@
 package net.neoforged.gradle.neoform.dependency;
 
-import com.google.common.collect.Sets;
 import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.Context;
 import net.neoforged.gradle.dsl.common.runtime.definition.Definition;
 import net.neoforged.gradle.dsl.common.runtime.extensions.RuntimesContainer;
 import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
-import net.neoforged.gradle.dsl.common.runtime.spec.TaskTreeBuilder;
-import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
 import net.neoforged.gradle.dsl.common.util.DistributionType;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2;
-import net.neoforged.gradle.neoform.runtime.NeoFormRuntime;
-import net.neoforged.gradle.neoform.runtime.definition.NeoFormRuntimeDefinition;
-import net.neoforged.gradle.neoform.util.NeoFormRuntimeUtils;
-import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
+import net.neoforged.gradle.neoform.runtime.NeoFormPublishingUtils;
+import net.neoforged.gradle.neoform.runtime.NeoFormRuntimeBuilder;
 import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacement;
 import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.ReplacementResult;
-import net.neoforged.gradle.neoform.runtime.extensions.NeoFormRuntimeExtension;
-import net.neoforged.gradle.util.ModuleDependencyUtils;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.DependencyArtifact;
 import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.provider.Provider;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
 
 /**
- * This class installs a dependency replacement handler that replaces the following dependencies with the output
+ * This class installs a dependency replacement handler that replaces the following compileDependencies with the output
  * of a NeoForm runtime.
  * <p>
  * <ul>
@@ -55,7 +46,7 @@ public static void apply(final Project project) {
     private static Optional<ReplacementResult> replaceDependency(Context context) {
         ModuleDependency dependency = context.getDependency();
 
-        NeoFormTarget target = getNeoFormTargetFromDependency(dependency);
+        NeoFormTarget target = createTarget(dependency);
         if (target == null) {
             return Optional.empty();
         }
@@ -68,43 +59,34 @@ private static Optional<ReplacementResult> replaceDependency(Context context) {
         Project project = context.getProject();
         RuntimesContainer container = project.getExtensions().getByType(RuntimesContainer.class);
 
-        final Provider<File> neoFormArchiveFile = NeoFormRuntime.getNeoFormArchive(project, target.version);
-        final Provider<NeoFormConfigConfigurationSpecV2> config = NeoFormRuntime.parseConfiguration(neoFormArchiveFile);
+        final NeoFormSdk sdk = NeoFormPublishingUtils.downloadAndParseSdkFile(project, target.version);
+
+        final NeoFormRuntimeBuilder builder = new NeoFormRuntimeBuilder();
 
         final Definition runtimeDefinition = container.register(
                 new Specification(
                         project,
                         "neoForm",
-                        project.provider(() -> target.version),
-                        NeoFormRuntime.getMinecraftVersion(config),
-                        project.provider(() -> target.distribution)
+                        target.version(),
+                        sdk.minecraftVersion(),
+                        target.distribution()
                 ),
-                new TaskTreeBuilder() {
-                    @Override
-                    public BuildResult build(Specification specification) {
-                        return null;
-                    }
-                }
+                builder::build
         );
 
-        NeoFormRuntimeExtension runtimeExtension = project.getExtensions().getByType(NeoFormRuntimeExtension.class);
-        NeoFormRuntimeDefinition runtime = runtimeExtension.maybeCreateFor(dependency, builder -> {
-            builder.withDistributionType(target.distribution).withNeoFormVersion(target.version);
-            NeoFormRuntimeUtils.configureDefaultRuntimeSpecBuilder(project, builder);
-        });
-
         return Optional.of(
                 new ReplacementResult(
                         project,
-                        runtime.getSourceJarTask(),
-                        runtime.getRawJarTask(),
-                        runtime.getMinecraftDependenciesConfiguration(),
+                        runtimeDefinition.outputs().sources(),
+                        runtimeDefinition.outputs().binaries(),
+                        //TODO: Pass both configurations back
+                        runtimeDefinition.dependencies().runtimeElements(),
                         Collections.emptySet()
                 ));
     }
 
     @Nullable
-    private static NeoFormTarget getNeoFormTargetFromDependency(ModuleDependency dependency) {
+    private static NeoFormTarget createTarget(ModuleDependency dependency) {
 
         if (!"net.minecraft".equals(dependency.getGroup())) {
             return null;
@@ -112,17 +94,12 @@ private static NeoFormTarget getNeoFormTargetFromDependency(ModuleDependency dep
 
         DistributionType distributionType;
         switch (dependency.getName()) {
-            case "neoform_client":
-                distributionType = DistributionType.CLIENT;
-                break;
-            case "neoform_server":
-                distributionType = DistributionType.SERVER;
-                break;
-            case "neoform_joined":
-                distributionType = DistributionType.JOINED;
-                break;
-            default:
+            case "neoform_client" -> distributionType = DistributionType.CLIENT;
+            case "neoform_server" -> distributionType = DistributionType.SERVER;
+            case "neoform_joined" -> distributionType = DistributionType.JOINED;
+            default -> {
                 return null; // This dependency is not handled by this replacer
+            }
         }
 
         if (!hasMatchingArtifact(dependency)) {
@@ -149,14 +126,6 @@ private static boolean hasSourcesArtifact(ModuleDependency externalModuleDepende
         return Objects.equals(artifact.getClassifier(), "sources") && Objects.equals(artifact.getExtension(), "jar");
     }
 
-    private static final class NeoFormTarget {
-        private final String version;
-        private final DistributionType distribution;
-
-        public NeoFormTarget(String version, DistributionType distribution) {
-            this.version = version;
-            this.distribution = distribution;
-        }
-    }
+    private record NeoFormTarget(String version, DistributionType distribution) {}
     
 }
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/naming/renamer/NeoFormSourceRenamer.java b/neoform/src/main/java/net/neoforged/gradle/neoform/naming/renamer/NeoFormSourceRenamer.java
index 5fd04a5d9..9bb992d21 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/naming/renamer/NeoFormSourceRenamer.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/naming/renamer/NeoFormSourceRenamer.java
@@ -47,7 +47,7 @@ public static NeoFormSourceRenamer from(File data) throws IOException {
                     boolean hasDesc = reader.getHeader().contains("desc");
                     reader.forEach(row -> {
                         String searge = row.getField(obf);
-                        names.put(searge, row.getField("name"));
+                        names.put(searge, row.getField("identifier"));
                         if (hasDesc) {
                             String desc = row.getField("desc");
                             if (!desc.isEmpty())
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormPublishingUtils.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormPublishingUtils.java
new file mode 100644
index 000000000..99487ccaf
--- /dev/null
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormPublishingUtils.java
@@ -0,0 +1,75 @@
+package net.neoforged.gradle.neoform.runtime;
+
+import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.attributes.Usage;
+import org.gradle.api.attributes.java.TargetJvmVersion;
+import org.gradle.api.plugins.JavaPluginExtension;
+
+import java.io.File;
+
+public class NeoFormPublishingUtils {
+
+    private static final String NEOFORM_SDK_CAPABILITY = "net.neoforged:neoform-sdk:%s";
+    private static final String NEOFORM_DEFAULT_GAV_PATTERN = "net.neoforged:neoform:%s";
+    private static final String NEOFORM_DEFAULT_CONTEXT_PATTERN = "neoFormSdk%s";
+    private static final String NEOFORM_INCLUDEDBUILD_GAV_PATTERN = "net.neoforged:%s:%s";
+    private static final String NEOFORM_INCLUDEDBUILD_CONTEXT_PATTERN = "neoFormIncludedBuild%s";
+    private static final String NEOFORM_DEPENDENCIES_CAPABILITY = "net.neoforged:neoform-dependencies";
+
+    public static NeoFormSdk downloadAndParseSdkFile(Project project, String version) {
+        return parseSdk(downloadSdkFile(project, version));
+    }
+
+    public static File downloadSdkFile(Project project, String version) {
+        try {
+            //First try it with a published coordinate.
+            return attemptDownloadSdkFileWith(project, version, NEOFORM_DEFAULT_CONTEXT_PATTERN.formatted(version), NEOFORM_DEFAULT_GAV_PATTERN.formatted(version));
+        } catch (Exception e) {
+            //No dependency found.
+            try {
+                //When neoform is included as a build then the above will fail because the gradle GAV and maven GAV are different
+                //Now try it with the included build GAV.
+                final String mcVersion = version.substring(0, version.indexOf('-'));
+                return attemptDownloadSdkFileWith(project, version, NEOFORM_INCLUDEDBUILD_CONTEXT_PATTERN.formatted(version), NEOFORM_INCLUDEDBUILD_GAV_PATTERN.formatted(mcVersion, version));
+            } catch (Exception e2) {
+                //Both do not exist, so throw the first exception.
+                e.addSuppressed(e2);
+                throw e;
+            }
+        }
+    }
+
+    private static File attemptDownloadSdkFileWith(Project project, String version, String context, String neoformGav) {
+        final Dependency neoformSdkFormatted = project.getDependencyFactory().create(neoformGav)
+                .capabilities(caps -> caps.requireCapability(NEOFORM_SDK_CAPABILITY.formatted(version)));
+
+        final Configuration configuration = ConfigurationUtils.temporaryUnhandledConfiguration(
+                project.getConfigurations(),
+                context,
+                toBuild -> {
+                    toBuild.attributes(attr -> {
+                        attr.attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, "sdk"));
+                        attr.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, project.getExtensions().getByType(JavaPluginExtension.class).getToolchain().getLanguageVersion().get().asInt());
+                    });
+                },
+                neoformSdkFormatted
+        );
+
+        return configuration.getSingleFile();
+    }
+
+    public static NeoFormSdk parseSdk(File sdkFile) {
+        return NeoFormSdk.get(sdkFile);
+    }
+
+    public static Dependency dependencies(Project project, String version) {
+        return project.getDependencyFactory().create(NEOFORM_DEFAULT_GAV_PATTERN.formatted(version))
+                .capabilities(caps -> {
+                    caps.requireCapability(NEOFORM_DEPENDENCIES_CAPABILITY);
+                });
+    }
+}
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntime.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntime.java
deleted file mode 100644
index 248b0e430..000000000
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntime.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.neoforged.gradle.neoform.runtime;
-
-import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.provider.Provider;
-
-import java.io.File;
-import java.util.Set;
-
-public class NeoFormRuntime {
-
-    private static final String NEOFORM_ARTIFACT = "net.neoforged:neoform:%s@zip";
-
-    public static Provider<File> getNeoFormArchive(Project project, String version) {
-        final String artifact = NEOFORM_ARTIFACT.formatted(version);
-
-        final Configuration configuration = ConfigurationUtils.temporaryUnhandledConfiguration(
-                project.getConfigurations(),
-                "neoform%s".formatted(version),
-                project.getDependencies().create(artifact)
-        );
-
-        return configuration.getIncoming().getArtifacts().getResolvedArtifacts().map(artifacts -> {
-            if (artifacts.isEmpty()) {
-                throw new IllegalStateException("Failed to resolve NeoForm artifact: %s".formatted(artifact));
-            }
-
-            return artifacts.iterator().next().getFile();
-        });
-    }
-
-    public static Provider<NeoFormConfigConfigurationSpecV2> parseConfiguration(Provider<File> neoFormArchiveFile) {
-        return neoFormArchiveFile.map(NeoFormConfigConfigurationSpecV2::getFromArchive);
-    }
-
-    public static Provider<String> getMinecraftVersion(Provider<NeoFormConfigConfigurationSpecV2> config) {
-        return config.map(NeoFormConfigConfigurationSpecV2::getVersion);
-    }
-}
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntimeBuilder.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntimeBuilder.java
new file mode 100644
index 000000000..381b3394c
--- /dev/null
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/NeoFormRuntimeBuilder.java
@@ -0,0 +1,190 @@
+package net.neoforged.gradle.neoform.runtime;
+
+import net.neoforged.gradle.common.runtime.tasks.ListLibraries;
+import net.neoforged.gradle.dsl.common.runtime.CommonRuntimeBuilder;
+import net.neoforged.gradle.dsl.common.runtime.definition.Outputs;
+import net.neoforged.gradle.dsl.common.runtime.definition.TaskHandler;
+import net.neoforged.gradle.dsl.common.runtime.spec.Specification;
+import net.neoforged.gradle.dsl.common.runtime.spec.TaskTreeBuilder;
+import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
+import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
+import net.neoforged.gradle.dsl.common.util.ConfigurationUtils;
+import net.neoforged.gradle.dsl.common.util.DistributionType;
+import net.neoforged.gradle.dsl.common.util.GameArtifact;
+import net.neoforged.gradle.dsl.neoform.configuration.LegacyNeoFormSdk;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
+import net.neoforged.gradle.neoform.runtime.tasks.InjectFromFileTreeSource;
+import net.neoforged.gradle.neoform.runtime.tasks.InjectZipContent;
+import net.neoforged.gradle.neoform.runtime.tasks.Patch;
+import net.neoforged.gradle.neoform.runtime.tasks.StripJar;
+import net.neoforged.gradle.neoform.util.NeoFormRuntimeUtils;
+import org.gradle.api.NamedDomainObjectProvider;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.tasks.TaskProvider;
+
+import javax.annotation.Nullable;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class NeoFormRuntimeBuilder extends CommonRuntimeBuilder {
+
+    private static final String DECOMPILE_FUNCTION = "decompile";
+
+    private static final Map<String, StepOverride> FUNCTION_OVERRIDES = Map.of(
+            DECOMPILE_FUNCTION, NeoFormRuntimeBuilder::createDecompile
+    );
+    private static final Set<LegacyNeoFormSdk.StepType> automaticallyIncludedTasks = EnumSet.of(
+            LegacyNeoFormSdk.StepType.DOWNLOAD_CLIENT,
+            LegacyNeoFormSdk.StepType.DOWNLOAD_SERVER,
+            LegacyNeoFormSdk.StepType.DOWNLOAD_JSON,
+            LegacyNeoFormSdk.StepType.DOWNLOAD_CLIENT_MAPPINGS,
+            LegacyNeoFormSdk.StepType.DOWNLOAD_SERVER_MAPPINGS
+    );
+
+    private final NeoFormSdk sdk;
+
+    public NeoFormRuntimeBuilder(Specification specification) {
+        super(specification);
+        this.sdk = NeoFormPublishingUtils.downloadAndParseSdkFile(specification.project(), specification.version());
+    }
+
+    @Override
+    public TaskTreeBuilder.BuildResult build() {
+        return build(specification.project(), specification.version());
+    }
+
+    protected TaskTreeBuilder.BuildResult build(final Project project, final String version) {
+        final NeoFormSdk sdk = NeoFormPublishingUtils.downloadAndParseSdkFile(project, version);
+
+        final TaskHandler taskHandler = new TaskHandler(project, task -> {
+            throw new IllegalStateException("Not implemented");
+        });
+
+        sdk.getSteps().forEach((stepName, step) -> {
+            taskHandler.register(stepName, NeoFormTask.class, task -> {
+                task.setSdk(sdk);
+                task.setStep(step);
+            }
+        });
+
+        final Configuration dependencies = ConfigurationUtils.temporaryConfiguration(
+                project,
+                "neoformDependencies%s".formatted(version),
+                NeoFormPublishingUtils.dependencies(project, version)
+        );
+
+        return new TaskTreeBuilder.BuildResult(dependencies, dependencies, taskHandler, Outputs.unknown());
+    }
+
+    protected interface StepOverride {
+        public TaskProvider<? extends Runtime> create(final Project project,
+                                                                final LegacyNeoFormSdk.Step step,
+                                                                final TaskHandler handler);
+    }
+
+    @Nullable
+    protected NamedDomainObjectProvider<? extends Runtime> processStep(final Project project,
+                                                                       final LegacyNeoFormSdk.Step step,
+                                                                       final TaskHandler handler) {
+
+        if (step.getType() == LegacyNeoFormSdk.StepType.FUNCTION && step.getFunction() == null)
+            throw new IllegalStateException("Function step must have a function name");
+
+        if (step.getType() == LegacyNeoFormSdk.StepType.FUNCTION && FUNCTION_OVERRIDES.containsKey(step.getFunction()))
+            return FUNCTION_OVERRIDES.get(step.getFunction()).create(project, step, handler);
+        
+        return switch (step.getType()) {
+            case DOWNLOAD_CLIENT -> handler.task(GameArtifact.CLIENT_JAR);
+            case DOWNLOAD_SERVER -> handler.task(GameArtifact.SERVER_JAR);
+            case STRIP -> handler.register(
+                    createTaskName(step.toString()),
+                    StripJar.class,
+                    task -> task.getInput().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task)));;
+            case LIST_LIBRARIES -> null;
+            case INJECT -> null;
+            case PATCH -> null;
+            case DOWNLOAD_CLIENT_MAPPINGS -> null;
+            case DOWNLOAD_SERVER_MAPPINGS -> null;
+            case FUNCTION -> null;
+        }
+        
+        
+        
+        
+        
+        switch (step.getType()) {
+            case "decompile":
+                return createDecompile(spec, step);
+            case "downloadClient":
+                return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.CLIENT_JAR, a -> {
+                    throw new IllegalStateException("Client Jar is required for this step, but was not provided");
+                });
+            case "downloadServer":
+                return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.SERVER_JAR, a -> {
+                    throw new IllegalStateException("Server Jar is required for this step, but was not provided");
+                });
+            case "strip":
+                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), StripJar.class, task -> task.getInput().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task)));
+            case "listLibraries":
+                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), ListLibraries.class, task -> {
+                    task.getDownloadedVersionJsonFile()
+                            .fileProvider(task.newProvider(cache.cacheVersionManifest(spec.getMinecraftVersion())));
+                });
+            case "inject":
+                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), InjectZipContent.class, task -> {
+                    task.getInjectionSource().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task));
+                    task.getInjectedSources()
+                            .add(task.getRuntimeData().map(data -> data.get("inject"))
+                                    .map(inject -> {
+                                        final InjectFromFileTreeSource fileTreeSource = task.getObjectFactory()
+                                                .newInstance(InjectFromFileTreeSource.class);
+                                        fileTreeSource.getFiles().from(inject
+                                                .matching(fileTree -> {
+                                                    if (spec.getDistribution().equals(DistributionType.SERVER)) {
+                                                        fileTree.include("**/server/**");
+                                                    } else if (spec.getDistribution().equals(DistributionType.CLIENT)) {
+                                                        fileTree.include("**/client/**");
+                                                    }
+                                                })
+                                        );
+                                        fileTreeSource.getTreePrefix().set(task.getSymbolicDataSources().map(data -> data.get("inject")));
+                                        return fileTreeSource;
+                                    })
+                            );
+                });
+            case "patch":
+                return spec.getProject().getTasks().register(
+                        CommonRuntimeUtils.buildTaskName(spec, step.getName()),
+                        Patch.class,
+                        task -> {
+                            task.getInput().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task));
+                            task.getPatchArchive().from(spec.getProject().fileTree(spec.getNeoFormArchive()));
+                            task.getPatchDirectory().set(neoFormConfigV2.getData("patches", spec.getDistribution().getName()));
+                        }
+                );
+        }
+        if (neoFormConfigV2.getSpec() >= 2) {
+            switch (step.getType()) {
+                case "downloadClientMappings":
+                    return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.CLIENT_MAPPINGS, a -> {
+                        throw new IllegalStateException("Client Mappings are required for this step, but were not provided");
+                    });
+                case "downloadServerMappings":
+                    return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.SERVER_MAPPINGS, a -> {
+                        throw new IllegalStateException("Server Mappings are required for this step, but were not provided");
+                    });
+            }
+        }
+
+        return null;
+    }
+
+    protected TaskProvider<? extends WithOutput> findInputFor(LegacyNeoFormSdk.Step step, TaskHandler handler) {
+
+    }
+}
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/definition/NeoFormRuntimeDefinition.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/definition/NeoFormRuntimeDefinition.java
index 0ff64f436..0a5a12e2e 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/definition/NeoFormRuntimeDefinition.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/definition/NeoFormRuntimeDefinition.java
@@ -9,14 +9,13 @@
 import net.neoforged.gradle.dsl.common.tasks.ArtifactProvider;
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.util.GameArtifact;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
 import net.neoforged.gradle.dsl.neoform.runtime.definition.NeoFormDefinition;
 import net.neoforged.gradle.neoform.runtime.specification.NeoFormRuntimeSpecification;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -26,7 +25,7 @@
  * Represents a configured and registered runtime for Mcp.
  */
 public class NeoFormRuntimeDefinition extends CommonRuntimeDefinition<NeoFormRuntimeSpecification> implements NeoFormDefinition<NeoFormRuntimeSpecification> {
-    private final NeoFormConfigConfigurationSpecV2 neoform;
+    private final NeoFormSdk neoform;
 
     private final TaskProvider<DownloadAssets> assetsTaskProvider;
     private final TaskProvider<ExtractNatives> nativesTaskProvider;
@@ -40,7 +39,7 @@ public NeoFormRuntimeDefinition(@NotNull NeoFormRuntimeSpecification specificati
                                     @NotNull Configuration minecraftDependenciesConfiguration,
                                     @NotNull Consumer<TaskProvider<? extends Runtime>> associatedTaskConsumer,
                                     @NotNull VersionJson versionJson,
-                                    @NotNull NeoFormConfigConfigurationSpecV2 neoform,
+                                    @NotNull NeoFormSdk neoform,
                                     @NotNull TaskProvider<DownloadAssets> assetsTaskProvider,
                                     @NotNull TaskProvider<ExtractNatives> nativesTaskProvider) {
         super(specification, taskOutputs, sourceJarTask, rawJarTask, gameArtifactProvidingTasks, minecraftDependenciesConfiguration, associatedTaskConsumer, versionJson);
@@ -51,7 +50,7 @@ public NeoFormRuntimeDefinition(@NotNull NeoFormRuntimeSpecification specificati
 
     @Override
     @NotNull
-    public NeoFormConfigConfigurationSpecV2 getNeoFormConfig() {
+    public NeoFormSdk getNeoFormConfig() {
         return neoform;
     }
 
@@ -87,7 +86,7 @@ public int hashCode() {
     public Map<String, String> buildRunInterpolationData(RunImpl run) {
         final Map<String, String> interpolationData = new HashMap<>(super.buildRunInterpolationData(run));
 
-        interpolationData.put("mcp_version", neoform.getVersion());
+        interpolationData.put("mcp_version", neoform.minecraftVersion());
         // NeoForge still references this in the environment variable MCP_MAPPINGS, which is unused since 1.20.2
         // Remove this interpolation placeholder once NeoForge removes the environment variable from its config.json
         interpolationData.put("mcp_mappings", "UNUSED_DEPRECATED");
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java
index af8355511..f0323daaa 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java
@@ -6,7 +6,6 @@
 import net.minecraftforge.gdi.ConfigurableDSLElement;
 import net.neoforged.gradle.common.runtime.extensions.CommonRuntimeExtension;
 import net.neoforged.gradle.common.runtime.tasks.DefaultExecute;
-import net.neoforged.gradle.common.runtime.tasks.ListLibraries;
 import net.neoforged.gradle.common.util.ToolUtilities;
 import net.neoforged.gradle.common.util.VersionJson;
 import net.neoforged.gradle.dsl.common.extensions.ConfigurationData;
@@ -22,8 +21,8 @@
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.tasks.specifications.OutputSpecification;
 import net.neoforged.gradle.dsl.common.util.*;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV1;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2;
+import net.neoforged.gradle.dsl.neoform.configuration.LegacyNeoFormSdk;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
 import net.neoforged.gradle.neoform.runtime.definition.NeoFormRuntimeDefinition;
 import net.neoforged.gradle.neoform.runtime.specification.NeoFormRuntimeSpecification;
 import net.neoforged.gradle.neoform.runtime.tasks.*;
@@ -32,7 +31,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.RegularFile;
@@ -43,7 +41,6 @@
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,7 +62,7 @@ public NeoFormRuntimeExtension(Project project) {
         super(project);
     }
 
-    private static void configureMcpRuntimeTaskWithDefaults(NeoFormRuntimeSpecification spec, File neoFormDirectory, Map<String, String> symbolicDataSources, LinkedHashMap<String, TaskProvider<? extends WithOutput>> tasks, NeoFormConfigConfigurationSpecV1.Step step, Runtime neoFormRuntimeTask, Optional<TaskProvider<? extends WithOutput>> alternativeInputProvider) {
+    private static void configureMcpRuntimeTaskWithDefaults(NeoFormRuntimeSpecification spec, File neoFormDirectory, Map<String, String> symbolicDataSources, LinkedHashMap<String, TaskProvider<? extends WithOutput>> tasks, LegacyNeoFormSdk.Step step, Runtime neoFormRuntimeTask, Optional<TaskProvider<? extends WithOutput>> alternativeInputProvider) {
         buildArguments(neoFormRuntimeTask.getArguments(), spec, step, tasks, neoFormRuntimeTask, alternativeInputProvider);
         configureCommonRuntimeTaskParameters(neoFormRuntimeTask, symbolicDataSources, step.getName(), spec, neoFormDirectory);
 
@@ -79,84 +76,11 @@ private static void configureMcpRuntimeTaskWithDefaults(NeoFormRuntimeSpecificat
     }
 
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    @Nullable
-    private static TaskProvider<? extends WithOutput> createBuiltIn(final NeoFormRuntimeSpecification spec,
-                                                                    NeoFormConfigConfigurationSpecV2 neoFormConfigV2,
-                                                                    NeoFormConfigConfigurationSpecV1.Step step,
-                                                                    final Map<String, TaskProvider<? extends WithOutput>> tasks,
-                                                                    final Map<GameArtifact, TaskProvider<? extends WithOutput>> gameArtifactTaskProviders,
-                                                                    final MinecraftArtifactCache cache,
-                                                                    final Optional<TaskProvider<? extends WithOutput>> adaptedInput) {
-        switch (step.getType()) {
-            case "decompile":
-                return createDecompile(spec, step, neoFormConfigV2);
-            case "downloadClient":
-                return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.CLIENT_JAR, a -> {
-                    throw new IllegalStateException("Client Jar is required for this step, but was not provided");
-                });
-            case "downloadServer":
-                return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.SERVER_JAR, a -> {
-                    throw new IllegalStateException("Server Jar is required for this step, but was not provided");
-                });
-            case "strip":
-                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), StripJar.class, task -> task.getInput().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task)));
-            case "listLibraries":
-                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), ListLibraries.class, task -> {
-                    task.getDownloadedVersionJsonFile()
-                            .fileProvider(task.newProvider(cache.cacheVersionManifest(spec.getMinecraftVersion())));
-                });
-            case "inject":
-                return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), InjectZipContent.class, task -> {
-                    task.getInjectionSource().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task));
-                    task.getInjectedSources()
-                            .add(task.getRuntimeData().map(data -> data.get("inject"))
-                                    .map(inject -> {
-                                        final InjectFromFileTreeSource fileTreeSource = task.getObjectFactory()
-                                                .newInstance(InjectFromFileTreeSource.class);
-                                        fileTreeSource.getFiles().from(inject
-                                                .matching(fileTree -> {
-                                                    if (spec.getDistribution().equals(DistributionType.SERVER)) {
-                                                        fileTree.include("**/server/**");
-                                                    } else if (spec.getDistribution().equals(DistributionType.CLIENT)) {
-                                                        fileTree.include("**/client/**");
-                                                    }
-                                                })
-                                        );
-                                        fileTreeSource.getTreePrefix().set(task.getSymbolicDataSources().map(data -> data.get("inject")));
-                                        return fileTreeSource;
-                                    })
-                            );
-                });
-            case "patch":
-                return spec.getProject().getTasks().register(
-                        CommonRuntimeUtils.buildTaskName(spec, step.getName()),
-                        Patch.class,
-                        task -> {
-                            task.getInput().fileProvider(NeoFormRuntimeUtils.getTaskInputFor(spec, tasks, step, task));
-                            task.getPatchArchive().from(spec.getProject().fileTree(spec.getNeoFormArchive()));
-                            task.getPatchDirectory().set(neoFormConfigV2.getData("patches", spec.getDistribution().getName()));
-                        }
-                );
-        }
-        if (neoFormConfigV2.getSpec() >= 2) {
-            switch (step.getType()) {
-                case "downloadClientMappings":
-                    return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.CLIENT_MAPPINGS, a -> {
-                        throw new IllegalStateException("Client Mappings are required for this step, but were not provided");
-                    });
-                case "downloadServerMappings":
-                    return gameArtifactTaskProviders.computeIfAbsent(GameArtifact.SERVER_MAPPINGS, a -> {
-                        throw new IllegalStateException("Server Mappings are required for this step, but were not provided");
-                    });
-            }
-        }
 
-        return null;
-    }
 
     @NotNull
-    private static TaskProvider<? extends Runtime> createDecompile(NeoFormRuntimeSpecification spec, NeoFormConfigConfigurationSpecV1.Step step, NeoFormConfigConfigurationSpecV2 neoFormConfig) {
-        NeoFormConfigConfigurationSpecV1.Function function = neoFormConfig.getFunction(step.getType());
+    private static TaskProvider<? extends Runtime> createDecompile(NeoFormRuntimeSpecification spec, LegacyNeoFormSdk.Step step, NeoFormSdk neoFormConfig) {
+        LegacyNeoFormSdk.Function function = neoFormConfig.getFunction(step.getType());
         if (function == null) {
             throw new IllegalArgumentException(String.format("Invalid NeoForm Config, Unknown function step type: %s File: %s", step.getType(), neoFormConfig));
         }
@@ -210,7 +134,7 @@ private static String getDecompilerLogLevelArg(DecompilerLogLevel logLevel, Stri
         }
     }
 
-    private TaskProvider<? extends Runtime> createExecute(final NeoFormRuntimeSpecification spec, final NeoFormConfigConfigurationSpecV1.Step step, final NeoFormConfigConfigurationSpecV1.Function function) {
+    private TaskProvider<? extends Runtime> createExecute(final NeoFormRuntimeSpecification spec, final LegacyNeoFormSdk.Step step, final LegacyNeoFormSdk.Function function) {
         return spec.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(spec, step.getName()), DefaultExecute.class, task -> {
             task.getExecutingJar().set(ToolUtilities.resolveTool(task.getProject(), function.getVersion()));
             task.getJvmArguments().addAll(function.getJvmArgs());
@@ -218,7 +142,7 @@ private TaskProvider<? extends Runtime> createExecute(final NeoFormRuntimeSpecif
         });
     }
 
-    private static void buildArguments(final RuntimeArguments arguments, final NeoFormRuntimeSpecification spec, NeoFormConfigConfigurationSpecV1.Step step, final Map<String, TaskProvider<? extends WithOutput>> tasks, final Runtime taskForArguments, final Optional<TaskProvider<? extends WithOutput>> alternativeInputProvider) {
+    private static void buildArguments(final RuntimeArguments arguments, final NeoFormRuntimeSpecification spec, LegacyNeoFormSdk.Step step, final Map<String, TaskProvider<? extends WithOutput>> tasks, final Runtime taskForArguments, final Optional<TaskProvider<? extends WithOutput>> alternativeInputProvider) {
         step.getValues().forEach((key, value) -> {
             if (value.startsWith("{") && value.endsWith("}")) {
                 Optional<TaskProvider<? extends WithOutput>> dependentTask;
@@ -238,7 +162,7 @@ private static void buildArguments(final RuntimeArguments arguments, final NeoFo
 
     @SuppressWarnings("unchecked")
     @NotNull
-    private static Map<String, String> buildDataFilesMap(NeoFormConfigConfigurationSpecV2 neoFormConfig, final DistributionType side) {
+    private static Map<String, String> buildDataFilesMap(NeoFormSdk neoFormConfig, final DistributionType side) {
         return neoFormConfig.getData().entrySet().stream()
                 .collect(Collectors.toMap(
                         Map.Entry::getKey,
@@ -284,7 +208,7 @@ protected NeoFormRuntimeDefinition doCreate(final NeoFormRuntimeSpecification sp
 
         stepsMcpDirectory.mkdirs();
 
-        NeoFormConfigConfigurationSpecV2 neoFormConfig = spec.getConfig();
+        NeoFormSdk neoFormConfig = spec.getConfig();
         neoFormConfig.getLibraries(spec.getDistribution().getName()).forEach(library -> minecraftDependenciesConfiguration.getDependencies().add(
                 spec.getProject().getDependencies().create(library)
         ));
@@ -330,7 +254,7 @@ protected NeoFormRuntimeSpecification.Builder createBuilder() {
 
     protected void bakeDefinition(NeoFormRuntimeDefinition definition) {
         final NeoFormRuntimeSpecification spec = definition.getSpecification();
-        final NeoFormConfigConfigurationSpecV2 neoFormConfig = definition.getNeoFormConfig();
+        final NeoFormSdk neoFormConfig = definition.getNeoFormConfig();
 
         final Minecraft minecraftExtension = spec.getProject().getExtensions().getByType(Minecraft.class);
         final Mappings mappingsExtension = minecraftExtension.getMappings();
@@ -348,7 +272,7 @@ protected void bakeDefinition(NeoFormRuntimeDefinition definition) {
 
         final Map<String, String> symbolicDataSources = buildDataFilesMap(neoFormConfig, spec.getDistribution());
 
-        final List<NeoFormConfigConfigurationSpecV1.Step> steps = new ArrayList<>(neoFormConfig.getSteps(spec.getDistribution().getName()));
+        final List<LegacyNeoFormSdk.Step> steps = new ArrayList<>(neoFormConfig.getSteps(spec.getDistribution().getName()));
         if (steps.isEmpty()) {
             throw new IllegalArgumentException("Unknown side: " + spec.getDistribution() + " for NeoForm " + definition.getSpecification().getNeoFormVersion());
         }
@@ -356,7 +280,7 @@ protected void bakeDefinition(NeoFormRuntimeDefinition definition) {
         steps.removeIf(step -> DISABLED_STEPS.contains(step.getType()));
 
         final LinkedHashMap<String, TaskProvider<? extends WithOutput>> taskOutputs = definition.getTasks();
-        for (NeoFormConfigConfigurationSpecV1.Step step : steps) {
+        for (LegacyNeoFormSdk.Step step : steps) {
             Optional<TaskProvider<? extends WithOutput>> adaptedInput = Optional.empty();
 
             if (spec.getPreTaskTypeAdapters().containsKey(step.getName())) {
@@ -391,7 +315,7 @@ protected void bakeDefinition(NeoFormRuntimeDefinition definition) {
             );
 
             if (neoFormRuntimeTaskProvider == null) {
-                NeoFormConfigConfigurationSpecV1.Function function = neoFormConfig.getFunction(step.getType());
+                LegacyNeoFormSdk.Function function = neoFormConfig.getFunction(step.getType());
                 if (function == null) {
                     throw new IllegalArgumentException(String.format("Invalid MCP Config, Unknown function step type: %s File: %s", step.getType(), neoFormConfig));
                 }
@@ -457,7 +381,7 @@ protected void bakeDefinition(NeoFormRuntimeDefinition definition) {
                 .getTasks().register(CommonRuntimeUtils.buildTaskName(spec, "recompile"), RecompileSourceJar.class, task -> {
                     task.setSource(unpackSources.flatMap(UnpackZip::getUnpackingTarget));
                     task.getCompileClasspath().setFrom(recompileDependencies);
-                    task.getStepName().set("recompile");
+                    task.getStep().set("recompile");
 
                     // Consider user-settings
                     Recompiler settings = spec.getProject().getExtensions().getByType(Subsystems.class).getRecompiler();
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java
index 7822c608b..b6b5750fb 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/specification/NeoFormRuntimeSpecification.java
@@ -6,7 +6,7 @@
 import net.neoforged.gradle.dsl.common.runtime.tasks.tree.TaskCustomizer;
 import net.neoforged.gradle.dsl.common.runtime.tasks.tree.TaskTreeAdapter;
 import net.neoforged.gradle.dsl.common.util.DistributionType;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV2;
+import net.neoforged.gradle.dsl.neoform.configuration.NeoFormSdk;
 import net.neoforged.gradle.dsl.neoform.runtime.specification.NeoFormSpecification;
 import net.neoforged.gradle.neoform.runtime.extensions.NeoFormRuntimeExtension;
 import net.neoforged.gradle.util.FileUtils;
@@ -22,7 +22,6 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ValueSource;
 import org.gradle.api.provider.ValueSourceParameters;
-import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -37,13 +36,13 @@
  */
 public class NeoFormRuntimeSpecification extends CommonRuntimeSpecification implements NeoFormSpecification {
     private final Provider<File> neoFormArchive;
-    private final NeoFormConfigConfigurationSpecV2 config;
+    private final NeoFormSdk config;
     private final FileCollection additionalRecompileDependencies;
 
     private NeoFormRuntimeSpecification(Project project,
                                         String version,
                                         Provider<File> neoFormArchive,
-                                        NeoFormConfigConfigurationSpecV2 config,
+                                        NeoFormSdk config,
                                         DistributionType side,
                                         Multimap<String, TaskTreeAdapter> preTaskTypeAdapters,
                                         Multimap<String, TaskTreeAdapter> postTypeAdapters,
@@ -55,12 +54,12 @@ private NeoFormRuntimeSpecification(Project project,
         this.additionalRecompileDependencies = additionalRecompileDependencies;
     }
 
-    public NeoFormConfigConfigurationSpecV2 getConfig() {
+    public NeoFormSdk getConfig() {
         return config;
     }
 
     public String getMinecraftVersion() {
-        return config.getVersion();
+        return config.minecraftVersion();
     }
 
     public String getNeoFormVersion() {
@@ -147,9 +146,9 @@ public Builder withAdditionalDependencies(final FileCollection files) {
             String effectiveVersion = artifact.getModuleVersion().getId().getVersion();
 
             // Read the NF config from the archive
-            NeoFormConfigConfigurationSpecV2 config;
+            NeoFormSdk config;
             try {
-                config = FileUtils.processFileFromZip(archive, "config.json", NeoFormConfigConfigurationSpecV2::get);
+                config = FileUtils.processFileFromZip(archive, "config.json", NeoFormSdk::get);
             } catch (IOException e) {
                 throw new GradleException("Failed to read NeoForm config file from version " + effectiveVersion);
             }
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/PackJar.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/PackJar.java
index 4cd1e54a3..97af086a5 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/PackJar.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/PackJar.java
@@ -5,11 +5,8 @@
 import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
 import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeArguments;
 import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeMultiArguments;
-import net.neoforged.gradle.dsl.common.tasks.WithOutput;
-import net.neoforged.gradle.util.ZipBuildingFileTreeVisitor;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFile;
-import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
@@ -20,13 +17,6 @@
 import org.gradle.work.DisableCachingByDefault;
 
 import javax.inject.Inject;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.zip.ZipOutputStream;
 
 @DisableCachingByDefault(because = "Jar tasks are not cached either")
 public abstract class PackJar extends Zip implements Runtime {
@@ -57,7 +47,7 @@ public PackJar() {
       getStepsDirectory().convention(getRuntimeDirectory().dir("steps"));
 
       //And configure output default locations.
-      getOutputDirectory().convention(getStepsDirectory().flatMap(d -> getStepName().map(d::dir)));
+      getOutputDirectory().convention(getStepsDirectory().flatMap(d -> getStep().map(d::dir)));
       getOutputFileName().convention(getArguments().getOrDefault("outputExtension", getProviderFactory().provider(() -> "jar")).map(extension -> String.format("output.%s", extension)).orElse("output.jar"));
       getOutput().convention(getOutputDirectory().flatMap(d -> getOutputFileName().orElse("output.jar").map(d::file)));
 
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java
index ec472c17f..3d3254858 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java
@@ -17,7 +17,6 @@
 import org.gradle.api.tasks.*;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.internal.jvm.Jvm;
-import org.gradle.jvm.toolchain.JavaCompiler;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.work.InputChanges;
@@ -47,7 +46,7 @@ public RecompileSourceJar() {
         getStepsDirectory().convention(getRuntimeDirectory().dir("steps"));
 
         //And configure output default locations.
-        getOutputDirectory().convention(getStepsDirectory().flatMap(d -> getStepName().map(d::dir)));
+        getOutputDirectory().convention(getStepsDirectory().flatMap(d -> getStep().map(d::dir)));
         getOutputFileName().convention(getArguments().getOrDefault("outputExtension", getProviderFactory().provider(() -> "jar")).map(extension -> String.format("output.%s", extension)));
 
         getJavaVersion().convention(getProject().getExtensions().getByType(JavaPluginExtension.class).getToolchain().getLanguageVersion());
diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/util/NeoFormRuntimeUtils.java b/neoform/src/main/java/net/neoforged/gradle/neoform/util/NeoFormRuntimeUtils.java
index 5162f5bd3..401e97a08 100644
--- a/neoform/src/main/java/net/neoforged/gradle/neoform/util/NeoFormRuntimeUtils.java
+++ b/neoform/src/main/java/net/neoforged/gradle/neoform/util/NeoFormRuntimeUtils.java
@@ -3,7 +3,7 @@
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
 import net.neoforged.gradle.dsl.common.util.NamingConstants;
-import net.neoforged.gradle.dsl.neoform.configuration.NeoFormConfigConfigurationSpecV1;
+import net.neoforged.gradle.dsl.neoform.configuration.LegacyNeoFormSdk;
 import net.neoforged.gradle.neoform.runtime.specification.NeoFormRuntimeSpecification;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -24,7 +24,7 @@ private NeoFormRuntimeUtils() {
     }
 
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    public static Provider<File> getTaskInputFor(final NeoFormRuntimeSpecification spec, final Map<String, TaskProvider<? extends WithOutput>> tasks, NeoFormConfigConfigurationSpecV1.Step step, final String defaultInputTask, final Optional<TaskProvider<? extends WithOutput>> adaptedInput, Task task) {
+    public static Provider<File> getTaskInputFor(final NeoFormRuntimeSpecification spec, final Map<String, TaskProvider<? extends WithOutput>> tasks, LegacyNeoFormSdk.Step step, final String defaultInputTask, final Optional<TaskProvider<? extends WithOutput>> adaptedInput, Task task) {
         if (adaptedInput.isPresent()) {
             task.dependsOn(adaptedInput);
             return adaptedInput.get().flatMap(t -> t.getOutput().getAsFile());
@@ -38,7 +38,7 @@ public static Provider<File> getTaskInputFor(final NeoFormRuntimeSpecification s
         return getInputForTaskFrom(spec, inputValue, tasks, task);
     }
 
-    public static Provider<File> getTaskInputFor(final NeoFormRuntimeSpecification spec, final Map<String, TaskProvider<? extends WithOutput>> tasks, NeoFormConfigConfigurationSpecV1.Step step, Task task) {
+    public static Provider<File> getTaskInputFor(final NeoFormRuntimeSpecification spec, final Map<String, TaskProvider<? extends WithOutput>> tasks, LegacyNeoFormSdk.Step step, Task task) {
         final String inputValue = step.getValue("input");
         if (inputValue == null) {
             throw new IllegalStateException("Can not transformer or get an input of a task without an input");
diff --git a/platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/specification/RuntimeDevRuntimeSpecification.java b/platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/specification/RuntimeDevRuntimeSpecification.java
index 6b42125a1..29d5e6e21 100644
--- a/platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/specification/RuntimeDevRuntimeSpecification.java
+++ b/platform/src/main/java/net/neoforged/gradle/platform/runtime/runtime/specification/RuntimeDevRuntimeSpecification.java
@@ -116,7 +116,7 @@ public Builder withPatchesDirectory(final Provider<Directory> patchesDirectory)
         }
 
         public Builder withPatchesDirectory(final Directory patchesDirectory) {
-            if (patchesDirectory == null) // Additional null check for convenient loading of versions from dependencies.
+            if (patchesDirectory == null) // Additional null check for convenient loading of versions from compileDependencies.
                 return getThis();
             
             return withPatchesDirectory(project.provider(() -> patchesDirectory));
@@ -128,7 +128,7 @@ public Builder withRejectsDirectory(final Provider<Directory> rejectsDirectory)
         }
         
         public Builder withRejectsDirectory(final Directory rejectsDirectory) {
-            if (rejectsDirectory == null) // Additional null check for convenient loading of versions from dependencies.
+            if (rejectsDirectory == null) // Additional null check for convenient loading of versions from compileDependencies.
                 return getThis();
             
             return withRejectsDirectory(project.provider(() -> rejectsDirectory));
@@ -140,7 +140,7 @@ public Builder isUpdating(final Provider<Boolean> isUpdating) {
         }
         
         public Builder isUpdating(final Boolean isUpdating) {
-            if (isUpdating == null) // Additional null check for convenient loading of versions from dependencies.
+            if (isUpdating == null) // Additional null check for convenient loading of versions from compileDependencies.
                 return getThis();
             
             return isUpdating(project.provider(() -> isUpdating));
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy
index 043a28610..2af4bc8ef 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy
@@ -24,7 +24,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
             
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -64,7 +64,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -108,7 +108,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
             
             minecraft.accessTransformers.entry 'public-f net.minecraft.client.Minecraft fixerUpper # fixerUpper'
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -149,7 +149,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.entry 'public-f net.minecraft.client.Minecraft LOGGER # LOGGER'
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -192,7 +192,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer2.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -236,7 +236,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/accesstransformer.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/CentralCacheTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/CentralCacheTests.groovy
index 6960c0f47..8fa5cb91e 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/CentralCacheTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/CentralCacheTests.groovy
@@ -27,7 +27,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -56,7 +56,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -90,7 +90,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
     }
 
     def "cache_supports_running_gradle_in_parallel"() {
-        if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
+        if (System.getProperty("os.identifier").toLowerCase(Locale.ROOT).contains("windows")) {
             //When we run on windows we do not get the right output, since we use native file locking.
             return
         }
@@ -104,7 +104,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -147,7 +147,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -189,7 +189,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -220,7 +220,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
             
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy
index 3b9bdb96f..790cbf2a3 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy
@@ -27,7 +27,7 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -57,7 +57,7 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationTests.groovy
index 3faeb29d1..9f6eef830 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationTests.groovy
@@ -22,7 +22,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -49,15 +49,15 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks('dependencies')
+            it.tasks('compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
-        def implementationStartLine = run.output.split(System.lineSeparator()).toList().indexOf('implementation - Implementation dependencies for the \'main\' feature. (n)')
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
+        def implementationStartLine = run.output.split(System.lineSeparator()).toList().indexOf('implementation - Implementation compileDependencies for the \'main\' feature. (n)')
         implementationStartLine != -1
         def nextLine = run.output.split(System.lineSeparator()).toList().get(implementationStartLine + 1)
-        nextLine.contains("No dependencies")
+        nextLine.contains("No compileDependencies")
     }
 
     def "a mod with userdev in the implementation configuration does not leak it via publishing"() {
@@ -71,7 +71,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -111,7 +111,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
 
         then:
         run.task(':generateMetadataFileForMavenPublication').outcome == TaskOutcome.SUCCESS
-        !run.file('build/publications/maven/module.json').text.contains("dependencies")
-        !run.file('build/publications/maven/pom-default.xml').text.contains("dependencies")
+        !run.file('build/publications/maven/module.json').text.contains("compileDependencies")
+        !run.file('build/publications/maven/pom-default.xml').text.contains("compileDependencies")
     }
 }
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/DepreciationTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/DepreciationTests.groovy
index 061d623ce..54cbaad58 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/DepreciationTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/DepreciationTests.groovy
@@ -55,7 +55,7 @@ class DepreciationTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/FunctionalTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/FunctionalTests.groovy
index 17b5716e0..5fbda2784 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/FunctionalTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/FunctionalTests.groovy
@@ -23,7 +23,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -50,7 +50,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:[20,)'
             }
             """)
@@ -71,11 +71,11 @@ class FunctionalTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks('dependencies', "--configuration", "compileClasspath")
+            it.tasks('compileDependencies', "--configuration", "compileClasspath")
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("+--- net.neoforged.fancymodloader:loader:")
     }
 
@@ -89,7 +89,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation ('net.neoforged:neoforge') {
                     version {
                         strictly '[20.4.167, 20.5)'
@@ -115,11 +115,11 @@ class FunctionalTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks('dependencies', "--configuration", "compileClasspath")
+            it.tasks('compileDependencies', "--configuration", "compileClasspath")
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("+--- net.neoforged.fancymodloader:loader:")
     }
 
@@ -133,7 +133,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -154,11 +154,11 @@ class FunctionalTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks('dependencies', "--configuration", "compileClasspath")
+            it.tasks('compileDependencies', "--configuration", "compileClasspath")
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("+--- io.github.llamalad7:mixinextras-neoforge")
     }
 
@@ -172,7 +172,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -210,7 +210,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -250,7 +250,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -309,7 +309,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -367,7 +367,7 @@ class FunctionalTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 contentImplementation 'net.neoforged:neoforge:+'
             }
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/MultiProjectTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/MultiProjectTests.groovy
index ffa65a2e0..7dc5a273d 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/MultiProjectTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/MultiProjectTests.groovy
@@ -34,7 +34,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -62,7 +62,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 implementation project(':api')
             }
@@ -129,7 +129,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -157,7 +157,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 implementation project(':api')
             }
@@ -220,7 +220,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
             }
             """)
             it.file("src/main/java/net/neoforged/gradle/apitest/FunctionalTests.java", """
@@ -245,7 +245,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:20.6.104-beta'
                 implementation project(':api')
             }
@@ -328,7 +328,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
             }
             """)
             it.file("src/main/java/net/neoforged/gradle/apitest/FunctionalTests.java", """
@@ -353,7 +353,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:20.6.104-beta'
                 implementation project(':api')
             }
@@ -438,7 +438,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
             }
             """)
             it.file("src/main/java/net/neoforged/gradle/apitest/FunctionalTests.java", """
@@ -463,7 +463,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:20.6.104-beta'
                 implementation project(':api')
             }
@@ -545,7 +545,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
             }
             """)
             it.file("src/main/java/net/neoforged/gradle/apitest/FunctionalTests.java", """
@@ -570,7 +570,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:20.6.104-beta'
                 implementation project(':api')
             }
@@ -652,7 +652,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
             }
             """)
             it.file("src/main/java/net/neoforged/gradle/apitest/FunctionalTests.java", """
@@ -677,7 +677,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:20.6.104-beta'
                 implementation project(':api')
             }
@@ -761,7 +761,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -789,7 +789,7 @@ class MultiProjectTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 implementation project(':api')
             }
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy
index f9825caa1..1ba7f9819 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy
@@ -39,7 +39,7 @@ class RunTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation "net.neoforged:neoforge:+"
             }
             
@@ -87,7 +87,7 @@ class RunTests extends BuilderBasedTestSpecification {
                 }
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             """)
@@ -119,13 +119,13 @@ class RunTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
             runs {
                 client {
-                    dependencies {
+                    compileDependencies {
                         runtime 'org.graalvm.polyglot:python:23.1.2'
                     }
                     
@@ -171,13 +171,13 @@ class RunTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
             runs {
                 client {
-                    dependencies {
+                    compileDependencies {
                         runtime 'org.jgrapht:jgrapht-core:+'
                     }
                     
@@ -226,14 +226,14 @@ class RunTests extends BuilderBasedTestSpecification {
                 runRuntime
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 runRuntime 'org.jgrapht:jgrapht-core:+'
             }
             
             runs {
                 client {
-                    dependencies {
+                    compileDependencies {
                         runtime project.configurations.runRuntime
                     }
                     
@@ -270,7 +270,7 @@ class RunTests extends BuilderBasedTestSpecification {
             it.file("gradle/libs.versions.toml",
                     """
                     [libraries]
-                    jgrapht = { group = "org.jgrapht", name = "jgrapht-core", version = "+" }
+                    jgrapht = { group = "org.jgrapht", identifier = "jgrapht-core", version = "+" }
                     """.trim())
 
             it.build("""
@@ -288,13 +288,13 @@ class RunTests extends BuilderBasedTestSpecification {
                 runRuntime
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
             runs {
                 client {
-                    dependencies {
+                    compileDependencies {
                         runtime libs.jgrapht
                     }
                     
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/UserDevPluginTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/UserDevPluginTests.groovy
index 22554d6fe..02fdb103f 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/UserDevPluginTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/UserDevPluginTests.groovy
@@ -7,7 +7,7 @@ class UserDevPluginTests extends SimpleTestSpecification {
 
     def "applying userdev plugin succeeds"() {
         given:
-        settingsFile << "rootProject.name = 'test-project'"
+        settingsFile << "rootProject.identifier = 'test-project'"
         buildFile << """
             plugins {
                 id 'net.neoforged.gradle.userdev'
@@ -23,7 +23,7 @@ class UserDevPluginTests extends SimpleTestSpecification {
 
     def "applying userdev plugin applies neoform plugin"() {
         given:
-        settingsFile << "rootProject.name = 'test-project'"
+        settingsFile << "rootProject.identifier = 'test-project'"
         buildFile << """
             plugins {
                 id 'net.neoforged.gradle.userdev'
@@ -42,7 +42,7 @@ class UserDevPluginTests extends SimpleTestSpecification {
 
     def "applying userdev plugin applies userDev runtime extension"() {
         given:
-        settingsFile << "rootProject.name = 'test-project'"
+        settingsFile << "rootProject.identifier = 'test-project'"
         buildFile << """
             plugins {
                 id 'net.neoforged.gradle.userdev'
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/IDEAIDEConventionTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/IDEAIDEConventionTests.groovy
index 06c69ca1c..2a1feee4c 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/IDEAIDEConventionTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/IDEAIDEConventionTests.groovy
@@ -17,7 +17,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
             it.property('neogradle.subsystems.conventions.enabled', 'false')
             //Force NeoGradle to think build with IDEA is enabled.
             it.file(".idea/gradle.xml", """
-            <option name=\"delegatedBuild\" value=\"false\" />
+            <option identifier=\"delegatedBuild\" value=\"false\" />
             """)
             it.build("""
             java {
@@ -40,7 +40,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -53,7 +53,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
             it.property('neogradle.subsystems.conventions.ide.enabled', 'false')
             //Force NeoGradle to think build with IDEA is enabled.
             it.file(".idea/gradle.xml", """
-            <option name=\"delegatedBuild\" value=\"false\" />
+            <option identifier=\"delegatedBuild\" value=\"false\" />
             """)
             it.build("""
             java {
@@ -76,7 +76,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -89,7 +89,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
             it.property('neogradle.subsystems.conventions.ide.idea.enabled', 'false')
             //Force NeoGradle to think build with IDEA is enabled.
             it.file(".idea/gradle.xml", """
-            <option name=\"delegatedBuild\" value=\"false\" />
+            <option identifier=\"delegatedBuild\" value=\"false\" />
             """)
             it.build("""
             java {
@@ -112,7 +112,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -125,7 +125,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
             it.property('neogradle.subsystems.conventions.ide.idea.compiler-detection', 'false')
             //Force NeoGradle to think build with IDEA is enabled.
             it.file(".idea/gradle.xml", """
-            <option name=\"delegatedBuild\" value=\"false\" />
+            <option identifier=\"delegatedBuild\" value=\"false\" />
             """)
             it.build("""
             java {
@@ -148,7 +148,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -160,7 +160,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
         def project = create("disable_compiler_idea_ide_disables_auto_detection", {
             //Force NeoGradle to think build with IDEA is enabled.
             it.file(".idea/gradle.xml", """
-            <option name=\"delegatedBuild\" value=\"false\" />
+            <option identifier=\"delegatedBuild\" value=\"false\" />
             """)
             it.build("""
             java {
@@ -183,7 +183,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -213,7 +213,7 @@ class IDEAIDEConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/RunConventionTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/RunConventionTests.groovy
index 8f83f4771..b28677acb 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/RunConventionTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/RunConventionTests.groovy
@@ -30,7 +30,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -45,7 +45,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -69,7 +69,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -84,7 +84,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -108,7 +108,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -123,7 +123,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -146,7 +146,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -163,7 +163,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
@@ -189,7 +189,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 clientRun 'org.jgrapht:jgrapht-core:+'
             }
@@ -200,12 +200,12 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method clientRun() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method clientRun() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling conventions globally prevents creation of runs configuration runs"() {
@@ -223,7 +223,7 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 runs 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -233,12 +233,12 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method runs() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method runs() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "using the run convention configuration puts the dependency on the runtime config"() {
@@ -255,13 +255,13 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 clientRun 'org.jgrapht:jgrapht-core:+'
             }
             
             afterEvaluate {
-                logger.lifecycle("Run contains cp entry: \${project.runs.client.dependencies.get().runtimeConfiguration.files.any { it.name.contains 'jgrapht' }}")
+                logger.lifecycle("Run contains cp entry: \${project.runs.client.compileDependencies.get().runtimeConfiguration.files.any { it.identifier.contains 'jgrapht' }}")
             }
             """)
             it.withToolchains()
@@ -270,11 +270,11 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run contains cp entry: true")
     }
 
@@ -292,13 +292,13 @@ class RunConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 runs 'org.jgrapht:jgrapht-core:+'
             }
             
             afterEvaluate {
-                logger.lifecycle("Run contains cp entry: \${project.runs.client.dependencies.get().runtimeConfiguration.files.any { it.name.contains 'jgrapht' }}")
+                logger.lifecycle("Run contains cp entry: \${project.runs.client.compileDependencies.get().runtimeConfiguration.files.any { it.identifier.contains 'jgrapht' }}")
             }
             """)
             it.withToolchains()
@@ -307,11 +307,11 @@ class RunConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run contains cp entry: true")
     }
 }
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy
index f2cc66354..ceff74402 100644
--- a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy
+++ b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy
@@ -27,7 +27,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -37,12 +37,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling conventions globally prevents creation of sourceset configuration localRunRuntime"() {
@@ -60,7 +60,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -70,12 +70,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling configuration conventions prevents creation of sourceset configuration localRuntime"() {
@@ -93,7 +93,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -103,12 +103,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling configuration conventions prevents creation of sourceset configuration localRunRuntime"() {
@@ -126,7 +126,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -136,12 +136,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling sourceset conventions prevents creation of sourceset configuration localRuntime"() {
@@ -159,7 +159,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -169,12 +169,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling sourceset conventions prevents creation of sourceset configuration localRunRuntime"() {
@@ -192,7 +192,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
             """)
@@ -202,12 +202,12 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
         then:
-        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.dependencies.DefaultDependencyHandler.")
+        run.output.contains("Could not find method localRunRuntime() for arguments [org.jgrapht:jgrapht-core:+] on object of type org.gradle.api.internal.artifacts.dsl.compileDependencies.DefaultDependencyHandler.")
     }
 
     def "disabling global conventions prevents registration of main sourceset to run"() {
@@ -225,7 +225,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -243,7 +243,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
@@ -266,7 +266,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -284,7 +284,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
@@ -307,7 +307,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -325,7 +325,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
             it.shouldFail()
         }
 
@@ -347,7 +347,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
             
@@ -365,11 +365,11 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run sources: {registration_enabled=[source set 'main']}")
     }
 
@@ -388,7 +388,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
@@ -431,7 +431,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
@@ -478,13 +478,13 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 localRuntime 'org.jgrapht:jgrapht-core:+'
             }
             
             afterEvaluate {
-                logger.lifecycle("Run contains cp entry: \${project.runs.client.dependencies.get().runtimeConfiguration.files.any { it.name.contains 'jgrapht' }}")
+                logger.lifecycle("Run contains cp entry: \${project.runs.client.compileDependencies.get().runtimeConfiguration.files.any { it.identifier.contains 'jgrapht' }}")
             }
             """)
             it.withToolchains()
@@ -493,11 +493,11 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run contains cp entry: false")
     }
 
@@ -515,13 +515,13 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
                 mavenCentral()
             }
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.neoforged:neoforge:+'
                 localRunRuntime 'org.jgrapht:jgrapht-core:+'
             }
             
             afterEvaluate {
-                logger.lifecycle("Run contains cp entry: \${project.runs.client.dependencies.get().runtimeConfiguration.files.any { it.name.contains 'jgrapht' }}")
+                logger.lifecycle("Run contains cp entry: \${project.runs.client.compileDependencies.get().runtimeConfiguration.files.any { it.identifier.contains 'jgrapht' }}")
             }
             """)
             it.withToolchains()
@@ -530,11 +530,11 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         when:
         def run = project.run {
-            it.tasks(':dependencies')
+            it.tasks(':compileDependencies')
         }
 
         then:
-        run.task(':dependencies').outcome == TaskOutcome.SUCCESS
+        run.task(':compileDependencies').outcome == TaskOutcome.SUCCESS
         run.output.contains("Run contains cp entry: true")
     }
 }
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
index 29b4f02a8..0638fef0d 100644
--- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
+++ b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
@@ -39,7 +39,7 @@ public void apply(final Project project) {
                     project,
                     "NeoForgeUserDevAdditionalReplacementDependenciesFor" + runtimeDefinition.getSpecification().getIdentifier(),
                     configuration -> {
-                        configuration.setDescription("Additional dependencies for the NeoForge UserDev replacement for " + runtimeDefinition.getSpecification().getIdentifier());
+                        configuration.setDescription("Additional compileDependencies for the NeoForge UserDev replacement for " + runtimeDefinition.getSpecification().getIdentifier());
                         configuration.extendsFrom(runtimeDefinition.getNeoFormRuntimeDefinition().getMinecraftDependenciesConfiguration());
                         configuration.extendsFrom(runtimeDefinition.getAdditionalUserDevDependencies());
                     }
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevReplacementResult.java b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevReplacementResult.java
index b313079a5..9f2ca995a 100644
--- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevReplacementResult.java
+++ b/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevReplacementResult.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 
 /**
- * Special replacement result for userdev dependencies.
+ * Special replacement result for userdev compileDependencies.
  * Is needed because userdev needs to know where the neoforge jar is, so it can put it on the classpath
  */
 public class UserDevReplacementResult extends ReplacementResult implements ReplacementAware {
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/specification/UserDevRuntimeSpecification.java b/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/specification/UserDevRuntimeSpecification.java
index 1b86a4e96..0ec94d7f9 100644
--- a/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/specification/UserDevRuntimeSpecification.java
+++ b/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/specification/UserDevRuntimeSpecification.java
@@ -129,7 +129,7 @@ public Builder withForgeVersion(final Provider<String> forgeVersion) {
 
         @Override
         public Builder withForgeVersion(final String forgeVersion) {
-            if (forgeVersion == null) // Additional null check for convenient loading of versions from dependencies.
+            if (forgeVersion == null) // Additional null check for convenient loading of versions from compileDependencies.
                 return this;
 
             return withForgeVersion(project.provider(() -> forgeVersion));
@@ -143,7 +143,7 @@ public Builder withForgeName(final Provider<String> mcpName) {
 
         @Override
         public Builder withForgeName(final String mcpName) {
-            if (mcpName == null) // Additional null check for convenient loading of names from dependencies.
+            if (mcpName == null) // Additional null check for convenient loading of names from compileDependencies.
                 return this;
 
             return withForgeName(project.provider(() -> mcpName));
@@ -157,7 +157,7 @@ public Builder withForgeGroup(final Provider<String> mcpGroup) {
 
         @Override
         public Builder withForgeGroup(final String mcpGroup) {
-            if (mcpGroup == null) // Additional null check for convenient loading of groups from dependencies.
+            if (mcpGroup == null) // Additional null check for convenient loading of groups from compileDependencies.
                 return this;
 
             return withForgeGroup(project.provider(() -> mcpGroup));
diff --git a/utils/src/main/java/net/neoforged/gradle/util/NamedRecord.java b/utils/src/main/java/net/neoforged/gradle/util/NamedRecord.java
index a25e99cf1..890ad1afa 100644
--- a/utils/src/main/java/net/neoforged/gradle/util/NamedRecord.java
+++ b/utils/src/main/java/net/neoforged/gradle/util/NamedRecord.java
@@ -9,11 +9,17 @@
  */
 public interface NamedRecord extends Named {
 
+    /**
+     * @return The name of the record.
+     */
     @Override
-    public default @NotNull String getName() {
+    default @NotNull String getName() {
         return name();
     }
 
+    /**
+     * @return A record friendly version of {@link Named#getName()}
+     */
     @NotNull
     String name();
 }
diff --git a/utils/src/main/java/net/neoforged/gradle/util/TransformerUtils.java b/utils/src/main/java/net/neoforged/gradle/util/TransformerUtils.java
index bd16d33d2..f065fe7c6 100644
--- a/utils/src/main/java/net/neoforged/gradle/util/TransformerUtils.java
+++ b/utils/src/main/java/net/neoforged/gradle/util/TransformerUtils.java
@@ -2,12 +2,15 @@
 
 import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import org.gradle.api.Transformer;
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.FileSystemLocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.Set;
 import java.util.function.Consumer;
 
 /**
@@ -158,6 +161,27 @@ public static <V extends FileSystemLocation> Transformer<V, V> ensureExists() {
         });
     }
 
+    /**
+     * Creates a transformer which will return the first element in the collection.
+     *
+     * @return a guarded transformer which will return the first element in the collection.
+     *
+     * @param <E> The type of the elements in the collection.
+     * @param <C> The type of the collection.
+     */
+    public static <E, C extends Collection<E>> Transformer<E, C> first() {
+        return TransformerUtils.guard(new ThrowingTransformer<>() {
+            @Nullable
+            @Override
+            public E transform(C es) throws Throwable {
+                if (es.isEmpty())
+                    throw new IllegalStateException("Collection is empty");
+
+                return es.iterator().next();
+            }
+        });
+    }
+
     /**
      * A definition for a transformer which can throw an exception.
      *
diff --git a/vanilla/src/functionalTest/groovy/net/neoforged/gradle/vanilla/AccessTransformerTests.groovy b/vanilla/src/functionalTest/groovy/net/neoforged/gradle/vanilla/AccessTransformerTests.groovy
index ab04bced9..a5d37a0e9 100644
--- a/vanilla/src/functionalTest/groovy/net/neoforged/gradle/vanilla/AccessTransformerTests.groovy
+++ b/vanilla/src/functionalTest/groovy/net/neoforged/gradle/vanilla/AccessTransformerTests.groovy
@@ -23,7 +23,7 @@ class AccessTransformerTests extends BuilderBasedTestSpecification {
             
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:client:+'
             }
             """)
@@ -65,7 +65,7 @@ class AccessTransformerTests extends BuilderBasedTestSpecification {
             
             minecraft.accessTransformers.entry 'public-f net.minecraft.client.Minecraft fixerUpper # fixerUpper'
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:client:+'
             }
             """)
@@ -105,7 +105,7 @@ class AccessTransformerTests extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.entry 'public-f net.minecraft.client.Minecraft LOGGER # LOGGER'
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:client:+'
             }
             """)
@@ -147,7 +147,7 @@ class AccessTransformerTests extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer2.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:client:+'
             }
             """)
@@ -190,7 +190,7 @@ class AccessTransformerTests extends BuilderBasedTestSpecification {
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/accesstransformer.cfg')
             
-            dependencies {
+            compileDependencies {
                 implementation 'net.minecraft:client:+'
             }
             """)
diff --git a/vanilla/src/main/java/net/neoforged/gradle/vanilla/VanillaProjectPlugin.java b/vanilla/src/main/java/net/neoforged/gradle/vanilla/VanillaProjectPlugin.java
index 6cb1b799c..037a9673c 100644
--- a/vanilla/src/main/java/net/neoforged/gradle/vanilla/VanillaProjectPlugin.java
+++ b/vanilla/src/main/java/net/neoforged/gradle/vanilla/VanillaProjectPlugin.java
@@ -15,7 +15,7 @@ public void apply(Project project) {
 
         project.getExtensions().create("vanillaRuntimes", VanillaRuntimeExtension.class, project);
 
-        //Setup handling of the dependencies
+        //Setup handling of the compileDependencies
         VanillaDependencyManager.getInstance().apply(project);
 
         //Add Known repos, -> The default tools come from this repo.
diff --git a/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/spec/VanillaRuntimeSpecification.java b/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/spec/VanillaRuntimeSpecification.java
index 109af1637..ab6163e39 100644
--- a/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/spec/VanillaRuntimeSpecification.java
+++ b/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/spec/VanillaRuntimeSpecification.java
@@ -149,7 +149,7 @@ public Builder withMinecraftArtifact(final Provider<String> minecraftArtifact) {
         }
 
         public Builder withMinecraftArtifact(final String minecraftArtifact) {
-            if (minecraftArtifact == null) // Additional null check for convenient loading of sides from dependencies.
+            if (minecraftArtifact == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withMinecraftArtifact(project.provider(() -> minecraftArtifact));
@@ -161,7 +161,7 @@ public Builder withMinecraftVersion(final Provider<String> minecraftVersion) {
         }
 
         public Builder withMinecraftVersion(final String minecraftVersion) {
-            if (minecraftVersion == null) // Additional null check for convenient loading of sides from dependencies.
+            if (minecraftVersion == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withMinecraftVersion(project.provider(() -> minecraftVersion));
@@ -174,7 +174,7 @@ public Builder withFartVersion(final Provider<String> fartVersion) {
         }
 
         public Builder withFartVersion(final String fartVersion) {
-            if (fartVersion == null) // Additional null check for convenient loading of sides from dependencies.
+            if (fartVersion == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withFartVersion(project.provider(() -> fartVersion));
@@ -187,7 +187,7 @@ public Builder withForgeFlowerVersion(final Provider<String> forgeFlowerVersion)
         }
 
         public Builder withForgeFlowerVersion(final String forgeFlowerVersion) {
-            if (forgeFlowerVersion == null) // Additional null check for convenient loading of sides from dependencies.
+            if (forgeFlowerVersion == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withForgeFlowerVersion(project.provider(() -> forgeFlowerVersion));
@@ -200,7 +200,7 @@ public Builder withAccessTransformerApplierVersion(final Provider<String> access
         }
 
         public Builder withAccessTransformerApplierVersion(final String accessTransformerApplierVersion) {
-            if (accessTransformerApplierVersion == null) // Additional null check for convenient loading of sides from dependencies.
+            if (accessTransformerApplierVersion == null) // Additional null check for convenient loading of sides from compileDependencies.
                 return getThis();
 
             return withAccessTransformerApplierVersion(project.provider(() -> accessTransformerApplierVersion));