Index: Core/Common/src/Core.Common.Gui/IProjectOwner.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r86a3948495b0d9ef1ee27cdce1891e1d03d9679b
--- Core/Common/src/Core.Common.Gui/IProjectOwner.cs	(.../IProjectOwner.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/IProjectOwner.cs	(.../IProjectOwner.cs)	(revision 86a3948495b0d9ef1ee27cdce1891e1d03d9679b)
@@ -52,10 +52,10 @@
         /// <summary>
         /// Sets the project and the path of the project that was used for obtaining it.
         /// </summary>
-        /// <param name="project">The project that is used in the application.</param>
-        /// <param name="projectPath">The file location where the <paramref name="project"/> was
+        /// <param name="newProject">The project that is used in the application.</param>
+        /// <param name="projectPath">The file location where the <paramref name="newProject"/> was
         /// loaded from, or <c>null</c> if it was not loaded from a file source.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="project"/> is <c>null</c>.</exception>
-        void SetProject(IProject project, string projectPath);
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="newProject"/> is <c>null</c>.</exception>
+        void SetProject(IProject newProject, string projectPath);
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/UITypeEditors/SelectionEditor.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r86a3948495b0d9ef1ee27cdce1891e1d03d9679b
--- Core/Common/src/Core.Common.Gui/UITypeEditors/SelectionEditor.cs	(.../SelectionEditor.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/UITypeEditors/SelectionEditor.cs	(.../SelectionEditor.cs)	(revision 86a3948495b0d9ef1ee27cdce1891e1d03d9679b)
@@ -47,7 +47,7 @@
             return UITypeEditorEditStyle.DropDown;
         }
 
-        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object originalValue)
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
         {
             if (provider != null)
             {
@@ -65,7 +65,7 @@
                     // Return user selected object, or original value if user did not select anything:
                     if (listBox.SelectedItem == null)
                     {
-                        return originalValue;
+                        return value;
                     }
 
                     if (ReferenceEquals(listBox.SelectedItem, NullItem))
@@ -77,7 +77,7 @@
                 }
             }
 
-            return base.EditValue(context, provider, originalValue);
+            return base.EditValue(context, provider, value);
         }
 
         /// <summary>
Index: Core/Common/test/Core.Common.Base.TestUtil/Geometry/Point2DComparerWithTolerance.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -r86a3948495b0d9ef1ee27cdce1891e1d03d9679b
--- Core/Common/test/Core.Common.Base.TestUtil/Geometry/Point2DComparerWithTolerance.cs	(.../Point2DComparerWithTolerance.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Base.TestUtil/Geometry/Point2DComparerWithTolerance.cs	(.../Point2DComparerWithTolerance.cs)	(revision 86a3948495b0d9ef1ee27cdce1891e1d03d9679b)
@@ -48,9 +48,9 @@
             return Compare(x as Point2D, y as Point2D);
         }
 
-        public int Compare(Point2D p0, Point2D p1)
+        public int Compare(Point2D x, Point2D y)
         {
-            double diff = p0.GetEuclideanDistanceTo(p1);
+            double diff = x.GetEuclideanDistanceTo(y);
             return diff <= tolerance ? 0 : 1;
         }
     }
Index: Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -r86a3948495b0d9ef1ee27cdce1891e1d03d9679b
--- Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs	(.../DoubleWithToleranceComparer.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs	(.../DoubleWithToleranceComparer.cs)	(revision 86a3948495b0d9ef1ee27cdce1891e1d03d9679b)
@@ -48,9 +48,9 @@
             return Compare((double) x, (double) y);
         }
 
-        public int Compare(double firstDouble, double secondDouble)
+        public int Compare(double x, double y)
         {
-            double diff = firstDouble - secondDouble;
+            double diff = x - y;
 
             bool tolerable = Math.Abs(diff) <= tolerance;