fixes related to module renaming