Consistency: Rename all modules to their singular spelling.

This renames modules written in a plural spelling to their singular spelling.