The Malaysian student who died during a commercial diving course in Waikato on Monday has been identified as Luqmanulhakim Bin Moien.
The 24-year-old died during a New Zealand School of Commercial Diver Training assessment in Lake Puketirini, near Huntly. The incident is being investigated by WorkSafe NZ.
The Intueri Education Group, which runs the New Zealand School of Commercial Diver Training, said it was supporting those who who knew the student.
Its chief executive Rob Facer said a representative in New Zealand had been liaising with the family in Malaysia.
"My understanding is that two of his immediate family members are coming out to New Zealand to transport his body back to Malaysia.''
The company had commissioned "a thorough'' internal investigation, Mr Facer said.
They were also assisting regulatory authorities to ensure the relevant information was made available to them "as and when they need it''.
The student, who was a qualified recreational diver, had undergone a "very thorough and comprehensive medical'' to do the commercial diver course.
He passed the medical test, but Mr Facer would not say whether the student had any medical issues.
A company spokeswoman said conditions at the lake on Monday were calm.
All students had to have passed recreational diving courses before starting the commercial courses, she said.
The company had "stringent regulations'' in place while courses were being undertaken, she said.
"Out of respect for the family and what has occurred, we have no formal classes for the rest of this week, and on Monday classes will resume.''
Lake Puketirini is a newly formed lake that had been developed from a disused coal-mined pit, and was now part of Puketirini, a Waikato District Council owned park, the council website said.
The lake was available for activities such as kayaking, waka ama, boating, and water-skiing.