More machine name changes and corrected some line endings.