diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
index da5ef4f376..5434d0f236 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
@@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 		protected DesignItem CreateCanvasContext(string xaml)
 		{
 			XamlDesignContext context = CreateContext(@"<Canvas
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
   " + xaml + "</Canvas>");
 			Canvas canvas = (Canvas)context.RootItem.Component;
@@ -57,7 +57,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 		{
 			expectedXaml =
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
-				("<Canvas xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\" " +
+				("<Canvas xmlns=\"http://schemas.microsoft.com/netfx/2007/xaml/presentation\" " +
 				 "xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\">\n" + expectedXaml.Trim())
 				.Replace("\r", "").Replace("\n", "\n  ")
 				+ "\n</Canvas>";
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index bff7a592c1..eac9571842 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -21,11 +21,11 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <Page
-    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     >
   <StackPanel
-    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
     <TextBlock>
       Hello, World!
@@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 			TestLoading(@"
 <!--<SnippetSimpleLayout>-->
 <StackPanel
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
   <Button HorizontalAlignment=""Left""
           Width=""100""
@@ -66,10 +66,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <Page
-	xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+	xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
 	xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 	<DockPanel
-		xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+		xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
 		xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 		<TextBlock Background=""LightBlue""
 		           DockPanel.Dock=""Top"">Some Text</TextBlock>
@@ -103,7 +103,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 		<Page
-    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
   <StackPanel Background=""LightBlue"">
     <TextBlock Margin=""10,10,10,10"">Start Page</TextBlock>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
index 8fdfedbedf..5a7cea1771 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
@@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <Window
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 </Window>
 			");
@@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <Window
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
   Width=""300"" Height=""400"">
 </Window>
@@ -41,7 +41,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <Window
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
   <Window.Height>100</Window.Height>
 </Window>
@@ -53,7 +53,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 </t:ExampleClass>
@@ -65,7 +65,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
   StringProp=""a test string"">
@@ -78,7 +78,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    a test string
@@ -91,7 +91,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    <t:ExampleClass.StringProp>
@@ -106,7 +106,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    a test string
@@ -122,7 +122,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    <t:ExampleClass.OtherProp>
@@ -138,7 +138,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    <t:ExampleClass.OtherProp>
@@ -186,7 +186,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleDependencyObject
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
   t:ExampleService.Example=""attached value"">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
index fcb29f1fc9..dbb74759a9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
@@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
       
@@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    a test               string
@@ -46,7 +46,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
    a test
@@ -60,7 +60,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
       
@@ -75,7 +75,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
    a test               string
@@ -88,7 +88,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
    a test
@@ -102,7 +102,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		{
 			TestLoading(@"
 		          <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve""> <![CDATA[
 	This is text inside the CData section.
@@ -119,7 +119,7 @@ And that was an empty line.
 		{
 			TestLoading(@"
 		          <t:ExampleClass
-  xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+  xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
   xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
   xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 	some text
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs
index cc64d34a2f..af639b33ae 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs
@@ -28,8 +28,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		
 		/// <summary>
 		/// The namespace used for the WPF schema.
-		/// Value: "http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+		/// Value: "http://schemas.microsoft.com/netfx/2007/xaml/presentation"
 		/// </summary>
-		public const string PresentationNamespace = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+		public const string PresentationNamespace = "http://schemas.microsoft.com/netfx/2007/xaml/presentation";
 	}
 }