Harbour naming fixes