Corrected names parsing