Yeah, I like that approach. It's also very common for people to shorten the name in common use so I try to anticipate what the "short form" would be and consider it just as much as the full name.