Yes and yes.

That's all I needed to hear. Trademarking 'pi' is therefore nothing more than exactly this.

There's therefore no need to rage out.