Simplify filenames (round 7).