diff -r ebae0e434898 -r 348fd9cb7b14 src/string.c
--- a/src/string.c	Wed May 16 13:13:33 2018 +0200
+++ b/src/string.c	Wed May 16 14:02:59 2018 +0200
@@ -201,8 +201,8 @@
     return ret;
 }
 
-scstr_t scstrsubs(scstr_t s, size_t start) {
-    return scstrsubsl (s, start, s.length-start);
+scstr_t scstrsubs(scstr_t string, size_t start) {
+    return scstrsubsl(string, start, string.length-start);
 }
 
 scstr_t scstrsubsl(scstr_t s, size_t start, size_t length) {
@@ -215,9 +215,9 @@
 }
 
 
-int ucx_strchr(const char *string, size_t length, int chr, size_t *pos) {
+static int ucx_strchr(const char *str, size_t length, int chr, size_t *pos) {
     for(size_t i=0;i<length;i++) {
-        if(string[i] == chr) {
+        if(str[i] == chr) {
             *pos = i;
             return 1;
         }
@@ -225,10 +225,10 @@
     return 0;
 }
 
-int ucx_strrchr(const char *string, size_t length, int chr, size_t *pos) {
+static int ucx_strrchr(const char *str, size_t length, int chr, size_t *pos) {
     if(length > 0) {
         for(size_t i=length ; i>0 ; i--) {
-            if(string[i-1] == chr) {
+            if(str[i-1] == chr) {
                 *pos = i-1;
                 return 1;
             }
@@ -278,7 +278,7 @@
     } while (0);
 
 
-const char* ucx_strstr(
+static const char* ucx_strstr(
         const char *str,
         size_t length,
         const char *match,
@@ -511,11 +511,11 @@
     }
 }
 
-sstr_t scstrdup(scstr_t s) {
+sstr_t ucx_strdup(scstr_t s) {
     return sstrdup_a(ucx_default_allocator(), s);
 }
 
-sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t s) {
+sstr_t ucx_strdup_a(UcxAllocator *allocator, scstr_t s) {
     sstr_t newstring;
     newstring.ptr = (char*)almalloc(allocator, s.length + 1);
     if (newstring.ptr) {
@@ -531,7 +531,7 @@
 }
 
 
-size_t ucx_strtrim(const char *s, size_t len, size_t *newlen) {
+static size_t ucx_strtrim(const char *s, size_t len, size_t *newlen) {
     const char *newptr = s;
     size_t length = len;