Support plural version of commands; support dashes