Hack/fix to allow hyphen and underscore in element name to generate xml