diff --git a/Makefile b/Makefile
index 1592160..ff50c9f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,15 @@ BUILD = `git show -s --pretty=format:%cI`
 GOARCH ?= amd64
 GOOS ?= linux
 
-all: toyohime-server
+all: yorihime
 
-toyohime-server:
-	${GO} build ${GOFLAGS} ./cmd/toyohime-server
+yorihime:
+	${GO} build ${GOFLAGS} ./cmd/yorihime
 clean:
-	rm toyohime-server
+	rm yorihime
 install:
-	install -m0755 toyohime-server $(PREFIX)/bin/toyohime-server
+	install -m0755 yorihime $(PREFIX)/bin/yorihime
 test:
 	${GO} test .
 uninstall:
-	rm -f $(PREFIX)/bin/toyohime-server
+	rm -f $(PREFIX)/bin/yorihime
diff --git a/README.md b/README.md
index e9e16b3..a491b37 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,8 @@ go get marisa.chaotic.ninja/toyohime
  - [GDDO Source Code Links](https://github.com/golang/gddo/wiki/Source-Code-Links)
  - [Custom Import Path Checking](https://docs.google.com/document/d/1jVFkZTcYbNLaTxXD9OcGfn7vYv5hWtPx9--lTx1gPMs/edit)
 
+## See also
+* [Yorihime](cmd/yorihime/README.md)
+
+
+(Both characters are from Touhou Project)
diff --git a/cmd/toyohime-server/README.md b/cmd/yorihime/README.md
similarity index 89%
rename from cmd/toyohime-server/README.md
rename to cmd/yorihime/README.md
index 12439db..04964db 100644
--- a/cmd/toyohime-server/README.md
+++ b/cmd/yorihime/README.md
@@ -1,11 +1,11 @@
-# vanityserver
+# Yorihime
 
 Runs a barebones vanity server over HTTP.
 
 ## Usage
 
 ```
-./vanityserver [-index] fqdn [repo file]
+./yorihime [-index] fqdn [repo file]
 ```
 
 The "-index" flag enables an index page at "/" that lists all repos hosted on
diff --git a/cmd/toyohime-server/dynamic_handler.go b/cmd/yorihime/dynamic_handler.go
similarity index 100%
rename from cmd/toyohime-server/dynamic_handler.go
rename to cmd/yorihime/dynamic_handler.go
diff --git a/cmd/toyohime-server/main.go b/cmd/yorihime/main.go
similarity index 97%
rename from cmd/toyohime-server/main.go
rename to cmd/yorihime/main.go
index 5c45928..ad335ad 100644
--- a/cmd/toyohime-server/main.go
+++ b/cmd/yorihime/main.go
@@ -3,7 +3,7 @@ Runs a barebones vanity server over HTTP.
 
 Usage
 
-  ./vanityserver [-index] [-nohealthz] fqdn [repo file]
+  ./yorihime [-index] [-nohealthz] fqdn [repo file]
 
 The "-index" flag enables an index page at "/" that lists all repos hosted on
 this server.
@@ -277,6 +277,7 @@ func main() {
 
 	srv := buildServer(h)
 
-	log.Printf("starting toyohime-server %v on port %v\n", toyohime.FullVersion(), *listenPort)
+	log.Printf("starting yorihime %v on port %v\n", toyohime.FullVersion(), *listenPort)
+	log.Println("gotta take care of those moon rabbits!")
 	log.Println(srv.ListenAndServe())
 }