[3.0] modules: fix typos

In the same spirit as !2444 (merged) backport a commit that made a lot of (harmless) changes in the code.

This will minimize differences when backporting code from master, making cherry picking safer/cleaner.