diff --git a/xml/development/cs.xml b/xml/development/cs.xml
index 21fdd0caa284..4cf701af275f 100644
--- a/xml/development/cs.xml
+++ b/xml/development/cs.xml
@@ -48649,20 +48649,20 @@
 		</meta>
 	</class>
 	<class path="sys.thread._Thread.HaxeThread" params="" file="/home/runner/work/haxe/haxe/std/cs/_std/sys/thread/Thread.hx" private="1" module="sys.thread.Thread">
-		<mainNativeThread static="1"><t path="cs.system.threading._Thread.NativeThread"/></mainNativeThread>
+		<mainNativeThread static="1"><c path="cs.system.threading.Thread"/></mainNativeThread>
 		<mainHaxeThread static="1"><c path="sys.thread._Thread.HaxeThread"/></mainHaxeThread>
 		<threads static="1"><t path="Map">
 	<x path="Int"/>
 	<c path="cs.system.WeakReference"/>
 </t></threads>
-		<threadsMutex static="1"><t path="cs.system.threading._Mutex.NativeMutex"/></threadsMutex>
+		<threadsMutex static="1"><c path="cs.system.threading.Mutex"/></threadsMutex>
 		<allocateCount static="1"><x path="Int"/></allocateCount>
 		<get public="1" set="method" line="119" static="1"><f a="native">
-	<t path="cs.system.threading._Thread.NativeThread"/>
+	<c path="cs.system.threading.Thread"/>
 	<c path="sys.thread._Thread.HaxeThread"/>
 </f></get>
 		<allocate public="1" set="method" line="134" static="1"><f a="native:withEventLoop">
-	<t path="cs.system.threading._Thread.NativeThread"/>
+	<c path="cs.system.threading.Thread"/>
 	<x path="Bool"/>
 	<c path="sys.thread._Thread.HaxeThread"/>
 </f></allocate>
@@ -48670,7 +48670,7 @@
 	<f a=""><x path="Void"/></f>
 	<x path="Void"/>
 </f></runWithEventLoop>
-		<native final="1" public="1"><t path="cs.system.threading._Thread.NativeThread"/></native>
+		<native final="1" public="1"><c path="cs.system.threading.Thread"/></native>
 		<events public="1" set="null"><x path="Null"><c path="sys.thread.EventLoop"/></x></events>
 		<messages final="1" expr="new Deque&lt;Dynamic&gt;()" line="117">
 			<c path="sys.thread.Deque"><d/></c>
@@ -48685,7 +48685,7 @@
 	<x path="Void"/>
 </f></sendMessage>
 		<new set="method" line="173"><f a="native">
-	<t path="cs.system.threading._Thread.NativeThread"/>
+	<c path="cs.system.threading.Thread"/>
 	<x path="Void"/>
 </f></new>
 		<meta>
@@ -49310,7 +49310,7 @@
 			</meta>
 		</__skipStack>
 		<__nativeException>
-			<t path="cs.system._Exception.CsException"/>
+			<c path="cs.system.Exception"/>
 			<meta><m n=":noCompletion"/></meta>
 		</__nativeException>
 		<__previousException>
@@ -76820,7 +76820,7 @@
 			<f a="cmd:?args">
 				<c path="String"/>
 				<c path="Array"><c path="String"/></c>
-				<t path="cs.system.diagnostics._Process.NativeProcess"/>
+				<c path="cs.system.diagnostics.Process"/>
 			</f>
 			<meta><m n=":allow"><e>Sys</e></m></meta>
 		</createNativeProcess>
@@ -76840,7 +76840,7 @@
 			<c path="haxe.io.Output"/>
 			<haxe_doc>Standard input. The stream data going into a process.</haxe_doc>
 		</stdin>
-		<native><t path="cs.system.diagnostics._Process.NativeProcess"/></native>
+		<native><c path="cs.system.diagnostics.Process"/></native>
 		<getPid public="1" set="method" line="109">
 			<f a=""><x path="Int"/></f>
 			<haxe_doc>Return the process ID.</haxe_doc>
@@ -76932,7 +76932,7 @@
 		In case a `timeout` (in seconds) is specified, select might wait at worst until the timeout expires.</haxe_doc>
 		</select>
 		<sock expr="null" line="44">
-			<t path="cs.system.net.sockets._Socket.NativeSocket"/>
+			<c path="cs.system.net.sockets.Socket"/>
 			<meta><m n=":value"><e>null</e></m></meta>
 		</sock>
 		<input public="1" set="null">
diff --git a/xml/development/info.json b/xml/development/info.json
index 4b259dac3556..d45f0fe4a2c1 100644
--- a/xml/development/info.json
+++ b/xml/development/info.json
@@ -1,4 +1,4 @@
   {
-    "commit": "c2479a0aa2aa9903790aafc4d5643214b7a841ae",
+    "commit": "d0016c9d82eaf526d325e5298b44a5aa82cc68eb",
     "branch": "development"
   }
diff --git a/xml/development/java.xml b/xml/development/java.xml
index 0c331e27960b..d1b5aa6ca328 100644
--- a/xml/development/java.xml
+++ b/xml/development/java.xml
@@ -6693,10 +6693,10 @@
 	</class>
 	<class path="sys.thread._Thread.HaxeThread" params="" file="/home/runner/work/haxe/haxe/std/java/_std/sys/thread/Thread.hx" private="1" module="sys.thread.Thread">
 		<nativeThreads static="1"><c path="java.util.Map">
-	<t path="java.lang._Thread.JavaThread"/>
+	<c path="java.lang.Thread"/>
 	<c path="sys.thread._Thread.HaxeThread"/>
 </c></nativeThreads>
-		<mainJavaThread static="1"><t path="java.lang._Thread.JavaThread"/></mainJavaThread>
+		<mainJavaThread static="1"><c path="java.lang.Thread"/></mainJavaThread>
 		<mainHaxeThread static="1"><c path="sys.thread._Thread.HaxeThread"/></mainHaxeThread>
 		<create public="1" set="method" line="100" static="1"><f a="job:withEventLoop">
 	<f a=""><x path="Void"/></f>
@@ -6704,7 +6704,7 @@
 	<c path="sys.thread._Thread.HaxeThread"/>
 </f></create>
 		<get public="1" set="method" line="110" static="1"><f a="javaThread">
-	<t path="java.lang._Thread.JavaThread"/>
+	<c path="java.lang.Thread"/>
 	<c path="sys.thread._Thread.HaxeThread"/>
 </f></get>
 		<runWithEventLoop public="1" set="method" line="127" static="1"><f a="job">
@@ -85453,7 +85453,7 @@
 	</class>
 	<class path="sys.thread.Condition" params="" file="/home/runner/work/haxe/haxe/std/java/_std/sys/thread/Condition.hx">
 		<lock final="1"><c path="java.util.concurrent.locks.ReentrantLock"/></lock>
-		<native final="1"><t path="java.util.concurrent.locks._Condition.NativeCondition"/></native>
+		<native final="1"><c path="java.util.concurrent.locks.Condition"/></native>
 		<acquire public="1" set="method" line="18">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>Acquires the internal mutex.</haxe_doc>
diff --git a/xml/development/js.xml b/xml/development/js.xml
index 32ffc7921618..2304db6619af 100644
--- a/xml/development/js.xml
+++ b/xml/development/js.xml
@@ -1157,7 +1157,7 @@
 	<class path="js.lib.Date" params="" file="/home/runner/work/haxe/haxe/std/js/lib/Date.hx" extern="1">
 		<fromHaxeDate public="1" get="inline" set="null" line="40" static="1">
 			<f a="date">
-				<t path="_Date.HaxeDate"/>
+				<c path="Date"/>
 				<c path="js.lib.Date"/>
 			</f>
 			<haxe_doc>Cast Haxe's Date to js.lib.Date.</haxe_doc>
@@ -1165,7 +1165,7 @@
 		<toHaxeDate public="1" get="inline" set="null" line="47" static="1">
 			<f a="date">
 				<c path="js.lib.Date"/>
-				<t path="_Date.HaxeDate"/>
+				<c path="Date"/>
 			</f>
 			<haxe_doc>Cast js.lib.Date to Haxe's Date.</haxe_doc>
 		</toHaxeDate>
diff --git a/xml/development/lua.xml b/xml/development/lua.xml
index e3ac27bed008..b29660176e1f 100644
--- a/xml/development/lua.xml
+++ b/xml/development/lua.xml
@@ -34107,7 +34107,7 @@
 	</class>
 	<class path="lua.lib.luasec.Ssl" params="" file="/home/runner/work/haxe/haxe/std/lua/lib/luasec/Ssl.hx" extern="1">
 		<wrap public="1" set="method" static="1"><f a="sock:params">
-	<t path="lua.lib.luasocket._Socket.LuaSocket"/>
+	<c path="lua.lib.luasocket.Socket"/>
 	<t path="lua.lib.luasec.SslParams"/>
 	<c path="lua.Result"><c path="lua.lib.luasec.SslTcpClient"/></c>
 </f></wrap>
@@ -37144,7 +37144,7 @@
 		<input public="1" set="null"><c path="haxe.io.Input"/></input>
 		<output public="1" set="null"><c path="haxe.io.Output"/></output>
 		<custom><d/></custom>
-		<_socket><t path="lua.lib.luasocket._Socket.LuaSocket"/></_socket>
+		<_socket><c path="lua.lib.luasocket.Socket"/></_socket>
 		<blocking expr="false">
 			<x path="Bool"/>
 			<meta><m n=":value"><e>false</e></m></meta>
@@ -37473,7 +37473,7 @@
 		<extends path="sys.net.Socket"/>
 		<_sslSocket><c path="lua.lib.luasec.SslTcpClient"/></_sslSocket>
 		<wrap set="method" line="39"><f a="sock">
-	<t path="lua.lib.luasocket._Socket.LuaSocket"/>
+	<c path="lua.lib.luasocket.Socket"/>
 	<c path="lua.lib.luasec.SslTcpClient"/>
 </f></wrap>
 		<handshake public="1" set="method" line="47"><f a=""><x path="Void"/></f></handshake>
diff --git a/xml/development/macro.xml b/xml/development/macro.xml
index b0a4a2523c5a..30254d7e3877 100644
--- a/xml/development/macro.xml
+++ b/xml/development/macro.xml
@@ -45201,7 +45201,7 @@
 	</abstract>
 	<class path="sys.thread._EventLoop.EventHandler_Impl_" params="" file="/home/runner/work/haxe/haxe/std/eval/_std/sys/thread/EventLoop.hx" private="1" module="sys.thread.EventLoop" extern="1" final="1"/>
 	<class path="sys.thread._EventLoop.RegularEvent" params="" file="/home/runner/work/haxe/haxe/std/eval/_std/sys/thread/EventLoop.hx" private="1" module="sys.thread.EventLoop">
-		<timer public="1"><x path="Null"><t path="eval.luv._Timer.LuvTimer"/></x></timer>
+		<timer public="1"><x path="Null"><x path="eval.luv.Timer"/></x></timer>
 		<event public="1"><f a=""><x path="Void"/></f></event>
 		<run public="1" set="method" line="36"><f a=""><x path="Void"/></f></run>
 		<new public="1" set="method" line="32"><f a="e">
diff --git a/xml/development/python.xml b/xml/development/python.xml
index ee45b5312fd2..4fde2fd1ea75 100644
--- a/xml/development/python.xml
+++ b/xml/development/python.xml
@@ -5905,7 +5905,7 @@
 	</class>
 	<class path="sys.thread._Thread.HxThread" params="" file="/home/runner/work/haxe/haxe/std/python/_std/sys/thread/Thread.hx" private="1" module="sys.thread.Thread">
 		<threads static="1"><c path="haxe.ds.ObjectMap">
-	<t path="python.lib.threading._Thread.NativeThread"/>
+	<c path="python.lib.threading.Thread"/>
 	<c path="sys.thread._Thread.HxThread"/>
 </c></threads>
 		<threadsMutex static="1"><c path="sys.thread.Mutex"/></threadsMutex>
@@ -5921,7 +5921,7 @@
 	<x path="Void"/>
 </f></runWithEventLoop>
 		<dropThread get="inline" set="null" line="155" static="1"><f a="nt">
-	<t path="python.lib.threading._Thread.NativeThread"/>
+	<c path="python.lib.threading.Thread"/>
 	<x path="Void"/>
 </f></dropThread>
 		<readMessage public="1" set="method" line="161" static="1"><f a="block">
@@ -5929,7 +5929,7 @@
 	<d/>
 </f></readMessage>
 		<events public="1" set="null"><x path="Null"><c path="sys.thread.EventLoop"/></x></events>
-		<nativeThread final="1"><t path="python.lib.threading._Thread.NativeThread"/></nativeThread>
+		<nativeThread final="1"><c path="python.lib.threading.Thread"/></nativeThread>
 		<messages final="1" expr="new Deque&lt;Dynamic&gt;()">
 			<c path="sys.thread.Deque"><d/></c>
 			<meta><m n=":value"><e><![CDATA[new Deque<Dynamic>()]]></e></m></meta>
@@ -5939,7 +5939,7 @@
 	<x path="Void"/>
 </f></sendMessage>
 		<new set="method" line="88"><f a="t">
-	<t path="python.lib.threading._Thread.NativeThread"/>
+	<c path="python.lib.threading.Thread"/>
 	<x path="Void"/>
 </f></new>
 		<meta><m n=":directlyUsed"/></meta>
@@ -37798,7 +37798,7 @@
 
 		In case a `timeout` (in seconds) is specified, select might wait at worst until the timeout expires.</haxe_doc>
 		</select>
-		<__s><t path="python.lib.socket._Socket.PSocket"/></__s>
+		<__s><c path="python.lib.socket.Socket"/></__s>
 		<input public="1" set="null">
 			<c path="haxe.io.Input"/>
 			<haxe_doc>The stream on which you can read available data. By default the stream is blocking until the requested data is available,
@@ -38598,7 +38598,7 @@
 	</class>
 	<class path="sys.net._Socket.SocketInput" params="" file="/home/runner/work/haxe/haxe/std/python/_std/sys/net/Socket.hx" private="1" module="sys.net.Socket">
 		<extends path="haxe.io.Input"/>
-		<__s><t path="python.lib.socket._Socket.PSocket"/></__s>
+		<__s><c path="python.lib.socket.Socket"/></__s>
 		<readByte public="1" set="method" line="42" override="1"><f a=""><x path="Int"/></f></readByte>
 		<readBytes public="1" set="method" line="54" override="1"><f a="buf:pos:len">
 	<c path="haxe.io.Bytes"/>
@@ -38608,14 +38608,14 @@
 </f></readBytes>
 		<close public="1" set="method" line="70" override="1"><f a=""><x path="Void"/></f></close>
 		<new public="1" set="method" line="38"><f a="s">
-	<t path="python.lib.socket._Socket.PSocket"/>
+	<c path="python.lib.socket.Socket"/>
 	<x path="Void"/>
 </f></new>
 		<meta><m n=":directlyUsed"/></meta>
 	</class>
 	<class path="sys.net._Socket.SocketOutput" params="" file="/home/runner/work/haxe/haxe/std/python/_std/sys/net/Socket.hx" private="1" module="sys.net.Socket">
 		<extends path="haxe.io.Output"/>
-		<__s><t path="python.lib.socket._Socket.PSocket"/></__s>
+		<__s><c path="python.lib.socket.Socket"/></__s>
 		<writeByte public="1" set="method" line="84" override="1"><f a="c">
 	<x path="Int"/>
 	<x path="Void"/>
@@ -38628,7 +38628,7 @@
 </f></writeBytes>
 		<close public="1" set="method" line="103" override="1"><f a=""><x path="Void"/></f></close>
 		<new public="1" set="method" line="80"><f a="s">
-	<t path="python.lib.socket._Socket.PSocket"/>
+	<c path="python.lib.socket.Socket"/>
 	<x path="Void"/>
 </f></new>
 		<meta><m n=":directlyUsed"/></meta>
@@ -39317,7 +39317,7 @@
 		</new>
 	</class>
 	<class path="sys.thread.Semaphore" params="" file="/home/runner/work/haxe/haxe/std/python/_std/sys/thread/Semaphore.hx">
-		<semaphore final="1"><t path="python.lib.threading._Semaphore.NativeSemaphore"/></semaphore>
+		<semaphore final="1"><c path="python.lib.threading.Semaphore"/></semaphore>
 		<acquire public="1" set="method" line="13">
 			<f a=""><x path="Void"/></f>
 			<haxe_doc>Locks the semaphore.