diff --git a/xml/java_std_cleanup/info.json b/xml/java_std_cleanup/info.json
index 7cf3c3371088..39a1d37228c4 100644
--- a/xml/java_std_cleanup/info.json
+++ b/xml/java_std_cleanup/info.json
@@ -1,4 +1,4 @@
   {
-    "commit": "f79e0d7b89035cc18549342b3f179d7ec62b9526",
+    "commit": "109a1167a69a528bf083266f5301e6fa620ff121",
     "branch": "java_std_cleanup"
   }
diff --git a/xml/java_std_cleanup/jvm.xml b/xml/java_std_cleanup/jvm.xml
index ad310d0875f8..e1895f870e85 100644
--- a/xml/java_std_cleanup/jvm.xml
+++ b/xml/java_std_cleanup/jvm.xml
@@ -6964,7 +6964,7 @@
 		</compare>
 		<decode public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 				<x path="java.lang.Integer"/>
 			</f>
 			<meta>
@@ -6974,14 +6974,14 @@
 		</decode>
 		<getInteger public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 				<x path="java.lang.Integer"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 			<overloads>
 				<getInteger public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Integer.String"/>
 						<x path="Int"/>
 						<x path="java.lang.Integer"/>
 					</f>
@@ -6989,7 +6989,7 @@
 				</getInteger>
 				<getInteger public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Integer.String"/>
 						<x path="java.lang.Integer"/>
 						<x path="java.lang.Integer"/>
 					</f>
@@ -7027,7 +7027,7 @@
 		</numberOfTrailingZeros>
 		<parseInt public="1" set="method" static="1">
 			<f a="param1:param2">
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 				<x path="Int"/>
 				<x path="Int"/>
 			</f>
@@ -7037,7 +7037,7 @@
 			</meta>
 			<overloads><parseInt public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Integer.String"/>
 		<x path="Int"/>
 	</f>
 	<meta>
@@ -7086,21 +7086,21 @@
 		<toBinaryString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Int"/>
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toBinaryString>
 		<toHexString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Int"/>
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toHexString>
 		<toOctalString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Int"/>
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toOctalString>
@@ -7108,7 +7108,7 @@
 			<f a="param1:param2">
 				<x path="Int"/>
 				<x path="Int"/>
-				<c path="String"/>
+				<t path="java.lang._Integer.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -7117,7 +7117,7 @@
 			<overloads><toString public="1" set="method">
 	<f a="param1">
 		<x path="Int"/>
-		<c path="String"/>
+		<t path="java.lang._Integer.String"/>
 	</f>
 	<meta>
 		<m n=":native"><e>"toString"</e></m>
@@ -7134,7 +7134,7 @@
 			<overloads>
 				<valueOf public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Integer.String"/>
 						<x path="java.lang.Integer"/>
 					</f>
 					<meta>
@@ -7144,7 +7144,7 @@
 				</valueOf>
 				<valueOf public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Integer.String"/>
 						<x path="Int"/>
 						<x path="java.lang.Integer"/>
 					</f>
@@ -7181,7 +7181,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Integer.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -7196,7 +7196,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><new public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Integer.String"/>
 		<x path="Void"/>
 	</f>
 	<meta>
@@ -7274,7 +7274,7 @@
 		</longBitsToDouble>
 		<parseDouble public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Double.String"/>
 				<x path="Float"/>
 			</f>
 			<meta>
@@ -7285,14 +7285,14 @@
 		<toHexString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Float"/>
-				<c path="String"/>
+				<t path="java.lang._Double.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toHexString>
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Float"/>
-				<c path="String"/>
+				<t path="java.lang._Double.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -7307,7 +7307,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><valueOf public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Double.String"/>
 		<x path="java.lang.Double"/>
 	</f>
 	<meta>
@@ -7350,7 +7350,7 @@
 			<meta><m n=":overload"/></meta>
 		</isNaN>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Double.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -7365,7 +7365,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><new public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Double.String"/>
 		<x path="Void"/>
 	</f>
 	<meta>
@@ -7395,14 +7395,14 @@
 		</compare>
 		<getBoolean public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Boolean.String"/>
 				<x path="Bool"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</getBoolean>
 		<parseBoolean public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Boolean.String"/>
 				<x path="Bool"/>
 			</f>
 			<meta><m n=":overload"/></meta>
@@ -7410,7 +7410,7 @@
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Bool"/>
-				<c path="String"/>
+				<t path="java.lang._Boolean.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -7425,7 +7425,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><valueOf public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Boolean.String"/>
 		<x path="java.lang.Boolean"/>
 	</f>
 	<meta><m n=":overload"/></meta>
@@ -7461,7 +7461,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Boolean.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -7476,7 +7476,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><new public="1" set="method">
 	<f a="string">
-		<c path="String"/>
+		<t path="java.lang._Boolean.String"/>
 		<x path="Void"/>
 	</f>
 	<meta><m n=":overload"/></meta>
@@ -40033,6 +40033,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Boolean.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Boolean.hx" private="1" module="java.lang.Boolean"><c path="String"/></typedef>
 	<abstract path="java.lang.Boolean" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Boolean.hx">
 		<from>
 			<icast><c path="java.lang.BooleanClass"/></icast>
@@ -40050,14 +40051,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Boolean.Boolean_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Boolean.hx" private="1" module="java.lang.Boolean" final="1">
-	<toBool public="1" get="inline" set="null" line="30" static="1">
+	<toBool public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.BooleanClass"/>
 			<x path="Bool"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toBool>
-	<fromBool public="1" get="inline" set="null" line="33" static="1">
+	<fromBool public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="Bool"/>
 			<x path="java.lang.Boolean"/>
@@ -40068,14 +40069,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Boolean.Boolean_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Boolean.hx" private="1" module="java.lang.Boolean" final="1">
-		<toBool public="1" get="inline" set="null" line="30" static="1">
+		<toBool public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.BooleanClass"/>
 				<x path="Bool"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toBool>
-		<fromBool public="1" get="inline" set="null" line="33" static="1">
+		<fromBool public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="Bool"/>
 				<x path="java.lang.Boolean"/>
@@ -40084,6 +40085,7 @@
 		</fromBool>
 		<meta><m n=":native"><e>""</e></m></meta>
 	</class>
+	<typedef path="java.lang._Byte.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Byte.hx" private="1" module="java.lang.Byte"><c path="String"/></typedef>
 	<abstract path="java.lang.Byte" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Byte.hx">
 		<from>
 			<icast><c path="java.lang.ByteClass"/></icast>
@@ -40101,14 +40103,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Byte.Byte_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Byte.hx" private="1" module="java.lang.Byte" final="1">
-	<toByte public="1" get="inline" set="null" line="30" static="1">
+	<toByte public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.ByteClass"/>
 			<x path="jvm.Int8"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toByte>
-	<fromByte public="1" get="inline" set="null" line="33" static="1">
+	<fromByte public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="jvm.Int8"/>
 			<x path="java.lang.Byte"/>
@@ -40119,14 +40121,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Byte.Byte_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Byte.hx" private="1" module="java.lang.Byte" final="1">
-		<toByte public="1" get="inline" set="null" line="30" static="1">
+		<toByte public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.ByteClass"/>
 				<x path="jvm.Int8"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toByte>
-		<fromByte public="1" get="inline" set="null" line="33" static="1">
+		<fromByte public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="jvm.Int8"/>
 				<x path="java.lang.Byte"/>
@@ -40152,7 +40154,7 @@
 		</compare>
 		<decode public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Byte.String"/>
 				<x path="java.lang.Byte"/>
 			</f>
 			<meta>
@@ -40162,7 +40164,7 @@
 		</decode>
 		<parseByte public="1" set="method" static="1">
 			<f a="param1:param2">
-				<c path="String"/>
+				<t path="java.lang._Byte.String"/>
 				<x path="Int"/>
 				<x path="jvm.Int8"/>
 			</f>
@@ -40172,7 +40174,7 @@
 			</meta>
 			<overloads><parseByte public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Byte.String"/>
 		<x path="jvm.Int8"/>
 	</f>
 	<meta>
@@ -40184,7 +40186,7 @@
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="jvm.Int8"/>
-				<c path="String"/>
+				<t path="java.lang._Byte.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -40200,7 +40202,7 @@
 			<overloads>
 				<valueOf public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Byte.String"/>
 						<x path="Int"/>
 						<x path="java.lang.Byte"/>
 					</f>
@@ -40211,7 +40213,7 @@
 				</valueOf>
 				<valueOf public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Byte.String"/>
 						<x path="java.lang.Byte"/>
 					</f>
 					<meta>
@@ -40247,7 +40249,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Byte.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -40262,7 +40264,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><new public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Byte.String"/>
 		<x path="Void"/>
 	</f>
 	<meta>
@@ -40389,6 +40391,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Character.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Character.hx" private="1" module="java.lang.Character"><c path="String"/></typedef>
 	<abstract path="java.lang.Character" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Character.hx">
 		<from>
 			<icast><c path="java.lang.CharacterClass"/></icast>
@@ -40406,14 +40409,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Character.Character_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Character.hx" private="1" module="java.lang.Character" final="1">
-	<toCharacter public="1" get="inline" set="null" line="30" static="1">
+	<toCharacter public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.CharacterClass"/>
 			<x path="jvm.Char16"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toCharacter>
-	<fromCharacter public="1" get="inline" set="null" line="33" static="1">
+	<fromCharacter public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="jvm.Char16"/>
 			<x path="java.lang.Character"/>
@@ -40424,14 +40427,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Character.Character_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Character.hx" private="1" module="java.lang.Character" final="1">
-		<toCharacter public="1" get="inline" set="null" line="30" static="1">
+		<toCharacter public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.CharacterClass"/>
 				<x path="jvm.Char16"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toCharacter>
-		<fromCharacter public="1" get="inline" set="null" line="33" static="1">
+		<fromCharacter public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="jvm.Char16"/>
 				<x path="java.lang.Character"/>
@@ -40635,7 +40638,7 @@
 		<getName public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Int"/>
-				<c path="String"/>
+				<t path="java.lang._Character.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</getName>
@@ -41067,7 +41070,7 @@
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="jvm.Char16"/>
-				<c path="String"/>
+				<t path="java.lang._Character.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -41139,7 +41142,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Character.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<new public="1" set="method">
@@ -41175,7 +41178,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString final="1" public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Character.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<meta>
@@ -41404,7 +41407,7 @@
 		<YI_SYLLABLES final="1" public="1" set="null" static="1"><c path="java.lang.Character_UnicodeBlock"/></YI_SYLLABLES>
 		<forName final="1" public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Character.String"/>
 				<c path="java.lang.Character_UnicodeBlock"/>
 			</f>
 			<meta><m n=":overload"/></meta>
@@ -42480,6 +42483,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Double.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Double.hx" private="1" module="java.lang.Double"><c path="String"/></typedef>
 	<abstract path="java.lang.Double" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Double.hx">
 		<from>
 			<icast><c path="java.lang.DoubleClass"/></icast>
@@ -42497,14 +42501,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Double.Double_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Double.hx" private="1" module="java.lang.Double" final="1">
-	<toFloat public="1" get="inline" set="null" line="30" static="1">
+	<toFloat public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.DoubleClass"/>
 			<x path="Float"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toFloat>
-	<fromFloat public="1" get="inline" set="null" line="33" static="1">
+	<fromFloat public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="Float"/>
 			<x path="java.lang.Double"/>
@@ -42515,14 +42519,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Double.Double_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Double.hx" private="1" module="java.lang.Double" final="1">
-		<toFloat public="1" get="inline" set="null" line="30" static="1">
+		<toFloat public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.DoubleClass"/>
 				<x path="Float"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toFloat>
-		<fromFloat public="1" get="inline" set="null" line="33" static="1">
+		<fromFloat public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="Float"/>
 				<x path="java.lang.Double"/>
@@ -42571,6 +42575,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Float.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Float.hx" private="1" module="java.lang.Float"><c path="String"/></typedef>
 	<abstract path="java.lang.Float" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Float.hx">
 		<from>
 			<icast><c path="java.lang.FloatClass"/></icast>
@@ -42588,14 +42593,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Float.Float_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Float.hx" private="1" module="java.lang.Float" final="1">
-	<toFloat public="1" get="inline" set="null" line="30" static="1">
+	<toFloat public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.FloatClass"/>
 			<x path="Float"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toFloat>
-	<fromFloat public="1" get="inline" set="null" line="33" static="1">
+	<fromFloat public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="Single"/>
 			<x path="java.lang.Float"/>
@@ -42606,14 +42611,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Float.Float_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Float.hx" private="1" module="java.lang.Float" final="1">
-		<toFloat public="1" get="inline" set="null" line="30" static="1">
+		<toFloat public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.FloatClass"/>
 				<x path="Float"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toFloat>
-		<fromFloat public="1" get="inline" set="null" line="33" static="1">
+		<fromFloat public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="Single"/>
 				<x path="java.lang.Float"/>
@@ -42686,7 +42691,7 @@
 		</_isNaN>
 		<parseFloat public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Float.String"/>
 				<x path="Single"/>
 			</f>
 			<meta>
@@ -42697,14 +42702,14 @@
 		<toHexString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Single"/>
-				<c path="String"/>
+				<t path="java.lang._Float.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toHexString>
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="Single"/>
-				<c path="String"/>
+				<t path="java.lang._Float.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -42719,7 +42724,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><valueOf public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Float.String"/>
 		<x path="java.lang.Float"/>
 	</f>
 	<meta>
@@ -42762,7 +42767,7 @@
 			<meta><m n=":overload"/></meta>
 		</isNaN>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Float.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="java.lang.Float"/></f></doubleValue>
@@ -42785,7 +42790,7 @@
 				</new>
 				<new public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Float.String"/>
 						<x path="Void"/>
 					</f>
 					<meta>
@@ -42860,6 +42865,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Integer.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Integer.hx" private="1" module="java.lang.Integer"><c path="String"/></typedef>
 	<abstract path="java.lang.Integer" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Integer.hx">
 		<from>
 			<icast><c path="java.lang.IntegerClass"/></icast>
@@ -42877,14 +42883,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Integer.Integer_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Integer.hx" private="1" module="java.lang.Integer" final="1">
-	<toInt public="1" get="inline" set="null" line="30" static="1">
+	<toInt public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.IntegerClass"/>
 			<x path="Int"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toInt>
-	<fromInt public="1" get="inline" set="null" line="33" static="1">
+	<fromInt public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="Int"/>
 			<x path="java.lang.Integer"/>
@@ -42895,14 +42901,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Integer.Integer_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Integer.hx" private="1" module="java.lang.Integer" final="1">
-		<toInt public="1" get="inline" set="null" line="30" static="1">
+		<toInt public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.IntegerClass"/>
 				<x path="Int"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toInt>
-		<fromInt public="1" get="inline" set="null" line="33" static="1">
+		<fromInt public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="Int"/>
 				<x path="java.lang.Integer"/>
@@ -42919,6 +42925,7 @@
 		<e>"Integer.IntegerCache"</e>
 	</m>
 </meta></class>
+	<typedef path="java.lang._Long.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Long.hx" private="1" module="java.lang.Long"><c path="String"/></typedef>
 	<abstract path="java.lang.Long" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Long.hx">
 		<from>
 			<icast><c path="java.lang.LongClass"/></icast>
@@ -42936,14 +42943,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Long.Long_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Long.hx" private="1" module="java.lang.Long" final="1">
-	<toLong public="1" get="inline" set="null" line="30" static="1">
+	<toLong public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.LongClass"/>
 			<x path="haxe.Int64"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toLong>
-	<fromLong public="1" get="inline" set="null" line="33" static="1">
+	<fromLong public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="haxe.Int64"/>
 			<x path="java.lang.Long"/>
@@ -42954,14 +42961,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Long.Long_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Long.hx" private="1" module="java.lang.Long" final="1">
-		<toLong public="1" get="inline" set="null" line="30" static="1">
+		<toLong public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.LongClass"/>
 				<x path="haxe.Int64"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toLong>
-		<fromLong public="1" get="inline" set="null" line="33" static="1">
+		<fromLong public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="haxe.Int64"/>
 				<x path="java.lang.Long"/>
@@ -42994,7 +43001,7 @@
 		</compare>
 		<decode public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 				<x path="java.lang.Long"/>
 			</f>
 			<meta>
@@ -43004,7 +43011,7 @@
 		</decode>
 		<getLong public="1" set="method" static="1">
 			<f a="param1:param2">
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 				<x path="java.lang.Long"/>
 				<x path="java.lang.Long"/>
 			</f>
@@ -43012,7 +43019,7 @@
 			<overloads>
 				<getLong public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Long.String"/>
 						<x path="haxe.Int64"/>
 						<x path="java.lang.Long"/>
 					</f>
@@ -43020,7 +43027,7 @@
 				</getLong>
 				<getLong public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Long.String"/>
 						<x path="java.lang.Long"/>
 					</f>
 					<meta><m n=":overload"/></meta>
@@ -43057,7 +43064,7 @@
 		</numberOfTrailingZeros>
 		<parseLong public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 				<x path="haxe.Int64"/>
 			</f>
 			<meta>
@@ -43066,7 +43073,7 @@
 			</meta>
 			<overloads><parseLong public="1" set="method">
 	<f a="param1:param2">
-		<c path="String"/>
+		<t path="java.lang._Long.String"/>
 		<x path="Int"/>
 		<x path="haxe.Int64"/>
 	</f>
@@ -43116,28 +43123,28 @@
 		<toBinaryString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="haxe.Int64"/>
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toBinaryString>
 		<toHexString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="haxe.Int64"/>
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toHexString>
 		<toOctalString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="haxe.Int64"/>
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 			</f>
 			<meta><m n=":overload"/></meta>
 		</toOctalString>
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="haxe.Int64"/>
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -43147,7 +43154,7 @@
 	<f a="param1:param2">
 		<x path="haxe.Int64"/>
 		<x path="Int"/>
-		<c path="String"/>
+		<t path="java.lang._Long.String"/>
 	</f>
 	<meta>
 		<m n=":native"><e>"toString"</e></m>
@@ -43164,7 +43171,7 @@
 			<overloads>
 				<valueOf public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Long.String"/>
 						<x path="java.lang.Long"/>
 					</f>
 					<meta>
@@ -43174,7 +43181,7 @@
 				</valueOf>
 				<valueOf public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Long.String"/>
 						<x path="Int"/>
 						<x path="java.lang.Long"/>
 					</f>
@@ -43211,7 +43218,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Long.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -43220,7 +43227,7 @@
 		<longValue public="1" set="method" override="1"><f a=""><x path="haxe.Int64"/></f></longValue>
 		<new public="1" set="method">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Long.String"/>
 				<x path="Void"/>
 			</f>
 			<meta>
@@ -44287,6 +44294,7 @@
 			<m n=":libType"/>
 		</meta>
 	</class>
+	<typedef path="java.lang._Short.String" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Short.hx" private="1" module="java.lang.Short"><c path="String"/></typedef>
 	<abstract path="java.lang.Short" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Short.hx">
 		<from>
 			<icast><c path="java.lang.ShortClass"/></icast>
@@ -44304,14 +44312,14 @@
 			<m n=":forward"/>
 		</meta>
 		<impl><class path="java.lang._Short.Short_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Short.hx" private="1" module="java.lang.Short" final="1">
-	<toShort public="1" get="inline" set="null" line="30" static="1">
+	<toShort public="1" get="inline" set="null" line="32" static="1">
 		<f a="this">
 			<c path="java.lang.ShortClass"/>
 			<x path="jvm.Int16"/>
 		</f>
 		<meta><m n=":to"/></meta>
 	</toShort>
-	<fromShort public="1" get="inline" set="null" line="33" static="1">
+	<fromShort public="1" get="inline" set="null" line="35" static="1">
 		<f a="b">
 			<x path="jvm.Int16"/>
 			<x path="java.lang.Short"/>
@@ -44322,14 +44330,14 @@
 </class></impl>
 	</abstract>
 	<class path="java.lang._Short.Short_Impl_" params="" file="/home/runner/work/haxe/haxe/std/java/lang/Short.hx" private="1" module="java.lang.Short" final="1">
-		<toShort public="1" get="inline" set="null" line="30" static="1">
+		<toShort public="1" get="inline" set="null" line="32" static="1">
 			<f a="this">
 				<c path="java.lang.ShortClass"/>
 				<x path="jvm.Int16"/>
 			</f>
 			<meta><m n=":to"/></meta>
 		</toShort>
-		<fromShort public="1" get="inline" set="null" line="33" static="1">
+		<fromShort public="1" get="inline" set="null" line="35" static="1">
 			<f a="b">
 				<x path="jvm.Int16"/>
 				<x path="java.lang.Short"/>
@@ -44355,7 +44363,7 @@
 		</compare>
 		<decode public="1" set="method" static="1">
 			<f a="param1">
-				<c path="String"/>
+				<t path="java.lang._Short.String"/>
 				<x path="java.lang.Short"/>
 			</f>
 			<meta>
@@ -44365,7 +44373,7 @@
 		</decode>
 		<parseShort public="1" set="method" static="1">
 			<f a="param1:param2">
-				<c path="String"/>
+				<t path="java.lang._Short.String"/>
 				<x path="Int"/>
 				<x path="jvm.Int16"/>
 			</f>
@@ -44375,7 +44383,7 @@
 			</meta>
 			<overloads><parseShort public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Short.String"/>
 		<x path="jvm.Int16"/>
 	</f>
 	<meta>
@@ -44394,7 +44402,7 @@
 		<_toString public="1" set="method" static="1">
 			<f a="param1">
 				<x path="jvm.Int16"/>
-				<c path="String"/>
+				<t path="java.lang._Short.String"/>
 			</f>
 			<meta>
 				<m n=":native"><e>"toString"</e></m>
@@ -44410,7 +44418,7 @@
 			<overloads>
 				<valueOf public="1" set="method">
 					<f a="param1">
-						<c path="String"/>
+						<t path="java.lang._Short.String"/>
 						<x path="java.lang.Short"/>
 					</f>
 					<meta>
@@ -44420,7 +44428,7 @@
 				</valueOf>
 				<valueOf public="1" set="method">
 					<f a="param1:param2">
-						<c path="String"/>
+						<t path="java.lang._Short.String"/>
 						<x path="Int"/>
 						<x path="java.lang.Short"/>
 					</f>
@@ -44457,7 +44465,7 @@
 			<meta><m n=":overload"/></meta>
 		</hashCode>
 		<toString public="1" set="method">
-			<f a=""><c path="String"/></f>
+			<f a=""><t path="java.lang._Short.String"/></f>
 			<meta><m n=":overload"/></meta>
 		</toString>
 		<doubleValue public="1" set="method" override="1"><f a=""><x path="Float"/></f></doubleValue>
@@ -44472,7 +44480,7 @@
 			<meta><m n=":overload"/></meta>
 			<overloads><new public="1" set="method">
 	<f a="param1">
-		<c path="String"/>
+		<t path="java.lang._Short.String"/>
 		<x path="Void"/>
 	</f>
 	<meta>