Renaming options integrated into xml parse/save