@@ -68,11 +68,11 @@
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
 	 (start-port      (portlogger:open-run-close portlogger:find-port))
 	 (link-tree-path  (common:get-linktree))
-	 (tmp-area        (common:get-db-tmp-area))
+	 (tmp-area        (common:get-db-tmp-area *alldat*))
 	 (start-file      (conc tmp-area "/.server-start")))
     (debug:print-info 0 *default-log-port* "portlogger recommended port: " start-port)
     ;; set some parameters for the server
     (root-path     (if link-tree-path 
 		       link-tree-path
@@ -240,11 +240,11 @@
 			   (debug:print 0 *default-log-port* "FATAL ERROR: http-transport:client-api-send-receive called with no server info")
 			   (exit 1))))
 	 (res        (vector #f "uninitialized"))
 	 (success    #t)
 	 (sparams    (db:obj->string params transport: 'http))
-	 (runremote  (or area-dat *runremote*)))
+	 (areadat  (or area-dat *areadat*)))
        (debug:print-info 11 *default-log-port* "fullurl=" fullurl ", cmd=" cmd ", params=" params ", run-id=" run-id "\n")
        ;; set up the http-client here
        (max-retry-attempts 1)
        ;; consider all requests indempotent
        (retry-request? (lambda (request)
@@ -269,12 +269,12 @@
                                                     (begin
                                                       (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
                                                       (debug:print 0 *default-log-port* " message: " msg)
                                                       (debug:print 0 *default-log-port* " cmd: " cmd " params: " params)
                                                       (debug:print 0 *default-log-port* " call-chain: " call-chain)))
-                                                (if runremote
-						    (remote-conndat-set! runremote #f))
+                                                (if areadat
+						    (areadat-conndat-set! areadat #f))
 						;; Killing associated server to allow clean retry.")
 						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
 						(mutex-unlock! *http-mutex*)
 					     ;;; (signal (make-composite-condition
 					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
@@ -316,17 +316,17 @@
 	     (signal (make-composite-condition
 		      (make-property-condition 
 		       'timeout
 		       'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))))
 
-;; careful closing of connections stored in *runremote*
+;; careful closing of connections stored in *alldat*
 ;;
-(define (http-transport:close-connections #!key (area-dat #f))
-  (let* ((runremote  (or area-dat *runremote*))
-	 (server-dat (if runremote
-                         (remote-conndat runremote)
-                         #f))) ;; (hash-table-ref/default *runremote* run-id #f)))
+(define (http-transport:close-connections #!key (all-dat #f))
+  (let* ((alldat  (or all-dat *alldat*))
+	 (server-dat (if alldat
+                         (alldat-conndat alldat)
+                         #f))) ;; (hash-table-ref/default *areadat* run-id #f)))
     (if (vector? server-dat)
 	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
 	  (handle-exceptions
 	    exn
 	    (begin
@@ -355,11 +355,11 @@
 (define (http-transport:keep-running) 
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
-  (let* ((tmp-area          (common:get-db-tmp-area))
+  (let* ((tmp-area          (common:get-db-tmp-area *alldat*))
 	 (started-file      (conc tmp-area "/.server-started"))
 	 (server-start-time (current-seconds))
 	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
@@ -515,11 +515,11 @@
 ;;
 ;; start_server? 
 ;;
 (define (http-transport:launch)
   ;; check that a server start is in progress, pause or exit if so
-  (let* ((tmp-area            (common:get-db-tmp-area))
+  (let* ((tmp-area            (common:get-db-tmp-area *alldat*))
 	 (server-start        (conc tmp-area "/.server-start"))
 	 (server-started      (conc tmp-area "/.server-started"))
 	 (start-time          (common:lazy-modification-time server-start))
 	 (started-time        (common:lazy-modification-time server-started))
 	 (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting