fix name extraction