@@ -26,10 +26,11 @@
 (declare (unit db))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses fs-transport))
+(declare (uses client))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
@@ -1095,11 +1096,11 @@
   (case *transport-type* 
     ((fs)
      (let ((packet (vector "na" qtype immediate "na" params 0)))
        (fs:process-queue-item packet)))
     ((http)
-     (let* ((client-sig  (server:get-client-signature))
+     (let* ((client-sig  (client:get-signature))
 	    (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
 	    (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds))))) ;; (with-output-to-string (lambda ()(serialize params))))
        (debug:print-info 11 "zdat=" zdat)
        (let* ((res  #f)
 	      (rawdat      (http-transport:client-send-receive serverdat zdat))
@@ -1113,21 +1114,21 @@
       (begin
 	(thread-sleep! 5) 
 	(if (> numretries 0)(apply cdb:client-call serverdat qtype immediate (- numretries 1) params)))
       (let* ((push-socket (vector-ref serverdat 0))
 	     (sub-socket  (vector-ref serverdat 1))
-	     (client-sig  (server:get-client-signature))
+	     (client-sig  (client:get-signature))
 	     (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
 	     (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds)))) ;; (with-output-to-string (lambda ()(serialize params))))
 	     (res  #f)
 	     (send-receive (lambda ()
 			     (debug:print-info 11 "sending message")
 			     (send-message push-socket zdat)
 			     (debug:print-info 11 "message sent")
 			     (let loop ()
 			       ;; get the sender info
-			       ;; this should match (server:get-client-signature)
+			       ;; this should match (client:get-signature)
 			       ;; we will need to process "all" messages here some day
 			       (receive-message* sub-socket)
 			       ;; now get the actual message
 			       (let ((myres (db:string->obj (receive-message* sub-socket))))
 				 (if (equal? query-sig (vector-ref myres 1))