diff --git a/cayley.go b/cayley.go
index 82d6ad7..b8c09ae 100644
--- a/cayley.go
+++ b/cayley.go
@@ -71,15 +71,15 @@ func main() {
 	case "init":
 		db.Init(cfg, *tripleFile)
 	case "load":
-		ts = db.OpenTSFrom(cfg)
+		ts = db.Open(cfg)
 		db.Load(ts, cfg, *tripleFile, false)
 		ts.Close()
 	case "repl":
-		ts = db.OpenTSFrom(cfg)
+		ts = db.Open(cfg)
 		db.Repl(ts, *queryLanguage, cfg)
 		ts.Close()
 	case "http":
-		ts = db.OpenTSFrom(cfg)
+		ts = db.Open(cfg)
 		http.Serve(ts, cfg)
 		ts.Close()
 	default:
diff --git a/db/init.go b/db/init.go
index ce0eb08..8efb863 100644
--- a/db/init.go
+++ b/db/init.go
@@ -32,7 +32,7 @@ func Init(cfg *config.Config, triplePath string) bool {
 		return true
 	}
 	if created && triplePath != "" {
-		ts := OpenTSFrom(cfg)
+		ts := Open(cfg)
 		Load(ts, cfg, triplePath, true)
 		ts.Close()
 	}
diff --git a/db/open.go b/db/open.go
index 71d86be..6997ba9 100644
--- a/db/open.go
+++ b/db/open.go
@@ -24,7 +24,7 @@ import (
 	"github.com/google/cayley/graph/mongo"
 )
 
-func OpenTSFrom(cfg *config.Config) graph.TripleStore {
+func Open(cfg *config.Config) graph.TripleStore {
 	glog.Infof("Opening database \"%s\" at %s", cfg.DatabaseType, cfg.DatabasePath)
 	switch cfg.DatabaseType {
 	case "mongo", "mongodb":