Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -rcd61acc8375d044a7a11c8af4e54956dc623d4c2 -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision cd61acc8375d044a7a11c8af4e54956dc623d4c2)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -38,18 +38,18 @@
         /// Gets the string representation of an enum value, taking <see cref="ResourcesDisplayNameAttribute"/>
         /// into account.
         /// </summary>
-        /// <typeparam name="TEnumType">The type of the enum.</typeparam>
+        /// <typeparam name="TEnum">The type of the enum.</typeparam>
         /// <param name="enumValue">The value of the enum.</param>
         /// <returns>The display name of the enum value.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="enumValue"/>
-        /// is an invalid value for <typeparamref name="TEnumType"/>.</exception>
-        public static string GetDisplayName<TEnumType>(TEnumType enumValue) where TEnumType : IConvertible
+        /// is an invalid value for <typeparamref name="TEnum"/>.</exception>
+        public static string GetDisplayName<TEnum>(TEnum enumValue) where TEnum : IConvertible
         {
             string valueString = enumValue.ToString(CultureInfo.InvariantCulture);
-            FieldInfo fieldInfo = typeof(TEnumType).GetField(valueString);
+            FieldInfo fieldInfo = typeof(TEnum).GetField(valueString);
             if (fieldInfo == null)
             {
-                throw new InvalidEnumArgumentException(nameof(enumValue), Convert.ToInt32(enumValue), typeof(TEnumType));
+                throw new InvalidEnumArgumentException(nameof(enumValue), Convert.ToInt32(enumValue), typeof(TEnum));
             }
             var resourcesDisplayNameAttribute = (ResourcesDisplayNameAttribute) Attribute.GetCustomAttribute(fieldInfo, typeof(ResourcesDisplayNameAttribute));
             return resourcesDisplayNameAttribute != null ?
Index: Core/Common/test/Core.Common.TestUtil/CustomExceptionDesignGuidelinesTestFixture.cs
===================================================================
diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Core/Common/test/Core.Common.TestUtil/CustomExceptionDesignGuidelinesTestFixture.cs	(.../CustomExceptionDesignGuidelinesTestFixture.cs)	(revision 7ac739bd142fda419737a1e3ce328f373ab3531f)
+++ Core/Common/test/Core.Common.TestUtil/CustomExceptionDesignGuidelinesTestFixture.cs	(.../CustomExceptionDesignGuidelinesTestFixture.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -29,15 +29,15 @@
     /// specified at https://msdn.microsoft.com/en-us/library/ms229064(v=vs.100).aspx.
     /// </summary>
     [TestFixture]
-    public abstract class CustomExceptionDesignGuidelinesTestFixture<TCustomExceptionType, TBaseExceptionType> where TCustomExceptionType : Exception
-                                                                                                               where TBaseExceptionType : Exception
+    public abstract class CustomExceptionDesignGuidelinesTestFixture<TCustomException, TBaseException> where TCustomException : Exception
+                                                                                                               where TBaseException : Exception
     {
         [Test]
         [SetCulture("en-US")]
         public void DefaultConstructor_ExpectedValues()
         {
             // Call
-            TCustomExceptionType exception = CallDefaultConstructor();
+            TCustomException exception = CallDefaultConstructor();
 
             // Assert
             AssertDefaultConstructedInstance(exception);
@@ -50,7 +50,7 @@
             const string messageText = "<insert exception message>";
 
             // Call
-            TCustomExceptionType exception = CallMessageConstructor(messageText);
+            TCustomException exception = CallMessageConstructor(messageText);
 
             // Assert
             AssertMessageConstructedInstance(exception, messageText);
@@ -64,7 +64,7 @@
             const string messageText = "<insert exception message>";
 
             // Call
-            TCustomExceptionType exception = CallMessageAndInnerExceptionConstructor(messageText, innerException);
+            TCustomException exception = CallMessageAndInnerExceptionConstructor(messageText, innerException);
 
             // Assert
             AssertMessageAndInnerExceptionConstructedInstance(exception, messageText, innerException);
@@ -74,23 +74,23 @@
         public void Constructor_SerializationRoundTrip_ExceptionProperlyInitialized()
         {
             // Setup
-            TCustomExceptionType originalException = CreateFullyConfiguredException();
+            TCustomException originalException = CreateFullyConfiguredException();
 
             // Precondition
             Assert.IsNotNull(originalException.InnerException);
             Assert.IsNull(originalException.InnerException.InnerException);
 
             // Call
-            TCustomExceptionType persistedException = SerializationTestHelper.SerializeAndDeserializeException(originalException);
+            TCustomException persistedException = SerializationTestHelper.SerializeAndDeserializeException(originalException);
 
             // Assert
             AssertRoundTripResult(originalException, persistedException);
         }
 
-        protected virtual void AssertDefaultConstructedInstance(TCustomExceptionType exception)
+        protected virtual void AssertDefaultConstructedInstance(TCustomException exception)
         {
-            Assert.IsInstanceOf<TBaseExceptionType>(exception);
-            string expectedMessage = $"Exception of type '{typeof(TCustomExceptionType)}' was thrown.";
+            Assert.IsInstanceOf<TBaseException>(exception);
+            string expectedMessage = $"Exception of type '{typeof(TCustomException)}' was thrown.";
             Assert.AreEqual(expectedMessage, exception.Message);
             CollectionAssert.IsEmpty(exception.Data);
             Assert.IsNull(exception.HelpLink);
@@ -100,10 +100,10 @@
             Assert.IsNull(exception.TargetSite);
         }
 
-        protected virtual void AssertMessageConstructedInstance(TCustomExceptionType exception, string messageText,
+        protected virtual void AssertMessageConstructedInstance(TCustomException exception, string messageText,
                                                                 bool assertData = true)
         {
-            Assert.IsInstanceOf<TBaseExceptionType>(exception);
+            Assert.IsInstanceOf<TBaseException>(exception);
             Assert.AreEqual(messageText, exception.Message);
             Assert.IsNull(exception.HelpLink);
             Assert.IsNull(exception.InnerException);
@@ -117,10 +117,10 @@
             }
         }
 
-        protected virtual void AssertMessageAndInnerExceptionConstructedInstance(TCustomExceptionType exception, string messageText,
+        protected virtual void AssertMessageAndInnerExceptionConstructedInstance(TCustomException exception, string messageText,
                                                                                  Exception innerException, bool assertData = true)
         {
-            Assert.IsInstanceOf<TBaseExceptionType>(exception);
+            Assert.IsInstanceOf<TBaseException>(exception);
             Assert.AreEqual(messageText, exception.Message);
             Assert.IsNull(exception.HelpLink);
             Assert.AreEqual(innerException, exception.InnerException);
@@ -134,7 +134,7 @@
             }
         }
 
-        protected virtual void AssertRoundTripResult(TCustomExceptionType originalException, TCustomExceptionType persistedException)
+        protected virtual void AssertRoundTripResult(TCustomException originalException, TCustomException persistedException)
         {
             Assert.AreEqual(originalException.Message, persistedException.Message);
             Assert.IsNotNull(persistedException.InnerException);
@@ -143,25 +143,25 @@
             Assert.IsNull(persistedException.InnerException.InnerException);
         }
 
-        protected virtual TCustomExceptionType CreateFullyConfiguredException()
+        protected virtual TCustomException CreateFullyConfiguredException()
         {
             var originalInnerException = new Exception("inner");
             return CallMessageAndInnerExceptionConstructor("outer", originalInnerException);
         }
 
-        private static TCustomExceptionType CallDefaultConstructor()
+        private static TCustomException CallDefaultConstructor()
         {
-            return (TCustomExceptionType) Activator.CreateInstance(typeof(TCustomExceptionType));
+            return (TCustomException) Activator.CreateInstance(typeof(TCustomException));
         }
 
-        private static TCustomExceptionType CallMessageConstructor(string message)
+        private static TCustomException CallMessageConstructor(string message)
         {
-            return (TCustomExceptionType) Activator.CreateInstance(typeof(TCustomExceptionType), message);
+            return (TCustomException) Activator.CreateInstance(typeof(TCustomException), message);
         }
 
-        private static TCustomExceptionType CallMessageAndInnerExceptionConstructor(string message, Exception innerException)
+        private static TCustomException CallMessageAndInnerExceptionConstructor(string message, Exception innerException)
         {
-            return (TCustomExceptionType) Activator.CreateInstance(typeof(TCustomExceptionType), message, innerException);
+            return (TCustomException) Activator.CreateInstance(typeof(TCustomException), message, innerException);
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/EnumTestFixture.cs
===================================================================
diff -u -rb9238c12b280f700b45fc0141ac1a2087e7ba4ba -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Core/Common/test/Core.Common.TestUtil/EnumTestFixture.cs	(.../EnumTestFixture.cs)	(revision b9238c12b280f700b45fc0141ac1a2087e7ba4ba)
+++ Core/Common/test/Core.Common.TestUtil/EnumTestFixture.cs	(.../EnumTestFixture.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -28,16 +28,16 @@
 namespace Core.Common.TestUtil
 {
     [TestFixture]
-    public abstract class EnumTestFixture<TEnumType>
+    public abstract class EnumTestFixture<TEnum>
     {
-        protected abstract IDictionary<TEnumType, string> ExpectedDisplayNameForEnumValues { get; }
-        protected abstract IDictionary<TEnumType, byte> ExpectedValueForEnumValues { get; }
+        protected abstract IDictionary<TEnum, string> ExpectedDisplayNameForEnumValues { get; }
+        protected abstract IDictionary<TEnum, byte> ExpectedValueForEnumValues { get; }
 
         [Test]
         public void DisplayName_Always_ReturnExpectedValues()
         {
             // Setup
-            foreach (TEnumType value in Enum.GetValues(typeof(TEnumType)))
+            foreach (TEnum value in Enum.GetValues(typeof(TEnum)))
             {
                 // Call
                 string displayName = GetDisplayName(value);
@@ -52,7 +52,7 @@
         public void ConvertToByte_Always_ReturnExpectedValues()
         {
             // Setup
-            foreach (TEnumType value in Enum.GetValues(typeof(TEnumType)))
+            foreach (TEnum value in Enum.GetValues(typeof(TEnum)))
             {
                 // Call
                 int actualValue = Convert.ToInt32(value);
@@ -63,9 +63,9 @@
             }
         }
 
-        private static string GetDisplayName(TEnumType value)
+        private static string GetDisplayName(TEnum value)
         {
-            Type type = typeof(TEnumType);
+            Type type = typeof(TEnum);
             MemberInfo[] memInfo = type.GetMember(value.ToString());
             object[] attributes = memInfo[0].GetCustomAttributes(typeof(ResourcesDisplayNameAttribute), false);
             if (attributes.Length > 0)
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs
===================================================================
diff -u -r1df1e9ae0057dde85489929cbf85d222c26e8c5f -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs	(.../DesignVariable.cs)	(revision 1df1e9ae0057dde85489929cbf85d222c26e8c5f)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs	(.../DesignVariable.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -25,16 +25,16 @@
 
 namespace Ringtoets.Common.Data.Probabilistics
 {
-    public abstract class DesignVariable<TDistributionType> where TDistributionType : IDistribution
+    public abstract class DesignVariable<TDistribution> where TDistribution : IDistribution
     {
-        private TDistributionType distribution;
+        private TDistribution distribution;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DesignVariable{T}"/> class.
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <see cref="Distribution"/> is 
         /// <c>null</c>.</exception>
-        protected DesignVariable(TDistributionType distribution)
+        protected DesignVariable(TDistribution distribution)
         {
             Distribution = distribution;
         }
@@ -44,7 +44,7 @@
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is 
         /// <c>null</c>.</exception>
-        public TDistributionType Distribution
+        public TDistribution Distribution
         {
             get
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs
===================================================================
diff -u -r8b07dff41637bfd485f412ec534f2ddd7fe27c00 -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs	(.../PercentileBasedDesignVariable.cs)	(revision 8b07dff41637bfd485f412ec534f2ddd7fe27c00)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs	(.../PercentileBasedDesignVariable.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -31,9 +31,9 @@
     /// This class is a representation of a variable derived from a probabilistic distribution,
     /// based on a percentile.
     /// </summary>
-    /// <typeparam name="TDistributionType">The type of the underlying distribution from which a value is 
+    /// <typeparam name="TDistribution">The type of the underlying distribution from which a value is 
     /// derived.</typeparam>
-    public abstract class PercentileBasedDesignVariable<TDistributionType> : DesignVariable<TDistributionType> where TDistributionType : IDistribution
+    public abstract class PercentileBasedDesignVariable<TDistribution> : DesignVariable<TDistribution> where TDistribution : IDistribution
     {
         private static readonly Range<double> percentileValidityRange = new Range<double>(0, 1);
         private double percentile;
@@ -44,7 +44,7 @@
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <see cref="DesignVariable{TDistributionType}.Distribution"/> is 
         /// <c>null</c>.</exception>
-        protected PercentileBasedDesignVariable(TDistributionType distribution) : base(distribution)
+        protected PercentileBasedDesignVariable(TDistribution distribution) : base(distribution)
         {
             percentile = 0.5;
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientDesignVariable.cs
===================================================================
diff -u -r1df1e9ae0057dde85489929cbf85d222c26e8c5f -r39195f5df99368004bfcd61ccee7e0f2575c9b8b
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientDesignVariable.cs	(.../VariationCoefficientDesignVariable.cs)	(revision 1df1e9ae0057dde85489929cbf85d222c26e8c5f)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientDesignVariable.cs	(.../VariationCoefficientDesignVariable.cs)	(revision 39195f5df99368004bfcd61ccee7e0f2575c9b8b)
@@ -25,16 +25,16 @@
 
 namespace Ringtoets.Common.Data.Probabilistics
 {
-    public abstract class VariationCoefficientDesignVariable<TDistributionType> where TDistributionType : IVariationCoefficientDistribution
+    public abstract class VariationCoefficientDesignVariable<TDistribution> where TDistribution : IVariationCoefficientDistribution
     {
-        private TDistributionType distribution;
+        private TDistribution distribution;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VariationCoefficientDesignVariable{T}"/> class.
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <see cref="Distribution"/> is 
         /// <c>null</c>.</exception>
-        protected VariationCoefficientDesignVariable(TDistributionType distribution)
+        protected VariationCoefficientDesignVariable(TDistribution distribution)
         {
             Distribution = distribution;
         }
@@ -44,7 +44,7 @@
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is 
         /// <c>null</c>.</exception>
-        public TDistributionType Distribution
+        public TDistribution Distribution
         {
             get
             {