diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/DD Base Plate.ipt b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/DD Base Plate.ipt
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/DD Base Plate.ipt
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/DD Base Plate.ipt
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/DD locking Plate.ipt b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/DD locking Plate.ipt
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/DD locking Plate.ipt
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/DD locking Plate.ipt
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/Ivan's Mag.ipt b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/Ivan's Mag.ipt
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/Ivan's Mag.ipt
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/Ivan's Mag.ipt
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/Ivan's follower.ipt b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/Ivan's follower.ipt
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/IPT/Ivan's follower.ipt
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/IPT/Ivan's follower.ipt
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower Without Brim.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Follower.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Baseplate.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body Without Brim.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Body.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.mtl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.mtl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.mtl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.mtl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.obj b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.obj
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.obj
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/OBJ/Ivan's Standard Mag Locking Plate.obj
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/README.md b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/README.md
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/README.md
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/README.md
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Assembeled Mags.jpg b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Assembeled Mags.jpg
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Assembeled Mags.jpg
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Assembeled Mags.jpg
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Baseplate.PNG b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Baseplate.PNG
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Baseplate.PNG
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Baseplate.PNG
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Example Orientations.PNG b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Example Orientations.PNG
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Example Orientations.PNG
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Example Orientations.PNG
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Follower.PNG b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Follower.PNG
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Follower.PNG
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Follower.PNG
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Locking Plate.PNG b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Locking Plate.PNG
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Locking Plate.PNG
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Locking Plate.PNG
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Mag Body.PNG b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Mag Body.PNG
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Mag Body.PNG
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Mag Body.PNG
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Mag with jig.jpg b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Mag with jig.jpg
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Mag with jig.jpg
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Mag with jig.jpg
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where To File Down.jpg b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where To File Down.jpg
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where To File Down.jpg
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where To File Down.jpg
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where To Solder 2.jpg b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where To Solder 2.jpg
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where To Solder 2.jpg
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where To Solder 2.jpg
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where to Solder.jpg b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where to Solder.jpg
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/Renders/Where to Solder.jpg
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/Renders/Where to Solder.jpg
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower Without Brim.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower Without Brim.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower Without Brim.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower Without Brim.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Follower.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Baseplate.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Baseplate.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Baseplate.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Baseplate.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body Without Brim.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body Without Brim.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body Without Brim.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body Without Brim.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Body.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Locking Plate.stp b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Locking Plate.stp
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Locking Plate.stp
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STEP/Ivan's Standard Mag Locking Plate.stp
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower Without Brim.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower Without Brim.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower Without Brim.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower Without Brim.stl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Follower.stl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Baseplate.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Baseplate.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Baseplate.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Baseplate.stl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body Without Brim.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body Without Brim.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body Without Brim.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body Without Brim.stl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Body.stl
diff --git a/Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Locking Plate.stl b/Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Locking Plate.stl
similarity index 100%
rename from Rifles/AR-15-30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Locking Plate.stl
rename to Rifles/AR-15_30_Round_Magazine-Ivanthetroll/STL/Ivan's Standard Mag Locking Plate.stl