diff -r 75cb6590358b -r 1cf71e56f01e test/prop_tests.c
--- a/test/prop_tests.c	Sun Jul 14 17:11:34 2013 +0200
+++ b/test/prop_tests.c	Mon Jul 15 13:53:51 2013 +0200
@@ -28,8 +28,8 @@
 
 #include "prop_tests.h"
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_new) {
-    UcxPropParser *parser = ucx_prop_new();
+UCX_TEST_IMPLEMENT(test_ucx_properties_new) {
+    UcxProperties *parser = ucx_properties_new();
     
     UCX_TEST_BEGIN
             
@@ -39,10 +39,10 @@
     
     UCX_TEST_END
             
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_parse) {  
+UCX_TEST_IMPLEMENT(test_ucx_properties_next) {  
     const char *tests[] = {
         "name = value\n",
         "name=value\n",
@@ -88,32 +88,32 @@
     sstr_t value;
     
     for(int i=0;i<10;i++) {
-        UcxPropParser *parser = ucx_prop_new();
+        UcxProperties *parser = ucx_properties_new();
         
-        ucx_prop_fill(parser, (char*)tests[i], strlen(tests[i]));
+        ucx_properties_fill(parser, (char*)tests[i], strlen(tests[i]));
         UCX_TEST_ASSERT(parser->buffer == tests[i], "fill failed");
         UCX_TEST_ASSERT(parser->buflen == strlen(tests[i]), "wrong buflen");
         
-        int r = ucx_prop_parse(parser, &name, &value);
+        int r = ucx_properties_next(parser, &name, &value);
         sstr_t n = sstr((char*)names[i]);
         sstr_t v = sstr((char*)values[i]);
-        UCX_TEST_ASSERT(r == 1, "parse returned 0");
+        UCX_TEST_ASSERT(r == 1, "next returned 0");
         UCX_TEST_ASSERT((!sstrcmp(name, n)), "wrong property name");
         UCX_TEST_ASSERT((!sstrcmp(value, v)), "wrong property value");
         
-        r = ucx_prop_parse(parser, &name, &value);
-        UCX_TEST_ASSERT(r == 0, "parse returned 1");
+        r = ucx_properties_next(parser, &name, &value);
+        UCX_TEST_ASSERT(r == 0, "next returned 1");
         UCX_TEST_ASSERT(parser->tmp == NULL, "tmp not NULL");
         UCX_TEST_ASSERT(parser->tmpcap == 0, "tmpcap not NULL");
         UCX_TEST_ASSERT(parser->tmplen == 0, "tmplen not NULL");
         
-        ucx_prop_free(parser);
+        ucx_properties_free(parser);
     }
     
     UCX_TEST_END       
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_parse_multi) {
+UCX_TEST_IMPLEMENT(test_ucx_properties_next_multi) {
     const char *names[] = {
         "a",
         "b",
@@ -153,31 +153,31 @@
         "key2 = value2\n"
         "\n\n\n        \n           key3=value3\n";
     
-    UcxPropParser *parser = ucx_prop_new();
+    UcxProperties *parser = ucx_properties_new();
     
     UCX_TEST_BEGIN
     
-    ucx_prop_fill(parser, (char*)str, strlen(str));
+    ucx_properties_fill(parser, (char*)str, strlen(str));
     
     sstr_t name;
     sstr_t value;
     for(int i=0;i<8;i++) {
-        int r = ucx_prop_parse(parser, &name, &value);
-        UCX_TEST_ASSERT(r == 1, "parse returned 0");
+        int r = ucx_properties_next(parser, &name, &value);
+        UCX_TEST_ASSERT(r == 1, "next returned 0");
         UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)names[i]))), "wrong name");
         UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)values[i]))),
                 "wrong value");
     }
-    int r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    int r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     UCX_TEST_END
     
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_parse_part) {
-    UcxPropParser *parser = ucx_prop_new();
+UCX_TEST_IMPLEMENT(test_ucx_properties_next_part) {
+    UcxProperties *parser = ucx_properties_new();
     const char *str;
     int r;
     sstr_t name;
@@ -186,108 +186,108 @@
     UCX_TEST_BEGIN
     
     str = "";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "  \n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "name";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "    ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "= ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "value";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"name"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value");
     
     // second round
     str = "#comment\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "#comment\nname = ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "value\na = b\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"name"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value");
     
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"a"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"b"))), "wrong value");
     
     str = "# comment\n#\n#\ntests = ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "test1 ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "test2 test3 test4\n";
     sstr_t testv = sstr((char*)"test1 test2 test3 test4");
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"tests"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, testv)), "wrong value");
     
-    // test if parse finds a name/value after a tmp comment
+    // test if ucx_properties_next finds a name/value after a tmp comment
     str = "# just a comment";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = " in 3";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = " parts\na = 1\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"a"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"1"))), "wrong value");
     
     UCX_TEST_END
     
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_parse_long) {
-    UcxPropParser *parser = ucx_prop_new();
+UCX_TEST_IMPLEMENT(test_ucx_properties_next_long) {
+    UcxProperties *parser = ucx_properties_new();
     int r;
     size_t name_len = 512;
     char *long_name = (char*)malloc(name_len);
@@ -305,75 +305,75 @@
     sstr_t name;
     sstr_t value;
     
-    ucx_prop_fill(parser, long_name, 10);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_name, 10);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_name+10, 202);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_name+10, 202);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_name+212, 200);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_name+212, 200);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_name+412, 100);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_name+412, 100);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     const char *str = " = ";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, (char*)str, strlen(str));
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_value, 512);
-    r = ucx_prop_parse(parser, &name, &value); 
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_value, 512);
+    r = ucx_properties_next(parser, &name, &value); 
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_value+512, 1024);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_value+512, 1024);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
-    ucx_prop_fill(parser, long_value+1536, 512);
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    ucx_properties_fill(parser, long_value+1536, 512);
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     str = "\n#comment\nkey = value\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));    
-    r = ucx_prop_parse(parser, &name, &value);
+    ucx_properties_fill(parser, (char*)str, strlen(str));    
+    r = ucx_properties_next(parser, &name, &value);
     sstr_t n = sstrn(long_name, name_len);
     sstr_t v = sstrn(long_value, value_len);
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, n)), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, v)), "wrong value");
     
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 1, "parse returned 0");
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 1, "next returned 0");
     UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"key"))), "wrong name");
     UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value");
     
-    r = ucx_prop_parse(parser, &name, &value);
-    UCX_TEST_ASSERT(r == 0, "parse returned 1");
+    r = ucx_properties_next(parser, &name, &value);
+    UCX_TEST_ASSERT(r == 0, "next returned 1");
     
     UCX_TEST_END
     
     free(long_name);
     free(long_value);
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_prop_parse2map) {
+UCX_TEST_IMPLEMENT(test_ucx_properties2map) {
     UcxMap *map = ucx_map_new(16);
-    UcxPropParser *parser = ucx_prop_new();
+    UcxProperties *parser = ucx_properties_new();
     
     UCX_TEST_BEGIN
     
     const char *str = "key1 = value1\nkey2 = value2\n\n#comment\n\nkey3 = value3\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
+    ucx_properties_fill(parser, (char*)str, strlen(str));
     
-    int r = ucx_prop_parse2map(parser, map);
+    int r = ucx_properties2map(parser, map);
     
-    UCX_TEST_ASSERT(r == 0, "parse2map failed");
+    UCX_TEST_ASSERT(r == 0, "properties2map failed");
     UCX_TEST_ASSERT(map->count == 3, "wrong number of properties");
     
     char *v1 = (char*)ucx_map_cstr_get(map, "key1");
@@ -396,17 +396,17 @@
     map = ucx_map_new(16);
     
     str = "\n#comment\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
+    ucx_properties_fill(parser, (char*)str, strlen(str));
     
-    r = ucx_prop_parse2map(parser, map);
-    UCX_TEST_ASSERT(r == 0, "parse2map failed");
+    r = ucx_properties2map(parser, map);
+    UCX_TEST_ASSERT(r == 0, "properties2map failed");
     UCX_TEST_ASSERT(map->count == 0, "wrong number of properties");
     
     str = "key1 = value1\nsyntax error line\n";
-    ucx_prop_fill(parser, (char*)str, strlen(str));
+    ucx_properties_fill(parser, (char*)str, strlen(str));
     
-    r = ucx_prop_parse2map(parser, map);
-    UCX_TEST_ASSERT(r == 1, "parse2map should return 1");
+    r = ucx_properties2map(parser, map);
+    UCX_TEST_ASSERT(r == 1, "properties2map should return 1");
     UCX_TEST_ASSERT(map->count == 1, "wrong number of properties");
     
     char *v = (char*)ucx_map_cstr_get(map, "key1");
@@ -414,7 +414,7 @@
     
     UCX_TEST_END
     
-    ucx_prop_free(parser);
+    ucx_properties_free(parser);
 }
 
 UCX_TEST_IMPLEMENT(test_ucx_properties_load) {