Simplify filenames (round 2).