Fix name parsing