Rename forgotten things

6 files changed, 11 insertions, 11 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
index 1da8e5bf761..e49e9c7998e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
@@ -87,7 +87,7 @@ public interface ServiceRegistry {
 
     ResourceTagger resourceTagger();
 
-    EnclaveAccessService amiService();
+    EnclaveAccessService enclaveAccessService();
 
     RoleService roleService();
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/EnclaveAccessService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/EnclaveAccessService.java
index 44d7712c243..52e8ba5adf8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/EnclaveAccessService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/EnclaveAccessService.java
@@ -9,7 +9,7 @@ import java.util.Set;
  */
 public interface EnclaveAccessService {
 
-    /** Makes the current AMIs available to the given accounts. */
+    /** Ensures the given enclave accounts have access to resources they require to function. */
     void allowAccessFor(Set<CloudAccount> accounts);
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index dc62511e5e2..89ca31105bb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -78,7 +78,7 @@ public class ControllerMaintenance extends AbstractComponent {
         maintainers.add(new UserManagementMaintainer(controller, intervals.userManagementMaintainer, controller.serviceRegistry().roleMaintainer()));
         maintainers.add(new BillingDatabaseMaintainer(controller, intervals.billingDatabaseMaintainer));
         maintainers.add(new MeteringMonitorMaintainer(controller, intervals.meteringMonitorMaintainer, controller.serviceRegistry().resourceDatabase(), metric));
-        maintainers.add(new AMISharer(controller, intervals.defaultInterval));
+        maintainers.add(new EnclaveAccessMaintainer(controller, intervals.defaultInterval));
     }
 
     public Upgrader upgrader() { return upgrader; }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/AMISharer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java
index bfd0d71d110..d9576f4e176 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/AMISharer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java
@@ -11,18 +11,18 @@ import java.util.logging.Logger;
 
 import static java.util.logging.Level.WARNING;
 
-public class AMISharer extends ControllerMaintainer {
+public class EnclaveAccessMaintainer extends ControllerMaintainer {
 
-    private static final Logger logger = Logger.getLogger(AMISharer.class.getName());
+    private static final Logger logger = Logger.getLogger(EnclaveAccessMaintainer.class.getName());
 
-    AMISharer(Controller controller, Duration interval) {
+    EnclaveAccessMaintainer(Controller controller, Duration interval) {
         super(controller, interval);
     }
 
     @Override
     protected double maintain() {
         try {
-            controller().serviceRegistry().amiService().allowAccessFor(externalAccounts());
+            controller().serviceRegistry().enclaveAccessService().allowAccessFor(externalAccounts());
             return 1;
         }
         catch (RuntimeException e) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
index fd3d17ce7dd..46c731e6e49 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
@@ -211,7 +211,7 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
     }
 
     @Override
-    public MockEnclaveAccessService amiService() {
+    public MockEnclaveAccessService enclaveAccessService() {
         return mockAMIService;
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/AMISharerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainerTest.java
index 77596d54b85..f5188d52db6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/AMISharerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainerTest.java
@@ -15,13 +15,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 /**
  * @author jonmv
  */
-class AMISharerTest {
+class EnclaveAccessMaintainerTest {
 
     @Test
     void test() {
         ControllerTester tester = new ControllerTester();
-        MockEnclaveAccessService amis = tester.serviceRegistry().amiService();
-        AMISharer sharer = new AMISharer(tester.controller(), Duration.ofMinutes(1));
+        MockEnclaveAccessService amis = tester.serviceRegistry().enclaveAccessService();
+        EnclaveAccessMaintainer sharer = new EnclaveAccessMaintainer(tester.controller(), Duration.ofMinutes(1));
         assertEquals(Set.of(), amis.currentAccounts());
 
         assertEquals(1, sharer.maintain());