diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs
index a0c2bd5d8f..f602678892 100644
--- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs
+++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditor.cs
@@ -120,7 +120,7 @@ namespace ICSharpCode.Scripting.Tests.Utils
 			throw new NotImplementedException();
 		}
 		
-		public System.Collections.Generic.IEnumerable<ICSharpCode.SharpDevelop.Editor.CodeCompletion.ICompletionItem> GetSnippets()
+		public System.Collections.Generic.IEnumerable<ICSharpCode.SharpDevelop.Editor.CodeCompletion.ISnippetCompletionItem> GetSnippets()
 		{
 			throw new NotImplementedException();
 		}
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditor.cs b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditor.cs
index cf3ecb3d8a..cad0b37882 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditor.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditor.cs
@@ -172,7 +172,7 @@ namespace WixBinding.Tests.Utils
 			throw new NotImplementedException();
 		}
 		
-		public IEnumerable<ICompletionItem> GetSnippets()
+		public IEnumerable<ISnippetCompletionItem> GetSnippets()
 		{
 			throw new NotImplementedException();
 		}
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs
index 528b5fd48e..0873442d6d 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs
@@ -111,7 +111,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			// so we keep it enabled even when the option is set to false.
 		}
 		
-		public override IEnumerable<ICompletionItem> GetSnippets()
+		public override IEnumerable<ISnippetCompletionItem> GetSnippets()
 		{
 			CodeSnippetGroup g = SnippetManager.Instance.FindGroup(Path.GetExtension(this.FileName));
 			if (g != null) {
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs
index 4414e90c49..4f9812118c 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs
@@ -120,7 +120,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
 			return CreateAvalonEditSnippet(context, this.Text);
 		}
 		
-		public ICompletionItem CreateCompletionItem(ITextEditor context)
+		public ISnippetCompletionItem CreateCompletionItem(ITextEditor context)
 		{
 			return new SnippetCompletionItem(context, this) { AlwaysInsertSnippet = context.SelectionLength > 0 };
 		}
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditor.cs b/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditor.cs
index 32c968c716..ae1248bbea 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditor.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditor.cs
@@ -187,7 +187,7 @@ namespace XmlEditor.Tests.Utils
 			throw new NotImplementedException();
 		}
 		
-		public IEnumerable<ICompletionItem> GetSnippets()
+		public IEnumerable<ISnippetCompletionItem> GetSnippets()
 		{
 			throw new NotImplementedException();
 		}
diff --git a/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs b/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs
index f286216c3c..a75e6b0e90 100644
--- a/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs
+++ b/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs
@@ -255,9 +255,9 @@ namespace ICSharpCode.SharpDevelop.Editor
 			return null;
 		}
 		
-		public virtual IEnumerable<ICompletionItem> GetSnippets()
+		public virtual IEnumerable<ISnippetCompletionItem> GetSnippets()
 		{
-			return Enumerable.Empty<ICompletionItem>();
+			return Enumerable.Empty<ISnippetCompletionItem>();
 		}
 		
 		public virtual IList<ICSharpCode.SharpDevelop.Refactoring.IContextActionProvider> ContextActionProviders {
diff --git a/src/Main/Base/Project/Editor/ITextEditor.cs b/src/Main/Base/Project/Editor/ITextEditor.cs
index 23c2c5831c..b0b70e7659 100644
--- a/src/Main/Base/Project/Editor/ITextEditor.cs
+++ b/src/Main/Base/Project/Editor/ITextEditor.cs
@@ -127,7 +127,7 @@ namespace ICSharpCode.SharpDevelop.Editor
 		/// <summary>
 		/// Gets the list of available code snippets.
 		/// </summary>
-		IEnumerable<ICompletionItem> GetSnippets();
+		IEnumerable<ISnippetCompletionItem> GetSnippets();
 		
 		/// <summary>
 		/// Gets the list of context action providers.