Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 68f02442e2e790aaa0bde531c328662819908f10)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -89,7 +89,7 @@
 
         static App()
         {
-            SettingsHelper.Instance = new RingtoetsSettingsHelper();
+            SettingsHelper.Instance = new RiskeerSettingsHelper();
             SetLanguage();
 
             string userDisplay = UserDisplay();
Index: Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs
===================================================================
diff -u -rcb6d0d0e0260d373f0ade513d28e6ffcfc28a138 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs	(.../AppTest.cs)	(revision cb6d0d0e0260d373f0ade513d28e6ffcfc28a138)
+++ Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs	(.../AppTest.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -58,7 +58,7 @@
 
                 // Assert
                 Assert.IsInstanceOf<System.Windows.Application>(app);
-                Assert.IsInstanceOf<RingtoetsSettingsHelper>(SettingsHelper.Instance);
+                Assert.IsInstanceOf<RiskeerSettingsHelper>(SettingsHelper.Instance);
                 app.Shutdown();
             });
         }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs
===================================================================
diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs	(.../AssessmentSectionFromFileCommandHandler.cs)	(revision 68f02442e2e790aaa0bde531c328662819908f10)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs	(.../AssessmentSectionFromFileCommandHandler.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -50,7 +50,7 @@
     public class AssessmentSectionFromFileCommandHandler : IAssessmentSectionFromFileCommandHandler
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(AssessmentSectionFromFileCommandHandler));
-        private readonly string shapeFileDirectory = RingtoetsSettingsHelper.GetCommonDocumentsRingtoetsShapeFileDirectory();
+        private readonly string shapeFileDirectory = RiskeerSettingsHelper.GetCommonDocumentsRiskeerShapeFileDirectory();
 
         private readonly IWin32Window dialogParent;
         private readonly IProjectOwner projectOwner;
@@ -95,13 +95,13 @@
             }
 
             AssessmentSection assessmentSection = GetAssessmentSectionFromDialog();
-            var ringtoetsProject = projectOwner.Project as RiskeerProject;
-            if (assessmentSection == null || ringtoetsProject == null)
+            var project = projectOwner.Project as RiskeerProject;
+            if (assessmentSection == null || project == null)
             {
                 return;
             }
 
-            SetAssessmentSectionToProject(ringtoetsProject, assessmentSection);
+            SetAssessmentSectionToProject(project, assessmentSection);
         }
 
         #region Dialog
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -1009,54 +1009,54 @@
         /// <summary>
         ///   Looks up a localized string similar to Database op pad &apos;{0}&apos; gekoppeld..
         /// </summary>
-        public static string RingtoetsPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked {
+        public static string RiskeerPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked {
             get {
-                return ResourceManager.GetString("RingtoetsPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked", resourceCulture);
+                return ResourceManager.GetString("RiskeerPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Korte beschrijving van het project..
         /// </summary>
-        public static string RingtoetsProjectProperties_Description_Description {
+        public static string RiskeerProjectProperties_Description_Description {
             get {
-                return ResourceManager.GetString("RingtoetsProjectProperties_Description_Description", resourceCulture);
+                return ResourceManager.GetString("RiskeerProjectProperties_Description_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Omschrijving.
         /// </summary>
-        public static string RingtoetsProjectProperties_Description_DisplayName {
+        public static string RiskeerProjectProperties_Description_DisplayName {
             get {
-                return ResourceManager.GetString("RingtoetsProjectProperties_Description_DisplayName", resourceCulture);
+                return ResourceManager.GetString("RiskeerProjectProperties_Description_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Naam van het project..
         /// </summary>
-        public static string RingtoetsProjectProperties_Name_Description {
+        public static string RiskeerProjectProperties_Name_Description {
             get {
-                return ResourceManager.GetString("RingtoetsProjectProperties_Name_Description", resourceCulture);
+                return ResourceManager.GetString("RiskeerProjectProperties_Name_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Naam.
         /// </summary>
-        public static string RingtoetsProjectProperties_Name_DisplayName {
+        public static string RiskeerProjectProperties_Name_DisplayName {
             get {
-                return ResourceManager.GetString("RingtoetsProjectProperties_Name_DisplayName", resourceCulture);
+                return ResourceManager.GetString("RiskeerProjectProperties_Name_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Traject Toevoegen.
         /// </summary>
-        public static string RingtoetsRibbon_AddAssessmentSection {
+        public static string RiskeerRibbon_AddAssessmentSection {
             get {
-                return ResourceManager.GetString("RingtoetsRibbon_AddAssessmentSection", resourceCulture);
+                return ResourceManager.GetString("RiskeerRibbon_AddAssessmentSection", resourceCulture);
             }
         }
         
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -153,7 +153,7 @@
   <data name="HydraulicBoundaryDatabase_FilePath_DisplayName" xml:space="preserve">
     <value>HRD database locatie</value>
   </data>
-  <data name="RingtoetsPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked" xml:space="preserve">
+  <data name="RiskeerPlugin_SetBoundaryDatabaseFilePath_Database_on_path_0_linked" xml:space="preserve">
     <value>Database op pad '{0}' gekoppeld.</value>
   </data>
   <data name="FailureMechanismContributionView_ProbabilityPerYear_Not_applicable" xml:space="preserve">
@@ -204,22 +204,22 @@
   <data name="AssessmentSectionFolder" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder-stand32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RingtoetsProjectProperties_Description_Description" xml:space="preserve">
+  <data name="RiskeerProjectProperties_Description_Description" xml:space="preserve">
     <value>Korte beschrijving van het project.</value>
   </data>
-  <data name="RingtoetsProjectProperties_Description_DisplayName" xml:space="preserve">
+  <data name="RiskeerProjectProperties_Description_DisplayName" xml:space="preserve">
     <value>Omschrijving</value>
   </data>
-  <data name="RingtoetsProjectProperties_Name_Description" xml:space="preserve">
+  <data name="RiskeerProjectProperties_Name_Description" xml:space="preserve">
     <value>Naam van het project.</value>
   </data>
-  <data name="RingtoetsProjectProperties_Name_DisplayName" xml:space="preserve">
+  <data name="RiskeerProjectProperties_Name_DisplayName" xml:space="preserve">
     <value>Naam</value>
   </data>
   <data name="AddAssessmentSectionFolder" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AddFolder-stand32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RingtoetsRibbon_AddAssessmentSection" xml:space="preserve">
+  <data name="RiskeerRibbon_AddAssessmentSection" xml:space="preserve">
     <value>Traject Toevoegen</value>
   </data>
   <data name="AddAssessmentSection_DisplayName" xml:space="preserve">
Fisheye: Tag 3e63e58f2e9de8de16ac832b4989b7705c97b443 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/RingtoetsProjectProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/RiskeerProjectProperties.cs
===================================================================
diff -u
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/RiskeerProjectProperties.cs	(revision 0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/RiskeerProjectProperties.cs	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer 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 Core.Common.Base.Data;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Util.Attributes;
+using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
+using RiskeerIntegrationFormsResources = Riskeer.Integration.Forms.Properties.Resources;
+
+namespace Riskeer.Integration.Forms.PropertyClasses
+{
+    /// <summary>
+    /// This class describes the presentation of properties of a <see cref="IProject"/>.
+    /// </summary>
+    public class RiskeerProjectProperties : ObjectProperties<IProject>
+    {
+        [PropertyOrder(1)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(RiskeerIntegrationFormsResources), nameof(RiskeerIntegrationFormsResources.RiskeerProjectProperties_Name_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerIntegrationFormsResources), nameof(RiskeerIntegrationFormsResources.RiskeerProjectProperties_Name_Description))]
+        public string Name
+        {
+            get
+            {
+                return data.Name;
+            }
+        }
+
+        [PropertyOrder(2)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(RiskeerIntegrationFormsResources), nameof(RiskeerIntegrationFormsResources.RiskeerProjectProperties_Description_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerIntegrationFormsResources), nameof(RiskeerIntegrationFormsResources.RiskeerProjectProperties_Description_Description))]
+        public string Description
+        {
+            get
+            {
+                return data.Description;
+            }
+            set
+            {
+                data.Description = value;
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 3e63e58f2e9de8de16ac832b4989b7705c97b443 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/RingtoetsSettingsHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Riskeer.Integration.Forms.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Riskeer.Integration.Forms.csproj	(.../Riskeer.Integration.Forms.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Riskeer.Integration.Forms.csproj	(.../Riskeer.Integration.Forms.csproj)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -86,10 +86,10 @@
     <Compile Include="PropertyClasses\IHydraulicLocationConfigurationDatabaseImportHandler.cs" />
     <Compile Include="PropertyClasses\NormProperties.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionCompositionProperties.cs" />
+    <Compile Include="PropertyClasses\RiskeerProjectProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\PipingStructureFailureMechanismProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\MacroStabilityOutwardsFailureMechanismProperties.cs" />
     <Compile Include="PropertyClasses\ReferenceLineProperties.cs" />
-    <Compile Include="PropertyClasses\RingtoetsProjectProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\StandAloneFailureMechanismProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -105,7 +105,7 @@
     <Compile Include="Dialogs\ReferenceLineMetaSelectionDialog.Designer.cs">
       <DependentUpon>ReferenceLineMetaSelectionDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="RingtoetsSettingsHelper.cs" />
+    <Compile Include="RiskeerSettingsHelper.cs" />
     <Compile Include="Views\AssemblyResultCategoriesView.cs">
       <SubType>UserControl</SubType>
     </Compile>
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs
===================================================================
diff -u
--- Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs	(revision 0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -0,0 +1,65 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer 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.Collections.Generic;
+using System.IO;
+using Core.Common.Util.Settings;
+
+namespace Riskeer.Integration.Forms
+{
+    /// <summary>
+    /// Class that defines helper methods related to Riskeer settings.
+    /// </summary>
+    public class RiskeerSettingsHelper : SettingsHelper
+    {
+        /// <summary>
+        /// Gets the directory of the "NBPW" shape file within the common documents directory.
+        /// </summary>
+        /// <returns>Directory path where the "NBPW" shape file can be found.</returns>
+        public static string GetCommonDocumentsRiskeerShapeFileDirectory()
+        {
+            string commonDocuments = new RiskeerSettingsHelper().GetCommonDocumentsDirectory();
+            return Path.Combine(commonDocuments, "NBPW");
+        }
+
+        public override string GetCommonDocumentsDirectory(params string[] subPath)
+        {
+            var documentsPath = new List<string>
+            {
+                "WTI",
+                "Ringtoets"
+            };
+            documentsPath.AddRange(subPath);
+            return base.GetCommonDocumentsDirectory(documentsPath.ToArray());
+        }
+
+        public override string GetApplicationLocalUserSettingsDirectory(params string[] subPath)
+        {
+            var applicationPath = new List<string>
+            {
+                "WTI",
+                "Ringtoets"
+            };
+            applicationPath.AddRange(subPath);
+            return base.GetApplicationLocalUserSettingsDirectory(applicationPath.ToArray());
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx	(.../AssessmentSectionAssemblyCategoriesView.resx)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx	(.../AssessmentSectionAssemblyCategoriesView.resx)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -136,7 +136,7 @@
     <value>assemblyCategoriesTable</value>
   </data>
   <data name="&gt;&gt;assemblyCategoriesTable.Type" xml:space="preserve">
-    <value>Ringtoets.Integration.Forms.Views.AssessmentSectionAssemblyCategoriesTable, Ringtoets.Common.Forms, Version=18.1.1.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>Riskeer.Integration.Forms.Views.AssessmentSectionAssemblyCategoriesTable, Riskeer.Common.Forms, Version=18.1.1.1, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;assemblyCategoriesTable.Parent" xml:space="preserve">
     <value>$this</value>
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 68f02442e2e790aaa0bde531c328662819908f10)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -295,7 +295,7 @@
         /// </summary>
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<IProject, RingtoetsProjectProperties>();
+            yield return new PropertyInfo<IProject, RiskeerProjectProperties>();
             yield return new PropertyInfo<IAssessmentSection, AssessmentSectionProperties>();
             yield return new PropertyInfo<BackgroundData, BackgroundDataProperties>
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsRibbon.xaml
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsRibbon.xaml	(.../RingtoetsRibbon.xaml)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsRibbon.xaml	(.../RingtoetsRibbon.xaml)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -37,7 +37,7 @@
     <fluent:Ribbon x:Name="RingtoetsRibbonControl" x:FieldModifier="private">
         <fluent:RibbonTabItem Header="{x:Static guiProperties:Resources.Ribbon_TabItem_Start}" fluent:KeyTip.Keys="S" >
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.RingtoetsRibbon_GroupBox_New}" fluent:KeyTip.Keys="ZN">
-                <fluent:Button x:Name="AddAssessmentSectionButton" Header="{x:Static properties:Resources.RingtoetsRibbon_AddAssessmentSection}" LargeIcon="{Binding Source={x:Static properties:Resources.AddAssessmentSectionFolder}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonAddAssessmentSectionToolWindowClick" fluent:KeyTip.Keys="T" />
+                <fluent:Button x:Name="AddAssessmentSectionButton" Header="{x:Static properties:Resources.RiskeerRibbon_AddAssessmentSection}" LargeIcon="{Binding Source={x:Static properties:Resources.AddAssessmentSectionFolder}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonAddAssessmentSectionToolWindowClick" fluent:KeyTip.Keys="T" />
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs	(.../AssessmentSectionMergeFilePathProviderTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs	(.../AssessmentSectionMergeFilePathProviderTest.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -65,7 +65,7 @@
             // Setup
             var mocks = new MockRepository();
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
-            inquiryHelper.Expect(ih => ih.GetSourceFileLocation("Ringtoetsproject (*.rtd)|*.rtd")).Return(expectedFilePath);
+            inquiryHelper.Expect(ih => ih.GetSourceFileLocation("Riskeerproject (*.rtd)|*.rtd")).Return(expectedFilePath);
             mocks.ReplayAll();
 
             var provider = new AssessmentSectionMergeFilePathProvider(inquiryHelper);
Fisheye: Tag 3e63e58f2e9de8de16ac832b4989b7705c97b443 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RiskeerProjectPropertiesTest.cs
===================================================================
diff -u
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RiskeerProjectPropertiesTest.cs	(revision 0)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RiskeerProjectPropertiesTest.cs	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -0,0 +1,97 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer 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.ComponentModel;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Riskeer.Integration.Data;
+using Riskeer.Integration.Forms.PropertyClasses;
+
+namespace Riskeer.Integration.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class RiskeerProjectPropertiesTest
+    {
+        [Test]
+        public void Name_WithData_ReturnsName()
+        {
+            // Setup
+            var project = new RiskeerProject();
+            var properties = new RiskeerProjectProperties
+            {
+                Data = project
+            };
+
+            const string testName = "some name";
+            project.Name = testName;
+
+            // Call
+            string result = properties.Name;
+
+            // Assert
+            Assert.AreEqual(testName, result);
+        }
+
+        [Test]
+        public void Description_WithData_ReturnsDescription()
+        {
+            // Setup
+            var project = new RiskeerProject();
+            var properties = new RiskeerProjectProperties
+            {
+                Data = project
+            };
+
+            const string testDescription = "some description";
+            const string anotherDescription = "another description";
+
+            project.Description = testDescription;
+
+            // Call
+            string result = properties.Description;
+
+            // Assert
+            Assert.AreEqual(testDescription, result);
+
+            // Call
+            properties.Description = anotherDescription;
+
+            // Assert
+            Assert.AreEqual(anotherDescription, project.Description);
+        }
+
+        [Test]
+        public void GetProperties_Always_ReturnsTwoProperties()
+        {
+            // Setup
+            var properties = new RiskeerProjectProperties
+            {
+                Data = new RiskeerProject()
+            };
+
+            // Call
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+
+            // Assert
+            Assert.AreEqual(2, dynamicProperties.Count);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 3e63e58f2e9de8de16ac832b4989b7705c97b443 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RingtoetsSettingsHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -81,6 +81,7 @@
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoryPropertiesTest.cs" />
     <Compile Include="PropertyClasses\NormPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\RiskeerProjectPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\PipingStructureFailureMechanismPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\MacroStabilityOutwardsFailureMechanismPropertiesTest.cs" />
     <Compile Include="PropertyClasses\ReferenceLinePropertiesTest.cs" />
@@ -90,11 +91,10 @@
     <Compile Include="PropertyClasses\CalculationGroupContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\CalculationContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionCompositionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\RingtoetsProjectPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\StandAloneFailureMechanismPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryDatabasePropertiesTest.cs" />
     <Compile Include="Dialogs\ReferenceLineMetaSelectionDialogTest.cs" />
-    <Compile Include="RingtoetsSettingsHelperTest.cs" />
+    <Compile Include="RiskeerSettingsHelperTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionPropertiesTest.cs" />
     <Compile Include="Views\AssemblyResultCategoriesViewTest.cs" />
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs
===================================================================
diff -u
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs	(revision 0)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -0,0 +1,114 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer 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 System.IO;
+using Core.Common.Util.Settings;
+using NUnit.Framework;
+
+namespace Riskeer.Integration.Forms.Test
+{
+    [TestFixture]
+    public class RiskeerSettingsHelperTest
+    {
+        [Test]
+        public void Constructor_ExpectedProperties()
+        {
+            // Call
+            var settingsHelper = new RiskeerSettingsHelper();
+
+            // Assert
+            Assert.IsInstanceOf<SettingsHelper>(settingsHelper);
+        }
+
+        [Test]
+        public void GetApplicationLocalUserSettingsDirectory_WithoutParams_ReturnsExpectedDirectory()
+        {
+            // Setup
+            var settingsHelper = new RiskeerSettingsHelper();
+
+            // Call
+            string localUserSettingsDirectory = settingsHelper.GetApplicationLocalUserSettingsDirectory();
+
+            // Assert
+            string localApplicationDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string expectedPath = Path.Combine(localApplicationDataPath, "WTI", "Ringtoets");
+            Assert.AreEqual(expectedPath, localUserSettingsDirectory);
+        }
+
+        [Test]
+        public void GetApplicationLocalUserSettingsDirectory_WithParams_ReturnsExpectedDirectory()
+        {
+            // Setup
+            var settingsHelper = new RiskeerSettingsHelper();
+            string localApplicationDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string rootPath = Path.Combine(localApplicationDataPath, "WTI", "Ringtoets");
+
+            // Call
+            string localUserSettingsDirectory = settingsHelper.GetApplicationLocalUserSettingsDirectory("subFolder", "subSubFolder");
+
+            // Assert
+            string expectedPath = Path.Combine(rootPath, "subFolder", "subSubFolder");
+            Assert.AreEqual(expectedPath, localUserSettingsDirectory);
+        }
+
+        [Test]
+        public void GetCommonDocumentsRiskeerDirectory_WithoutParams_ReturnsExpectedDirectory()
+        {
+            // Setup
+            var settingsHelper = new RiskeerSettingsHelper();
+
+            // Call
+            string pathFromSettings = settingsHelper.GetCommonDocumentsDirectory();
+
+            // Assert
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "WTI", "Ringtoets");
+            Assert.AreEqual(expectedPath, pathFromSettings);
+        }
+
+        [Test]
+        public void GetCommonDocumentsRiskeerDirectory_WithParams_ReturnsExpectedDirectory()
+        {
+            // Setup
+            var settingsHelper = new RiskeerSettingsHelper();
+
+            // Call
+            string pathFromSettings = settingsHelper.GetCommonDocumentsDirectory("some folder");
+
+            // Assert
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "WTI", "Ringtoets", "some folder");
+            Assert.AreEqual(expectedPath, pathFromSettings);
+        }
+
+        [Test]
+        public void GetCommonDocumentsRiskeerShapeFileDirectory_ReturnsExpectedDirectory()
+        {
+            // Setup
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "WTI", "Ringtoets", "NBPW");
+
+            // Call
+            string pathFromSettings = RiskeerSettingsHelper.GetCommonDocumentsRiskeerShapeFileDirectory();
+
+            // Assert
+            Assert.AreEqual(expectedPath, pathFromSettings);
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r3e63e58f2e9de8de16ac832b4989b7705c97b443
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 68f02442e2e790aaa0bde531c328662819908f10)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 3e63e58f2e9de8de16ac832b4989b7705c97b443)
@@ -228,7 +228,7 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(IProject),
-                    typeof(RingtoetsProjectProperties));
+                    typeof(RiskeerProjectProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,