Extend underwater to underfluid; rename