Changed id to id_ to avoid colliding with python keywords
Changed id to id_ to avoid colliding with python keywords; also, updated some typedfield names to exactly mirror the element names in the XML schema