Updating module names to resolve conflicts