Better name extraction, convert trailing ', the' to leading