diff --git a/server/server.go b/server/server.go
index 9c561e4..b20bd36 100644
--- a/server/server.go
+++ b/server/server.go
@@ -39,10 +39,7 @@ func Register(name string, con Constructor) {
 func New(cfg *chihaya.ServerConfig, tkr *tracker.Tracker) (Server, error) {
 	con, ok := constructors[cfg.Name]
 	if !ok {
-		return nil, fmt.Errorf(
-			"server: unknown Constructor %q (forgotten import?)",
-			cfg.Name,
-		)
+		return nil, fmt.Errorf("server: unknown Constructor %q (forgotten import?)", cfg.Name)
 	}
 	return con(cfg, tkr)
 }
diff --git a/server/store/client_store.go b/server/store/client_store.go
index 9cd2e98..0976acf 100644
--- a/server/store/client_store.go
+++ b/server/store/client_store.go
@@ -42,7 +42,7 @@ func RegisterClientStoreDriver(name string, driver ClientStoreDriver) {
 func OpenClientStore(cfg *DriverConfig) (ClientStore, error) {
 	driver, ok := clientStoreDrivers[cfg.Name]
 	if !ok {
-		return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
+		return nil, fmt.Errorf("store: unknown ClientStoreDriver %q (forgotten import?)", cfg)
 	}
 
 	return driver.New(cfg)
diff --git a/server/store/ip_store.go b/server/store/ip_store.go
index 209050a..3fea3a6 100644
--- a/server/store/ip_store.go
+++ b/server/store/ip_store.go
@@ -60,10 +60,10 @@ type IPStoreDriver interface {
 // it panics.
 func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
 	if driver == nil {
-		panic("store: could not register nil ClientStoreDriver")
+		panic("store: could not register nil IPStoreDriver")
 	}
 	if _, dup := ipStoreDrivers[name]; dup {
-		panic("store: could not register duplicate ClientStoreDriver: " + name)
+		panic("store: could not register duplicate IPStoreDriver: " + name)
 	}
 	ipStoreDrivers[name] = driver
 }
@@ -72,7 +72,7 @@ func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
 func OpenIPStore(cfg *DriverConfig) (IPStore, error) {
 	driver, ok := ipStoreDrivers[cfg.Name]
 	if !ok {
-		return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
+		return nil, fmt.Errorf("store: unknown IPStoreDriver %q (forgotten import?)", cfg)
 	}
 
 	return driver.New(cfg)
diff --git a/server/store/peer_store.go b/server/store/peer_store.go
index af97ed3..e2d4936 100644
--- a/server/store/peer_store.go
+++ b/server/store/peer_store.go
@@ -52,7 +52,7 @@ func RegisterPeerStoreDriver(name string, driver PeerStoreDriver) {
 func OpenPeerStore(cfg *DriverConfig) (PeerStore, error) {
 	driver, ok := peerStoreDrivers[cfg.Name]
 	if !ok {
-		return nil, fmt.Errorf("storage: unknown driver %q (forgotten import?)", cfg)
+		return nil, fmt.Errorf("storage: unknown PeerStoreDriver %q (forgotten import?)", cfg)
 	}
 
 	return driver.New(cfg)
diff --git a/server/store/string_store.go b/server/store/string_store.go
index a8c5200..ab2c992 100644
--- a/server/store/string_store.go
+++ b/server/store/string_store.go
@@ -42,7 +42,7 @@ func RegisterStringStoreDriver(name string, driver StringStoreDriver) {
 func OpenStringStore(cfg *DriverConfig) (StringStore, error) {
 	driver, ok := stringStoreDrivers[cfg.Name]
 	if !ok {
-		return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
+		return nil, fmt.Errorf("store: unknown StringStoreDriver %q (forgotten import?)", cfg)
 	}
 
 	return driver.New(cfg)