Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -591,11 +591,11 @@
 	 (old2new (member 'old2new options))
 	 (dejunk (member 'dejunk options))
 	 (killservers (member 'killservers options))
 	 (src-area (if old2new *toppath* tmp-area))
 	 (dest-area (if old2new tmp-area *toppath*))
-	 (dbfiles        (if old2new (glob (conc *toppath* "/.megatest/*.db")) (glob (conc tmp-area "/.megatest/*.db"))))
+	 (dbfiles        (if old2new (glob (conc *toppath* "/.mtdb/*.db")) (glob (conc tmp-area "/.mtdt/*.db"))))
 	 (keys (db:get-keys dbstruct))
 	 (sync-durations (make-hash-table)))
 
     ;; kill servers
     (if killservers (db:kill-servers))
@@ -606,12 +606,12 @@
 	 (lambda (srcfile)
 	   (debug:print-info 3 *default-log-port* "file: " srcfile)
 	   (let* ((fname    (conc (pathname-file srcfile) ".db"))
 		  (basename (pathname-file srcfile))
 		  (run-id   (if (string= basename "main") #f (string->number basename)))
-		  (destfile (conc dest-area "/.megatest/" fname))
-		  (dest-directory  (conc dest-area "/.megatest/"))
+		  (destfile (conc dest-area "/.mtdb/" fname))
+		  (dest-directory  (conc dest-area "/.mtdb/"))
 		  (time1    (file-modification-time srcfile))
 		  (time2    (if (file-exists? destfile)
 				(begin
 				  (debug:print-info 2 *default-log-port* "destfile " destfile " exists")
 				  (file-modification-time destfile))
@@ -1812,11 +1812,11 @@
 ;;
 ;; NOTE: This DOESN'T (necessarily) get the real run ids, but the number of the <number>.db!!
 
 (define (db:get-changed-run-ids since-time)
   (let* ((dbdir      (db:dbfile-path)) ;; (configf:lookup *configdat* "setup" "dbdir"))
-	 (alldbs     (glob (conc dbdir "/.megatest/[0-9]*.db")))
+	 (alldbs     (glob (conc dbdir "/.mtdb/[0-9]*.db")))
 	 (changed    (filter (lambda (dbfile)
 			       (> (file-modification-time dbfile) since-time))
 			     alldbs)))
     (delete-duplicates
      (map (lambda (dbfile)
@@ -4522,17 +4522,17 @@
 
 ;; sync for filesystem local db writes
 ;;
 (define (db:run-lock-and-sync no-sync-db)
   (let* ((tmp-area       (common:get-db-tmp-area))
-	 (dbfiles        (glob (conc tmp-area"/.megatest/*.db")))
+	 (dbfiles        (glob (conc tmp-area"/.mtdb/*.db")))
 	 (sync-durations (make-hash-table)))
     ;; (debug:print-info 0 *default-log-port* "lock-and-sync, dbfiles: "dbfiles)
     (for-each
      (lambda (file)
        (let* ((fname (conc (pathname-file file) ".db"))
-	      (fulln (conc *toppath*"/.megatest/"fname))
+	      (fulln (conc *toppath*"/.mtdb/"fname))
 	      (time1 (if (file-exists? file)
 			 (file-modification-time file)
 			 (begin
 			   (debug:print-info 0 *default-log-port* "Sync - I do not see file "file)
 			   1)))

Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -45,11 +45,11 @@
 ;; parameters
 ;;
 (define dbfile:testsuite-name (make-parameter #f))
 
 (define keep-age-param        (make-parameter 10))      ;; qif file age, if over move to attic
-(define num-run-dbs           (make-parameter 10))      ;; number of db's in .megatest
+(define num-run-dbs           (make-parameter 10))      ;; number of db's in .mtdb
 (define dbfile:sync-method    (make-parameter 'attach)) ;; 'attach or 'original
 (define dbfile:cache-method   (make-parameter 'inmem))  ;; 'direct
 
 ;; 'original     - use old condition code
 ;; 'suicide-mode - create mtrah/stop-the-train with info on what went wrong
@@ -83,16 +83,16 @@
   )
 
 ;; NOTE: Need one dbr:subdb per main.db, 1.db ...
 ;;
 (defstruct dbr:subdb
-  (dbname      #f) ;; .megatest/1.db
-  (mtdbfile    #f) ;; mtrah/.megatest/1.db
+  (dbname      #f) ;; .mtdb/1.db
+  (mtdbfile    #f) ;; mtrah/.mtdb/1.db
   (mtdbdat     #f) ;; only need one of these for syncing
   ;; (dbdats      (make-hash-table))  ;; id => dbdat 
-  (tmpdbfile   #f) ;; /tmp/.../.megatest/1.db
-  ;; (refndbfile  #f) ;; /tmp/.../.megatest/1.db_ref
+  (tmpdbfile   #f) ;; /tmp/.../.mtdb/1.db
+  ;; (refndbfile  #f) ;; /tmp/.../.mtdb/1.db_ref
   (dbstack     (make-stack)) ;; stack for tmp dbr:dbdat,
   (homehost    #f) ;; not used yet
   (on-homehost #f) ;; not used yet
   (read-only   #f)
   (last-sync   0)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2392,11 +2392,11 @@
 	 (bup-mutex    (make-mutex))
          (keep-records (args:get-arg "-keep-records")) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
 	 (test-records '())) ;; for tasks that we wish to operate on all tests in one fell swoop
 
     (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
-           (dbfile             (conc  *toppath* "/.megatest/main.db"))
+           (dbfile             (conc  *toppath* "/.mtdb/main.db"))
            (readonly-mode      (not (file-write-access? dbfile))))
       (when (and readonly-mode
                  (member action write-access-actions))
         (debug:print-error 0 *default-log-port* dbfile " is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
         (exit 1)))