Fix #1562: rename modules to new names
7 files changed