Few changes to water and ship - changing method names