diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
index 69b5a0d3ca..b125ba4e46 100644
--- a/libraries/string_mb.lib.php
+++ b/libraries/string_mb.lib.php
@@ -18,11 +18,8 @@
 /**
  * Returns length of string depending on current charset.
  *
- * @uses    mb_strlen()
  * @param   string   string to count
  * @return  int      string length
- * @access  public
- * @todo rename to PM_STR_len()
  */
 function PMA_strlen($string)
 {
@@ -32,13 +29,10 @@ function PMA_strlen($string)
 /**
  * Returns substring from string, works depending on current charset.
  *
- * @uses    mb_substr()
- * @param   string   string to count
- * @param   int      start of substring
- * @param   int      length of substring
- * @return  int      substring
- * @access  public
- * @todo rename to PM_STR_sub()
+ * @param   string $string  string to count
+ * @param   int    $start   start of substring
+ * @param   int    $length  length of substring
+ * @return  string
  */
 function PMA_substr($string, $start, $length = 2147483647)
 {
@@ -46,11 +40,11 @@ function PMA_substr($string, $start, $length = 2147483647)
 }
 
 /**
- * returns postion of $needle in $haystack or false if not found
+ * Returns postion of $needle in $haystack or false if not found
  *
- * @uses    mb_strpos()
- * @param   string  $needle
  * @param   string  $haystack
+ * @param   string  $needle
+ * @param   int     $offset
  * @return  integer position of $needle in $haystack or false
  */
 function PMA_STR_pos($haystack, $needle, $offset = 0)
@@ -59,11 +53,11 @@ function PMA_STR_pos($haystack, $needle, $offset = 0)
 }
 
 /**
- * returns right most postion of $needle in $haystack or false if not found
+ * Returns right most postion of $needle in $haystack or false if not found
  *
- * @uses    mb_strrpos()
- * @param   string  $needle
  * @param   string  $haystack
+ * @param   string  $needle
+ * @param   int     $offset
  * @return  integer position of $needle in $haystack or false
  */
 function PMA_STR_rPos($haystack, $needle, $offset = 0)
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
index e70bf0b01d..d4e76caec9 100644
--- a/libraries/string_native.lib.php
+++ b/libraries/string_native.lib.php
@@ -18,11 +18,8 @@
 /**
  * Returns length of string depending on current charset.
  *
- * @uses    strlen()
  * @param   string   string to count
  * @return  int      string length
- * @access  public
- * @todo rename to PM_STR_len()
  */
 function PMA_strlen($string)
 {
@@ -32,13 +29,10 @@ function PMA_strlen($string)
 /**
  * Returns substring from string, works depending on current charset.
  *
- * @uses    substr()
- * @param   string   string to count
- * @param   int      start of substring
- * @param   int      length of substring
- * @return  int      substring
- * @access  public
- * @todo rename to PM_STR_sub()
+ * @param   string $string  string to count
+ * @param   int    $start   start of substring
+ * @param   int    $length  length of substring
+ * @return  string
  */
 function PMA_substr($string, $start, $length = 2147483647)
 {
@@ -46,11 +40,11 @@ function PMA_substr($string, $start, $length = 2147483647)
 }
 
 /**
- * returns postion of $needle in $haystack or false if not found
+ * Returns postion of $needle in $haystack or false if not found
  *
- * @uses    strpos()
- * @param   string  $needle
  * @param   string  $haystack
+ * @param   string  $needle
+ * @param   int     $offset
  * @return  integer position of $needle in $haystack or false
  */
 function PMA_STR_pos($haystack, $needle, $offset = 0)
@@ -59,11 +53,11 @@ function PMA_STR_pos($haystack, $needle, $offset = 0)
 }
 
 /**
- * returns right most postion of $needle in $haystack or false if not found
+ * Returns right most postion of $needle in $haystack or false if not found
  *
- * @uses    strrpos()
- * @param   string  $needle
  * @param   string  $haystack
+ * @param   string  $needle
+ * @param   int     $offset
  * @return  integer position of $needle in $haystack or false
  */
 function PMA_STR_rPos($haystack, $needle, $offset = 0)