Rename name and label attributes to be compatible with 1.1.0
Update and correct tests
Remove two items that get clobbered by identical names later in the readers def.  Unfortunately, the readers object cannot respond differently to the same string, even if it appears in a different place in the XML tree.