diff --git a/docs/benchmarks.rst b/docs/benchmarks.rst
index e01e6e4ba..d0b71428f 100644
--- a/docs/benchmarks.rst
+++ b/docs/benchmarks.rst
@@ -1,7 +1,7 @@
 Benchmarks
 ======================
 
-Do we really need the benchmark? People always use benchmark to compare systems. But benchmarks are misleading. The resources, e.g., CPU, disk, memory, network, all matter a lot. And with Weed File System, single node vs multiple nodes, benchmarking on one machine vs several multiple machines, all matter a lot.
+Do we really need the benchmark? People always use benchmark to compare systems. But benchmarks are misleading. The resources, e.g., CPU, disk, memory, network, all matter a lot. And with Seaweed File System, single node vs multiple nodes, benchmarking on one machine vs several multiple machines, all matter a lot.
 
 Here is the steps on how to run benchmark if you really need some numbers.
 
@@ -38,7 +38,22 @@ Many options are options are configurable. Please check the help content:
 Common Problems
 ###############################
 
-The most common problem is "too many open files" error. This is because the test itself starts too many network connections on one single machine. In my local macbook, if I ran "random read" following writing right away, the error happens always. I have to run "weed benchmark -write=false" to run the reading test only. Also, changing the concurrency level to "-c=16" would also help.
+The most common
+I start weed servers in one console for simplicity. Better run servers on different consoles.
+
+For more realistic tests, please start them on different machines.
+
+.. code-block:: bash
+
+  # prepare directories
+  mkdir 3 4 5
+  # start 3 servers
+  ./weed server -dir=./3 -master.port=9333 -volume.port=8083 &
+  ./weed volume -dir=./4 -port=8084 &
+  ./weed volume -dir=./5 -port=8085 &
+  ./weed benchmark -server=localhost:9333
+
+ problem is "too many open files" error. This is because the test itself starts too many network connections on one single machine. In my local macbook, if I ran "random read" following writing right away, the error happens always. I have to run "weed benchmark -write=false" to run the reading test only. Also, changing the concurrency level to "-c=16" would also help.
 
 My own unscientific single machine results
 ###################################################
diff --git a/docs/directories.rst b/docs/directories.rst
index 787c7a2ab..aa14da4f7 100644
--- a/docs/directories.rst
+++ b/docs/directories.rst
@@ -1,7 +1,7 @@
 Directories and files
 ===========================
 
-When talking about file systems, many people would assume directories, list files under a directory, etc. These are expected if we want to hook up Weed File System with linux by FUSE, or with Hadoop, etc.
+When talking about file systems, many people would assume directories, list files under a directory, etc. These are expected if we want to hook up Seaweed File System with linux by FUSE, or with Hadoop, etc.
 
 Sample usage
 #####################
diff --git a/docs/failover.rst b/docs/failover.rst
index f244918d8..506a33e3b 100644
--- a/docs/failover.rst
+++ b/docs/failover.rst
@@ -7,7 +7,7 @@ Introduction
 
 Some user will ask for no single point of failure. Although google runs its file system with a single master for years, no SPOF seems becoming a criteria for architects to pick solutions.
 
-Luckily, it's not too difficult to enable Weed File System with failover master servers.
+Luckily, it's not too difficult to enable Seaweed File System with failover master servers.
 
 Cheat Sheet: Startup multiple servers
 ########################################
diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst
index 19eb130a7..ad28319fe 100644
--- a/docs/gettingstarted.rst
+++ b/docs/gettingstarted.rst
@@ -1,6 +1,6 @@
 Getting started
 ===================================
-Installing Weed-Fs
+Installing Seaweed-FS
 ###################################
 
 Download a proper version from  `Seaweed-FS download page <https://bintray.com/chrislusf/Weed-FS/weed/>`_.
@@ -57,7 +57,7 @@ Actually, forget about previous commands. You can setup one master server and on
 	# use "weed server -h" to find out more
 	./weed server -master.port=9333 -volume.port=8080 -dir="./data"
 
-Testing Weed-Fs
+Testing Seaweed-FS
 ###################################
 
 With the master and volume server up, now what? Let's pump in a lot of files into the system!
@@ -77,7 +77,7 @@ Then, you can simply check "du -m -s /some/big/folder" to see the actual disk us
 
 Now you can use your tools to hit weed-fs as hard as you can.
 
-Using Weed-Fs in docker
+Using Seaweed-FS in docker
 ####################################
 
 You can use image "cydev/weed" or build your own with  `dockerfile <https://github.com/chrislusf/weed-fs/blob/master/Dockerfile>`_  in the root of repo.
diff --git a/go/weed/fix.go b/go/weed/fix.go
index 9c8026448..e66075ed2 100644
--- a/go/weed/fix.go
+++ b/go/weed/fix.go
@@ -17,7 +17,7 @@ func init() {
 var cmdFix = &Command{
 	UsageLine: "fix -dir=/tmp -volumeId=234",
 	Short:     "run weed tool fix on index file if corrupted",
-	Long: `Fix runs the WeedFS fix command to re-create the index .idx file.
+	Long: `Fix runs the SeeweedFS fix command to re-create the index .idx file.
 
   `,
 }