Avoid command name doubling in logs and errors.

Signed-off-by: Jeffrey Peckham <peckham@pivotallabs.com>