diff --git a/libs.xml b/libs.xml
index a4b43767..2811f7b6 100644
--- a/libs.xml
+++ b/libs.xml
@@ -4,23 +4,23 @@
 		<print pretty="true">Preparing installation...</print>
 
 		<!-- OpenFL & Lime (Required for Flixel) -->
-		<git name="openfl" url="https://github.com/FNF-CNE-Devs/openfl" />
+		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" />
 		<lib name="lime" version="8.1.2" />
-		<!-- <git name="lime" url="https://github.com/FNF-CNE-Devs/lime" />  disabled for now until fixed -->
+		<!-- <git name="lime" url="https://github.com/CodenameCrew/cne-lime" />  disabled for now until fixed -->
 
 		<!-- Flixel -->
-		<git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel" />
-		<git name="flixel-addons" url="https://github.com/FNF-CNE-Devs/flixel-addons" />
+		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" />
+		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" />
 
 		<!-- Other Libraries -->
-		<git name="hscript-improved" url="https://github.com/FNF-CNE-Devs/hscript-improved" ref="codename-dev" />
-		<git name="flxanimate" url="https://github.com/FNF-CNE-Devs/flxanimate" />
-		<git name="hxdiscord_rpc" url="https://github.com/FNF-CNE-Devs/hxdiscord_rpc" skipDeps="true" />
+		<git name="hscript-improved" url="https://github.com/CodenameCrew/hscript-improved" ref="codename-dev" />
+		<git name="flxanimate" url="https://github.com/CodenameCrew/cne-flxanimate" />
+		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true" />
 		<lib name="hxvlc" version="1.9.3" skipDeps="true" />
 
 		<!-- Documentation and other features -->
-		<git name="away3d" url="https://github.com/FNF-CNE-Devs/away3d" />
-		<git name="funkin.vis" url="https://github.com/FNF-CNE-Devs/funkVis" />
+		<git name="away3d" url="https://github.com/CodenameCrew/away3d" />
+		<git name="funkin.vis" url="https://github.com/CodenameCrew/cne-funkVis" />
 		<git name="grig.audio" url="https://gitlab.com/haxe-grig/grig.audio.git" ref="57f5d47f2533fd0c3dcd025a86cb86c0dfa0b6d2" />
 		<!-- <lib name="dox" /> -->
 		<lib name="markdown" />
@@ -29,10 +29,7 @@
 		<lib global="true" name="hxp" /> <lib name="hxp" />
 		<lib global="true" name="format" /> <lib name="format" />
 
-		<!-- Extras -->
-		<!-- TODO: Remove this when hxcpp is updated -->
-		<!-- Adds a progress counter to compilation -->
-		<git name="hxcpp" url="https://github.com/NeeEoo/hxcpp" ref="codename" />
+		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp" />
 	</if>
 
 	<!-- Hxcpp Building -->