fixed name parsing