@@ -279,14 +279,14 @@
 		       (setup-for-run)
 		       (open-db)))
 	   (runpatt  (args:get-arg "-list-runs"))
 	   (testpatt (args:get-arg "-testpatt"))
 	   (itempatt (args:get-arg "-itempatt"))
-	   (runsdat  (rdb:get-runs db runpatt #f #f '()))
+	   (runsdat  (db:get-runs db runpatt #f #f '()))
 	   (runs     (db:get-rows runsdat))
 	   (header   (db:get-header runsdat))
-	   (keys     (rdb:get-keys db))
+	   (keys     (db:get-keys db))
 	   (keynames (map key:get-fieldname keys)))
       (if (not (args:get-arg "-server"))
 	  (server:client-setup db))
       ;; Each run
       (for-each 
@@ -297,11 +297,11 @@
 					 keynames) "/")
 		"/"
 		(db:get-value-by-header run header "runname")
 		" status: " (db:get-value-by-header run header "state"))
 	 (let ((run-id (db:get-value-by-header run header "id")))
-	   (let ((tests (rdb:get-tests-for-run db run-id testpatt itempatt '() '())))
+	   (let ((tests (db:get-tests-for-run db run-id testpatt itempatt '() '())))
 	     ;; Each test
 	     (for-each 
 	      (lambda (test)
 		(format #t
 			"  Test: ~25a State: ~15a Status: ~15a Runtime: ~5@as Time: ~22a Host: ~10a\n"
@@ -484,13 +484,13 @@
 		(exit 1)))
 	  (set! db (open-db))    
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
-		 (keys     (rdb:get-keys db))
+		 (keys     (db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (rdb:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+		 (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
@@ -497,11 +497,11 @@
 	(general-run-call 
 	 "-test-files"
 	 "Get paths to test"
 	 (lambda (db target runname keys keynames keyvallst)
 	   (let* ((itempatt (args:get-arg "-itempatt"))
-		  (paths    (rdb:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+		  (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================
@@ -534,11 +534,11 @@
 		(exit 1)))
 	  (set! db (open-db))   
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
-		 (keys     (rdb:get-keys db))
+		 (keys     (db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
 		 (paths    (db:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
@@ -612,11 +612,11 @@
 		(exit 1)))
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (if (and state status)
-	      (rdb:teststep-set-status! db test-id step state status itemdat (args:get-arg "-m") logfile)
+	      (db:teststep-set-status! db test-id step state status itemdat (args:get-arg "-m") logfile)
 	      (begin
 		(debug:print 0 "ERROR: You must specify :state and :status with every call to -step")
 		(exit 6)))
 	  (sqlite3:finalize! db)
 	  (set! *didsomething* #t))))
@@ -655,11 +655,11 @@
 	  (if (args:get-arg "-load-test-data")
 	      ;; has sub commands that are rdb:
 	      (db:load-test-data db test-id))
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
-		(rdb:test-set-log! db test-id logfname)))
+		(db:test-set-log! db test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
 	      (rtests:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
 	      (tests:summarize-items db run-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
@@ -681,11 +681,11 @@
 				       (else ">&")))
 			 (fullcmd    (conc "(" (string-intersperse 
 						(cons cmd params) " ")
 					   ") " redir " " logfile)))
 		    ;; mark the start of the test
-		    (rdb:teststep-set-status! db test-id stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
+		    (db:teststep-set-status! db test-id stepname "start" "n/a" itemdat (args:get-arg "-m") logfile)
 		    ;; close the db
 		    ;; (sqlite3:finalize! db)
 		    ;; run the test step
 		    (debug:print 2 "INFO: Running \"" fullcmd "\"")
 		    (change-directory startingdir)
@@ -704,13 +704,13 @@
 			  (debug:print 2 "INFO: running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
-			  (rdb:test-set-log! db test-id htmllogfile)))
+			  (db:test-set-log! db test-id htmllogfile)))
 		    (let ((msg (args:get-arg "-m")))
-		      (rdb:teststep-set-status! db test-id stepname "end" exitstat itemdat msg logfile))
+		      (db:teststep-set-status! db test-id stepname "end" exitstat itemdat msg logfile))
 		    ;; (sqlite3:finalize! db)
 		    ;;(if (not (eq? exitstat 0))
 		    ;;	(exit 254)) ;; (exit exitstat) doesn't work?!?
 		  ;; open the db
 		  ;; mark the end of the test
@@ -754,11 +754,11 @@
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
       (set! db (open-db))
       (if (not (args:get-arg "-server"))
 	  (server:client-setup db))
-      (set! keys (rdb:get-keys db))
+      (set! keys (db:get-keys db))
       (debug:print 1 "Keys: " (string-intersperse (map key:get-fieldname keys) ", "))
       (sqlite3:finalize! db)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-gui")