diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 096bd8e394..f080d44d6a 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -728,6 +728,7 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
 IDCANCEL
@@ -800,7 +801,6 @@ invokecommand
 ipcmanager
 IPREVIEW
 ipreviewhandlervisualssetfont
-irdp
 IPTC
 irow
 irprops
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs
index 837246b731..75c63c5ae0 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs
@@ -113,10 +113,10 @@ public class FallbackRemoteDesktopItemTests
         return field.GetValue(command) as string ?? string.Empty;
     }
 
-    private static (FallbackRemoteDesktopItem Fallback, IRdpConnectionManager Manager) CreateFallback(params string[] connectionNames)
+    private static (FallbackRemoteDesktopItem Fallback, IRdpConnectionsManager Manager) CreateFallback(params string[] connectionNames)
     {
         var settingsManager = new MockSettingsManager(connectionNames);
-        var connectionsManager = new MockRDPConnectionsManager(settingsManager);
+        var connectionsManager = new MockRdpConnectionsManager(settingsManager);
 
         var fallback = new FallbackRemoteDesktopItem(connectionsManager);
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRDPConnectionsManager.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRdpConnectionsManager.cs
similarity index 84%
rename from src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRDPConnectionsManager.cs
rename to src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRdpConnectionsManager.cs
index 36c3151c6f..be1c961523 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRDPConnectionsManager.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRdpConnectionsManager.cs
@@ -10,13 +10,13 @@ using Microsoft.CmdPal.Ext.RemoteDesktop.Settings;
 
 namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
 
-internal sealed class MockRDPConnectionsManager : IRdpConnectionManager
+internal sealed class MockRdpConnectionsManager : IRdpConnectionsManager
 {
     private readonly List<ConnectionListItem> _connections = new();
 
     public IReadOnlyCollection<ConnectionListItem> Connections => _connections.AsReadOnly();
 
-    public MockRDPConnectionsManager(ISettingsInterface settingsManager)
+    public MockRdpConnectionsManager(ISettingsInterface settingsManager)
     {
         _connections.AddRange(settingsManager.PredefinedConnections.Select(ConnectionHelpers.MapToResult));
     }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RDPConnectionsManagerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RdpConnectionsManagerTests.cs
similarity index 93%
rename from src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RDPConnectionsManagerTests.cs
rename to src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RdpConnectionsManagerTests.cs
index dabea49a63..a8a48ba79c 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RDPConnectionsManagerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RdpConnectionsManagerTests.cs
@@ -10,13 +10,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
 
 [TestClass]
-public class RDPConnectionsManagerTests
+public class RdpConnectionsManagerTests
 {
     [TestMethod]
     public void Constructor_AddsOpenCommandItem()
     {
         // Act
-        var manager = new RDPConnectionsManager(new MockSettingsManager(["test.local"]));
+        var manager = new RdpConnectionsManager(new MockSettingsManager(["test.local"]));
 
         // Assert
         Assert.IsTrue(manager.Connections.Any(item => string.IsNullOrEmpty(item.ConnectionName)));
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs
index 415746670f..8579566b77 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs
@@ -23,9 +23,9 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem
         ];
 
     private static readonly CompositeFormat RemoteDesktopOpenHostFormat = CompositeFormat.Parse(Resources.remotedesktop_open_host);
-    private readonly IRdpConnectionManager _rdpConnectionsManager;
+    private readonly IRdpConnectionsManager _rdpConnectionsManager;
 
-    public FallbackRemoteDesktopItem(IRdpConnectionManager rdpConnectionsManager)
+    public FallbackRemoteDesktopItem(IRdpConnectionsManager rdpConnectionsManager)
     : base(new OpenRemoteDesktopCommand(string.Empty), Resources.remotedesktop_title)
     {
         _rdpConnectionsManager = rdpConnectionsManager;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRDPConnectionManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRdpConnectionsManager.cs
similarity index 90%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRDPConnectionManager.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRdpConnectionsManager.cs
index 4d04126dfb..2968e15c9c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRDPConnectionManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/IRdpConnectionsManager.cs
@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
 
 namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
 
-internal interface IRdpConnectionManager
+internal interface IRdpConnectionsManager
 {
     IReadOnlyCollection<ConnectionListItem> Connections { get; }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RDPConnectionsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RdpConnectionsManager.cs
similarity index 96%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RDPConnectionsManager.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RdpConnectionsManager.cs
index b9b7d62e1a..6e357e27d9 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RDPConnectionsManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Helper/RdpConnectionsManager.cs
@@ -13,7 +13,7 @@ using Microsoft.Win32;
 
 namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
 
-internal class RDPConnectionsManager : IRdpConnectionManager
+internal class RdpConnectionsManager : IRdpConnectionsManager
 {
     private readonly ISettingsInterface _settingsManager;
     private readonly ConnectionListItem _openRdpCommandListItem = new(string.Empty);
@@ -23,7 +23,7 @@ internal class RDPConnectionsManager : IRdpConnectionManager
     private const int MinutesToCache = 1;
     private DateTime? _connectionsLastLoaded;
 
-    public RDPConnectionsManager(ISettingsInterface settingsManager)
+    public RdpConnectionsManager(ISettingsInterface settingsManager)
     {
         _settingsManager = settingsManager;
         _settingsManager.Settings.SettingsChanged += (s, e) =>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Pages/RemoteDesktopListPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Pages/RemoteDesktopListPage.cs
index 42a0165277..c6ba2b3187 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Pages/RemoteDesktopListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Pages/RemoteDesktopListPage.cs
@@ -12,16 +12,16 @@ namespace Microsoft.CmdPal.Ext.RemoteDesktop.Pages;
 
 internal sealed partial class RemoteDesktopListPage : ListPage
 {
-    private readonly IRdpConnectionManager _rdpConnectionManager;
+    private readonly IRdpConnectionsManager _rdpConnectionsManager;
 
-    public RemoteDesktopListPage(IRdpConnectionManager rdpConnectionManager)
+    public RemoteDesktopListPage(IRdpConnectionsManager rdpConnectionsManager)
     {
         Icon = Icons.RDPIcon;
         Name = Resources.remotedesktop_title;
         Id = "com.microsoft.cmdpal.builtin.remotedesktop";
 
-        _rdpConnectionManager = rdpConnectionManager;
+        _rdpConnectionsManager = rdpConnectionsManager;
     }
 
-    public override IListItem[] GetItems() => _rdpConnectionManager.Connections.ToArray();
+    public override IListItem[] GetItems() => _rdpConnectionsManager.Connections.ToArray();
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs
index eefd467d5b..1ce307b301 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs
@@ -24,7 +24,7 @@ public partial class RemoteDesktopCommandProvider : CommandProvider
         Icon = Icons.RDPIcon;
 
         var settingsManager = new SettingsManager();
-        var rdpConnectionsManager = new RDPConnectionsManager(settingsManager);
+        var rdpConnectionsManager = new RdpConnectionsManager(settingsManager);
         var listPage = new RemoteDesktopListPage(rdpConnectionsManager);
 
         fallback = new FallbackRemoteDesktopItem(rdpConnectionsManager);