Updating module names to resolve conflicts

No match.