diff --git a/src/PowerShellEditorServices.Protocol/LanguageServer/Definition.cs b/src/PowerShellEditorServices.Protocol/LanguageServer/Definition.cs
index 336259ba9..cee9a7215 100644
--- a/src/PowerShellEditorServices.Protocol/LanguageServer/Definition.cs
+++ b/src/PowerShellEditorServices.Protocol/LanguageServer/Definition.cs
@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.LanguageServer
     public class DefinitionRequest
     {
         public static readonly
-            RequestType<TextDocumentPosition, Location[], object, TextDocumentRegistrationOptions> Type =
-            RequestType<TextDocumentPosition, Location[], object, TextDocumentRegistrationOptions>.Create("textDocument/definition");
+            RequestType<TextDocumentPositionParams, Location[], object, TextDocumentRegistrationOptions> Type =
+            RequestType<TextDocumentPositionParams, Location[], object, TextDocumentRegistrationOptions>.Create("textDocument/definition");
     }
 }
 
diff --git a/src/PowerShellEditorServices.Protocol/LanguageServer/References.cs b/src/PowerShellEditorServices.Protocol/LanguageServer/References.cs
index 992464140..6965cb073 100644
--- a/src/PowerShellEditorServices.Protocol/LanguageServer/References.cs
+++ b/src/PowerShellEditorServices.Protocol/LanguageServer/References.cs
@@ -14,7 +14,7 @@ public static readonly
             RequestType<ReferencesParams, Location[], object, TextDocumentRegistrationOptions>.Create("textDocument/references");
     }
 
-    public class ReferencesParams : TextDocumentPosition
+    public class ReferencesParams : TextDocumentPositionParams
     {
         public ReferencesContext Context { get; set; }
     }
diff --git a/src/PowerShellEditorServices.Protocol/LanguageServer/TextDocument.cs b/src/PowerShellEditorServices.Protocol/LanguageServer/TextDocument.cs
index 8920ef1c4..13cbdb22d 100644
--- a/src/PowerShellEditorServices.Protocol/LanguageServer/TextDocument.cs
+++ b/src/PowerShellEditorServices.Protocol/LanguageServer/TextDocument.cs
@@ -65,18 +65,6 @@ public class VersionedTextDocumentIdentifier : TextDocumentIdentifier
         public int Version { get; set; }
     }
 
-    /// <summary>
-    /// Defines a position in a text document.
-    /// </summary>
-    [DebuggerDisplay("TextDocumentPosition = {Position.Line}:{Position.Character}")]
-    public class TextDocumentPosition : TextDocumentIdentifier
-    {
-        /// <summary>
-        /// Gets or sets the position in the document.
-        /// </summary>
-        public Position Position { get; set; }
-    }
-
     /// <summary>
     /// A parameter literal used in requests to pass a text document and a position inside that document.
     /// </summary>
diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
index 9ee25c045..b22c11504 100644
--- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
+++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
@@ -624,12 +624,12 @@ await this.RunScriptDiagnostics(
         }
 
         protected async Task HandleDefinitionRequest(
-            TextDocumentPosition textDocumentPosition,
+            TextDocumentPositionParams textDocumentPosition,
             RequestContext<Location[]> requestContext)
         {
             ScriptFile scriptFile =
                 editorSession.Workspace.GetFile(
-                    textDocumentPosition.Uri);
+                    textDocumentPosition.TextDocument.Uri);
 
             SymbolReference foundSymbol =
                 editorSession.LanguageService.FindSymbolAtLocation(
@@ -668,7 +668,7 @@ protected async Task HandleReferencesRequest(
         {
             ScriptFile scriptFile =
                 editorSession.Workspace.GetFile(
-                    referencesParams.Uri);
+                    referencesParams.TextDocument.Uri);
 
             SymbolReference foundSymbol =
                 editorSession.LanguageService.FindSymbolAtLocation(
diff --git a/test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs b/test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs
index 7ca874794..8c85738f4 100644
--- a/test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs
+++ b/test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs
@@ -263,7 +263,10 @@ await this.SendRequest(
                 ReferencesRequest.Type,
                 new ReferencesParams
                 {
-                    Uri = "TestFiles\\FindReferences.ps1",
+                    TextDocument = new TextDocumentIdentifier
+                    {
+                        Uri = "TestFiles\\FindReferences.ps1"
+                    },
                     Position = new Position
                     {
                         Line = 7,
@@ -292,7 +295,10 @@ await this.SendRequest(
                     ReferencesRequest.Type,
                     new ReferencesParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1"
+                        },
                         Position = new Position
                         {
                             Line = 9,
@@ -314,7 +320,10 @@ await this.SendRequest(
                     ReferencesRequest.Type,
                     new ReferencesParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1"
+                        },
                         Position = new Position
                         {
                             Line = 0,
@@ -343,7 +352,10 @@ await this.SendRequest(
                     ReferencesRequest.Type,
                     new ReferencesParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1"
+                        },
                         Position = new Position
                         {
                             Line = 0,
@@ -370,9 +382,12 @@ public async Task FindsDefinitionOfCommand()
             Location[] locations =
                 await this.SendRequest(
                     DefinitionRequest.Type,
-                    new TextDocumentPosition
+                    new TextDocumentPositionParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1",
+                        },
                         Position = new Position
                         {
                             Line = 2,
@@ -394,9 +409,12 @@ public async Task FindsNoDefinitionOfBuiltinCommand()
             Location[] locations =
                 await this.SendRequest(
                     DefinitionRequest.Type,
-                    new TextDocumentPosition
+                    new TextDocumentPositionParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1"
+                        },
                         Position = new Position
                         {
                             Line = 10,
@@ -416,9 +434,12 @@ public async Task FindsDefintionOfVariable()
             Location[] locations =
                 await this.SendRequest(
                     DefinitionRequest.Type,
-                    new TextDocumentPosition
+                    new TextDocumentPositionParams
                     {
-                        Uri = "TestFiles\\FindReferences.ps1",
+                        TextDocument = new TextDocumentIdentifier
+                        {
+                            Uri = "TestFiles\\FindReferences.ps1"
+                        },
                         Position = new Position
                         {
                             Line = 8,