Issue parsing {Parameter: Company} due to lookup Tenant ID?

[Coligor]

There's a small issue in the UI.
On the homepage under Site Scripts in the left navigation, my installed solution (literally) shows: {parameter: Company} TeamSite
under SiteDesigns it does work, it shows MyTenantName Team Site

Also when installing the .pnp template I get an error when this line is being parsed:
<pnp:RoleAssignment Principal="c:0-.f|rolemanager|spo-grid-all-users/{parameter:TenantId}" RoleDefinition="Read" />

When executing the script I get the error that the Principal (c:0-.f|rolemanager|spo-grid-all-users{my tenant Guid}) is not found. Google gives me an issue reported back in 2018 that in older tenants (like mine), sometimes this does not work. This however is the group Everyone except External users. I gave that group read manually to the site.

However.. it seems to me that in the solution code somewhere this lookup (Tenant ID->Tenant Name?) is not working also, or not being parsed.