fixed form names, and a typo