Changed xml form names