diff --git a/tests/test-decode-Interest+Forwarding+Entry.html b/tests/test-decode-Interest+Forwarding+Entry.html
index 83c0849..4d033ff 100644
--- a/tests/test-decode-Interest+Forwarding+Entry.html
+++ b/tests/test-decode-Interest+Forwarding+Entry.html
@@ -363,10 +363,10 @@
 					output+= "<br />";
 				}
 				
-				if(forwardingEntry.ccndID!=null){
-					output+= "ccndID: ";
+				if(forwardingEntry.ndndID!=null){
+					output+= "ndndID: ";
 					
-					output+= forwardingEntry.ccndID;
+					output+= forwardingEntry.ndndID;
 					output+= "<br />";
 				}
 				
diff --git a/tests/test-get-async.html b/tests/test-get-async.html
index ede20af..7331b34 100644
--- a/tests/test-get-async.html
+++ b/tests/test-get-async.html
@@ -64,7 +64,7 @@
 
 	<form>
 		Please Enter an Interest:<br />
-		<input id="interest" type="text" name="INTEREST" size="50" value="/%C1.M.S.localhost/%C1.M.SRV/ccnd/KEY" /> 
+		<input id="interest" type="text" name="INTEREST" size="50" value="/%C1.M.S.localhost/%C1.M.SRV/ndnd/KEY" /> 
 	</form>
 
 	<button id="testBtn" onclick="run()">Fetch Content</button>
diff --git a/tests/test-throughput-ws-pipeline.html b/tests/test-throughput-ws-pipeline.html
index 0389583..95c3879 100644
--- a/tests/test-throughput-ws-pipeline.html
+++ b/tests/test-throughput-ws-pipeline.html
@@ -115,7 +115,7 @@
 	            if (segmentNumber != 0) {
 	                // Special case: Save this content object for later and request segment zero.
 	                // SWT: this should not happen in normal case; 
-	                //      ccnd should always return the first segment if no seg# is specified
+	                //      ndnd should always return the first segment if no seg# is specified
 	                this.firstReceivedContentObject = contentObject;
 	                var componentsForZero = contentObject.name.components.slice
 	                    (0, contentObject.name.components.length - 1);