Use plural forms for modules.
Code cleanup.