Name reading modified to handle whitespace.