VID-560 adding form names