make generated files singular instead of plural

Closes #2249