IMO, we should use "content moderation" for the former and "censorship" for the latter, congruent with historical usage. But people who are against content moderation will claim I'm being biased, even though I view the whole debate as a bit of red herring that distracts from the real issues. So I'd settle for "private-sector censorship" and "government censorship".
But in any case it's almost always counter-productive to conflate the two, to the point that it's a logical fallacy which should be named.