Rename dict => kvs.