diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ChildNodesOfObject.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ChildNodesOfObject.cs
index 7ee5b67d05..301db6da13 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ChildNodesOfObject.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ChildNodesOfObject.cs
@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using ICSharpCode.Core;
 
 using Debugger;
+using Debugger.MetaData;
 using Debugger.Expressions;
 
 namespace Debugger.AddIn.TreeModel
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ValueNode.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ValueNode.cs
index 87a85139e1..289c04417f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ValueNode.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ValueNode.cs
@@ -14,6 +14,7 @@ using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Services;
 
 using Debugger;
+using Debugger.MetaData;
 using Debugger.Expressions;
 
 namespace Debugger.AddIn.TreeModel
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs
index 8e37696ad2..18fa080190 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs
@@ -8,6 +8,8 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+
+using Debugger.MetaData;
 using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/LocalVariableIdentifierExpression.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/LocalVariableIdentifierExpression.cs
index e8e6c1d59b..17769acb6b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/LocalVariableIdentifierExpression.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/LocalVariableIdentifierExpression.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 
+using Debugger.MetaData;
 using Debugger.Wrappers.CorSym;
 
 namespace Debugger.Expressions
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/MemberReferenceExpression.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/MemberReferenceExpression.cs
index dfd6ae288c..e61b116787 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/MemberReferenceExpression.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/MemberReferenceExpression.cs
@@ -9,6 +9,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
+using Debugger.MetaData;
+
 namespace Debugger.Expressions
 {
 	/// <summary>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/ParameterIdentifierExpression.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/ParameterIdentifierExpression.cs
index 067bcd6f86..0cf278353a 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/ParameterIdentifierExpression.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Ast/ParameterIdentifierExpression.cs
@@ -8,6 +8,8 @@
 using System;
 using System.Collections.Generic;
 
+using Debugger.MetaData;
+
 namespace Debugger.Expressions
 {
 	/// <summary>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.Create.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.Create.cs
index 441c2d1bfe..195aa28c8d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.Create.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.Create.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 
+using Debugger.MetaData;
 using Debugger.Wrappers.CorSym;
 
 namespace Debugger.Expressions
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/BindingFlags.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/BindingFlags.cs
index 832718aeda..94479a7062 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/BindingFlags.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/BindingFlags.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Binding flags specify which members should be returned.
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType-Helpers.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType-Helpers.cs
index 2234762748..99db1d44c4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType-Helpers.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType-Helpers.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	public partial class DebugType
 	{
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs
index 230bd6c2ea..bc1acad2fd 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Represents a type in a debugee. That is, a class, array, value type or a primitive type.
@@ -251,7 +251,7 @@ namespace Debugger
 		
 		static internal DebugType Create(Process process, ICorDebugClass corClass, params ICorDebugType[] typeArguments)
 		{
-			MetaData metaData = process.GetModule(corClass.Module).MetaData;
+			Debugger.Wrappers.MetaData.MetaData metaData = process.GetModule(corClass.Module).MetaData;
 			
 			bool isValueType = false;
 			uint superClassToken = metaData.GetTypeDefProps(corClass.Token).SuperClassToken;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/FieldInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/FieldInfo.cs
index 38b80b3130..0ed4462a03 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/FieldInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/FieldInfo.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Provides information about a field of some class.
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MemberInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MemberInfo.cs
index cce2e9f2f5..624ab67277 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MemberInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MemberInfo.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Provides information about a member of some class
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs
index 18cda2acaf..8b1ca5980c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs
@@ -12,7 +12,7 @@ using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.CorSym;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Provides information about a method in a class
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/PropertyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/PropertyInfo.cs
index 58c2420588..0b3a3eee6d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/PropertyInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/PropertyInfo.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.MetaData;
 
-namespace Debugger
+namespace Debugger.MetaData
 {
 	/// <summary>
 	/// Provides information about a property in a class
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
index c16a7e4107..fad4bc7098 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
@@ -6,6 +6,8 @@
 // </file>
 
 using System;
+
+using Debugger.MetaData;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.CorSym;
 using Debugger.Wrappers.MetaData;
@@ -22,7 +24,7 @@ namespace Debugger
 		int orderOfLoading = 0;
 		ICorDebugModule corModule;
 		ISymUnmanagedReader symReader;
-		MetaData metaData;
+		Debugger.Wrappers.MetaData.MetaData metaData;
 		
 		[Debugger.Tests.Ignore]
 		public Process Process {
@@ -31,7 +33,7 @@ namespace Debugger
 			}
 		}
 		
-		internal MetaData MetaData {
+		internal Debugger.Wrappers.MetaData.MetaData MetaData {
 			get {
 				return metaData;
 			}
@@ -125,7 +127,7 @@ namespace Debugger
 			
 			corModule = pModule;
 			
-			metaData = new MetaData(pModule);
+			metaData = new Debugger.Wrappers.MetaData.MetaData(pModule);
 			
 			fullPath = pModule.Name;
 			
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
index 6ebcc59414..acc922d87b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
+using Debugger.MetaData;
 using Debugger.Expressions;
 using Debugger.Wrappers.CorDebug;
 using Debugger.Wrappers.CorSym;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs
index 709a07635e..b9caf601b7 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 
+using Debugger.MetaData;
 using Debugger.Expressions;
 using Debugger.Wrappers.CorDebug;
 
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs
index 0db2561604..f60fe5e573 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 
+using Debugger.MetaData;
 using Debugger.Expressions;
 using Debugger.Wrappers.CorDebug;
 
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/GenericDictionary.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/GenericDictionary.cs
index 0ad34a3c67..6308ebe96d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/GenericDictionary.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/GenericDictionary.cs
@@ -25,6 +25,8 @@ namespace Debugger.Tests.TestPrograms
 
 #if TEST_CODE
 namespace Debugger.Tests {
+	using Debugger.MetaData;
+	
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test, NUnit.Framework.Ignore]
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
index d10fcbf587..c33f3cc8c0 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
@@ -27,6 +27,7 @@ namespace Debugger.Tests.TestPrograms
 #if TEST_CODE
 namespace Debugger.Tests {
 	using NUnit.Framework;
+	using Debugger.MetaData;
 	
 	public partial class DebuggerTests
 	{
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs
index c9797c6c6d..31d6d015af 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ObjectValue.cs
@@ -38,6 +38,8 @@ namespace Debugger.Tests.TestPrograms
 
 #if TEST_CODE
 namespace Debugger.Tests {
+	using Debugger.MetaData;
+	
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test, NUnit.Framework.Ignore]
@@ -49,11 +51,11 @@ namespace Debugger.Tests {
 			
 			val = process.SelectedStackFrame.GetLocalVariableValue("val");
 			ObjectDump("val", val);
-			ObjectDump("val members", val.GetMemberValues(null, Debugger.BindingFlags.All));
+			ObjectDump("val members", val.GetMemberValues(null, BindingFlags.All));
 			
 			process.Continue();
 			ObjectDump("val", val);
-			ObjectDump("val members", val.GetMemberValues(null, Debugger.BindingFlags.All));
+			ObjectDump("val members", val.GetMemberValues(null, BindingFlags.All));
 			
 			EndTest();
 		}