Updated the water shader to work more as the gameshader.

Renamed some names in the shaders.