Align save format for XML with model name