Swimming New Zealand chief executive Christian Renford has resigned but won't leave the role until after the Rio Olympics.
Renford will return to Australia with his family for a business opportunity.
He was recruited to the role from Rowing New South Wales in 2013 and was charged with implementing a number of the changes to the sport that were recommended by the Moller Review.
His predecessor Mike Byrne resigned following the release of the independent review, which criticised the national organisation and called for the entire board to resign and Byrne to be removed.
Swimming New Zealand chairman Bruce Cotterill said Renford had done a good job of leading the organisation through a difficult period.
"In particular [he] has repositioned our sport in the eyes of many of our stakeholders, especially those in the clubs and regions around New Zealand," Cotterill said.
Swimming New Zealand was excited about the future of the sport and the opportunity to bring fresh leadership to the 2020 campaign, Cotterill said.