diff --git a/Rifles/Carbine_Handguards-WarFairy/README.md b/Rifles/AR-15_Carbine_Handguards-WarFairy/README.md
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/README.md
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/README.md
diff --git a/Rifles/Carbine_Handguards-WarFairy/Renders/Railed_Detail.jpg b/Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Railed_Detail.jpg
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/Renders/Railed_Detail.jpg
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Railed_Detail.jpg
diff --git a/Rifles/Carbine_Handguards-WarFairy/Renders/Railed_Installed.jpg b/Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Railed_Installed.jpg
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/Renders/Railed_Installed.jpg
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Railed_Installed.jpg
diff --git a/Rifles/Carbine_Handguards-WarFairy/Renders/Smooth_Detail.jpg b/Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Smooth_Detail.jpg
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/Renders/Smooth_Detail.jpg
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Smooth_Detail.jpg
diff --git a/Rifles/Carbine_Handguards-WarFairy/Renders/Smooth_Installed.jpg b/Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Smooth_Installed.jpg
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/Renders/Smooth_Installed.jpg
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/Renders/Smooth_Installed.jpg
diff --git a/Rifles/Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Railed.SLDPRT b/Rifles/AR-15_Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Railed.SLDPRT
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Railed.SLDPRT
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Railed.SLDPRT
diff --git a/Rifles/Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Smooth.SLDPRT b/Rifles/AR-15_Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Smooth.SLDPRT
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Smooth.SLDPRT
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/SLDPRT/Carbine_Handguard_Smooth.SLDPRT
diff --git a/Rifles/Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Railed.STEP b/Rifles/AR-15_Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Railed.STEP
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Railed.STEP
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Railed.STEP
diff --git a/Rifles/Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Smooth.STEP b/Rifles/AR-15_Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Smooth.STEP
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Smooth.STEP
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/STEP/Carbine_Handguard_Smooth.STEP
diff --git a/Rifles/Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Railed.stl b/Rifles/AR-15_Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Railed.stl
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Railed.stl
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Railed.stl
diff --git a/Rifles/Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Smooth.stl b/Rifles/AR-15_Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Smooth.stl
similarity index 100%
rename from Rifles/Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Smooth.stl
rename to Rifles/AR-15_Carbine_Handguards-WarFairy/STL/Carbine_Handguard_Smooth.stl