Rename of file. Try to keep everything singular.

This way there will be no ambiguity if we use singular or plural
depending on a context.