Buffy's Mystery Neighbor?

So... Buffy's mystery neighbor is named Heinrich, right? Isn't the Master's real name Heinrich Joseph Nest (from Whedon's notes in the script for the pilot of BtVS)? Well... Oh, this is either going to be popcorn hilarious or downright disturbing, isn't it?

*grabs popcorn*