added names for the fields to match the originals
Merge branch 'master' of github.com:plone/mockup