fix form names