Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -805,22 +805,22 @@
 				  (hash-table-set! alltgls item #t))
 			      (let ((all (hash-table-keys alltgls)))
 				(proc all)))))
 		items))))
 
-;; Extract the various bits of data from *data* and create the command line equivalent that will be displayed
+;; Extract the various bits of data from data and create the command line equivalent that will be displayed
 ;;
 (define (dashboard:update-run-command data)
-  (let* ((cmd-tb       (dboard:data-get-command-tb data))
-	 (cmd          (dboard:data-get-command    data))
-	 (test-patt    (let ((tp (dboard:data-get-test-patts data)))
+  (let* ((cmd-tb       (dboard:data-command-tb data))
+	 (cmd          (dboard:data-command    data))
+	 (test-patt    (let ((tp (dboard:data-test-patts data)))
 			 (if (equal? tp "") "%" tp)))
-	 (states       (dboard:data-get-states     data))
-	 (statuses     (dboard:data-get-statuses   data))
-	 (target       (let ((targ-list (dboard:data-get-target     data)))
+	 (states       (dboard:data-states     data))
+	 (statuses     (dboard:data-statuses   data))
+	 (target       (let ((targ-list (dboard:data-target     data)))
 			 (if targ-list (string-intersperse targ-list "/") "no-target-selected")))
-	 (run-name     (dboard:data-get-run-name   data))
+	 (run-name     (dboard:data-run-name   data))
 	 (states-str   (if (or (not states)
 			       (null? states))
 			   ""
 			   (conc " -state "  (string-intersperse states ","))))
 	 (statuses-str (if (or (not statuses)
@@ -895,17 +895,17 @@
 	 ;; (updater-for-runs #f)
 	 (update-keyvals (lambda ()
 			   (let ((targ (map (lambda (x)
 					      (iup:attribute x "VALUE"))
 					    (car (dashboard:update-target-selector key-listboxes))))
-				 (curr-runname (dboard:data-get-run-name data)))
-			     (dboard:data-set-target! data targ)
-			     (if (dboard:data-get-updater-for-runs data)
-				 ((dboard:data-get-updater-for-runs data)))
-			     (if (or (not (equal? curr-runname (dboard:data-get-run-name data)))
-				     (equal? (dboard:data-get-run-name data) ""))
-				 (dboard:data-set-run-name! data curr-runname))
+				 (curr-runname (dboard:data-run-name data)))
+			     (dboard:data-target-set! data targ)
+			     (if (dboard:data-updater-for-runs data)
+				 ((dboard:data-updater-for-runs data)))
+			     (if (or (not (equal? curr-runname (dboard:data-run-name data)))
+				     (equal? (dboard:data-run-name data) ""))
+				 (dboard:data-run-name-set! data curr-runname))
 			     (dashboard:update-run-command data))))
 	 (tests-draw-state (make-hash-table)) ;; use for keeping state of the test canvas
 	 (test-patterns-textbox  #f))
     (hash-table-set! tests-draw-state 'first-time #t)
     ;; (hash-table-set! tests-draw-state 'scalef 1)
@@ -934,11 +934,11 @@
        
  ;;(iup:frame
  ;; #:title "Logs" ;; To be replaced with tabs
  ;; (let ((logs-tb (iup:textbox #:expand "YES"
  ;;				   #:multiline "YES")))
- ;;	 (dboard:data-set-logs-textbox! data logs-tb)
+ ;;	 (dboard:data-logs-textbox-set! data logs-tb)
  ;;	 logs-tb))
       )))
 
 ;;======================================================================
 ;; R U N   C O N T R O L S
@@ -960,16 +960,16 @@
 	 (updater-for-runs #f)
 	 (update-keyvals (lambda ()
 			   (let ((targ (map (lambda (x)
 					      (iup:attribute x "VALUE"))
 					    (car (dashboard:update-target-selector key-listboxes))))
-				 (curr-runname (dboard:data-get-run-name data)))
-			     (dboard:data-set-target! data targ)
+				 (curr-runname (dboard:data-run-name data)))
+			     (dboard:data-target-set! data targ)
 			     (if updater-for-runs (updater-for-runs))
-			     (if (or (not (equal? curr-runname (dboard:data-get-run-name data)))
-				     (equal? (dboard:data-get-run-name data) ""))
-				 (dboard:data-set-run-name! data curr-runname))
+			     (if (or (not (equal? curr-runname (dboard:data-run-name data)))
+				     (equal? (dboard:data-run-name data) ""))
+				 (dboard:data-run-name-set! data curr-runname))
 			     (dashboard:update-run-command data))))
 	 (tests-draw-state (make-hash-table)) ;; use for keeping state of the test canvas
 	 (test-patterns-textbox  #f))
     (hash-table-set! tests-draw-state 'first-time #t)
     ;; (hash-table-set! tests-draw-state 'scalef 1)
@@ -997,11 +997,11 @@
        
 ;; (iup:frame
 ;;  #:title "Logs" ;; To be replaced with tabs
 ;;  (let ((logs-tb (iup:textbox #:expand "YES"
 ;; 				   #:multiline "YES")))
-;; 	 (dboard:data-set-logs-textbox! data logs-tb)
+;; 	 (dboard:data-logs-textbox-set! data logs-tb)
 ;; 	 logs-tb))
       )))
 
 ;;======================================================================
 ;; S U M M A R Y 
@@ -1166,11 +1166,11 @@
 					  (run-path   (append key-vals (list run-name)))
 					  (existing   (tree:find-node tb run-path)))
 				     (if (not (hash-table-ref/default (d:data-path-run-ids ddata) run-path #f))
 					 (begin
 					   (hash-table-set! (d:data-run-keys ddata) run-id run-path)
-					   ;; (iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+					   ;; (iup:attribute-set! (dboard:data-runs-matrix data)
 					   ;;    		 (conc rownum ":" colnum) col-name)
 					   ;; (hash-table-set! runid-to-col run-id (list colnum run-record))
 					   ;; Here we update the tests treebox and tree keys
 					   (tree:add-node tb "Runs" run-path ;; (append key-vals (list run-name))
 							  userdata: (conc "run-id: " run-id))
@@ -1312,11 +1312,11 @@
 					  (run-path   (append key-vals (list run-name)))
 					  (existing   (tree:find-node tb run-path)))
 				     (if (not (hash-table-ref/default (d:data-path-run-ids ddata) run-path #f))
 					 (begin
 					   (hash-table-set! (d:data-run-keys ddata) run-id run-path)
-					   ;; (iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+					   ;; (iup:attribute-set! (dboard:data-runs-matrix data)
 					   ;;    		 (conc rownum ":" colnum) col-name)
 					   ;; (hash-table-set! runid-to-col run-id (list colnum run-record))
 					   ;; Here we update the tests treebox and tree keys
 					   (tree:add-node tb "Runs" run-path ;; (append key-vals (list run-name))
 							  userdata: (conc "run-id: " run-id))

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -38,78 +38,78 @@
 ;; A single data structure for all the data used in a dashboard.
 ;; Share this structure between newdashboard and dashboard with the 
 ;; intent of converging on a single app.
 ;;
 (define *data* (make-vector 25 #f))
-(define (dboard:data-get-runs          vec)    (vector-ref  vec 0))
-(define (dboard:data-get-tests         vec)    (vector-ref  vec 1))
-(define (dboard:data-get-runs-matrix   vec)    (vector-ref  vec 2))
-(define (dboard:data-get-tests-tree    vec)    (vector-ref  vec 3))
-(define (dboard:data-get-run-keys      vec)    (vector-ref  vec 4))
-(define (dboard:data-get-curr-test-ids vec)    (vector-ref  vec 5))
-;; (define (dboard:data-get-test-details  vec)    (vector-ref  vec 6))
-(define (dboard:data-get-path-test-ids vec)    (vector-ref  vec 7))
-(define (dboard:data-get-updaters      vec)    (vector-ref  vec 8))
-(define (dboard:data-get-path-run-ids  vec)    (vector-ref  vec 9))
-(define (dboard:data-get-curr-run-id   vec)    (vector-ref  vec 10))
-(define (dboard:data-get-runs-tree     vec)    (vector-ref  vec 11))
+(define (dboard:data-runs          vec)    (vector-ref  vec 0))
+(define (dboard:data-tests         vec)    (vector-ref  vec 1))
+(define (dboard:data-runs-matrix   vec)    (vector-ref  vec 2))
+(define (dboard:data-tests-tree    vec)    (vector-ref  vec 3))
+(define (dboard:data-run-keys      vec)    (vector-ref  vec 4))
+(define (dboard:data-curr-test-ids vec)    (vector-ref  vec 5))
+;; (define (dboard:data-test-details  vec)    (vector-ref  vec 6))
+(define (dboard:data-path-test-ids vec)    (vector-ref  vec 7))
+(define (dboard:data-updaters      vec)    (vector-ref  vec 8))
+(define (dboard:data-path-run-ids  vec)    (vector-ref  vec 9))
+(define (dboard:data-curr-run-id   vec)    (vector-ref  vec 10))
+(define (dboard:data-runs-tree     vec)    (vector-ref  vec 11))
 ;; For test-patts convert #f to ""
-(define (dboard:data-get-test-patts    vec)    
+(define (dboard:data-test-patts    vec)    
   (let ((val (vector-ref  vec 12)))(if val val "")))
-(define (dboard:data-get-states        vec)    (vector-ref vec 13))
-(define (dboard:data-get-statuses      vec)    (vector-ref vec 14))
-(define (dboard:data-get-logs-textbox  vec val)(vector-ref vec 15))
-(define (dboard:data-get-command       vec)    (vector-ref vec 16))
-(define (dboard:data-get-command-tb    vec)    (vector-ref vec 17))
-(define (dboard:data-get-target        vec)    (vector-ref vec 18))
-(define (dboard:data-get-target-string vec)
-  (let ((targ (dboard:data-get-target vec)))
+(define (dboard:data-states        vec)    (vector-ref vec 13))
+(define (dboard:data-statuses      vec)    (vector-ref vec 14))
+(define (dboard:data-logs-textbox  vec val)(vector-ref vec 15))
+(define (dboard:data-command       vec)    (vector-ref vec 16))
+(define (dboard:data-command-tb    vec)    (vector-ref vec 17))
+(define (dboard:data-target        vec)    (vector-ref vec 18))
+(define (dboard:data-target-string vec)
+  (let ((targ (dboard:data-target vec)))
     (if (list? targ)(string-intersperse targ "/") "no-target-specified")))
-(define (dboard:data-get-run-name      vec)    (vector-ref vec 19))
-(define (dboard:data-get-runs-listbox  vec)    (vector-ref vec 20))
-(define (dboard:data-get-updater-for-runs vec) (vector-ref vec 21))
+(define (dboard:data-run-name      vec)    (vector-ref vec 19))
+(define (dboard:data-runs-listbox  vec)    (vector-ref vec 20))
+(define (dboard:data-updater-for-runs vec) (vector-ref vec 21))
 
 (defstruct d:data runs tests runs-matrix tests-tree run-keys
   curr-test-ids updaters path-run-ids curr-run-id runs-tree test-patts
   states statuses logs-textbox command command-tb target run-name
   runs-listbox)
 
-(define (dboard:data-set-runs!          vec val)(vector-set! vec 0 val))
-(define (dboard:data-set-tests!         vec val)(vector-set! vec 1 val))
-(define (dboard:data-set-runs-matrix!   vec val)(vector-set! vec 2 val))
-(define (dboard:data-set-tests-tree!    vec val)(vector-set! vec 3 val))
-(define (dboard:data-set-run-keys!      vec val)(vector-set! vec 4 val))
-(define (dboard:data-set-curr-test-ids! vec val)(vector-set! vec 5 val))
-;; (define (dboard:data-set-test-details!  vec val)(vector-set! vec 6 val))
-(define (dboard:data-set-path-test-ids! vec val)(vector-set! vec 7 val))
-(define (dboard:data-set-updaters!      vec val)(vector-set! vec 8 val))
-(define (dboard:data-set-path-run-ids!  vec val)(vector-set! vec 9 val))
-(define (dboard:data-set-curr-run-id!   vec val)(vector-set! vec 10 val))
-(define (dboard:data-set-runs-tree!     vec val)(vector-set! vec 11 val))
+(define (dboard:data-runs-set!          vec val)(vector-set! vec 0 val))
+(define (dboard:data-tests-set!         vec val)(vector-set! vec 1 val))
+(define (dboard:data-runs-matrix-set!   vec val)(vector-set! vec 2 val))
+(define (dboard:data-tests-tree-set!    vec val)(vector-set! vec 3 val))
+(define (dboard:data-run-keys-set!      vec val)(vector-set! vec 4 val))
+(define (dboard:data-curr-test-ids-set! vec val)(vector-set! vec 5 val))
+;; (define (dboard:data-test-details-set!  vec val)(vector-set! vec 6 val))
+(define (dboard:data-path-test-ids-set! vec val)(vector-set! vec 7 val))
+(define (dboard:data-updaters-set!      vec val)(vector-set! vec 8 val))
+(define (dboard:data-path-run-ids-set!  vec val)(vector-set! vec 9 val))
+(define (dboard:data-curr-run-id-set!   vec val)(vector-set! vec 10 val))
+(define (dboard:data-runs-tree-set!     vec val)(vector-set! vec 11 val))
 ;; For test-patts convert "" to #f 
-(define (dboard:data-set-test-patts!    vec val)
+(define (dboard:data-test-patts-set!    vec val)
   (vector-set! vec 12 (if (equal? val "") #f val)))
-(define (dboard:data-set-states!        vec val)(vector-set! vec 13 val))
-(define (dboard:data-set-statuses!      vec val)(vector-set! vec 14 val))
-(define (dboard:data-set-logs-textbox!  vec val)(vector-set! vec 15 val))
-(define (dboard:data-set-command!       vec val)(vector-set! vec 16 val))
-(define (dboard:data-set-command-tb!    vec val)(vector-set! vec 17 val))
-(define (dboard:data-set-target!        vec val)(vector-set! vec 18 val))
-(define (dboard:data-set-run-name!      vec val)(vector-set! vec 19 val))
-(define (dboard:data-set-runs-listbox!  vec val)(vector-set! vec 20 val))
-(define (dboard:data-set-updater-for-runs! vec val)(vector-set! vec 21 val))
-
-(dboard:data-set-run-keys! *data* (make-hash-table))
+(define (dboard:data-states-set!        vec val)(vector-set! vec 13 val))
+(define (dboard:data-statuses-set!      vec val)(vector-set! vec 14 val))
+(define (dboard:data-logs-textbox-set!  vec val)(vector-set! vec 15 val))
+(define (dboard:data-command-set!       vec val)(vector-set! vec 16 val))
+(define (dboard:data-command-tb-set!    vec val)(vector-set! vec 17 val))
+(define (dboard:data-target-set!        vec val)(vector-set! vec 18 val))
+(define (dboard:data-run-name-set!      vec val)(vector-set! vec 19 val))
+(define (dboard:data-runs-listbox-set!  vec val)(vector-set! vec 20 val))
+(define (dboard:data-updater-for-runs-set! vec val)(vector-set! vec 21 val))
+
+(dboard:data-run-keys-set! *data* (make-hash-table))
 
 ;; List of test ids being viewed in various panels
-(dboard:data-set-curr-test-ids! *data* (make-hash-table))
+(dboard:data-curr-test-ids-set! *data* (make-hash-table))
 
 ;; Look up test-ids by (key1 key2 ... testname [itempath])
-(dboard:data-set-path-test-ids! *data* (make-hash-table))
+(dboard:data-path-test-ids-set! *data* (make-hash-table))
 
 ;; Look up run-ids by ??
-(dboard:data-set-path-run-ids! *data* (make-hash-table))
+(dboard:data-path-run-ids-set! *data* (make-hash-table))
 
 (define (d:data-init dat)
   (d:data-run-keys-set!      dat (make-hash-table))
   (d:data-curr-test-ids-set! dat (make-hash-table))
   (d:data-path-run-ids-set!  dat (make-hash-table))
@@ -158,11 +158,11 @@
 	 (get-runs-sig    (conc (client:get-signature) " get-runs"))
 	 (get-tests-sig   (conc (client:get-signature) " get-tests"))
 	 (get-details-sig (conc (client:get-signature) " get-test-details"))
 
 	 ;; test-ids to get and display are indexed on window-id in curr-test-ids hash
-	 (test-ids        (hash-table-values (dboard:data-get-curr-test-ids *data*)))
+	 (test-ids        (hash-table-values (dboard:data-curr-test-ids *data*)))
 	 ;; run-id is #f in next line to send the query to server 0
  	 (run-changes     (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data #f runname #f #f keypatts))
 	 (tests-detail-changes (if (not (null? test-ids))
 				   (synchash:client-get 'db:get-test-info-by-ids get-details-sig 0  data #f test-ids)
 				   '()))
@@ -206,24 +206,24 @@
 		       (key-vals   (map (lambda (key)(db:get-value-by-header run-record header key))
 					keys))
 		       (run-name   (db:get-value-by-header run-record header "runname"))
 		       (col-name   (conc (string-intersperse key-vals "\n") "\n" run-name))
 		       (run-path   (append key-vals (list run-name))))
-		  (hash-table-set! (dboard:data-get-run-keys *data*) run-id run-path)
-		  (iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+		  (hash-table-set! (dboard:data-run-keys *data*) run-id run-path)
+		  (iup:attribute-set! (dboard:data-runs-matrix *data*)
 				      (conc rownum ":" colnum) col-name)
 		  (hash-table-set! runid-to-col run-id (list colnum run-record))
 		  ;; Here we update the tests treebox and tree keys
-		  (tree:add-node (dboard:data-get-tests-tree *data*) "Runs" (append key-vals (list run-name))
+		  (tree:add-node (dboard:data-tests-tree *data*) "Runs" (append key-vals (list run-name))
 				 userdata: (conc "run-id: " run-id))
 		  (set! colnum (+ colnum 1))))
 	      run-ids)
 
     ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table
     ;; Do this analysis in the order of the run-ids, the most recent run wins
     (for-each (lambda (run-id)
-		(let* ((run-path       (hash-table-ref (dboard:data-get-run-keys *data*) run-id))
+		(let* ((run-path       (hash-table-ref (dboard:data-run-keys *data*) run-id))
 		       (test-changes   (hash-table-ref all-test-changes run-id))
 		       (new-test-dat   (car test-changes))
 		       (removed-tests  (cadr test-changes))
 		       (tests          (sort (map cadr (filter (lambda (testrec)
 								 (eq? run-id (db:mintest-get-run_id (cadr testrec))))
@@ -258,48 +258,48 @@
 				     (dispname  (if (string=? itempath "") testname (conc "   " itempath)))
 				     (rownum    (hash-table-ref/default testname-to-row fullname #f))
 				     (test-path (append run-path (if (equal? itempath "") 
 								     (list testname)
 								     (list testname itempath))))
-				     (tb         (dboard:data-get-tests-tree *data*)))
+				     (tb         (dboard:data-tests-tree *data*)))
 				(print "INFONOTE: run-path: " run-path)
-				(tree:add-node (dboard:data-get-tests-tree *data*) "Runs" 
+				(tree:add-node (dboard:data-tests-tree *data*) "Runs" 
 					       test-path
 					       userdata: (conc "test-id: " test-id))
 				(let ((node-num (tree:find-node tb (cons "Runs" test-path)))
 				      (color    (car (gutils:get-color-for-state-status state status))))
 				  (debug:print 0 *default-log-port* "node-num: " node-num ", color: " color)
 				  (iup:attribute-set! tb (conc "COLOR" node-num) color))
-				(hash-table-set! (dboard:data-get-path-test-ids *data*) test-path test-id)
+				(hash-table-set! (dboard:data-path-test-ids *data*) test-path test-id)
 				(if (not rownum)
 				    (let ((rownums (hash-table-values testname-to-row)))
 				      (set! rownum (if (null? rownums)
 						       1
 						       (+ 1 (apply max rownums))))
 				      (hash-table-set! testname-to-row fullname rownum)
 				      ;; create the label
-				      (iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+				      (iup:attribute-set! (dboard:data-runs-matrix *data*)
 							  (conc rownum ":" 0) dispname)
 				      ))
 				;; set the cell text and color
 				;; (debug:print 2 *default-log-port* "rownum:colnum=" rownum ":" colnum ", state=" status)
-				(iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+				(iup:attribute-set! (dboard:data-runs-matrix *data*)
 						    (conc rownum ":" colnum)
 						    (if (member state '("ARCHIVED" "COMPLETED"))
 							status
 							state))
-				(iup:attribute-set! (dboard:data-get-runs-matrix *data*)
+				(iup:attribute-set! (dboard:data-runs-matrix *data*)
 						    (conc "BGCOLOR" rownum ":" colnum)
 						    (car (gutils:get-color-for-state-status state status)))
 				))
 			    tests)))
 	      run-ids)
 
-    (let ((updater (hash-table-ref/default  (dboard:data-get-updaters *data*) window-id #f)))
+    (let ((updater (hash-table-ref/default  (dboard:data-updaters *data*) window-id #f)))
       (if updater (updater (hash-table-ref/default data get-details-sig #f))))
 
-    (iup:attribute-set! (dboard:data-get-runs-matrix *data*) "REDRAW" "ALL")
+    (iup:attribute-set! (dboard:data-runs-matrix *data*) "REDRAW" "ALL")
     ;; (debug:print 2 *default-log-port* "run-changes: " run-changes)
     ;; (debug:print 2 *default-log-port* "test-changes: " test-changes)
     (list run-changes all-test-changes)))
 
 ;;======================================================================
@@ -323,19 +323,18 @@
 	  (if (null? tal)
 	      (reverse (cons newitem res))
 	      (loop (car tal)(cdr tal)(cons newitem res)))))))
 
 (define (dcommon:examine-xterm run-id test-id)
-  (let*
-      ((testdat (rmt:get-test-info-by-id run-id test-id)))
-       (if (not testdat)
+  (let* ((testdat (rmt:get-test-info-by-id run-id test-id)))
+    (if (not testdat)
 	(begin
 	  (debug:print 2 "ERROR: No test data found for test " test-id ", exiting")
 	  (exit 1))
         (let*
             ((rundir        (if testdat 
-				  (db:test-get-rundir testdat)
+				(db:test-get-rundir testdat)
 				  logfile))
              (testfullname  (if testdat (db:test-get-fullname testdat) "Gathering data ..."))
              (xterm      (lambda ()
                            (if (directory-exists? rundir)
                                (let* ((shell (if (get-environment-variable "SHELL") 
@@ -924,16 +923,16 @@
 	       #:value "megatest "
 	       #:expand "HORIZONTAL"
 	       #:readonly "YES"
 	       #:font "Courier New, -12"
 	       )))
-      (dboard:data-set-command-tb! data tb)
+      (dboard:data-command-tb-set! data tb)
       tb)
     (iup:button "Execute" #:size "50x"
 		#:action (lambda (obj)
 			   (let ((cmd (conc "xterm -geometry 180x20 -e \""
-					    (iup:attribute (dboard:data-get-command-tb data) "VALUE")
+					    (iup:attribute (dboard:data-command-tb data) "VALUE")
 					    ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &")))
 			     (system cmd)))))))
 
 (define (dcommon:command-action-selector data)
   (iup:frame
@@ -943,37 +942,37 @@
     (let* ((cmds-list '("run" "remove-runs" "set-state-status" "lock-runs" "unlock-runs"))
 	   (lb         (iup:listbox #:expand "HORIZONTAL"
 				    #:dropdown "YES"
 				    #:action (lambda (obj val index lbstate)
 					       ;; (print obj " " val " " index " " lbstate)
-					       (dboard:data-set-command! data val)
+					       (dboard:data-command-set! data val)
 					       (dashboard:update-run-command data))))
 	   (default-cmd (car cmds-list)))
       (iuplistbox-fill-list lb cmds-list selected-item: default-cmd)
-      (dboard:data-set-command! data default-cmd)
+      (dboard:data-command-set! data default-cmd)
       lb))))
 
 (define (dcommon:command-runname-selector alldat data)
   (iup:frame
    #:title "Runname"
    (let* ((default-run-name (seconds->work-week/day (current-seconds)))
 	  (tb (iup:textbox #:expand "HORIZONTAL"
 			   #:action (lambda (obj val txt)
 				      ;; (print "obj: " obj " val: " val " unk: " unk)
-				      (dboard:data-set-run-name! data txt) ;; (iup:attribute obj "VALUE"))
+				      (dboard:data-run-name-set! data txt) ;; (iup:attribute obj "VALUE"))
 				      (dashboard:update-run-command data))
-			   #:value (or default-run-name (dboard:data-get-run-name data))))
+			   #:value (or default-run-name (dboard:data-run-name data))))
 	  (lb (iup:listbox #:expand "HORIZONTAL"
 			   #:dropdown "YES"
 			   #:action (lambda (obj val index lbstate)
 				      (if (not (equal? val ""))
 					  (begin
 					    (iup:attribute-set! tb "VALUE" val)
-					    (dboard:data-set-run-name! data val)
+					    (dboard:data-run-name-set! data val)
 					    (dashboard:update-run-command data))))))
 	  (refresh-runs-list (lambda ()
-			       (let* ((target        (dboard:data-get-target-string data))
+			       (let* ((target        (dboard:data-target-string data))
 				      (runs-for-targ (if (d:alldat-useserver alldat)
 							 (rmt:get-runs-by-patt (d:alldat-keys alldat) "%" target #f #f #f)
 							 (db:get-runs-by-patt (d:alldat-dblocal alldat) (d:alldat-keys alldat) "%" target #f #f #f)))
 				      (runs-header   (vector-ref runs-for-targ 0))
 				      (runs-dat      (vector-ref runs-for-targ 1))
@@ -981,13 +980,13 @@
 							   (map (lambda (x)
 								  (db:get-value-by-header x runs-header "runname"))
 								runs-dat))))
 				 ;; (iup:attribute-set! lb "REMOVEITEM" "ALL")
 				 (iuplistbox-fill-list lb run-names selected-item: default-run-name)))))
-     (dboard:data-set-updater-for-runs! data refresh-runs-list)
+     (dboard:data-updater-for-runs-set! data refresh-runs-list)
      (refresh-runs-list)
-     (dboard:data-set-run-name! data default-run-name)
+     (dboard:data-run-name-set! data default-run-name)
      (iup:hbox
       tb
       lb))))
 
 (define (dcommon:command-testname-selector alldat data update-keyvals key-listboxes)
@@ -996,16 +995,16 @@
    (iup:vbox
     ;; Text box for test patterns
     (iup:frame
      #:title "Test patterns (one per line)"
      (let ((tb (iup:textbox #:action (lambda (val a b)
-				       (dboard:data-set-test-patts!
+				       (dboard:data-test-patts-set!
 					*data*
 					(dboard:lines->test-patt b))
 				       (dashboard:update-run-command data))
 			    #:value (dboard:test-patt->lines
-				     (dboard:data-get-test-patts *data*))
+				     (dboard:data-test-patts *data*))
 			    #:expand "YES"
 			    #:size "x50"
 			    #:multiline "YES")))
        (set! test-patterns-textbox tb)
        tb))
@@ -1024,19 +1023,19 @@
       #:title "States"
       (dashboard:text-list-toggle-box 
        ;; Move these definitions to common and find the other useages and replace!
        (map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED")
        (lambda (all)
-	 (dboard:data-set-states! *data* all)
+	 (dboard:data-states-set! *data* all)
 	 (dashboard:update-run-command data))))
      ;; Text box for STATES
      (iup:frame
       #:title "Statuses"
       (dashboard:text-list-toggle-box 
        (map cadr *common:std-statuses*) ;; '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD")
        (lambda (all)
-	 (dboard:data-set-statuses! *data* all)
+	 (dboard:data-statuses-set! *data* all)
 	 (dashboard:update-run-command data))))))))
 
 (define (dcommon:command-tests-tasks-canvas data test-records sorted-testnames tests-draw-state)
   (iup:frame
    #:title "Tests and Tasks"
@@ -1106,11 +1105,11 @@
 										    (delete test-name patterns)))
 								  (newpatt      (string-intersperse newpatt-list "\n")))
 							     (iup:attribute-set! obj "REDRAW" "ALL")
 							     (hash-table-set! selected-tests test-name selected)
 							     (iup:attribute-set! test-patterns-textbox "VALUE" newpatt)
-							     (dboard:data-set-test-patts! data (dboard:lines->test-patt newpatt))
+							     (dboard:data-test-patts-set! data (dboard:lines->test-patt newpatt))
 							     (dashboard:update-run-command data)
 							     (if updater (updater last-xadj last-yadj)))))))
 						 (hash-table-keys tests-info)))))))
      canvas-obj)))
 

Index: multi-dboard.scm
==================================================================
--- multi-dboard.scm
+++ multi-dboard.scm
@@ -389,18 +389,18 @@
 			    (area      (car tree-path))
 			    (areadat-path (cdr tree-path)))
 		       #f
 		       ;; (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))
 
 ;;======================================================================
 ;; M A I N   M A T R I X
 ;;======================================================================
@@ -422,11 +422,11 @@
 			   #:click-cb (lambda (obj lin col status)
 					(print "obj: " obj " lin: " lin " col: " col " status: " status " value: " (iup:attribute obj "VALUE"))))))
     
     ;; (iup:attribute-set! view-matrix "RESIZEMATRIX" "YES")
     (iup:attribute-set! view-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
     view-matrix))

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -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       (db:test-get-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"
@@ -628,8 +628,8 @@
 				    (endtime   (current-milliseconds)))
 			       (set! nextmintime (+ endtime (* 2 (- endtime starttime))))
 			       (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)

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -135,10 +135,10 @@
                      ;; (print "obj: " obj ", id: " id ", state: " state)
                      (let* ((run-path (tree:node->path obj id))
                             (run-id   (tree-path->run-id (cdr run-path))))
                        (if run-id
                            (begin
-                             (dboard:data-set-curr-run-id! *data* run-id)
+                             (dboard:data-curr-run-id-set! *data* run-id)
                              (dashboard:update-run-summary-tab)))
                        ;; (print "path: " (tree:node->path obj id) " run-id: " run-id)
                        ))))
 |#