Added a few missing cmd name checks.