diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4ac20df00..1912dd268 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,61 +1,61 @@
-<Project>
-  <ItemGroup>
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
-    <PackageVersion Include="Google.Protobuf" Version="3.23.4" />
-    <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.53.0" />
-    <PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
-    <PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.53.0" />
-    <PackageVersion Include="Grpc.Tools" Version="2.54.0" />
-    <PackageVersion Include="Grpc" Version="2.46.6" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
-    <PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MorganStanley.Fdc3.AppDirectory" Version="2.0.0-alpha.8" />
-    <PackageVersion Include="MorganStanley.Fdc3.NewtonsoftJson" Version="2.0.0-alpha.7" />
-    <PackageVersion Include="MorganStanley.Fdc3" Version="2.0.0-alpha.8" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
-    <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageVersion Include="Roslyn.System.IO.Abstractions.Analyzers" Version="12.2.19" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageVersion Include="Serilog" Version="2.11.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.1" />
-    <PackageVersion Include="System.IO.Pipelines" Version="6.0.3" />
-    <PackageVersion Include="System.Management" Version="6.0.1" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
-    <PackageVersion Include="System.Reactive" Version="6.0.0" />
-    <PackageVersion Include="System.ServiceModel.Primitives" Version="6.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="6.0.8" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="19.2.69" />
-    <PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-  </ItemGroup>
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+    <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
+    <PackageVersion Include="Finos.Fdc3" Version="2.0.0-beta.1" />
+    <PackageVersion Include="Finos.Fdc3.NewtonsoftJson" Version="2.0.0-beta.1" />
+    <PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.0.0-beta.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
+    <PackageVersion Include="Google.Protobuf" Version="3.23.4" />
+    <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.53.0" />
+    <PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
+    <PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.53.0" />
+    <PackageVersion Include="Grpc.Tools" Version="2.54.0" />
+    <PackageVersion Include="Grpc" Version="2.46.6" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
+    <PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
+    <PackageVersion Include="Moq" Version="4.18.4" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
+    <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
+    <PackageVersion Include="Roslyn.System.IO.Abstractions.Analyzers" Version="12.2.19" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog" Version="2.11.0" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.1" />
+    <PackageVersion Include="System.IO.Pipelines" Version="6.0.3" />
+    <PackageVersion Include="System.Management" Version="6.0.1" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
+    <PackageVersion Include="System.Reactive" Version="6.0.0" />
+    <PackageVersion Include="System.ServiceModel.Primitives" Version="6.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="6.0.8" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="19.2.69" />
+    <PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.cs b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.cs
index b2656fa9e..47d6995bb 100644
--- a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.cs
+++ b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.cs
@@ -18,8 +18,8 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
-using MorganStanley.Fdc3.AppDirectory;
-using MorganStanley.Fdc3.NewtonsoftJson.Serialization;
+using Finos.Fdc3.AppDirectory;
+using Finos.Fdc3.NewtonsoftJson.Serialization;
 using Newtonsoft.Json;
 
 namespace MorganStanley.ComposeUI.Fdc3.AppDirectory;
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj
index 3ae78de53..c72591c64 100644
--- a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj
+++ b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj
@@ -9,12 +9,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Finos.Fdc3.AppDirectory" />
+		<PackageReference Include="Finos.Fdc3.NewtonsoftJson" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
 		<PackageReference Include="Microsoft.Extensions.Http" />
 		<PackageReference Include="Microsoft.Extensions.Options" />
-		<PackageReference Include="MorganStanley.Fdc3.AppDirectory" />
-		<PackageReference Include="MorganStanley.Fdc3.NewtonsoftJson" />
 		<PackageReference Include="Newtonsoft.Json" />
 		<PackageReference Include="Roslyn.System.IO.Abstractions.Analyzers">
 		  <PrivateAssets>all</PrivateAssets>
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectoryOptions.cs b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectoryOptions.cs
index 85407f339..500f65ba6 100644
--- a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectoryOptions.cs
+++ b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectoryOptions.cs
@@ -11,7 +11,7 @@
 // and limitations under the License.
 
 using Microsoft.Extensions.Options;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 
 namespace MorganStanley.ComposeUI.Fdc3.AppDirectory;
 
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/DependencyInjection/ServiceCollectionAppDirectoryExtensions.cs b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/DependencyInjection/ServiceCollectionAppDirectoryExtensions.cs
index 0ae5c4460..713de008d 100644
--- a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/DependencyInjection/ServiceCollectionAppDirectoryExtensions.cs
+++ b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/DependencyInjection/ServiceCollectionAppDirectoryExtensions.cs
@@ -16,7 +16,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using MorganStanley.ComposeUI.Fdc3.AppDirectory;
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/Fdc3ModuleCatalog.cs b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/Fdc3ModuleCatalog.cs
index 6c016299a..c3ded2fd0 100644
--- a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/Fdc3ModuleCatalog.cs
+++ b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/Fdc3ModuleCatalog.cs
@@ -13,7 +13,7 @@
 */
 
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 
 namespace MorganStanley.ComposeUI.Fdc3.AppDirectory;
 
diff --git a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApp.Tests.cs b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApp.Tests.cs
index 2dff6881f..0bf1eda93 100644
--- a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApp.Tests.cs
+++ b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApp.Tests.cs
@@ -1,4 +1,4 @@
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 
 namespace MorganStanley.ComposeUI.Fdc3.AppDirectory;
 
diff --git a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApps.Tests.cs b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApps.Tests.cs
index 97ba6efe9..e0b3e48c7 100644
--- a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApps.Tests.cs
+++ b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.GetApps.Tests.cs
@@ -13,7 +13,7 @@
 using System.Net;
 using System.Text;
 using Moq.Contrib.HttpClient;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 using Newtonsoft.Json.Linq;
 using TaskExtensions = MorganStanley.ComposeUI.Testing.TaskExtensions;
 
diff --git a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/Fdc3ModuleCatalog.GetModuleIds.Tests.cs b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/Fdc3ModuleCatalog.GetModuleIds.Tests.cs
index a4ef4d632..bd803a2ee 100644
--- a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/Fdc3ModuleCatalog.GetModuleIds.Tests.cs
+++ b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/Fdc3ModuleCatalog.GetModuleIds.Tests.cs
@@ -12,7 +12,7 @@
 * and limitations under the License.
 */
 
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 
 namespace MorganStanley.ComposeUI.Fdc3.AppDirectory;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindChannelRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindChannelRequest.cs
index 7fd9da37b..324ec69a5 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindChannelRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindChannelRequest.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentRequest.cs
index 111a4bc12..e396750af 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentRequest.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
@@ -33,7 +33,7 @@ internal sealed class FindIntentRequest
     public string Intent { get; set; }
 
     /// <summary>
-    /// <inheritdoc cref="MorganStanley.Fdc3.Context.Context"/>
+    /// <inheritdoc cref="Finos.Fdc3.Context.Context"/>
     /// </summary>
     public Context? Context { get; set; }
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentResponse.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentResponse.cs
index db5d35235..bc6f93c95 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentResponse.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentResponse.cs
@@ -22,7 +22,7 @@ namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 internal sealed class FindIntentResponse
 {
     /// <summary>
-    /// <see cref="MorganStanley.Fdc3.AppIntent"/>, as result of executing the fdc3.findIntent.
+    /// <see cref="Finos.Fdc3.AppIntent"/>, as result of executing the fdc3.findIntent.
     /// </summary>
     public AppIntent? AppIntent { get; init; }
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentsByContextRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentsByContextRequest.cs
index 5e54d466d..391f26374 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentsByContextRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/FindIntentsByContextRequest.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
@@ -28,7 +28,7 @@ internal sealed class FindIntentsByContextRequest
     public string Fdc3InstanceId { get; set; }
 
     /// <summary>
-    /// <see cref="MorganStanley.Fdc3.Context.Context"/>
+    /// <see cref="Finos.Fdc3.Context.Context"/>
     /// </summary>
     public Context Context { get; set; }
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/GetIntentResultResponse.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/GetIntentResultResponse.cs
index c2d983591..9ecde516d 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/GetIntentResultResponse.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/GetIntentResultResponse.cs
@@ -13,8 +13,8 @@
  */
 
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
-using MorganStanley.Fdc3;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentRequest.cs
index 37b407fd6..7f8643639 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentRequest.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResolutionRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResolutionRequest.cs
index 19e0f10af..190cfd2a5 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResolutionRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResolutionRequest.cs
@@ -14,7 +14,7 @@
 
 
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResponse.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResponse.cs
index 55aa54260..fff2007e5 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResponse.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/RaiseIntentResponse.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/StoreIntentResultRequest.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/StoreIntentResultRequest.cs
index 09f04c4a1..0e88756be 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/StoreIntentResultRequest.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Contracts/StoreIntentResultRequest.cs
@@ -12,8 +12,8 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppIntentJsonConverter.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppIntentJsonConverter.cs
index a4c2fbfae..53b396582 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppIntentJsonConverter.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppIntentJsonConverter.cs
@@ -14,7 +14,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppMetadataJsonConverter.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppMetadataJsonConverter.cs
index eb907fea9..b1ae05e80 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppMetadataJsonConverter.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/AppMetadataJsonConverter.cs
@@ -14,7 +14,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IconJsonConverter.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IconJsonConverter.cs
index 4004b5cc5..ab3395b80 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IconJsonConverter.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IconJsonConverter.cs
@@ -14,7 +14,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using Icon = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Icon;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/ImageJsonConverter.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/ImageJsonConverter.cs
index 1f79be5f8..6c33eec16 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/ImageJsonConverter.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/ImageJsonConverter.cs
@@ -14,7 +14,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using Screenshot = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Screenshot;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IntentMetadataJsonConverter.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IntentMetadataJsonConverter.cs
index b3a144616..e4788f531 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IntentMetadataJsonConverter.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Converters/IntentMetadataJsonConverter.cs
@@ -14,7 +14,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using IntentMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.IntentMetadata;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj
index 8ca86583d..97452113b 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj
@@ -9,11 +9,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Finos.Fdc3" />
+		<PackageReference Include="Finos.Fdc3.AppDirectory" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-		<PackageReference Include="MorganStanley.Fdc3" />
-		<PackageReference Include="MorganStanley.Fdc3.AppDirectory" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Exceptions/ThrowHelper.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Exceptions/ThrowHelper.cs
index 69c28e1b2..4eb15d89c 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Exceptions/ThrowHelper.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Exceptions/ThrowHelper.cs
@@ -12,7 +12,7 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs
index ab218fdb8..817adfd7b 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs
@@ -22,15 +22,15 @@
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3;
-using MorganStanley.Fdc3.AppDirectory;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3;
+using Finos.Fdc3.AppDirectory;
+using Finos.Fdc3.Context;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 using ContextMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.ContextMetadata;
 using Icon = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Icon;
-using IntentMetadata = MorganStanley.Fdc3.AppDirectory.IntentMetadata;
+using IntentMetadata = Finos.Fdc3.AppDirectory.IntentMetadata;
 using Screenshot = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Screenshot;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3StartupAction.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3StartupAction.cs
index 6605fde32..06a44d26d 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3StartupAction.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3StartupAction.cs
@@ -14,7 +14,7 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent;
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 using ResourceReader = MorganStanley.ComposeUI.Utilities.ResourceReader;
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.cs
index 776974b34..d0379b053 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.cs
@@ -22,7 +22,7 @@
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.DependencyInjection;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
 using MorganStanley.ComposeUI.Messaging;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/IFdc3DesktopAgentBridge.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/IFdc3DesktopAgentBridge.cs
index a2df9d36b..06e540b6a 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/IFdc3DesktopAgentBridge.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/IFdc3DesktopAgentBridge.cs
@@ -13,7 +13,7 @@
  */
 
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaiseIntentResolutionInvocation.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaiseIntentResolutionInvocation.cs
index 2a6606eb1..11c276cd4 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaiseIntentResolutionInvocation.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaiseIntentResolutionInvocation.cs
@@ -12,8 +12,8 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3.Context;
-using MorganStanley.Fdc3;
+using Finos.Fdc3.Context;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaisedIntentRequestHandler.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaisedIntentRequestHandler.cs
index bc520b8b8..488b6deca 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaisedIntentRequestHandler.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Infrastructure/Internal/RaisedIntentRequestHandler.cs
@@ -12,8 +12,8 @@
  * and limitations under the License.
  */
 
-using MorganStanley.Fdc3.Context;
-using MorganStanley.Fdc3;
+using Finos.Fdc3.Context;
+using Finos.Fdc3;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIdentifier.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIdentifier.cs
index 8020225d1..afe315e0d 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIdentifier.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIdentifier.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIntent.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIntent.cs
index 6d135e549..7bac3408f 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIntent.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppIntent.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppMetadata.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppMetadata.cs
index 4daf686b4..b545fa2a2 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppMetadata.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/AppMetadata.cs
@@ -11,7 +11,7 @@
 // and limitations under the License.
 
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using Icon = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Icon;
 using Screenshot = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.Screenshot;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ContextMetadata.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ContextMetadata.cs
index d948a22bf..a08ceccad 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ContextMetadata.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ContextMetadata.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/DisplayMetadata.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/DisplayMetadata.cs
index 4467df37f..2ea22cb74 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/DisplayMetadata.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/DisplayMetadata.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Icon.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Icon.cs
index a49470558..92bd92c08 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Icon.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Icon.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ImplementationMetadata.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ImplementationMetadata.cs
index 57a75e0f8..b2e29bf4c 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ImplementationMetadata.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/ImplementationMetadata.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/IntentMetadata.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/IntentMetadata.cs
index 5c0427348..a21481f08 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/IntentMetadata.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/IntentMetadata.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Screenshot.cs b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Screenshot.cs
index fe123c051..33828fcdc 100644
--- a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Screenshot.cs
+++ b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Protocol/Screenshot.cs
@@ -10,7 +10,7 @@
 // or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol;
 
diff --git a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/EndToEndTests.cs b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/EndToEndTests.cs
index b072bc471..d64c8db65 100644
--- a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/EndToEndTests.cs
+++ b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/EndToEndTests.cs
@@ -22,8 +22,8 @@
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.Helpers;
 using MorganStanley.ComposeUI.Messaging.Client.WebSocket;
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3;
+using Finos.Fdc3.Context;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
diff --git a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Fdc3DesktopAgentTests.cs b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Fdc3DesktopAgentTests.cs
index f1eb725f0..4a9dbee76 100644
--- a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Fdc3DesktopAgentTests.cs
+++ b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Fdc3DesktopAgentTests.cs
@@ -15,15 +15,15 @@
 
 using MorganStanley.ComposeUI.Fdc3.AppDirectory;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.TestUtils;
-using MorganStanley.Fdc3.AppDirectory;
+using Finos.Fdc3.AppDirectory;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
-using MorganStanley.Fdc3;
+using Finos.Fdc3;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.Helpers;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Exceptions;
 using MorganStanley.ComposeUI.ModuleLoader;
diff --git a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.Tests.cs b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.Tests.cs
index a4639946f..df492b320 100644
--- a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.Tests.cs
+++ b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/Infrastructure/Internal/Fdc3DesktopAgentMessageRouterService.Tests.cs
@@ -20,9 +20,9 @@
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.Helpers;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.TestUtils;
 using MorganStanley.ComposeUI.ModuleLoader;
-using MorganStanley.Fdc3;
-using MorganStanley.Fdc3.AppDirectory;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3;
+using Finos.Fdc3.AppDirectory;
+using Finos.Fdc3.Context;
 using AppMetadata = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppMetadata;
 using AppIntent = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIntent;
 using AppIdentifier = MorganStanley.ComposeUI.Fdc3.DesktopAgent.Protocol.AppIdentifier;
diff --git a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/UserChannelTests.cs b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/UserChannelTests.cs
index 350e9ac26..a0323ee94 100644
--- a/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/UserChannelTests.cs
+++ b/src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/UserChannelTests.cs
@@ -13,7 +13,7 @@
  */
 
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
-using MorganStanley.Fdc3.Context;
+using Finos.Fdc3.Context;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests;