diff --git a/test_ndntraffic/README.md b/test_ndntraffic/README.md
index 85384f0..e464abf 100644
--- a/test_ndntraffic/README.md
+++ b/test_ndntraffic/README.md
@@ -7,6 +7,6 @@
 
 ## Description ##
 
-This test case will run NFD, ndn-traffic, and ndn-traffic-server.
-This will report SUCCESS if one Interest/Data exchange is completed without any data inconsistency between ndn-traffic and ndn-traffic-server.
+This test case will run NFD, ndn-traffic-client, and ndn-traffic-server.
+This will report SUCCESS if one Interest/Data exchange is completed without any data inconsistency between ndn-traffic-client and ndn-traffic-server.
 Otherwise, it will fail.
diff --git a/test_ndntraffic/ndntraffic-test.sh b/test_ndntraffic/ndntraffic-test.sh
index 3f494cd..f5435f6 100755
--- a/test_ndntraffic/ndntraffic-test.sh
+++ b/test_ndntraffic/ndntraffic-test.sh
@@ -3,7 +3,7 @@
 
 clean_up() {
   r=$(sudo killall ndn-traffic-server 2>&1)
-  r=$(sudo killall ndn-traffic 2>&1)
+  r=$(sudo killall ndn-traffic-client 2>&1)
   r=$(sudo killall nfd 2>&1)
 }
 
@@ -20,12 +20,12 @@
 sleep 1
 
 # A: Run ndn-traffic
-echo "Running ndn-traffic on A..."
-ndn-traffic -c 1 $workdir/test-traffic-client.conf &> $workdir/logs/ndn-traffic.log
+echo "Running ndn-traffic-client on A..."
+ndn-traffic-client -c 1 $workdir/test-traffic-client.conf &> $workdir/logs/ndn-traffic-client.log
 exitcode=$?
 
 if [[ $exitcode -ne 0 ]]; then
-  echo "Received non-zero exit code from ndn-traffic - actual: $exitcode"
+  echo "Received non-zero exit code from ndn-traffic-client - actual: $exitcode"
   clean_up
   exit 1
 fi
diff --git a/test_ndntraffic/test_ndntraffic.py b/test_ndntraffic/test_ndntraffic.py
index e81c2cc..97b7a76 100644
--- a/test_ndntraffic/test_ndntraffic.py
+++ b/test_ndntraffic/test_ndntraffic.py
@@ -27,7 +27,7 @@
         ret = subprocess.call(["./ndntraffic-test.sh"], shell=True)
         print "Test script return  value:", ret
         errormsg = {
-            1 : "ndn-traffic did not receive a Data satisfying its Interest",
+            1 : "ndn-traffic-client did not receive a Data satisfying its Interest",
             2 : "ndn-traffic-server did not exit after sending a Data packet",
         }
         if (ret != 0):