Ibidem: multiple versions of author's name

[Elka Klein <elka>]

Hi,

I am looking for a solution to the problem of dealing with authors with
multiple versions of their names.

The most common one in my work is Yitzhak Baer, whose sourcebook was
published in Germany under the name Fritz Baer, but whose history of the
JEws in Spain was published under the name Yitzhak, the name he used for
all publications after he left Germany.

So, I have the former entered as Baer, Fritz [Yitzhak] and the latter as
Baer, Yitzhak.

This generates the first reference to each work very properly. But the
hundreds of subsequent references, which I would like to appear simply
with

Baer, short title, p #

appear instead with the first names too (as if they were two different
people.

Obviously, I can go through and manually change all of the citations and
then freeze them, but given that I cite both works hundreds of times,
that's not a good move.

I can change the original in Ibidem, and manually change the first
citation, and freeze it, but I'm likely to get confused if I do that.

Has anyone come up with a better solution than either of these to this
problem?

Elka