Updated the survey definitions.

The survey definitions have now been updated to the new, agreed upon format.