rename some data stores
cleanup
rename other data stores