Fix a typo. Improve automatically generated file names.