Little refactoring on names and types declaration for water specialized visitor.