@@ -57,28 +57,18 @@
      db 
      (conc "SELECT " keystr " FROM runs WHERE runname like ? " key-patt ";")
      runnamepatt)
     (vector header res)))
 
-;; ;; TODO: Converge this with db:get-test-info
-;; (define (runs:get-test-info db run-id test-name item-path)
-;;   (let ((res #f)) ;; (vector #f #f #f #f #f #f)))
-;;     (sqlite3:for-each-row 
-;;      (lambda (id run-id test-name state status)
-;;        (set! res (vector id run-id test-name state status item-path)))
-;;      db "SELECT id,run_id,testname,state,status FROM tests WHERE run_id=? AND testname=? AND item_path=?;"
-;;      run-id test-name item-path)
-;;     res))
-
 (define (runs:test-get-full-path test)
   (let* ((testname (db:test-get-testname   test))
 	 (itempath (db:test-get-item-path test)))
     (conc testname (if (equal? itempath "") "" (conc "(" itempath ")")))))
 
 
 (define (set-megatest-env-vars db run-id)
-  (let ((keys (db-get-keys db)))
+  (let ((keys (rdb:get-keys db)))
     (for-each (lambda (key)
 		(sqlite3:for-each-row
 		 (lambda (val)
 		   (debug:print 2 "setenv " (key:get-fieldname key) " " val)
 		   (setenv (key:get-fieldname key) val))
@@ -168,11 +158,11 @@
 	  #f))))
 
 ;; This is a duplicate of run-tests (which has been deprecated). Use this one instead of run tests.
 ;; keyvals
 (define (runs:run-tests db target runname test-patts item-patts user flags)
-  (let* ((keys        (db-get-keys db))
+  (let* ((keys        (rdb:get-keys db))
 	 (keyvallst   (keys:target->keyval keys target))
 	 (run-id      (runs:register-run db keys keyvallst runname "new" "n/a" user))  ;;  test-name)))
 	 (deferred    '()) ;; delay running these since they have a waiton clause
 	 ;; keepgoing is the defacto modality now, will add hit-n-run a bit later
 	 ;; (keepgoing   (hash-table-ref/default flags "-keepgoing" #f))
@@ -407,17 +397,17 @@
     (runs:update-test_meta db test-name test-conf)
     
     ;; (lambda (itemdat) ;;; ((ripeness "overripe") (temperature "cool") (season "summer"))
     (let* ((new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/"))
 	   (new-test-name (if (equal? item-path "") test-name (conc test-name "/" item-path))) ;; just need it to be unique
-	   (testdat       (db:get-test-info db run-id test-name item-path)))
+	   (testdat       (rdb:get-test-info db run-id test-name item-path)))
       (if (not testdat)
 	  (begin
 	    ;; ensure that the path exists before registering the test
 	    (system (conc "mkdir -p " new-test-path))
 	    (register-test db run-id test-name item-path)
-	    (set! testdat (db:get-test-info db run-id test-name item-path))))
+	    (set! testdat (rdb:get-test-info db run-id test-name item-path))))
       (change-directory test-path)
       (case (if force ;; (args:get-arg "-force")
 		'NOT_STARTED
 		(if testdat
 		    (string->symbol (test:get-state testdat))
@@ -487,11 +477,11 @@
 	       (take dparts (- (length dparts) count))
 	       "/"))))
 ;; Remove runs
 ;; fields are passing in through 
 (define (runs:remove-runs db runnamepatt testpatt itempatt)
-  (let* ((keys        (db-get-keys db))
+  (let* ((keys        (rdb:get-keys db))
 	 (rundat      (runs:get-runs-by-patt db keys runnamepatt))
 	 (header      (vector-ref rundat 0))
 	 (runs        (vector-ref rundat 1)))
     (debug:print 1 "Header: " header)
     (for-each
@@ -510,11 +500,11 @@
 		  (lambda (test)
 		    (let* ((item-path (db:test-get-item-path test))
 			   (test-name (db:test-get-testname test))
 			   (run-dir   (db:test-get-rundir test)))
 		      (debug:print 1 "  " (db:test-get-testname test) " id: " (db:test-get-id test) " " item-path)
-		      (db:delete-test-records db (db:test-get-id test))
+		      (rdb:delete-test-records db (db:test-get-id test))
 		      (if (> (string-length run-dir) 5) ;; bad heuristic but should prevent /tmp /home etc.
 			  (let ((fullpath run-dir)) ;; "/" (db:test-get-item-path test))))
 			    (set! lasttpath fullpath)
 			    (hash-table-set! dirs-to-remove fullpath #t)
 			    ;; The following was the safe delete code but it was not being exectuted.
@@ -592,11 +582,11 @@
 	(if (not (setup-for-run))
 	    (begin 
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(set! db   (open-db))
-	(set! keys (db-get-keys db))
+	(set! keys (db:get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
 	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
 		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
 	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
@@ -623,15 +613,15 @@
 ;; Rollup runs
 ;;======================================================================
 
 ;; Update the test_meta table for this test
 (define (runs:update-test_meta db test-name test-conf)
-  (let ((currrecord (db:testmeta-get-record db test-name)))
+  (let ((currrecord (rdb:testmeta-get-record db test-name)))
     (if (not currrecord)
 	(begin
 	  (set! currrecord (make-vector 10 #f))
-	  (db:testmeta-add-record db test-name)))
+	  (rdb:testmeta-add-record db test-name)))
     (for-each 
      (lambda (key)
        (let* ((idx (cadr key))
 	      (fld (car  key))
 	      (val (config-lookup test-conf "test_meta" fld)))