diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/Templates/Files/CSharp.EDMX.xft b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/Templates/Files/CSharp.EDMX.xft
index 67f6a58cf4..ecbe86d51d 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/Templates/Files/CSharp.EDMX.xft
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/Templates/Files/CSharp.EDMX.xft
@@ -38,7 +38,7 @@
 		${Path}                     -> Full path of the file
 	 -->
 	<Files>
-    <File name="${FullName}" language="XML" buildAction="EntityDeploy" CustomTool="EntityModelCodeGenerator">
+    <File name="${FullName}" language="XML" buildAction="EntityDeploy" Generator="EntityModelCodeGenerator">
       <![CDATA[<?xml version="1.0" encoding="utf-8"?>
 <edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2008/10/edmx">
   <!-- EF Runtime content -->
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/DisplayBinding/EDMDesignerViewContent.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/DisplayBinding/EDMDesignerViewContent.cs
index 5b58b0338c..47aa0a8373 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/DisplayBinding/EDMDesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/DisplayBinding/EDMDesignerViewContent.cs
@@ -22,6 +22,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Designer.ChangeWatcher;
 using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Common;
+using ICSharpCode.SharpDevelop.Project;
 
 #endregion
 
@@ -109,7 +110,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.DisplayBinding
             if (_edmView.EDM.IsEmpty)
             {
                 edmxElement = null;
-                EDMWizardWindow wizard = RunWizard(file);
+                EDMWizardWindow wizard = RunWizard(file, ProjectService.CurrentProject.RootNamespace);
 
                 if (wizard.DialogResult == true)
                     _edmView = new EDMView(wizard.EDMXDocument, readMoreAction);
@@ -150,9 +151,9 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.DisplayBinding
             EDMXIO.WriteXDocument(_edmView).Save(stream);
 		}
 		
-		private EDMWizardWindow RunWizard(OpenedFile file)
+		private EDMWizardWindow RunWizard(OpenedFile file, string projectStandardNamespace)
 		{
-            EDMWizardWindow wizard = new EDMWizardWindow(file);
+            EDMWizardWindow wizard = new EDMWizardWindow(file, projectStandardNamespace);
             wizard.Owner = Application.Current.MainWindow;
             wizard.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             wizard.ShowDialog();
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/DesignerIO.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/DesignerIO.cs
index 466e12f04d..36b1b97ffb 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/DesignerIO.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/DesignerIO.cs
@@ -12,6 +12,7 @@ using ICSharpCode.Data.EDMDesigner.Core.EDMObjects;
 using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Designer.Common;
 using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Common;
 using ICSharpCode.Data.EDMDesigner.Core.EDMObjects.Designer.ChangeWatcher;
+using System.Collections.Generic;
 
 #endregion
 
@@ -44,7 +45,9 @@ namespace ICSharpCode.Data.EDMDesigner.Core.IO
             if (arrange != null)
                 designerView.ArrangeTypeDesigners =  bool.Parse(arrange.Value);
 
-            foreach (var designerTypeXElement in designerViewXElement.Elements("DesignerType"))
+            IEnumerable<XElement> designerTypeXElements = designerViewXElement.Elements("DesignerType");
+
+            foreach (var designerTypeXElement in designerTypeXElements)
             {
                 var name = designerTypeXElement.Attribute("Name").Value;
                 
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/EntityModelCodeGenerator.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/EntityModelCodeGenerator.cs
index 78c7431c6b..88f68bd345 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/EntityModelCodeGenerator.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/EntityModelCodeGenerator.cs
@@ -33,7 +33,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.IO
                 throw new ArgumentException("Input file is not a valid EDMX file.");
 
             XDocument csdlDocument = new XDocument(new XDeclaration("1.0", "utf-8", null), conceptualModelsElement.Element(XName.Get("Schema", csdlNamespace.NamespaceName)));
-
+            
             string tempFileName = IO.GetTempFilenameWithExtension("csdl");
             csdlDocument.Save(tempFileName);
 
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/Windows/EDMWizard/EDMWizardWindow.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/Windows/EDMWizard/EDMWizardWindow.cs
index 74adf5aa4f..59d97e4d44 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/Windows/EDMWizard/EDMWizardWindow.cs
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/Windows/EDMWizard/EDMWizardWindow.cs
@@ -37,6 +37,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.Windows.EDMWizard
         private IDatabase _selectedDatabase = null;
         private string _modelNamespace = string.Empty;
         private string _objectContextName = string.Empty;
+        private string _projectStandardNamespace = string.Empty;
         private OpenedFile _file = null;
         private XDocument _edmxDocument = null;
 
@@ -137,7 +138,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.Windows.EDMWizard
 
         #region Constructor
 
-        public EDMWizardWindow(OpenedFile file)
+        public EDMWizardWindow(OpenedFile file, string projectStandardNamespace)
         {
             Title = "Entity Framework Wizard";
             Width = 640;
@@ -147,6 +148,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.Windows.EDMWizard
             AddWizardUserControl<ChooseDatabaseObjectsUserControl>();
 
             _file = file;
+            _projectStandardNamespace = projectStandardNamespace;
         }
 
         #endregion
@@ -157,7 +159,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.Windows.EDMWizard
         {          
             if (SelectedDatabase != null)
             {
-                _edmxDocument = EDMConverter.CreateEDMXFromIDatabase(SelectedDatabase, ModelNamespace, "TestNamespace", ObjectContextName);
+                _edmxDocument = EDMConverter.CreateEDMXFromIDatabase(SelectedDatabase, ModelNamespace, _projectStandardNamespace, ObjectContextName);
             }
         }
 
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.sln b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.sln
index 5d74b7ba86..c559d20fe5 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.sln
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 10
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DatabaseDrivers", "DatabaseDrivers", "{C5FB6340-6A60-40EA-9C06-708BE0EC84F2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{1F5B7C44-B137-4D74-A594-96EAC98890F8}"
@@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "I
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.DemoApp", "ICSharpCode.Data.DemoApp\ICSharpCode.Data.DemoApp.csproj", "{1EB79CD3-ECF1-420E-8A44-FA1EDD15390F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A3C49AAC-F616-4575-9522-E6A3ACA36884}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU