diff --git a/client/sim.cpp b/client/sim.cpp
index 24535354b2..8298fe437b 100644
--- a/client/sim.cpp
+++ b/client/sim.cpp
@@ -68,7 +68,7 @@ int line_limit = 1000000;
 SIM_RESULTS sim_results;
 
 void SIM_PROJECT::update_dcf_stats(RESULT* rp) {
-    double raw_ratio = rp->final_cpu_time/rp->estimated_cpu_time_uncorrected();
+    double raw_ratio = rp->final_cpu_time/rp->estimated_duration_uncorrected();
     // see http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Algorithm_III
     ++completed_task_count;
     double delta = raw_ratio - completions_ratio_mean;
@@ -162,7 +162,7 @@ void CLIENT_STATE::handle_completed_results() {
 void CLIENT_STATE::get_workload(vector<IP_RESULT>& ip_results) {
     for (unsigned int i=0; i<results.size(); i++) {
         RESULT* rp = results[i];
-        double x = rp->estimated_cpu_time_remaining(false);
+        double x = rp->estimated_time_remaining(false);
         if (x == 0) continue;
         IP_RESULT ipr(rp->name, rp->report_deadline, x);
         ip_results.push_back(ipr);
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index bd7c6c634e..a9ced326a7 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -392,7 +392,7 @@ bool CLIENT_STATE::compute_work_requests() {
             for (unsigned int j=0; j<results.size(); j++) {
                 RESULT* rp = results[j];
                 if (rp->project != p) continue;
-                d += rp->estimated_duration_remaining(true);
+                d += rp->estimated_time_remaining(true);
             }
             double rrs = p->resource_share/trs;
             double minq = total_buf*rrs;