User:This, that and the other/WT:COMPANY

Delete the existing text at WT:COMPANY, which is (for the record):

Company names

Being a company name does not guarantee inclusion. To be included, the use of the company name other than its use as a trademark (i.e., a use as a common word or family name) has to be attested.

and replace it with the following:

Company and organisation names

Company and organisation names – that is, "proper noun" entries or senses where the definition simply identifies or describes a certain company or organisation – are generally excluded from Wiktionary.

The following agreed exceptions apply:

• If a company name is also a brand name, it may be included if it satisfies the rules under WT:BRAND.
• Where there are three or more terms (other than proper nouns) satisfying these criteria for inclusion that are directly or indirectly derived from the company or organisation name (Walmarting from Walmart), the name may be included in order to provide a central location for housing its etymology and derived terms.
• Terms understood as abbreviations (BBC) or nicknames (Woolies) for a company or organization name are allowed.

Note that this section of CFI does not definitively rule in or out every possible company name entry. While the presumption is toward deletion, company or organisation names may be kept as proper nouns by agreement of the community at requests for deletion in special circumstances.

Instances where a company name is used as a common word (for example, the use of Google as a verb) are not affected by this section of the policy.

If we were to vote on this I might make a separate vote for the second-last para, as this might be a bit controversial...