@@ -197,21 +197,21 @@
     (iup:frame
      #:title "Set fields"
      (iup:vbox
       (iup:hbox (iup:label "Comment:")
 		(iup:textbox #:action (lambda (val a b)
-					(db:test-set-state-status-by-id *db* test-id #f #f b)
+					(rdb:test-set-state-status-by-id *db* test-id #f #f b)
 					(set! newcomment b))
 			     #:value (db:test-get-comment testdat)
 			     #:expand "HORIZONTAL"))
       (apply iup:hbox
 	     (iup:label "STATE:" #:size "30x")
 	     (let* ((btns  (map (lambda (state)
 				  (let ((btn (iup:button state
 							 #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10"
 							 #:action (lambda (x)
-								    (db:test-set-state-status-by-id *db* test-id state #f #f)
+								    (rdb:test-set-state-status-by-id *db* test-id state #f #f)
 								    (db:test-set-state! testdat state)))))
 				    btn))
 				(list "COMPLETED" "NOT_STARTED" "RUNNING" "REMOTEHOSTSTART" "KILLED" "KILLREQ"))))
 	       (vector-set! *state-status* 0
 			    (lambda (state color)
@@ -227,11 +227,11 @@
 	     (iup:label "STATUS:" #:size "30x")
 	     (let* ((btns  (map (lambda (status)
 				  (let ((btn (iup:button status
 							 #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10"
 							 #:action (lambda (x)
-								    (db:test-set-state-status-by-id *db* test-id #f status #f)
+								    (rdb:test-set-state-status-by-id *db* test-id #f status #f)
 								    (db:test-set-status! testdat status)))))
 				    btn))
 				(list  "PASS" "WARN" "FAIL" "CHECK" "n/a" "WAIVED"))))
 	       (vector-set! *state-status* 1
 			    (lambda (status color)
@@ -249,22 +249,22 @@
 ;;
 ;;======================================================================
 (define (examine-test db test-id) ;; run-id run-key origtest)
   (let* ((testdat       (db:get-test-data-by-id db test-id))
 	 (run-id        (if testdat (db:test-get-run_id testdat) #f))
-	 (keydat        (if testdat (keys:get-key-val-pairs db run-id) #f))
-	 (rundat        (if testdat (db:get-run-info db run-id) #f))
+	 (keydat        (if testdat (rdb:get-key-val-pairs db run-id) #f))
+	 (rundat        (if testdat (rdb: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")
 	 (rundir        logfile)
 	 (testfullname  (if testdat (db:test-get-fullname testdat) "Gathering data ..."))
 	 (testname      (if testdat (db:test-get-testname testdat) "n/a"))
 	 (testmeta      (if testdat 
-			    (let ((tm (db:testmeta-get-record db testname)))
+			    (let ((tm (rdb:testmeta-get-record db testname)))
 			      (if tm tm (make-db:testmeta)))
 			    (make-db:testmeta)))
 
 	 (keystring  (string-intersperse 
 		      (map (lambda (keyval)
@@ -285,16 +285,16 @@
 					    "")))
 			     (system (conc "cd " rundir 
 					   ";xterm -T \"" (string-translate testfullname "()" "  ") "\" " shell "&")))
 			   (message-window  (conc "Directory " rundir " not found")))))
 	 (refreshdat (lambda ()
-		       (let ((newtestdat (db:get-test-data-by-id db test-id)))
+		       (let ((newtestdat (rdb:get-test-data-by-id db test-id)))
 			 (if newtestdat 
 			     (begin
 			       ;(mutex-lock! mx1)
 			       (set! testdat newtestdat)
-			       (set! teststeps    (db:get-steps-for-test db test-id))
+			       (set! teststeps    (rdb:get-steps-for-test db test-id))
 			       (set! logfile      (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))
 			       (set! rundir       (db:test-get-rundir testdat))
 			       (set! testfullname (db:test-get-fullname testdat))
 			       ;(mutex-unlock! mx1)
 			       )
@@ -391,11 +391,11 @@
 				     #:size "60x100")))
 		   (hash-table-set! widgets "Test Steps" 
 				    (lambda (testdat)
 				      (let* ((currval (iup:attribute stepsdat "VALUE")) ;; "TITLE"))
 					     (fmtstr  "~20a~10a~10a~12a~15a~20a")
-					     (comprsteps (db:get-steps-table db test-id))
+					     (comprsteps (rdb:get-steps-table db test-id))
 					     (newval  (string-intersperse 
 						       (append
 							(list 
 							 (format #f fmtstr "Stepname" "Start" "End" "Status" "Time" "Logfile")
 							 (format #f fmtstr "========" "=====" "===" "======" "====" "======="))