Update WaterRoof for new naming conventions
Merge pull request #1622 from Cottser/waterroof

Update WaterRoof for new naming conventions