@@ -204,21 +204,21 @@
     (iup:frame
      #:title "Set fields"
      (iup:vbox
       (iup:hbox (iup:label "Comment:")
 		(iup:textbox #:action (lambda (val a b)
-					(cdb:run-remote db:test-set-state-status-by-id #f test-id #f #f b)
+					(cdb:remote-run db:test-set-state-status-by-id #f 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)
-								    (cdb:run-remote db:test-set-state-status-by-id #f test-id state #f #f)
+								    (cdb:remote-run db:test-set-state-status-by-id #f 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)
@@ -234,11 +234,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)
-								    (cdb:run-remote db:test-set-state-status-by-id #f test-id #f status #f)
+								    (cdb:remote-run db:test-set-state-status-by-id #f 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)
@@ -254,11 +254,11 @@
 
 ;;======================================================================
 ;;
 ;;======================================================================
 (define (examine-test test-id) ;; run-id run-key origtest)
-  (let* ((testdat       (cdb:run-remote db:get-test-info-by-id #f test-id))
+  (let* ((testdat       (cdb:remote-run db:get-test-info-by-id #f 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)
 	 (db             #f))
@@ -265,22 +265,22 @@
     (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 (cdb:run-remote db:get-key-val-pairs #f run-id) #f))
-	       (rundat        (if testdat (cdb:run-remote db:get-run-info #f run-id) #f))
+	       (keydat        (if testdat (cdb:remote-run db:get-key-val-pairs #f run-id) #f))
+	       (rundat        (if testdat (cdb:remote-run db:get-run-info #f 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 (cdb:run-remote db:testmeta-get-record #f testname)))
+				  (let ((tm (cdb:remote-run db:testmeta-get-record #f testname)))
 				    (if tm tm (make-db:testmeta)))
 				  (make-db:testmeta)))
 
 	       (keystring  (string-intersperse 
 			    (map (lambda (keyval)
@@ -305,11 +305,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 (open-run-close db:get-test-info-by-id db test-id))))
+				    (newtestdat (if need-update (cdb:remote-run db:get-test-info-by-id #f test-id))))
 			       (cond
 				((and need-update newtestdat)
 				 (set! testdat newtestdat)
 				 (set! teststeps    (open-run-close db:get-steps-for-test db test-id))
 				 (set! logfile      (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))
@@ -466,11 +466,11 @@
 										       (db:test-data-get-tol      x)
 										       (db:test-data-get-status   x)
 										       (db:test-data-get-units    x)
 										       (db:test-data-get-type     x)
 										       (db:test-data-get-comment  x)))
-									     (open-run-close db:read-test-data db test-id "%")))
+									     (cdb:remote-run db:read-test-data #f test-id "%")))
 								       "\n")))
 							(if (not (equal? currval newval))
 							    (iup:attribute-set! test-data "VALUE" newval ))))) ;; "TITLE" newval)))))
 				   test-data)))
 			       )))