diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index 712347217b..e37e54fb23 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -2400,8 +2400,8 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox" xml:space="preserve">
     <value>Hide cursor while typing</value>
   </data>
-  <data name="Dialog.Options.IDEOptions.TextEditor.General.UseOverstrikeModeCheckBox" xml:space="preserve">
-    <value>Use overstrike mode</value>
+  <data name="Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox" xml:space="preserve">
+    <value>Allow overstrike mode</value>
   </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.ShowQuickClassBrowserCheckBox" xml:space="preserve">
     <value>Show &amp;Quick ClassBrowser Panel</value>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml
index 666efcd3be..6e78d32c41 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml
@@ -28,8 +28,8 @@
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowHiddenDefinitions}" 
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" />
 				<CheckBox 
-					IsChecked="{core:OptionBinding local:CodeEditorOptions.UseOverstrikeMode}" 
-					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.UseOverstrikeModeCheckBox}" />
+					IsChecked="{core:OptionBinding local:CodeEditorOptions.AllowOverstrikeMode}" 
+					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox}" />
 			</widgets:StackPanelWithSpacing>
 		</GroupBox>
 	</StackPanel>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
index 2d70007d15..898b6b84cf 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
@@ -394,7 +394,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 		{
 			if (textView != null && textView.Document != null) {
 				VisualLine visualLine = textView.GetOrConstructVisualLine(textView.Document.GetLineByNumber(position.Line));
-				return (this.textView.Options.UseOverstrikeMode && this.textArea.OverstrikeMode)
+				return (this.textView.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode)
 					? CalcCaretOverstrikeRectangle(visualLine) : CalcCaretRectangle(visualLine);
 			} else {
 				return Rect.Empty;
@@ -451,7 +451,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 				VisualLine visualLine = textView.GetVisualLine(position.Line);
 				if (visualLine != null) {
 					Rect caretRect;
-					if (this.textView.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) {
+					if (this.textView.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) {
 						caretRect = CalcCaretOverstrikeRectangle(visualLine);
 					} else {
 						caretRect = CalcCaretRectangle(visualLine);
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
index 81df5e8a15..6bf68b2a70 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
@@ -79,7 +79,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 				if (caretBrush == null)
 					caretBrush = (Brush)textView.GetValue(TextBlock.ForegroundProperty);
 				
-				if (this.textArea.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) {
+				if (this.textArea.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) {
 					SolidColorBrush scBrush = caretBrush as SolidColorBrush;
 					if (scBrush != null) {
 						Color brushColor = scBrush.Color;
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
index 75e244b8af..079bb1ffe2 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
@@ -956,7 +956,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 		{
 			base.OnPreviewKeyDown(e);
 			
-			if (!this.Options.UseOverstrikeMode) {
+			if (!this.Options.AllowOverstrikeMode) {
 				this.overstrikeMode = false;
 			} else if (!e.Handled && e.Key == Key.Insert) {
 				this.overstrikeMode = !this.overstrikeMode;
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
index d9fedd28ef..353c958c24 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
@@ -463,18 +463,18 @@ namespace ICSharpCode.AvalonEdit
 			}
 		}
 		
-		bool useOverstrikeMode = false;
+		bool allowOverstrikeMode = false;
 		
 		[DefaultValue(false)]
 		/// <summary>
 		/// Gets/Sets if overstrike mode is enabled to use
 		/// </summary>
-		public bool UseOverstrikeMode {
-			get { return useOverstrikeMode; }
+		public bool AllowOverstrikeMode {
+			get { return allowOverstrikeMode; }
 			set {
-				if (useOverstrikeMode != value) {
-					useOverstrikeMode = value;
-					OnPropertyChanged("UseOverstrikeMode");
+				if (allowOverstrikeMode != value) {
+					allowOverstrikeMode = value;
+					OnPropertyChanged("AllowOverstrikeMode");
 				}
 			}
 		}