Fix persisting of name