Correct references that got lost in the module renaming