KVStore key namespacing change, misc