Continue to refactor the references to `system/module`