CDK-156: Use command name as a prefix for metrics - fixed