@@ -15,17 +15,17 @@
 
 (use regex)
 (declare (unit process))
 (declare (uses common))
 
-(define (conservative-read port)
+(define (process:conservative-read port)
   (let loop ((res ""))
     (if (not (eof-object? (peek-char port)))
 	(loop (conc res (read-char port)))
 	res)))
-    
-(define (cmd-run-with-stderr->list cmd . params)
+
+(define (process:cmd-run-with-stderr->list cmd . params)
   ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
 ;;  (handle-exceptions
 ;;   exn
 ;;   (begin
 ;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
@@ -34,11 +34,11 @@
    (let-values (((fh fho pid fhe) (if (null? params)
 				      (process* cmd)
 				      (process* cmd params))))
        (let loop ((curr (read-line fh))
 		  (result  '()))
-	 (let ((errstr (conservative-read fhe)))
+	 (let ((errstr (process:conservative-read fhe)))
 	   (if (not (string=? errstr ""))
 	       (set! result (append result (list errstr)))))
        (if (not (eof-object? curr))
 	   (loop (read-line fh)
 		 (append result (list curr)))