diff --git a/examples/fdc3-appdirectory/apps-with-intents.json b/examples/fdc3-appdirectory/apps-with-intents.json
index 86e225939..9b041318c 100644
--- a/examples/fdc3-appdirectory/apps-with-intents.json
+++ b/examples/fdc3-appdirectory/apps-with-intents.json
@@ -17,13 +17,6 @@
       "interop": {
         "intents": {
           "listensFor": {
-            "ViewChart": {
-              "name": "ViewChart",
-              "displayName": "ViewChart",
-              "contexts": [
-                "fdc3.instrument"
-              ]
-            }
           }
         }
       }
@@ -51,13 +44,6 @@
               "contexts": [
                 "fdc3.nothing"
               ]
-            },
-            "ViewChart": {
-              "name": "ViewChart",
-              "displayName": "ViewChart",
-              "contexts": [
-                "fdc3.instrument"
-              ]
             }
           },
           "raises": {}
@@ -87,13 +73,6 @@
               "contexts": [
                 "fdc3.testContext"
               ]
-            },
-            "ViewChart": {
-              "name": "ViewChart",
-              "displayName": "ViewChart",
-              "contexts": [
-                "fdc3.instrument"
-              ]
             }
           },
           "raises": {}
diff --git a/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUiRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUIRequest.cs
similarity index 100%
rename from src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUiRequest.cs
rename to src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUIRequest.cs
diff --git a/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUiResponse.cs b/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUIResponse.cs
similarity index 100%
rename from src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUiResponse.cs
rename to src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Contracts/ResolverUIResponse.cs
diff --git a/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/IResolverUiCommunicator.cs b/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/IResolverUICommunicator.cs
similarity index 100%
rename from src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/IResolverUiCommunicator.cs
rename to src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/IResolverUICommunicator.cs
diff --git a/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.cs b/src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Infrastructure/Internal/ResolverUIMessageRouterCommunicator.cs
similarity index 100%
rename from src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.cs
rename to src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Infrastructure/Internal/ResolverUIMessageRouterCommunicator.cs
diff --git a/src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.Tests.cs b/src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUIMessageRouterCommunicator.Tests.cs
similarity index 96%
rename from src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.Tests.cs
rename to src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUIMessageRouterCommunicator.Tests.cs
index 9b4fec385..7001af96a 100644
--- a/src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.Tests.cs
+++ b/src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUIMessageRouterCommunicator.Tests.cs
@@ -17,6 +17,7 @@
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
+using MorganStanley.ComposeUI.Messaging.Abstractions;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.Infrastructure.Internal;
@@ -57,7 +58,7 @@ public async Task SendResolverUIRequest_will_return_response()
                     It.IsAny<MessageBuffer>(),
                     It.IsAny<InvokeOptions>(),
                     It.IsAny<CancellationToken>()))
-            .Returns(ValueTask.FromResult<MessageBuffer?>(
+            .Returns(ValueTask.FromResult<IMessageBuffer?>(
                 MessageBuffer.Factory.CreateJson(new ResolverUIResponse()
                 {
                     AppMetadata = new AppMetadata(){ AppId = "testAppId" }
diff --git a/src/messaging/dotnet/src/Abstractions/IMessageBuffer.cs b/src/messaging/dotnet/src/Abstractions/IMessageBuffer.cs
index 669357e30..2b462069b 100644
--- a/src/messaging/dotnet/src/Abstractions/IMessageBuffer.cs
+++ b/src/messaging/dotnet/src/Abstractions/IMessageBuffer.cs
@@ -10,20 +10,19 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-namespace MorganStanley.ComposeUI.Messaging.Abstractions
+namespace MorganStanley.ComposeUI.Messaging.Abstractions;
+
+public interface IMessageBuffer
 {
-    public interface IMessageBuffer
-    {
-        /// <summary>
-        ///     Gets the bytes of the underlying buffer as a <see cref="ReadOnlySpan{T}" />
-        /// </summary>
-        /// <returns></returns>
-        ReadOnlySpan<byte> GetSpan();
+    /// <summary>
+    ///     Gets the bytes of the underlying buffer as a <see cref="ReadOnlySpan{T}" />
+    /// </summary>
+    /// <returns></returns>
+    ReadOnlySpan<byte> GetSpan();
 
-        /// <summary>
-        ///     Gets the string value of the buffer.
-        /// </summary>
-        /// <returns></returns>
-        string GetString();
-    }
-}
+    /// <summary>
+    ///     Gets the string value of the buffer.
+    /// </summary>
+    /// <returns></returns>
+    string GetString();
+}
\ No newline at end of file
diff --git a/src/messaging/dotnet/src/Abstractions/IMessagingService.cs b/src/messaging/dotnet/src/Abstractions/IMessagingService.cs
index 8d358ee8a..51c8f2359 100644
--- a/src/messaging/dotnet/src/Abstractions/IMessagingService.cs
+++ b/src/messaging/dotnet/src/Abstractions/IMessagingService.cs
@@ -10,84 +10,83 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-namespace MorganStanley.ComposeUI.Messaging.Abstractions
+namespace MorganStanley.ComposeUI.Messaging.Abstractions;
+
+public interface IMessagingService : IAsyncDisposable
 {
-    public interface IMessagingService : IAsyncDisposable
-    {
-        /// <summary>
-        /// Gets the client ID of the current connection.
-        /// </summary>
-        /// <remarks>
-        /// The returned value will be <value>null</value> if the client is not connected.
-        /// </remarks>
-        string? ClientId { get; }
+    /// <summary>
+    /// Gets the client ID of the current connection.
+    /// </summary>
+    /// <remarks>
+    /// The returned value will be <value>null</value> if the client is not connected.
+    /// </remarks>
+    string? ClientId { get; }
 
-        /// <summary>
-        /// Asynchronously connects to the Message Router server endpoint.
-        /// </summary>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Clients don't need to call this method before calling other methods on this type.
-        /// The client should automatically establish a connection when needed.
-        /// </remarks>
-        ValueTask ConnectAsync(CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Asynchronously connects to the Message Router server endpoint.
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    /// <remarks>
+    /// Clients don't need to call this method before calling other methods on this type.
+    /// The client should automatically establish a connection when needed.
+    /// </remarks>
+    ValueTask ConnectAsync(CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets an observable that represents a topic.
-        /// </summary>
-        /// <param name="topic"></param>
-        /// <param name="subscriber"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        ValueTask<IAsyncDisposable> SubscribeAsync(string topic, 
-            Func<IMessageBuffer, ValueTask> subscriber, 
-            CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets an observable that represents a topic.
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <param name="subscriber"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    ValueTask<IAsyncDisposable> SubscribeAsync(string topic, 
+        Func<IMessageBuffer, ValueTask> subscriber, 
+        CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Publishes a message to a topic.
-        /// </summary>
-        /// <param name="topic"></param>
-        /// <param name="payload"></param>
-        /// <param name="options"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        ValueTask PublishAsync(string topic, 
-            IMessageBuffer? message = null, 
-            PublishOptions optinos = default, 
-            CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Publishes a message to a topic.
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <param name="payload"></param>
+    /// <param name="options"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    ValueTask PublishAsync(string topic, 
+        IMessageBuffer? message = null, 
+        PublishOptions optinos = default, 
+        CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Registers a service by providing a name and handler.
-        /// </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="subscriber"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        ValueTask RegisterServiceAsync(string endpoint,
-            Func<string, IMessageBuffer?, MessageContext?, ValueTask<IMessageBuffer?>> subscriber,
-            CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Registers a service by providing a name and handler.
+    /// </summary>
+    /// <param name="endpoint"></param>
+    /// <param name="subscriber"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    ValueTask RegisterServiceAsync(string endpoint,
+        Func<string, IMessageBuffer?, MessageContext?, ValueTask<IMessageBuffer?>> subscriber,
+        CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Removes a service registration.
-        /// </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        ValueTask UnregisterServiceAsync(string endpoint, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Removes a service registration.
+    /// </summary>
+    /// <param name="endpoint"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    ValueTask UnregisterServiceAsync(string endpoint, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        ///     Invokes a named service.
-        /// </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="payload"></param>
-        /// <param name="options"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        ValueTask<IMessageBuffer?> InvokeAsync(
-            string endpoint,
-            IMessageBuffer? payload = null,
-            InvokeOptions options = default,
-            CancellationToken cancellationToken = default);
-    }
-}
+    /// <summary>
+    ///     Invokes a named service.
+    /// </summary>
+    /// <param name="endpoint"></param>
+    /// <param name="payload"></param>
+    /// <param name="options"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    ValueTask<IMessageBuffer?> InvokeAsync(
+        string endpoint,
+        IMessageBuffer? payload = null,
+        InvokeOptions options = default,
+        CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell.sln b/src/shell/dotnet/Shell.sln
index 64f25b434..57056cef2 100644
--- a/src/shell/dotnet/Shell.sln
+++ b/src/shell/dotnet/Shell.sln
@@ -53,6 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{1944F009-EA2D-4D
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MorganStanley.ComposeUI.Messaging.Abstractions", "..\..\messaging\dotnet\src\Abstractions\MorganStanley.ComposeUI.Messaging.Abstractions.csproj", "{F90449AE-B26E-42E0-873B-4F0CAE6FCD98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -107,6 +109,10 @@ Global
 		{24E64AFE-D2C5-487D-85F3-B0CE5AC0A128}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24E64AFE-D2C5-487D-85F3-B0CE5AC0A128}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{24E64AFE-D2C5-487D-85F3-B0CE5AC0A128}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F90449AE-B26E-42E0-873B-4F0CAE6FCD98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F90449AE-B26E-42E0-873B-4F0CAE6FCD98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F90449AE-B26E-42E0-873B-4F0CAE6FCD98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F90449AE-B26E-42E0-873B-4F0CAE6FCD98}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -125,6 +131,7 @@ Global
 		{24E64AFE-D2C5-487D-85F3-B0CE5AC0A128} = {DA1A43C4-F758-47E2-870A-7E5BBB946671}
 		{B7A04459-C612-447F-9245-75DFAF23C31D} = {DA1A43C4-F758-47E2-870A-7E5BBB946671}
 		{56F41D4A-5A4C-4F41-86CA-1B003992F083} = {DA1A43C4-F758-47E2-870A-7E5BBB946671}
+		{F90449AE-B26E-42E0-873B-4F0CAE6FCD98} = {E7A2C581-4BF4-47A5-8A11-59B2DEBADCA7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C901E6C-4B9A-48C2-AB16-461040DC57B4}
diff --git a/src/shell/dotnet/Shell/App.xaml.cs b/src/shell/dotnet/Shell/App.xaml.cs
index 1d6ab1247..8d5a151e1 100644
--- a/src/shell/dotnet/Shell/App.xaml.cs
+++ b/src/shell/dotnet/Shell/App.xaml.cs
@@ -201,7 +201,7 @@ void ConfigureFdc3()
                 services.AddFdc3AppDirectory();
                 services.AddSingleton<Fdc3ResolverUIWindow>();
                 services.AddSingleton<IResolverUIProjector>(p => p.GetRequiredService<Fdc3ResolverUIWindow>());
-                services.AddHostedService<Fdc3ResolverUIService>();
+                services.AddHostedService<ResolverUIService>();
                 services.Configure<Fdc3Options>(fdc3ConfigurationSection);
                 services.Configure<Fdc3DesktopAgentOptions>(
                     fdc3ConfigurationSection.GetSection(nameof(fdc3Options.DesktopAgent)));
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIViewModel.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIViewModel.cs
similarity index 87%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIViewModel.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIViewModel.cs
index 035546343..70c3f97cc 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIViewModel.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIViewModel.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 using System.Threading;
 using System.Windows.Controls;
@@ -22,35 +23,33 @@
 using CommunityToolkit.Mvvm.Input;
 using Finos.Fdc3;
 using MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages;
-using Size = System.Drawing.Size;
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
 internal class Fdc3ResolverUIViewModel : INotifyPropertyChanged, IDisposable
 {
-    private readonly CancellationTokenSource _userCancellationTokenSource;
+    private readonly Page _advancedResolverUIPage;
+    private readonly Size _advancedResolverUISize = new(width: 800, height: 600);
     private readonly List<ResolverUIAppData> _appData = new();
     private readonly Page _simpleResolverUIPage;
-    private readonly Size _simpleResolverUISize = new(500, 400);
-    private readonly Page _advancedResolverUIPage;
-    private readonly Size _advancedResolverUISize = new(800, 600);
+    private readonly Size _simpleResolverUISize = new(width: 500, height: 400);
+    private readonly CancellationTokenSource _userCancellationTokenSource;
+    private double _currentHeight;
     private Page _currentPage;
     private double _currentWidth;
-    private double _currentHeight;
-
-    internal CancellationToken UserCancellationToken => _userCancellationTokenSource.Token;
 
     public Fdc3ResolverUIViewModel(IEnumerable<IAppMetadata> apps)
     {
-        _userCancellationTokenSource = new();
+        _userCancellationTokenSource = new CancellationTokenSource();
 
         foreach (var app in apps)
         {
-            _appData.Add(new()
-            {
-                AppMetadata = app,
-                Icon = app.Icons.FirstOrDefault() //First Icon from the array will be shown on the ResolverUI
-            });
+            _appData.Add(
+                new ResolverUIAppData
+                {
+                    AppMetadata = app,
+                    Icon = app.Icons.FirstOrDefault() //First Icon from the array will be shown on the ResolverUI
+                });
         }
 
         _simpleResolverUIPage = new SimpleResolverUIPage(_appData);
@@ -62,11 +61,7 @@ public Fdc3ResolverUIViewModel(IEnumerable<IAppMetadata> apps)
         OpenAdvancedViewCommand = new RelayCommand(SetCurrentPageToAdvancedView);
     }
 
-    private void SetCurrentSize(Size size)
-    {
-        CurrentWidth = size.Width;
-        CurrentHeight = size.Height;
-    }
+    internal CancellationToken UserCancellationToken => _userCancellationTokenSource.Token;
 
     public Page CurrentPage
     {
@@ -78,19 +73,6 @@ public Page CurrentPage
         }
     }
 
-    private void SetCurrentPageToSimpleView()
-    {
-        CurrentPage = _simpleResolverUIPage;
-
-        SetCurrentSize(_simpleResolverUISize);
-    }
-
-    private void SetCurrentPageToAdvancedView()
-    {
-        CurrentPage = _advancedResolverUIPage;
-        SetCurrentSize(_advancedResolverUISize);
-    }
-
     public ICommand OpenSimpleViewCommand { get; }
     public ICommand OpenAdvancedViewCommand { get; }
 
@@ -114,21 +96,40 @@ public double CurrentHeight
         }
     }
 
+    public void Dispose()
+    {
+        _userCancellationTokenSource.Cancel();
+        _userCancellationTokenSource.Dispose();
+    }
+
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    protected virtual void OnPropertyChanged(string propertyName)
+    private void SetCurrentSize(Size size)
     {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        CurrentWidth = size.Width;
+        CurrentHeight = size.Height;
     }
 
-    internal void CancelDialog()
+    private void SetCurrentPageToSimpleView()
     {
-        _userCancellationTokenSource.Cancel();
+        CurrentPage = _simpleResolverUIPage;
+
+        SetCurrentSize(_simpleResolverUISize);
     }
 
-    public void Dispose()
+    private void SetCurrentPageToAdvancedView()
+    {
+        CurrentPage = _advancedResolverUIPage;
+        SetCurrentSize(_advancedResolverUISize);
+    }
+
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    internal void CancelDialog()
     {
         _userCancellationTokenSource.Cancel();
-        _userCancellationTokenSource.Dispose();
     }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIWindow.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIWindow.cs
similarity index 72%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIWindow.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIWindow.cs
index f1f84cf13..955c8ee1d 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIWindow.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Fdc3ResolverUIWindow.cs
@@ -33,33 +33,34 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
         {
             var dispatcher = Application.Current.Dispatcher;
 
-            Fdc3ResolverUI? resolverUI = null;
+            ResolverUI? resolverUI = null;
             Task? timeoutTask = null;
 
-            dispatcher.Invoke(() =>
-            {
-                if (dispatcher.HasShutdownStarted
-                    || dispatcher.HasShutdownFinished)
+            dispatcher.Invoke(
+                () =>
                 {
-                    return;
-                }
+                    if (dispatcher.HasShutdownStarted
+                        || dispatcher.HasShutdownFinished)
+                    {
+                        return;
+                    }
 
-                resolverUI = new Fdc3ResolverUI(apps);
+                    resolverUI = new ResolverUI(apps);
 
-                timeoutTask = Task.Delay(timeout)
-                    .ContinueWith((task) => resolverUI?.Close(), TaskScheduler.FromCurrentSynchronizationContext());
+                    timeoutTask = Task.Delay(timeout)
+                        .ContinueWith(task => resolverUI?.Close(), TaskScheduler.FromCurrentSynchronizationContext());
 
-                resolverUI.ShowDialog();
-            });
+                    resolverUI.ShowDialog();
+                });
 
             //First we need to check if the timeout happened
             if (timeoutTask != null
                 && timeoutTask.IsCompletedSuccessfully)
             {
                 return ValueTask.FromResult(
-                    new ResolverUIResponse()
+                    new ResolverUIResponse
                     {
-                        Error = ResolveError.ResolverTimeout,
+                        Error = ResolveError.ResolverTimeout
                     });
             }
 
@@ -67,14 +68,14 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
                 && resolverUI.UserCancellationToken.IsCancellationRequested)
             {
                 return ValueTask.FromResult(
-                    new ResolverUIResponse()
+                    new ResolverUIResponse
                     {
-                        Error = ResolveError.UserCancelledResolution,
+                        Error = ResolveError.UserCancelledResolution
                     });
             }
 
             return ValueTask.FromResult(
-                new ResolverUIResponse()
+                new ResolverUIResponse
                 {
                     AppMetadata = resolverUI?.AppMetadata
                 });
@@ -82,23 +83,23 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
         catch (TimeoutException)
         {
             return ValueTask.FromResult(
-                new ResolverUIResponse()
+                new ResolverUIResponse
                 {
-                    Error = ResolveError.ResolverTimeout,
+                    Error = ResolveError.ResolverTimeout
                 });
         }
         catch (Exception exception)
         {
             if (_logger.IsEnabled(LogLevel.Error))
             {
-                _logger.LogError(exception, $"Exception thrown while showing ResolverUi.");
+                _logger.LogError(exception, message: "Exception thrown while showing ResolverUi.");
             }
 
             return ValueTask.FromResult(
-                new ResolverUIResponse()
+                new ResolverUIResponse
                 {
                     Error = ResolveError.ResolverUnavailable
                 });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/IResolverUIProjector.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/IResolverUIProjector.cs
similarity index 88%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/IResolverUIProjector.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/IResolverUIProjector.cs
index 218425fec..d048e31db 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/IResolverUIProjector.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/IResolverUIProjector.cs
@@ -21,15 +21,15 @@
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
 /// <summary>
-/// Abstraction for showing the ResolverUI for the raised intent.
+///     Abstraction for showing the ResolverUI for the raised intent.
 /// </summary>
 public interface IResolverUIProjector
 {
     /// <summary>
-    /// Shows ResolverUi for the user to select an module to resolve the raised intent.
+    ///     Shows ResolverUi for the user to select an module to resolve the raised intent.
     /// </summary>
     /// <param name="apps">Possible modules to resolve the intent.</param>
     /// <param name="timeout">Configurable timeout to show the blocking window for the set of time.</param>
     /// <returns></returns>
     ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> apps, TimeSpan timeout);
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/ImageSourceConverter.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ImageSourceConverter.cs
similarity index 94%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/ImageSourceConverter.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ImageSourceConverter.cs
index f9142b205..e866bfbe0 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/ImageSourceConverter.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ImageSourceConverter.cs
@@ -18,6 +18,7 @@
 using System.Windows.Media.Imaging;
 using Finos.Fdc3;
 using MorganStanley.ComposeUI.Shell.Utilities;
+using Icon = System.Drawing.Icon;
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
@@ -56,13 +57,13 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             }
 
             using var nativeIcon =
-                System.Drawing.Icon.ExtractAssociatedIcon(path);
+                Icon.ExtractAssociatedIcon(path);
 
             if (icon != null)
             {
                 using var bitmap = nativeIcon.ToBitmap();
 
-                return (BitmapImage)bitmap.ToImageSource();
+                return (BitmapImage) bitmap.ToImageSource();
             }
 
             return null;
@@ -78,4 +79,4 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
     {
         throw new NotImplementedException();
     }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml
similarity index 75%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml
index b3bc31297..e16cf95eb 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml
@@ -11,24 +11,23 @@ See the License for the specific language governing permissions and limitations
 <Page x:Class="MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages.AdvancedResolverUIPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mainNamespace="clr-namespace:MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI"
-      mc:Ignorable="d" 
+      mc:Ignorable="d"
       ShowsNavigationUI="False"
       Title="AdvancedResolverUIPage">
     <Page.Resources>
 
         <Style TargetType="DataGrid">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="RowBackground" Value="Transparent"/>
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="RowBackground" Value="Transparent" />
             <Setter Property="ColumnHeaderStyle">
                 <Setter.Value>
                     <Style TargetType="DataGridColumnHeader">
-                        <Setter Property="Background" Value="Transparent"/>
-                        <Setter Property="BorderBrush" Value="Transparent"/>
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="BorderBrush" Value="Transparent" />
                         <Setter Property="VerticalAlignment" Value="Center" />
                         <Setter Property="HorizontalAlignment" Value="Center" />
                     </Style>
@@ -37,25 +36,25 @@ See the License for the specific language governing permissions and limitations
             <Setter Property="CellStyle">
                 <Setter.Value>
                     <Style TargetType="DataGridCell">
-                        <Setter Property="Background" Value="Transparent"/>
-                        <Setter Property="FontWeight" Value="SemiBold"/>
-                        <Setter Property="BorderBrush" Value="Transparent"/>
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="FontWeight" Value="SemiBold" />
+                        <Setter Property="BorderBrush" Value="Transparent" />
                     </Style>
                 </Setter.Value>
             </Setter>
         </Style>
 
         <Style TargetType="DataGridRow">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
             <Style.Triggers>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="Gray"/>
+                    <Setter Property="Background" Value="Gray" />
                 </Trigger>
             </Style.Triggers>
         </Style>
 
-        <mainNamespace:ImageSourceConverter x:Key="ImageSourceConverter"/>
+        <mainNamespace:ImageSourceConverter x:Key="ImageSourceConverter" />
 
     </Page.Resources>
 
@@ -70,12 +69,12 @@ See the License for the specific language governing permissions and limitations
                 <RowDefinition Height="75" />
             </Grid.RowDefinitions>
 
-            <DataGrid 
+            <DataGrid
                 x:Name="ResolverUIDataSource"
                 ItemsSource="{Binding Apps}"
-                HorizontalAlignment="Center" 
-                VerticalAlignment="Top" 
-                IsReadOnly="True" 
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                IsReadOnly="True"
                 SelectionMode="Single"
                 SelectedItem="{Binding SelectedApp, Mode=TwoWay}"
                 MouseDoubleClick="ResolverUIDataSource_OnMouseDoubleClick"
@@ -85,10 +84,11 @@ See the License for the specific language governing permissions and limitations
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column"
                 RowStyle="{StaticResource {x:Type DataGridRow}}"
-                Grid.Row="1" >
+                Grid.Row="1">
 
                 <DataGrid.Resources>
-                    <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                    <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader"
+                           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="Height" Value="50" />
                         <Setter Property="FontWeight" Value="Bold" />
@@ -102,7 +102,8 @@ See the License for the specific language governing permissions and limitations
 
                 <DataGrid.Columns>
 
-                    <DataGridTemplateColumn Header="Icon" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" MinWidth="50">
+                    <DataGridTemplateColumn Header="Icon" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}"
+                                            MinWidth="50">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <Image Source="{Binding Path=Icon, Converter={StaticResource ImageSourceConverter}}" />
@@ -110,17 +111,23 @@ See the License for the specific language governing permissions and limitations
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
 
-                    <DataGridTextColumn Header="AppId" Binding="{Binding Path=AppMetadata.AppId}" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
-                    <DataGridTextColumn Header="Name" Binding="{Binding Path=AppMetadata.Name}" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
-                    <DataGridTextColumn Header="InstanceId" Binding="{Binding Path=AppMetadata.InstanceId}" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="250" />
-                    <DataGridTextColumn Header="Version" Binding="{Binding Path=AppMetadata.Version}" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" Visibility="Hidden" />
-                    <DataGridTextColumn Header="ResultType" Binding="{Binding Path=AppMetadata.ResultType}" HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
+                    <DataGridTextColumn Header="AppId" Binding="{Binding Path=AppMetadata.AppId}"
+                                        HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
+                    <DataGridTextColumn Header="Name" Binding="{Binding Path=AppMetadata.Name}"
+                                        HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
+                    <DataGridTextColumn Header="InstanceId" Binding="{Binding Path=AppMetadata.InstanceId}"
+                                        HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="250" />
+                    <DataGridTextColumn Header="Version" Binding="{Binding Path=AppMetadata.Version}"
+                                        HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100"
+                                        Visibility="Hidden" />
+                    <DataGridTextColumn Header="ResultType" Binding="{Binding Path=AppMetadata.ResultType}"
+                                        HeaderStyle="{StaticResource DataGridColumnHeaderStyle}" Width="100" />
                 </DataGrid.Columns>
 
             </DataGrid>
 
         </Grid>
-        
+
     </Border>
-    
-</Page>
+
+</Page>
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml.cs
similarity index 94%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml.cs
index d60edbe8e..46e3d30b5 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/AdvancedResolverUiPage.xaml.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/AdvancedResolverUIPage.xaml.cs
@@ -16,11 +16,10 @@
 using System.Windows.Input;
 using Finos.Fdc3;
 
-
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages;
 
 /// <summary>
-/// Interaction logic for AdvancedResolverUIPage.xaml
+///     Interaction logic for AdvancedResolverUIPage.xaml
 /// </summary>
 public partial class AdvancedResolverUIPage : Page, IPageService
 {
@@ -37,7 +36,7 @@ public AdvancedResolverUIPage(IEnumerable<ResolverUIAppData> apps)
     public void ClosePage(IAppMetadata appMetadata)
     {
         var window = Window.GetWindow(this);
-        if (window is Fdc3ResolverUI resolverUIWindow)
+        if (window is ResolverUI resolverUIWindow)
         {
             resolverUIWindow.AppMetadata = appMetadata;
             resolverUIWindow.Close();
@@ -59,4 +58,4 @@ private void ResolverUIDataSource_OnMouseDoubleClick(object sender, MouseButtonE
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/IPageService.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/IPageService.cs
similarity index 100%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/IPageService.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/IPageService.cs
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/ResolverUIPageViewModel.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/ResolverUIPageViewModel.cs
similarity index 93%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/ResolverUIPageViewModel.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/ResolverUIPageViewModel.cs
index af40d9fce..0d3fa5483 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/ResolverUIPageViewModel.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/ResolverUIPageViewModel.cs
@@ -21,10 +21,10 @@ namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages;
 
 internal class ResolverUIPageViewModel : INotifyPropertyChanged
 {
-    private IEnumerable<ResolverUIAppData> _apps;
+    private readonly IEnumerable<ResolverUIAppData> _apps;
+    private readonly RelayCommand<string> _openAppCommand;
     private readonly IPageService _pageService;
     private ResolverUIAppData? _selectedApp;
-    private readonly RelayCommand<string> _openAppCommand;
 
     public ResolverUIPageViewModel(
         IPageService pageService,
@@ -36,17 +36,6 @@ public ResolverUIPageViewModel(
         OpenApp = new RelayCommand<string>(ExecuteOpenApp);
     }
 
-    public void DoubleClickListBox(ResolverUIAppData? appMetadata)
-    {
-        if (appMetadata == null)
-        {
-            return;
-        }
-
-        SelectedApp = appMetadata;
-        _pageService.ClosePage(SelectedApp.AppMetadata);
-    }
-
     public ResolverUIAppData? SelectedApp
     {
         get => _selectedApp;
@@ -78,6 +67,21 @@ private init
         }
     }
 
+    public ICommand SelectAppMetadata { get; }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public void DoubleClickListBox(ResolverUIAppData? appMetadata)
+    {
+        if (appMetadata == null)
+        {
+            return;
+        }
+
+        SelectedApp = appMetadata;
+        _pageService.ClosePage(SelectedApp.AppMetadata);
+    }
+
     private void ExecuteOpenApp(string? appId)
     {
         if (appId == null)
@@ -85,7 +89,8 @@ private void ExecuteOpenApp(string? appId)
             return;
         }
 
-        var app = Apps.FirstOrDefault(x => x.AppMetadata.AppId == appId && string.IsNullOrEmpty(x.AppMetadata.InstanceId));
+        var app = Apps.FirstOrDefault(
+            x => x.AppMetadata.AppId == appId && string.IsNullOrEmpty(x.AppMetadata.InstanceId));
         if (app == default)
         {
             return;
@@ -94,10 +99,6 @@ private void ExecuteOpenApp(string? appId)
         _pageService.ClosePage(app.AppMetadata);
     }
 
-    public ICommand SelectAppMetadata { get; }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
     protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml
similarity index 89%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml
index cf8aec609..e98d651d5 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml
@@ -11,12 +11,10 @@ See the License for the specific language governing permissions and limitations
 <Page x:Class="MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages.SimpleResolverUIPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mainNamespace="clr-namespace:MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI"
-      mc:Ignorable="d" 
+      mc:Ignorable="d"
       MinHeight="500"
       MinWidth="500"
       ShowsNavigationUI="False"
@@ -24,19 +22,19 @@ See the License for the specific language governing permissions and limitations
       Title="SimpleResolverUIPage">
 
     <Page.Resources>
-        <mainNamespace:ImageSourceConverter x:Key="ImageSourceConverter"/>
+        <mainNamespace:ImageSourceConverter x:Key="ImageSourceConverter" />
 
         <DataTemplate x:Key="NormalDataTemplate">
             <StackPanel Orientation="Horizontal">
                 <Image Source="{Binding Icon, Converter={StaticResource ImageSourceConverter}}" Margin="5" />
-                <TextBlock Text="{Binding AppMetadata.AppId}" Margin="5"/>
+                <TextBlock Text="{Binding AppMetadata.AppId}" Margin="5" />
             </StackPanel>
         </DataTemplate>
 
         <DataTemplate x:Key="NullInstanceIdDataTemplate">
             <StackPanel Orientation="Horizontal">
                 <Image Source="{Binding Icon, Converter={StaticResource ImageSourceConverter}}" Margin="5" />
-                <TextBlock Text="Start New " Margin="5,0,0,0"/>
+                <TextBlock Text="Start New " Margin="5,0,0,0" />
                 <TextBlock Text="{Binding AppMetadata.AppId}" Margin="0,0,0,0" />
             </StackPanel>
         </DataTemplate>
@@ -44,17 +42,17 @@ See the License for the specific language governing permissions and limitations
         <mainNamespace:ResolverUIDataTemplateSelector
             x:Key="DataTemplateSelector"
             NormalDataTemplate="{StaticResource NormalDataTemplate}"
-            NullInstanceIdDataTemplate="{StaticResource NullInstanceIdDataTemplate}"/>
+            NullInstanceIdDataTemplate="{StaticResource NullInstanceIdDataTemplate}" />
 
     </Page.Resources>
 
     <Border
         x:Name="ResolverUIBorder"
         Background="Transparent">
-        
+
         <Grid
             Background="Transparent">
-            
+
             <ListBox
                 x:Name="ResolverUIDataSource"
                 Background="Transparent"
@@ -66,4 +64,4 @@ See the License for the specific language governing permissions and limitations
                 ItemTemplateSelector="{StaticResource DataTemplateSelector}" />
         </Grid>
     </Border>
-</Page>
+</Page>
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml.cs
similarity index 94%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml.cs
index a04fc0b38..ab4a1239b 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Pages/SimpleResolverUiPage.xaml.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/Pages/SimpleResolverUIPage.xaml.cs
@@ -19,7 +19,7 @@
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages;
 
 /// <summary>
-/// Interaction logic for SimpleResolverUIPage.xaml
+///     Interaction logic for SimpleResolverUIPage.xaml
 /// </summary>
 public partial class SimpleResolverUIPage : Page, IPageService
 {
@@ -36,7 +36,7 @@ public SimpleResolverUIPage(IEnumerable<ResolverUIAppData> apps)
     public void ClosePage(IAppMetadata? appMetadata)
     {
         var window = Window.GetWindow(this);
-        if (window is Fdc3ResolverUI resolverUIWindow)
+        if (window is ResolverUI resolverUIWindow)
         {
             resolverUIWindow.AppMetadata = appMetadata;
             resolverUIWindow.Close();
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml
similarity index 70%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml
index a1e51f79b..2c2e442ec 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml
@@ -8,13 +8,12 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND
 See the License for the specific language governing permissions and limitations under the License.
 ********************************************************************************************************
 -->
-<Window x:Class="MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Fdc3ResolverUI"
+<Window x:Class="MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.ResolverUI"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI"
-        mc:Ignorable="d" 
+        mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResizeWithGrip"
         WindowStyle="None"
@@ -26,13 +25,13 @@ See the License for the specific language governing permissions and limitations
         Width="{Binding CurrentWidth, Mode=TwoWay}">
 
     <Border>
-        <Grid 
+        <Grid
             x:Name="MainGrid">
 
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <TextBlock
@@ -44,26 +43,30 @@ See the License for the specific language governing permissions and limitations
                 Margin="40,10,0,0"
                 Grid.Row="0" />
 
-            <StackPanel Orientation="Horizontal" Height="40" VerticalAlignment="Top" HorizontalAlignment="Center" Grid.Row="0">
-                <Button x:Name="SimpleResolverUiViewButton" Content="Simple" MinWidth="90" Margin="300,15,0,0" Command="{Binding OpenSimpleViewCommand}"/>
-                <Button x:Name="AdvancedResolverUiViewButton" Content="Advanced" MinWidth="90" Margin="10,15,90,0" Command="{Binding OpenAdvancedViewCommand}"/>
+            <StackPanel Orientation="Horizontal" Height="40" VerticalAlignment="Top" HorizontalAlignment="Center"
+                        Grid.Row="0">
+                <Button x:Name="SimpleResolverUiViewButton" Content="Simple" MinWidth="90" Margin="300,15,0,0"
+                        Command="{Binding OpenSimpleViewCommand}" />
+                <Button x:Name="AdvancedResolverUiViewButton" Content="Advanced" MinWidth="90" Margin="10,15,90,0"
+                        Command="{Binding OpenAdvancedViewCommand}" />
             </StackPanel>
 
-            <Frame x:Name="ResolverUiFrame" Margin="0,45,0,0" Grid.Row="1" NavigationUIVisibility="Hidden" Content="{Binding CurrentPage}"/>
+            <Frame x:Name="ResolverUiFrame" Margin="0,45,0,0" Grid.Row="1" NavigationUIVisibility="Hidden"
+                   Content="{Binding CurrentPage}" />
 
-            <Button 
-                x:Name="CancelButton" 
-                Content="Cancel" 
-                HorizontalAlignment="Right" 
-                VerticalAlignment="Bottom" 
+            <Button
+                x:Name="CancelButton"
+                Content="Cancel"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
                 Margin="0,0,40,30"
-                Click="CancelButton_Click" 
-                IsCancel="True" 
+                Click="CancelButton_Click"
+                IsCancel="True"
                 Width="80"
                 MinHeight="30"
-                Grid.Row="2"/>
+                Grid.Row="2" />
 
         </Grid>
     </Border>
-    
-</Window>
+
+</Window>
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml.cs
similarity index 90%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml.cs
index 9dfc96acb..d84e91207 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUI.xaml.cs
@@ -21,16 +21,13 @@
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
 /// <summary>
-/// Interaction logic for Fdc3ResolverUi.xaml
+///     Interaction logic for Fdc3ResolverUi.xaml
 /// </summary>
-public partial class Fdc3ResolverUI : Window, IDisposable
+public partial class ResolverUI : Window, IDisposable
 {
     private readonly Fdc3ResolverUIViewModel _viewModel;
 
-    public IAppMetadata? AppMetadata { get; internal set; }
-    public CancellationToken UserCancellationToken => _viewModel.UserCancellationToken;
-
-    public Fdc3ResolverUI(IEnumerable<IAppMetadata> apps)
+    public ResolverUI(IEnumerable<IAppMetadata> apps)
     {
         InitializeComponent();
 
@@ -38,6 +35,14 @@ public Fdc3ResolverUI(IEnumerable<IAppMetadata> apps)
         DataContext = _viewModel;
     }
 
+    public IAppMetadata? AppMetadata { get; internal set; }
+    public CancellationToken UserCancellationToken => _viewModel.UserCancellationToken;
+
+    public void Dispose()
+    {
+        _viewModel.Dispose();
+    }
+
     protected override void OnClosing(CancelEventArgs e)
     {
         base.OnClosing(e);
@@ -55,16 +60,11 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
         Close();
     }
 
-    public void Dispose()
-    {
-        _viewModel.Dispose();
-    }
-
     private void Window_MouseDown(object sender, MouseButtonEventArgs e)
     {
         if (e.ChangedButton == MouseButton.Left)
-        { 
-            DragMove(); 
+        {
+            DragMove();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/ResolverUIAppData.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIAppData.cs
similarity index 84%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/ResolverUIAppData.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIAppData.cs
index 44577a91e..fd4782829 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/ResolverUIAppData.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIAppData.cs
@@ -15,17 +15,17 @@
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
 /// <summary>
-/// Model containing information about the app that can resolve the intent.
+///     Model containing information about the app that can resolve the intent.
 /// </summary>
 public class ResolverUIAppData
 {
     /// <summary>
-    /// App specific information.
+    ///     App specific information.
     /// </summary>
     public IAppMetadata AppMetadata { get; set; }
 
     /// <summary>
-    /// Icon that can be visualized on the ResolverUI.
+    ///     Icon that can be visualized on the ResolverUI.
     /// </summary>
     public IIcon? Icon { get; set; }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/ResolverUIDataTemplateSelector.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIDataTemplateSelector.cs
similarity index 100%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/ResolverUIDataTemplateSelector.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIDataTemplateSelector.cs
diff --git a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUiService.cs b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIService.cs
similarity index 73%
rename from src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUiService.cs
rename to src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIService.cs
index 03926fe01..c1d5c4b0d 100644
--- a/src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUiService.cs
+++ b/src/shell/dotnet/Shell/Fdc3/ResolverUI/ResolverUIService.cs
@@ -25,19 +25,21 @@
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
-internal class Fdc3ResolverUIService : IHostedService
+internal class ResolverUIService : IHostedService
 {
+    private readonly object _disposeLock = new();
+
+    private readonly List<Func<ValueTask>> _disposeTask = new();
     private readonly IHost _host;
-    private readonly IResolverUIProjector _resolverUIWindow;
+
     private readonly JsonSerializerOptions _jsonSerializerOptions = new()
     {
-        Converters = { new AppMetadataJsonConverter(), new IconJsonConverter() },
+        Converters = {new AppMetadataJsonConverter(), new IconJsonConverter()}
     };
 
-    private readonly List<Func<ValueTask>> _disposeTask = new();
-    private readonly object _disposeLock = new();
+    private readonly IResolverUIProjector _resolverUIWindow;
 
-    public Fdc3ResolverUIService(
+    public ResolverUIService(
         IHost host,
         IResolverUIProjector resolverUIWindow)
     {
@@ -50,35 +52,57 @@ public async Task StartAsync(CancellationToken cancellationToken)
         await StartMessageRouterServiceAsync(cancellationToken);
     }
 
+    public async Task StopAsync(CancellationToken cancellationToken)
+    {
+        Func<ValueTask>[]? reversedList = null;
+
+        lock (_disposeLock)
+        {
+            reversedList = _disposeTask.AsEnumerable().Reverse().ToArray();
+        }
+
+
+        if (reversedList != null)
+        {
+            for (var i = 0; i < reversedList.Length; i++)
+            {
+                await reversedList[i].Invoke();
+            }
+        }
+    }
+
     private async Task StartMessageRouterServiceAsync(CancellationToken cancellationToken)
     {
         var messageRouter = _host.Services.GetRequiredService<IMessageRouter>();
         var topic = "ComposeUI/fdc3/v2.0/resolverUI";
 
-        await messageRouter.RegisterServiceAsync(topic,
-                async (endpoint, payload, context) =>
+        await messageRouter.RegisterServiceAsync(
+            topic,
+            async (endpoint, payload, context) =>
+            {
+                var request = payload?.ReadJson<ResolverUIRequest>(_jsonSerializerOptions);
+                if (request == null)
                 {
-                    var request = payload?.ReadJson<ResolverUIRequest>(_jsonSerializerOptions);
-                    if (request == null)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    var response = await ShowResolverUI(request.AppMetadata);
+                var response = await ShowResolverUI(request.AppMetadata);
 
-                    return response is null ? null : MessageBuffer.Factory.CreateJson(response, _jsonSerializerOptions);
-                }, cancellationToken: cancellationToken);
+                return response is null ? null : MessageBuffer.Factory.CreateJson(response, _jsonSerializerOptions);
+            },
+            cancellationToken: cancellationToken);
 
         lock (_disposeLock)
         {
-            _disposeTask.Add(async () =>
-            {
-                if (messageRouter != null)
+            _disposeTask.Add(
+                async () =>
                 {
-                    await messageRouter.UnregisterServiceAsync(topic, cancellationToken);
-                    await messageRouter.DisposeAsync();
-                }
-            });
+                    if (messageRouter != null)
+                    {
+                        await messageRouter.UnregisterServiceAsync(topic, cancellationToken);
+                        await messageRouter.DisposeAsync();
+                    }
+                });
         }
     }
 
@@ -86,23 +110,4 @@ private ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> a
     {
         return _resolverUIWindow.ShowResolverUI(apps, TimeSpan.FromMinutes(1));
     }
-
-    public async Task StopAsync(CancellationToken cancellationToken)
-    {
-        Func<ValueTask>[]? reversedList = null;
-
-        lock (_disposeLock)
-        {
-            reversedList = _disposeTask.AsEnumerable().Reverse().ToArray();
-        }
-
-
-        if (reversedList != null)
-        {
-            for (var i = 0; i < reversedList.Length; i++)
-            {
-                await reversedList[i].Invoke();
-            }
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/src/shell/dotnet/Shell/Shell.csproj b/src/shell/dotnet/Shell/Shell.csproj
index beb60293c..0283ecffc 100644
--- a/src/shell/dotnet/Shell/Shell.csproj
+++ b/src/shell/dotnet/Shell/Shell.csproj
@@ -34,7 +34,7 @@
 		
 		<Page Include="MainWindow.xaml" />
 		
-		<Page Include="Fdc3\ResolverUI\Fdc3ResolverUI.xaml">
+		<Page Include="Fdc3\ResolverUI\ResolverUI.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 
diff --git a/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUi/ImageSourceConverterTests.cs b/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUI/ImageSourceConverterTests.cs
similarity index 100%
rename from src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUi/ImageSourceConverterTests.cs
rename to src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUI/ImageSourceConverterTests.cs
diff --git a/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUi/Fdc3ResolverUiServiceTests.cs b/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUI/ResolverUIServiceTests.cs
similarity index 94%
rename from src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUi/Fdc3ResolverUiServiceTests.cs
rename to src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUI/ResolverUIServiceTests.cs
index c9b6a7114..562938fc2 100644
--- a/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUi/Fdc3ResolverUiServiceTests.cs
+++ b/src/shell/dotnet/test/Shell.Tests/Fdc3/ResolverUI/ResolverUIServiceTests.cs
@@ -18,7 +18,7 @@
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
-public class Fdc3ResolverUIServiceTests
+public class ResolverUIServiceTests
 {
     [Fact]
     public async Task StartAsync_registers_MessageRouter_service()
@@ -35,7 +35,7 @@ public async Task StartAsync_registers_MessageRouter_service()
                 _ => _.GetService(typeof(IMessageRouter)))
             .Returns(messageRouterMock.Object);
 
-        var fdc3ResolverUIService = new Fdc3ResolverUIService(
+        var fdc3ResolverUIService = new ResolverUIService(
             hostMock.Object,
             resolverUIWindowMock.Object);