Renamed some files to match the right naming conventions