Move name property over to data store