diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
index 68699fa838..f0f4fb4c97 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
@@ -45,44 +45,92 @@ namespace Debugger
 			);
 		}
 		
-		public static ExpressionCollection StackFrameVariables(StackFrame stackFrame)
+		/// <summary> Get all variables for a method - this; parameters; local variables </summary>
+		public static ExpressionCollection MethodVariables(MethodInfo methodInfo)
 		{
-			throw new NotImplementedException();
+			ExpressionCollection vars = new ExpressionCollection();
+			
+			vars.Add(MethodThis(methodInfo));
+			vars.AddRange(MethodParameters(methodInfo));
+			vars.AddRange(MethodLocalVariables(methodInfo));
+			
+			return vars;
 		}
 		
-		public static Expression StackFrameThis(StackFrame stackFrame)
+		/// <summary> Get 'this' variable for a method </summary>
+		public static Expression MethodThis(MethodInfo methodInfo)
 		{
-			throw new NotImplementedException();
+			if (methodInfo.IsStatic) throw new DebuggerException(methodInfo.FullName + " is static method");
+			
+			return new Ast.ThisReferenceExpression();
 		}
 		
-		public static ExpressionCollection StackFrameParameters(StackFrame stackFrame)
+		/// <summary> Get parameters of a method </summary>
+		public static ExpressionCollection MethodParameters(MethodInfo methodInfo)
 		{
-			throw new NotImplementedException();
-		}
-		
-		public static ExpressionCollection StackFrameLocalVariables(StackFrame stackFrame)
-		{
-			throw new NotImplementedException();
+			ExpressionCollection pars = new ExpressionCollection();
+			
+			for(int i = 0; i < methodInfo.ParameterCount; i++) {
+				pars.Add(new Ast.ParameterIdentifierExpression(i, methodInfo.GetParameterName(i)));
+			}
+			
+			return pars;
 		}
 		
-		public ValueCollection GetArrayElements()
+		/// <summary> Get local variables of a method </summary>
+		public static ExpressionCollection MethodLocalVariables(MethodInfo methodInfo)
 		{
-			throw new NotImplementedException();
+			ExpressionCollection vars = new ExpressionCollection();
+			
+			foreach(ISymUnmanagedVariable var in methodInfo.LocalVariables) {
+				vars.Add(new Ast.LocalVariableIdentifierExpression(var));
+			}
+			
+			return vars;
 		}
 		
-		public ExpressionCollection GetObjectMembers()
+		/// <summary>
+		/// Evaluate the expression and return expressions for all array elements.
+		/// The expression must evaluate to array.
+		/// </summary>
+		public ExpressionCollection EvaluateAndGetArrayElements()
 		{
-			throw new NotImplementedException();
+			ExpressionCollection elements = new ExpressionCollection();
+			foreach(uint[] indices in this.Evaluate().ArrayIndices) {
+				elements.Add(this.AppendIndexer(indices));
+			}
+			return elements;
 		}
 		
-		public ExpressionCollection GetObjectMembers(BindingFlags bindingFlags)
+		/// <summary>
+		/// Evaluate the expression and return object members.
+		/// The expression must evaluate to object.
+		/// </summary>
+		public ExpressionCollection EvaluateAndGetObjectMembers(BindingFlags bindingFlags)
 		{
-			throw new NotImplementedException();
+			ExpressionCollection members = new ExpressionCollection();
+			
+			DebugType currentType = this.Evaluate().Type;
+			while (currentType != null) {
+				members.AddRange(GetObjectMembers(currentType, bindingFlags));
+				currentType = currentType.BaseType;
+			}
+			
+			return members;
 		}
 		
 		public ExpressionCollection GetObjectMembers(DebugType type, BindingFlags bindingFlags)
 		{
-			throw new NotImplementedException();
+			ExpressionCollection members = new ExpressionCollection();
+			
+			foreach(FieldInfo field in type.GetFields(bindingFlags)) {
+				members.Add(this.AppendFieldReference(field));
+			}
+			foreach(PropertyInfo property in type.GetProperties(bindingFlags)) {
+				members.Add(this.AppendPropertyReference(property));
+			}
+			
+			return members;
 		}
 	}
 }
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
index c9bc01ed7c..09df721a19 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
@@ -17,12 +17,12 @@ namespace Debugger
 {
 	public partial class Expression: DebuggerObject
 	{
-		public Value GetValue()
+		public Value Evaluate()
 		{
 			return Evaluate(null);
 		}
 		
-		Value Evaluate(StackFrame stackFrame)
+		public Value Evaluate(StackFrame stackFrame)
 		{
 			EvaluateAstVisitor astVisitor = new EvaluateAstVisitor(stackFrame);
 			return (Value)this.AbstractSynatxTree.AcceptVisitor(astVisitor, null);
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
index 4988c07e77..dea991983b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
@@ -21,6 +21,20 @@ namespace Debugger
 	{
 		MethodProps methodProps;
 		
+		/// <summary> Gets the name of this method </summary>
+		public override string Name {
+			get {
+				return methodProps.Name;
+			}
+		}
+		
+		/// <summary> Gets name of the method including the full name of the declaring type </summary>
+		public string FullName {
+			get {
+				return this.DeclaringType.FullName + "." + methodProps.Name;
+			}
+		}
+		
 		/// <summary> Gets a value indicating whether this method is private </summary>
 		public override bool IsPrivate {
 			get {
@@ -59,13 +73,6 @@ namespace Debugger
 			}
 		}
 		
-		/// <summary> Gets the name of this method </summary>
-		public override string Name {
-			get {
-				return methodProps.Name;
-			}
-		}
-		
 		internal ICorDebugFunction CorFunction {
 			get {
 				return this.Module.CorModule.GetFunctionFromToken(this.MetadataToken);
@@ -113,6 +120,13 @@ namespace Debugger
 			}
 		}
 		
+		[Debugger.Tests.Ignore]
+		public int ParameterCount {
+			get {
+				return this.Module.MetaData.GetParamCount(this.MetadataToken);
+			}
+		}
+		
 		/// <summary> Gets the name of given parameter </summary>
 		/// <param name="index"> Zero-based index </param>
 		public string GetParameterName(int index)
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs
index d24a6dfe6a..32a5f4783e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs
@@ -34,7 +34,7 @@ namespace Debugger
 		}
 		
 		/// <summary>
-		/// Gets the number of elements the array can store.
+		/// Gets the number of elements in the array.
 		/// eg new object[4,5] returns 20
 		/// </summary>
 		public uint ArrayLenght {
@@ -108,27 +108,40 @@ namespace Debugger
 		/// <summary> Returns all elements in the array </summary>
 		public ValueCollection GetArrayElements()
 		{
-			return new ValueCollection(GetArrayElementsEnum());
+			return new ValueCollection(this.ArrayElements);
 		}
 		
-		IEnumerable<Value> GetArrayElementsEnum()
-		{
-			uint[] indices = new uint[ArrayRank];
-			uint rank = ArrayRank;
-			uint[] dimensions = ArrayDimensions;
-			
-			while(true) { // Go thought all combinations
-				for (uint i = rank - 1; i >= 1; i--) {
-					if (indices[i] >= dimensions[i]) {
-						indices[i] = 0;
-						indices[i-1]++;
-					}
+		/// <summary> Enumerate over all array elements </summary>
+		[Debugger.Tests.Ignore]
+		public IEnumerable<Value> ArrayElements {
+			get {
+				foreach(uint[] indices in ArrayIndices) {
+					yield return GetArrayElement(indices);
 				}
-				if (indices[0] >= dimensions[0]) break; // We are done
-				
-				yield return GetArrayElement(indices);
+			}
+		}
+		
+		/// <summary> Enumerate over all array indices </summary>
+		[Debugger.Tests.Ignore]
+		public IEnumerable<uint[]> ArrayIndices {
+			get {
+				uint[] indices = new uint[ArrayRank];
+				uint rank = ArrayRank;
+				uint[] dimensions = ArrayDimensions;
 				
-				indices[rank - 1]++;
+				while(true) { // Go thought all combinations
+					for (uint i = rank - 1; i >= 1; i--) {
+						if (indices[i] >= dimensions[i]) {
+							indices[i] = 0;
+							indices[i-1]++;
+						}
+					}
+					if (indices[0] >= dimensions[0]) break; // We are done
+					
+					yield return (uint[])indices.Clone();
+					
+					indices[rank - 1]++;
+				}
 			}
 		}
 	}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
index f25949fade..bf4900e9b4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
@@ -223,18 +223,23 @@ namespace Debugger
 		
 		IEnumerable<Value> GetObjectMembersEnum(DebugType type, BindingFlags bindingFlags)
 		{
-			DebugType currentType = type ?? this.Type;
-			while (currentType != null) {
-				foreach(FieldInfo field in currentType.GetFields(bindingFlags)) {
+			if (type != null) {
+				foreach(FieldInfo field in type.GetFields(bindingFlags)) {
 					yield return this.GetFieldValue(field);
 				}
-				foreach(PropertyInfo property in currentType.GetProperties(bindingFlags)) {
+				foreach(PropertyInfo property in type.GetProperties(bindingFlags)) {
 					yield return this.GetPropertyValue(property);
 				}
-				if (type == null) {
+			} else {
+				DebugType currentType = this.Type;
+				while (currentType != null) {
+					foreach(FieldInfo field in currentType.GetFields(bindingFlags)) {
+						yield return this.GetFieldValue(field);
+					}
+					foreach(PropertyInfo property in currentType.GetProperties(bindingFlags)) {
+						yield return this.GetPropertyValue(property);
+					}
 					currentType = currentType.BaseType;
-				} else {
-					yield break;
 				}
 			}
 		}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
index 7ad3f432b7..c29b807f7d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
@@ -12,11 +12,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Sub2</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Sub2</FullName>
                 <IsPrivate>True</IsPrivate>
                 <IsPublic>False</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Sub2</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
@@ -48,11 +49,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Sub1</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Sub1</FullName>
                 <IsPrivate>True</IsPrivate>
                 <IsPublic>False</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Sub1</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
@@ -84,11 +86,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Main</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Main</FullName>
                 <IsPrivate>False</IsPrivate>
                 <IsPublic>True</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Main</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
@@ -128,11 +131,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Sub1</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Sub1</FullName>
                 <IsPrivate>True</IsPrivate>
                 <IsPublic>False</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Sub1</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
@@ -164,11 +168,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Main</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Main</FullName>
                 <IsPrivate>False</IsPrivate>
                 <IsPublic>True</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Main</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
@@ -208,11 +213,12 @@
           <StackFrame>
             <MethodInfo>
               <MethodInfo>
+                <Name>Main</Name>
+                <FullName>Debugger.Tests.TestPrograms.Callstack.Main</FullName>
                 <IsPrivate>False</IsPrivate>
                 <IsPublic>True</IsPublic>
                 <IsSpecialName>False</IsSpecialName>
                 <IsStatic>True</IsStatic>
-                <Name>Main</Name>
                 <Module>Callstack.exe</Module>
                 <DeclaringType>Debugger.Tests.TestPrograms.Callstack</DeclaringType>
               </MethodInfo>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
index 7776f8586b..9efc661797 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
@@ -10,11 +10,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticFunction</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.StaticFunction</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticFunction</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
@@ -95,11 +96,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticFunction</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.StaticFunction</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticFunction</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
@@ -180,11 +182,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticFunction</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.StaticFunction</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticFunction</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
@@ -265,11 +268,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
@@ -366,11 +370,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
@@ -467,11 +472,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionArgumentVariables.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionArgumentVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionArgumentVariables</DeclaringType>
           </MethodInfo>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
index 24df51a97f..4c7b8be0e0 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
@@ -9,11 +9,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
@@ -64,11 +65,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
@@ -118,11 +120,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>SubFunction</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.SubFunction</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>SubFunction</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
@@ -157,11 +160,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
@@ -212,11 +216,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
@@ -250,11 +255,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Function</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLifetime.Function</FullName>
             <IsPrivate>True</IsPrivate>
             <IsPublic>False</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Function</Name>
             <Module>FunctionLifetime.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLifetime</DeclaringType>
           </MethodInfo>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
index 9e865f5b2b..db45c162ce 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
@@ -9,11 +9,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.FunctionLocalVariables.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>FunctionLocalVariables.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.FunctionLocalVariables</DeclaringType>
           </MethodInfo>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
index f504b9c258..4df096a5de 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
@@ -9,11 +9,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Metod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.Metod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>Metod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -95,11 +96,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>GenericMethod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.GenericMethod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>GenericMethod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -181,11 +183,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticMetod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticMetod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticMetod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -251,11 +254,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticGenericMethod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticGenericMethod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticGenericMethod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -321,11 +325,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Metod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.Metod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>Metod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -386,11 +391,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>GenericMethod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.GenericMethod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>False</IsStatic>
-            <Name>GenericMethod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -451,11 +457,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticMetod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticMetod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticMetod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
@@ -521,11 +528,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>StaticGenericMethod</Name>
+            <FullName>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticGenericMethod</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>StaticGenericMethod</Name>
             <Module>Generics.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;</DeclaringType>
           </MethodInfo>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
index 55eb4c4023..fe2e514f68 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
@@ -10,11 +10,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -49,11 +50,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -91,11 +93,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -130,11 +133,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Sub</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Sub</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Sub</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -169,11 +173,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Sub</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Sub</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Sub</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -209,11 +214,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Sub</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Sub</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Sub</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -250,11 +256,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -289,11 +296,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>
@@ -329,11 +337,12 @@
       <StackFrame>
         <MethodInfo>
           <MethodInfo>
+            <Name>Main</Name>
+            <FullName>Debugger.Tests.TestPrograms.Stepping.Main</FullName>
             <IsPrivate>False</IsPrivate>
             <IsPublic>True</IsPublic>
             <IsSpecialName>False</IsSpecialName>
             <IsStatic>True</IsStatic>
-            <Name>Main</Name>
             <Module>Stepping.exe</Module>
             <DeclaringType>Debugger.Tests.TestPrograms.Stepping</DeclaringType>
           </MethodInfo>