diff --git a/Editor/HighlightReferences/HighlightTagger.cs b/Editor/HighlightReferences/HighlightTagger.cs
index ceeb58a..b64ecb4 100644
--- a/Editor/HighlightReferences/HighlightTagger.cs
+++ b/Editor/HighlightReferences/HighlightTagger.cs
@@ -238,7 +238,7 @@ protected virtual void Dispose (bool disposing)
 		}
 
 		/// <summary>
-		/// Considers items to be indentical if they intersect
+		/// Considers items to be identical if they intersect
 		/// </summary>
 		class IntersectionComparer : IComparer<(TKind kind, SnapshotSpan location)>
 		{
diff --git a/Editor/HighlightReferences/XmlHighlightEndTagTagger.cs b/Editor/HighlightReferences/XmlHighlightEndTagTagger.cs
index d5ba205..6f38f36 100644
--- a/Editor/HighlightReferences/XmlHighlightEndTagTagger.cs
+++ b/Editor/HighlightReferences/XmlHighlightEndTagTagger.cs
@@ -9,16 +9,16 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Tagging;
 
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Editor.Completion;
 using MonoDevelop.Xml.Editor.HighlightReferences;
+using MonoDevelop.Xml.Editor.Tagging;
 using MonoDevelop.Xml.Parser;
 
 namespace MonoDevelop.MSBuild.Editor.HighlightReferences
 {
-	class XmlHighlightEndTagTagger : HighlightTagger<ITextMarkerTag, ITextMarkerTag>
+	class XmlHighlightEndTagTagger : HighlightTagger<NavigableHighlightTag, NavigableHighlightTag>
 	{
 		readonly XmlParserProvider parserProvider;
 
@@ -31,7 +31,7 @@ public XmlHighlightEndTagTagger (
 		}
 
 		protected async override
-			Task<(SnapshotSpan sourceSpan, ImmutableArray<(ITextMarkerTag kind, SnapshotSpan location)> highlights)>
+			Task<(SnapshotSpan sourceSpan, ImmutableArray<(NavigableHighlightTag kind, SnapshotSpan location)> highlights)>
 			GetHighlightsAsync (SnapshotPoint caretLocation, CancellationToken token)
 		{
 			if (!parserProvider.TryGetParser (TextView.TextBuffer, out var parser)) {
@@ -61,25 +61,25 @@ protected async override
 			}
 			return Empty;
 
-			(SnapshotSpan sourceSpan, ImmutableArray<(ITextMarkerTag kind, SnapshotSpan location)> highlights)
+			(SnapshotSpan sourceSpan, ImmutableArray<(NavigableHighlightTag kind, SnapshotSpan location)> highlights)
 				CreateResult (TextSpan source, TextSpan target)
 				=> (
 					new SnapshotSpan (caretLocation.Snapshot, source.Start, source.Length),
-					ImmutableArray<(ITextMarkerTag kind, SnapshotSpan location)>.Empty
+					ImmutableArray<(NavigableHighlightTag kind, SnapshotSpan location)>.Empty
 					.Add ((
 						MatchingTagHighlightTag.Instance,
 						new SnapshotSpan (caretLocation.Snapshot, target.Start, target.Length)))
 				);
 		}
 
-		protected override ITextMarkerTag GetTag (ITextMarkerTag kind) => kind;
+		protected override NavigableHighlightTag GetTag (NavigableHighlightTag kind) => kind;
 	}
 
-	sealed class MatchingTagHighlightTag : TextMarkerTag
+	sealed class MatchingTagHighlightTag : NavigableHighlightTag
 	{
 		internal const string TagId = "brace matching";
 
-		public static readonly MatchingTagHighlightTag Instance = new MatchingTagHighlightTag ();
+		public static readonly MatchingTagHighlightTag Instance = new ();
 
 		private MatchingTagHighlightTag () : base (TagId) { }
 	}