Deprecate 'jdisc', and update all tests to use 'container.

41 files changed, 222 insertions, 211 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 57e0b969929..672ee0bb161 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -83,20 +83,22 @@ import java.util.logging.Level;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static java.util.logging.Level.WARNING;
+
 /**
  * @author Tony Vaagenes
  * @author gjoranv
  */
 public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
-    /**
-     * Default path to vip status file for container in Hosted Vespa.
-     */
+    // Default path to vip status file for container in Hosted Vespa.
     static final String HOSTED_VESPA_STATUS_FILE = Defaults.getDefaults().underVespaHome("var/vespa/load-balancer/status.html");
-    /**
-     * Path to vip status file for container in Hosted Vespa. Only used if set, else use HOSTED_VESPA_STATUS_FILE
-     */
+
+    //Path to vip status file for container in Hosted Vespa. Only used if set, else use HOSTED_VESPA_STATUS_FILE
     private static final String HOSTED_VESPA_STATUS_FILE_SETTING = "VESPA_LB_STATUS_FILE";
+
+    private static final String TAG_NAME = "container";
+    private static final String DEPRECATED_TAG_NAME = "jdisc";
     private static final String ENVIRONMENT_VARIABLES_ELEMENT = "environment-variables";
 
     public enum Networking { disable, enable }
@@ -109,7 +111,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     protected DeployLogger log;
 
     public static final List<ConfigModelId> configModelIds =  
-            ImmutableList.of(ConfigModelId.fromName("container"), ConfigModelId.fromName("jdisc"));
+            ImmutableList.of(ConfigModelId.fromName(TAG_NAME), ConfigModelId.fromName(DEPRECATED_TAG_NAME));
 
     private static final String xmlRendererId = RendererRegistry.xmlRendererId.getName();
     private static final String jsonRendererId = RendererRegistry.jsonRendererId.getName();
@@ -130,10 +132,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     @Override
     public void doBuild(ContainerModel model, Element spec, ConfigModelContext modelContext) {
+        log = modelContext.getDeployLogger();
         app = modelContext.getApplicationPackage();
+
         checkVersion(spec);
+        checkTagName(spec, log);
 
-        this.log = modelContext.getDeployLogger();
         ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
         addBundlesForPlatformComponents(cluster);
@@ -423,6 +427,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         }
     }
 
+    private void checkTagName(Element spec, DeployLogger logger) {
+        if (spec.getTagName().equals(DEPRECATED_TAG_NAME)) {
+            logger.log(WARNING, "'" + DEPRECATED_TAG_NAME + "' is deprecated as tag name. Use '" + TAG_NAME + "' instead.");
+        }
+    }
+
     private void addNodes(ApplicationContainerCluster cluster, Element spec, ConfigModelContext context) {
         if (standaloneBuilder)
             addStandaloneNode(cluster);
@@ -462,7 +472,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         } else {
             jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME);
             if (incompatibleGCOptions(jvmOptions)) {
-                deployLogger.log(Level.WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'");
+                deployLogger.log(WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'");
                 cluster.setJvmGCOptions(ContainerCluster.G1GC);
             }
         }
diff --git a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
index c8a89775d27..2efbc08a68f 100644
--- a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
+++ b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <services version="1.0">
-  <jdisc version="1.0">
+  <container version="1.0">
       <search />
-  </jdisc>
+  </container>
 </services>
diff --git a/config-model/src/test/cfg/application/include_dirs/services.xml b/config-model/src/test/cfg/application/include_dirs/services.xml
index dbd41cec43a..4374cc78bb0 100644
--- a/config-model/src/test/cfg/application/include_dirs/services.xml
+++ b/config-model/src/test/cfg/application/include_dirs/services.xml
@@ -7,7 +7,7 @@
     <logserver hostalias="node1" />
   </admin>
 
-  <jdisc id="default" version="1.0">
+  <container id="default" version="1.0">
   <!--  <component id="test.Exampledocproc"/> -->
     <components>
       <include dir="jdisc_dir"/>
@@ -21,6 +21,6 @@
     <nodes>
       <node hostalias="node1" />
     </nodes>
-  </jdisc>
+  </container>
 
 </services>
diff --git a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml
index 47f25d86d58..9763dda556e 100644
--- a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml
+++ b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml
@@ -1,3 +1,3 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<jdisc>
-</jdisc>
+<container>
+</container>
diff --git a/config-model/src/test/cfg/container/data/configserverinclude/services.xml b/config-model/src/test/cfg/container/data/configserverinclude/services.xml
index 73d924f762d..5691922ec7f 100644
--- a/config-model/src/test/cfg/container/data/configserverinclude/services.xml
+++ b/config-model/src/test/cfg/container/data/configserverinclude/services.xml
@@ -2,9 +2,9 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <services version="1.0">
 
-  <jdisc id='configserver' version="1.0">
+  <container id='configserver' version="1.0">
     <http>
       <server id="configserver" port="1234" />
     </http>
-  </jdisc>
+  </container>
 </services>
diff --git a/config-model/src/test/cfg/container/data/include_xml_error/services.xml b/config-model/src/test/cfg/container/data/include_xml_error/services.xml
index 4e703c7e40c..e6b749ce8c5 100644
--- a/config-model/src/test/cfg/container/data/include_xml_error/services.xml
+++ b/config-model/src/test/cfg/container/data/include_xml_error/services.xml
@@ -7,7 +7,7 @@
     <logserver hostalias="node1" />
   </admin>
 
-  <jdisc version="1.0">
+  <container version="1.0">
     <search>
       <include dir='dir1'/>
     </search>
@@ -15,6 +15,6 @@
     <nodes>
       <node hostalias="node1" />
     </nodes>
-  </jdisc>
+  </container>
 
 </services>
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
index 7256c9ccdb0..19d7def5787 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
@@ -127,7 +127,7 @@ public class HostsXmlProvisionerTest {
 
     @Test
     public void require_singlenode_HostAlias_is_used_if_hosts_xml() {
-        String servicesXml = "<jdisc id='default' version='1.0' />";
+        String servicesXml = "<container id='default' version='1.0' />";
         HostsXmlProvisioner hostProvisioner = createProvisioner(oneHost);
         HostSpec hostSpec = hostProvisioner.allocateHost(Container.SINGLENODE_CONTAINER_SERVICESPEC);
         assertThat(hostSpec.hostname(), is("test1.yahoo.com"));
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 82841b52984..dc0312aef8e 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -73,19 +73,19 @@ public class ModelProvisioningTest {
                         "<services>\n" +
                         "\n" +
                         "<admin version='3.0'><nodes count='1' /></admin>\n" +
-                        "<jdisc id='mydisc' version='1.0'>" +
+                        "<container id='mydisc' version='1.0'>" +
                         "  <handler id='myHandler'>" +
                         "    <component id='injected' />" +
                         "  </handler>" +
                         "  <nodes count=\"3\"/>" +
-                        "</jdisc>" +
-                        "<jdisc id='mydisc2' version='1.0'>" +
+                        "</container>" +
+                        "<container id='mydisc2' version='1.0'>" +
                         "  <document-processing/>" +
                         "  <handler id='myHandler'>" +
                         "    <component id='injected' />" +
                         "  </handler>" +
                         "  <nodes count='2' allocated-memory='45%' jvm-gc-options='-XX:+UseParNewGC' jvm-options='-verbosegc' preload='lib/blablamalloc.so'/>" +
-                        "</jdisc>" +
+                        "</container>" +
                         "</services>";
         String hosts ="<hosts>"
                 + " <host name='myhost0'>"
@@ -1232,19 +1232,19 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testJDiscOnly() {
+    public void testContainerOnly() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<jdisc version='1.0'>" +
+                        "<container version='1.0'>" +
                         "  <search/>" +
                         "  <nodes count='3'/>" +
-                        "</jdisc>";
+                        "</container>";
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
         assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
-        assertEquals(3, model.getContainerClusters().get("jdisc").getContainers().size());
+        assertEquals(3, model.getContainerClusters().get("container").getContainers().size());
         assertNotNull(model.getAdmin().getLogserver());
         assertEquals(3, model.getAdmin().getSlobroks().size());
     }
@@ -1253,42 +1253,42 @@ public class ModelProvisioningTest {
     public void testJvmArgs() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<jdisc version='1.0'>" +
+                        "<container version='1.0'>" +
                         "  <search/>" +
                         "  <nodes jvmargs='xyz' count='3'/>" +
-                        "</jdisc>";
+                        "</container>";
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
         assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
-        assertEquals("xyz", model.getContainerClusters().get("jdisc").getContainers().get(0).getAssignedJvmOptions());
+        assertEquals("xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
     }
 
     @Test
     public void testJvmOptions() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<jdisc version='1.0'>" +
+                        "<container version='1.0'>" +
                         "  <search/>" +
                         "  <nodes jvm-options='xyz' count='3'/>" +
-                        "</jdisc>";
+                        "</container>";
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
         VespaModel model = tester.createModel(services, true);
         assertEquals(numberOfHosts, model.getRoot().getHostSystem().getHosts().size());
-        assertEquals("xyz", model.getContainerClusters().get("jdisc").getContainers().get(0).getAssignedJvmOptions());
+        assertEquals("xyz", model.getContainerClusters().get("container").getContainers().get(0).getAssignedJvmOptions());
     }
 
     @Test
     public void testJvmOptionsOverridesJvmArgs() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<jdisc version='1.0'>" +
+                        "<container version='1.0'>" +
                         "  <search/>" +
                         "  <nodes jvm-options='xyz' jvmargs='abc' count='3'/>" +
-                        "</jdisc>";
+                        "</container>";
         int numberOfHosts = 3;
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
@@ -1309,14 +1309,14 @@ public class ModelProvisioningTest {
                         "<admin version='2.0'>" +
                         "  <adminserver hostalias='node1'/>\n"+
                         "</admin>\n" +
-                        "<jdisc id='mydisc' version='1.0'>" +
+                        "<container id='mydisc' version='1.0'>" +
                         "  <handler id='myHandler'>" +
                         "    <component id='injected' />" +
                         "  </handler>" +
                         "  <nodes>" +
                         "    <node hostalias='node1'/>" +
                         "  </nodes>" +
-                        "</jdisc>" +
+                        "</container>" +
                         "</services>";
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
@@ -1329,11 +1329,11 @@ public class ModelProvisioningTest {
     public void testThatStandaloneSyntaxWorksOnHostedVespa() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>" +
-                "<jdisc id='foo' version='1.0'>" +
+                "<container id='foo' version='1.0'>" +
                 "  <http>" +
                 "    <server id='server1' port='" + getDefaults().vespaWebServicePort() + "' />" +
                 "  </http>" +
-                "</jdisc>";
+                "</container>";
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
@@ -1346,10 +1346,10 @@ public class ModelProvisioningTest {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
-                "  <jdisc id='foo' version='1.0'>" +
+                "  <container id='foo' version='1.0'>" +
                 "    <search/>" +
                 "    <document-api/>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='bar'>" +
                 "     <documents>" +
                 "       <document type='type1' mode='index'/>" +
@@ -1370,10 +1370,10 @@ public class ModelProvisioningTest {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
-                "  <jdisc id='foo' version='1.0'>" +
+                "  <container id='foo' version='1.0'>" +
                 "    <search/>" +
                 "    <document-api/>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "</services>";
         VespaModelTester tester = new VespaModelTester();
         tester.addHosts(1);
@@ -1388,10 +1388,10 @@ public class ModelProvisioningTest {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
-                "  <jdisc id='foo' version='1.0'>" +
+                "  <container id='foo' version='1.0'>" +
                 "    <search/>" +
                 "    <document-api/>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='bar'>" +
                 "     <documents>" +
                 "       <document type='type1' mode='index'/>" +
@@ -1413,11 +1413,11 @@ public class ModelProvisioningTest {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
-                "  <jdisc id='foo' version='1.0'>" +
+                "  <container id='foo' version='1.0'>" +
                 "    <search/>" +
                 "    <document-api/>" +
                 "    <nodes><node hostalias='foo'/></nodes>"+
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='bar'>" +
                 "     <documents>" +
                 "       <document type='type1' mode='index'/>" +
@@ -1444,12 +1444,12 @@ public class ModelProvisioningTest {
         "  <admin version='2.0'>" +
         "    <adminserver hostalias='node1'/>" +
         "  </admin>"  +
-        "   <jdisc id='default' version='1.0'>" +
+        "   <container id='default' version='1.0'>" +
         "     <search/>" +
         "     <nodes>" +
         "       <node hostalias='node1'/>" +
         "     </nodes>" +
-        "   </jdisc>" +
+        "   </container>" +
         "   <content id='storage' version='1.0'>" +
         "     <redundancy>2</redundancy>" +
         "     <group>" +
@@ -1593,12 +1593,12 @@ public class ModelProvisioningTest {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='node1'/>" +
                 "  </admin>"  +
-                "   <jdisc id='default' version='1.0'>" +
+                "   <container id='default' version='1.0'>" +
                 "     <search/>" +
                 "     <nodes>" +
                 "       <node hostalias='node1'/>" +
                 "     </nodes>" +
-                "   </jdisc>" +
+                "   </container>" +
                 "   <content id='storage' version='1.0'>" +
                 "     <redundancy>2</redundancy>" +
                 "     <group>" +
@@ -1655,14 +1655,14 @@ public class ModelProvisioningTest {
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                         "<services>" +
                         "  <admin version='4.0'/>" +
-                        "  <jdisc version='1.0' id='jdisc0'>" +
+                        "  <container version='1.0' id='jdisc0'>" +
                         "     <search/>" +
                         "     <nodes count='2'/>" +
-                        "  </jdisc>" +
-                        "  <jdisc version='1.0' id='jdisc1'>" +
+                        "  </container>" +
+                        "  <container version='1.0' id='jdisc1'>" +
                         "     <search/>" +
                         "     <nodes count='2'/>" +
-                        "  </jdisc>" +
+                        "  </container>" +
                         "  <content version='1.0' id='content0'>" +
                         "     <redundancy>2</redundancy>" +
                         "     <documents>" +
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
index 62c12fcfa6a..acb5b95d3fe 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
@@ -61,10 +61,10 @@ public class SingleNodeProvisionerTest {
                            + "  <admin version='3.0'>"
                            + "    <nodes count='1' />"
                            + "  </admin>"
-                           + "  <jdisc version='1.0'>"
+                           + "  <container version='1.0'>"
                            + "    <search />"
                            + "    <nodes count='1' />"
-                           + "  </jdisc>"
+                           + "  </container>"
                            + "</services>";
         ApplicationPackage app = new MockApplicationPackage.Builder().withServices(servicesXml).build();
         VespaModel model = new VespaModel(app);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
index febccaca3a5..90ec1779f39 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
@@ -96,9 +96,9 @@ public class VespaModelFactoryTest {
                         "    <admin version='2.0'>\n" +
                         "        <adminserver hostalias='proxy1' />\n" +
                         "    </admin>" +
-                        "    <jdisc id='" + routingClusterName + "' version='1.0'>\n" +
+                        "    <container id='" + routingClusterName + "' version='1.0'>\n" +
                         "        <nodes type='proxy'/>\n" +
-                        "    </jdisc>\n" +
+                        "    </container>\n" +
                         "</services>";
 
         HostProvisioner provisionerToOverride = new HostProvisioner() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index 77f31993a7f..ac76783c2af 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -115,18 +115,18 @@ public class DedicatedAdminV4Test {
                     "  <admin version='4.0'>" +
                     "    <nodes count='1' dedicated='true' />" +
                     "  </admin>" +
-                    "  <jdisc id='a' version='1.0'>" +
+                    "  <container id='a' version='1.0'>" +
                     "    <search />" +
                     "    <nodes count='2' dedicated='true' />" +
-                    "  </jdisc>" +
-                    "  <jdisc id='b' version='1.0'>" +
+                    "  </container>" +
+                    "  <container id='b' version='1.0'>" +
                     "    <search />" +
                     "    <nodes count='1' dedicated='true' />" +
-                    "  </jdisc>" +
-                    "  <jdisc id='c' version='1.0'>" +
+                    "  </container>" +
+                    "  <container id='c' version='1.0'>" +
                     "    <search />" +
                     "    <nodes count='1' dedicated='true' />" +
-                    "  </jdisc>" +
+                    "  </container>" +
                     "</services>";
 
         VespaModel model = createModel(hosts, servicesWith3JdiscClusters);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidatorTest.java
index 86e9ccb8a29..5fc3f815b09 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidatorTest.java
@@ -33,12 +33,12 @@ public class DeploymentFileValidatorTest {
                 "  <admin  version='2.0'>" +
                 "    <adminserver hostalias='node0' />" +
                 "  </admin>" +
-                "  <jdisc id='default' version='1.0'>" +
+                "  <container id='default' version='1.0'>" +
                 "    <search/>" +
                 "      <nodes>" +
                 "        <node hostalias='node0'/>" +
                 "     </nodes>" +
-                "   </jdisc>" +
+                "   </container>" +
                 "</services>";
 
         final String deploymentSpec = "<?xml version='1.0' encoding='UTF-8'?>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index 6d9eabf326b..eeeb5344e0b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -182,12 +182,12 @@ public class ConfigValueChangeValidatorTest {
                         "    <admin version='2.0'>\n" +
                         "      <adminserver hostalias='node1'/>\n" +
                         "    </admin>\n" +
-                        "    <jdisc id='default' version='1.0'>\n" +
+                        "    <container id='default' version='1.0'>\n" +
                         "       <search/>\n" +
                         "       <nodes>\n" +
                         "           <node hostalias='node1'/>\n" +
                         "       </nodes>\n" +
-                        "   </jdisc>\n" +
+                        "   </container>\n" +
                         "   <content id='basicsearch' version='1.0'>\n" +
                         "       <redundancy>1</redundancy>\n" +
                         createDocumentsSegment(docTypes) + "\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
index 1a6bd89bb3f..c1730528a39 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
@@ -54,27 +54,27 @@ public class ContainerRestartValidatorTest {
                 null,
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services version='1.0'>\n" +
-                "    <jdisc id='cluster1' version='1.0'>\n" +
+                "    <container id='cluster1' version='1.0'>\n" +
                 "       <http>\n" +
                 "           <server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "'/>\n" +
                 "       </http>\n" +
                 "       <config name='container.qr'>\n" +
                 "           <restartOnDeploy>" + restartOnDeploy + "</restartOnDeploy>\n" +
                 "       </config>\n" +
-                "   </jdisc>\n" +
-                "   <jdisc id='cluster2' version='1.0'>\n" +
+                "   </container>\n" +
+                "   <container id='cluster2' version='1.0'>\n" +
                 "       <http>\n" +
                 "           <server id='server2' port='4090'/>\n" +
                 "       </http>\n" +
                 "       <config name='container.qr'>\n" +
                 "           <restartOnDeploy>" + restartOnDeploy + "</restartOnDeploy>\n" +
                 "       </config>\n" +
-                "   </jdisc>\n" +
-                "   <jdisc id='cluster3' version='1.0'>\n" +
+                "   </container>\n" +
+                "   <container id='cluster3' version='1.0'>\n" +
                 "       <http>\n" +
                 "           <server id='server3' port='4100'/>\n" +
                 "       </http>\n" +
-                "   </jdisc>\n" +
+                "   </container>\n" +
                 "</services>"
         ).create();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
index b4cdac9b241..b90c3173bec 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
@@ -21,13 +21,13 @@ public class Bug6068056Test {
             "    <adminserver hostalias=\"node1\" />" +
             "  </admin>" +
 
-            "  <jdisc id=\"docproc\" version=\"1.0\">" +
+            "  <container id=\"docproc\" version=\"1.0\">" +
             "    <search/>" +
             "    <document-processing/>" +
             "    <nodes>" +
             "      <node hostalias=\"node1\"/>" +
             "    </nodes>" +
-            "  </jdisc>" +
+            "  </container>" +
 
             "<content version='1.0' id='music'>\n" +
             "     <redundancy>1</redundancy>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index e7a1cbd6d8b..c0dd894695e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -723,13 +723,13 @@ public class ContentBuilderTest extends DomBuilderTest {
                 "      <node hostalias='mockhost' distribution-key='0' />\n" +
                 "    </group>\n" +
                 "  </content>\n" +
-                "  <jdisc version='1.0' id='qrc'>" +
+                "  <container version='1.0' id='qrc'>" +
                 "      <search/>" +
                 "      <nodes>" +
                 "        <node hostalias='mockhost' />" +
                 "      </nodes>" +
-                "  </jdisc>" +
-                "  <jdisc version='1.0' id='qrc2'>" +
+                "  </container>" +
+                "  <container version='1.0' id='qrc2'>" +
                 "      <http>" +
                 "      <server id ='server1' port='5000' />" +
                 "      </http>" +
@@ -738,7 +738,7 @@ public class ContentBuilderTest extends DomBuilderTest {
                 "        <node hostalias='mockhost' />" +
                 "        <node hostalias='mockhost2' />" +
                 "      </nodes>" +
-                "  </jdisc>"
+                "  </container>"
 
         );
         List<Dispatch> tlds = content.getSearch().getIndexed().getTLDs();
@@ -919,12 +919,12 @@ public class ContentBuilderTest extends DomBuilderTest {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='mockhost'/>" +
                 "  </admin>" +
-                "  <jdisc version='1.0' id='qrc'>" +
+                "  <container version='1.0' id='qrc'>" +
                 "      <search/>" +
                 "      <nodes>" +
                 "        <node hostalias='mockhost' />" +
                 "      </nodes>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='clu'>" +
                 "    <documents>" +
                 "      <document type='music' mode='index'>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index 708d38d8ebb..2a41f972eb3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -148,11 +148,11 @@ public class ConfigserverClusterTest {
 
     private static <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> clazz, TestOptions testOptions) {
         AbstractConfigProducerRoot root = new MockRoot();
-        String services = "<jdisc id='standalone' version='1.0'>"
+        String services = "<container id='standalone' version='1.0'>"
                 + "  <http>"
                 + "    <server port='1337' id='configserver' />"
                 + "  </http>"
-                + "</jdisc>";
+                + "</container>";
         new ConfigServerContainerModelBuilder(testOptions)
                 .build(new DeployState.Builder().build(), null, null, root, XML.getDocument(services).getDocumentElement());
         root.freezeModelTopology();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java
index 3edc70833d8..d346d98103d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/docproc/StandaloneDocprocContainerTest.java
@@ -35,7 +35,7 @@ public class StandaloneDocprocContainerTest extends DomBuilderTest {
 
     private Element servicesXml() {
         return parse("" +
-                "<jdisc version=\"1.0\">\n" +
+                "<container version=\"1.0\">\n" +
                 "    <document-processing>\n" +
                 "        <chain id=\"foo\">\n" +
                 "            <documentprocessor id=\"MyDocproc\"/>\n" +
@@ -44,7 +44,7 @@ public class StandaloneDocprocContainerTest extends DomBuilderTest {
                 "    <nodes>\n" +
                 "        <node hostalias=\"node01\"/>\n" +
                 "    </nodes>\n" +
-                "</jdisc>\n");
+                "</container>\n");
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
index b6d63af180d..9056a30eda2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
@@ -83,7 +83,7 @@ public class FilterBindingsTest extends DomBuilderTest {
     @Test
     public void bindings_are_added_to_config_for_all_http_servers_with_jetty() throws Exception {
         final Element xml = parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 "  <http>",
                 "    <filtering>",
                 "      <request-chain id='my-request-chain'>",
@@ -93,17 +93,17 @@ public class FilterBindingsTest extends DomBuilderTest {
                 "    <server id='server1' port='8000' />",
                 "    <server id='server2' port='9000' />",
                 "  </http>",
-                "</jdisc>");
+                "</container>");
         buildContainerCluster(xml);
 
         {
-            final ServerConfig config = root.getConfig(ServerConfig.class, "jdisc/http/jdisc-jetty/server1");
+            final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server1");
             assertThat(config.filter().size(), is(1));
             assertThat(config.filter(0).id(), is("my-request-chain"));
             assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING));
         }
         {
-            final ServerConfig config = root.getConfig(ServerConfig.class, "jdisc/http/jdisc-jetty/server2");
+            final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server2");
             assertThat(config.filter().size(), is(1));
             assertThat(config.filter(0).id(), is("my-request-chain"));
             assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
index 65866a5e3b8..66ed86e3eaa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
@@ -21,11 +21,11 @@ public class ImplicitIndexingClusterTest {
     @Test
     public void existing_jdisc_is_used_as_indexing_cluster_when_multitenant() {
         final String servicesXml = "<services version=\"1.0\">\n" + //
-                "  <jdisc version=\"1.0\" id=\"jdisc\">\n" + //
+                "  <container version=\"1.0\" id=\"jdisc\">\n" + //
                 "    <search />\n" + //
                 "    <nodes count=\"1\" />\n" + //
                 ACCESS_CONTROL_XML + //
-                "  </jdisc>\n" + //
+                "  </container>\n" + //
                 "  <content id=\"music\" version=\"1.0\">\n" + //
                 "    <redundancy>1</redundancy>\n" + //
                 "    <documents>\n" + //
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
index 6ba75f1ff05..9dd6f834e62 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
@@ -44,13 +44,13 @@ public class SearchChainsTest2 {
     @Test
     public void fail_upon_two_user_declared_chains_with_same_name() {
         final Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='cluster1' version='1.0'>",
+                "<container id='cluster1' version='1.0'>",
                 ContainerModelBuilderTest.nodesXml,
                 "  <search>",
                 "    <chain id='same' />",
                 "    <chain id='same' />",
                 "  </search>",
-                "</jdisc>");
+                "</container>");
         try {
             ContainerModelBuilderTest.createModel(root, clusterElem);
             fail("Expected exception when declaring chains with duplicate id.");
@@ -63,12 +63,12 @@ public class SearchChainsTest2 {
     @Test
     public void fail_upon_user_declared_chain_with_same_id_as_builtin_chain() {
         final Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='cluster1' version='1.0'>",
+                "<container id='cluster1' version='1.0'>",
                 ContainerModelBuilderTest.nodesXml,
                 "  <search>",
                 "    <chain id='vespa' />",
                 "  </search>",
-                "</jdisc>");
+                "</container>");
         try {
             ContainerModelBuilderTest.createModel(root, clusterElem);
             fail("Expected exception when taking the id from a builtin chain.");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index 5433c7659cc..3fea346f788 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -116,7 +116,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     @Test
     public void access_control_filter_chain_has_correct_handler_bindings() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 "  <search/>",
                 "  <document-api/>",
                 "  <handler id='custom.Handler'>",
@@ -127,7 +127,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
                 "      <access-control domain='foo' />",
                 "    </filtering>",
                 "  </http>",
-                "</jdisc>");
+                "</container>");
 
         Http http = getHttp(clusterElem);
 
@@ -149,13 +149,13 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         final String notExcludedBinding = "http://*/custom-handler/*";
         final String excludedBinding = "http://*/excluded/*";
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 httpWithExcludedBinding(excludedBinding),
                 "  <handler id='custom.Handler'>",
                 "    <binding>" + notExcludedBinding + "</binding>",
                 "    <binding>" + excludedBinding + "</binding>",
                 "  </handler>",
-                "</jdisc>");
+                "</container>");
 
         Http http = getHttp(clusterElem);
         assertFalse("Excluded binding was not removed.",
@@ -171,7 +171,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         final String restApiPath = "api/v0";
         final Set<String> requiredBindings = ImmutableSet.of(servletPath, restApiPath);
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 "  <servlet id='foo' class='bar' bundle='baz'>",
                 "    <path>" + servletPath + "</path>",
                 "  </servlet>",
@@ -181,7 +181,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
                 "      <access-control domain='foo' />",
                 "    </filtering>",
                 "  </http>",
-                "</jdisc>");
+                "</container>");
 
         Http http = getHttp(clusterElem);
 
@@ -199,12 +199,12 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         final String notExcludedBinding = "http://*:8081/" + servletPath;
         final String excludedBinding = "http://*:8080/" + servletPath;
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 httpWithExcludedBinding(excludedBinding),
                 "  <servlet id='foo' class='bar' bundle='baz'>",
                 "    <path>" + servletPath + "</path>",
                 "  </servlet>",
-                "</jdisc>");
+                "</container>");
 
         Http http = getHttp(clusterElem);
         assertFalse("Excluded binding was not removed.",
@@ -220,10 +220,10 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         final String notExcludedBinding = "http://*:8081/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
         final String excludedBinding = "http://*:8080/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc version='1.0'>",
+                "<container version='1.0'>",
                 httpWithExcludedBinding(excludedBinding),
                 "  <rest-api jersey2='true' path='" + restApiPath + "' />",
-                "</jdisc>");
+                "</container>");
 
         Http http = getHttp(clusterElem);
         assertFalse("Excluded binding was not removed.",
@@ -246,9 +246,9 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
                 "  </http>");
     }
 
-    private Http getHttp(Element clusterElem) throws SAXException, IOException {
+    private Http getHttp(Element clusterElem) {
         createModel(root, clusterElem);
-        ContainerCluster cluster = (ContainerCluster) root.getChildren().get("jdisc");
+        ContainerCluster cluster = (ContainerCluster) root.getChildren().get("container");
         Http http = cluster.getHttp();
         assertNotNull(http);
         return http;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index 183df4ce471..3876ce25d96 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -25,16 +25,16 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     @Test
     public void default_access_log_is_only_added_when_search_is_present() throws Exception {
         Element cluster1Elem = DomBuilderTest.parse(
-                "<jdisc id='cluster1' version='1.0'>",
+                "<container id='cluster1' version='1.0'>",
                 "<search />",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
         Element cluster2Elem = DomBuilderTest.parse(
-                "<jdisc id='cluster2' version='1.0'>",
+                "<container id='cluster2' version='1.0'>",
                 "  <nodes>",
                 "    <node hostalias='mockhost' baseport='1234' />",
                 "  </nodes>",
-                "</jdisc>" );
+                "</container>" );
 
         createModel(root, cluster1Elem, cluster2Elem);
 
@@ -49,10 +49,10 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
         final String jdiscClusterId = "jdisc-cluster";
 
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id=" + quote(jdiscClusterId) + " version='1.0'>" +
+                "<container id=" + quote(jdiscClusterId) + " version='1.0'>" +
                         "  <search />" +
                         "  <accesslog type='disabled' />" +
-                        "</jdisc>" );
+                        "</container>" );
 
         createModel(root, clusterElem);
         assertNull(getVespaAccessLog(jdiscClusterId));
@@ -71,13 +71,13 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     @Test
     public void access_log_can_be_configured() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <accesslog type='vespa' ",
                 "             fileNamePattern='pattern' rotationInterval='interval' />",
                 "  <accesslog type='json' ",
                 "             fileNamePattern='pattern' rotationInterval='interval' />",
                 nodesXml,
-                "</jdisc>" );
+                "</container>" );
 
         createModel(root, clusterElem);
         assertNotNull(getJsonAccessLog("default"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index 7e5106b1a71..ac2e1b88c0b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -37,13 +37,13 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     @Test
     public void custom_bindings_are_allowed() {
         Element elem = DomBuilderTest.parse(
-                "<jdisc id='cluster1' version='1.0'>",
+                "<container id='cluster1' version='1.0'>",
                 "  <document-api>",
                 "    <binding>http://*/document-api/</binding>",
                 "    <binding>missing-trailing-slash</binding>",
                 "  </document-api>",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
         createModel(root, elem);
 
         verifyCustomBindings("com.yahoo.vespa.http.server.FeedHandler", ContainerCluster.RESERVED_URI_PREFIX + "/feedapi");
@@ -63,10 +63,10 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     @Test
     public void requireThatHandlersAreSetup() {
         Element elem = DomBuilderTest.parse(
-                "<jdisc id='cluster1' version='1.0'>",
+                "<container id='cluster1' version='1.0'>",
                 "  <document-api />",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
         createModel(root, elem);
 
         Map<String, Handler<?>> handlerMap = getHandlers("cluster1");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
index a3aeeff6ca7..1456e632897 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
@@ -68,7 +68,7 @@ public class DocprocBuilderTest extends DomBuilderTest {
 
     private Element servicesXml() {
         return parse(
-                "<jdisc id='banan' version='1.0'>",
+                "<container id='banan' version='1.0'>",
                 "  <nodes>",
                 "    <node hostalias='mockhost' baseport='1500' />",
                 "  </nodes>",
@@ -78,7 +78,7 @@ public class DocprocBuilderTest extends DomBuilderTest {
                 "      <documentprocessor id='docproc2'/>",
                 "    </chain>",
                 "  </document-processing>",
-                "</jdisc>");
+                "</container>");
     }
 
     // TODO: re-enable assertions when the appropriate attributes are handled by the builder
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
index 7d463e5b57b..0695f7b30d7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
@@ -23,7 +23,7 @@ public class IdentityBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void identity_config_produced_from_deployment_spec() throws IOException, SAXException {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'><search /></jdisc>");
+                "<container id='default' version='1.0'><search /></container>");
         String deploymentXml = "<deployment version='1.0' athenz-domain='domain' athenz-service='service'>\n" +
                                "    <test/>\n" +
                                "    <prod>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index 880cccf02e4..4e119506104 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -37,7 +37,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_overriding_connector_options_works() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>\n" +
+                "<container id='default' version='1.0'>\n" +
                 "  <http>\n" +
                 "    <server id='bananarama' port='4321'>\n" +
                 "      <config name='jdisc.http.connector'>\n" +
@@ -47,7 +47,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
                 "    </server>\n" +
                 "  </http>\n" +
                 nodesXml +
-                "</jdisc>\n"
+                "</container>\n"
         );
         createModel(root, clusterElem);
         ConnectorConfig cfg = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/bananarama");
@@ -58,9 +58,9 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_enabling_jetty_works() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>" +
+                "<container id='default' version='1.0'>" +
                         nodesXml +
-                        "</jdisc>"
+                        "</container>"
         );
         createModel(root, clusterElem);
         assertJettyServerInConfig();
@@ -69,12 +69,12 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_enabling_jetty_works_for_custom_http_servers() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <http>",
                 "    <server port='9000' id='foo' />",
                 "  </http>",
                 nodesXml,
-                "</jdisc>" );
+                "</container>" );
         createModel(root, clusterElem);
         assertJettyServerInConfig();
     }
@@ -82,9 +82,9 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verifyThatJettyHttpServerHasFilterBindingsProvider() throws Exception {
         final Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 nodesXml,
-                "</jdisc>" );
+                "</container>" );
         createModel(root, clusterElem);
 
         final ComponentsConfig.Components jettyHttpServerComponent = extractComponentByClassName(
@@ -103,12 +103,12 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verifyThatJettyHttpServerHasFilterBindingsProviderForCustomHttpServers() throws Exception {
         final Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <http>",
                 "    <server port='9000' id='foo' />",
                 "  </http>",
                 nodesXml,
-                "</jdisc>" );
+                "</container>" );
         createModel(root, clusterElem);
 
         final ComponentsConfig.Components jettyHttpServerComponent = extractComponentByClassName(
@@ -127,7 +127,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void ssl_element_generates_connector_config_and_injects_provider_component() {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0' jetty='true'>",
                 "    <http>",
                 "        <server port='9000' id='minimal'>",
                 "            <ssl>",
@@ -152,7 +152,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
                 "    </http>",
                 nodesXml,
                 "",
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
         ConnectorConfig minimalCfg = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/minimal/configured-ssl-provider@minimal");
@@ -184,7 +184,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_tht_ssl_provider_configuration_configures_correct_config() {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0' jetty='true'>",
                 "    <http>",
                 "        <server port='9000' id='ssl'>",
                 "            <ssl-provider class='com.yahoo.CustomSslProvider' bundle='mybundle'/>",
@@ -192,7 +192,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
                 "    </http>",
                 nodesXml,
                 "",
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
         ConnectorConfig sslProvider = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/ssl/ssl-provider@ssl");
@@ -208,7 +208,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_container_factory_sees_same_config(){
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0' jetty='true'>",
                 "    <http>",
                 "        <server port='9000' id='ssl'>",
                 "            <ssl>",
@@ -219,7 +219,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
                 "    </http>",
                 nodesXml,
                 "",
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
         ConnectorConfig sslProvider = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/ssl");
@@ -229,7 +229,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_container_setup_additional_tls4443(){
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0' jetty='true'>",
                 "    <http>",
                 "        <server port='9000' id='ssl'>",
                 "            <ssl>",
@@ -240,7 +240,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
                 "    </http>",
                 nodesXml,
                 "",
-                "</jdisc>");
+                "</container>");
 
         DeployState deployState = new DeployState.Builder().properties(new TestProperties().setHostedVespa(true).setTlsSecrets(Optional.of(new TlsSecrets("CERT", "KEY")))).build();
         createModel(root, deployState, null, clusterElem);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
index 174f7db125c..7789b4b8a16 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
@@ -29,7 +29,7 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void setsRotationActiveAccordingToDeploymentSpec() throws IOException, SAXException {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'><search /></jdisc>");
+                "<container id='default' version='1.0'><search /></container>");
 
         String deploymentSpec = "<deployment>\n" +
                                 "  <prod>    \n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 4862c747742..0da3b8e1f5f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -33,10 +33,10 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void gui_search_handler_is_always_included_when_search_is_specified() {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <search />",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
 
@@ -59,13 +59,13 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void search_handler_bindings_can_be_overridden() {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <search>",
                 "    <binding>binding0</binding>",
                 "    <binding>binding1</binding>",
                 "  </search>",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
 
@@ -78,12 +78,12 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void search_handler_bindings_can_be_disabled() {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <search>",
                 "    <binding/>",
                 "  </search>",
                 nodesXml,
-                "</jdisc>");
+                "</container>");
 
         createModel(root, clusterElem);
 
@@ -109,12 +109,12 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
     private void createClusterWithOnlyDefaultChains() {
         Element containerElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
+                "<container id='default' version='1.0'>",
                 "  <search/>",
                 "  <nodes>",
                 "    <node hostalias='mockhost' />",
                 "  </nodes>",
-                "</jdisc>");
+                "</container>");
 
         createModel(root, containerElem);
     }
@@ -123,10 +123,10 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     public void manually_setting_up_search_handler_is_forbidden() {
         try {
             Element clusterElem = DomBuilderTest.parse(
-                    "<jdisc id='default' version='1.0'>",
+                    "<container id='default' version='1.0'>",
                     "  <handler id='com.yahoo.search.handler.SearchHandler' />",
                     nodesXml,
-                    " </jdisc>");
+                    " </container>");
 
 
             createModel(root, clusterElem);
@@ -145,14 +145,14 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='mockhost'/>" +
                 "  </admin>" +
-                "  <jdisc version='1.0' id='container'>"+
+                "  <container version='1.0' id='container'>"+
                 "      <search>" +
                 "        <chain id='mychain' inherits='vespa'/>" +
                 "      </search>" +
                 "      <nodes>"+
                 "        <node hostalias=\"mockhost\" />"+
                 "      </nodes>"+
-                "  </jdisc>"+
+                "  </container>"+
                 contentXml() +
                 "</services>";
 
@@ -171,14 +171,14 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='mockhost'/>" +
                 "  </admin>" +
-                "  <jdisc version='1.0' id='container'>"+
+                "  <container version='1.0' id='container'>"+
                 "      <search>" +
                 "        <chain id='mychain' inherits='vespa'/>" +
                 "      </search>" +
                 "      <nodes>"+
                 "        <node hostalias=\"mockhost\" />"+
                 "      </nodes>"+
-                "  </jdisc>"+
+                "  </container>"+
                 contentXml() +
                 "</services>";
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 7c365859862..c70e05c39c3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -232,12 +232,12 @@ public class ContentClusterTest extends ContentBaseTest {
                         "  <admin version='2.0'>" +
                         "    <adminserver hostalias='node1'/>" +
                         "  </admin>"  +
-                        "   <jdisc id='default' version='1.0'>" +
+                        "   <container id='default' version='1.0'>" +
                         "     <search/>" +
                         "     <nodes>" +
                         "       <node hostalias='node1'/>" +
                         "     </nodes>" +
-                        "   </jdisc>" +
+                        "   </container>" +
                         "   <content id='storage' version='1.0'>" +
                         "     <redundancy>2</redundancy>" +
                         "     <group>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index 919fec5be2f..62cdcf5a0c6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -56,12 +56,12 @@ public class IndexedTest extends ContentBaseTest {
                 "      </tokens>" +
                 "    </tokenlist>" +
                 "  </config>" +
-                "  <jdisc version='1.0'>" +
+                "  <container version='1.0'>" +
                 "    <search/>" +
                 "    <nodes>" +
                 "      <node hostalias='node0'/>" +
                 "    </nodes>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='test'>" +
                 "     <redundancy>1</redundancy>" +
                 "     <engine>" +
@@ -85,12 +85,12 @@ public class IndexedTest extends ContentBaseTest {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='node0'/>" +
                 "  </admin>" +
-                "  <jdisc version='1.0'>" +
+                "  <container version='1.0'>" +
                 "    <search/>" +
                 "    <nodes>" +
                 "      <node hostalias='node0'/>" +
                 "    </nodes>" +
-                "  </jdisc>" +
+                "  </container>" +
                 "  <content version='1.0' id='test'>" +
                 "     <redundancy>1</redundancy>\n" +
                 "     <engine>" +
@@ -153,15 +153,16 @@ public class IndexedTest extends ContentBaseTest {
         DocumentProtocol protocol = (DocumentProtocol) routing.getProtocols().get(0);
         RoutingTableSpec spec = protocol.getRoutingTableSpec();
         assertEquals(2, spec.getNumHops());
-        assertEquals("indexing", spec.getHop(0).getName());
-        assertEquals("jdisc/chain.indexing", spec.getHop(1).getName());
+
+        assertEquals("container/chain.indexing", spec.getHop(0).getName());
+        assertEquals("indexing", spec.getHop(1).getName());
 
         assertRoute(spec.getRoute(0), "default", "indexing");
         assertRoute(spec.getRoute(1), "default-get", "[Content:cluster=test]");
         assertRoute(spec.getRoute(2), "storage/cluster.test", "route:test");
         assertRoute(spec.getRoute(3), "test", "[MessageType:test]");
         assertRoute(spec.getRoute(4), "test-direct", "[Content:cluster=test]");
-        assertRoute(spec.getRoute(5), "test-index", "jdisc/chain.indexing", "[Content:cluster=test]");
+        assertRoute(spec.getRoute(5), "test-index", "container/chain.indexing", "[Content:cluster=test]");
     }
 
     @Test
@@ -268,7 +269,7 @@ public class IndexedTest extends ContentBaseTest {
     @Test
     public void requireThatIndexingDocprocGetsConfigIdBasedOnDistributionKey() {
         VespaModel model = getIndexedVespaModel();
-        ApplicationContainerCluster cluster = model.getContainerClusters().get("jdisc");
-        assertEquals("jdisc/container.0", cluster.getContainers().get(0).getConfigId());
+        ApplicationContainerCluster cluster = model.getContainerClusters().get("container");
+        assertEquals("container/container.0", cluster.getContainers().get(0).getConfigId());
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
index 76a4a83c4fc..e25bcea29f6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
@@ -42,8 +42,8 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
         SearchClusterSpec searchCluster = new SearchClusterSpec(CLUSTERNAME, null, null);
         searchCluster.searchDefs.add(new SearchDefSpec("music", "artist", "album"));
         VespaModel model = getIndexedContentVespaModel(Collections.<DocprocClusterSpec>emptyList(), Arrays.asList(searchCluster));
-        assertIndexing(model, new DocprocClusterSpec("jdisc", new DocprocChainSpec("jdisc/chain.indexing")));
-        assertFeedingRoute(model, CLUSTERNAME, "jdisc/chain.indexing");
+        assertIndexing(model, new DocprocClusterSpec("container", new DocprocChainSpec("container/chain.indexing")));
+        assertFeedingRoute(model, CLUSTERNAME, "container/chain.indexing");
     }
 
     @Test
@@ -54,8 +54,8 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
         searchCluster.searchDefs.add(new SearchDefSpec("music", "artist", "album"));
         searchCluster.searchDefs.add(new SearchDefSpec("book", "author", "title"));
         VespaModel model = getIndexedContentVespaModel(Collections.<DocprocClusterSpec>emptyList(), Arrays.asList(searchCluster));
-        assertIndexing(model, new DocprocClusterSpec("jdisc", new DocprocChainSpec("jdisc/chain.indexing")));
-        assertFeedingRoute(model, CLUSTERNAME, "jdisc/chain.indexing");
+        assertIndexing(model, new DocprocClusterSpec("container", new DocprocChainSpec("container/chain.indexing")));
+        assertFeedingRoute(model, CLUSTERNAME, "container/chain.indexing");
     }
 
     @Test
@@ -72,10 +72,10 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
         VespaModel model = getIndexedContentVespaModel(Collections.<DocprocClusterSpec>emptyList(), Arrays.asList(musicCluster, booksCluster));
 
         assertIndexing(model,
-                new DocprocClusterSpec("jdisc", new DocprocChainSpec("jdisc/chain.indexing")));
+                new DocprocClusterSpec("container", new DocprocChainSpec("container/chain.indexing")));
 
-        assertFeedingRoute(model, MUSIC, "jdisc/chain.indexing");
-        assertFeedingRoute(model, BOOKS, "jdisc/chain.indexing");
+        assertFeedingRoute(model, MUSIC, "container/chain.indexing");
+        assertFeedingRoute(model, BOOKS, "container/chain.indexing");
     }
 
 
@@ -111,7 +111,7 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                 "                </nodes>\n" +
                 "    </content>\n" +
                 "  \n" +
-                "  <jdisc version='1.0' id='dpcluster'>\n" +
+                "  <container version='1.0' id='dpcluster'>\n" +
                 "    <document-processing>\n" +
                 "      <chain id='fooindexing' inherits='indexing '/>\n" +
                 "    </document-processing>\n" +
@@ -121,7 +121,7 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                 "    <http>\n" +
                 "      <server id='dpcluster' port='8000'/>\n" +
                 "    </http>\n" +
-                "  </jdisc>\n" +
+                "  </container>\n" +
                 "</services>\n";
         VespaModel model = getIndexedSearchVespaModel(xml);
         assertIndexing(model, new DocprocClusterSpec("dpcluster", new DocprocChainSpec("dpcluster/chain.fooindexing", "indexing"),
@@ -156,12 +156,12 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                         "  <admin version='2.0'>\n" +
                         "    <adminserver hostalias='node0'/>\n" +
                         "  </admin>\n" +
-                        "  <jdisc version='1.0' id='dokprok'>\n" +
+                        "  <container version='1.0' id='dokprok'>\n" +
                         "    <document-processing />\n" +
                         "    <nodes>\n" +
                         "      <node hostalias='node0'/>\n" +
                         "    </nodes>\n" +
-                        "  </jdisc>\n" +
+                        "  </container>\n" +
                         "</services>\n";
 
         List<String> sds = ApplicationPackageUtils.generateSearchDefinitions("music", "title", "artist");
@@ -382,16 +382,16 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                         "    <adminserver hostalias='node0'/>\n" +
                         "  </admin>\n" +
 
-                        "  <jdisc version='1.0'>\n" +
+                        "  <container version='1.0'>\n" +
                         "    <search/>\n" +
                         "    <nodes>\n" +
                         "      <node hostalias='node0'/>\n" +
                         "    </nodes>\n" +
-                        "  </jdisc>\n";
+                        "  </container>\n";
         int clusterNo = 0;
         for (DocprocClusterSpec docprocClusterSpec : docprocClusterSpecs) {
             String docprocCluster = "";
-            docprocCluster += "  <jdisc version='1.0' id='" + docprocClusterSpec.name + "'>\n";
+            docprocCluster += "  <container version='1.0' id='" + docprocClusterSpec.name + "'>\n";
 
             if (docprocClusterSpec.chains != null && docprocClusterSpec.chains.size() > 0) {
                 docprocCluster += "    <document-processing>\n";
@@ -421,7 +421,7 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
             docprocCluster += "    <nodes>\n" +
                     "      <node hostalias='node0'/>\n" +
                     "    </nodes>\n" +
-                    "  </jdisc>\n";
+                    "  </container>\n";
             mainPre += docprocCluster;
             clusterNo++;
         }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index 44986bc0b69..fb54f8f9241 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -110,10 +110,10 @@ public class ClusterTest {
                         "  <admin version='2.0'>",
                         "    <adminserver hostalias='my_host' />",
                         "  </admin>",
-                        "<jdisc id='foo' version='1.0'>",
+                        "<container id='foo' version='1.0'>",
                         "  <search />",
                         "  <nodes><node hostalias='my_host' /></nodes>",
-                        "</jdisc>",
+                        "</container>",
                         "  <content version='1.0'>",
                         "    <redundancy>3</redundancy>",
                         "    <documents>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
index 7ccf5937490..f50d41b9c95 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
@@ -224,10 +224,10 @@ public class MultilevelDispatchTest {
                                                                                       "  </nodes>" +
                                                                                       "  <search><coverage><minimum>0.95</minimum></coverage></search>" +
                                                                                       "</content>" +
-                                                                                      "<jdisc id='foo' version='1.0'>" +
+                                                                                      "<container id='foo' version='1.0'>" +
                                                                                       "  <search />" +
                                                                                       "  <nodes><node hostalias='mockroot' /></nodes>" +
-                                                                                      "</jdisc>" +
+                                                                                      "</container>" +
                                                                                       "</services>")
                                                                 .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
                                                                 .build());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
index 4d766b776b3..227ad9c6be1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
@@ -24,12 +24,12 @@ public class TldTest {
                                 "  <admin version='2.0'>" +
                                 "    <adminserver hostalias='mockhost' />" +
                                 "  </admin>" +
-                                "  <jdisc version='1.0' id='default'>" +
+                                "  <container version='1.0' id='default'>" +
                                 "    <search />" +
                                 "    <nodes>" +
                                 "      <node hostalias='mockhost'/>" +
                                 "    </nodes>" +
-                                "  </jdisc>" +
+                                "  </container>" +
                                 "  <content version='1.0' id='foo'>" +
                                 "    <redundancy>1</redundancy>" +
                                 "    <documents>" +
@@ -73,19 +73,19 @@ public class TldTest {
                     "  <admin version='2.0'>" +
                     "    <adminserver hostalias='gateway' />" +
                     "  </admin>" +
-                    "  <jdisc version='1.0' id='default'>" +
+                    "  <container version='1.0' id='default'>" +
                     "    <search />" +
                     "    <nodes>" +
                     "      <node hostalias='search1'/>" +
                     "      <node hostalias='search2'/>" +
                     "    </nodes>" +
-                    "  </jdisc>" +
-                    "  <jdisc version='1.0' id='gw'>" +
+                    "  </container>" +
+                    "  <container version='1.0' id='gw'>" +
                     "    <document-api/>" +
                     "    <nodes>" +
                     "      <node hostalias='gateway'/>" +
                     "    </nodes>" +
-                    "  </jdisc>" +
+                    "  </container>" +
                     "  <content version='1.0' id='foo'>" +
                     "    <redundancy>2</redundancy>" +
                     "    <documents>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
index de45eaa4d1a..e39e0147dbf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
@@ -81,7 +81,7 @@ public class SearchClusterTest {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='node0' />" +
                 "  </admin>\n" +
-                "  <jdisc version='1.0' id='j1'>\n" +
+                "  <container version='1.0' id='j1'>\n" +
                 "    <search>" +
                 "      <chain id='s1Chain'>" +
                 "        <searcher id='S1ClusterSearcher'/>" +
@@ -91,9 +91,9 @@ public class SearchClusterTest {
                 "    <nodes>" +
                 "      <node hostalias=\"node0\" />" +
                 "    </nodes>" +
-                "  </jdisc>" +
+                "  </container>" +
 
-                "  <jdisc version='1.0' id='j2'>" +
+                "  <container version='1.0' id='j2'>" +
                 "    <search>" +
                 "      <chain id='s2Chain'>" +
                 "        <searcher id='S2ClusterSearcher'/>" +
@@ -103,7 +103,7 @@ public class SearchClusterTest {
                 "    <nodes>" +
                 "      <node hostalias=\"node2\" />" +
                 "    </nodes>" +
-                "  </jdisc>" +
+                "  </container>" +
 
                 "  <content id='xbulk' version=\"1.0\">" +
                 "     <redundancy>2</redundancy>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
index 82da14f0d29..1ce584c2910 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
@@ -49,15 +49,15 @@ public class ModelAmendingTestCase {
         String services =
                                              "<services version='1.0'>" +
                                              "    <admin version='4.0'/>" +
-                                             "    <jdisc id='test1' version='1.0'>" +
+                                             "    <container id='test1' version='1.0'>" +
                                              "        <search/>" +
                                              "        <nodes count='2'/>" +
-                                             "    </jdisc>" +
-                                             "    <jdisc id='test2' version='1.0'>" +
+                                             "    </container>" +
+                                             "    <container id='test2' version='1.0'>" +
                                              "        <http><server id='server1' port='19110'/></http>" +
                                              "        <document-api/>" +
                                              "        <nodes count='2'/>" +
-                                             "    </jdisc>" +
+                                             "    </container>" +
                                              "    <content id='test3' version='1.0'>" +
                                              "        <redundancy>1</redundancy>" +
                                              "        <documents>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index a5284ac8720..3fa013d0089 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -290,7 +290,7 @@ public class VespaModelTestCase {
     @Test
     public void testMinimalApp() throws IOException, SAXException {
         VespaModel model = new VespaModel(new MockApplicationPackage.Builder()
-                                                  .withServices("<services version='1.0'><jdisc version='1.0'><search /></jdisc></services>")
+                                                  .withServices("<services version='1.0'><container version='1.0'><search /></container></services>")
                                                   .build());
         assertThat(model.getHostSystem().getHosts().size(), is(1));
         assertThat(model.getContainerClusters().size(), is(1));
diff --git a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
index 7a77a10a381..18a06ec41b9 100644
--- a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
+++ b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
@@ -18,9 +18,9 @@
     </metrics>
   </admin>
 
-  <jdisc id="container" version="1.0">
+  <container id="container" version="1.0">
     <nodes count="5" flavor="medium"/>
-  </jdisc>
+  </container>
 
   <content id="search" version="1.0">
     <redundancy>2</redundancy>
diff --git a/config-model/src/test/schema-test-files/services-hosted.xml b/config-model/src/test/schema-test-files/services-hosted.xml
index d62857d67b0..07839239c81 100644
--- a/config-model/src/test/schema-test-files/services-hosted.xml
+++ b/config-model/src/test/schema-test-files/services-hosted.xml
@@ -6,15 +6,15 @@
     <nodes count="3" flavor="small"/>
   </admin>
 
-  <jdisc id="container1" version="1.0">
+  <container id="container1" version="1.0">
     <nodes count="5" required="true">
       <resources vcpu="1.2" memory="10Gb" disk="0.3 TB"/>
     </nodes>
-  </jdisc>
+  </container>
 
-  <jdisc id="container1" version="1.0">
+  <container id="container1" version="1.0">
     <nodes of="search" required="true"/>
-  </jdisc>
+  </container>
   
   <container id="container2" version="1.0">
     <nodes of="search"/>
diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml
index 0656f293001..b77654521ee 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<jdisc id='qrsCluster_1' version='1.0'>
+<container id='qrsCluster_1' version='1.0'>
   <rest-api path="jersey1">
     <components bundle="my-bundle" />
     <components bundle="other-bundle" />
@@ -137,4 +137,4 @@
   <server id="server-provider" />
 
 
-</jdisc>
+</container>