NXP-10793: remove dash character from form names