Added support for $commandName token in usage