Fixed to match module renaming