diff --git a/CHANGELOG.md b/CHANGELOG.md
index d21352c06..bece3471a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,11 +30,12 @@ BUG FIXES:
 BREAKING:
 - [genesis] rename `app_options` to `app_state`
 
-## 0.16.1 (TBD)
-
 IMPROVEMENTS:
 - [config] exposed `auth_enc` flag to enable/disable encryption
 - [p2p] when `auth_enc` is true, all dialed peers must have a node ID in their address
+- [all] renamed `dummy` (`persistent_dummy`) to `kvstore`
+  (`persistent_kvstore`) (name "dummy" is deprecated and will not work in
+  release after this one)
 
 ## 0.16.0 (February 20th, 2017)
 
diff --git a/proxy/client.go b/proxy/client.go
index 84efa4f49..6c987368a 100644
--- a/proxy/client.go
+++ b/proxy/client.go
@@ -65,8 +65,12 @@ func (r *remoteClientCreator) NewABCIClient() (abcicli.Client, error) {
 func DefaultClientCreator(addr, transport, dbDir string) ClientCreator {
 	switch addr {
 	case "kvstore":
+		fallthrough
+	case "dummy":
 		return NewLocalClientCreator(kvstore.NewKVStoreApplication())
 	case "persistent_kvstore":
+		fallthrough
+	case "persistent_dummy":
 		return NewLocalClientCreator(kvstore.NewPersistentKVStoreApplication(dbDir))
 	case "nilapp":
 		return NewLocalClientCreator(types.NewBaseApplication())