Index: Core/Common/src/Core.Common.Util/Settings/SettingsHelper.cs
===================================================================
diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rf40ab91c80712d3b89dce7d96151b27d13eac232
--- Core/Common/src/Core.Common.Util/Settings/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03)
+++ Core/Common/src/Core.Common.Util/Settings/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision f40ab91c80712d3b89dce7d96151b27d13eac232)
@@ -83,17 +83,17 @@
 
         private static string GetFullPath(string rootPath, string[] subPath)
         {
-            var directorypath = new List<string>
+            var directoryPath = new List<string>
             {
                 rootPath
             };
 
             if (subPath != null)
             {
-                directorypath.AddRange(subPath.ToList());
+                directoryPath.AddRange(subPath.ToList());
             }
 
-            return Path.Combine(directorypath.ToArray());
+            return Path.Combine(directoryPath.ToArray());
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rf40ab91c80712d3b89dce7d96151b27d13eac232
--- Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs	(.../RiskeerSettingsHelper.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/RiskeerSettingsHelper.cs	(.../RiskeerSettingsHelper.cs)	(revision f40ab91c80712d3b89dce7d96151b27d13eac232)
@@ -45,7 +45,7 @@
             var documentsPath = new List<string>
             {
                 "BOI",
-                "Riskeer"
+                $"Riskeer {ApplicationVersion}"
             };
             documentsPath.AddRange(subPath);
             return base.GetCommonDocumentsDirectory(documentsPath.ToArray());
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rf40ab91c80712d3b89dce7d96151b27d13eac232
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs	(.../RiskeerSettingsHelperTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/RiskeerSettingsHelperTest.cs	(.../RiskeerSettingsHelperTest.cs)	(revision f40ab91c80712d3b89dce7d96151b27d13eac232)
@@ -80,7 +80,8 @@
             string pathFromSettings = settingsHelper.GetCommonDocumentsDirectory();
 
             // Assert
-            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "BOI", "Riskeer");
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments),
+                                               "BOI", $"Riskeer {settingsHelper.ApplicationVersion}");
             Assert.AreEqual(expectedPath, pathFromSettings);
         }
 
@@ -94,15 +95,17 @@
             string pathFromSettings = settingsHelper.GetCommonDocumentsDirectory("some folder");
 
             // Assert
-            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "BOI", "Riskeer", "some folder");
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments),
+                                               "BOI", $"Riskeer {settingsHelper.ApplicationVersion}", "some folder");
             Assert.AreEqual(expectedPath, pathFromSettings);
         }
 
         [Test]
         public void GetCommonDocumentsRiskeerShapeFileDirectory_ReturnsExpectedDirectory()
         {
             // Setup
-            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "BOI", "Riskeer", "NBPW");
+            string expectedPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments),
+                                               "BOI", $"Riskeer {SettingsHelper.Instance.ApplicationVersion}", "NBPW");
 
             // Call
             string pathFromSettings = RiskeerSettingsHelper.GetCommonDocumentsRiskeerShapeFileDirectory();