Yeah, I think Ethan called him “Ripper.” So the “Call him Rupert & you’ll eventually die” holds. Of course, doesn’t everyone eventually die? And what happened to Olivia?
I don’t know what happened to Olivia, though some people speculate that they broke up, and this was implied by his dream in Restless.
Spike mostly calls Giles “Watcher” or “Ripper”, and Ethan always called him “Ripper”.