Sovereign isn't very precise. Non-custodial has much more exact meaning of 'not giving your keys to us'. But I agree that this terminology only matters for small number of people, so it will probably evolve.