Rename bundle loader classes and fields for consistency.

* BundleManager -> ApplicationBundleLoader
* PlatformBundleInstaller -> PlatformBundleLoader

1 files changed, 6 insertions, 6 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 1677da1896d..cf38e49497c 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -101,16 +101,16 @@ public class HandlersConfigurerDi {
     private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper {
 
         private final OsgiFramework osgiFramework;
-        private final BundleManager bundleManager;
-        private final PlatformBundleInstaller platformBundleInstaller;
+        private final ApplicationBundleLoader applicationBundleLoader;
+        private final PlatformBundleLoader platformBundleLoader;
 
         public ContainerAndDiOsgi(OsgiFramework osgiFramework) {
             super(osgiFramework);
             this.osgiFramework = osgiFramework;
 
             OsgiImpl osgi = new OsgiImpl(osgiFramework);
-            bundleManager = new BundleManager(osgi);
-            platformBundleInstaller = new PlatformBundleInstaller(osgi);
+            applicationBundleLoader = new ApplicationBundleLoader(osgi);
+            platformBundleLoader = new PlatformBundleLoader(osgi);
         }
 
 
@@ -137,13 +137,13 @@ public class HandlersConfigurerDi {
         @Override
         public void installPlatformBundles(Collection<FileReference> bundles) {
             log.fine("Installing platform bundles.");
-            platformBundleInstaller.install(bundles);
+            platformBundleLoader.install(bundles);
         }
 
         @Override
         public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) {
             log.info("Installing bundles from the latest application");
-            return bundleManager.use(new ArrayList<>(bundles));
+            return applicationBundleLoader.use(new ArrayList<>(bundles));
         }
     }