Add command name check