Fixed xml naming problems