diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h
index b51cccec1..b81ca505d 100755
--- a/src/c/symbols_list.h
+++ b/src/c/symbols_list.h
@@ -1906,6 +1906,7 @@ cl_symbols[] = {
 {EXT_ "EVALUATE-FORMS", EXT_ORDINARY, NULL, -1, OBJNULL},
 
 {EXT_ "ARRAY-INDEX", EXT_ORDINARY, NULL, -1, OBJNULL},
+{EXT_ "ANSI-STREAM", EXT_ORDINARY, NULL, -1, OBJNULL},
 
 
 /* Tag for end of list */
diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h
index b2c55d082..c4fc98bce 100755
--- a/src/c/symbols_list2.h
+++ b/src/c/symbols_list2.h
@@ -1906,6 +1906,7 @@ cl_symbols[] = {
 {EXT_ "EVALUATE-FORMS",NULL},
 
 {EXT_ "ARRAY-INDEX",NULL},
+{EXT_ "ANSI-STREAM",NULL},
 
 
 /* Tag for end of list */
diff --git a/src/clos/builtin.lsp b/src/clos/builtin.lsp
index a771abecb..962b4344a 100644
--- a/src/clos/builtin.lsp
+++ b/src/clos/builtin.lsp
@@ -52,14 +52,14 @@
 	        (base-string string vector)
 	        (bit-vector vector)
 	    (stream)
-	      (ansi-stream stream)
-		(file-stream ansi-stream)
-		(echo-stream ansi-stream)
-		(string-stream ansi-stream)
-		(two-way-stream ansi-stream)
-		(synonym-stream ansi-stream)
-		(broadcast-stream ansi-stream)
-		(concatenated-stream ansi-stream)
+	      (ext:ansi-stream stream)
+		(file-stream ext:ansi-stream)
+		(echo-stream ext:ansi-stream)
+		(string-stream ext:ansi-stream)
+		(two-way-stream ext:ansi-stream)
+		(synonym-stream ext:ansi-stream)
+		(broadcast-stream ext:ansi-stream)
+		(concatenated-stream ext:ansi-stream)
 	    (character)
 	    (number)
 	      (real number)
diff --git a/src/clos/streams.lsp b/src/clos/streams.lsp
index ea27c070e..04fc2e575 100644
--- a/src/clos/streams.lsp
+++ b/src/clos/streams.lsp
@@ -12,7 +12,7 @@
 
 (in-package "GRAY")
 
-(import 'clos::ansi-stream)
+(import 'ext:ansi-stream)
 
 ;;;
 ;;; This is the generic function interface for CLOS streams.
@@ -470,7 +470,7 @@
 ;; UNREAD-CHAR
 
 (defmethod stream-unread-char ((stream ansi-stream) character)
-  (cl:unread-char stream character))
+  (cl:unread-char character stream))
 
 (defmethod stream-unread-char ((stream ansi-stream) character)
   (bug-or-error stream 'stream-unread-char))
@@ -560,7 +560,7 @@
 ;; WRITE-BYTE
 
 (defmethod stream-write-byte ((stream ansi-stream) integer)
-  (cl:write-byte stream integer))
+  (cl:write-byte integer stream))
 
 (defmethod stream-write-byte ((stream t) integer)
   (bug-or-error stream 'stream-write-byte))
@@ -569,7 +569,7 @@
 ;; WRITE-CHAR
 
 (defmethod stream-write-char ((stream ansi-stream) character)
-  (cl:write-char stream character))
+  (cl:write-char character stream))
 
 (defmethod stream-write-char ((stream t) character)
   (bug-or-error stream 'stream-write-char))
diff --git a/src/lsp/predlib.lsp b/src/lsp/predlib.lsp
index 04834263f..51ff92cf1 100644
--- a/src/lsp/predlib.lsp
+++ b/src/lsp/predlib.lsp
@@ -1188,9 +1188,10 @@ if not possible."
 	       (STRING-STREAM)
 	       (SYNONYM-STREAM)
  	       (TWO-WAY-STREAM)
-	       (STREAM (OR BROADCAST-STREAM CONCATENATED-STREAM ECHO-STREAM
-			   FILE-STREAM STRING-STREAM SYNONYM-STREAM TWO-WAY-STREAM
-			   #+clos-streams GRAY:FUNDAMENTAL-STREAM))
+	       (EXT:ANSI-STREAM (OR BROADCAST-STREAM CONCATENATED-STREAM ECHO-STREAM
+                             FILE-STREAM STRING-STREAM SYNONYM-STREAM TWO-WAY-STREAM
+                             #+clos-streams GRAY:FUNDAMENTAL-STREAM))
+               (STREAM EXT:ANSI-STREAM)
 
 	       (READTABLE)
 	       #+threads (MP::PROCESS)