Fixed name saving issue.