@@ -216,16 +216,16 @@
 	 (c2    (map string->number (string-split color2)))
 	 (delta (map (lambda (a b)(abs (- a b))) c1 c2)))
     (null? (filter (lambda (x)(> x 3)) delta))))
 
 (define (compare-tests test1 test2)
-  (let* ((test-name1  (db:test-get-testname  test1))
-	 (item-path1  (db:test-get-item-path test1))
-	 (eventtime1  (db:test-get-event_time test1))
-	 (test-name2  (db:test-get-testname  test2))
-	 (item-path2  (db:test-get-item-path test2))
-	 (eventtime2  (db:test-get-event_time test2))
+  (let* ((test-name1  (db:test-testname  test1))
+	 (item-path1  (db:test-item-path test1))
+	 (eventtime1  (db:test-event_time test1))
+	 (test-name2  (db:test-testname  test2))
+	 (item-path2  (db:test-item-path test2))
+	 (eventtime2  (db:test-event_time test2))
 	 (same-name   (equal? test-name1 test-name2))
 	 (test1-top   (equal? item-path1 ""))
 	 (test2-top   (equal? item-path2 ""))
 	 (test1-older (> eventtime1 eventtime2))
 	 (same-time   (equal? eventtime1 eventtime2)))			 
@@ -388,12 +388,12 @@
 
 ;; 
 (define (get-itemized-tests test-dats)
   (let ((tnames '()))
     (for-each (lambda (tdat)
-		(let ((tname (vector-ref tdat 0))  ;; (db:test-get-testname tdat))
-		      (ipath (vector-ref tdat 1))) ;; (db:test-get-item-path tdat)))
+		(let ((tname (vector-ref tdat 0))  ;; (db:test-testname tdat))
+		      (ipath (vector-ref tdat 1))) ;; (db:test-item-path tdat)))
 		  (if (not (equal? ipath ""))
 		      (if (and (list? tnames)
 			       (string? tname)
 			       (not (member tname tnames)))
 			  (set! tnames (append tnames (list tname)))))))
@@ -410,12 +410,12 @@
 	(let* ((tnames   '())                ;; list of names used to reserve order
 	       (tests    (make-hash-table))  ;; hash of lists, used to build as we go
 	       (itemized (get-itemized-tests test-dats)))
 	  (for-each 
 	   (lambda (testdat)
-	     (let* ((tname (vector-ref testdat 0))  ;; db:test-get-testname testdat))
-		    (ipath (vector-ref testdat 1))) ;; db:test-get-item-path testdat)))
+	     (let* ((tname (vector-ref testdat 0))  ;; db:test-testname testdat))
+		    (ipath (vector-ref testdat 1))) ;; db:test-item-path testdat)))
 	       ;;   (seen  (hash-table-ref/default tests tname #f)))
 	       (if (not (member tname tnames))
 		   (if (or (and (eq? priority 'itempath)
 				(not (equal? ipath "")))
 			   (and (eq? priority 'testname)
@@ -510,17 +510,17 @@
 							(lambda (x)(equal? (test:test-get-fullname x) testname))
 							testsdat)))
 					 (if (null? matching)
 					     (vector -1 -1 "" "" "" 0 "" "" 0 "" "" "" 0 "" "")
 					     (car matching))))
-			   (testname   (db:test-get-testname  test))
-			   (itempath   (db:test-get-item-path test))
+			   (testname   (db:test-testname  test))
+			   (itempath   (db:test-item-path test))
 			   (testfullname (test:test-get-fullname test))
-			   (teststatus (db:test-get-status   test))
-			   (teststate  (db:test-get-state    test))
-			   ;;(teststart  (db:test-get-event_time test))
-			   ;;(runtime    (db:test-get-run_duration test))
+			   (teststatus (db:test-status   test))
+			   (teststate  (db:test-state    test))
+			   ;;(teststart  (db:test-event_time test))
+			   ;;(runtime    (db:test-run_duration test))
 			   (buttontxt  (cond
 					((member teststate '("COMPLETED" "ARCHIVED")) teststatus)
 					((and (equal? teststate "NOT_STARTED")
 					      (member teststatus '("ZERO_ITEMS" "BLOCKED" "PREQ_FAIL" "PREQ_DISCARDED" "TIMED_OUT" "KEEP_TRYING" "TEN_STRIKES")))
 					 teststatus)
@@ -1452,12 +1452,12 @@
 				       #:expand "HORIZONTAL"
 				       #:fontsize "10" 
 				       #:action (lambda (x)
 						  (let* ((toolpath (car (argv)))
 							 (buttndat (hash-table-ref *buttondat* button-key))
-							 (test-id  (db:test-get-id (vector-ref buttndat 3)))
-							 (run-id   (db:test-get-run_id (vector-ref buttndat 3)))
+							 (test-id  (db:test-id (vector-ref buttndat 3)))
+							 (run-id   (db:test-run_id (vector-ref buttndat 3)))
 							 (cmd  (conc toolpath " -test " run-id "," test-id "&")))
 					;(print "Launching " cmd)
 						    (system cmd))))))
 	  (hash-table-set! *buttondat* button-key (vector 0 "100 100 100" button-key #f #f)) 
 	  (vector-set! testvec testnum butn)