diff --git a/benchmark.go b/benchmark.go
index 36551f5ad..ca60341f0 100644
--- a/benchmark.go
+++ b/benchmark.go
@@ -129,7 +129,7 @@ func main() {
 	}
 
 	// Setup a logger to stdout and log file.
-	logFileName := fmt.Sprintf("./%v/%s-%v.log", *logFolder, role, *port)
+	logFileName := fmt.Sprintf("./%v/%s-%v-%v.log", *logFolder, role, *ip, *port)
 	h := log.MultiHandler(
 		log.StdoutHandler,
 		log.Must.FileHandler(logFileName, log.LogfmtFormat()), // Log to file
diff --git a/client/txgen/main.go b/client/txgen/main.go
index ba6f0018a..b1d049bf1 100644
--- a/client/txgen/main.go
+++ b/client/txgen/main.go
@@ -255,7 +255,7 @@ func main() {
 
 	// TODO(Richard): refactor this chuck to a single method
 	// Setup a logger to stdout and log file.
-	logFileName := fmt.Sprintf("./%v/tx-generator.log", *logFolder)
+	logFileName := fmt.Sprintf("./%v/txgen.log", *logFolder)
 	h := log.MultiHandler(
 		log.StdoutHandler,
 		log.Must.FileHandler(logFileName, log.LogfmtFormat()), // Log to file