diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt
index 1d326a63c..34679d75e 100644
--- a/buildSrc/src/main/kotlin/extensions.kt
+++ b/buildSrc/src/main/kotlin/extensions.kt
@@ -11,6 +11,7 @@ fun Project.configureShadowJar() {
     tasks {
         withType<ShadowJar> {
             archiveClassifier.set("")
+            archiveFileName.set("ViaVersion-${project.name.substringAfter("viaversion-").capitalize()}-${project.version}.jar")
             destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
             //minimize() // ?
             configureRelocations()
@@ -23,7 +24,6 @@ fun Project.configureShadowJar() {
 }
 
 private fun ShadowJar.configureRelocations() {
-    relocate("org.yaml.snakeyaml", "us.myles.viaversion.libs.snakeyaml")
     relocate("javassist", "us.myles.viaversion.libs.javassist")
     relocate("com.google.gson", "us.myles.viaversion.libs.gson")
     relocate("com.github.steveice10.opennbt", "us.myles.viaversion.libs.opennbt")
@@ -69,6 +69,7 @@ private fun ShadowJar.configureExcludes() {
     exclude("it/unimi/dsi/fastutil/*/*Big*")
     exclude("it/unimi/dsi/fastutil/*/*Synchronized*")
     exclude("it/unimi/dsi/fastutil/*/*Unmodifiable*")
+    exclude("it/unimi/dsi/fastutil/io/*")
 }
 
 fun Project.latestCommitHash(): String {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 123cb96fc..29b2b86f4 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -15,8 +15,8 @@ dependencies {
     api("com.github.steveice10", "opennbt", Versions.openNBT)
     api("com.google.code.gson", "gson", Versions.gson)
     api("org.javassist", "javassist", Versions.javassist)
-    api("org.yaml", "snakeyaml", Versions.snakeYaml)
 
+    compileOnlyApi("org.yaml", "snakeyaml", Versions.snakeYaml)
     compileOnlyApi("io.netty", "netty-all", Versions.netty)
     compileOnlyApi("com.google.guava", "guava", Versions.guava)
     compileOnlyApi("org.jetbrains", "annotations", Versions.jetbrainsAnnotations)
diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
index f68a23416..551b2861a 100644
--- a/universal/build.gradle.kts
+++ b/universal/build.gradle.kts
@@ -2,6 +2,7 @@ tasks {
     val universalJar = register<Jar>("universalJar") {
         artifacts.add("archives", this)
         archiveClassifier.set("")
+        archiveFileName.set("ViaVersion-Universal-${project.version}.jar")
         destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         arrayOf(