Self custody.

3rd party custody.

These terms are self explanatory. And more easy for people to appreciate the meaning.

Custodial and non-custodial are not helpful and would be best phased out.

We need to be better.