Index: libcfa/src/collections/string.cfa
===================================================================
--- libcfa/src/collections/string.cfa	(revision c4f8c4bfa2372f6ff1d67445f9282c8bba3f0770)
+++ libcfa/src/collections/string.cfa	(revision 30548de557fe51569fd989d9a2f6f14e66179173)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 11 08:31:21 2025
-// Update Count     : 369
+// Last Modified On : Fri Apr 11 18:18:07 2025
+// Update Count     : 370
 //
 
@@ -234,6 +234,6 @@
 	}
 
-	istype & ?|?( istype & is, _Istream_Squoted f ) {
-		_Istream_Rquoted f2 = { { f.sstr.s.inner, (_Istream_str_base)f.sstr } };
+	istype & ?|?( istype & is, _Istream_Squote f ) {
+		_Istream_Rquote f2 = { { f.sstr.s.inner, (_Istream_str_base)f.sstr } };
 		return is | f2;
 	} // ?|?
Index: libcfa/src/collections/string.hfa
===================================================================
--- libcfa/src/collections/string.hfa	(revision c4f8c4bfa2372f6ff1d67445f9282c8bba3f0770)
+++ libcfa/src/collections/string.hfa	(revision 30548de557fe51569fd989d9a2f6f14e66179173)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 11 08:28:27 2025
-// Update Count     : 260
+// Last Modified On : Fri Apr 11 18:13:35 2025
+// Update Count     : 261
 //
 
@@ -111,7 +111,7 @@
 }; // _Istream_Swidth
 
-struct _Istream_Squoted {
+struct _Istream_Squote {
 	_Istream_Swidth sstr;
-}; // _Istream_Squoted
+}; // _Istream_Squote
 
 struct _Istream_Sstr {
@@ -131,10 +131,10 @@
 		f.delimiters[0] = delimiter; f.delimiters[1] = '\0'; f.flags.delimiter = true; return (_Istream_Sstr &)f;
 	}
-	_Istream_Squoted quoted( string & s, const char Ldelimiter = '\"', const char Rdelimiter = '\0' ) {
-		return (_Istream_Squoted)@{ { .s = s, { {.delimiters = { Ldelimiter, Rdelimiter, '\0' }}, .wd = -1, {.flags.rwd = true} } } };
+	_Istream_Squote quote( string & s, const char Ldelimiter = '\"', const char Rdelimiter = '\0' ) {
+		return (_Istream_Squote)@{ { .s = s, { {.delimiters = { Ldelimiter, Rdelimiter, '\0' }}, .wd = -1, {.flags.rwd = true} } } };
 	}
-	_Istream_Squoted & quoted( _Istream_Swidth & f, const char Ldelimiter = '"', const char Rdelimiter = '\0' ) {
+	_Istream_Squote & quote( _Istream_Swidth & f, const char Ldelimiter = '"', const char Rdelimiter = '\0' ) {
 		f.delimiters[0] = Ldelimiter;  f.delimiters[1] = Rdelimiter;  f.delimiters[2] = '\0';
-		return (_Istream_Squoted &)f;
+		return (_Istream_Squote &)f;
 	}
 //	_Istream_Sstr incl( const char scanset[], string & s ) { return (_Istream_Sstr)@{ { .s = s, { {.scanset = scanset}, .wd = -1, {.flags.inex = false} } } }; }
@@ -147,5 +147,5 @@
 	_Istream_Sstr ignore( string & s ) { return (_Istream_Sstr)@{ .s = s, { {.scanset = 0p}, .wd = -1, {.flags.ignore = true} } }; }
 	_Istream_Sstr & ignore( _Istream_Swidth & f ) { f.flags.ignore = true; return (_Istream_Sstr &)f; }
-	_Istream_Squoted & ignore( _Istream_Squoted & f ) { f.sstr.flags.ignore = true; return (_Istream_Squoted &)f; }
+	_Istream_Squote & ignore( _Istream_Squote & f ) { f.sstr.flags.ignore = true; return (_Istream_Squote &)f; }
 //	_Istream_Sstr & ignore( _Istream_Sstr & f ) { f.sstr.flags.ignore = true; return (_Istream_Sstr &)f; }
 	_Istream_Sstr & ignore( _Istream_Sstr & f ) { f.flags.ignore = true; return (_Istream_Sstr &)f; }
@@ -153,5 +153,5 @@
 
 forall( istype & | basic_istream( istype ) ) {
-	istype & ?|?( istype & is, _Istream_Squoted f );
+	istype & ?|?( istype & is, _Istream_Squote f );
 	istype & ?|?( istype & is, _Istream_Sstr f );
 	static inline istype & ?|?( istype & is, _Istream_Swidth f ) { return is | *(_Istream_Sstr *)&f; }
Index: libcfa/src/collections/string_res.cfa
===================================================================
--- libcfa/src/collections/string_res.cfa	(revision c4f8c4bfa2372f6ff1d67445f9282c8bba3f0770)
+++ libcfa/src/collections/string_res.cfa	(revision 30548de557fe51569fd989d9a2f6f14e66179173)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  9 08:44:17 2025
-// Update Count     : 128
+// Last Modified On : Fri Apr 11 18:18:42 2025
+// Update Count     : 129
 //
 
@@ -249,5 +249,5 @@
 
 forall( istype & | basic_istream( istype ) )
-istype & ?|?( istype & is, _Istream_Rquoted f ) with( f.rstr ) {
+istype & ?|?( istype & is, _Istream_Rquote f ) with( f.rstr ) {
 	if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
 	int args;
Index: libcfa/src/collections/string_res.hfa
===================================================================
--- libcfa/src/collections/string_res.hfa	(revision c4f8c4bfa2372f6ff1d67445f9282c8bba3f0770)
+++ libcfa/src/collections/string_res.hfa	(revision 30548de557fe51569fd989d9a2f6f14e66179173)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  9 15:16:29 2025
-// Update Count     : 76
+// Last Modified On : Fri Apr 11 18:11:05 2025
+// Update Count     : 77
 //
 
@@ -132,9 +132,9 @@
 }; // _Istream_Rwidth
 
-struct _Istream_Rquoted {
+struct _Istream_Rquote {
 	// string_res * s;
 	// inline _Istream_str_base;
 	_Istream_Rwidth rstr;
-}; // _Istream_Rquoted
+}; // _Istream_Rquote
 
 struct _Istream_Rstr {
@@ -154,10 +154,10 @@
 		f.delimiters[0] = delimiter; f.delimiters[1] = '\0'; f.flags.delimiter = true; return (_Istream_Rstr &)f;
 	}
-	_Istream_Rquoted quoted( string_res & s, const char Ldelimiter = '\"', const char Rdelimiter = '\0' ) {
-		return (_Istream_Rquoted)@{ { .s = &s, { {.delimiters = { Ldelimiter, Rdelimiter, '\0' }}, .wd = -1, {.flags.rwd = true} } } };
-	}
-	_Istream_Rquoted & quoted( _Istream_Rwidth & f, const char Ldelimiter = '"', const char Rdelimiter = '\0' ) {
+	_Istream_Rquote quote( string_res & s, const char Ldelimiter = '\"', const char Rdelimiter = '\0' ) {
+		return (_Istream_Rquote)@{ { .s = &s, { {.delimiters = { Ldelimiter, Rdelimiter, '\0' }}, .wd = -1, {.flags.rwd = true} } } };
+	}
+	_Istream_Rquote & quote( _Istream_Rwidth & f, const char Ldelimiter = '"', const char Rdelimiter = '\0' ) {
 		f.delimiters[0] = Ldelimiter;  f.delimiters[1] = Rdelimiter;  f.delimiters[2] = '\0';
-		return (_Istream_Rquoted &)f;
+		return (_Istream_Rquote &)f;
 	}
 	_Istream_Rstr incl( const char scanset[], string_res & s ) { return (_Istream_Rstr)@{ .s = &s, { {.scanset = scanset}, .wd = -1, {.flags.inex = false} } }; }
@@ -167,9 +167,9 @@
 	_Istream_Rstr ignore( string_res & s ) { return (_Istream_Rstr)@{ .s = &s, { {.scanset = 0p}, .wd = -1, {.flags.ignore = true} } }; }
 	_Istream_Rstr & ignore( _Istream_Rwidth & f ) { f.flags.ignore = true; return (_Istream_Rstr &)f; }
-	_Istream_Rquoted & ignore( _Istream_Rquoted & f ) { f.rstr.flags.ignore = true; return (_Istream_Rquoted &)f; }
+	_Istream_Rquote & ignore( _Istream_Rquote & f ) { f.rstr.flags.ignore = true; return (_Istream_Rquote &)f; }
 	_Istream_Rstr & ignore( _Istream_Rstr & f ) { f.flags.ignore = true; return (_Istream_Rstr &)f; }
 } // distribution
 forall( istype & | basic_istream( istype ) ) {
-	istype & ?|?( istype & is, _Istream_Rquoted f );
+	istype & ?|?( istype & is, _Istream_Rquote f );
 	istype & ?|?( istype & is, _Istream_Rstr f );
 	static inline istype & ?|?( istype & is, _Istream_Rwidth f ) { return is | *(_Istream_Rstr *)&f; }