Use attributes, not element names to identify fields.
Rename for fussiness.