breaking: change namespace to ApolloGraphQL.HotChocolate.Federation (#2)

Changing the namespace in order to better structure the project for future addition of Federation v2 support.
apollographql · Oct 11, 2023 · 53c2813 · 53c2813
1 parent 1efa2a1
commit 53c2813
Show file tree

Hide file tree

Showing 127 changed files with 453 additions and 205 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
         run: | 
           NEW_VERSION=$(echo "${GITHUB_REF}" | sed 's/.*\/v//')
           echo "New version: ${NEW_VERSION}"
-          dotnet pack -p:Version=${NEW_VERSION} -p:Configuration=Release src/Federation/ApolloGraphQL.Federation.HotChocolate.csproj
+          dotnet pack -p:Version=${NEW_VERSION} -p:Configuration=Release src/Federation/ApolloGraphQL.HotChocolate.Federation.csproj
       - name: Publish package
         run: dotnet nuget push src/Federation/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
         env:

diff --git a/ApolloGraphQL.Federation.HotChocolate.sln b/ApolloGraphQL.Federation.HotChocolate.sln
@@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74D95657-7BC6-409F-8484-F963A128764A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Federation", "src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj", "{46D3566C-FBBC-46BB-A9AB-454F348A003E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Federation", "src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj", "{46D3566C-FBBC-46BB-A9AB-454F348A003E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EA937CAB-A9B1-474E-BF2A-A45399561B2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Federation.Tests", "test\Federation.Tests\ApolloGraphQL.Federation.HotChocolate.Tests.csproj", "{3B96CAE2-A6C0-4BA6-A21B-1CBFE6EF7A16}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Federation.Tests", "test\Federation.Tests\ApolloGraphQL.HotChocolate.Federation.Tests.csproj", "{3B96CAE2-A6C0-4BA6-A21B-1CBFE6EF7A16}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{82050CA3-2111-49D6-B682-EA22191ADB99}"
 EndProject

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ dotnet build
 
 #### Unit Tests
 
-We are using `ApolloGraphQL.Federation.HotChocolate.Tests` project for our unit tests. This ensures we have good code coverage and can easily test all cases of schema federation.
+We are using `ApolloGraphQL.HotChocolate.Federation.Tests` project for our unit tests. This ensures we have good code coverage and can easily test all cases of schema federation.
 
 To run tests:
 
@@ -66,7 +66,7 @@ In order to [release a new version](https://github.com/apollographql/federation-
 and tag the commit. Releases are following [semantic versioning](https://semver.org/) and specify major, minor and patch version.
 
 Once release is published it will trigger corresponding [Github Action](https://github.com/apollographql/federation-hotchocolate/blob/main/.github/workflows/release.yaml)
-based on the published release event. Release workflow will then proceed to build and publish all library artifacts to [NuGet](https://www.nuget.org/packages/ApolloGraphQL.Federation.HotChocolate).
+based on the published release event. Release workflow will then proceed to build and publish all library artifacts to [NuGet](https://www.nuget.org/packages/ApolloGraphQL.HotChocolate.Federation).
 
 ### Release requirements
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Continuous Integration](https://github.com/apollographql/federation-hotchocolate/workflows/Continuous%20Integration/badge.svg)](https://github.com/apollographql/federation-hotchocolate/actions?query=workflow%3A%22Continuous+Integration%22)
 [![MIT License](https://img.shields.io/github/license/apollographql/federation-hotchocolate.svg)](LICENSE)
-[![Nuget](https://img.shields.io/nuget/v/ApolloGraphQL.Federation.HotChocolate)](https://www.nuget.org/packages/ApolloGraphQL.Federation.HotChocolate/)
+[![Nuget](https://img.shields.io/nuget/v/ApolloGraphQL.HotChocolate.Federation)](https://www.nuget.org/packages/ApolloGraphQL.HotChocolate.Federation/)
 [![Join the community forum](https://img.shields.io/badge/join%20the%20community-forum-blueviolet)](https://community.apollographql.com)
 [![Join our Discord server](https://img.shields.io/discord/1022972389463687228.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square)](https://discord.gg/graphos)
 
@@ -10,28 +10,19 @@
 >This is a fork of `HotChocolate.Federation` module that aims to provide first class [Apollo Federation](https://www.apollographql.com/docs/federation/) support for [`HotChocolate` subgraphs](https://chillicream.com/docs/hotchocolate/v13).
 
 [**Apollo Federation**](https://www.apollographql.com/docs/federation/) is a powerful, open architecture that helps you create a **unified supergraph** that combines multiple GraphQL APIs.
-`ApolloGraphQL.Federation.HotChocolate` provides Apollo Federation support for building subgraphs in the `HotChocolate` ecosystem. Individual subgraphs can be run independently of each other but can also specify
+`ApolloGraphQL.HotChocolate.Federation` provides Apollo Federation support for building subgraphs in the `HotChocolate` ecosystem. Individual subgraphs can be run independently of each other but can also specify
 relationships to the other subgraphs by using Federated directives. See [Apollo Federation documentation](https://www.apollographql.com/docs/federation/) for details.
 
-```mermaid
-graph BT;
-  router([Supergraph<br/>router]);
-  serviceA[Users<br/>subgraph];
-  serviceB[Products<br/>subgraph];
-  serviceC[Reviews<br/>subgraph];
-  router --- serviceA & serviceB & serviceC;
-```
-
 ## Installation
 
-`ApolloGraphQL.Federation.HotChocolate` package is published to [Nuget](https://img.shields.io/nuget/v/ApolloGraphQL.Federation.HotChocolate). Update your `.csproj` file with following package references
+`ApolloGraphQL.HotChocolate.Federation` package is published to [Nuget](https://img.shields.io/nuget/v/ApolloGraphQL.HotChocolate.Federation). Update your `.csproj` file with following package references
 
 ```xml
   <ItemGroup>
     <!-- make sure to also include HotChocolate package -->
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
     <!-- federation package -->
-    <PackageInstallation packageName="ApolloGraphQL.Federation.HotChocolate"/>
+    <PackageReference Include="ApolloGraphQL.HotChocolate.Federation" Version="$LatestVersion" />
   </ItemGroup>
 ```
 
@@ -60,7 +51,7 @@ Apollo Federation requires subgraphs to provide some additional metadata to make
 the supergraph by the specified `@key`s. Since entities can be extended by various subgraphs, we need an extra entry point to access the entities, i.e. subgraphs need to
 implement reference resolvers for entities that they support.
 
-Currently `ApolloGraphQL.Federation.HotChocolate` supports only Apollo Federation v1. See [Apollo documentation](https://www.apollographql.com/docs/federation/) for additional Federation details.
+Currently `ApolloGraphQL.HotChocolate.Federation` supports only Apollo Federation v1. See [Apollo documentation](https://www.apollographql.com/docs/federation/) for additional Federation details.
 
 ### Annotation
 
@@ -109,7 +100,7 @@ type Product @key(fields: "id") {
 Directives
 
 * `Key` applicable on objects, see [`@key` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#key)
-* `ExtendService` applicable on objects, see [`@extends` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#extends)
+* `Extends` applicable on objects, see [`@extends` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#extends)
 * `External` applicable on fields, see [`@external` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#external)
 * `Provides` applicable on fields, see [`@provides` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#provides)
 * `Requires` applicable on fields, see [`@requires` documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives#requires)

diff --git a/compatibility/Products.csproj b/compatibility/Products.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
     <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="13.5.1" />
-    <ProjectReference Include="..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/compatibility/Types/DeprecatedProduct.cs b/compatibility/Types/DeprecatedProduct.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/compatibility/Types/Product.cs b/compatibility/Types/Product.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/compatibility/Types/ProductResearch.cs b/compatibility/Types/ProductResearch.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/compatibility/Types/Query.cs b/compatibility/Types/Query.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/compatibility/Types/User.cs b/compatibility/Types/User.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/compatibility/packages.lock.json b/compatibility/packages.lock.json
@@ -397,7 +397,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/AnnotationBased/Accounts/Accounts.csproj b/examples/AnnotationBased/Accounts/Accounts.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/AnnotationBased/Accounts/User.cs b/examples/AnnotationBased/Accounts/User.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Accounts;
 

diff --git a/examples/AnnotationBased/Accounts/packages.lock.json b/examples/AnnotationBased/Accounts/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/AnnotationBased/Inventory/Inventory.csproj b/examples/AnnotationBased/Inventory/Inventory.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/AnnotationBased/Inventory/Product.cs b/examples/AnnotationBased/Inventory/Product.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Inventory;
 

diff --git a/examples/AnnotationBased/Inventory/packages.lock.json b/examples/AnnotationBased/Inventory/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/AnnotationBased/Products/Product.cs b/examples/AnnotationBased/Products/Product.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Products;
 

diff --git a/examples/AnnotationBased/Products/Products.csproj b/examples/AnnotationBased/Products/Products.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/AnnotationBased/Products/Program.cs b/examples/AnnotationBased/Products/Program.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/examples/AnnotationBased/Products/packages.lock.json b/examples/AnnotationBased/Products/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/AnnotationBased/Reviews/Product.cs b/examples/AnnotationBased/Reviews/Product.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Reviews;
 

diff --git a/examples/AnnotationBased/Reviews/Review.cs b/examples/AnnotationBased/Reviews/Review.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Reviews;
 

diff --git a/examples/AnnotationBased/Reviews/Reviews.csproj b/examples/AnnotationBased/Reviews/Reviews.csproj
@@ -12,6 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/AnnotationBased/Reviews/User.cs b/examples/AnnotationBased/Reviews/User.cs
@@ -1,4 +1,4 @@
-using ApolloGraphQL.Federation.HotChocolate;
+using ApolloGraphQL.HotChocolate.Federation;
 
 namespace Reviews;
 

diff --git a/examples/AnnotationBased/Reviews/packages.lock.json b/examples/AnnotationBased/Reviews/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/CodeFirst/Accounts/Accounts.csproj b/examples/CodeFirst/Accounts/Accounts.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/CodeFirst/Accounts/packages.lock.json b/examples/CodeFirst/Accounts/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/CodeFirst/Inventory/Inventory.csproj b/examples/CodeFirst/Inventory/Inventory.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/CodeFirst/Inventory/packages.lock.json b/examples/CodeFirst/Inventory/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/CodeFirst/Products/Products.csproj b/examples/CodeFirst/Products/Products.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/CodeFirst/Products/packages.lock.json b/examples/CodeFirst/Products/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/examples/CodeFirst/Reviews/Reviews.csproj b/examples/CodeFirst/Reviews/Reviews.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
-    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.Federation.HotChocolate.csproj" />
+    <ProjectReference Include="..\..\..\src\Federation\ApolloGraphQL.HotChocolate.Federation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/CodeFirst/Reviews/packages.lock.json b/examples/CodeFirst/Reviews/packages.lock.json
@@ -382,7 +382,7 @@
           "System.IO.Hashing": "7.0.0"
         }
       },
-      "apollographql.federation.hotchocolate": {
+      "ApolloGraphQL.HotChocolate.Federation": {
         "type": "Project",
         "dependencies": {
           "HotChocolate": "[13.5.1, )"

diff --git a/src/Federation/AnyType.cs b/src/Federation/AnyType.cs
@@ -1,11 +1,11 @@
 using System.Linq;
-using ApolloGraphQL.Federation.HotChocolate.Constants;
-using ApolloGraphQL.Federation.HotChocolate.Properties;
+using ApolloGraphQL.HotChocolate.Federation.Constants;
+using ApolloGraphQL.HotChocolate.Federation.Properties;
 using HotChocolate.Language;
 using HotChocolate.Utilities;
-using static ApolloGraphQL.Federation.HotChocolate.ThrowHelper;
+using static ApolloGraphQL.HotChocolate.Federation.ThrowHelper;
 
-namespace ApolloGraphQL.Federation.HotChocolate;
+namespace ApolloGraphQL.HotChocolate.Federation;
 
 /// <summary>
 /// The _Any scalar is used to pass representations of entities

diff --git a/...lloGraphQL.Federation.HotChocolate.csproj → ...lloGraphQL.HotChocolate.Federation.csproj b/...lloGraphQL.Federation.HotChocolate.csproj → ...lloGraphQL.HotChocolate.Federation.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0; net6.0</TargetFrameworks>
-    <RootNamespace>ApolloGraphQL.Federation.HotChocolate</RootNamespace>
-    <PackageId>ApolloGraphQL.Federation.HotChocolate</PackageId>
-    <AssemblyName>ApolloGraphQL.Federation.HotChocolate</AssemblyName>
+    <RootNamespace>ApolloGraphQL.HotChocolate.Federation</RootNamespace>
+    <PackageId>ApolloGraphQL.HotChocolate.Federation</PackageId>
+    <AssemblyName>ApolloGraphQL.HotChocolate.Federation</AssemblyName>
     <Description>Apollo Federation Subgraph support for HotChocolate.</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="ApolloGraphQL.Federation.HotChocolate.Tests" />
+    <InternalsVisibleTo Include="ApolloGraphQL.HotChocolate.Federation.Tests" />
   </ItemGroup>
 
   <ItemGroup> 

diff --git a/src/Federation/Constants/WellKnownArgumentNames.cs b/src/Federation/Constants/WellKnownArgumentNames.cs
@@ -1,4 +1,4 @@
-namespace ApolloGraphQL.Federation.HotChocolate.Constants;
+namespace ApolloGraphQL.HotChocolate.Federation.Constants;
 
 internal static class WellKnownArgumentNames
 {

diff --git a/src/Federation/Constants/WellKnownContextData.cs b/src/Federation/Constants/WellKnownContextData.cs
@@ -1,11 +1,11 @@
-namespace ApolloGraphQL.Federation.HotChocolate.Constants;
+namespace ApolloGraphQL.HotChocolate.Federation.Constants;
 
 internal static class WellKnownContextData
 {
-    public const string KeyMarker = "ApolloGraphQL.Federation.HotChocolate.Key";
-    public const string ExtendMarker = "ApolloGraphQL.Federation.HotChocolate.Extend";
-    public const string ExternalSetter = "ApolloGraphQL.Federation.HotChocolate.ExternalSetter";
-    public const string EntityResolver = "ApolloGraphQL.Federation.HotChocolate.EntityResolver";
+    public const string KeyMarker = "ApolloGraphQL.HotChocolate.Federation.Key";
+    public const string ExtendMarker = "ApolloGraphQL.HotChocolate.Federation.Extend";
+    public const string ExternalSetter = "ApolloGraphQL.HotChocolate.Federation.ExternalSetter";
+    public const string EntityResolver = "ApolloGraphQL.HotChocolate.Federation.EntityResolver";
     public const string DataField = "data";
     public const string TypeField = "__type";
 }
diff --git a/src/Federation/Constants/WellKnownFieldNames.cs b/src/Federation/Constants/WellKnownFieldNames.cs
@@ -1,4 +1,4 @@
-namespace ApolloGraphQL.Federation.HotChocolate.Constants;
+namespace ApolloGraphQL.HotChocolate.Federation.Constants;
 
 internal static class WellKnownFieldNames
 {