Update references to the new KeyValueStore hierarchy