Tidy up naming ready for publication