Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs
===================================================================
diff -u -r1e1038fd12231a8f093a94c8df78337958d55ad0 -r9e196d166be69221bf9cc0285136d20a7310fac8
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs	(.../HydraRingConfiguration.cs)	(revision 1e1038fd12231a8f093a94c8df78337958d55ad0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs	(.../HydraRingConfiguration.cs)	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -37,19 +37,19 @@
         /// </summary>
         public HydraRingConfiguration()
         {
-            TimeIntegrationSchemeType = TimeIntegrationSchemeType.Undefined;
-            UncertaintiesType = UncertaintiesType.Undefined;
+            HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.Undefined;
+            HydraRingUncertaintiesType = HydraRingUncertaintiesType.Undefined;
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="TimeIntegrationSchemeType"/>.
+        /// Gets or sets the <see cref="HydraRingTimeIntegrationSchemeType"/>.
         /// </summary>
-        public TimeIntegrationSchemeType TimeIntegrationSchemeType { get; set; }
+        public HydraRingTimeIntegrationSchemeType HydraRingTimeIntegrationSchemeType { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="UncertaintiesType"/>.
+        /// Gets or sets the <see cref="HydraRingUncertaintiesType"/>.
         /// </summary>
-        public UncertaintiesType UncertaintiesType { get; set; }
+        public HydraRingUncertaintiesType HydraRingUncertaintiesType { get; set; }
 
         /// <summary>
         /// Gets or sets the <see cref="HydraulicBoundaryLocation"/>.
@@ -80,10 +80,10 @@
                 new OrderedDictionary
                 {
                     {
-                        "TimeIntegrationSchemeID", TimeIntegrationSchemeType != TimeIntegrationSchemeType.Undefined ? (int?) TimeIntegrationSchemeType : null
+                        "TimeIntegrationSchemeID", HydraRingTimeIntegrationSchemeType != HydraRingTimeIntegrationSchemeType.Undefined ? (int?) HydraRingTimeIntegrationSchemeType : null
                     },
                     {
-                        "UncertaintiesID", UncertaintiesType != UncertaintiesType.Undefined ? (int?) UncertaintiesType : null
+                        "UncertaintiesID", HydraRingUncertaintiesType != HydraRingUncertaintiesType.Undefined ? (int?) HydraRingUncertaintiesType : null
                     },
                     {
                         "DataSetName", "WTI 2017" // Fixed: use the WTI 2017 set of station locations
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingTimeIntegrationSchemeType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingTimeIntegrationSchemeType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingTimeIntegrationSchemeType.cs	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation
+{
+    /// <summary>
+    /// Enumeration that defines the time integration scheme types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// Except for <see cref="Undefined"/>, the integer values correspond to time integration scheme ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingTimeIntegrationSchemeType
+    {
+        Undefined = -1,
+        FBC = 1,
+        APT = 2,
+        NTI = 3
+    }
+}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingUncertaintiesType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingUncertaintiesType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingUncertaintiesType.cs	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation
+{
+    /// <summary>
+    /// Enumeration that defines the uncertainties types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// Except for <see cref="Undefined"/>, the integer values correspond to uncertainties ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingUncertaintiesType
+    {
+        Undefined = -1,
+        None = 0, // "No uncertainties"
+        All = 1, // "All uncertainties"
+        Model = 2, // "Only model uncertainties"
+        Statistic = 3 // "Only statistical uncertainties"
+    }
+}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -rcfbf9b34d71b46cca6c038e90e45db85d883ea30 -r9e196d166be69221bf9cc0285136d20a7310fac8
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision cfbf9b34d71b46cca6c038e90e45db85d883ea30)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -43,8 +43,8 @@
     <Compile Include="HydraRingConfiguration.cs" />
     <Compile Include="HydraRingConfigurationSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TimeIntegrationSchemeType.cs" />
-    <Compile Include="UncertaintiesType.cs" />
+    <Compile Include="HydraRingTimeIntegrationSchemeType.cs" />
+    <Compile Include="HydraRingUncertaintiesType.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
Fisheye: Tag 9e196d166be69221bf9cc0285136d20a7310fac8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/TimeIntegrationSchemeType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e196d166be69221bf9cc0285136d20a7310fac8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/UncertaintiesType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs
===================================================================
diff -u -r1e1038fd12231a8f093a94c8df78337958d55ad0 -r9e196d166be69221bf9cc0285136d20a7310fac8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs	(.../HydraRingConfigurationTest.cs)	(revision 1e1038fd12231a8f093a94c8df78337958d55ad0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs	(.../HydraRingConfigurationTest.cs)	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -57,8 +57,8 @@
         {
             var hydraRingConfiguration = new HydraRingConfiguration
             {
-                TimeIntegrationSchemeType = TimeIntegrationSchemeType.NTI,
-                UncertaintiesType = UncertaintiesType.Model,
+                HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.NTI,
+                HydraRingUncertaintiesType = HydraRingUncertaintiesType.Model,
                 HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "", 0, 0)
             };
 
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingTimeIntegrationSchemeTypeTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingTimeIntegrationSchemeTypeTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingTimeIntegrationSchemeTypeTest.cs	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+
+namespace Ringtoets.HydraRing.Calculation.Test
+{
+    [TestFixture]
+    public class HydraRingTimeIntegrationSchemeTypeTest
+    {
+        [Test]
+        public void Values_HasFour()
+        {
+            Assert.AreEqual(4, Enum.GetValues(typeof(HydraRingTimeIntegrationSchemeType)).Length);
+        }
+
+        [Test]
+        public void ConvertToInteger_ForAllValues_ReturnsExpectedInteger()
+        {
+            Assert.AreEqual(-1, (int) HydraRingTimeIntegrationSchemeType.Undefined);
+            Assert.AreEqual(1, (int) HydraRingTimeIntegrationSchemeType.FBC);
+            Assert.AreEqual(2, (int) HydraRingTimeIntegrationSchemeType.APT);
+            Assert.AreEqual(3, (int) HydraRingTimeIntegrationSchemeType.NTI);
+        }
+    }
+}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingUncertaintiesTypeTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingUncertaintiesTypeTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingUncertaintiesTypeTest.cs	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+
+namespace Ringtoets.HydraRing.Calculation.Test
+{
+    [TestFixture]
+    public class HydraRingUncertaintiesTypeTest
+    {
+        [Test]
+        public void Values_HasFive()
+        {
+            Assert.AreEqual(5, Enum.GetValues(typeof(HydraRingUncertaintiesType)).Length);
+        }
+
+        [Test]
+        public void ConvertToInteger_ForAllValues_ReturnsExpectedInteger()
+        {
+            Assert.AreEqual(-1, (int) HydraRingUncertaintiesType.Undefined);
+            Assert.AreEqual(0, (int) HydraRingUncertaintiesType.None);
+            Assert.AreEqual(1, (int) HydraRingUncertaintiesType.All);
+            Assert.AreEqual(2, (int) HydraRingUncertaintiesType.Model);
+            Assert.AreEqual(3, (int) HydraRingUncertaintiesType.Statistic);
+        }
+    }
+}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -rcfbf9b34d71b46cca6c038e90e45db85d883ea30 -r9e196d166be69221bf9cc0285136d20a7310fac8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision cfbf9b34d71b46cca6c038e90e45db85d883ea30)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 9e196d166be69221bf9cc0285136d20a7310fac8)
@@ -51,8 +51,8 @@
     <Compile Include="HydraRingConfigurationTest.cs" />
     <Compile Include="HydraRingFailureMechanismTypeTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TimeIntegrationSchemeTypeTest.cs" />
-    <Compile Include="UncertaintiesTypeTest.cs" />
+    <Compile Include="HydraRingTimeIntegrationSchemeTypeTest.cs" />
+    <Compile Include="HydraRingUncertaintiesTypeTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
Fisheye: Tag 9e196d166be69221bf9cc0285136d20a7310fac8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/TimeIntegrationSchemeTypeTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9e196d166be69221bf9cc0285136d20a7310fac8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/UncertaintiesTypeTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?