Improved ParseName regex