@@ -124,11 +124,11 @@
          ;; (dot-server-url (server:check-if-running areapath))
 	 (curr-ip     (server:get-best-guess-address curr-host))
 	 (curr-pid    (current-process-id))
 	 (homehost    (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" ))
 	 (target-host (car homehost))
-	 (testsuite   (common:get-testsuite-name))
+	 (testsuite   (common:get-area-name))
 	 (logfile     (conc areapath "/logs/server.log")) ;; -" curr-pid "-" target-host ".log"))
 	 (cmdln (conc (common:get-megatest-exe)
 		      " -server " (or target-host "-") (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
 							   " -daemonize "
 							   "")
@@ -504,11 +504,11 @@
 ;;
 
 (define (server:get-bruteforce-syncer dbstruct #!key (fork-to-background #f) (persist-until-sync #f))
   (let* ((sqlite-exe   (or (get-environment-variable "MT_SQLITE3_EXE"))) ;; defined in cfg.sh
          (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
-	 (tmp-area     (common:get-db-tmp-area))
+	 (tmp-area     (common:get-db-tmp-area *alldat*))
 	 (tmp-db       (conc tmp-area "/megatest.db"))
 	 (staging-file (conc *toppath* "/.megatest.db"))
 	 (mtdbfile     (conc *toppath* "/megatest.db"))
 	 (lockfile     (common:get-sync-lock-filepath))
          (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
@@ -628,11 +628,11 @@
     (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
     (if (and legacy-sync (not *time-to-exit*))
 	(let* (;;(dbstruct (db:setup))
 	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
 	       (mtpath     (db:dbdat-get-path mtdb))
-	       (tmp-area   (common:get-db-tmp-area))
+	       (tmp-area   (common:get-db-tmp-area *alldat*))
 	       (start-file (conc tmp-area "/.start-sync"))
 	       (end-file   (conc tmp-area "/.end-sync")))
 	  (debug:print-info 0 *default-log-port* "Server running, periodic sync started.")
 	  (let loop ()
 	    ;; sync for filesystem local db writes