PIM-1757 : use form types aliases