improve variable names in xml parsing