Datastore naming fixes