@@ -177,12 +177,12 @@
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
                             if it contains forward slashes the path will be converted
                             to windows style
 Getting started
-  -gen-megatest-area       : create a skeleton megatest area. You will be prompted for paths
-  -gen-megatest-test tname : create a skeleton megatest test. You will be prompted for info
+  -create-megatest-area       : create a skeleton megatest area. You will be prompted for paths
+  -create-test testname       : create a skeleton megatest test. You will be prompted for info
 
 Examples
 
 # Get test path, use '.' to get a single path or a specific path/file pattern
 megatest -test-files 'logs/*.log' -target ubuntu/n%/no% -runname w49% -testpatt test_mt%
@@ -241,11 +241,11 @@
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
 			"-set-run-status"
 			"-debug" ;; for *verbosity* > 2
-			"-gen-megatest-test"
+			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
 			"-load"        ;; load and exectute a scheme file
 			"-section"
 			"-var"
@@ -304,11 +304,11 @@
 			"-remove-runs"
 			"-rebuild-db"
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
-			"-gen-megatest-area"
+			"-create-megatest-area"
 			"-mark-incompletes"
 
 			"-convert-to-norm"
 			"-convert-to-old"
 			"-import-megatest.db"
@@ -759,11 +759,11 @@
 	(if (launch:setup)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
-	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
+	      (if (or (args-defined? "-h" "-version" "-create-megatest-area" "-create-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
 		  (debug:print-info 1 *default-log-port* "Server connection not needed")
 		  (begin
 		    ;; (if run-id 
 		    ;;     (client:launch run-id) 
@@ -1829,17 +1829,17 @@
     (begin
       (debug:print 0 *default-log-port* "Look at the dashboard for now")
       ;; (megatest-gui)
       (set! *didsomething* #t)))
 
-(if (args:get-arg "-gen-megatest-area")
+(if (args:get-arg "-create-megatest-area")
     (begin
       (genexample:mk-megatest.config)
       (set! *didsomething* #t)))
 
-(if (args:get-arg "-gen-megatest-test")
-    (let ((testname (args:get-arg "-gen-megatest-test")))
+(if (args:get-arg "-create-test")
+    (let ((testname (args:get-arg "-create-test")))
       (genexample:mk-megatest-test testname)
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Update the database schema, clean up the db