diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.Designer.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.Designer.cs
index 01460d4d08..ad1b6fa3ec 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.Designer.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.Designer.cs
@@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Services
 		/// not be able to load this method if it was changed manually.
 		/// </summary>
 		private void InitializeComponent() {
-			this.localVarList = new Aga.Controls.Tree.TreeViewAdv();
+			this.exceptionDetails = new Aga.Controls.Tree.TreeViewAdv();
 			this.linkExceptionDetail = new System.Windows.Forms.LinkLabel();
 			this.splitContainer = new System.Windows.Forms.SplitContainer();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
@@ -65,36 +65,24 @@ namespace ICSharpCode.SharpDevelop.Services
 			// 
 			this.textBox.Size = new System.Drawing.Size(542, 139);
 			// 
-			// buttonBreak
+			// exceptionDetails
 			// 
-			this.buttonBreak.Location = new System.Drawing.Point(176, 356);
-			// 
-			// buttonContinue
-			// 
-			this.buttonContinue.Location = new System.Drawing.Point(274, 356);
-			// 
-			// buttonTerminate
-			// 
-			this.buttonTerminate.Location = new System.Drawing.Point(372, 356);
-			// 
-			// localVarList
-			// 
-			this.localVarList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.exceptionDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
 									| System.Windows.Forms.AnchorStyles.Left) 
 									| System.Windows.Forms.AnchorStyles.Right)));
-			this.localVarList.AutoRowHeight = true;
-			this.localVarList.BackColor = System.Drawing.SystemColors.Window;
-			this.localVarList.DefaultToolTipProvider = null;
-			this.localVarList.DragDropMarkColor = System.Drawing.Color.Black;
-			this.localVarList.LineColor = System.Drawing.SystemColors.ControlDark;
-			this.localVarList.LoadOnDemand = true;
-			this.localVarList.Location = new System.Drawing.Point(3, 4);
-			this.localVarList.Model = null;
-			this.localVarList.Name = "localVarList";
-			this.localVarList.SelectedNode = null;
-			this.localVarList.Size = new System.Drawing.Size(539, 153);
-			this.localVarList.TabIndex = 4;
-			this.localVarList.UseColumns = true;
+			this.exceptionDetails.AutoRowHeight = true;
+			this.exceptionDetails.BackColor = System.Drawing.SystemColors.Window;
+			this.exceptionDetails.DefaultToolTipProvider = null;
+			this.exceptionDetails.DragDropMarkColor = System.Drawing.Color.Black;
+			this.exceptionDetails.LineColor = System.Drawing.SystemColors.ControlDark;
+			this.exceptionDetails.LoadOnDemand = true;
+			this.exceptionDetails.Location = new System.Drawing.Point(3, 4);
+			this.exceptionDetails.Model = null;
+			this.exceptionDetails.Name = "exceptionDetails";
+			this.exceptionDetails.SelectedNode = null;
+			this.exceptionDetails.Size = new System.Drawing.Size(539, 153);
+			this.exceptionDetails.TabIndex = 4;
+			this.exceptionDetails.UseColumns = true;
 			// 
 			// linkExceptionDetail
 			// 
@@ -122,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Services
 			// 
 			// splitContainer.Panel2
 			// 
-			this.splitContainer.Panel2.Controls.Add(this.localVarList);
+			this.splitContainer.Panel2.Controls.Add(this.exceptionDetails);
 			this.splitContainer.Size = new System.Drawing.Size(550, 327);
 			this.splitContainer.SplitterDistance = 163;
 			this.splitContainer.TabIndex = 6;
@@ -146,8 +134,8 @@ namespace ICSharpCode.SharpDevelop.Services
 			this.ResumeLayout(false);
 			this.PerformLayout();
 		}
+		private Aga.Controls.Tree.TreeViewAdv exceptionDetails;
 		private System.Windows.Forms.SplitContainer splitContainer;
-		private Aga.Controls.Tree.TreeViewAdv localVarList;
 		private System.Windows.Forms.LinkLabel linkExceptionDetail;
 		#endregion
 			
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
index 21e5826b63..e2b1009479 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
@@ -65,7 +65,7 @@ namespace ICSharpCode.SharpDevelop.Services
             textBox.Location = new System.Drawing.Point(0, 4);
             splitContainer.Panel1.Controls.Add(textBox);
             
-            // To make the localVarList size properly, it must be rendered full size in the designer.
+            // To make the exceptionDetails size properly, it must be rendered full size in the designer.
             // To get the text right we set the panel to the opposite of what we want and then fire linkExceptionDetail.Click().
             splitContainer.Panel2Collapsed = DebuggingOptions.Instance.ShowExceptionDetails;
             DebuggingOptions.Instance.ShowExceptionDetails = ! DebuggingOptions.Instance.ShowExceptionDetails;
@@ -74,13 +74,13 @@ namespace ICSharpCode.SharpDevelop.Services
             WindowState = DebuggingOptions.Instance.DebuggeeExceptionWindowState;
 			Size = DebuggingOptions.Instance.DebuggeeExceptionWindowSize;
             
-			InitializeLocalVarList();
+			InitializeexceptionDetails();
 		}
 		
 		/// <summary>
-		/// Setup the columns for the LocalVarList.
+		/// Setup the columns for the exceptionDetails.
 		/// </summary>
-		private void InitializeLocalVarList() {
+		private void InitializeexceptionDetails() {
 			NodeIcon iconControl = new ItemIcon();
 			NodeTextBox nameControl = new ItemName();
 			NodeTextBox textControl = new ItemText();
@@ -90,24 +90,24 @@ namespace ICSharpCode.SharpDevelop.Services
 			TreeColumn valColumn  = new TreeColumn();
 			TreeColumn typeColumn = new TreeColumn();
 			
-			localVarList.Columns.Add(nameColumn);
-			localVarList.Columns.Add(valColumn);
-			localVarList.Columns.Add(typeColumn);
-			localVarList.UseColumns = true;
-			localVarList.SelectionMode = TreeSelectionMode.Single;
-			localVarList.LoadOnDemand = true;
+			exceptionDetails.Columns.Add(nameColumn);
+			exceptionDetails.Columns.Add(valColumn);
+			exceptionDetails.Columns.Add(typeColumn);
+			exceptionDetails.UseColumns = true;
+			exceptionDetails.SelectionMode = TreeSelectionMode.Single;
+			exceptionDetails.LoadOnDemand = true;
 			
 			iconControl.ParentColumn = nameColumn;
-			localVarList.NodeControls.Add(iconControl);
+			exceptionDetails.NodeControls.Add(iconControl);
 			
 			nameControl.ParentColumn = nameColumn;
-			localVarList.NodeControls.Add(nameControl);
+			exceptionDetails.NodeControls.Add(nameControl);
 			
 			textControl.ParentColumn = valColumn;
-			localVarList.NodeControls.Add(textControl);
+			exceptionDetails.NodeControls.Add(textControl);
 			
 			typeControl.ParentColumn = typeColumn;
-			localVarList.NodeControls.Add(typeControl);
+			exceptionDetails.NodeControls.Add(typeControl);
 		
 			nameColumn.Header = ResourceService.GetString("Global.Name");
 			nameColumn.Width = 165;
@@ -127,10 +127,10 @@ namespace ICSharpCode.SharpDevelop.Services
 				IList<AbstractNode> exceptionNodes = new List<AbstractNode>();
 				exceptionNodes.Add(ValueNode.Create(new CurrentExceptionExpression()));
 				
-				form.localVarList.BeginUpdate();
-				TreeViewVarNode.SetContentRecursive(process, form.localVarList, exceptionNodes);
-				form.localVarList.EndUpdate();
-				form.localVarList.Refresh();
+				form.exceptionDetails.BeginUpdate();
+				TreeViewVarNode.SetContentRecursive(process, form.exceptionDetails, exceptionNodes);
+				form.exceptionDetails.EndUpdate();
+				form.exceptionDetails.Refresh();
 
 				form.buttonContinue.Enabled = canContinue;
 				form.ShowDialog(Gui.WorkbenchSingleton.MainForm);