Be consistent about naming modules.

Closes #467.