Replace “package” with “module” in a number of places

Ref #1059
Merge commit 'HEAD@{1}' into develop