Nope, we will be using whole new Digimon for this generation of warriors. So Water warrior could be anything to do with water.