Renamed a bunch of files for naming convention consistency