diff --git a/.github/workflows/validate-orchestrator-integration.yml b/.github/workflows/validate-orchestrator-integration.yml
index f5bcbfd8..97648e13 100644
--- a/.github/workflows/validate-orchestrator-integration.yml
+++ b/.github/workflows/validate-orchestrator-integration.yml
@@ -90,7 +90,7 @@ jobs:
       - name: Verify all services and lazy loaders
         run: |
           node -e "
-            const { loadOrchestrator, loadEnterpriseServices } = require('./lib/model/orchestrator-plugin');
+            const { loadOrchestrator, loadPluginServices } = require('./lib/model/orchestrator-plugin');
             (async () => {
               const orch = await loadOrchestrator();
               if (!orch || typeof orch.run !== 'function') {
@@ -99,8 +99,8 @@ jobs:
               }
               console.log('✓ loadOrchestrator().run is a function');
 
-              const services = await loadEnterpriseServices();
-              if (!services) { console.error('ERROR: loadEnterpriseServices failed'); process.exit(1); }
+              const services = await loadPluginServices();
+              if (!services) { console.error('ERROR: loadPluginServices failed'); process.exit(1); }
 
               const eager = ['BuildReliabilityService','TestWorkflowService','HotRunnerService','OutputService','OutputTypeRegistry','ArtifactUploadHandler','IncrementalSyncService'];
               for (const s of eager) { if (!services[s]) { console.error('Missing: ' + s); process.exit(1); } }
diff --git a/.github/workflows/validate-orchestrator.yml b/.github/workflows/validate-orchestrator.yml
index 90dc8751..c6fcba78 100644
--- a/.github/workflows/validate-orchestrator.yml
+++ b/.github/workflows/validate-orchestrator.yml
@@ -99,7 +99,7 @@ jobs:
         run: |
           echo "Checking plugin loader handles missing @game-ci/orchestrator..."
           node -e "
-            const { loadOrchestrator, loadEnterpriseServices } = require('./lib/model/orchestrator-plugin');
+            const { loadOrchestrator, loadPluginServices } = require('./lib/model/orchestrator-plugin');
             (async () => {
               const orch = await loadOrchestrator();
               if (orch !== undefined) {
@@ -108,12 +108,12 @@ jobs:
               }
               console.log('✓ loadOrchestrator() returns undefined when package not installed');
 
-              const services = await loadEnterpriseServices();
+              const services = await loadPluginServices();
               if (services !== undefined) {
-                console.error('ERROR: loadEnterpriseServices should return undefined when package not installed');
+                console.error('ERROR: loadPluginServices should return undefined when package not installed');
                 process.exit(1);
               }
-              console.log('✓ loadEnterpriseServices() returns undefined when package not installed');
+              console.log('✓ loadPluginServices() returns undefined when package not installed');
             })();
           "
 
@@ -153,7 +153,7 @@ jobs:
         run: |
           echo "Checking plugin loader returns defined exports..."
           node -e "
-            const { loadOrchestrator, loadEnterpriseServices } = require('./lib/model/orchestrator-plugin');
+            const { loadOrchestrator, loadPluginServices } = require('./lib/model/orchestrator-plugin');
             (async () => {
               const orch = await loadOrchestrator();
               if (orch === undefined) {
@@ -166,9 +166,9 @@ jobs:
               }
               console.log('✓ loadOrchestrator() returns defined exports with orchestrator installed');
 
-              const services = await loadEnterpriseServices();
+              const services = await loadPluginServices();
               if (services === undefined) {
-                console.error('ERROR: loadEnterpriseServices should return defined exports when package is installed');
+                console.error('ERROR: loadPluginServices should return defined exports when package is installed');
                 process.exit(1);
               }
               const expectedServices = [
@@ -182,7 +182,7 @@ jobs:
                   process.exit(1);
                 }
               }
-              console.log('✓ loadEnterpriseServices() returns all ' + expectedServices.length + ' services');
+              console.log('✓ loadPluginServices() returns all ' + expectedServices.length + ' services');
 
               const lazyLoaders = [
                 'loadChildWorkspaceService', 'loadLocalCacheService',