Fixed clashing names for 2nd stage xml parser and improved clean-up.