diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ef1b75bbc..a1368061c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @OctopusDeploy/team-server-at-scale
\ No newline at end of file
+* @OctopusDeploy/team-executions-foundations
\ No newline at end of file
diff --git a/renovate-config.js b/renovate-config.js
index d42b6a8ab..9c1a56065 100644
--- a/renovate-config.js
+++ b/renovate-config.js
@@ -38,7 +38,7 @@ module.exports = {
 
   platform: 'github',
   repositories: ['OctopusDeploy/Halibut'],
-  reviewers: ['OctopusDeploy/team-server-at-scale'],
+  reviewers: ['OctopusDeploy/team-executions-foundations'],
   labels: ['dependencies', 'Halibut'],
   branchPrefix: 'renovate-dotnet/',
 
diff --git a/source/Halibut.Tests/Support/LatestServiceBuilder.cs b/source/Halibut.Tests/Support/LatestServiceBuilder.cs
index f36b24e20..19caa44b5 100644
--- a/source/Halibut.Tests/Support/LatestServiceBuilder.cs
+++ b/source/Halibut.Tests/Support/LatestServiceBuilder.cs
@@ -196,7 +196,7 @@ async Task<IService> IServiceBuilder.Build(CancellationToken cancellationToken)
 
         public async Task<LatestService> Build(CancellationToken cancellationToken)
         {
-            //TODO: @server-at-scale - We don't need to be async. But this is left here to see if we need to add it back some day. We can decide later if we wish to make this sync.
+            //TODO: @executions-foundations - We don't need to be async. But this is left here to see if we need to add it back some day. We can decide later if we wish to make this sync.
             await Task.CompletedTask;
 
             serviceFactory ??= serviceFactoryBuilder.Build();