No worries, there are several Marae that are more Technical in functioning (like Kirikiriroa Marae in Hamilton) which make it more harder to determine the Wharekai, the Wharenui is the easiest building to distinguish due to it's carvings, rectangle shape or positioning of surrounding details. However I think you should add Wharenui to the end of Toa Rangātira so it reads as "Toa Rangātira Wharenui" here. I say "Wharenui" should be put on all ends of the Wharenui Names just so it is easily identifiable. Just the Name without it can confuse people, so that's why it's needed to clarify it as the Main Marae building as it is the Cultural Heart of Marae, even if others in a Marae Area are used more than it. There are instances where there is 2 Wharenui in 1 Marae such as Apumoana Marae in Rotorua which I reccently updated as an example where I only put the Main Wharenui with the Community Centre tags but not the older, less of focus one, as so to why we can't display the shorter names of Wharenui & other smaller buildings in Marae without adding their Maori Name of their Purpose or until OSM has a Wharenui Icon render created. Cheers.