Rename modules to module to follow convention.