Rename cmdline->cli, fix different path from integration