diff -Naur ./srfi-40-base.scm /home/azul/src/chicken-eggs/srfi-40/src/srfi-40-base.scm
--- ./srfi-40-base.scm	2004-07-02 12:34:08.000000000 -0500
+++ /home/azul/src/chicken-eggs/srfi-40/src/srfi-40-base.scm	2004-07-12 12:35:32.000000000 -0500
@@ -17,7 +17,7 @@
   (export stream-low-level-strict
 	  stream-low-level-delay stream-low-level-lazy stream-cons
 	  stream-delay stream-error
-          make-stream stream? stream-promise stream-null stream-null?
+          make-stream-obj stream? stream-promise stream-null stream-null?
           stream-pair? stream-car stream-cdr stream stream-unfoldn
           stream-map stream-for-each stream-filter))
 
@@ -34,11 +34,11 @@
 ;; STREAM-TYPE -- type of streams
 ;; STREAM? object -- #t if object is a stream, #f otherwise
 ;; (define-record-type stream-type
-;;   (make-stream promise)
+;;   (make-stream-obj promise)
 ;;   stream?
 ;;   (promise stream-promise))
 
-(define make-stream
+(define make-stream-obj
   (lambda (promise)
     (##sys#make-structure 'stream promise)))
 (define stream?
@@ -87,7 +87,7 @@
 
 ;; STREAM-LOW-LEVEL-STRICT -- make a value into a low-level promise
 (define (stream-low-level-strict x)
-  (make-stream (box (cons 'value x))))
+  (make-stream-obj (box (cons 'value x))))
 
 ;; STREAM-LOW-LEVEL-FORCE -- force the value from a low-level promise
 (define (stream-low-level-force promise)
@@ -105,7 +105,7 @@
 ;;; STREAM SYNTAX AND FUNCTIONS
 
 ;; STREAM-NULL -- the distinguished nil stream
-(define stream-null (make-stream (stream-low-level-delay '())))
+(define stream-null (make-stream-obj (stream-low-level-delay '())))
 
 ;; STREAM-CONS object stream -- primitive constructor of streams
 ;; (moved to srfi-40-syntax.scm)
diff -Naur ./srfi-40.scm /home/azul/src/chicken-eggs/srfi-40/src/srfi-40.scm
--- ./srfi-40.scm	2004-07-12 15:28:18.000000000 -0500
+++ /home/azul/src/chicken-eggs/srfi-40/src/srfi-40.scm	2004-07-12 23:14:37.000000000 -0500
@@ -34,7 +34,7 @@
 ;;(define-syntax stream-cons
 ;;  (syntax-rules ()
 ;;    ((stream-cons obj strm)
-;;      (make-stream
+;;      (make-stream-obj
 ;;        (stream-low-level-delay
 ;;          (if (not (stream? strm))
 ;;              (stream-error "attempt to stream-cons onto non-stream")
@@ -42,7 +42,7 @@
 (define-macro stream-cons
   (lambda (obj strm)
     (let ((strm-val (gensym)))
-      `(make-stream
+      `(make-stream-obj
          (stream-low-level-delay
            (let ((,strm-val ,strm))
              (if (not (stream? ,strm-val))
@@ -53,11 +53,11 @@
 ;;(define-syntax stream-delay
 ;;  (syntax-rules ()
 ;;    ((stream-delay expr)
-;;      (make-stream
+;;      (make-stream-obj
 ;;        (stream-low-level-lazy expr)))))
 (define-macro stream-delay
   (lambda (exp)
-    `(make-stream (stream-low-level-lazy ,exp))))
+    `(make-stream-obj (stream-low-level-lazy ,exp))))
 
 ;;; END