Fixed waterline errors names; updated waterline modules