Renamed a bunch of stuff
Fixed some hax