Fix saving names