I've reviewed this and the current state seems OK. Overall Marina named as 'Hobsonville Marina'. The ferry terminal, within the marina named as 'West Harbour'. Will add 'old_name=Westpark marina' to the marina