Fix that names with whitespace can be found.