Update GenericRestParser to deal with form types name