diff --git a/test_fib_matching/README.md b/test_fib_matching/README.md
index 49d5c16..66130b3 100644
--- a/test_fib_matching/README.md
+++ b/test_fib_matching/README.md
@@ -7,7 +7,7 @@
 
 ## Description ##
 
-This test case will run NFD, ndn-traffic, and ndn-traffic-server to test NFD's FIB matching mechanism.
+This test case will run NFD, ndn-traffic-client, and ndn-traffic-server to test NFD's FIB matching mechanism.
 
 ## Steps ##
 
@@ -16,16 +16,16 @@
 3.  Start ndn-traffic-server to serve /A with Content "A" with FreshnessPeriod=10ms.
 4.  Start ndn-traffic-server to serve /A/B/C with Content "C" with FreshnessPeriod=10ms.
 5.  Start ndn-traffic-server to serve /D/E with Content "E" with FreshnessPeriod=10ms.
-6.  Invoke ndn-traffic to request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+6.  Invoke ndn-traffic-client to request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 7.  Wait 100ms.
-8.  Invoke ndn-traffic to request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+8.  Invoke ndn-traffic-client to request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 9.  Wait 100ms.
-10. Invoke ndn-traffic to request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+10. Invoke ndn-traffic-client to request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 11. Wait 100ms.
-12. Invoke ndn-traffic to request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+12. Invoke ndn-traffic-client to request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 13. Wait 100ms.
-14. Invoke ndn-traffic to request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+14. Invoke ndn-traffic-client to request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 15. Wait 100ms.
-16. Invoke ndn-traffic to request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
+16. Invoke ndn-traffic-client to request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
 17. Wait 100ms.
-18. Invoke ndn-traffic to request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received content is not "C".
+18. Invoke ndn-traffic-client to request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received content is not "C".
diff --git a/test_fib_matching/fib-matching-test.sh b/test_fib_matching/fib-matching-test.sh
index d313d04..bc4b465 100755
--- a/test_fib_matching/fib-matching-test.sh
+++ b/test_fib_matching/fib-matching-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)
 }
 
@@ -29,7 +29,7 @@
 
 # A: Request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 echo "Starting Traffic Client 1 (Prefix=/F, MustBeFresh=true, ExpectedContent=Z)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-1.conf &> $workdir/logs/client-1.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-1.conf &> $workdir/logs/client-1.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 1. Actual: $outcode"
@@ -43,7 +43,7 @@
 
 # A: Request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A"
 echo "Starting Traffic Client 2 (Prefix=/A, MustBeFresh=true, ExpectedContent=A)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-2.conf &> $workdir/logs/client-2.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-2.conf &> $workdir/logs/client-2.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 2. Actual: $outcode"
@@ -57,7 +57,7 @@
 
 # A: Request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 echo "Starting Traffic Client 3 (Prefix=/a, MustBeFresh=true, ExpectedContent=Z)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-3.conf &> $workdir/logs/client-3.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-3.conf &> $workdir/logs/client-3.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 3. Actual: $outcode"
@@ -71,7 +71,7 @@
 
 # A: Request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 echo "Starting Traffic Client 4 (Prefix=/A/B, MustBeFresh=true, ExpectedContent=A)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-4.conf &> $workdir/logs/client-4.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-4.conf &> $workdir/logs/client-4.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 4. Actual: $outcode"
@@ -85,7 +85,7 @@
 
 # A: Request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 echo "Starting Traffic Client 5 (Prefix=/A/B/G, MustBeFresh=true, ExpectedContent=A)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-5.conf &> $workdir/logs/client-5.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-5.conf &> $workdir/logs/client-5.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 5. Actual: $outcode"
@@ -99,7 +99,7 @@
 
 # A: Request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
 echo "Starting Traffic Client 6 (Prefix=/A/B/C, MustBeFresh=true, ExpectedContent=C)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-6.conf &> $workdir/logs/client-6.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-6.conf &> $workdir/logs/client-6.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 6. Actual: $outcode"
@@ -114,7 +114,7 @@
 # A: Request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received
 # content is not "C".
 echo "Starting Traffic Client 7 (Prefix=/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z, MustBeFresh=true, ExpectedContent=C)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-7.conf &> $workdir/logs/client-7.log
+ndn-traffic-client -c 1 $workdir/test-traffic-client-7.conf &> $workdir/logs/client-7.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
   echo "Received non-zero exit code from Traffic Client 7. Actual: $outcode"