Rename persistence to datastore