-name and -rm to --name and --rm Upstream-commit: 10a320818e875547c83fecea32cd73231248acf8 Component: engine