Change file names and corrected some syntax