Rename files and corrected breakpoints