@@ -1633,11 +1633,11 @@
 ;;       (apply cdb:client-call *runremote* 'immediate #f *default-numtries* open-run-close proc #f params)
 ;;       (begin
 ;; 	(debug:print 0 "ERROR: Attempt to access read-only database")
 ;; 	#f)))
 
-(define (rmt:roll-up-pass-fail-counts run-id test-name item-path status)
+(define (db:roll-up-pass-fail-counts db run-id test-name item-path status)
   (if (and (not (equal? item-path ""))
 	   (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP")))
       (begin
 	(db:general-call 'update-pass-fail-counts db (list run-id test-name run-id test-name))
 	(if (equal? status "RUNNING")
@@ -1693,11 +1693,11 @@
 	'(update-run-duration     "UPDATE tests SET run_duration=? WHERE id=?;")
 	'(update-uname-host       "UPDATE tests SET uname=?,host=? WHERE id=?;")
 	'(update-test-state       "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
 	'(update-test-status      "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
 	;; stuff for roll-up-pass-fail-counts
-	'(update-fail-pass-counts "UPDATE tests 
+	'(update-pass-fail-counts "UPDATE tests 
              SET fail_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status IN ('FAIL','CHECK')),
                  pass_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status IN ('PASS','WARN','WAIVED'))
              WHERE run_id=? AND testname=? AND item_path='';")
 	'(top-test-set-running  "UPDATE tests SET state='RUNNING' WHERE run_id=? AND testname=? AND item_path='';")
 	'(top-test-set-per-pf-counts "UPDATE tests