Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r1613 -r1618
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 1613)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 1618)
@@ -542,19 +542,19 @@
         [TestCase(PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk)]
         [TestCase(PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces)]
         [TestCase(PipingModelType.Wti2017, InputPipingModelType.WbiSellmeijerRevised)]
-        public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType outputPipingModelType)
+        public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType inputPipingModelType)
         {
-            Assert.AreEqual(outputPipingModelType, ConversionHelper.ConvertToInputPipingModelType(pipingModelType));
+            Assert.AreEqual(inputPipingModelType, ConversionHelper.ConvertToInputPipingModelType(pipingModelType));
         }
 
         [Test]
         [TestCase(InputPipingModelType.Bligh, PipingModelType.Bligh)]
         [TestCase(InputPipingModelType.SellmeijerVnk, PipingModelType.SellmeijerVnk)]
         [TestCase(InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces)]
         [TestCase(InputPipingModelType.WbiSellmeijerRevised, PipingModelType.Wti2017)]
-        public void CanConvertToPipingModelType(InputPipingModelType outputPipingModelType, PipingModelType pipingModelType)
+        public void CanConvertToPipingModelType(InputPipingModelType inputPipingModelType, PipingModelType pipingModelType)
         {
-            Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(outputPipingModelType));
+            Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(inputPipingModelType));
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs
===================================================================
diff -u -r1586 -r1618
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs	(.../WbiPipingSellmeijerRevisedOutput.cs)	(revision 1586)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs	(.../WbiPipingSellmeijerRevisedOutput.cs)	(revision 1618)
@@ -27,6 +27,7 @@
 {
     /// <summary>
     /// Output parameters for Wbi Piping SellmeijerRevised
+    /// Note: the Wbi kernel does provide more output (such as CCreep, Zp etc) but thta just is not used in DAM.
     /// </summary>
     public class WbiPipingSellmeijerRevisedOutput: IKernelDataOutput
     {
@@ -47,38 +48,6 @@
         public double Hc { get; set; }
 
         /// <summary>
-        /// Gets or sets the zp (limit state function).
-        /// </summary>
-        /// <value>
-        /// The zp.
-        /// </value>
-        // public double Zp { get; set; } DAM does not use this!
-
-        /// <summary>
-        /// Gets or sets the HCP (critical water level for piping).
-        /// </summary>
-        /// <value>
-        /// The HCP.
-        /// </value>
-        //public double Hcp { get; set; } DAM does not use this!
-
-        /// <summary>
-        /// Gets or sets the creep coefficient.
-        /// </summary>
-        /// <value>
-        /// The ccreep.
-        /// </value>
-        //public double Ccreep { get; set; } DAM does not use this!
-
-        /// <summary>
-        /// Gets or sets the reduced fall.
-        /// </summary>
-        /// <value>
-        /// The reduced fall.
-        /// </value>
-        //public double ReducedFall { get; set; } DAM does not use this!
-
-        /// <summary>
         /// Gets or sets the calculation result.
         /// </summary>
         /// <value>
@@ -92,22 +61,22 @@
         /// <value>
         /// The uplift factor.
         /// </value>
-        public double? UpliftFactor { get; set; } //#Bka needed?? For now, yes as we use DAM uplift.
+        public double? UpliftFactor { get; set; }
 
         /// <summary>
         /// Gets or sets the x-coordinate of the exit point.
         /// </summary>
         /// <value>
         /// The exit point x.
         /// </value>
-        public double ExitPointX { get; set; }//#Bka needed?? For now, yes
+        public double ExitPointX { get; set; }
 
         /// <summary>
         /// Gets or sets the uplift situation.
         /// </summary>
         /// <value>
         /// The uplift situation.
         /// </value>
-        public UpliftSituation UpliftSituation { get; set; }//#Bka needed?? For now, yes
+        public UpliftSituation UpliftSituation { get; set; }
     }
 }