@@ -1219,12 +1219,12 @@
     (if (number? ovr-deadtime)(set! deadtime ovr-deadtime))
     
     ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
     ;;
     ;; HOWEVER: this code in run:test seems to work fine
-    ;;              (> (- (current-seconds)(+ (db:test-event_time testdat)
-    ;;                     (db:test-run_duration testdat)))
+    ;;              (> (- (current-seconds)(+ (dbr:test-event_time testdat)
+    ;;                     (dbr:test-run_duration testdat)))
     ;;                    600) 
     (db:delay-if-busy dbdat)
     (sqlite3:for-each-row 
      (lambda (test-id run-dir uname testname item-path)
        (if (and (equal? uname "n/a")
@@ -1278,12 +1278,12 @@
     (if (number? ovr-deadtime)(set! deadtime ovr-deadtime))
     
     ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
     ;;
     ;; HOWEVER: this code in run:test seems to work fine
-    ;;              (> (- (current-seconds)(+ (db:test-event_time testdat)
-    ;;                     (db:test-run_duration testdat)))
+    ;;              (> (- (current-seconds)(+ (dbr:test-event_time testdat)
+    ;;                     (dbr:test-run_duration testdat)))
     ;;                    600) 
     (db:delay-if-busy dbdat)
     (sqlite3:for-each-row 
      (lambda (test-id run-dir uname testname item-path)
        (if (and (equal? uname "n/a")
@@ -3149,15 +3149,15 @@
 		  (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name 
 			       ", item-path " item-path " results: " (intersperse results "\n"))
 		  ;; Keep only the youngest of any test/item combination
 		  (for-each 
 		   (lambda (testdat)
-		     (let* ((full-testname (conc (db:test-testname testdat) "/" (db:test-item-path testdat)))
+		     (let* ((full-testname (conc (dbr:test-testname testdat) "/" (dbr:test-item-path testdat)))
 			    (stored-test   (hash-table-ref/default tests-hash full-testname #f)))
 		       (if (or (not stored-test)
 			       (and stored-test
-				    (> (db:test-event_time testdat)(db:test-event_time stored-test))))
+				    (> (dbr:test-event_time testdat)(dbr:test-event_time stored-test))))
 			   ;; this test is younger, store it in the hash
 			   (hash-table-set! tests-hash full-testname testdat))))
 		   results)
 		  (if (null? tal)
 		      (map cdr (hash-table->alist tests-hash)) ;; return a list of the most recent tests
@@ -3343,14 +3343,14 @@
 		 (ever-seen         #f)
 		 (parent-waiton-met #f)
 		 (item-waiton-met   #f))
 	     (for-each 
 	      (lambda (test)
-		;; (if (equal? waitontest-name (db:test-testname test)) ;; by defintion this had better be true ...
-		(let* ((state             (db:test-state test))
-		       (status            (db:test-status test))
-		       (item-path         (db:test-item-path test))
+		;; (if (equal? waitontest-name (dbr:test-testname test)) ;; by defintion this had better be true ...
+		(let* ((state             (dbr:test-state test))
+		       (status            (dbr:test-status test))
+		       (item-path         (dbr:test-item-path test))
 		       (is-completed      (equal? state "COMPLETED"))
 		       (is-running        (equal? state "RUNNING"))
 		       (is-killed         (equal? state "KILLED"))
 		       (is-ok             (member status '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))
 		       ;;                                       testname-b    path-a    path-b