Minor fix to function names.
Add check to string length.