diff --git a/checkin_notes b/checkin_notes
index 4ef5c8b8fa..7c480471fc 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8441,3 +8441,11 @@ David  6 Aug 2006
 
     client/
         cpu_sched.C
+
+David  6 Aug 2006
+    - renamed schedule_result() to get_task()
+
+    client/
+        client_state.h
+        cpu_sched.C
+        cs_apps.C
diff --git a/client/client_state.h b/client/client_state.h
index e05d59cfab..d91a885c53 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -320,7 +320,7 @@ private:
     bool start_apps();
     bool handle_finished_apps();
 public:
-    int schedule_result(RESULT*);
+    ACTIVE_TASK* get_task(RESULT*);
 
 // --------------- cs_benchmark.C:
 public:
diff --git a/client/cpu_sched.C b/client/cpu_sched.C
index c4b8f07aaa..e0e05055bf 100644
--- a/client/cpu_sched.C
+++ b/client/cpu_sched.C
@@ -614,7 +614,8 @@ bool CLIENT_STATE::enforce_schedule() {
             run_task = true;
         }
         if (run_task) {
-            schedule_result(rp);
+            atp = get_task(rp);
+            atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
             nrunning++;
         }
     }
@@ -635,7 +636,8 @@ bool CLIENT_STATE::enforce_schedule() {
     for (i=0; i<results.size(); i++) {
         RESULT* rp = results[i];
         if (rp->project->non_cpu_intensive && rp->runnable()) {
-            schedule_result(rp);
+            atp = get_task(rp);
+            atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
         }
     }
 
diff --git a/client/cs_apps.C b/client/cs_apps.C
index b298f1aa2f..1cb75cf358 100644
--- a/client/cs_apps.C
+++ b/client/cs_apps.C
@@ -222,7 +222,7 @@ int CLIENT_STATE::input_files_available(RESULT* rp, bool verify) {
 
 // if there's not an active task for the result, make one
 //
-int CLIENT_STATE::schedule_result(RESULT* rp) {
+ACTIVE_TASK* CLIENT_STATE::get_task(RESULT* rp) {
     ACTIVE_TASK *atp = lookup_active_task_by_result(rp);
     if (!atp) {
         atp = new ACTIVE_TASK;
@@ -230,8 +230,7 @@ int CLIENT_STATE::schedule_result(RESULT* rp) {
         atp->init(rp);
         active_tasks.active_tasks.push_back(atp);
     }
-    atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
-    return 0;
+    return atp;
 }