diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
index bb9569b..d31913c 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
@@ -227,19 +227,19 @@ public partial class SharpIdeCodeEdit : CodeEdit
 			await _fileChangedService.SharpIdeFileChanged(_currentFile, text, FileChangeType.IdeUnsavedChange);
 			if (pendingCompletionTrigger is not null)
 			{
-				completionTrigger = pendingCompletionTrigger;
+				_completionTrigger = pendingCompletionTrigger;
 				var linePosition = new LinePosition(cursorPosition.line, cursorPosition.col);
-				var shouldTriggerCompletion = await _roslynAnalysis.ShouldTriggerCompletionAsync(_currentFile, text, linePosition, completionTrigger!.Value);
-				GD.Print($"Code completion trigger typed: '{completionTrigger.Value.Character}' at {linePosition.Line}:{linePosition.Character} should trigger: {shouldTriggerCompletion}");
+				var shouldTriggerCompletion = await _roslynAnalysis.ShouldTriggerCompletionAsync(_currentFile, text, linePosition, _completionTrigger!.Value);
+				GD.Print($"Code completion trigger typed: '{_completionTrigger.Value.Character}' at {linePosition.Line}:{linePosition.Character} should trigger: {shouldTriggerCompletion}");
 				if (shouldTriggerCompletion)
 				{
-					await OnCodeCompletionRequested(completionTrigger.Value, text, cursorPosition);
+					await OnCodeCompletionRequested(_completionTrigger.Value, text, cursorPosition);
 				}
 			}
-			else if (pendingCompletionFilterReason is not null)
+			else if (_pendingCompletionFilterReason is not null)
 			{
-				var filterReason = pendingCompletionFilterReason.Value;
-				pendingCompletionFilterReason = null;
+				var filterReason = _pendingCompletionFilterReason.Value;
+				_pendingCompletionFilterReason = null;
 				await CustomFilterCodeCompletionCandidates(filterReason);
 			}
 			__?.Dispose();
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions.cs
index b1abb19..c7aa6ad 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions.cs
@@ -68,11 +68,11 @@ public partial class SharpIdeCodeEdit
     }
     
 	private EventWrapper<CompletionTrigger, string, (int,int), Task> CustomCodeCompletionRequested { get; } = new((_, _, _) => Task.CompletedTask);
-	private CompletionList? completionList;
-	private Document? completionResultDocument;
-	private CompletionTrigger? completionTrigger;
+	private CompletionList? _completionList;
+	private Document? _completionResultDocument;
+	private CompletionTrigger? _completionTrigger;
 	private CompletionTrigger? _pendingCompletionTrigger;
-	private CompletionFilterReason? pendingCompletionFilterReason;
+	private CompletionFilterReason? _pendingCompletionFilterReason;
 	
 	private readonly List<string> _codeCompletionTriggers =
 	[
@@ -83,9 +83,9 @@ public partial class SharpIdeCodeEdit
     private void ResetCompletionPopupState()
     {
 	    _codeCompletionOptions = ImmutableArray<SharpIdeCompletionItem>.Empty;
-        completionList = null;
-        completionResultDocument = null;
-        completionTrigger = null;
+        _completionList = null;
+        _completionResultDocument = null;
+        _completionTrigger = null;
         _completionTriggerPosition = null;
         _codeCompletionCurrentSelected = 0;
         _codeCompletionForceItemCenter = -1;
@@ -93,10 +93,10 @@ public partial class SharpIdeCodeEdit
 
     private async Task CustomFilterCodeCompletionCandidates(CompletionFilterReason filterReason)
     {
-        if (completionList is null || completionList.ItemsList.Count is 0) return;
+        if (_completionList is null || _completionList.ItemsList.Count is 0) return;
         var cursorPosition = await this.InvokeAsync(() => GetCaretPosition());
         var linePosition = new LinePosition(cursorPosition.line, cursorPosition.col);
-        var filteredCompletions = RoslynAnalysis.FilterCompletions(_currentFile, Text, linePosition, completionList, completionTrigger!.Value, filterReason);
+        var filteredCompletions = RoslynAnalysis.FilterCompletions(_currentFile, Text, linePosition, _completionList, _completionTrigger!.Value, filterReason);
         _codeCompletionOptions = filteredCompletions;
         await this.InvokeAsync(QueueRedraw);
     }
@@ -113,8 +113,8 @@ public partial class SharpIdeCodeEdit
 		// We can't draw until we get this position
 		_completionTriggerPosition = await this.InvokeAsync(() => GetPosAtLineColumn(completionsResult.LinePosition.Line, completionsResult.LinePosition.Character));
 			
-		completionList = completionsResult.CompletionList;
-		completionResultDocument = completionsResult.Document;
+		_completionList = completionsResult.CompletionList;
+		_completionResultDocument = completionsResult.Document;
 		var filterReason = completionTrigger.Kind switch
 		{
 			CompletionTriggerKind.Insertion => CompletionFilterReason.Insertion,
@@ -130,7 +130,7 @@ public partial class SharpIdeCodeEdit
 	{
 		var selectedIndex = _codeCompletionCurrentSelected;
 		var completionItem = _codeCompletionOptions[selectedIndex];
-		var document = completionResultDocument;
+		var document = _completionResultDocument;
 		_ = Task.GodotRun(async () =>
 		{
 			Guard.Against.Null(document);
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions_InputHandling.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions_InputHandling.cs
index abde47f..29ca22c 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions_InputHandling.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit_Completions_InputHandling.cs
@@ -14,8 +14,8 @@ public partial class SharpIdeCodeEdit
         {
             if (@event.IsActionPressed(InputStringNames.CodeEditorRequestCompletions))
             {
-                completionTrigger = new CompletionTrigger(CompletionTriggerKind.InvokeAndCommitIfUnique);
-                CustomCodeCompletionRequested.InvokeParallelFireAndForget(completionTrigger!.Value, Text, GetCaretPosition());
+                _completionTrigger = new CompletionTrigger(CompletionTriggerKind.InvokeAndCommitIfUnique);
+                CustomCodeCompletionRequested.InvokeParallelFireAndForget(_completionTrigger!.Value, Text, GetCaretPosition());
                 return true;
             }
         }
@@ -67,7 +67,7 @@ public partial class SharpIdeCodeEdit
             }
             else if (@event.IsActionPressed(InputStringNames.Backspace))
             {
-                pendingCompletionFilterReason = CompletionFilterReason.Deletion;
+                _pendingCompletionFilterReason = CompletionFilterReason.Deletion;
                 return false;
             }
 
@@ -104,7 +104,7 @@ public partial class SharpIdeCodeEdit
             var unicodeString = char.ConvertFromUtf32((int)keyEvent.Unicode);
             if (isCodeCompletionPopupOpen && keyEvent.Unicode >= 32)
             {
-                pendingCompletionFilterReason = CompletionFilterReason.Insertion;
+                _pendingCompletionFilterReason = CompletionFilterReason.Insertion;
                 return false; // Let the text update happen
             }