Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -573,11 +573,11 @@
 	      (list  "MT_ITEMPATH"  item-path)
 	      (list  "MT_RUNNAME"   runname)
 	      (list  "MT_MEGATEST"  megatest)
 	      (list  "MT_TARGET"    target)
 	      (list  "MT_LINKTREE"  (configf:lookup *configdat* "setup" "linktree"))
-	      (list  "MT_TESTSUITE_NAME" (common:get-testsuite-name))))
+	      (list  "MT_TESTSUITENAME" (common:get-testsuite-name))))
 
 	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
 	  ;; (change-directory top-path)
 	  ;; Can setup as client for server mode now
 	  ;; (client:setup)
@@ -863,11 +863,11 @@
 	    )))
     (if (and *toppath*
 	     (directory-exists? *toppath*))
 	(begin
 	  (setenv "MT_RUN_AREA_HOME" *toppath*)
-	  (setenv "MT_TESTSUITE_NAME" (common:get-testsuite-name)))
+	  (setenv "MT_TESTSUITENAME" (common:get-testsuite-name)))
 	(begin
 	  (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")
           ;;(exit 1)
           #f
           ))