Fixed name saving and restoring