Looks good to me. It seems a bit strange depending on \w to match all but one of the digits in names that contain more than one, but it works!