@@ -67,11 +67,11 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(if (not (launch:setup-for-run))
+(if (not (launch:setup))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 ;; (if (args:get-arg "-host")
@@ -261,11 +261,11 @@
 ;; T E S T S
 ;;======================================================================
 
 (define (tree-path->test-id path)
   (if (not (null? path))
-      (hash-table-ref/default (dboard:data-get-path-test-ids *data*) path #f)
+      (hash-table-ref/default (dboard:data-path-test-ids *data*) path #f)
       #f))
 
 (define (test-panel window-id)
   (let* ((curr-row-num 0)
 	 (viewlog    (lambda (x)
@@ -345,11 +345,11 @@
 			    #:numlin-visible 8))
 	 (updater          (lambda (testdat)
 			     (test-update window-id testdat run-info-matrix test-info-matrix test-run-matrix meta-dat-matrix steps-matrix data-matrix))))
 
     ;; Set the updater in updaters
-    (hash-table-set! (dboard:data-get-updaters *data*) window-id updater)
+    (hash-table-set! (dboard:data-updaters *data*) window-id updater)
     ;; 
     (for-each
      (lambda (mat)
        ;; (iup:attribute-set! mat "0:1" "Value")
        ;; (iup:attribute-set! mat "0:0" "Var")
@@ -447,29 +447,29 @@
 		    (lambda (obj id state)
 		      ;; (print "obj: " obj ", id: " id ", state: " state)
 		      (let* ((run-path (tree:node->path obj id))
 			     (test-id  (tree-path->test-id (cdr run-path))))
 			(if test-id
-			    (hash-table-set! (dboard:data-get-curr-test-ids *data*)
+			    (hash-table-set! (dboard:data-curr-test-ids *data*)
 					     window-id test-id))
 			(print "path: " (tree:node->path obj id) " test-id: " test-id))))))
      (iup:attribute-set! tb "VALUE" "0")
      (iup:attribute-set! tb "NAME" "Runs")
      ;;(iup:attribute-set! tb "ADDEXPANDED" "NO")
-     (dboard:data-set-tests-tree! *data* tb)
+     (dboard:data-tests-tree-set! *data* tb)
      tb)
    (test-panel window-id)))
 
 ;; The function to update the fields in the test view panel
 (define (test-update window-id testdat run-info-matrix test-info-matrix test-run-matrix meta-dat-matrix steps-matrix data-matrix)
   ;; get test-id
   ;; then get test record
   (if testdat
-      (let* ((test-id      (hash-table-ref/default (dboard:data-get-curr-test-ids *data*) window-id #f))
+      (let* ((test-id      (hash-table-ref/default (dboard:data-curr-test-ids *data*) window-id #f))
 	     (test-data    (hash-table-ref/default testdat test-id #f))
 	     (run-id       (dbr:test-run_id test-data))
-	     (targ/runname (hash-table-ref/default (dboard:data-get-run-keys *data*) 
+	     (targ/runname (hash-table-ref/default (dboard:data-run-keys *data*) 
 						   run-id
 						   '()))
 	     (target       (if (null? targ/runname) "" (string-intersperse (reverse (cdr (reverse targ/runname))) "/")))
 	     (runname      (if (null? targ/runname) "" (car (cdr targ/runname))))
 	     (steps-dat    (tests:get-compressed-steps *dbstruct-local* run-id test-id)))
@@ -562,11 +562,11 @@
 					(print "obj: " obj " lin: " lin " col: " col " status: " status)))))
 
     (iup:attribute-set! runs-matrix "RESIZEMATRIX" "YES")
     (iup:attribute-set! runs-matrix "WIDTH0" "100")
 
-    (dboard:data-set-runs-matrix! *data* runs-matrix)
+    (dboard:data-runs-matrix-set! *data* runs-matrix)
     (iup:hbox
      (iup:frame 
       #:title "Runs browser"
       (iup:vbox
        runs-matrix)))))
@@ -611,11 +611,11 @@
 	 (states   '())
 	 (statuses '())
 	 (nextmintime (current-milliseconds))
 	 (my-window-id *current-window-id*))
     (set! *current-window-id* (+ 1 *current-window-id*))
-    (dboard:data-set-runs! *data* data) ;; make this data available to the rest of the application
+    (dboard:data-runs-set! *data* data) ;; make this data available to the rest of the application
     (iup:show (main-panel my-window-id))
     ;; Yes, running iup:show will pop up a new panel
     ;; (iup:show (main-panel my-window-id))
     (iup:callback-set! *tim*
 		       "ACTION_CB"
@@ -625,11 +625,11 @@
 			 (if (< nextmintime (current-milliseconds))
 			     (let* ((starttime (current-milliseconds))
 				    (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
 				    (endtime   (current-milliseconds)))
 			       (set! nextmintime (+ endtime (* 2 (- endtime starttime))))
-			       (debug:print 11 "CHANGE(S): " (car changes) "..."))
-			     (debug:print-info 11 "Server overloaded"))))))
+			       (debug:print 11 *default-log-port* "CHANGE(S): " (car changes) "..."))
+			     (debug:print-info 11 *default-log-port* "Server overloaded"))))))
 
-(dboard:data-set-updaters! *data* (make-hash-table))
+(dboard:data-updaters-set! *data* (make-hash-table))
 (newdashboard *dbstruct-local*)    
 (iup:main-loop)