Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs
===================================================================
diff -u -r5197 -r5479
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs	(.../GeometryObjectTests.cs)	(revision 5197)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs	(.../GeometryObjectTests.cs)	(revision 5479)
@@ -40,23 +40,6 @@
     }
 
     [Test]
-    [TestCase(null, "haha")]
-    [TestCase("", "")]
-    [TestCase("hihi", "hihi")]
-    public void SetNameUnlessNewNameIsNull(string newName, string expectedName)
-    {
-        // setup
-        var geometry = new GeometryObjectTestExerciser();
-        geometry.SetName("haha");
-
-        // call
-        geometry.Name = newName;
-
-        // assert
-        Assert.That(geometry.Name, Is.EqualTo(expectedName));
-    }
-    
-    [Test]
     [TestCase(0.0000455454, 0.000)]
     [TestCase(0.004455454, 0.004)]
     [TestCase(0.004555454, 0.005)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs
===================================================================
diff -u -r5197 -r5479
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs	(.../GeometryObject.cs)	(revision 5197)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs	(.../GeometryObject.cs)	(revision 5479)
@@ -54,17 +54,8 @@
     }
 
     #endregion
-
+    
     /// <summary>
-    /// Sets the name.
-    /// </summary>
-    /// <param name="newName">The new name.</param>
-    public virtual void SetName(string newName)
-    {
-        name = newName; // TODO: Name is virtual. Is this really expected behavior?
-    }
-
-    /// <summary>
     /// Gets the geometry bounds.
     /// </summary>
     /// <returns></returns>