Module renamings broke source-dist targets. These two commits fix them.
Closes #17848 (closed). Closes #17849 (closed).