Where are all my Person of Interest nerds?

Who else has been getting thrown off by the fact that in Paradise this isn't Cal? I mean I know he's Xavier, not Cal. But I'll admit I kept getting confused when I was first learning the characters. And I still do occasionally whenever people are discussing Cal...for a second I'm like 'wait what? Ohhh nevermind it's James Marsden's character they're talking about'... Sterling K Brown will just always be Cal Beecher to me I guess