Establishing consistency for common POIs / companies with branches

I agree.

Good. I’ll wait a week or so to see if anyone has objections. If not, I’ll write up some short explanation in the WIki and see if I can bulk edit it.

For the record: We now have a bot which edits the branches according to these templates.