Rename modules to avoid name clash