Renamed a bunch of files with bad names
more name changes