Name parsing fix