diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs
index 610ddf7592..f36c1744e7 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs
@@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 
 		private DesignItem IntializePasteOperationsTest()
 		{
-			var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><ListBox/>");
+			var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><Image/>");
 			Assert.IsNotNull(grid);
 			var xamlConxtext = grid.Context as XamlDesignContext;
 			if (xamlConxtext != null) {
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs
index 0ea8458426..aac3da5257 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs
@@ -38,6 +38,14 @@ namespace ICSharpCode.WpfDesign.XamlDom
 					}
 					if (newName != null) {
 						nameScope.RegisterName(newName, namedObject.Instance);
+						
+						try{
+							var prp = namedObject.ElementType.GetProperty(namedObject.RuntimeNameProperty);
+							if (prp != null)
+								prp.SetValue(namedObject.Instance, newName, null);
+						} catch (Exception x) {
+							Debug.WriteLine(x.Message);
+						}
 					}
 					break;
 				}