Renamed some files to be more consistent