diff -r 75cb6590358b -r 1cf71e56f01e ucx/properties.c
--- a/ucx/properties.c	Sun Jul 14 17:11:34 2013 +0200
+++ b/ucx/properties.c	Mon Jul 15 13:53:51 2013 +0200
@@ -32,9 +32,9 @@
 
 #include "properties.h"
 
-UcxPropParser *ucx_prop_new() {
-    UcxPropParser *parser = (UcxPropParser*)malloc(
-            sizeof(UcxPropParser));
+UcxProperties *ucx_properties_new() {
+    UcxProperties *parser = (UcxProperties*)malloc(
+            sizeof(UcxProperties));
     if(!parser) {
         return NULL;
     }
@@ -54,20 +54,20 @@
     return parser;
 }
 
-void ucx_prop_free(UcxPropParser *parser) {
+void ucx_properties_free(UcxProperties *parser) {
     if(parser->tmp) {
         free(parser->tmp);
     }
     free(parser);
 }
 
-void ucx_prop_fill(UcxPropParser *parser, char *buf, size_t len) {
+void ucx_properties_fill(UcxProperties *parser, char *buf, size_t len) {
     parser->buffer = buf;
     parser->buflen = len;
     parser->pos = 0;
 }
 
-static void parser_tmp_append(UcxPropParser *parser, char *buf, size_t len) {
+static void parser_tmp_append(UcxProperties *parser, char *buf, size_t len) {
     if(parser->tmpcap - parser->tmplen < len) {
         size_t newcap = parser->tmpcap + len + 64;
         parser->tmp = (char*)realloc(parser->tmp, newcap);
@@ -77,7 +77,7 @@
     parser->tmplen += len;
 }
 
-int ucx_prop_parse(UcxPropParser *parser, sstr_t *name, sstr_t *value)  {   
+int ucx_properties_next(UcxProperties *parser, sstr_t *name, sstr_t *value)  {   
     if(parser->tmplen > 0) {
         char *buf = parser->buffer + parser->pos;
         size_t len = parser->buflen - parser->pos;
@@ -98,7 +98,7 @@
             parser->tmpcap = 0;
             parser->tmplen = 0;
             // run parse with the tmp buffer as main buffer
-            int ret = ucx_prop_parse(parser, name, value);
+            int ret = ucx_properties_next(parser, name, value);
             
             // restore original buffer
             parser->tmp = parser->buffer;
@@ -111,7 +111,7 @@
              * we parse again with the original buffer to get a name/value
              * or a new tmp buffer
              */
-            return ret ? ret : ucx_prop_parse(parser, name, value);
+            return ret ? ret : ucx_properties_next(parser, name, value);
         } else {
             parser_tmp_append(parser, buf, len);
             return 0;
@@ -195,10 +195,10 @@
     return 0;
 }
 
-int ucx_prop_parse2map(UcxPropParser *parser, UcxMap *map) {
+int ucx_properties2map(UcxProperties *parser, UcxMap *map) {
     sstr_t name;
     sstr_t value;
-    while(ucx_prop_parse(parser, &name, &value)) {
+    while(ucx_properties_next(parser, &name, &value)) {
         name = sstrdup_alloc(map->allocator, name);
         if(!name.ptr) {
             return 1;
@@ -222,7 +222,7 @@
 }
 
 int ucx_properties_load(UcxMap *map, FILE *file) {
-    UcxPropParser *parser = ucx_prop_new();
+    UcxProperties *parser = ucx_properties_new();
     if(!parser || !map || !file) {
         return 1;
     }
@@ -231,14 +231,14 @@
     size_t r;
     char buf[1024];
     while((r = fread(buf, 1, 1024, file)) != 0) {
-        ucx_prop_fill(parser, buf, r);
-        if(ucx_prop_parse2map(parser, map)) {
+        ucx_properties_fill(parser, buf, r);
+        if(ucx_properties2map(parser, map)) {
             error = 1;
             break;
         }
     }
     
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
     return error;
 }