Index: Core/Common/src/Core.Common.Base/Data/Project.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Base/Data/Project.cs	(.../Project.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Common/src/Core.Common.Base/Data/Project.cs	(.../Project.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 
 using Core.Common.Base.Properties;
-using Core.Common.Utils.Collections.Generic;
 
 namespace Core.Common.Base.Data
 {
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs
===================================================================
diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs	(.../Chart.cs)	(revision 2da9b71bbdefaeed62c47b673671b7d76502a363)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs	(.../Chart.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -408,7 +408,7 @@
             AllowSeriesTypeChange = true;
         }
 
-        private void SeriesCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void SeriesCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             var chartSeries = e.Item as ChartSeries;
             if (chartSeries == null)
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -8,7 +8,6 @@
 using Core.Common.Controls.Swf.Charting.Customized;
 using Core.Common.Controls.Swf.Charting.Tools;
 using Core.Common.Controls.Swf.Properties;
-using Core.Common.Utils.Collections.Generic;
 
 using Steema.TeeChart;
 using Steema.TeeChart.Drawing;
@@ -144,7 +143,7 @@
         }
 
         /// <summary>
-        /// Data: in this case ISeries expected in <see cref="IEventedList{T}"/>
+        /// Data: in this case <see cref="IChart"/>
         /// </summary>
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs
===================================================================
diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs	(.../IChart.cs)	(revision 2da9b71bbdefaeed62c47b673671b7d76502a363)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs	(.../IChart.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -5,7 +5,6 @@
 using System.Windows.Forms;
 
 using Core.Common.Controls.Swf.Charting.Series;
-using Core.Common.Utils.Collections.Generic;
 
 namespace Core.Common.Controls.Swf.Charting
 {
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -409,7 +409,7 @@
             refreshRequired = true;
         }
 
-        private void DataSourceCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void DataSourceCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             refreshRequired = true;
             UpdateHeaderColumnSize();
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs
===================================================================
diff -u -reab6a10ef5444e79f4dddd5babbfcd5892d3d97a -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs	(.../ITreeNodePresenter.cs)	(revision eab6a10ef5444e79f4dddd5babbfcd5892d3d97a)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeNodePresenter.cs	(.../ITreeNodePresenter.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -144,7 +144,7 @@
         /// </summary>
         /// <param name="sender">Sender of the event</param>
         /// <param name="e">Event arguments, e.Item contains object which was added / removed</param>
-        void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e);
+        void OnCollectionChanged(object sender, NotifyCollectionChangeEventArgs e);
 
         // TODO: check it we need to replace these methods with OnKeyPressed()
         /// <summary>
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs	(.../TreeViewController.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs	(.../TreeViewController.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -4,7 +4,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Swf.Properties;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
+
 using log4net;
 
 namespace Core.Common.Controls.Swf.TreeViewControls
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs
===================================================================
diff -u -r529c5b708080eb65abba0502d79869fe549e035a -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs	(.../TreeViewNodePresenterBase.cs)	(revision 529c5b708080eb65abba0502d79869fe549e035a)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs	(.../TreeViewNodePresenterBase.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -168,7 +168,7 @@
             }
         }
 
-        public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        public void OnCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             // TODO: should this code be moved into tree view implementaiton?
 
@@ -260,7 +260,7 @@
         /// <param name="parentNode"></param>
         /// <param name="e"></param>
         /// <param name="newNodeIndex"></param>
-        protected virtual void OnCollectionChanged(T childNodeData, ITreeNode parentNode, NotifyCollectionChangingEventArgs e, int newNodeIndex)
+        protected virtual void OnCollectionChanged(T childNodeData, ITreeNode parentNode, NotifyCollectionChangeEventArgs e, int newNodeIndex)
         {
             switch (e.Action)
             {
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r41f690d1d649d07cdb7a11fce79fff5c343de1bd -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 41f690d1d649d07cdb7a11fce79fff5c343de1bd)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -438,7 +438,7 @@
             return Dispatcher.Invoke(method, args);
         }
 
-        private void ToolWindowViews_CollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void ToolWindowViews_CollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             if (e.Action != NotifyCollectionChangeAction.Remove)
             {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -407,7 +407,7 @@
         {
             if (CollectionChanged != null)
             {
-                CollectionChanged(this, new NotifyCollectionChangingEventArgs(notifyCollectionChangeAction, item, index, -1));
+                CollectionChanged(this, new NotifyCollectionChangeEventArgs(notifyCollectionChangeAction, item, index, -1));
             }
         }
 
Index: Core/Common/src/Core.Common.Gui/IViewList.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls.Views;
-using Core.Common.Utils.Collections.Generic;
+using Core.Common.Utils.Collections;
 
 namespace Core.Common.Gui
 {
@@ -19,7 +19,7 @@
     /// <summary>
     /// Manages currently displayed views
     /// </summary>
-    public interface IViewList : IEventedList<IView>, IDisposable
+    public interface IViewList : IList<IView>, IDisposable
     {
         /// <summary>
         /// Fired before active view has been changed.
@@ -32,6 +32,11 @@
         event EventHandler<ActiveViewChangeEventArgs> ActiveViewChanged;
 
         /// <summary>
+        /// Fired after the view elements in this view list have changed.
+        /// </summary>
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        /// <summary>
         /// HACK: Hack to disable activation temporarily
         /// </summary>
         bool IgnoreActivation { get; set; }
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r0d8098264ea05ccbf529b3c2c54479fdbc0ef670 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 0d8098264ea05ccbf529b3c2c54479fdbc0ef670)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -854,7 +854,7 @@
             SetToolTipForView(view);
         }
 
-        private void ToolWindowViewsOnCollectionChanged(object sender, NotifyCollectionChangingEventArgs notifyCollectionChangingEventArgs)
+        private void ToolWindowViewsOnCollectionChanged(object sender, NotifyCollectionChangeEventArgs notifyCollectionChangeEventArgs)
         {
             if (isExiting)
             {
@@ -863,7 +863,7 @@
             mainWindow.ValidateItems();
         }
 
-        private void DocumentViewsCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void DocumentViewsCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             if (isExiting || documentViews.Count != 0)
             {
Fisheye: Tag 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/Generic/IEnumerableListEditor.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/Generic/IEventedList.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/INotifyCollectionChange.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeEventArgs.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeEventArgs.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeEventArgs.cs	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -0,0 +1,47 @@
+using System.ComponentModel;
+
+namespace Core.Common.Utils.Collections
+{
+    /// <summary>
+    /// EventArgs for a collection that include the item and the action.
+    /// 
+    /// Note: for performance reasons we use fields here instead of properties.
+    /// </summary>
+    public class NotifyCollectionChangeEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Indicate what operation took place such as add, remove etc...
+        /// </summary>
+        public NotifyCollectionChangeAction Action;
+
+        /// <summary>
+        /// When inserting, this is the position where the item is inserted.
+        /// </summary>
+        public int Index;
+
+        /// <summary>
+        /// Previous index (if changed). TODO: remove it. This is the index at which the insert was intent
+        /// </summary>
+        public int OldIndex;
+
+        public NotifyCollectionChangeEventArgs(NotifyCollectionChangeAction action, object item, int index, int oldIndex)
+        {
+            Action = action;
+            Item = item;
+            Index = index;
+            OldIndex = oldIndex;
+        }
+
+        public NotifyCollectionChangeEventArgs() {}
+
+        /// <summary>
+        /// The item added, removed or replaced. On replace the new item is given
+        /// </summary>
+        public virtual object Item { get; set; }
+
+        /// <summary>
+        /// Item that is replaced. (only filled out on replace)
+        /// </summary>
+        public virtual object OldItem { get; set; }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs	(.../NotifyCollectionChangedEventHandler.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs	(.../NotifyCollectionChangedEventHandler.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -1,5 +1,5 @@
 namespace Core.Common.Utils.Collections
 {
     // TODO: use NotifyCollectionChangeEventArgs as in PropertyChange
-    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangingEventArgs e);
+    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangeEventArgs e);
 }
\ No newline at end of file
Fisheye: Tag 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangingEventArgs.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangingEventHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -107,13 +107,10 @@
     <Compile Include="Collections\INotifyCollectionChanged.cs" />
     <Compile Include="Collections\NotifyCollectionChangeAction.cs" />
     <Compile Include="Collections\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="Collections\NotifyCollectionChangingEventHandler.cs" />
     <Compile Include="INotifyPropertyChange.cs" />
     <Compile Include="Collections\CollectionExtensions.cs" />
     <Compile Include="Collections\EnumerableExtensions.cs" />
-    <Compile Include="Collections\Generic\IEnumerableListEditor.cs" />
-    <Compile Include="Collections\INotifyCollectionChange.cs" />
-    <Compile Include="Collections\NotifyCollectionChangingEventArgs.cs" />
+    <Compile Include="Collections\NotifyCollectionChangeEventArgs.cs" />
     <Compile Include="ComparableExtensions.cs" />
     <Compile Include="ComponentModel\DynamicReadOnlyValidationMethodAttribute.cs" />
     <Compile Include="PropertyBag\Dynamic\DynamicPropertyBag.cs" />
@@ -133,7 +130,6 @@
     <Compile Include="Validation\ValidationReport.cs" />
     <Compile Include="Validation\ValidationSeverity.cs" />
     <Compile Include="Reflection\AssemblyUtils.cs" />
-    <Compile Include="Collections\Generic\IEventedList.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -185,6 +181,7 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -297,7 +297,7 @@
 
             // Collection changed is bubbled to nodePresenter => expect 1 call during parent.Children.Remove(child2);
             // not that in some cases Full refresh can be called
-            Expect.Call(() => childNodePresenter.OnCollectionChanged(parent, new NotifyCollectionChangingEventArgs())).IgnoreArguments().Repeat.Any();
+            Expect.Call(() => childNodePresenter.OnCollectionChanged(parent, new NotifyCollectionChangeEventArgs())).IgnoreArguments().Repeat.Any();
 
             mocks.ReplayAll();
 
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -8,7 +8,7 @@
 using Core.Common.Base;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.TestUtil;
-using Core.Common.Utils.Collections.Generic;
+
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs	(.../EventedList.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs	(.../EventedList.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -6,7 +6,6 @@
 
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 
 namespace Core.GIS.SharpMap.Api.Collections
 {
@@ -381,7 +380,7 @@
         {
             if (CollectionChanging != null)
             {
-                var args = new NotifyCollectionChangingEventArgs(action, item, index, -1);
+                var args = new NotifyCollectionChangeEventArgs(action, item, index, -1);
 
                 try
                 {
@@ -402,15 +401,15 @@
         {
             if (CollectionChanged != null)
             {
-                var args = new NotifyCollectionChangingEventArgs(action, item, index, -1)
+                var args = new NotifyCollectionChangeEventArgs(action, item, index, -1)
                 {
                     OldItem = oldItem
                 };
                 CollectionChanged(this, args);
             }
         }
 
-        private void Item_CollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void Item_CollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             // forwards event to subscribers of the list
             if (CollectionChanged != null)
@@ -450,7 +449,7 @@
                 notifyPropertyChange.PropertyChanged -= Item_PropertyChangedDelegate;
             }
 
-            var notifyCollectionChange = item as INotifyCollectionChange;
+            var notifyCollectionChange = item as INotifyCollectionChanged;
             if (notifyCollectionChange != null)
             {
                 notifyCollectionChange.CollectionChanged -= Item_CollectionChangedDelegate;
@@ -474,7 +473,7 @@
                 notifyPropertyChange.PropertyChanging += Item_PropertyChangingDelegate;
             }
 
-            var notifyCollectionChanged = item as INotifyCollectionChange;
+            var notifyCollectionChanged = item as INotifyCollectionChanged;
             if (notifyCollectionChanged != null)
             {
                 if (Item_PropertyChangedDelegate == null)
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Collections/IEventedList.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Api/Collections/IEventedList.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Collections/IEventedList.cs	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+using Core.Common.Utils.Collections;
+
+namespace Core.GIS.SharpMap.Api.Collections
+{
+    /// <summary>
+    /// This interface defines a list which observes all changes in the underlying items and
+    /// subscribes to their INotifyPropertyChanged and INotifyCollectionChange if they implement them.
+    /// </summary>
+    /// <typeparam name="T">The datatype that is being added/removed</typeparam>
+    public interface IEventedList<T> : IList<T>, INotifyCollectionChanged
+    {
+        void AddRange(IEnumerable<T> enumerable);
+    }
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Collections/NotifyCollectionChangingEventHandler.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Api/Collections/NotifyCollectionChangingEventHandler.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Collections/NotifyCollectionChangingEventHandler.cs	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -0,0 +1,6 @@
+using Core.Common.Utils.Collections;
+
+namespace Core.GIS.SharpMap.Api.Collections
+{
+    public delegate void NotifyCollectionChangingEventHandler(object sender, NotifyCollectionChangeEventArgs e);
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -52,6 +52,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Collections\EventedList.cs" />
+    <Compile Include="Collections\IEventedList.cs" />
+    <Compile Include="Collections\NotifyCollectionChangingEventHandler.cs" />
     <Compile Include="Delegates\AddRelatedFeature.cs" />
     <Compile Include="Editors\FallOffType.cs" />
     <Compile Include="Delegates\GetLabelMethod.cs" />
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs	(.../IGroupLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs	(.../IGroupLayer.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -3,7 +3,7 @@
 
 namespace Core.GIS.SharpMap.Api.Layers
 {
-    public interface IGroupLayer : ILayer, INotifyCollectionChange
+    public interface IGroupLayer : ILayer, INotifyCollectionChanged
     {
         EventedList<ILayer> Layers { get; set; }
 
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -735,7 +735,7 @@
             }
         }
 
-        private void ToolsCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void ToolsCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             switch (e.Action)
             {
@@ -809,7 +809,7 @@
             }
         }
 
-        private void MapCollectionChangedDelayed(object sender, NotifyCollectionChangingEventArgs e)
+        private void MapCollectionChangedDelayed(object sender, NotifyCollectionChangeEventArgs e)
         {
             if (sender is Map.Map || sender is ILayer || sender is IList<ILayer>)
             {
@@ -824,7 +824,7 @@
             }
         }
 
-        private void MapCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void MapCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             if (IsDisposed)
             {
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Tools/IMapTool.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.UI/Tools/IMapTool.cs	(.../IMapTool.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Tools/IMapTool.cs	(.../IMapTool.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -96,7 +96,7 @@
 
         void OnMapPropertyChanged(object sender, PropertyChangedEventArgs e);
 
-        void OnMapCollectionChanged(object sender, NotifyCollectionChangingEventArgs e);
+        void OnMapCollectionChanged(object sender, NotifyCollectionChangeEventArgs e);
 
         IEnumerable<MapToolContextMenuItem> GetContextMenuItems(ICoordinate worldPosition);
 
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Tools/MapTool.cs
===================================================================
diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.UI/Tools/MapTool.cs	(.../MapTool.cs)	(revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Tools/MapTool.cs	(.../MapTool.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -296,7 +296,7 @@
 
         public virtual void OnMapPropertyChanged(object sender, PropertyChangedEventArgs e) {}
 
-        public virtual void OnMapCollectionChanged(object sender, NotifyCollectionChangingEventArgs e) {}
+        public virtual void OnMapCollectionChanged(object sender, NotifyCollectionChangeEventArgs e) {}
 
         public virtual IEnumerable<MapToolContextMenuItem> GetContextMenuItems(ICoordinate worldPosition)
         {
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Tools/SelectTool.cs
===================================================================
diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap.UI/Tools/SelectTool.cs	(.../SelectTool.cs)	(revision 10b304d4b5cb2283801cdb16204baf2a42ab5967)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Tools/SelectTool.cs	(.../SelectTool.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -619,7 +619,7 @@
             orgClickTime = DateTime.Now;
         }
 
-        public override void OnMapCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        public override void OnMapCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             switch (e.Action)
             {
Index: Core/GIS/src/Core.GIS.SharpMap/Data/Providers/FeatureCollection.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap/Data/Providers/FeatureCollection.cs	(.../FeatureCollection.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/GIS/src/Core.GIS.SharpMap/Data/Providers/FeatureCollection.cs	(.../FeatureCollection.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -307,7 +307,7 @@
             envelope = null;
         }
 
-        private void FeaturesCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void FeaturesCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             FireFeaturesChanged();
         }
Index: Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs	(.../GroupLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs	(.../GroupLayer.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -288,7 +288,7 @@
             }
         }
 
-        protected void LayersCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        protected void LayersCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             // performance
             if (!created || cloning)
@@ -320,7 +320,7 @@
             }
         }
 
-        private void OnLayersCollectionChanged(NotifyCollectionChangingEventArgs e)
+        private void OnLayersCollectionChanged(NotifyCollectionChangeEventArgs e)
         {
             switch (e.Action)
             {
@@ -336,7 +336,7 @@
             }
         }
 
-        private void LayersCollectionChanging(object sender, NotifyCollectionChangingEventArgs e)
+        private void LayersCollectionChanging(object sender, NotifyCollectionChangeEventArgs e)
         {
             // performance
             if (!created || cloning)
Index: Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -80,7 +80,7 @@
     /// System.Drawing.Image imgMap = myMap.GetMap(); //Renders the map
     /// </code>
     /// </example>
-    public class Map : Observable, IDisposable, INotifyCollectionChange, INotifyPropertyChange, IMap
+    public class Map : Observable, IDisposable, INotifyCollectionChanged, INotifyPropertyChange, IMap
     {
         /// <summary>
         /// When layer render time is less than this - image will not be cached, increase this parameter when you get memory leaks.
@@ -1245,7 +1245,7 @@
             }
         }
 
-        private void LayersCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void LayersCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             OnLayersCollectionChanged(e);
 
@@ -1255,7 +1255,7 @@
             }
         }
 
-        private void OnLayersCollectionChanged(NotifyCollectionChangingEventArgs e)
+        private void OnLayersCollectionChanged(NotifyCollectionChangeEventArgs e)
         {
             var layer1 = e.Item as ILayer;
 
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(.../EventedListTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(.../EventedListTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -25,7 +25,7 @@
             var eventedList = new EventedList<object>();
             var callCount = 0;
             var item = new object();
-            eventedList.CollectionChanged += delegate(object sender, NotifyCollectionChangingEventArgs e)
+            eventedList.CollectionChanged += delegate(object sender, NotifyCollectionChangeEventArgs e)
             {
                 Assert.AreEqual(eventedList, sender);
                 Assert.AreEqual(item, e.Item);
@@ -220,7 +220,7 @@
             });
         }
 
-        private class MockWithPropertyAndCollectionChange : INotifyPropertyChange, INotifyCollectionChange
+        private class MockWithPropertyAndCollectionChange : INotifyPropertyChange, INotifyCollectionChanged
         {
             // Required by interface, but not used (yet)
 #pragma warning disable 67
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -151,7 +151,7 @@
             UpdateChartLegendView();
         }
 
-        private void ViewsCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void ViewsCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             if (Gui == null || Gui.DocumentViews == null)
             {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -439,7 +439,7 @@
             DataBindings.Clear();
         }
 
-        private void mapCollectionChangedEventHandler(object sender, NotifyCollectionChangingEventArgs e)
+        private void mapCollectionChangedEventHandler(object sender, NotifyCollectionChangeEventArgs e)
         {
             var layer = e.Item as ILayer;
 
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -6,7 +6,6 @@
 using System.Windows.Forms.Integration;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.SharpMap.Api.Collections;
 
 using Xceed.Wpf.AvalonDock;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -235,7 +235,7 @@
                 featureRowList.Add(featureRowObject);
             }
 
-            ((INotifyCollectionChange) featureRowList).CollectionChanged += FeatureRowListCollectionChanged;
+            ((INotifyCollectionChanged) featureRowList).CollectionChanged += FeatureRowListCollectionChanged;
 
             return featureRowList;
         }
@@ -247,7 +247,7 @@
                 return;
             }
 
-            ((INotifyCollectionChange) featureRowList).CollectionChanged -= FeatureRowListCollectionChanged;
+            ((INotifyCollectionChanged) featureRowList).CollectionChanged -= FeatureRowListCollectionChanged;
 
             foreach (var featureRowObject in featureRowList.OfType<IDisposable>())
             {
@@ -257,7 +257,7 @@
             featureRowList = null;
         }
 
-        private void FeatureRowListCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void FeatureRowListCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             // if item is removed using this table
             if (e.Action != NotifyCollectionChangeAction.Remove)
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -86,7 +86,7 @@
             {
                 return;
             }
-            ((INotifyCollectionChange) backgroundMap).CollectionChanged -= BackgroundMapCollectionChanged;
+            ((INotifyCollectionChanged) backgroundMap).CollectionChanged -= BackgroundMapCollectionChanged;
         }
 
         public void SubscribeToBackgroundMap()
@@ -96,7 +96,7 @@
                 return;
             }
 
-            ((INotifyCollectionChange) backgroundMap).CollectionChanged += BackgroundMapCollectionChanged;
+            ((INotifyCollectionChanged) backgroundMap).CollectionChanged += BackgroundMapCollectionChanged;
         }
 
         public void UpdateLayers()
@@ -169,7 +169,7 @@
             SubscribeToBackgroundMap();
         }
 
-        private void BackgroundMapCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        private void BackgroundMapCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             backgroundMapChanged = true;
             RenderRequired = true;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs
===================================================================
diff -u -r0a222f4f3c0054ec9cc70f94480c0dc504fea411 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(.../RingtoetsNodePresenterBase.cs)	(revision 0a222f4f3c0054ec9cc70f94480c0dc504fea411)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(.../RingtoetsNodePresenterBase.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -114,7 +114,7 @@
             OnPropertyChanged((T)sender, node, e);
         }
 
-        public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        public void OnCollectionChanged(object sender, NotifyCollectionChangeEventArgs e)
         {
             OnCollectionChanged((T)sender, e);
         }
@@ -201,8 +201,8 @@
         /// <summary>
         /// Typed implementation of method <see cref="ITreeNodePresenter.OnCollectionChanged"/>.
         /// </summary>
-        /// <seealso cref="OnCollectionChanged(object, NotifyCollectionChangingEventArgs)"/>
-        protected virtual void OnCollectionChanged(T sender, NotifyCollectionChangingEventArgs e)
+        /// <seealso cref="OnCollectionChanged(object, NotifyCollectionChangeEventArgs)"/>
+        protected virtual void OnCollectionChanged(T sender, NotifyCollectionChangeEventArgs e)
         {
             // Do nothing
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs	(.../RingtoetsNodePresenterBaseTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs	(.../RingtoetsNodePresenterBaseTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -306,7 +306,7 @@
         {
             // Setup
             var dataMock = mockRepository.StrictMock<object>();
-            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangingEventArgs>();
+            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangeEventArgs>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mockRepository.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 10b304d4b5cb2283801cdb16204baf2a42ab5967)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -323,7 +323,7 @@
             // Setup
             var mocks = new MockRepository();
             var dataMock = mocks.StrictMock<AssessmentSectionBase>();
-            var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
+            var eventArgsMock = mocks.StrictMock<NotifyCollectionChangeEventArgs>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mocks.ReplayAll();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -r96c8a39df93bef7386b457dd067c03728cc805ed -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 96c8a39df93bef7386b457dd067c03728cc805ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -490,7 +490,7 @@
         public void OnCollectionChange_Always_DoNothing()
         {
             // Setup
-            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangingEventArgs>();
+            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangeEventArgs>();
             var contextMenuBuilderProvider = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mockRepository.ReplayAll();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r96c8a39df93bef7386b457dd067c03728cc805ed -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 96c8a39df93bef7386b457dd067c03728cc805ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -335,7 +335,7 @@
             // Setup
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
             var dataMock = mockRepository.StrictMock<PipingFailureMechanism>();
-            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangingEventArgs>();
+            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangeEventArgs>();
             mockRepository.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter(contextMenuBuilderProviderMock);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs
===================================================================
diff -u -r96c8a39df93bef7386b457dd067c03728cc805ed -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision 96c8a39df93bef7386b457dd067c03728cc805ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
@@ -348,7 +348,7 @@
         {
             // Setup
             var dataMock = mockRepository.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
-            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangingEventArgs>();
+            var eventArgsMock = mockRepository.StrictMock<NotifyCollectionChangeEventArgs>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
             mockRepository.ReplayAll();