WS3.0 uses somehow "marina" and water=harbour, but also piers. Probably piers should be left over to osm2city