diff --git a/ICSharpCode.AvalonEdit/Editing/TextArea.cs b/ICSharpCode.AvalonEdit/Editing/TextArea.cs
index ac2aa561..52aab3ef 100644
--- a/ICSharpCode.AvalonEdit/Editing/TextArea.cs
+++ b/ICSharpCode.AvalonEdit/Editing/TextArea.cs
@@ -1085,13 +1085,13 @@ public bool OverstrikeMode {
 
 		#endregion
 
-		#region AutomationPeer for IntelliSense
+		#region AutomationPeer override for CodeCompletion
 		/// <summary>
-		/// Gets or sets AutomationPeer instance used by IntelliSense.
+		/// Gets or sets AutomationPeer instance used by CodeCompletion.
 		/// CompletionWindow can use this property to inject AutomationPeer that reflects
 		/// the suggestion list and the value of the currently selected CompletionData item.
 		/// </summary>
-		public System.Windows.Automation.Peers.AutomationPeer ActiveIntelliSenseAutomationPeer { get; set; }
+		public System.Windows.Automation.Peers.AutomationPeer CodeCompletionAutomationPeer { get; set; }
 		#endregion
 
 		/// <inheritdoc/>
diff --git a/ICSharpCode.AvalonEdit/Editing/TextRangeProvider.cs b/ICSharpCode.AvalonEdit/Editing/TextRangeProvider.cs
index 5083aec0..01327fe7 100644
--- a/ICSharpCode.AvalonEdit/Editing/TextRangeProvider.cs
+++ b/ICSharpCode.AvalonEdit/Editing/TextRangeProvider.cs
@@ -76,7 +76,7 @@ public ITextRangeProvider Clone()
 		public bool Compare(ITextRangeProvider range)
 		{
 			TextRangeProvider other = (TextRangeProvider)range;
-			if (textArea.ActiveIntelliSenseAutomationPeer != null) {
+			if (textArea.CodeCompletionAutomationPeer != null) {
 				Log("{0}.Compare({1}) [ActiveIntelliSenseAutomationPeer != null]= false", ID, other.ID);
 				return false;
 			}
@@ -199,8 +199,8 @@ public IRawElementProviderSimple GetEnclosingElement()
 		public string GetText(int maxLength)
 		{
 			Log("{0}.GetText({1})", ID, maxLength);
-			if (textArea.ActiveIntelliSenseAutomationPeer != null) {
-				var result = textArea.ActiveIntelliSenseAutomationPeer.GetName();
+			if (textArea.CodeCompletionAutomationPeer != null) {
+				var result = textArea.CodeCompletionAutomationPeer.GetName();
 				Log("{0}.GetText({1}) --> {2}", ID, maxLength, result);
 				return result;
 			}