Yeah, so we use the term non-custodial differently. I've always heard these terms referred to the way I'm using them, not the way you're using them. Of course that doesn't mean I'm right LOL. But it does underscore the nascent nature of this space, which is annoying AF.

I've always heard non-custodial used to refer to a wallet where _I_ don't custody my own Bitcoin. And self-custody means that _I_ custody my own Bitcoin my_self.