XML: remove _ prefixes on property names; fix enumeration; add test for ...