Index: tests/collections/string-api-coverage.cfa
===================================================================
--- tests/collections/string-api-coverage.cfa	(revision 30bf6bf3677858106dafefcbfae7eff10d078623)
+++ tests/collections/string-api-coverage.cfa	(revision 9018dcf792e16e3e114b78eda77160bd4b5959e6)
@@ -159,5 +159,5 @@
 
 
-    sout | size(s); // 5
+    sout | len(s); // 5
 
     //
Index: tests/collections/string-gc.cfa
===================================================================
--- tests/collections/string-gc.cfa	(revision 30bf6bf3677858106dafefcbfae7eff10d078623)
+++ tests/collections/string-gc.cfa	(revision 9018dcf792e16e3e114b78eda77160bd4b5959e6)
@@ -12,5 +12,5 @@
 
 void prtStrRep(const char * label, string_res & s) {
-    sout | label | "from" | heapOffsetStart(s) | "to" | (heapOffsetStart(s) + size(s));
+    sout | label | "from" | heapOffsetStart(s) | "to" | (heapOffsetStart(s) + len(s));
 }
 #define PRT_STR_REP(s) prtStrRep( #s, s )
@@ -29,5 +29,5 @@
     // x and padder overlap
     sout | "--A";
-    sout | "length of x:" | size(x);
+    sout | "length of x:" | len(x);
     PRT_STR_REP(padder);
     PRT_STR_REP(x);
@@ -39,5 +39,5 @@
     // x and padder still overlap; now x is huge
     sout | "--B";
-    sout | "length of x:" | size(x);
+    sout | "length of x:" | len(x);
     PRT_STR_REP(padder);
     PRT_STR_REP(x);
@@ -53,5 +53,5 @@
 
     // want the next edit to straddle the bound
-    assert( bytesRemaining() < size(padder) );
+    assert( bytesRemaining() < len(padder) );
 
     sout | "--D";
Index: tests/collections/string-istream-manip.cfa
===================================================================
--- tests/collections/string-istream-manip.cfa	(revision 30bf6bf3677858106dafefcbfae7eff10d078623)
+++ tests/collections/string-istream-manip.cfa	(revision 9018dcf792e16e3e114b78eda77160bd4b5959e6)
@@ -45,5 +45,5 @@
 				sin | s;
 				sout | casename | s;
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preS1");
@@ -60,5 +60,5 @@
 				sin | plainjane( s );
 				sout | casename | s;
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preSMN1");
@@ -75,5 +75,5 @@
 				sin | plainjane( s );
 				sout | casename | s;
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preRMN1");
@@ -91,5 +91,5 @@
 				sin | incl( ".:|# x", s );
 				sout | casename | " \"" | s | "\"";
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preSMI1");
@@ -107,5 +107,5 @@
 				sin | excl( "-\n", s );
 				sout | casename | " \"" | s | "\"";
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preSME1");
@@ -123,5 +123,5 @@
 				sin | getline( s );
 				sout | casename | s;
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 		}
 		echoTillX("preSMG1");
@@ -138,5 +138,5 @@
 				sin | getline( s, '@' );
 				sout | casename | s;
-			} while ( size(s) > 0 && s[size(s)-1] != 'x' );
+			} while ( len(s) > 0 && s[len(s)-1] != 'x' );
 			sin | skip(" \n");
 		}
Index: tests/collections/string-istream.cfa
===================================================================
--- tests/collections/string-istream.cfa	(revision 30bf6bf3677858106dafefcbfae7eff10d078623)
+++ tests/collections/string-istream.cfa	(revision 9018dcf792e16e3e114b78eda77160bd4b5959e6)
@@ -37,5 +37,5 @@
     for(;;) {
         sin | si;
-      if (size(si) > 0 && si[0] == '=') break;
+      if (len(si) > 0 && si[0] == '=') break;
         sout | si;    step_otherStringAction();
     }
@@ -50,5 +50,5 @@
     for(;;) {
         sin | si;
-      if (size(si) > 0 && si[0] == '=') break;
+      if (len(si) > 0 && si[0] == '=') break;
         sout | si;    step_otherStringAction();
     }
Index: tests/collections/string-overwrite.cfa
===================================================================
--- tests/collections/string-overwrite.cfa	(revision 30bf6bf3677858106dafefcbfae7eff10d078623)
+++ tests/collections/string-overwrite.cfa	(revision 9018dcf792e16e3e114b78eda77160bd4b5959e6)
@@ -78,6 +78,6 @@
     int we = ws + wl;
 
-    assert( ms >= 0 && ms <= me && me <= size(s) );
-    assert( ws >= 0 && ws <= we && we <= size(s) );
+    assert( ms >= 0 && ms <= me && me <= len(s) );
+    assert( ws >= 0 && ws <= we && we <= len(s) );
 
     string mod = s(ms, ml)`share;
@@ -92,5 +92,5 @@
     // visualize the pair of ranges
     sout | nlOff;
-    for ( i; size(s) ) {
+    for ( i; len(s) ) {
         if( i < ms || i > me ) {
             sout | ' ';
@@ -102,5 +102,5 @@
         }
     } sout | nl;
-    for ( i; size(s) ) {
+    for ( i; len(s) ) {
         if( i < ws || i > we ) {
             sout | ' ';
@@ -116,5 +116,5 @@
 
     mod = replaceWith;    // main replacement
-    sout | s | "( wit = " | wit | "witlen = " | size(wit) | " )";
+    sout | s | "( wit = " | wit | "witlen = " | len(wit) | " )";
     wit = "?";            // witness-revelaing replacement
     sout | s;