diff --git a/build.gradle b/build.gradle
index 6c404655fa..2c791b8b13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 		classpath "net.fabricmc:stitch:${project.stitch_version}"
 		classpath "commons-io:commons-io:2.8.0"
 		classpath 'de.undercouch:gradle-download-task:4.1.1'
-		classpath 'net.fabricmc:tiny-remapper:0.6.0'
+		classpath 'net.fabricmc:tiny-remapper:0.7.0'
 		classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
 		classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
 		classpath "net.fabricmc:name-proposal:${project.name_proposal_version}"
@@ -1011,6 +1011,8 @@ void mapJar(File output, File input, File mappings, File libraries, String from,
 			.renameInvalidLocals(true)
 			.rebuildSourceFilenames(true)
 			.invalidLvNamePattern(~/\$\$\d+/)
+			.inferNameFromSameLvIndex(true)
+
 	action.execute(remapperBuilder)
 	def remapper = remapperBuilder
 			.build()