Use generic names in other files also

Reduce the number of files that must be customized when starting new
projects.