Rename and fix for read-string.