Merge branch 'minor-fixes-modules-spelling'