Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -52,7 +52,7 @@
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class AddNewDemoAssessmentSectionCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs	(.../OpenChartViewCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs	(.../OpenChartViewCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -24,7 +24,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class OpenChartViewCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class OpenMapViewCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenPointedTreeGraphViewCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenPointedTreeGraphViewCommandTest.cs	(.../OpenPointedTreeGraphViewCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenPointedTreeGraphViewCommandTest.cs	(.../OpenPointedTreeGraphViewCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -24,7 +24,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class OpenPointedTreeGraphViewCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenStackChartViewCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenStackChartViewCommandTest.cs	(.../OpenStackChartViewCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenStackChartViewCommandTest.cs	(.../OpenStackChartViewCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -24,7 +24,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class OpenStackChartViewCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenThematicalMapViewCommandTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenThematicalMapViewCommandTest.cs	(.../OpenThematicalMapViewCommandTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenThematicalMapViewCommandTest.cs	(.../OpenThematicalMapViewCommandTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.Commands
+namespace Demo.Riskeer.Test.Commands
 {
     [TestFixture]
     public class OpenThematicalMapViewCommandTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/GUIs/DemoProjectPluginTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/GUIs/DemoProjectPluginTest.cs	(.../DemoProjectPluginTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/GUIs/DemoProjectPluginTest.cs	(.../DemoProjectPluginTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -33,7 +33,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Demo.Ringtoets.Test.GUIs
+namespace Demo.Riskeer.Test.GUIs
 {
     [TestFixture]
     public class DemoProjectPluginTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs
===================================================================
diff -u -rb6aa6b218ed5de2c1277925e213c20fad451d6e1 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision b6aa6b218ed5de2c1277925e213c20fad451d6e1)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -25,12 +25,11 @@
 using System.Windows.Controls.Primitives;
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
-using Demo.Riskeer.Ribbons;
 using NUnit.Framework;
 using Rhino.Mocks;
 using RingtoetsDemoProjectRibbon = Demo.Riskeer.Ribbons.RingtoetsDemoProjectRibbon;
 
-namespace Demo.Ringtoets.Test.Ribbons
+namespace Demo.Riskeer.Test.Ribbons
 {
     [TestFixture]
     public class RingtoetsDemoProjectRibbonTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -25,7 +25,7 @@
 using Demo.Riskeer.Views;
 using NUnit.Framework;
 
-namespace Demo.Ringtoets.Test.Views
+namespace Demo.Riskeer.Test.Views
 {
     [TestFixture]
     public class ChartDataViewTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs	(.../MapDataViewTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs	(.../MapDataViewTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -30,7 +30,7 @@
 using Demo.Riskeer.Views;
 using NUnit.Framework;
 
-namespace Demo.Ringtoets.Test.Views
+namespace Demo.Riskeer.Test.Views
 {
     [TestFixture]
     public class MapDataViewTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/PointedTreeGraphViewTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/PointedTreeGraphViewTest.cs	(.../PointedTreeGraphViewTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/PointedTreeGraphViewTest.cs	(.../PointedTreeGraphViewTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -26,7 +26,7 @@
 using Demo.Riskeer.Views;
 using NUnit.Framework;
 
-namespace Demo.Ringtoets.Test.Views
+namespace Demo.Riskeer.Test.Views
 {
     [TestFixture]
     public class PointedTreeGraphViewTest
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs
===================================================================
diff -u -r332cb8bbe379aca2e0ced3881b0a4d604056d6e8 -r2949bad9312a66ada6a9503265ed72c7c9d2b0f1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs	(.../StackChartDataViewTest.cs)	(revision 332cb8bbe379aca2e0ced3881b0a4d604056d6e8)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs	(.../StackChartDataViewTest.cs)	(revision 2949bad9312a66ada6a9503265ed72c7c9d2b0f1)
@@ -25,7 +25,7 @@
 using Demo.Riskeer.Views;
 using NUnit.Framework;
 
-namespace Demo.Ringtoets.Test.Views
+namespace Demo.Riskeer.Test.Views
 {
     [TestFixture]
     public class StackChartDataViewTest