Simplify filenames (round 4).