Changed filenames to plurals