For #1794: also sort form names