Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs
===================================================================
diff -u -re8e9033d644387817a2bd7a7a9ce0ced231ecde8 -rddcad0ec18079f8c827bfa82ba406b3eab76fbfe
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs	(.../ForeshoreProfileEditorTest.cs)	(revision e8e9033d644387817a2bd7a7a9ce0ced231ecde8)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs	(.../ForeshoreProfileEditorTest.cs)	(revision ddcad0ec18079f8c827bfa82ba406b3eab76fbfe)
@@ -64,15 +64,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new ForeshoreProfileEditor();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(someValue, result);
@@ -91,15 +91,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new ForeshoreProfileEditor();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(foreshoreProfile, result);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/HydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u -rf35371f467919042f47b41f84d31e8d4f47cff2a -rddcad0ec18079f8c827bfa82ba406b3eab76fbfe
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/HydraulicBoundaryLocationEditorTest.cs	(.../HydraulicBoundaryLocationEditorTest.cs)	(revision f35371f467919042f47b41f84d31e8d4f47cff2a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/HydraulicBoundaryLocationEditorTest.cs	(.../HydraulicBoundaryLocationEditorTest.cs)	(revision ddcad0ec18079f8c827bfa82ba406b3eab76fbfe)
@@ -51,15 +51,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new HydraulicBoundaryLocationEditor();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(someValue, result);
@@ -78,15 +78,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new HydraulicBoundaryLocationEditor();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(hydraulicBoundaryLocation, result);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/StructureEditorTest.cs
===================================================================
diff -u -rf35371f467919042f47b41f84d31e8d4f47cff2a -rddcad0ec18079f8c827bfa82ba406b3eab76fbfe
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/StructureEditorTest.cs	(.../StructureEditorTest.cs)	(revision f35371f467919042f47b41f84d31e8d4f47cff2a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/StructureEditorTest.cs	(.../StructureEditorTest.cs)	(revision ddcad0ec18079f8c827bfa82ba406b3eab76fbfe)
@@ -52,15 +52,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new StructureEditor<SimpleStructure>();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(someValue, result);
@@ -79,15 +79,15 @@
             var propertyBag = new DynamicPropertyBag(properties);
             var editor = new StructureEditor<SimpleStructure>();
             var someValue = new object();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
+            var serviceProviderStub = mockRepository.Stub<IServiceProvider>();
+            var serviceStub = mockRepository.Stub<IWindowsFormsEditorService>();
+            var descriptorContextStub = mockRepository.Stub<ITypeDescriptorContext>();
+            serviceProviderStub.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceStub);
+            descriptorContextStub.Stub(c => c.Instance).Return(propertyBag);
             mockRepository.ReplayAll();
 
             // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+            var result = editor.EditValue(descriptorContextStub, serviceProviderStub, someValue);
 
             // Assert
             Assert.AreSame(simpleStructure, result);