diff -r 75cb6590358b -r 1cf71e56f01e ucx/properties.h
--- a/ucx/properties.h	Sun Jul 14 17:11:34 2013 +0200
+++ b/ucx/properties.h	Mon Jul 15 13:53:51 2013 +0200
@@ -48,14 +48,14 @@
     char   comment1;
     char   comment2;
     char   comment3;
-} UcxPropParser;
+} UcxProperties;
 
 
-UcxPropParser *ucx_prop_new();
-void ucx_prop_free(UcxPropParser *parser);
-void ucx_prop_fill(UcxPropParser *parser, char *buf, size_t len);
-int ucx_prop_parse(UcxPropParser *parser, sstr_t *name, sstr_t *value);
-int ucx_prop_parse2map(UcxPropParser *parser, UcxMap *map);
+UcxProperties *ucx_properties_new();
+void ucx_properties_free(UcxProperties *parser);
+void ucx_properties_fill(UcxProperties *parser, char *buf, size_t len);
+int ucx_properties_next(UcxProperties *parser, sstr_t *name, sstr_t *value);
+int ucx_properties2map(UcxProperties *parser, UcxMap *map);
 
 int ucx_properties_load(UcxMap *map, FILE *file);
 int ucx_properties_store(UcxMap *map, FILE *file);