@@ -247,22 +247,22 @@
 
 ;;======================================================================
 ;;
 ;;======================================================================
 (define (examine-test db test-id) ;; run-id run-key origtest)
-  (let* ((testdat       (rdb:get-test-data-by-id db test-id))
+  (let* ((testdat       (db:get-test-info-by-id db test-id))
 	 (db-path       (conc *toppath* "/megatest.db"))
 	 (db-mod-time   0) ;; (file-modification-time db-path))
 	 (last-update   0) ;; (current-seconds))
 	 (request-update #t))
     (if (not testdat)
 	(begin
 	  (debug:print 0 "ERROR: No test data found for test " test-id ", exiting")
 	  (exit 1))
 	(let* ((run-id        (if testdat (db:test-get-run_id testdat) #f))
-	       (keydat        (if testdat (rdb:get-key-val-pairs db run-id) #f))
-	       (rundat        (if testdat (rdb:get-run-info db run-id) #f))
+	       (keydat        (if testdat (db:get-key-val-pairs db run-id) #f))
+	       (rundat        (if testdat (db:get-run-info db run-id) #f))
 	       (runname       (if testdat (db:get-value-by-header (db:get-row rundat)
 								  (db:get-header rundat)
 								  "runname") #f))
 					;(teststeps     (if testdat (db:get-steps-for-test db test-id) #f))
 	       (logfile       "/this/dir/better/not/exist")
@@ -297,11 +297,11 @@
 	       (refreshdat (lambda ()
 			     (let* ((curr-mod-time (file-modification-time db-path))
 				    (need-update   (or (and (> curr-mod-time db-mod-time)
 							    (> (current-seconds) (+ last-update 2))) ;; every two seconds if db touched
 						       request-update))
-				    (newtestdat (if need-update (rdb:get-test-data-by-id db test-id))))
+				    (newtestdat (if need-update (db:get-test-info-by-id db test-id))))
 			       (cond
 				((and need-update newtestdat)
 				 (set! testdat newtestdat)
 				 (set! teststeps    (rdb:get-steps-for-test db test-id))
 				 (set! logfile      (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))