Fixed issues with --name argument for command line.