diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index dfa83e3f09bc025ca20371ceafc22dee00c628f8..f24f8c297c626a49fd3bd87c03c569c50c6f2524 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -137,7 +137,7 @@ static volatile bool have_new_trickle_up = false;
 static volatile bool have_trickle_down = true;
     // on first call, scan slot dir for msgs
 static volatile int heartbeat_giveup_count;
-    // interrupt count value at which to give up on core client
+    // interrupt count value at which to give up on client
 #ifdef _WIN32
 static volatile int nrunning_ticks = 0;
 #endif
@@ -175,7 +175,7 @@ int app_min_checkpoint_period = 0;
     // to the client, and of checkpoint enabling.
 #define HEARTBEAT_GIVEUP_SECS 30
 #define HEARTBEAT_GIVEUP_COUNT ((int)(HEARTBEAT_GIVEUP_SECS/TIMER_PERIOD))
-    // quit if no heartbeat from core in this #interrupts
+    // quit if no heartbeat from client in this #interrupts
 #define LOCKFILE_TIMEOUT_PERIOD 35
     // quit if we cannot aquire slot lock file in this #secs after startup
 
@@ -356,7 +356,7 @@ double boinc_worker_thread_cpu_time() {
     return cpu;
 }
 
-// Communicate to the core client (via shared mem)
+// Communicate to the client (via shared mem)
 // the current CPU time and fraction done.
 // NOTE: various bugs could cause some of these FP numbers to be enormous,
 // possibly overflowing the buffer.
@@ -678,7 +678,7 @@ static void send_trickle_up_msg() {
     }
 }
 
-// NOTE: a non-zero status tells the core client that we're exiting with 
+// NOTE: a non-zero status tells the client that we're exiting with 
 // an "unrecoverable error", which will be reported back to server. 
 // A zero exit-status tells the client we've successfully finished the result.
 //
@@ -1131,7 +1131,7 @@ static void timer_handler() {
     if (!boinc_status.suspended) {
         running_interrupt_count++;
     }
-    // handle messages from the core client
+    // handle messages from the client
     //
     if (app_client_shm) {
         if (options.check_heartbeat) {
@@ -1160,7 +1160,7 @@ static void timer_handler() {
         }
     }
 
-    // see if the core client has died, which means we need to die too
+    // see if the client has died, which means we need to die too
     // (unless we're in a critical section)
     //
     if (in_critical_section==0 && options.check_heartbeat) {
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index b3643db06cb0b1e1d3a83a81c4f4905b866e8cba..f6a20989e32cd8ffcbaa0575a6f33d9243b806f7 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -264,10 +264,10 @@ void set_throttles(APP_INIT_DATA& aid, VBOX_VM& vm) {
 }
 
 // If the Floppy device has been specified, initialize its state so that
-// it contains the contents of the init_data.xml file.  In theory this
-// would allow network enabled VMs to know about proxy server configurations
-// either specified by the volunteer or automatically detected by the
-// core client.
+// it contains the contents of the init_data.xml file.
+// In theory this would allow network enabled VMs to know about
+// proxy server configurations either specified by the volunteer
+// or automatically detected by the client.
 //
 // CERN decided they only needed a small subset of the data and changed the
 // data format to 'name=value\n' pairs.  So if we are running under their
diff --git a/samples/wrapper/wrapper.cpp b/samples/wrapper/wrapper.cpp
index 37d8f13cb12b8cdabd39aa76873ef2a402815f27..79e754b64114ae91563347fd0979f9380a67dea6 100644
--- a/samples/wrapper/wrapper.cpp
+++ b/samples/wrapper/wrapper.cpp
@@ -21,7 +21,7 @@
 // Handles:
 // - suspend/resume/quit/abort
 // - reporting CPU time
-// - loss of heartbeat from core client
+// - loss of heartbeat from client
 // - checkpointing
 //      (at the level of task; or potentially within task)
 //