Adopted usage comments
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 2359dbb..7f82470 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -69,27 +69,27 @@
 #################################################
 
 set(check_programs
+	chargen_server_upcall.c
 	client.c
+	client_upcall.c
 	daytime_server.c
+	daytime_server_upcall.c
 	discard_server.c
+	discard_server_upcall.c
 	echo_server.c
+	echo_server_upcall.c
 	ekr_client.c
-	ekr_loop_offload.c
 	ekr_loop.c
+	ekr_loop_offload.c
+	ekr_loop_upcall.c
 	ekr_peer.c
 	ekr_server.c
 	http_client.c
+	http_client_upcall.c
 	rtcweb.c
 	test_libmgmt.c
 	test_timer.c
 	tsctp.c
-	http_client_upcall.c
-	client_upcall.c
-	discard_server_upcall.c
-	echo_server_upcall.c
-	chargen_server_upcall.c
-	daytime_server_upcall.c
-	ekr_loop_upcall.c
 )
 
 foreach (source_file ${check_programs})
diff --git a/programs/chargen_server_upcall.c b/programs/chargen_server_upcall.c
index b5ed7e5..fbf06a5 100644
--- a/programs/chargen_server_upcall.c
+++ b/programs/chargen_server_upcall.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Usage: daytime_server [local_encaps_port] [remote_encaps_port]
+ * Usage: chargen_server_upcall [local_encaps_port] [remote_encaps_port]
  */
 
 #ifdef _WIN32
diff --git a/programs/client_upcall.c b/programs/client_upcall.c
index bf0b698..fb1a079 100644
--- a/programs/client_upcall.c
+++ b/programs/client_upcall.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Usage: client remote_addr remote_port [local_port] [local_encaps_port] [remote_encaps_port]
+ * Usage: client_upcall remote_addr remote_port [local_port] [local_encaps_port] [remote_encaps_port]
  */
 
 #include <stdio.h>
diff --git a/programs/daytime_server_upcall.c b/programs/daytime_server_upcall.c
index f2d786b..c3855ba 100644
--- a/programs/daytime_server_upcall.c
+++ b/programs/daytime_server_upcall.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Usage: daytime_server [local_encaps_port] [remote_encaps_port]
+ * Usage: daytime_server_upcall [local_encaps_port] [remote_encaps_port]
  */
 
 #ifdef _WIN32
diff --git a/programs/discard_server_upcall.c b/programs/discard_server_upcall.c
index 53eb88d..16d4e46 100644
--- a/programs/discard_server_upcall.c
+++ b/programs/discard_server_upcall.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Usage: discard_server [local_encaps_port] [remote_encaps_port]
+ * Usage: discard_server_upcall [local_encaps_port] [remote_encaps_port]
  */
 
 #ifdef _WIN32
diff --git a/programs/echo_server_upcall.c b/programs/echo_server_upcall.c
index 02f9155..949cf1e 100644
--- a/programs/echo_server_upcall.c
+++ b/programs/echo_server_upcall.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Usage: discard_server [local_encaps_port] [remote_encaps_port]
+ * Usage: discard_server_upcall [local_encaps_port] [remote_encaps_port]
  */
 
 #ifdef _WIN32