@@ -526,11 +526,11 @@
 	 (allowed-tests      #f)
 	 (runconf            #f))
 
     ;; check if readonly
     (when readonly-mode
-      (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed.")
+      (debug:print-error 0 *default-log-port* "Megatest database is readonly.  Cannot proceed.")
       (exit 1))
 
     ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
     ;; this will reduce issues in database corruption
     (common:check-db-dir-and-exit-if-insufficient)
@@ -2347,15 +2347,15 @@
 	 (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.db"))
+           (dbfile             (conc  *toppath* "/.db/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* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
+        (debug:print-error 0 *default-log-port* dbfile " is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
         (exit 1)))
     
     (debug:print-info 4 *default-log-port* "runs:operate-on => Header: " header " action: " action " new-state-status: " new-state-status)
     (if (> 2 (length state-status))
 	(begin