Revert "Fixed inconsistencies in plural and singular forms used in module names"

This reverts commit 1d7bc3b49baac7c43124e837f3a0ac13aea3ebfe.