Fixed handling of name lines.