Use short names for easier matching across services.

Someday I should add a mode for simplified matching where results =~ commands, but for now EVAL will work.