The matua and whaea debate appears to have been settled.
A Hawke's Bay school where two student teachers left after alleging they were not allowed to be referred to by pupils as matua and whaea says all teachers at the school will now be welcome to choose to use them as teaching titles.
A Clive School Board of Trustees spokeswoman confirmed today that the school had made made the changes after a review started by the incident.
In March Rangi Mitchell and Arihi Raiha Hutana said they had left Clive School after what they alleged was an ultimatum by principal Brian Eales - be referred to by schoolkids as Mr and Miss, not matua and whaea, or leave.
The two teachers said the titles were a mark of respect to their culture and world view, and they should be entitled to use them in the classroom.
The Clive School spokeswoman said since the issue was drawn to the board's attention it had been working through a process to review the practice.
She said the school had taken its time to ensure its practice and use of the terms were in line with the best practice for New Zealand schools.
"We think it is important to also confirm that our board is committed to giving effect to local tikanga Māori, mātauranga Māori, and te ao Māori in our school and our wonderful staff are continually engaging positively to ensure their plans and curriculum are culturally reflective," she added.
Last week three MPs had their say in Parliament about the use of matua and whaea titles in classrooms.
Māori Party co-leader Deborah Ngarewa-Packer, who comes from a whānau of teachers, said it could be really hard to learn if you can't relate to who it is and how you're being taught.
"Matua and whaea are really respectful terms and you couldn't have anything else so much more connected," she said.
"The reality is we are Aotearoa and we consistently don't see respect for tangata whenua and the need that we have to show that respect."
Fellow Māori Part co-leader Rawiri Waititi said the terms are different to Sir and Miss because they are about hierarchy, and matua and whaea are about respect.
"There are still schools cutting taonga of students' necks, there are still rules in some schools where our tamariki aren't allowed to express their cultural identity," he said.
Waititi said he would be in contact with certain schools about these issues.
MP and Minister of Māori Development Willie Jackson said he would always support teachers being able to be called matua and whaea as it's a natural thing for a lot of children in New Zealand.
"We've got to make the education system user friendly - it's not one shoe fits all," he said.
Mitchell and Hutana could not be reached for comment today.