Fix Metadata to be coherent with Surveyval Specifications

The metadata and the specifications expected by the Surveyval tool have gotten out of sync.