Index: kernel/generic/include/string.h
===================================================================
--- kernel/generic/include/string.h	(revision e1813cf4114a4d3ec284d7ebb2533fb7ce78e6fd)
+++ kernel/generic/include/string.h	(revision 1b0b48e09eab2e821aca4d6f6b078ce38136134f)
@@ -43,12 +43,12 @@
 
 extern wchar_t chr_decode(const char *, size_t *, size_t);
-extern bool chr_encode(const wchar_t, char *, size_t *, size_t limit);
-extern size_t utf8_count_bytes(const char *str, count_t count);
+extern bool chr_encode(const wchar_t, char *, size_t *, size_t);
+extern size_t str_lsize(const char *, count_t);
 extern bool ascii_check(const wchar_t ch);
 extern bool unicode_check(const wchar_t ch);
 
 extern size_t strlen(const char *str);
-extern size_t strlen_utf8(const char *str);
-extern size_t strlen_utf32(const wchar_t *str);
+extern count_t str_length(const char *str);
+extern count_t wstr_length(const wchar_t *str);
 
 extern int strcmp(const char *src, const char *dst);