Rename modules to use plural names in order to read more naturally.