fixups to command names, i tested it works, resolve #250