Update require path
Pluralize files and errors when applicable