diff --git a/bin/run-benchmark.sh b/bin/run-benchmark.sh
index cfa9b10..e1a58af 100755
--- a/bin/run-benchmark.sh
+++ b/bin/run-benchmark.sh
@@ -10,8 +10,8 @@ fi
 host=$1; shift
 port=$1; shift
 
-flags="-c -p $port -O 10 -t 190"
-fbase="iperf-to-${host}"
+flags="-c ${host} -p $port -O 10 -t 190"
+fbase="iperf"
 
 if echo $host | grep -q ':'; then
     flags="$flags -6"
@@ -24,10 +24,10 @@ fi
 do_benchmark()
 {
     full_flags="$@"
-    iperf3_flags=$(echo $flags | sed 's/ //g')
+    iperf3_flags=$(echo $full_flags | sed 's/ //g')
     filename="${fbase}-${iperf3_flags}"
 
-    iperf3 $flags -P$p | tee "${filename}"
+    iperf3 $full_flags | tee "${filename}"
 
 }