issue #20416: fixed filenames