diff --git a/cmd/abci-cli/abci-cli.go b/cmd/abci-cli/abci-cli.go
index 5204137ce..4dc5e96e3 100644
--- a/cmd/abci-cli/abci-cli.go
+++ b/cmd/abci-cli/abci-cli.go
@@ -682,10 +682,10 @@ func cmdKVStore(cmd *cobra.Command, args []string) error {
 	// Create the application - in memory or persisted to disk
 	var app types.Application
 	if flagPersist == "" {
-		app = kvstore.NewDummyApplication()
+		app = kvstore.NewKVStoreApplication()
 	} else {
-		app = kvstore.NewPersistentDummyApplication(flagPersist)
-		app.(*kvstore.PersistentDummyApplication).SetLogger(logger.With("module", "kvstore"))
+		app = kvstore.NewPersistentKVStoreApplication(flagPersist)
+		app.(*kvstore.PersistentKVStoreApplication).SetLogger(logger.With("module", "kvstore"))
 	}
 
 	// Start the listener
diff --git a/example/kvstore/dummy.go b/example/kvstore/kvstore.go
similarity index 100%
rename from example/kvstore/dummy.go
rename to example/kvstore/kvstore.go
diff --git a/example/kvstore/dummy_test.go b/example/kvstore/kvstore_test.go
similarity index 100%
rename from example/kvstore/dummy_test.go
rename to example/kvstore/kvstore_test.go
diff --git a/example/kvstore/persistent_dummy.go b/example/kvstore/persistent_kvstore.go
similarity index 100%
rename from example/kvstore/persistent_dummy.go
rename to example/kvstore/persistent_kvstore.go