@@ -63,11 +63,11 @@
 	   'remote:run 
 	   (lambda (procstr . params)
 	     (server:autoremote procstr params)))
 	  
 	  (rpc:publish-procedure!
-	   'serve:login
+	   'server:login
 	   (lambda (toppath)
 	     (set! *last-db-access* (current-seconds))
 	     (if (equal? *toppath* toppath)
 		 (begin
 		   (debug:print 2 "INFO: login successful")
@@ -103,13 +103,13 @@
 	     (debug:print 4 "INFO: Remote call of cdb:pass-fail-counts " test-id " passes: " pass-count " fails: " fail-count)
 	     (cdb:pass-fail-counts test-id fail-count pass-count)))
 
 	  (rpc:publish-procedure!
 	   'cdb:tests-register-test
-	   (lambda (run-id test-name item-path)
+	   (lambda (db run-id test-name item-path)
 	     (debug:print 4 "INFO: Remote call of cdb:tests-register-test " run-id " testname: " test-name " item-path: " item-path)
-	     (cdb:tests-register-test run-id test-name item-path)))
+	     (cdb:tests-register-test db run-id test-name item-path)))
 
 	  (rpc:publish-procedure!
 	   'cdb:flush-queue
 	   (lambda ()
 	     (debug:print 4 "INFO: Remote call of cdb:flush-queue")
@@ -195,14 +195,14 @@
 		 ;;  (lambda (db . param) 
 		 ;;    (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'"))
 		 ;;  #f)
 		 (set! *runremote* #f))
 	       (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server
-			((rpc:procedure 'serve:login host portn) *toppath*))
+			((rpc:procedure 'server:login host portn) *toppath*))
 		   (begin
 		     (debug:print 2 "INFO: Connected to " host ":" port)
 		     (set! *runremote* (vector host portn)))
 		   (begin
 		     (debug:print 2 "INFO: Failed to connect to " host ":" port)
 		     (set! *runremote* #f)))))
 	    (debug:print 2 "INFO: no server available")))))