Simplify filenames (round 6).