rename raft to boat throughout