diff -r 8b44653541ef -r fca8efb122de ucx/string.h
--- a/ucx/string.h	Mon Jul 22 14:51:52 2013 +0200
+++ b/ucx/string.h	Tue Jul 23 12:06:28 2013 +0200
@@ -232,7 +232,7 @@
  * exceeded, the last list item will be an empty string.
  * 
  * <b>Attention:</b> All list items <b>AND</b> all sstr_t.ptr of the list
- * items must be manually passed to <code>free()</code>. Use sstrsplita() with
+ * items must be manually passed to <code>free()</code>. Use sstrsplit_a() with
  * an allocator to managed memory, to avoid this.
  *
  * @param string the string to split
@@ -242,7 +242,7 @@
  * @return a list of the split strings as sstr_t array or
  *         <code>NULL</code> on error
  * 
- * @see sstrsplita()
+ * @see sstrsplit_a()
  */
 sstr_t* sstrsplit(sstr_t string, sstr_t delim, size_t *count);
 
@@ -258,18 +258,18 @@
  * <b>Note:</b> the allocator is not used for memory that is freed within the
  * same call of this function (locally scoped variables).
  * 
+ * @param allocator the UcxAllocator used for allocating memory
  * @param string the string to split
  * @param delim  the delimiter string
  * @param count  IN: the maximum size of the resulting list (0 for an
  *               unbounded list), OUT: the actual size of the list
- * @param allocator the UcxAllocator used for allocating memory
  * @return a list of the split strings as sstr_t array or
  *         <code>NULL</code> on error
  * 
  * @see sstrsplit()
  */
-sstr_t* sstrsplita(sstr_t string, sstr_t delim, size_t *count,
-        UcxAllocator *allocator);
+sstr_t* sstrsplit_a(UcxAllocator *allocator, sstr_t string, sstr_t delim,
+        size_t *count);
 
 /**
  * Compares two UCX strings with standard <code>memcmp()</code>.
@@ -297,7 +297,7 @@
  * 
  * @param string the string to duplicate
  * @return a duplicate of the string
- * @see sstrdupa()
+ * @see sstrdup_a()
  */
 sstr_t sstrdup(sstr_t string);
 
@@ -317,7 +317,7 @@
  * @return a duplicate of the string
  * @see sstrdup()
  */
-sstr_t sstrdupa(UcxAllocator *allocator, sstr_t string);
+sstr_t sstrdup_a(UcxAllocator *allocator, sstr_t string);
 
 /**
  * Omits leading and trailing spaces.