Relinking problem in FCPX

Weird problem with relinking. So I went and changed the file name of a couple of video files I am using in a single project (don't ask why!) It is looking for the old file name, so I used relink to tell it to use the same file as before, but with the new name. That worked fine, but there are two files I changed the name of and only one will relink correctly at a time. That is, I relink file A with the renamed file Aa and it works fine. Then I go to file B and relink that with file Bb and it works fine, but oh no, file A is now referencing file Bb, not Aa, so it's all messed up. If I try to do it again the other way around, the other one is messed up referencing the wrong file. How do I fix this so that each file will reference the correct renamed file?