diff --git a/store/postgresql/postgresql.go b/store/cockroach/cockroach.go
similarity index 95%
rename from store/postgresql/postgresql.go
rename to store/cockroach/cockroach.go
index 84c07d58..0467954f 100644
--- a/store/postgresql/postgresql.go
+++ b/store/cockroach/cockroach.go
@@ -1,9 +1,10 @@
-// Package postgresql implements a micro Store backed by sql
-package postgresql
+// Package cockroach implements the cockroach store
+package cockroach
 
 import (
 	"database/sql"
 	"fmt"
+	"strings"
 	"time"
 	"unicode"
 
@@ -208,9 +209,12 @@ func New(opts ...store.Option) store.Store {
 		}
 	}
 
+	source := nodes[0]
+	if !strings.Contains(source, " ") {
+		source = fmt.Sprintf("host=%s", source)
+	}
 	// create source from first node
-	source := fmt.Sprintf("host=%s", nodes[0])
-	db, err := sql.Open("pq", source)
+	db, err := sql.Open("postgres", source)
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/store/postgresql/postgresql_test.go b/store/cockroach/cockroach_test.go
similarity index 98%
rename from store/postgresql/postgresql_test.go
rename to store/cockroach/cockroach_test.go
index 692aebeb..45948634 100644
--- a/store/postgresql/postgresql_test.go
+++ b/store/cockroach/cockroach_test.go
@@ -1,4 +1,4 @@
-package postgresql
+package cockroach
 
 import (
 	"database/sql"