Fix name parsing for single name