diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
index 2cfdad60d5..271774a21f 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
@@ -94,11 +94,11 @@
     <Compile Include="Src\CodeEditorView.cs" />
     <Compile Include="Src\ContextActionsRenderer.cs" />
     <Compile Include="Src\ExpressionHighlightRenderer.cs" />
-    <Compile Include="Src\FocusHighlight.xaml.cs">
-      <DependentUpon>FocusHighlight.xaml</DependentUpon>
+    <Compile Include="Src\CaretHighlight.xaml.cs">
+      <DependentUpon>CaretHighlight.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\FocusHighlightAdorner.cs" />
+    <Compile Include="Src\CaretHighlightAdorner.cs" />
     <Compile Include="Src\NewLineConsistencyCheck.cs" />
     <Compile Include="Src\SharpDevelopTextEditor.cs" />
     <Compile Include="Src\Commands\FoldingCommands.cs" />
@@ -165,7 +165,7 @@
     <EmbeddedResource Include="Resources\ReverseIncrementalSearchCursor.cur" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Src\FocusHighlight.xaml" />
+    <Page Include="Src\CaretHighlight.xaml" />
     <Page Include="Src\SharpDevelopCompletionWindow.xaml">
       <DependentUpon>SharpDevelopCompletionWindow.cs</DependentUpon>
     </Page>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml
similarity index 93%
rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml
rename to src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml
index 7c684608e0..dd7e1d8f37 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ICSharpCode.AvalonEdit.AddIn.FocusHighlight"
+<UserControl x:Class="ICSharpCode.AvalonEdit.AddIn.CaretHighlight"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<Grid HorizontalAlignment="Left" VerticalAlignment="Top">
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml.cs
similarity index 81%
rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml.cs
rename to src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml.cs
index 72ddc8e2cd..c21facf7b8 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlight.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlight.xaml.cs
@@ -14,11 +14,11 @@ using System.Windows.Media;
 namespace ICSharpCode.AvalonEdit.AddIn
 {
 	/// <summary>
-	/// Interaction logic for FocusHighlight.xaml
+	/// Interaction logic for CaretHighlight.xaml
 	/// </summary>
-	public partial class FocusHighlight : UserControl
+	public partial class CaretHighlight : UserControl
 	{
-		public FocusHighlight()
+		public CaretHighlight()
 		{
 			InitializeComponent();
 		}
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlightAdorner.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlightAdorner.cs
similarity index 87%
rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlightAdorner.cs
rename to src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlightAdorner.cs
index b84a85efd9..fcc8f5b6ed 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/FocusHighlightAdorner.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CaretHighlightAdorner.cs
@@ -11,16 +11,16 @@ using System.Windows.Threading;
 namespace ICSharpCode.AvalonEdit.AddIn
 {
 	/// <summary>
-	/// Description of FocusHighlightAdorner.
+	/// Description of CaretHighlightAdorner.
 	/// </summary>
-	public class FocusHighlightAdorner : Adorner
+	public class CaretHighlightAdorner : Adorner
 	{
-		FocusHighlight highlight;
+		CaretHighlight highlight;
 		
-		public FocusHighlightAdorner(UIElement adornedElement, Point origin)
+		public CaretHighlightAdorner(UIElement adornedElement, Point origin)
 			: base(adornedElement)
 		{
-			this.Highlight = new FocusHighlight() {
+			this.Highlight = new CaretHighlight() {
 				RenderTransform = new TranslateTransform(origin.X, origin.Y),
 			};
 		}
@@ -28,7 +28,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		/// <summary>
 		/// Gets/sets the visual child.
 		/// </summary>
-		protected FocusHighlight Highlight {
+		protected CaretHighlight Highlight {
 			get { return highlight; }
 			set {
 				RemoveVisualChild(highlight);
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs
index ea3d1ce74d..46d650734a 100755
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs
@@ -451,11 +451,11 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			this.Adapter.JumpTo(line, column);
 			this.Focus();
 			
-			if (CodeEditorOptions.Instance.HighlightFocus)
-				Dispatcher.Invoke(DispatcherPriority.Background, (Action)DisplayFocusHighlight);
+			if (CodeEditorOptions.Instance.EnableAnimations)
+				Dispatcher.Invoke(DispatcherPriority.Background, (Action)DisplayCaretHighlightAnimation);
 		}
 		
-		void DisplayFocusHighlight()
+		void DisplayCaretHighlightAnimation()
 		{
 			TextArea textArea = Adapter.GetService(typeof(TextArea)) as TextArea;
 			
@@ -463,7 +463,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				return;
 			
 			AdornerLayer layer = AdornerLayer.GetAdornerLayer(textArea.TextView);
-			FocusHighlightAdorner adorner = new FocusHighlightAdorner(textArea.TextView, textArea.Caret.CalculateCaretRectangle().Location - textArea.TextView.ScrollOffset - new Vector(3, 6.75));
+			CaretHighlightAdorner adorner = new CaretHighlightAdorner(textArea.TextView, textArea.Caret.CalculateCaretRectangle().Location - textArea.TextView.ScrollOffset - new Vector(3, 6.75));
 			layer.Add(adorner);
 			
 			WorkbenchSingleton.CallLater(TimeSpan.FromSeconds(1), (Action)(() => layer.Remove(adorner)));
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs
index 3467e9a512..74841e3c67 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs
@@ -144,15 +144,15 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			}
 		}
 		
-		bool highlightFocus = true;
+		bool enableAnimations = true;
 		
 		[DefaultValue(true)]
-		public bool HighlightFocus {
-			get { return highlightFocus; }
+		public bool EnableAnimations {
+			get { return enableAnimations; }
 			set {
-				if (highlightFocus != value) {
-					highlightFocus = value;
-					OnPropertyChanged("HighlightFocus");
+				if (enableAnimations != value) {
+					enableAnimations = value;
+					OnPropertyChanged("EnableAnimations");
 				}
 			}
 		}
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml
index b535277997..7308c0a67f 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml
@@ -25,8 +25,8 @@
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightSymbol}"
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox}" />
 				<CheckBox
-					IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightFocus}"
-					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightFocusCheckBox}" />
+					IsChecked="{core:OptionBinding local:CodeEditorOptions.EnableAnimations}"
+					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.EnableAnimationsCheckBox}" />
 			</widgets:StackPanelWithSpacing>
 		</GroupBox>
 	</StackPanel>