Rename a class and some methods

23 files changed, 162 insertions, 163 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index c7e4022c668..138d963b250 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -44,7 +44,7 @@ import com.yahoo.vespa.applicationmodel.InfrastructureApplication;
 import com.yahoo.vespa.config.server.application.Application;
 import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase;
 import com.yahoo.vespa.config.server.application.ApplicationReindexing;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.ClusterReindexing;
 import com.yahoo.vespa.config.server.application.ClusterReindexingStatusClient;
 import com.yahoo.vespa.config.server.application.CompressedApplicationInputStream;
@@ -658,10 +658,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         Tenant tenant = getTenant(applicationId);
         if (tenant == null) throw new NotFoundException("Tenant '" + applicationId.tenant() + "' not found");
 
-        Optional<ApplicationSet> activeApplicationSet = tenant.getSessionRepository().getActiveApplicationSet(applicationId);
-        if (activeApplicationSet.isEmpty()) throw new NotFoundException("Unknown application id '" + applicationId + "'");
+        Optional<ApplicationVersions> activeApplicationVersions = tenant.getSessionRepository().activeApplicationVersions(applicationId);
+        if (activeApplicationVersions.isEmpty()) throw new NotFoundException("Unknown application id '" + applicationId + "'");
 
-        return activeApplicationSet.get().getForVersionOrLatest(version, clock.instant());
+        return activeApplicationVersions.get().getForVersionOrLatest(version, clock.instant());
     }
 
     // Will return Optional.empty() if getting application fails (instead of throwing an exception)
@@ -706,10 +706,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     }
 
     public List<Version> getAllVersions(ApplicationId applicationId) {
-        Optional<ApplicationSet> applicationSet = getActiveApplicationSet(applicationId);
+        Optional<ApplicationVersions> applicationSet = getActiveApplicationSet(applicationId);
         return applicationSet.isEmpty()
                 ? List.of()
-                : applicationSet.get().getAllVersions(applicationId);
+                : applicationSet.get().versions(applicationId);
     }
 
     public HttpResponse validateSecretStore(ApplicationId applicationId, SystemName systemName, Slime slime) {
@@ -1018,8 +1018,8 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         return session;
     }
 
-    public Optional<ApplicationSet> getActiveApplicationSet(ApplicationId appId) {
-        return getTenant(appId).getSessionRepository().getActiveApplicationSet(appId);
+    public Optional<ApplicationVersions> getActiveApplicationSet(ApplicationId appId) {
+        return getTenant(appId).getSessionRepository().activeApplicationVersions(appId);
     }
 
     public Application getActiveApplication(ApplicationId applicationId) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigActivationListener.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigActivationListener.java
index e52089f5400..94ff60a29c1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigActivationListener.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigActivationListener.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.config.server;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 
 /**
  * A ConfigActivationListener is used to signal to a component that config has been
@@ -20,7 +20,7 @@ public interface ConfigActivationListener {
      *
      * Must be thread-safe.
      */
-    void configActivated(ApplicationSet application);
+    void configActivated(ApplicationVersions application);
 
     /**
      * Application has been removed.
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
index 16423889d01..aee61fa9a44 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
@@ -11,7 +11,7 @@ import com.yahoo.config.model.api.SuperModelProvider;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.GenerationCounter;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.model.SuperModelConfigProvider;
 import com.yahoo.vespa.flags.FlagSource;
 
@@ -89,10 +89,10 @@ public class SuperModelManager implements SuperModelProvider {
         }
     }
 
-    public void configActivated(ApplicationSet applicationSet) {
+    public void configActivated(ApplicationVersions applicationVersions) {
         synchronized (monitor) {
             // TODO: Should supermodel care about multiple versions?
-            ApplicationInfo applicationInfo = applicationSet
+            ApplicationInfo applicationInfo = applicationVersions
                     .getForVersionOrLatest(Optional.empty(), Instant.now())
                     .toApplicationInfo();
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
index 93bb44e25d3..d43d898f8c3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
@@ -10,7 +10,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.GetConfigRequest;
 import com.yahoo.vespa.config.protocol.ConfigResponse;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.rpc.ConfigResponseFactory;
 
 import java.util.Optional;
@@ -46,10 +46,10 @@ public class SuperModelRequestHandler implements RequestHandler {
      * Signals that config has been activated for an {@link com.yahoo.vespa.config.server.application.Application}
      * belonging to a tenant.
      *
-     * @param applicationSet The activated set of {@link com.yahoo.vespa.config.server.application.Application}.
+     * @param applicationVersions The activated set of {@link com.yahoo.vespa.config.server.application.Application}s.
      */
-    public synchronized void activateConfig(ApplicationSet applicationSet) {
-        superModelManager.configActivated(applicationSet);
+    public synchronized void activateConfig(ApplicationVersions applicationVersions) {
+        superModelManager.configActivated(applicationVersions);
         updateHandler();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
index 3fe28c918d0..6db01c91dea 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
@@ -21,20 +21,20 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class ApplicationMapper {
 
-    private final Map<ApplicationId, ApplicationSet> requestHandlers = new ConcurrentHashMap<>();
+    private final Map<ApplicationId, ApplicationVersions> requestHandlers = new ConcurrentHashMap<>();
 
-    private ApplicationSet getApplicationSet(ApplicationId applicationId) {
-        ApplicationSet set = requestHandlers.get(applicationId);
-        if (set == null) throw new NotFoundException("No such application id: " + applicationId);
+    private ApplicationVersions applicationVersions(ApplicationId applicationId) {
+        ApplicationVersions versions = requestHandlers.get(applicationId);
+        if (versions == null) throw new NotFoundException("No such application id: " + applicationId);
 
-        return set;
+        return versions;
     }
 
     /**
      * Register an Application to an application id and specific vespa version
      */
-    public void register(ApplicationId applicationId, ApplicationSet applicationSet) {
-        requestHandlers.put(applicationId, applicationSet);
+    public void register(ApplicationId applicationId, ApplicationVersions applicationVersions) {
+        requestHandlers.put(applicationId, applicationVersions);
     }
 
     /**
@@ -45,12 +45,12 @@ public final class ApplicationMapper {
     }
 
     /**
-     * Retrieve the Application corresponding to this application id and specific vespa version.
+     * Retrieve the Application corresponding to this application id and specified vespa version.
      *
      * @return the matching application, or null if none matches
      */
     public Application getForVersion(ApplicationId applicationId, Optional<Version> vespaVersion, Instant now) throws VersionDoesNotExistException {
-        return getApplicationSet(applicationId).getForVersionOrLatest(vespaVersion, now);
+        return applicationVersions(applicationId).getForVersionOrLatest(vespaVersion, now);
     }
 
     /** Returns whether this registry has an application for the given application id */
@@ -80,7 +80,7 @@ public final class ApplicationMapper {
     }
 
     public List<Application> listApplications(ApplicationId applicationId) {
-        return requestHandlers.get(applicationId).getAllApplications();
+        return requestHandlers.get(applicationId).applications();
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationVersions.java
index 5650c2e7e15..71ec91e758f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationVersions.java
@@ -16,14 +16,14 @@ import java.util.Optional;
  *
  * @author vegard
  */
-public final class ApplicationSet {
+public final class ApplicationVersions {
 
     private final Version latestVersion;
     private final ApplicationId applicationId;
     private final long generation;
     private final HashMap<Version, Application> applications = new HashMap<>();
 
-    private ApplicationSet(List<Application> applications) {
+    private ApplicationVersions(List<Application> applications) {
         if (applications.isEmpty()) throw new IllegalArgumentException("application list cannot be empty");
 
         Application firstApp = applications.get(0);
@@ -44,12 +44,12 @@ public final class ApplicationSet {
         latestVersion = this.applications.keySet().stream().max(Version::compareTo).get();
     }
 
-    public static ApplicationSet fromList(List<Application> applications) {
-        return new ApplicationSet(applications);
+    public static ApplicationVersions fromList(List<Application> applications) {
+        return new ApplicationVersions(applications);
     }
 
     // For testing
-    public static ApplicationSet from(Application application) {
+    public static ApplicationVersions from(Application application) {
         return fromList(List.of(application));
     }
 
@@ -86,7 +86,7 @@ public final class ApplicationSet {
 
     public ApplicationId getId() { return applicationId; }
 
-    public Collection<String> getAllHosts() {
+    public Collection<String> allHosts() {
         return applications.values().stream()
                 .flatMap(app -> app.getModel().getHosts().stream()
                         .map(HostInfo::getHostname))
@@ -97,15 +97,15 @@ public final class ApplicationSet {
         applications.values().forEach(app -> app.updateHostMetrics(app.getModel().getHosts().size()));
     }
 
-    public long getApplicationGeneration() {
+    public long applicationGeneration() {
         return generation;
     }
 
-    List<Application> getAllApplications() {
+    List<Application> applications() {
         return new ArrayList<>(applications.values());
     }
 
-    public List<Version> getAllVersions(ApplicationId applicationId) {
+    public List<Version> versions(ApplicationId applicationId) {
         return applications.values().stream()
                 .filter(application -> application.getId().equals(applicationId))
                 .map(Application::getVespaVersion)
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index cddcb0f316d..db4a94c6e1a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -215,29 +215,29 @@ public class TenantApplications implements RequestHandler, HostValidator {
         return application.resolveConfig(req, responseFactory);
     }
 
-    private void notifyConfigActivationListeners(ApplicationSet applicationSet) {
-        List<Application> applications = applicationSet.getAllApplications();
+    private void notifyConfigActivationListeners(ApplicationVersions applicationVersions) {
+        List<Application> applications = applicationVersions.applications();
         if (applications.isEmpty()) throw new IllegalArgumentException("application set cannot be empty");
 
-        hostRegistry.update(applications.get(0).getId(), applicationSet.getAllHosts());
-        configActivationListener.configActivated(applicationSet);
+        hostRegistry.update(applications.get(0).getId(), applicationVersions.allHosts());
+        configActivationListener.configActivated(applicationVersions);
     }
 
     /**
      * Activates the config of the given app. Notifies listeners
      *
-     * @param applicationSet the {@link ApplicationSet} to be activated
+     * @param applicationVersions the {@link ApplicationVersions} to be activated
      */
-    public void activateApplication(ApplicationSet applicationSet, long activeSessionId) {
-        ApplicationId id = applicationSet.getId();
+    public void activateApplication(ApplicationVersions applicationVersions, long activeSessionId) {
+        ApplicationId id = applicationVersions.getId();
         try (@SuppressWarnings("unused") Lock lock = lock(id)) {
             if ( ! exists(id))
                 return; // Application was deleted before activation.
-            if (applicationSet.getApplicationGeneration() != activeSessionId)
+            if (applicationVersions.applicationGeneration() != activeSessionId)
                 return; // Application activated a new session before we got here.
 
-            setActiveApp(applicationSet);
-            notifyConfigActivationListeners(applicationSet);
+            setActiveApp(applicationVersions);
+            notifyConfigActivationListeners(applicationVersions);
         }
     }
 
@@ -281,13 +281,13 @@ public class TenantApplications implements RequestHandler, HostValidator {
         configActivationListener.applicationRemoved(applicationId);
     }
 
-    private void setActiveApp(ApplicationSet applicationSet) {
-        ApplicationId applicationId = applicationSet.getId();
-        Collection<String> hostsForApp = applicationSet.getAllHosts();
+    private void setActiveApp(ApplicationVersions applicationVersions) {
+        ApplicationId applicationId = applicationVersions.getId();
+        Collection<String> hostsForApp = applicationVersions.allHosts();
         hostRegistry.update(applicationId, hostsForApp);
-        applicationSet.updateHostMetrics();
+        applicationVersions.updateHostMetrics();
         tenantMetricUpdater.setApplications(applicationMapper.numApplications());
-        applicationMapper.register(applicationId, applicationSet);
+        applicationMapper.register(applicationId, applicationVersions);
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index 0e45d42efcf..328bd143d81 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -19,7 +19,7 @@ import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.application.Application;
 import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.deploy.ModelContextImpl;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.monitoring.Metrics;
@@ -51,7 +51,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     private final TenantName tenant;
     private final long applicationGeneration;
     private final SessionZooKeeperClient zkClient;
-    private final Optional<ApplicationSet> currentActiveApplicationSet;
+    private final Optional<ApplicationVersions> activeApplicationVersions;
     private final ConfigDefinitionRepo configDefinitionRepo;
     private final Metrics metrics;
     private final Curator curator;
@@ -62,7 +62,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     public ActivatedModelsBuilder(TenantName tenant,
                                   long applicationGeneration,
                                   SessionZooKeeperClient zkClient,
-                                  Optional<ApplicationSet> currentActiveApplicationSet,
+                                  Optional<ApplicationVersions> activeApplicationVersions,
                                   ExecutorService executor,
                                   Curator curator,
                                   Metrics metrics,
@@ -77,7 +77,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
         this.tenant = tenant;
         this.applicationGeneration = applicationGeneration;
         this.zkClient = zkClient;
-        this.currentActiveApplicationSet = currentActiveApplicationSet;
+        this.activeApplicationVersions = activeApplicationVersions;
         this.configDefinitionRepo = configDefinitionRepo;
         this.metrics = metrics;
         this.curator = curator;
@@ -122,8 +122,8 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     }
 
     private Optional<Model> modelOf(Version version) {
-        if (currentActiveApplicationSet.isEmpty()) return Optional.empty();
-        return currentActiveApplicationSet.get().get(version).map(Application::getModel);
+        if (activeApplicationVersions.isEmpty()) return Optional.empty();
+        return activeApplicationVersions.get().get(version).map(Application::getModel);
     }
 
     private static <T> Optional<T> getForVersionOrLatest(Map<Version, T> map, Version version) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index a89ba88bfbe..af611b131f6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -29,14 +29,13 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.vespa.config.server.application.Application;
 import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.deploy.ModelContextImpl;
 import com.yahoo.vespa.config.server.host.HostValidator;
 import com.yahoo.vespa.config.server.provision.HostProvisionerProvider;
 import com.yahoo.vespa.config.server.session.PrepareParams;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.flags.FlagSource;
-import com.yahoo.yolean.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -67,7 +66,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
     private final HostValidator hostValidator;
     private final PrepareParams params;
     private final FileRegistry fileRegistry;
-    private final Optional<ApplicationSet> currentActiveApplicationSet;
+    private final Optional<ApplicationVersions> activeApplicationVersions;
     private final Curator curator;
     private final ExecutorService executor;
 
@@ -84,7 +83,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                                  HostValidator hostValidator,
                                  DeployLogger deployLogger,
                                  PrepareParams params,
-                                 Optional<ApplicationSet> currentActiveApplicationSet,
+                                 Optional<ApplicationVersions> activeApplicationVersions,
                                  ConfigserverConfig configserverConfig,
                                  Zone zone) {
         super(modelFactoryRegistry, configserverConfig, zone, hostProvisionerProvider, deployLogger);
@@ -97,7 +96,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
         this.hostValidator = hostValidator;
         this.curator = curator;
         this.params = params;
-        this.currentActiveApplicationSet = currentActiveApplicationSet;
+        this.activeApplicationVersions = activeApplicationVersions;
         this.executor = executor;
     }
 
@@ -149,8 +148,8 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
     }
 
     private Optional<Model> modelOf(Version version) {
-        if (currentActiveApplicationSet.isEmpty()) return Optional.empty();
-        return currentActiveApplicationSet.get().get(version).map(Application::getModel);
+        if (activeApplicationVersions.isEmpty()) return Optional.empty();
+        return activeApplicationVersions.get().get(version).map(Application::getModel);
     }
 
     private HostProvisioner createHostProvisioner(ApplicationPackage applicationPackage, Provisioned provisioned) {
@@ -213,7 +212,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                                                zone(),
                                                Set.copyOf(containerEndpoints),
                                                params.isBootstrap(),
-                                               currentActiveApplicationSet.isEmpty(),
+                                               activeApplicationVersions.isEmpty(),
                                                LegacyFlags.from(applicationPackage, flagSource),
                                                endpointCertificateSecrets,
                                                params.athenzDomain(),
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index d26a22284c0..dd328c9a730 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -31,7 +31,7 @@ import com.yahoo.vespa.config.server.ConfigActivationListener;
 import com.yahoo.vespa.config.server.GetConfigContext;
 import com.yahoo.vespa.config.server.RequestHandler;
 import com.yahoo.vespa.config.server.SuperModelRequestHandler;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.filedistribution.FileServer;
 import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
@@ -260,16 +260,16 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
      * This method should be called when config is activated in the server.
      */
     @Override
-    public void configActivated(ApplicationSet applicationSet) {
-        ApplicationId applicationId = applicationSet.getId();
+    public void configActivated(ApplicationVersions applicationVersions) {
+        ApplicationId applicationId = applicationVersions.getId();
         ApplicationState state = getState(applicationId);
-        state.setActiveGeneration(applicationSet.getApplicationGeneration());
-        reloadSuperModel(applicationSet);
+        state.setActiveGeneration(applicationVersions.applicationGeneration());
+        reloadSuperModel(applicationVersions);
         configActivated(applicationId);
     }
 
-    private void reloadSuperModel(ApplicationSet applicationSet) {
-        superModelRequestHandler.activateConfig(applicationSet);
+    private void reloadSuperModel(ApplicationVersions applicationVersions) {
+        superModelRequestHandler.activateConfig(applicationVersions);
         configActivated(ApplicationId.global());
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index 12c61272f20..aa6d33fbda8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.config.server.session;
 
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -15,7 +15,7 @@ import java.util.Optional;
  */
 public class RemoteSession extends Session {
 
-    private final Optional<ApplicationSet> applicationSet;
+    private final Optional<ApplicationVersions> applicationVersions;
 
     /**
      * Creates a session. This involves loading the application, validating it and distributing it.
@@ -36,17 +36,17 @@ public class RemoteSession extends Session {
      * @param zooKeeperClient a SessionZooKeeperClient instance
      * @param applicationSet current application set for this session
      */
-    RemoteSession(TenantName tenant, long sessionId, SessionZooKeeperClient zooKeeperClient, Optional<ApplicationSet> applicationSet) {
+    RemoteSession(TenantName tenant, long sessionId, SessionZooKeeperClient zooKeeperClient, Optional<ApplicationVersions> applicationSet) {
         super(tenant, sessionId, zooKeeperClient);
-        this.applicationSet = applicationSet;
+        this.applicationVersions = applicationSet;
     }
 
     @Override
-    public Optional<ApplicationSet> applicationSet() { return applicationSet; }
+    public Optional<ApplicationVersions> applicationVersions() { return applicationVersions; }
 
-    public synchronized RemoteSession activated(ApplicationSet applicationSet) {
-        Objects.requireNonNull(applicationSet, "applicationSet cannot be null");
-        return new RemoteSession(tenant, sessionId, sessionZooKeeperClient, Optional.of(applicationSet));
+    public synchronized RemoteSession activated(ApplicationVersions applicationVersions) {
+        Objects.requireNonNull(applicationVersions, "applicationVersions cannot be null");
+        return new RemoteSession(tenant, sessionId, sessionZooKeeperClient, Optional.of(applicationVersions));
     }
 
     public synchronized RemoteSession deactivated() {
@@ -55,7 +55,7 @@ public class RemoteSession extends Session {
 
     @Override
     public String toString() {
-        return super.toString() + ",application set=" + applicationSet;
+        return super.toString() + ",application set=" + applicationVersions;
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index eb359f9ffc6..f354b5238b2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -17,7 +17,7 @@ import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.Transaction;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
@@ -184,7 +184,7 @@ public abstract class Session implements Comparable<Session>  {
         return getApplicationPackage().getFile(relativePath);
     }
 
-    Optional<ApplicationSet> applicationSet() { return Optional.empty(); }
+    Optional<ApplicationVersions> applicationVersions() { return Optional.empty(); }
 
     private void markSessionEdited() {
         setStatus(Session.Status.NEW);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 6c0120eb337..aeff97169f4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -34,7 +34,7 @@ import com.yahoo.net.HostName;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.config.server.ConfigServerSpec;
 import com.yahoo.vespa.config.server.TimeoutBudget;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.configchange.ConfigChangeActions;
 import com.yahoo.vespa.config.server.deploy.ZooKeeperDeployer;
 import com.yahoo.vespa.config.server.filedistribution.FileDistributionFactory;
@@ -125,14 +125,14 @@ public class SessionPreparer {
      * @param hostValidator               host validator
      * @param logger                      for storing logs returned in response to client.
      * @param params                      parameters controlling behaviour of prepare.
-     * @param activeApplicationSet        set of currently active applications.
+     * @param activeApplicationVersions   active application versions.
      * @return the config change actions that must be done to handle the activation of the models prepared.
      */
     public PrepareResult prepare(HostValidator hostValidator, DeployLogger logger, PrepareParams params,
-                                 Optional<ApplicationSet> activeApplicationSet, Instant now, File serverDbSessionDir,
+                                 Optional<ApplicationVersions> activeApplicationVersions, Instant now, File serverDbSessionDir,
                                  ApplicationPackage applicationPackage, SessionZooKeeperClient sessionZooKeeperClient) {
         ApplicationId applicationId = params.getApplicationId();
-        Preparation preparation = new Preparation(hostValidator, logger, params, activeApplicationSet,
+        Preparation preparation = new Preparation(hostValidator, logger, params, activeApplicationVersions,
                                                   TenantRepository.getTenantPath(applicationId.tenant()),
                                                   serverDbSessionDir, applicationPackage, sessionZooKeeperClient);
         preparation.preprocess();
@@ -184,7 +184,7 @@ public class SessionPreparer {
         private final FileRegistry fileRegistry;
 
         Preparation(HostValidator hostValidator, DeployLogger logger, PrepareParams params,
-                    Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath,
+                    Optional<ApplicationVersions> activeApplicationVersions, Path tenantPath,
                     File serverDbSessionDir, ApplicationPackage applicationPackage,
                     SessionZooKeeperClient sessionZooKeeperClient) {
             this.logger = logger;
@@ -217,7 +217,7 @@ public class SessionPreparer {
                                                                    hostValidator,
                                                                    logger,
                                                                    params,
-                                                                   currentActiveApplicationSet,
+                                                                   activeApplicationVersions,
                                                                    configserverConfig,
                                                                    zone);
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index eb8f78036ef..64793454517 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -22,7 +22,7 @@ import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.transaction.Transaction;
 import com.yahoo.vespa.config.server.ConfigServerDB;
 import com.yahoo.vespa.config.server.TimeoutBudget;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.configchange.ConfigChangeActions;
 import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
@@ -246,9 +246,9 @@ public class SessionRepository {
         Optional<CompletionWaiter> waiter = params.isDryRun()
                 ? Optional.empty()
                 : Optional.of(sessionZooKeeperClient.createPrepareWaiter());
-        Optional<ApplicationSet> activeApplicationSet = getActiveApplicationSet(params.getApplicationId());
+        Optional<ApplicationVersions> activeApplicationVersions = activeApplicationVersions(params.getApplicationId());
         ConfigChangeActions actions = sessionPreparer.prepare(applicationRepo, logger, params,
-                                                              activeApplicationSet, now, getSessionAppDir(sessionId),
+                                                              activeApplicationVersions, now, getSessionAppDir(sessionId),
                                                               session.getApplicationPackage(), sessionZooKeeperClient)
                 .getConfigChangeActions();
         setPrepared(session);
@@ -479,20 +479,20 @@ public class SessionRepository {
         notifyCompletion(waiter);
     }
 
-    public ApplicationSet ensureApplicationLoaded(RemoteSession session) {
-        if (session.applicationSet().isPresent()) {
-            return session.applicationSet().get();
+    public ApplicationVersions ensureApplicationLoaded(RemoteSession session) {
+        if (session.applicationVersions().isPresent()) {
+            return session.applicationVersions().get();
         }
         Optional<Long> activeSessionId = getActiveSessionId(session.getApplicationId());
-        Optional<ApplicationSet> previousApplicationSet = activeSessionId.filter(session::isNewerThan)
-                                                                         .flatMap(this::getApplicationSet);
-        ApplicationSet applicationSet = loadApplication(session, previousApplicationSet);
-        RemoteSession activated = session.activated(applicationSet);
+        Optional<ApplicationVersions> previousActiveApplicationVersions = activeSessionId.filter(session::isNewerThan)
+                                                                         .flatMap(this::activeApplicationVersions);
+        ApplicationVersions applicationVersions = loadApplication(session, previousActiveApplicationVersions);
+        RemoteSession activated = session.activated(applicationVersions);
         long sessionId = activated.getSessionId();
         remoteSessionCache.put(sessionId, activated);
         updateSessionStateWatcher(sessionId);
 
-        return applicationSet;
+        return applicationVersions;
     }
 
     void confirmUpload(Session session) {
@@ -526,7 +526,7 @@ public class SessionRepository {
         }
     }
 
-    private ApplicationSet loadApplication(Session session, Optional<ApplicationSet> previousApplicationSet) {
+    private ApplicationVersions loadApplication(Session session, Optional<ApplicationVersions> previousApplicationSet) {
         log.log(Level.FINE, () -> "Loading application for " + session);
         SessionZooKeeperClient sessionZooKeeperClient = createSessionZooKeeperClient(session.getSessionId());
         ActivatedModelsBuilder builder = new ActivatedModelsBuilder(session.getTenantName(),
@@ -543,12 +543,12 @@ public class SessionRepository {
                                                                     zone,
                                                                     modelFactoryRegistry,
                                                                     configDefinitionRepo);
-        return ApplicationSet.fromList(builder.buildModels(session.getApplicationId(),
-                                                           session.getDockerImageRepository(),
-                                                           session.getVespaVersion(),
-                                                           sessionZooKeeperClient.loadApplicationPackage(),
-                                                           new AllocatedHostsFromAllModels(),
-                                                           clock.instant()));
+        return ApplicationVersions.fromList(builder.buildModels(session.getApplicationId(),
+                                                                session.getDockerImageRepository(),
+                                                                session.getVespaVersion(),
+                                                                sessionZooKeeperClient.loadApplicationPackage(),
+                                                                new AllocatedHostsFromAllModels(),
+                                                                clock.instant()));
     }
 
     private void nodeChanged() {
@@ -775,11 +775,11 @@ public class SessionRepository {
         }
     }
 
-    public Optional<ApplicationSet> getActiveApplicationSet(ApplicationId appId) {
-        return applicationRepo.activeSessionOf(appId).flatMap(this::getApplicationSet);
+    public Optional<ApplicationVersions> activeApplicationVersions(ApplicationId appId) {
+        return applicationRepo.activeSessionOf(appId).flatMap(this::activeApplicationVersions);
     }
 
-    private Optional<ApplicationSet> getApplicationSet(long sessionId) {
+    private Optional<ApplicationVersions> activeApplicationVersions(long sessionId) {
         try {
             return Optional.ofNullable(getRemoteSession(sessionId)).map(this::ensureApplicationLoaded);
         } catch (IllegalArgumentException e) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 950a21e5750..c355be5090a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -326,7 +326,7 @@ public class ApplicationRepositoryTest {
             // Delete app and verify that it has been deleted from repos and no application set exists
             assertTrue(applicationRepository.delete(applicationId()));
             assertTrue(applicationRepository.getActiveSession(applicationId()).isEmpty());
-            assertEquals(Optional.empty(), sessionRepository.getRemoteSession(sessionId).applicationSet());
+            assertEquals(Optional.empty(), sessionRepository.getRemoteSession(sessionId).applicationVersions());
             assertTrue(curator.exists(sessionNode));
             assertEquals(Session.Status.DELETE.name(), Utf8.toString(curator.getData(sessionNode.append("sessionState")).get()));
             assertTrue(sessionFile.exists());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
index c3766ad9b83..1b4e9ad1231 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
@@ -7,7 +7,7 @@ import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
@@ -112,8 +112,8 @@ public class SuperModelRequestHandlerTest {
         assertTrue(controller.hasApplication(ApplicationId.global(), Optional.empty()));
     }
 
-    private ApplicationSet createApp(ApplicationId applicationId, long generation) throws IOException, SAXException {
-        return ApplicationSet.from(
+    private ApplicationVersions createApp(ApplicationId applicationId, long generation) throws IOException, SAXException {
+        return ApplicationVersions.from(
                 new TestApplication(
                         new VespaModel(FilesApplicationPackage.fromFile(testApp)),
                         new ServerCache(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
index 57af219c813..fb5d6537a19 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
@@ -38,7 +38,7 @@ public class ApplicationMapperTest {
 
     @Test
     public void testGetForVersionReturnsCorrectVersion() {
-        applicationMapper.register(appId, ApplicationSet.fromList(applications));
+        applicationMapper.register(appId, ApplicationVersions.fromList(applications));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
@@ -46,19 +46,19 @@ public class ApplicationMapperTest {
 
     @Test
     public void testGetForVersionReturnsLatestVersion() {
-        applicationMapper.register(appId, ApplicationSet.fromList(applications));
+        applicationMapper.register(appId, ApplicationVersions.fromList(applications));
         assertEquals(applicationMapper.getForVersion(appId, Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionThrows() {
-        applicationMapper.register(appId, ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2))));
+        applicationMapper.register(appId, ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2))));
         applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
     @Test (expected = NotFoundException.class)
     public void testGetForVersionThrows2() {
-        applicationMapper.register(appId, ApplicationSet.from(applications.get(0)));
+        applicationMapper.register(appId, ApplicationVersions.from(applications.get(0)));
 
         applicationMapper.getForVersion(new ApplicationId.Builder()
                                                 .tenant("different")
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java
index 7629680b16f..d0a3bf4ec9b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java
@@ -18,9 +18,9 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Vegard Sjonfjell
  */
-public class ApplicationSetTest {
+public class ApplicationVersionsTest {
 
-    private ApplicationSet applicationSet;
+    private ApplicationVersions applicationVersions;
     private final List<Version> vespaVersions = new ArrayList<>();
     private final List<Application> applications = new ArrayList<>();
 
@@ -32,29 +32,29 @@ public class ApplicationSetTest {
 
     @Test
     public void testGetForVersionOrLatestReturnsCorrectVersion() {
-        applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
+        applicationVersions = ApplicationVersions.fromList(applications);
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
     }
 
     @Test
     public void testGetForVersionOrLatestReturnsLatestVersion() {
-        applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()), applications.get(2));
+        applicationVersions = ApplicationVersions.fromList(applications);
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionOrLatestThrows() {
-        applicationSet = ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2)));
-        applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now());
+        applicationVersions = ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2)));
+        applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
     @Test
     public void testGetAllVersions() {
-        applicationSet = ApplicationSet.fromList(applications);
+        applicationVersions = ApplicationVersions.fromList(applications);
         assertEquals(List.of(Version.fromString("1.2.3"), Version.fromString("1.2.4"), Version.fromString("1.2.5")),
-                     applicationSet.getAllVersions(ApplicationId.defaultId()));
+                     applicationVersions.versions(ApplicationId.defaultId()));
     }
 
     private Application createApplication(Version version) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 2ad04fdd572..a380a01b855 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -145,17 +145,17 @@ public class TenantApplicationsTest {
         assertEquals(0, repo.activeApplications().size());
     }
 
-    private static ApplicationSet createSet(ApplicationId id, Version version) throws IOException, SAXException {
+    private static ApplicationVersions createApplicationVersions(ApplicationId id, Version version) throws IOException, SAXException {
         VespaModel model = new VespaModel(new NullConfigModelRegistry(),
                                           new DeployState.Builder().wantedNodeVespaVersion(version)
                                                                    .applicationPackage(FilesApplicationPackage.fromFile(new File("src/test/apps/app")))
                                                                    .build());
-        return ApplicationSet.from(new Application(model,
-                                                   new ServerCache(),
-                                                   1,
-                                                   Version.emptyVersion,
-                                                   MetricUpdater.createTestUpdater(),
-                                                   id));
+        return ApplicationVersions.from(new Application(model,
+                                                        new ServerCache(),
+                                                        1,
+                                                        Version.emptyVersion,
+                                                        MetricUpdater.createTestUpdater(),
+                                                        id));
     }
 
     @Test
@@ -167,19 +167,19 @@ public class TenantApplicationsTest {
         applications.createPutTransaction(app1, 1).commit();
 
         Version deployedVersion0 = Version.fromString("6.1");
-        applications.activateApplication(createSet(app1, deployedVersion0), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion0), 1);
         assertTrue("Empty version is compatible", applications.compatibleWith(Optional.empty(), app1));
 
         Version nodeVersion0 = Version.fromString("6.0");
         assertTrue("Lower version is compatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         Version deployedVersion1 = Version.fromString("7.1");
-        applications.activateApplication(createSet(app1, deployedVersion1), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion1), 1);
         assertTrue("New major is compatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         flagSource.withListFlag(PermanentFlags.INCOMPATIBLE_VERSIONS.id(), List.of("8"), String.class);
         Version deployedVersion2 = Version.fromString("8.1");
-        applications.activateApplication(createSet(app1, deployedVersion2), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion2), 1);
         assertFalse("New major is incompatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         Version nodeVersion1 = Version.fromString("8.0");
@@ -191,7 +191,7 @@ public class TenantApplicationsTest {
         final AtomicInteger removed = new AtomicInteger(0);
 
         @Override
-        public void configActivated(ApplicationSet application) {
+        public void configActivated(ApplicationVersions application) {
             activated.incrementAndGet();
         }
 
@@ -210,12 +210,12 @@ public class TenantApplicationsTest {
         ApplicationId applicationId = ApplicationId.defaultId();
         applications.createApplication(applicationId);
         applications.createPutTransaction(applicationId, 1).commit();
-        applications.activateApplication(ApplicationSet.from(new Application(model,
-                                                                             new ServerCache(),
-                                                                             1,
-                                                                             vespaVersion,
-                                                                             MetricUpdater.createTestUpdater(),
-                                                                             applicationId)),
+        applications.activateApplication(ApplicationVersions.from(new Application(model,
+                                                                                  new ServerCache(),
+                                                                                  1,
+                                                                                  vespaVersion,
+                                                                                  MetricUpdater.createTestUpdater(),
+                                                                                  applicationId)),
                                          1);
         Set<ConfigKey<?>> configNames = applications.listConfigs(applicationId, Optional.of(vespaVersion), false);
         assertTrue(configNames.contains(new ConfigKey<>("sentinel", "hosts", "cloud.config")));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index ba1d69c13dd..6a4099bc45a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -66,7 +66,7 @@ public class HostHandlerTest {
     public void require_correct_tenant_and_application_for_hostname() throws Exception {
         ApplicationId applicationId = applicationId();
         applicationRepository.deploy(testApp, new PrepareParams.Builder().applicationId(applicationId).build());
-        String hostname = applicationRepository.getActiveApplicationSet(applicationId).get().getAllHosts().iterator().next();
+        String hostname = applicationRepository.getActiveApplicationSet(applicationId).get().allHosts().iterator().next();
         assertApplicationForHost(hostname, applicationId);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
index 9190cbc0d8a..8db86aa4dec 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
@@ -25,7 +25,7 @@ import com.yahoo.vespa.config.protocol.Trace;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.session.PrepareParams;
 import com.yahoo.vespa.filedistribution.LazyFileReferenceData;
@@ -142,7 +142,7 @@ public class RpcServerTest {
                                           new Version(1, 2, 3),
                                           MetricUpdater.createTestUpdater(),
                                           applicationId);
-        ApplicationSet appSet = ApplicationSet.from(app);
+        ApplicationVersions appSet = ApplicationVersions.from(app);
         tester.rpcServer().configActivated(appSet);
         ConfigKey<?> key = new ConfigKey<>(LbServicesConfig.class, "*");
         JRTClientConfigRequest clientReq  = createRequest(new RawConfig(key, LbServicesConfig.getDefMd5()));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
index 07d3aac5a52..bb71cbd35d4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
@@ -19,7 +19,7 @@ import com.yahoo.io.reader.NamedReader;
 import com.yahoo.path.Path;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.ApplicationRepository;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.OrchestratorMock;
 import com.yahoo.vespa.config.server.filedistribution.MockFileDistributionFactory;
 import com.yahoo.vespa.config.server.http.InvalidApplicationException;
@@ -115,11 +115,11 @@ public class SessionRepositoryTest {
         assertNotNull(sessionRepository.getLocalSession(secondSessionId));
         assertNull(sessionRepository.getLocalSession(secondSessionId + 1));
 
-        ApplicationSet applicationSet = sessionRepository.ensureApplicationLoaded(sessionRepository.getRemoteSession(firstSessionId));
-        assertNotNull(applicationSet);
-        assertEquals(2, applicationSet.getApplicationGeneration());
-        assertEquals(applicationId.application(), applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application());
-        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
+        ApplicationVersions applicationVersions = sessionRepository.ensureApplicationLoaded(sessionRepository.getRemoteSession(firstSessionId));
+        assertNotNull(applicationVersions);
+        assertEquals(2, applicationVersions.applicationGeneration());
+        assertEquals(applicationId.application(), applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application());
+        assertNotNull(applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
 
         LocalSession session = sessionRepository.getLocalSession(secondSessionId);
         Collection<NamedReader> a = session.applicationPackage.get().getSchemas();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 9af1bbb875e..7cfe96bf30e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -17,7 +17,7 @@ import com.yahoo.vespa.config.server.MockSecretStore;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.TestConfigDefinitionRepo;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.application.TenantApplicationsTest;
 import com.yahoo.vespa.config.server.filedistribution.FileDirectory;
@@ -107,12 +107,12 @@ public class TenantRepositoryTest {
         ApplicationId id = ApplicationId.from(tenant1, ApplicationName.defaultName(), InstanceName.defaultName());
         applicationRepo.createApplication(id);
         applicationRepo.createPutTransaction(id, 4).commit();
-        applicationRepo.activateApplication(ApplicationSet.from(new Application(new VespaModel(MockApplicationPackage.createEmpty()),
-                                                                                new ServerCache(),
-                                                                                4L,
-                                                                                new Version(1, 2, 3),
-                                                                                MetricUpdater.createTestUpdater(),
-                                                                                id)),
+        applicationRepo.activateApplication(ApplicationVersions.from(new Application(new VespaModel(MockApplicationPackage.createEmpty()),
+                                                                                     new ServerCache(),
+                                                                                     4L,
+                                                                                     new Version(1, 2, 3),
+                                                                                     MetricUpdater.createTestUpdater(),
+                                                                                     id)),
                                             4);
         assertEquals(1, listener.activated.get());
     }