Index: uspace/dist/src/c/demos/edit/edit.c
===================================================================
--- uspace/dist/src/c/demos/edit/edit.c	(revision c0cef6f938006513bcdf3e25c4649ce73b376407)
+++ uspace/dist/src/c/demos/edit/edit.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -637,12 +637,12 @@
 	asprintf(&str, "%s: %s", prompt, init_value);
 	status_display(str);
-	console_set_pos(con, 1 + str_length(str), scr_rows - 1);
+	console_set_pos(con, 1 + str_code_points(str), scr_rows - 1);
 	free(str);
 
 	console_set_style(con, STYLE_INVERTED);
 
-	max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
+	max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_code_points(prompt));
 	str_to_wstr(buffer, max_len + 1, init_value);
-	nc = wstr_length(buffer);
+	nc = wstr_code_points(buffer);
 	done = false;
 
@@ -747,5 +747,5 @@
 	do {
 		sheet_copy_out(doc.sh, &sp, epos, buf, BUF_SIZE, &bep);
-		bytes = str_size(buf);
+		bytes = str_bytes(buf);
 
 		n_written = fwrite(buf, 1, bytes, f);
@@ -783,5 +783,5 @@
 		sheet_copy_out(doc.sh, &sp, epos, &buf[bpos], buf_size - bpos,
 		    &bep);
-		bytes = str_size(&buf[bpos]);
+		bytes = str_bytes(&buf[bpos]);
 		bpos += bytes;
 		sp = bep;
@@ -893,5 +893,5 @@
 
 		console_set_pos(con, 0, i);
-		size = str_size(row_buf);
+		size = str_bytes(row_buf);
 		pos = 0;
 		s_column = pane.sh_column;
@@ -1012,5 +1012,5 @@
 		/* Compute position where we overwrite with '..\0' */
 		if (fnw >= nextra + 2) {
-			p = fname + str_lsize(fname, fnw - nextra - 2);
+			p = fname + str_lbytes(fname, fnw - nextra - 2);
 		} else {
 			p = fname;
@@ -1609,5 +1609,5 @@
 {
 	size_t offset = 0;
-	return str_decode(str, &offset, str_size(str));
+	return str_decode(str, &offset, str_bytes(str));
 }
 
Index: uspace/dist/src/c/demos/edit/search.c
===================================================================
--- uspace/dist/src/c/demos/edit/search.c	(revision c0cef6f938006513bcdf3e25c4649ce73b376407)
+++ uspace/dist/src/c/demos/edit/search.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -55,5 +55,5 @@
 	}
 
-	search->pattern_length = wstr_length(p);
+	search->pattern_length = wstr_code_points(p);
 
 	if (reverse) {
Index: uspace/dist/src/c/demos/edit/sheet.c
===================================================================
--- uspace/dist/src/c/demos/edit/sheet.c	(revision c0cef6f938006513bcdf3e25c4649ce73b376407)
+++ uspace/dist/src/c/demos/edit/sheet.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -107,5 +107,5 @@
 	char *newp;
 
-	sz = str_size(str);
+	sz = str_bytes(str);
 	if (sh->text_size + sz > sh->dbuf_size) {
 		/* Enlarge data buffer. */
Index: uspace/dist/src/c/demos/tetris/screen.c
===================================================================
--- uspace/dist/src/c/demos/tetris/screen.c	(revision c0cef6f938006513bcdf3e25c4649ce73b376407)
+++ uspace/dist/src/c/demos/tetris/screen.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -321,5 +321,5 @@
 void scr_msg(char *s, bool set)
 {
-	int l = str_size(s);
+	int l = str_bytes(s);
 
 	moveto(Rows - 2, ((Cols - l) >> 1) - 1);
Index: uspace/dist/src/c/demos/tetris/tetris.c
===================================================================
--- uspace/dist/src/c/demos/tetris/tetris.c	(revision c0cef6f938006513bcdf3e25c4649ce73b376407)
+++ uspace/dist/src/c/demos/tetris/tetris.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -270,5 +270,5 @@
 			break;
 		case 'k':
-			if (str_size(keys = optarg) != 6)
+			if (str_bytes(keys = optarg) != 6)
 				usage();
 			break;