Use more sensible file names.