I don't think so. Maybe I'm misremembering, but I distinctly recall when the Pi was first created, there was only one entity and it was non-profit.

Correct. There was a split. E Upton resigned and created a new commercial company which then confusingly changed its name to Raspberry Pi Ltd.

The R Pi commercial company dropped "Trading" years ago.