Add back optional name property.