fix name parsing