Undo Water Commands

Not matching with ctl convention.