Issue #24225: Fix additional renamed module references.
3 files changed