diff -r 75cb6590358b -r 1cf71e56f01e test/main.c
--- a/test/main.c	Sun Jul 14 17:11:34 2013 +0200
+++ b/test/main.c	Mon Jul 15 13:53:51 2013 +0200
@@ -171,12 +171,12 @@
         ucx_test_register(suite, test_ucx_map_rehash);
         
         /* UcxPropertiesParser Tests */
-        ucx_test_register(suite, test_ucx_prop_new);
-        ucx_test_register(suite, test_ucx_prop_parse);
-        ucx_test_register(suite, test_ucx_prop_parse_multi);
-        ucx_test_register(suite, test_ucx_prop_parse_part);
-        ucx_test_register(suite, test_ucx_prop_parse_long);
-        ucx_test_register(suite, test_ucx_prop_parse2map);
+        ucx_test_register(suite, test_ucx_properties_new);
+        ucx_test_register(suite, test_ucx_properties_next);
+        ucx_test_register(suite, test_ucx_properties_next_multi);
+        ucx_test_register(suite, test_ucx_properties_next_part);
+        ucx_test_register(suite, test_ucx_properties_next_long);
+        ucx_test_register(suite, test_ucx_properties2map);
         ucx_test_register(suite, test_ucx_properties_load);
         ucx_test_register(suite, test_ucx_properties_store);