I think the difference between Rin and Rei is fine. I don't really think either of us need to change. (Then again, I take Japanese and and used to all of the very similar sounding words, heh) And well, I suppose I could remove her last name, or do the same thing you did. I don't think it's too big of a deal though.