@@ -17,10 +17,11 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit genexample))
+(declare (uses common))
 (use posix regex)
 
 (define genexample:example-logpro
 #<<EOF
   ;; You should have at least one expect:required. This ensures that your process ran
@@ -65,11 +66,11 @@
 	(begin
 	  (print "The path " path " does not exist or is not a directory. Attempting to create it now")
 	  (create-directory path #t)))
 
     ;; First check that the directory is empty!
-    (if (and (common:file-exists? path)
+    (if (and (file-exists? path)
 	     (not (null? (glob (conc path "/*")))))
 	(begin
 	  (print "WARNING: directory " path " is not empty, are you sure you want to continue?")
 	  (display "Enter y/n: ")
 	  (if (equal? "y" (read-line))
@@ -219,22 +220,22 @@
 	(scripts  '())
 	(items    '())
 	(rel-path #f))
 
     (cond
-     ((common:file-exists? "megatest.config")         (set! rel-path "./"))
-     ((common:file-exists? "../megatest.config")      (set! rel-path "../"))
-     ((common:file-exists? "../../megatest.config")   (set! rel-path "../../"))
-     ((common:file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
+     ((file-exists? "megatest.config")         (set! rel-path "./"))
+     ((file-exists? "../megatest.config")      (set! rel-path "../"))
+     ((file-exists? "../../megatest.config")   (set! rel-path "../../"))
+     ((file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
 
     ;; Don't gather data or continue if a) megatest.config can't be found or b) testconfig already exists
     (if (not rel-path)
 	(begin
 	  (print "ERROR: I could not find megatest.config, please run -create-test in the top dir of your megatest area")
 	  (exit 1)))
 
-    (if (common:file-exists? (conc rel-path "tests/" testname "/testconfig"))
+    (if (file-exists? (conc rel-path "tests/" testname "/testconfig"))
 	(begin
 	  (print "WARNING: You already have a testconfig in " rel-path "tests/" testname ", do you want to clobber your files?")
 	  (display "Enter y/n: ")
 	  (if (not (equal? "y" (read-line)))
 	      (begin