Index: tests/collections/string-istream-manip.cfa
===================================================================
--- tests/collections/string-istream-manip.cfa	(revision 3f631d63dc8a3d8d5bd5e664c971d336878cb507)
+++ tests/collections/string-istream-manip.cfa	(revision 16d9c3ad11804ba6611afddc59feffaa040594e1)
@@ -176,9 +176,9 @@
 		sin | ignore( getline( s, '%' ) ) | nl;			sout | "18" | s;
 
-		sin | quoted( s );								sout | "19" | s;
-		sin | quoted( s, '\'' );						sout | "20" | s;
-		sin | quoted( s, '{', '}' );					sout | "21" | s;
-		sin | quoted( s, 'X', 'Y' );					sout | "22" | s;
-		sin | ignore( quoted( s, 'X', 'Y' ) );			sout | "23" | s;
+		sin | quote( s );								sout | "19" | s;
+		sin | quote( s, '\'' );							sout | "20" | s;
+		sin | quote( s, '{', '}' );						sout | "21" | s;
+		sin | quote( s, 'X', 'Y' );						sout | "22" | s;
+		sin | ignore( quote( s, 'X', 'Y' ) );			sout | "23" | s;
 		sin | nl;
 	}
@@ -213,9 +213,9 @@
 		sin | ignore( getline( s, '%' ) ) | nl;			sout | "18" | s;
 
-		sin | quoted( s );								sout | "19" | s;
-		sin | quoted( s, '\'' );						sout | "20" | s;
-		sin | quoted( s, '{', '}' );					sout | "21" | s;
-		sin | quoted( s, 'X', 'Y' );					sout | "22" | s;
-		sin | ignore( quoted( s, 'X', 'Y' ) );			sout | "23" | s;
+		sin | quote( s );								sout | "19" | s;
+		sin | quote( s, '\'' );							sout | "20" | s;
+		sin | quote( s, '{', '}' );						sout | "21" | s;
+		sin | quote( s, 'X', 'Y' );						sout | "22" | s;
+		sin | ignore( quote( s, 'X', 'Y' ) );			sout | "23" | s;
 	}
 }