Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r1935 -r1958
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 1935)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 1958)
@@ -1740,65 +1740,65 @@
         
         private bool sellmeijerVnkHcriticalFieldSpecified;
         
-        private double wbi2017BackwardErosionFactorField;
+        private double wti2017BackwardErosionFactorField;
         
-        private bool wbi2017BackwardErosionFactorFieldSpecified;
+        private bool wti2017BackwardErosionFactorFieldSpecified;
         
-        private double wbi2017BackwardErosionHcriticalField;
+        private double wti2017BackwardErosionHcriticalField;
         
-        private bool wbi2017BackwardErosionHcriticalFieldSpecified;
+        private bool wti2017BackwardErosionHcriticalFieldSpecified;
         
         private double exitPointXField;
         
         private bool exitPointXFieldSpecified;
         
-        private double wbi2017UpliftFactorField;
+        private double wti2017UpliftFactorField;
         
-        private bool wbi2017UpliftFactorFieldSpecified;
+        private bool wti2017UpliftFactorFieldSpecified;
         
-        private double wbi2017UpliftHcriticalField;
+        private double wti2017UpliftHcriticalField;
         
-        private bool wbi2017UpliftHcriticalFieldSpecified;
+        private bool wti2017UpliftHcriticalFieldSpecified;
         
-        private double wbi2017DeltaPhiCuField;
+        private double wti2017DeltaPhiCuField;
         
-        private bool wbi2017DeltaPhiCuFieldSpecified;
+        private bool wti2017DeltaPhiCuFieldSpecified;
         
-        private double wbi2017HeaveFactorField;
+        private double wti2017HeaveFactorField;
         
-        private bool wbi2017HeaveFactorFieldSpecified;
+        private bool wti2017HeaveFactorFieldSpecified;
         
-        private double wbi2017HeaveHcriticalField;
+        private double wti2017HeaveHcriticalField;
         
-        private bool wbi2017HeaveHcriticalFieldSpecified;
+        private bool wti2017HeaveHcriticalFieldSpecified;
         
-        private double wbi2017GradientField;
+        private double wti2017GradientField;
         
-        private bool wbi2017GradientFieldSpecified;
+        private bool wti2017GradientFieldSpecified;
         
-        private double wbi2017FactorOverallField;
+        private double wti2017FactorOverallField;
         
-        private bool wbi2017FactorOverallFieldSpecified;
+        private bool wti2017FactorOverallFieldSpecified;
         
-        private double wbi2017HcriticalOverallField;
+        private double wti2017HcriticalOverallField;
         
-        private bool wbi2017HcriticalOverallFieldSpecified;
+        private bool wti2017HcriticalOverallFieldSpecified;
         
-        private double wbi2017EffectiveStressField;
+        private double wti2017EffectiveStressField;
         
-        private bool wbi2017EffectiveStressFieldSpecified;
+        private bool wti2017EffectiveStressFieldSpecified;
         
-        private double wbi2017BackwardErosionDeltaPhiCField;
+        private double wti2017BackwardErosionDeltaPhiCField;
         
-        private bool wbi2017BackwardErosionDeltaPhiCFieldSpecified;
+        private bool wti2017BackwardErosionDeltaPhiCFieldSpecified;
         
-        private double wbi2017CCreepField;
+        private double wti2017CCreepField;
         
-        private bool wbi2017CCreepFieldSpecified;
+        private bool wti2017CCreepFieldSpecified;
         
-        private double wbi2017BackwardErosionDeltaPhiReducedField;
+        private double wti2017BackwardErosionDeltaPhiReducedField;
         
-        private bool wbi2017BackwardErosionDeltaPhiReducedFieldSpecified;
+        private bool wti2017BackwardErosionDeltaPhiReducedFieldSpecified;
         
         /// <remarks/>
         public UpliftSituation UpliftSituation {
@@ -2009,45 +2009,45 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017BackwardErosionFactor {
+        public double Wti2017BackwardErosionFactor {
             get {
-                return this.wbi2017BackwardErosionFactorField;
+                return this.wti2017BackwardErosionFactorField;
             }
             set {
-                this.wbi2017BackwardErosionFactorField = value;
+                this.wti2017BackwardErosionFactorField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017BackwardErosionFactorSpecified {
+        public bool Wti2017BackwardErosionFactorSpecified {
             get {
-                return this.wbi2017BackwardErosionFactorFieldSpecified;
+                return this.wti2017BackwardErosionFactorFieldSpecified;
             }
             set {
-                this.wbi2017BackwardErosionFactorFieldSpecified = value;
+                this.wti2017BackwardErosionFactorFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017BackwardErosionHcritical {
+        public double Wti2017BackwardErosionHcritical {
             get {
-                return this.wbi2017BackwardErosionHcriticalField;
+                return this.wti2017BackwardErosionHcriticalField;
             }
             set {
-                this.wbi2017BackwardErosionHcriticalField = value;
+                this.wti2017BackwardErosionHcriticalField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017BackwardErosionHcriticalSpecified {
+        public bool Wti2017BackwardErosionHcriticalSpecified {
             get {
-                return this.wbi2017BackwardErosionHcriticalFieldSpecified;
+                return this.wti2017BackwardErosionHcriticalFieldSpecified;
             }
             set {
-                this.wbi2017BackwardErosionHcriticalFieldSpecified = value;
+                this.wti2017BackwardErosionHcriticalFieldSpecified = value;
             }
         }
         
@@ -2075,265 +2075,265 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017UpliftFactor {
+        public double Wti2017UpliftFactor {
             get {
-                return this.wbi2017UpliftFactorField;
+                return this.wti2017UpliftFactorField;
             }
             set {
-                this.wbi2017UpliftFactorField = value;
+                this.wti2017UpliftFactorField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017UpliftFactorSpecified {
+        public bool Wti2017UpliftFactorSpecified {
             get {
-                return this.wbi2017UpliftFactorFieldSpecified;
+                return this.wti2017UpliftFactorFieldSpecified;
             }
             set {
-                this.wbi2017UpliftFactorFieldSpecified = value;
+                this.wti2017UpliftFactorFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017UpliftHcritical {
+        public double Wti2017UpliftHcritical {
             get {
-                return this.wbi2017UpliftHcriticalField;
+                return this.wti2017UpliftHcriticalField;
             }
             set {
-                this.wbi2017UpliftHcriticalField = value;
+                this.wti2017UpliftHcriticalField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017UpliftHcriticalSpecified {
+        public bool Wti2017UpliftHcriticalSpecified {
             get {
-                return this.wbi2017UpliftHcriticalFieldSpecified;
+                return this.wti2017UpliftHcriticalFieldSpecified;
             }
             set {
-                this.wbi2017UpliftHcriticalFieldSpecified = value;
+                this.wti2017UpliftHcriticalFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017DeltaPhiCu {
+        public double Wti2017DeltaPhiCu {
             get {
-                return this.wbi2017DeltaPhiCuField;
+                return this.wti2017DeltaPhiCuField;
             }
             set {
-                this.wbi2017DeltaPhiCuField = value;
+                this.wti2017DeltaPhiCuField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017DeltaPhiCuSpecified {
+        public bool Wti2017DeltaPhiCuSpecified {
             get {
-                return this.wbi2017DeltaPhiCuFieldSpecified;
+                return this.wti2017DeltaPhiCuFieldSpecified;
             }
             set {
-                this.wbi2017DeltaPhiCuFieldSpecified = value;
+                this.wti2017DeltaPhiCuFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017HeaveFactor {
+        public double Wti2017HeaveFactor {
             get {
-                return this.wbi2017HeaveFactorField;
+                return this.wti2017HeaveFactorField;
             }
             set {
-                this.wbi2017HeaveFactorField = value;
+                this.wti2017HeaveFactorField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017HeaveFactorSpecified {
+        public bool Wti2017HeaveFactorSpecified {
             get {
-                return this.wbi2017HeaveFactorFieldSpecified;
+                return this.wti2017HeaveFactorFieldSpecified;
             }
             set {
-                this.wbi2017HeaveFactorFieldSpecified = value;
+                this.wti2017HeaveFactorFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017HeaveHcritical {
+        public double Wti2017HeaveHcritical {
             get {
-                return this.wbi2017HeaveHcriticalField;
+                return this.wti2017HeaveHcriticalField;
             }
             set {
-                this.wbi2017HeaveHcriticalField = value;
+                this.wti2017HeaveHcriticalField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017HeaveHcriticalSpecified {
+        public bool Wti2017HeaveHcriticalSpecified {
             get {
-                return this.wbi2017HeaveHcriticalFieldSpecified;
+                return this.wti2017HeaveHcriticalFieldSpecified;
             }
             set {
-                this.wbi2017HeaveHcriticalFieldSpecified = value;
+                this.wti2017HeaveHcriticalFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017Gradient {
+        public double Wti2017Gradient {
             get {
-                return this.wbi2017GradientField;
+                return this.wti2017GradientField;
             }
             set {
-                this.wbi2017GradientField = value;
+                this.wti2017GradientField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017GradientSpecified {
+        public bool Wti2017GradientSpecified {
             get {
-                return this.wbi2017GradientFieldSpecified;
+                return this.wti2017GradientFieldSpecified;
             }
             set {
-                this.wbi2017GradientFieldSpecified = value;
+                this.wti2017GradientFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017FactorOverall {
+        public double Wti2017FactorOverall {
             get {
-                return this.wbi2017FactorOverallField;
+                return this.wti2017FactorOverallField;
             }
             set {
-                this.wbi2017FactorOverallField = value;
+                this.wti2017FactorOverallField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017FactorOverallSpecified {
+        public bool Wti2017FactorOverallSpecified {
             get {
-                return this.wbi2017FactorOverallFieldSpecified;
+                return this.wti2017FactorOverallFieldSpecified;
             }
             set {
-                this.wbi2017FactorOverallFieldSpecified = value;
+                this.wti2017FactorOverallFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017HcriticalOverall {
+        public double Wti2017HcriticalOverall {
             get {
-                return this.wbi2017HcriticalOverallField;
+                return this.wti2017HcriticalOverallField;
             }
             set {
-                this.wbi2017HcriticalOverallField = value;
+                this.wti2017HcriticalOverallField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017HcriticalOverallSpecified {
+        public bool Wti2017HcriticalOverallSpecified {
             get {
-                return this.wbi2017HcriticalOverallFieldSpecified;
+                return this.wti2017HcriticalOverallFieldSpecified;
             }
             set {
-                this.wbi2017HcriticalOverallFieldSpecified = value;
+                this.wti2017HcriticalOverallFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017EffectiveStress {
+        public double Wti2017EffectiveStress {
             get {
-                return this.wbi2017EffectiveStressField;
+                return this.wti2017EffectiveStressField;
             }
             set {
-                this.wbi2017EffectiveStressField = value;
+                this.wti2017EffectiveStressField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017EffectiveStressSpecified {
+        public bool Wti2017EffectiveStressSpecified {
             get {
-                return this.wbi2017EffectiveStressFieldSpecified;
+                return this.wti2017EffectiveStressFieldSpecified;
             }
             set {
-                this.wbi2017EffectiveStressFieldSpecified = value;
+                this.wti2017EffectiveStressFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017BackwardErosionDeltaPhiC {
+        public double Wti2017BackwardErosionDeltaPhiC {
             get {
-                return this.wbi2017BackwardErosionDeltaPhiCField;
+                return this.wti2017BackwardErosionDeltaPhiCField;
             }
             set {
-                this.wbi2017BackwardErosionDeltaPhiCField = value;
+                this.wti2017BackwardErosionDeltaPhiCField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017BackwardErosionDeltaPhiCSpecified {
+        public bool Wti2017BackwardErosionDeltaPhiCSpecified {
             get {
-                return this.wbi2017BackwardErosionDeltaPhiCFieldSpecified;
+                return this.wti2017BackwardErosionDeltaPhiCFieldSpecified;
             }
             set {
-                this.wbi2017BackwardErosionDeltaPhiCFieldSpecified = value;
+                this.wti2017BackwardErosionDeltaPhiCFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017CCreep {
+        public double Wti2017CCreep {
             get {
-                return this.wbi2017CCreepField;
+                return this.wti2017CCreepField;
             }
             set {
-                this.wbi2017CCreepField = value;
+                this.wti2017CCreepField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017CCreepSpecified {
+        public bool Wti2017CCreepSpecified {
             get {
-                return this.wbi2017CCreepFieldSpecified;
+                return this.wti2017CCreepFieldSpecified;
             }
             set {
-                this.wbi2017CCreepFieldSpecified = value;
+                this.wti2017CCreepFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wbi2017BackwardErosionDeltaPhiReduced {
+        public double Wti2017BackwardErosionDeltaPhiReduced {
             get {
-                return this.wbi2017BackwardErosionDeltaPhiReducedField;
+                return this.wti2017BackwardErosionDeltaPhiReducedField;
             }
             set {
-                this.wbi2017BackwardErosionDeltaPhiReducedField = value;
+                this.wti2017BackwardErosionDeltaPhiReducedField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wbi2017BackwardErosionDeltaPhiReducedSpecified {
+        public bool Wti2017BackwardErosionDeltaPhiReducedSpecified {
             get {
-                return this.wbi2017BackwardErosionDeltaPhiReducedFieldSpecified;
+                return this.wti2017BackwardErosionDeltaPhiReducedFieldSpecified;
             }
             set {
-                this.wbi2017BackwardErosionDeltaPhiReducedFieldSpecified = value;
+                this.wti2017BackwardErosionDeltaPhiReducedFieldSpecified = value;
             }
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
===================================================================
diff -u -r1935 -r1958
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 1935)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 1958)
@@ -173,7 +173,7 @@
                 model = PipingModelType.Sellmeijer4Forces;
             if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified)
                 model = PipingModelType.SellmeijerVnk;
-            if (designResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified)
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified)
                 model = PipingModelType.Wti2017;
             desResult.PipingDesignResults = new PipingDesignResults(model)
             {
@@ -204,35 +204,35 @@
 
             if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical;
 
-            if (designResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wbi2017BackwardErosionFactor;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor;
 
-            if (designResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wbi2017BackwardErosionHcritical;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical;
 
-            if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiCSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiC;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC;
 
-            if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReducedSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReduced;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced;
 
-            if (designResult.PipingDesignResults.Wbi2017UpliftFactorSpecified) desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wbi2017UpliftFactor;
+            if (designResult.PipingDesignResults.Wti2017UpliftFactorSpecified) desResult.PipingDesignResults.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wti2017UpliftFactor;
 
-            if (designResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wbi2017UpliftHcritical;
+            if (designResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical;
 
-            if (designResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wbi2017DeltaPhiCu;
+            if (designResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified) desResult.PipingDesignResults.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wti2017DeltaPhiCu;
 
-            if (designResult.PipingDesignResults.Wbi2017HeaveFactorSpecified) desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wbi2017HeaveFactor;
+            if (designResult.PipingDesignResults.Wti2017HeaveFactorSpecified) desResult.PipingDesignResults.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wti2017HeaveFactor;
 
-            if (designResult.PipingDesignResults.Wbi2017HeaveHcriticalSpecified) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wbi2017HeaveHcritical;
+            if (designResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical;
 
-            if (designResult.PipingDesignResults.Wbi2017GradientSpecified) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wbi2017Gradient;
+            if (designResult.PipingDesignResults.Wti2017GradientSpecified) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient;
 
-            if (designResult.PipingDesignResults.Wbi2017FactorOverallSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wbi2017FactorOverall;
+            if (designResult.PipingDesignResults.Wti2017FactorOverallSpecified) desResult.PipingDesignResults.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wti2017FactorOverall;
 
-            if (designResult.PipingDesignResults.Wbi2017HcriticalOverallSpecified) desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wbi2017HcriticalOverall;
+            if (designResult.PipingDesignResults.Wti2017HcriticalOverallSpecified) desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall;
 
             if (designResult.PipingDesignResults.ExitPointXSpecified) desResult.PipingDesignResults.LocalExitPointX = designResult.PipingDesignResults.ExitPointX;
 
-            if (designResult.PipingDesignResults.Wbi2017EffectiveStressSpecified) desResult.PipingDesignResults.EffectiveStress = designResult.PipingDesignResults.Wbi2017EffectiveStress;
+            if (designResult.PipingDesignResults.Wti2017EffectiveStressSpecified) desResult.PipingDesignResults.EffectiveStress = designResult.PipingDesignResults.Wti2017EffectiveStress;
 
-            if (designResult.PipingDesignResults.Wbi2017CCreepSpecified) desResult.PipingDesignResults.CCreep = designResult.PipingDesignResults.Wbi2017CCreep;
+            if (designResult.PipingDesignResults.Wti2017CCreepSpecified) desResult.PipingDesignResults.CCreep = designResult.PipingDesignResults.Wti2017CCreep;
 
             if (designResult.PipingDesignResults.UpliftSituation != null)
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r1936 -r1958
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs	(.../PipingSellmeijerRevisedTests.cs)	(revision 1936)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs	(.../PipingSellmeijerRevisedTests.cs)	(revision 1958)
@@ -57,8 +57,8 @@
             
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance);
-            Assert.AreEqual(1.9830328582839827, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance);
+            Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance);
+            Assert.AreEqual(1.9830328582839827, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance);
             Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
             // The following values are not the same as in the classic UI
             // The upliftfactor there is 0.351, but that is the Wti Upliftfactor
@@ -109,9 +109,9 @@
             Assert.AreEqual(93.986, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
 
             // expected value = 1.280
-            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance);
+            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance);
             // expected value = 4.697
-            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance);
+            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance);
 
             // expected value = 0.582
             Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
@@ -152,8 +152,8 @@
             Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance);
             Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance);
-            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionFactor, tolerance);
-            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wbi2017BackwardErosionHcritical, tolerance);
+            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance);
+            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance);
             Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r1935 -r1958
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1935)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1958)
@@ -167,50 +167,50 @@
             desResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified = designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue;
             if (designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical.Value;
 
-            desResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue;
-            if (designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionFactor = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.Value;
+            desResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionFactor = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.Value;
 
-            desResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue;
-            if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value;
+            desResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value;
 
-            desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiCSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue;
-            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.Value;
+            desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.Value;
 
-            desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReducedSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue;
-            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue) desResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.Value;
+            desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.Value;
 
-            desResult.PipingDesignResults.Wbi2017UpliftFactorSpecified = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue;
-            if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value;
+            desResult.PipingDesignResults.Wti2017UpliftFactorSpecified = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue;
+            if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value;
 
-            desResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified = designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue;
-            if (designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue) desResult.PipingDesignResults.Wbi2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical.Value;
+            desResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified = designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue;
+            if (designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical.Value;
 
-            desResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue;
-            if (designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue) desResult.PipingDesignResults.Wbi2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.Value;
+            desResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue;
+            if (designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue) desResult.PipingDesignResults.Wti2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.Value;
 
-            desResult.PipingDesignResults.Wbi2017HeaveFactorSpecified = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue;
-            if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) desResult.PipingDesignResults.Wbi2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value;
+            desResult.PipingDesignResults.Wti2017HeaveFactorSpecified = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue;
+            if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value;
 
-            desResult.PipingDesignResults.Wbi2017HeaveHcriticalSpecified = designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue;
-            if (designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue) desResult.PipingDesignResults.Wbi2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical.Value;
+            desResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified = designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue;
+            if (designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical.Value;
 
-            desResult.PipingDesignResults.Wbi2017GradientSpecified = designResult.PipingDesignResults.Wti2017Gradient.HasValue;
-            if (designResult.PipingDesignResults.Wti2017Gradient.HasValue) desResult.PipingDesignResults.Wbi2017Gradient = designResult.PipingDesignResults.Wti2017Gradient.Value;
+            desResult.PipingDesignResults.Wti2017GradientSpecified = designResult.PipingDesignResults.Wti2017Gradient.HasValue;
+            if (designResult.PipingDesignResults.Wti2017Gradient.HasValue) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient.Value;
 
-            desResult.PipingDesignResults.Wbi2017FactorOverallSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue;
-            if (designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue) desResult.PipingDesignResults.Wbi2017FactorOverall = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.Value;
+            desResult.PipingDesignResults.Wti2017FactorOverallSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue;
+            if (designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue) desResult.PipingDesignResults.Wti2017FactorOverall = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.Value;
 
-            desResult.PipingDesignResults.Wbi2017HcriticalOverallSpecified = designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue;
-            if (designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue) desResult.PipingDesignResults.Wbi2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall.Value;
+            desResult.PipingDesignResults.Wti2017HcriticalOverallSpecified = designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue;
+            if (designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue) desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall.Value;
 
             desResult.PipingDesignResults.ExitPointXSpecified = designResult.PipingDesignResults.LocalExitPointX.HasValue;
             if (designResult.PipingDesignResults.LocalExitPointX.HasValue) desResult.PipingDesignResults.ExitPointX = designResult.PipingDesignResults.LocalExitPointX.Value;
 
-            desResult.PipingDesignResults.Wbi2017EffectiveStressSpecified = designResult.PipingDesignResults.EffectiveStress.HasValue;
-            if (designResult.PipingDesignResults.EffectiveStress.HasValue) desResult.PipingDesignResults.Wbi2017EffectiveStress = designResult.PipingDesignResults.EffectiveStress.Value;
+            desResult.PipingDesignResults.Wti2017EffectiveStressSpecified = designResult.PipingDesignResults.EffectiveStress.HasValue;
+            if (designResult.PipingDesignResults.EffectiveStress.HasValue) desResult.PipingDesignResults.Wti2017EffectiveStress = designResult.PipingDesignResults.EffectiveStress.Value;
 
-            desResult.PipingDesignResults.Wbi2017CCreepSpecified = designResult.PipingDesignResults.CCreep.HasValue;
-            if (designResult.PipingDesignResults.CCreep.HasValue) desResult.PipingDesignResults.Wbi2017CCreep = designResult.PipingDesignResults.CCreep.Value;
+            desResult.PipingDesignResults.Wti2017CCreepSpecified = designResult.PipingDesignResults.CCreep.HasValue;
+            if (designResult.PipingDesignResults.CCreep.HasValue) desResult.PipingDesignResults.Wti2017CCreep = designResult.PipingDesignResults.CCreep.Value;
 
             if (designResult.PipingDesignResults.UpliftSituation.HasValue)
             {
Index: DamEngine/trunk/xsd/DamDesignResult.xsd
===================================================================
diff -u -r1935 -r1958
--- DamEngine/trunk/xsd/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 1935)
+++ DamEngine/trunk/xsd/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 1958)
@@ -46,21 +46,21 @@
           <xs:attribute name="Sellmeijer4ForcesHcritical" type="xs:double" use="optional" />
           <xs:attribute name="SellmeijerVnkFactor" type="xs:double" use="optional" />
           <xs:attribute name="SellmeijerVnkHcritical" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017BackwardErosionFactor" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017BackwardErosionHcritical" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017BackwardErosionFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017BackwardErosionHcritical" type="xs:double" use="optional" />
           <xs:attribute name="ExitPointX" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017UpliftFactor" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017UpliftHcritical" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017DeltaPhiCu" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017HeaveFactor" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017HeaveHcritical" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017Gradient" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017FactorOverall" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017HcriticalOverall" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017EffectiveStress" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017BackwardErosionDeltaPhiC" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017CCreep" type="xs:double" use="optional" />
-          <xs:attribute name="Wbi2017BackwardErosionDeltaPhiReduced" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017UpliftFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017UpliftHcritical" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017DeltaPhiCu" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017HeaveFactor" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017HeaveHcritical" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017Gradient" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017FactorOverall" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017HcriticalOverall" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017EffectiveStress" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017BackwardErosionDeltaPhiC" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017CCreep" type="xs:double" use="optional" />
+          <xs:attribute name="Wti2017BackwardErosionDeltaPhiReduced" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
     </xs:sequence>