Index: trunk/cmd/suika-znc-import/main.go
===================================================================
--- trunk/cmd/suika-znc-import/main.go	(revision 801)
+++ trunk/cmd/suika-znc-import/main.go	(revision 804)
@@ -17,8 +17,8 @@
 )
 
-const usage = `usage: soju-znc-import [options...] <znc config path>
+const usage = `usage: suika-znc-import [options...] <znc config path>
 
 Imports configuration from a ZNC file. Users and networks are merged if they
-already exist in the soju database. ZNC settings overwrite existing soju
+already exist in the suika database. ZNC settings overwrite existing suika
 settings.
 
@@ -26,5 +26,5 @@
 
   -help             Show this help message
-  -config <path>    Path to soju config file
+  -config <path>    Path to suika config file
   -user <username>  Limit import to username (may be specified multiple times)
   -network <name>   Limit import to network (may be specified multiple times)
@@ -65,5 +65,5 @@
 	ctx := context.Background()
 
-	db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+	db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
 	if err != nil {
 		log.Fatalf("failed to open database: %v", err)
@@ -87,5 +87,5 @@
 		log.Fatalf("failed to list users in DB: %v", err)
 	}
-	existingUsers := make(map[string]*soju.User, len(l))
+	existingUsers := make(map[string]*suika.User, len(l))
 	for i, u := range l {
 		existingUsers[u.Username] = &l[i]
@@ -108,5 +108,5 @@
 		} else {
 			// "!!" is an invalid crypt format, thus disables password auth
-			u = &soju.User{Username: username, Password: "!!"}
+			u = &suika.User{Username: username, Password: "!!"}
 			usersCreated++
 			log.Printf("user %q: creating new user", username)
@@ -124,5 +124,5 @@
 			log.Fatalf("failed to list networks for user %q: %v", username, err)
 		}
-		existingNetworks := make(map[string]*soju.Network, len(l))
+		existingNetworks := make(map[string]*suika.Network, len(l))
 		for i, n := range l {
 			existingNetworks[n.GetName()] = &l[i]
@@ -176,5 +176,5 @@
 				logger.Printf("updating existing network")
 			} else {
-				n = &soju.Network{Name: netName}
+				n = &suika.Network{Name: netName}
 				logger.Printf("creating new network")
 			}
@@ -195,5 +195,5 @@
 				logger.Fatalf("failed to list channels: %v", err)
 			}
-			existingChannels := make(map[string]*soju.Channel, len(l))
+			existingChannels := make(map[string]*suika.Channel, len(l))
 			for i, ch := range l {
 				existingChannels[ch.Name] = &l[i]
@@ -214,5 +214,5 @@
 					logger.Printf("channel %q: updating existing channel", chName)
 				} else {
-					ch = &soju.Channel{Name: chName}
+					ch = &suika.Channel{Name: chName}
 					logger.Printf("channel %q: creating new channel", chName)
 				}
@@ -233,5 +233,5 @@
 
 	if usersCreated > 0 {
-		log.Printf("warning: user passwords haven't been imported, please set them with `sojuctl change-password <username>`")
+		log.Printf("warning: user passwords haven't been imported, please set them with `suikactl change-password <username>`")
 	}
 
Index: trunk/cmd/suika/main.go
===================================================================
--- trunk/cmd/suika/main.go	(revision 801)
+++ trunk/cmd/suika/main.go	(revision 804)
@@ -60,5 +60,5 @@
 )
 
-func loadConfig() (*config.Server, *soju.Config, error) {
+func loadConfig() (*config.Server, *suika.Config, error) {
 	var raw *config.Server
 	if configPath != "" {
@@ -89,5 +89,5 @@
 	}
 
-	cfg := &soju.Config{
+	cfg := &suika.Config{
 		Hostname:        raw.Hostname,
 		Title:           raw.Title,
@@ -124,5 +124,5 @@
 	}
 
-	db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+	db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
 	if err != nil {
 		log.Fatalf("failed to open database: %v", err)
@@ -138,7 +138,7 @@
 	}
 
-	srv := soju.NewServer(db)
+	srv := suika.NewServer(db)
 	srv.SetConfig(serverCfg)
-	srv.Logger = soju.NewLogger(log.Writer(), debug)
+	srv.Logger = suika.NewLogger(log.Writer(), debug)
 
 	for _, listen := range cfg.Listen {
@@ -242,5 +242,5 @@
 		case "ident":
 			if srv.Identd == nil {
-				srv.Identd = soju.NewIdentd()
+				srv.Identd = suika.NewIdentd()
 			}
 
@@ -316,5 +316,5 @@
 	}
 
-	if db, ok := db.(soju.MetricsCollectorDatabase); ok && srv.MetricsRegistry != nil {
+	if db, ok := db.(suika.MetricsCollectorDatabase); ok && srv.MetricsRegistry != nil {
 		srv.MetricsRegistry.MustRegister(db.MetricsCollector())
 	}
@@ -345,5 +345,5 @@
 }
 
-func proxyProtoListener(ln net.Listener, srv *soju.Server) net.Listener {
+func proxyProtoListener(ln net.Listener, srv *suika.Server) net.Listener {
 	return &proxyproto.Listener{
 		Listener: ln,
Index: trunk/cmd/suikactl/main.go
===================================================================
--- trunk/cmd/suikactl/main.go	(revision 801)
+++ trunk/cmd/suikactl/main.go	(revision 804)
@@ -16,5 +16,5 @@
 )
 
-const usage = `usage: sojuctl [-config path] <action> [options...]
+const usage = `usage: suikactl [-config path] <action> [options...]
 
   create-user <username> [-admin]  Create a new user
@@ -45,5 +45,5 @@
 	}
 
-	db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+	db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
 	if err != nil {
 		log.Fatalf("failed to open database: %v", err)
@@ -74,5 +74,5 @@
 		}
 
-		user := soju.User{
+		user := suika.User{
 			Username: username,
 			Password: string(hashed),
