@@ -157,11 +157,11 @@
 	   (debug:print 0 "WARNING: failed to start on portnum: " portnum ", trying next port")
 	   (thread-sleep! 0.1)
 	   (http-transport:try-start-server ipaddrstr (+ portnum 1) server-id))
 	 (print "ERROR: Tried and tried but could not start the server")))
    ;; any error in following steps will result in a retry
-   (set! *runremote* (list ipaddrstr portnum))
+   (set! *server-info* (list ipaddrstr portnum))
    (open-run-close tasks:server-set-interface-port 
 		   tasks:open-db 
 		   server-id 
 		   ipaddrstr portnum)
    (debug:print 1 "INFO: Trying to start server on " ipaddrstr ":" portnum)
@@ -399,11 +399,11 @@
   (let* ((server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
                         (let ((sdat #f))
                           (mutex-lock! *heartbeat-mutex*)
-                          (set! sdat *runremote*)
+                          (set! sdat *server-info*)
                           (mutex-unlock! *heartbeat-mutex*)
                           (if (and sdat
 				   (not changed)
 				   (> (- (current-seconds) start-time) 2))
 			      sdat
@@ -442,11 +442,11 @@
       (if (< count 1) ;; 3x3 = 9 secs aprox
 	  (loop (+ count 1)))
       
       ;; Check that iface and port have not changed (can happen if server port collides)
       (mutex-lock! *heartbeat-mutex*)
-      (set! sdat *runremote*)
+      (set! sdat *server-info*)
       (mutex-unlock! *heartbeat-mutex*)
       
       (if (or (not (equal? sdat (list iface port)))
 	      (not server-id))
 	  (begin