Rename method

101 files changed, 184 insertions, 190 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java
index 4268e4f835e..9b0d3e23fa2 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/IncludeProcessor.java
@@ -58,7 +58,7 @@ class IncludeProcessor implements PreProcessor {
 
 
     private static void mergeInto(Element destination, List<Element> subElements) {
-        // System.out.println("merging " + subElements.size() + " elements into " + destination.getTagName());
+        // System.out.println("merging " + subElements.size() + " labels into " + destination.getTagName());
         for (Element subElement : subElements) {
             Node copiedNode = destination.getOwnerDocument().importNode(subElement, true);
             destination.appendChild(copiedNode);
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 32e9aec56cb..0087e850a48 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -105,7 +105,7 @@ class OverrideProcessor implements PreProcessor {
     }
 
     /**
-     * Prune elements that are not matching our environment and region
+     * Prune labels that are not matching our environment and region
      */
     private void pruneNonMatchingEnvironmentsAndRegions(Element parent, List<Element> children) {
         Iterator<Element> elemIt = children.iterator();
@@ -144,7 +144,7 @@ class OverrideProcessor implements PreProcessor {
         if (bestMatch > 1) // there was a region/environment specific overriode
             doElementSpecificProcessingOnOverride(bestMatchElement);
 
-        // Remove elements not specific
+        // Remove labels not specific
         for (Element child : children) {
             if (child != bestMatchElement) {
                 parent.removeChild(child);
@@ -161,7 +161,7 @@ class OverrideProcessor implements PreProcessor {
     }
     
     /**
-     * Retains all elements where at least one element is overridden. Removes non-overridden elements from map.
+     * Retains all labels where at least one element is overridden. Removes non-overridden labels from map.
      */
     private void retainOverriddenElements(Map<String, List<Element>> elementsByTagName) {
         Iterator<Map.Entry<String, List<Element>>> it = elementsByTagName.entrySet().iterator();
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
index 62b0fee5344..840e0308809 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
@@ -130,14 +130,14 @@ public class Xml {
     }
 
     /**
-     * Will get all sub-elements under parent named "name", just like XML.getChildren(). Then look under
-     * pathFromAppRoot/ in the app package for XML files, parse them and append elements of the same name.
+     * Will get all sub-labels under parent named "name", just like XML.getChildren(). Then look under
+     * pathFromAppRoot/ in the app package for XML files, parse them and append labels of the same name.
      *
      * @param parent parent XML node
-     * @param name name of elements to merge
+     * @param name name of labels to merge
      * @param app an {@link ApplicationPackage}
      * @param pathFromAppRoot path from application root
-     * @return list of all sub-elements with given name
+     * @return list of all sub-labels with given name
      */
     public static List<Element> mergeElems(Element parent, String name, ApplicationPackage app, String pathFromAppRoot) {
         List<Element> children = XML.getChildren(parent, name);
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index d4b6751c356..a6f2c2f191b 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -84,7 +84,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
     }
 
     /**
-     * If the top level is &lt;services&gt;, it contains a list of services elements,
+     * If the top level is &lt;services&gt;, it contains a list of services labels,
      * otherwise, the top level tag is a single service.
      */
     private List<Element> getServiceElements(Element servicesRoot) {
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
index 15068eceaf9..15fa0ccdaa8 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
@@ -31,10 +31,10 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
     }
 
     /**
-     * Method that must return the XML elements this builder handles. Subclasses must implement this in order to
-     * get called when one of the elements have been encountered when parsing.
+     * Method that must return the XML labels this builder handles. Subclasses must implement this in order to
+     * get called when one of the labels have been encountered when parsing.
      *
-     * @return A list of elements that this builder handles.
+     * @return A list of labels that this builder handles.
      */
     public abstract List<ConfigModelId> handlesElements();
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/graph/ModelGraphBuilder.java b/config-model/src/main/java/com/yahoo/config/model/graph/ModelGraphBuilder.java
index 97d914c6012..2f3b6dd390f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/graph/ModelGraphBuilder.java
+++ b/config-model/src/main/java/com/yahoo/config/model/graph/ModelGraphBuilder.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Used to add builders and elements in addBuilder, and then build a dependency graph based on the
+ * Used to add builders and labels in addBuilder, and then build a dependency graph based on the
  * constructor arguments.
  *
  * @author lulf
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
index ae77cf32920..1d76cbb82e3 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
@@ -27,7 +27,7 @@ public class HostsXmlProvisioner implements HostProvisioner {
 
     @Override
     public HostSpec allocateHost(String alias) {
-        // Some special rules to allow no admin elements as well as jdisc element without nodes.
+        // Some special rules to allow no admin labels as well as jdisc element without nodes.
         if (alias.equals(IMPLICIT_ADMIN_HOSTALIAS)) {
             if (hosts.asCollection().size() > 1) {
                 throw new IllegalArgumentException("More than 1 host specified (" + hosts.asCollection().size() + ") and <admin> not specified");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/PortsMeta.java b/config-model/src/main/java/com/yahoo/vespa/model/PortsMeta.java
index a0b3cc7294b..e511e377379 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/PortsMeta.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/PortsMeta.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class PortsMeta implements Serializable {
 
-    /** A list of all ports. The list elements are lists of strings. */
+    /** A list of all ports. The list labels are lists of strings. */
     private List<LinkedList<String>> ports;
 
     /** Remember the rpc admin port offset. */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index c0baa50b3b0..6d401884090 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -41,7 +41,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
         ModelElement adminElement = new ModelElement(w3cAdminElement);
         admin.addConfigservers(getConfigServersFromSpec(admin));
 
-        // Note: These two elements only exists in admin version 4.0
+        // Note: These two labels only exists in admin version 4.0
         // This build handles admin version 3.0 by ignoring its content (as the content is not useful)
         Optional<NodesSpecification> requestedSlobroks   = NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("slobroks"));
         Optional<NodesSpecification> requestedLogservers = NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("logservers"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index 7b8f1e8ff47..8ff1708b04a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -142,7 +142,7 @@ public class DomConfigPayloadBuilder {
 
         if (element.hasAttribute("index")) {
             // Check for legacy (pre Vespa 6) usage
-            throw new IllegalArgumentException("The 'index' attribute on config elements is not supported - use <item>");
+            throw new IllegalArgumentException("The 'index' attribute on config labels is not supported - use <item>");
         } else if (element.hasAttribute("operation")) {
             // leaf array, currently the only supported operation is 'append'
             verifyLegalOperation(element);
@@ -150,7 +150,7 @@ public class DomConfigPayloadBuilder {
             a.append(value);
         } else if ("item".equals(name)) {
             if (parentName == null)
-                throw new ConfigurationRuntimeException("<item> is a reserved keyword for array and map elements");
+                throw new ConfigurationRuntimeException("<item> is a reserved keyword for array and map labels");
             if (element.hasAttribute("key")) {
                 payloadBuilder.getMap(parentName).put(element.getAttribute("key"), value);
             } else {
@@ -167,7 +167,7 @@ public class DomConfigPayloadBuilder {
          // Inner value
         if (element.hasAttribute("index")) {
             // Check for legacy (pre Vespa 6) usage
-            throw new IllegalArgumentException("The 'index' attribute on config elements is not supported - use <item>");
+            throw new IllegalArgumentException("The 'index' attribute on config labels is not supported - use <item>");
         } else if (element.hasAttribute("operation")) {
             // inner array, currently the only supported operation is 'append'
             verifyLegalOperation(element);
@@ -204,12 +204,12 @@ public class DomConfigPayloadBuilder {
                 for (Element child : children)
                     parseElement(child, p, name);
             } else if (numMatching == children.size()) {
-                // Array with <item elements>
+                // Array with <item labels>
                 for (Element child : children) {
                     parseElement(child, payloadBuilder, name);
                 }
             } else {
-                throw new ConfigurationRuntimeException("<item> is a reserved keyword for array and map elements");
+                throw new ConfigurationRuntimeException("<item> is a reserved keyword for array and map labels");
             }
         }
     }
@@ -217,7 +217,7 @@ public class DomConfigPayloadBuilder {
     /**
      * Adds the values and children (recursively) in the given xml element to the given {@link ConfigPayloadBuilder}.
      * @param currElem  The element representing a config parameter.
-     * @param payloadBuilder The builder to use when adding elements.
+     * @param payloadBuilder The builder to use when adding labels.
      */
     private void parseElement(Element currElem, ConfigPayloadBuilder payloadBuilder, String parentName) {
         List<Element> children = XML.getChildren(currElem);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index c83f6098a0f..810d4177291 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -63,7 +63,7 @@ public class NodesSpecification {
 
     /**
      * Returns a requirement for dedicated nodes taken from the <code>nodes</code> element
-     * contained in the given parent element, or empty if the parent element is null, or the nodes elements
+     * contained in the given parent element, or empty if the parent element is null, or the nodes labels
      * is not present.
      */
     public static Optional<NodesSpecification> fromParent(ModelElement parentElement) {
@@ -75,7 +75,7 @@ public class NodesSpecification {
 
     /**
      * Returns a requirement for undedicated or dedicated nodes taken from the <code>nodes</code> element
-     * contained in the given parent element, or empty if the parent element is null, or the nodes elements
+     * contained in the given parent element, or empty if the parent element is null, or the nodes labels
      * is not present.
      */
     public static Optional<NodesSpecification> optionalDedicatedFromParent(ModelElement parentElement) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index e24fae3e3b5..9f558e59d4f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -192,7 +192,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
     }
 
     /**
-     * The SimpleConfigProducer is the producer for elements such as qrservers, topleveldispatchers, gateways.
+     * The SimpleConfigProducer is the producer for labels such as qrservers, topleveldispatchers, gateways.
      * Must support overrides for that too, hence this builder
      *
      * @author vegardh
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java
index b7aef6b9b1f..2598e501c9b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java
@@ -59,7 +59,7 @@ public class ComponentsBuilder<T extends ChainedComponent<?>> {
     /**
      * @param ancestor The parent config producer
      * @param componentTypes The allowed component types for 'elementContainingComponentElements' - MUST match &lt;T&gt;
-     * @param elementsContainingComponentElems All elements containing elements with name matching ComponentType.name
+     * @param elementsContainingComponentElems All labels containing labels with name matching ComponentType.name
      * @param outerComponentTypeByComponentName Use null if this is the outermost scope, i.e.
      *                                          every component is a definition, not a reference.
      */
@@ -126,7 +126,7 @@ public class ComponentsBuilder<T extends ChainedComponent<?>> {
         if (componentSpec.getAttributes().getLength() > 1 || !XML.getChildren(componentSpec).isEmpty())
             throw new RuntimeException("Expecting " + componentName +
                     " to be a reference to a global component with the same name," +
-                    " so no additional attributes or nested elements are allowed");
+                    " so no additional attributes or nested labels are allowed");
     }
 
     private void ensureTypesMatch(ComponentType type1, ComponentType type2, String componentName) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/GenericChainedComponentModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/GenericChainedComponentModelBuilder.java
index a7f5a306f8b..d913bf11e44 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/GenericChainedComponentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/GenericChainedComponentModelBuilder.java
@@ -8,7 +8,7 @@ import com.yahoo.config.model.builder.xml.XmlHelper;
 import org.w3c.dom.Element;
 
 /**
- * reads the common attributes and elements of all chained component elements.
+ * reads the common attributes and labels of all chained component labels.
  * @author tonytv
  */
 public abstract class GenericChainedComponentModelBuilder {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/PageTemplates.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/PageTemplates.java
index c38001d4a83..b806fe9b157 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/PageTemplates.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/PageTemplates.java
@@ -50,7 +50,7 @@ public class PageTemplates implements Serializable, PageTemplatesConfig.Producer
     }
 
     // We are representing these as XML rather than a structured config type because the structure
-    // is not easily representable by config (arbitrary nesting of many types of elements within each other)
+    // is not easily representable by config (arbitrary nesting of many types of labels within each other)
     // and config<->xml generation will not pull its weight in work and possible bugs.
     // The XML content is already validated when we get here.
     public PageTemplates(List<NamedReader> readers) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ManhattanContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ManhattanContainerModelBuilder.java
index f6ed6c2eb7d..15748d717d8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ManhattanContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ManhattanContainerModelBuilder.java
@@ -92,7 +92,7 @@ public final class ManhattanContainerModelBuilder extends ContainerModelBuilder
         List<Element> accessLogElements = getAccessLogElements(spec);
         if (!accessLogElements.isEmpty()) {
             logManhattanInfo("Ignoring " + accessLogElements.size() +
-                    " access log elements in services.xml, using default yapache access logging instead.");
+                    " access log labels in services.xml, using default yapache access logging instead.");
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
index 344c5e16d29..5ee34748eff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
@@ -296,7 +296,7 @@ public final class DocumentProtocol implements Protocol, Documentrouteselectorpo
 
     /**
      * Attempts to simplify all route names by removing prefixing plugin name and whatever comes before the dot (.) in
-     * the second naming element. This can only be done to those routes that do not share primary name elements with
+     * the second naming element. This can only be done to those routes that do not share primary name labels with
      * other routes (e.g. a search clusters with the same name as a storage cluster).
      *
      * @param table The routing table whose route names are to be simplified.
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
index fbbc2071d30..fb8c3199d74 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
@@ -72,7 +72,7 @@ public class ClientUpdater {
             return;
         } else {
             if (log.isLoggable(LogLevel.DEBUG)) {
-                log.log(LogLevel.DEBUG, "Delayed response queue has " + responseDelayQueue.size() + " elements");
+                log.log(LogLevel.DEBUG, "Delayed response queue has " + responseDelayQueue.size() + " labels");
             }
         }
         DelayedResponse[] responses = new DelayedResponse[1];
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
index 36e0a4e81dc..5caa3fce245 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
@@ -101,7 +101,7 @@ public class ConfigPayloadBuilder {
      * Create a new array where new values may be added.
      *
      * @param name Name of array.
-     * @return Array object supporting adding elements to it.
+     * @return Array object supporting adding labels to it.
      */
     public Array getArray(String name) {
         Array a = arrayMap.get(name);
@@ -191,7 +191,7 @@ public class ConfigPayloadBuilder {
      * Create a new map where new values may be added.
      *
      * @param name Name of map.
-     * @return Map builder supporting adding elements to it.
+     * @return Map builder supporting adding labels to it.
      */
     public MapBuilder getMap(String name) {
         MapBuilder a = mapBuilderMap.get(name);
@@ -325,7 +325,7 @@ public class ConfigPayloadBuilder {
         }
 
         /**
-         * Create a new slime object and returns its payload builder. Append the element after all other elements
+         * Create a new slime object and returns its payload builder. Append the element after all other labels
          * in the array.
          *
          * @return a payload builder for the new slime object.
@@ -385,7 +385,7 @@ public class ConfigPayloadBuilder {
          */
         private void setAppend() {
             if (mode == ArrayMode.INDEX && elements.size() > 0) {
-                throw new IllegalStateException("Cannot append elements to an array in index mode with more than one element");
+                throw new IllegalStateException("Cannot append labels to an array in index mode with more than one element");
             }
             mode = ArrayMode.APPEND;
         }
@@ -395,7 +395,7 @@ public class ConfigPayloadBuilder {
          */
         private void verifyIndex() {
             if (mode == ArrayMode.APPEND)
-                throw new IllegalStateException("Cannot reference array elements with index once append is done");
+                throw new IllegalStateException("Cannot reference array labels with index once append is done");
         }
 
         public void resolve(Cursor parent) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
index 8858d368edf..485089f5ded 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
@@ -66,7 +66,7 @@ public class ServerCache {
     }
     
     /**
-     * The number of different {@link ConfigResponse} elements
+     * The number of different {@link ConfigResponse} labels
      * @return elems
      */
     public int configElems() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
index da6616772d3..d74be06404c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/MetricUpdater.java
@@ -59,18 +59,18 @@ public class MetricUpdater {
     }
 
     /**
-     * Sets the count for number of config elements in the {@link ServerCache}
+     * Sets the count for number of config labels in the {@link ServerCache}
      *
-     * @param elems number of elements
+     * @param elems number of labels
      */
     public void setCacheConfigElems(long elems) {
         staticMetrics.put(METRIC_CACHE_CONFIG_ELEMENTS, elems);
     }
 
     /**
-     * Sets the count for number of checksum elements in the {@link ServerCache}
+     * Sets the count for number of checksum labels in the {@link ServerCache}
      *
-     * @param elems number of elements
+     * @param elems number of labels
      */
     public void setCacheChecksumElems(long elems) {
         staticMetrics.put(METRIC_CACHE_CONFIG_CHECKSUMS, elems);
@@ -79,7 +79,7 @@ public class MetricUpdater {
     /**
      * Sets the number of outstanding responses (unchanged config in long poll)
      *
-     * @param elems number of elements
+     * @param elems number of labels
      */
     public void setDelayedResponses(long elems) {
         staticMetrics.put(METRIC_DELAYED_RESPONSES, elems);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
index e1bad224b8c..1565845b303 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
@@ -164,7 +164,7 @@ public class DelayedConfigResponses {
             request.setDelayedResponse(true);
             try {
                 if (log.isLoggable(LogLevel.DEBUG)) {
-                    log.log(LogLevel.DEBUG, context.logPre()+"Putting on delayedRequests queue (" + delayedResponsesQueue.size() + " elements): " +
+                    log.log(LogLevel.DEBUG, context.logPre()+"Putting on delayedRequests queue (" + delayedResponsesQueue.size() + " labels): " +
                             response.getRequest().getShortDescription());
                 }
                 // Config will be resolved in the run() method of DelayedConfigResponse,
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
index 887628ec43d..769c8635246 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
@@ -194,7 +194,7 @@ public class AccessLogEntry {
             if (adInfos == null) {
                 return Collections.emptyList();
             }
-            // TODO: The returned list is unmodifiable, but its elements are not. But we're all friendly here, right?
+            // TODO: The returned list is unmodifiable, but its labels are not. But we're all friendly here, right?
             return Collections.unmodifiableList(adInfos);
         }
     }
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java
index 961bfc32cc1..6fbaf7b8eb8 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java
@@ -82,7 +82,7 @@ public class LogFormatter extends Formatter {
 
     /**
      * Static insertDate method will insert date fragments into a string
-     * based on '%x' pattern elements.  Equivalents in SimpleDateFormatter patterns,
+     * based on '%x' pattern labels.  Equivalents in SimpleDateFormatter patterns,
      * with examples:
      * <ul>
      * <li>%Y  YYYY  2003
diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java
index ba2d34eabd7..75f4f836f25 100644
--- a/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java
+++ b/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 /**
  * The default renderer for processing responses. Renders a response in JSON.
- * This can be overridden to specify particular rendering of leaf Data elements.
+ * This can be overridden to specify particular rendering of leaf Data labels.
  * This default implementation renders the toString of each element.
  *
  * @author bratseth
diff --git a/container-search/src/main/java/com/yahoo/prelude/Location.java b/container-search/src/main/java/com/yahoo/prelude/Location.java
index 10d63051cbe..547541ecfcd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Location.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Location.java
@@ -17,7 +17,7 @@ public class Location {
     // 1 or 2
     private int dimensions = 0;
 
-    // line elements and rectangles
+    // line labels and rectangles
     private int x1 = 0;
     private int y1 = 0;
     private int x2 = 1;
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
index 638376c791d..7a4014b1912 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
@@ -245,7 +245,7 @@ public class HitField {
         return tokenizedContent;
     }
     /**
-     * Return an iterator for the tokens, delimiters and markup elements
+     * Return an iterator for the tokens, delimiters and markup labels
      * of the field.
      */
     public ListIterator<FieldPart> listIterator() {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/package-info.java b/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
index 95dbd62849f..4fa5a4e6750 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
- * The query model representing a boolean combination of selection criterions, where elements may be
+ * The query model representing a boolean combination of selection criterions, where labels may be
  * simple criterions, nested boolean operators, or annotated pieces of natural language text.
  */
 @ExportPackage
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
index cb540a1f982..0c9c1c6b208 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
@@ -68,7 +68,7 @@ public class AllParser extends SimpleParser {
         return simplifyUnnecessaryComposites(topLevel);
     }
 
-    // Simplify if there are unnecessary composites due to single elements
+    // Simplify if there are unnecessary composites due to single labels
     protected final Item simplifyUnnecessaryComposites(Item item) {
         if (item == null) return null;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
index bf673083596..7783a42fbce 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
@@ -25,7 +25,7 @@ public class WebParser extends AllParser {
     }
 
     protected @Override Item parseItemsBody() {
-        // Algorithm: Collect positive, negative, and'ed and or'ed elements, then combine.
+        // Algorithm: Collect positive, negative, and'ed and or'ed labels, then combine.
         AndItem and=null;
         OrItem or=null;
         NotItem not=null; // Store negatives here as we go
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
index 86fdee2bad9..f4932d8ae2f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
@@ -526,7 +526,7 @@ public class PhraseMatcher {
 
             public Item next() {
                 if (!hasNext())
-                    throw new NoSuchElementException(this + " has no more elements");
+                    throw new NoSuchElementException(this + " has no more labels");
 
                 currentIndex++;
                 if ((phrase.matched instanceof MatchedWord))
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
index 0b0ae0918aa..da42d398e78 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
@@ -120,7 +120,7 @@ public class Evaluation {
     }
 
 
-    /** Returns the current item, or null if there is no more elements */
+    /** Returns the current item, or null if there is no more labels */
     public FlattenedItem currentItem() {
         if ( (currentIndex>=flattenedItems.size()) || (currentIndex<0)) return null; //PGA
         return flattenedItems.get(currentIndex);
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
index ba6bf821197..95da7e8e21d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
@@ -120,7 +120,7 @@ public class RuleEvaluation {
 
     /**
      * Returns the current term item to look at,
-     * or null if there are no more elements
+     * or null if there are no more labels
      */
     public FlattenedItem currentItem() {
         if (position>=items.size()) return null;
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
index f54d92cdbf5..92dd0c67cbe 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
@@ -2,7 +2,7 @@
 package com.yahoo.search.grouping.request;
 
 /**
- * This class represents an count-aggregator in a {@link GroupingExpression}. It evaluates to the number of elements
+ * This class represents an count-aggregator in a {@link GroupingExpression}. It evaluates to the number of labels
  * there are in the input.
  *
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
index d445007a039..7a30883e7cf 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
 
 /**
  * This class represents a size-function in a {@link GroupingExpression}. It evaluates to a number that equals the
- * number of elements in the result of the argument (e.g. the number of elements in an array).
+ * number of labels in the result of the argument (e.g. the number of labels in an array).
  *
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  */
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
index 8c421feae47..21d9d354fc1 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
@@ -13,7 +13,7 @@ import java.util.Set;
 
 /**
  * A page template represents a particular way to organize a return page. It is a recursive structure of
- * page template elements.
+ * page template labels.
  *
  * @author bratseth
  */
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
index 451efb851d5..48c681cf093 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
@@ -29,7 +29,7 @@ public class PageTemplateXMLReader {
     /** The registry being constructed */
     private PageTemplateRegistry registry;
 
-    /** XML elements by page id - available after phase 1. Needed for includes. */
+    /** XML labels by page id - available after phase 1. Needed for includes. */
     private Map<ComponentId, Element> pageElementsByPageId=new LinkedHashMap<>();
 
     /**
@@ -167,7 +167,7 @@ public class PageTemplateXMLReader {
         page.freeze();
     }
 
-    /** Fills a section with attributes and sub-elements from a "section" or "page" element */
+    /** Fills a section with attributes and sub-labels from a "section" or "page" element */
     private Section readSection(Element sectionElement,Section section) {
         section.setLayout(Layout.fromString(sectionElement.getAttribute("layout")));
         section.setRegion(sectionElement.getAttribute("region"));
@@ -179,7 +179,7 @@ public class PageTemplateXMLReader {
         return section;
     }
 
-    /** Returns all page elements found under the given node */
+    /** Returns all page labels found under the given node */
     private List<PageElement> readPageElements(Element parent) {
         List<PageElement> pageElements=new ArrayList<>();
         for (Element child : XML.getChildren(parent)) {
@@ -196,7 +196,7 @@ public class PageTemplateXMLReader {
             pageElements.add(pageElement);
     }
 
-    /** Reads the direct descendant elements of an include */
+    /** Reads the direct descendant labels of an include */
     private List<PageElement> readInclude(Element element) {
         PageTemplate included=registry.getComponent(element.getAttribute("idref"));
         if (included==null)
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
index 6415dad37ec..5827dd9a402 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
@@ -44,7 +44,7 @@ public abstract class Resolver extends AbstractComponent {
      * on each choice found in that temnplate. This provides a simple API to resolvers which make each choice
      * independently.
      *
-     * @param pageTemplate the choice of page templates to resolve - a choice containing singleton lists of PageTemplate elements
+     * @param pageTemplate the choice of page templates to resolve - a choice containing singleton lists of PageTemplate labels
      * @param query the query, from which information useful for correct resolution can be found
      * @param result the result, from which further information useful for correct resolution can be found
      * @return the resolution of the choices contained in the given page template
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
index 3e956d510e7..6147bbabe6a 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
@@ -4,7 +4,7 @@ package com.yahoo.search.pagetemplates.model;
 import java.util.*;
 
 /**
- * A choice between some alternative lists of page elements.
+ * A choice between some alternative lists of page labels.
  *
  * @author bratseth
  */
@@ -46,7 +46,7 @@ public final class Choice extends AbstractChoice {
 
     /**
      * Returns the alternatives of this as a live reference to the alternatives of this.
-     * The list and elements may be modified unless this is frozen. This is never null.
+     * The list and labels may be modified unless this is frozen. This is never null.
      */
     public List<List<PageElement>> alternatives() { return alternatives; }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
index 67f67cb8538..c87538ce863 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
@@ -24,10 +24,10 @@ public class Section extends FreezableClass implements PageElement {
 
     private String region;
 
-    /** The elements of this - sources, subsections etc. and/or choices of the same */
+    /** The labels of this - sources, subsections etc. and/or choices of the same */
     private List<PageElement> elements=new ArrayList<>();
 
-    /** Filtered versions of elements pre-calculated at freeze time */
+    /** Filtered versions of labels pre-calculated at freeze time */
     private List<PageElement> sections, sources, renderers;
 
     private int max=-1;
@@ -80,25 +80,25 @@ public class Section extends FreezableClass implements PageElement {
     }
 
     /**
-     * Returns the elements of this - sources, subsections and presentations and/or choices of these,
+     * Returns the labels of this - sources, subsections and presentations and/or choices of these,
      * as a live reference which can be modified to change the content of this (unless this is frozen).
      * <p>
-     * All elements are kept in a single list to allow multiple elements of each type to be nested within separate
-     * choices, and to maintain the internal order of elements of various types, which is sometimes significant.
-     * To extract a certain kind of elements (say, sources), the element list must be traversed to collect
-     * all source elements as well as all choices of sources.
+     * All labels are kept in a single list to allow multiple labels of each type to be nested within separate
+     * choices, and to maintain the internal order of labels of various types, which is sometimes significant.
+     * To extract a certain kind of labels (say, sources), the element list must be traversed to collect
+     * all source labels as well as all choices of sources.
      * <p>
      * This list is never null but may be empty.
      */
     public List<PageElement> elements() { return elements; }
 
     /**
-     * Convenience method which returns the elements <b>and choices</b> of the given type in elements as a
-     * read-only list. Not that as this returns both concrete elements and choices betwen them,
+     * Convenience method which returns the labels <b>and choices</b> of the given type in labels as a
+     * read-only list. Not that as this returns both concrete labels and choices betwen them,
      * the list element cannot be case to the given class - this must be used in conjunction
      * with a resolve which contains the resolution to the choices.
      *
-     * @param pageTemplateModelElementClass type to returns elements and choices of, a subtype of PageElement
+     * @param pageTemplateModelElementClass type to returns labels and choices of, a subtype of PageElement
      */
     public List<PageElement> elements(@SuppressWarnings("rawtypes") Class pageTemplateModelElementClass) {
         if (isFrozen()) { // Use precalculated lists
@@ -133,7 +133,7 @@ public class Section extends FreezableClass implements PageElement {
         this.order=order;
     }
 
-    /** Returns max number of (immediate) elements/sections permissible within this, -1 means unrestricted. Default: -1. */
+    /** Returns max number of (immediate) labels/sections permissible within this, -1 means unrestricted. Default: -1. */
     public int getMax() { return max; }
 
     public void setMax(int max) {
@@ -141,7 +141,7 @@ public class Section extends FreezableClass implements PageElement {
         this.max=max;
     }
 
-    /** Returns min number of (immediate) elements/sections desired within this, -1 means unrestricted. Default: -1. */
+    /** Returns min number of (immediate) labels/sections desired within this, -1 means unrestricted. Default: -1. */
     public int getMin() { return min; }
 
     public void setMin(int min) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
index 78fa24973d4..f7829e4cc7e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
@@ -87,7 +87,7 @@ public class DimensionBinding {
     /**
      * Returns the values for the dimensions of this. This value is undefined if this isEmpty()
      * This array is always of the same length as the
-     * length of the dimension list - missing elements are represented as nulls.
+     * length of the dimension list - missing labels are represented as nulls.
      * This is never null but may be empty.
      */
     public DimensionValues getValues() { return values; }
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
index d0d18d7ba85..e58f6edb8a0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * A string which contains one or more elements of the form %{name},
+ * A string which contains one or more labels of the form %{name},
  * where these occurrences are to be replaced by a query profile lookup on name.
  * <p>
  * This objects does the analysis on creation and provides a (reasonably) fast method of
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
index 808d4f43682..74875a459b7 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
@@ -79,7 +79,7 @@ public class ItemInitializer {
         TypeCheck.ensureInstanceOf(connectivity, List.class);
         List<?> connectivityList = (List<?>) connectivity;
         if (connectivityList.size() != 2) {
-            throw new IllegalArgumentException("Expected two elements for connectivity, got " + connectivityList.size());
+            throw new IllegalArgumentException("Expected two labels for connectivity, got " + connectivityList.size());
         }
 
         Object id = connectivityList.get(0);
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index 7df859c6070..c2c0074a8ba 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -65,7 +65,7 @@ import com.yahoo.yolean.trace.TraceVisitor;
  *
  * @author Steinar Knutsen
  */
-// NOTE: The JSON format is a public API. If new elements are added be sure to update the reference doc.
+// NOTE: The JSON format is a public API. If new labels are added be sure to update the reference doc.
 public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
 
     private static final CompoundName DEBUG_RENDERING_KEY = new CompoundName("renderer.json.debug");
diff --git a/container-search/src/main/java/com/yahoo/search/result/Relevance.java b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
index df79b64585e..147955f1312 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Relevance.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
@@ -32,7 +32,7 @@ public class Relevance implements Comparable<Relevance> {
     /**
      * Set score value to this value. This should ideally be a
      * normalized value between 0 and 1, but that is not enforced.
-     * NaN is also a legal value, for elements where it makes no sense to assign a particular value.
+     * NaN is also a legal value, for labels where it makes no sense to assign a particular value.
      */
     public void setScore(double score) { this.score = score; }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java b/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
index 86e2cbf01ff..e65ec2690d7 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
@@ -20,8 +20,8 @@ class JavaListTypeChecker extends OperatorTypeChecker {
         Preconditions.checkArgument(argument instanceof List, "Argument %s of %s must be a List<%s>", idx, parent, elementType.getName(), argument.getClass().getName());
         List<?> lst = (List<?>) argument;
         for (Object elt : lst) {
-            Preconditions.checkNotNull(elt, "Argument %s of %s List elements may not be null", idx, parent);
-            Preconditions.checkArgument(elementType.isInstance(elt), "Argument %s of %s List elements must be %s (is %s)", idx, parent, elementType.getName(), elt.getClass().getName());
+            Preconditions.checkNotNull(elt, "Argument %s of %s List labels may not be null", idx, parent);
+            Preconditions.checkArgument(elementType.isInstance(elt), "Argument %s of %s List labels must be %s (is %s)", idx, parent, elementType.getName(), elt.getClass().getName());
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
index d1b65ee258b..6ac3b963e7e 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
@@ -79,7 +79,7 @@ final class OperatorNode<T extends Operator> {
     }
 
     public Object[] getArguments() {
-        // this is only called by a test right now, but ImmutableList.copyOf won't tolerate null elements
+        // this is only called by a test right now, but ImmutableList.copyOf won't tolerate null labels
         if (args.length == 0) {
             return args;
         }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
index 6c061cdce47..465bc5158d2 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
@@ -209,7 +209,7 @@ public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
         Set<String> sourceNames=new HashSet<>();
         for (Source source : page.getSources())
             sourceNames.add(source.getName());
-        assertEquals("Expected " + expectedSourceNames.length + " elements in " + sourceNames,
+        assertEquals("Expected " + expectedSourceNames.length + " labels in " + sourceNames,
                      expectedSourceNames.length,sourceNames.size());
         for (String expectedSourceName : expectedSourceNames)
             assertTrue("Sources did not include '" + expectedSourceName+ "'",sourceNames.contains(expectedSourceName));
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
index cca4a2833d0..cd8fddf057f 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
@@ -71,7 +71,7 @@ public class QueryProfileListPropertiesMicroBenchmark {
             Map<String,Object> properties = query.properties().listProperties(propertyPrefix);
             int expectedSize = 10 + (propertyPrefix.isEmpty() ? 3 : 0); // 3 extra properties on the root
             if ( properties.size() != expectedSize )
-                throw new RuntimeException("Expected a map of 10 elements, but got " + expectedSize + ": \n" + toString(properties));
+                throw new RuntimeException("Expected a map of 10 labels, but got " + expectedSize + ": \n" + toString(properties));
         }
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
index 23316a58877..e3b8e88225d 100644
--- a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
@@ -52,7 +52,7 @@ public class CacheControlSearcherTestCase extends TestCase {
      */
     private void assertCacheHeaders(String[] values, List<String> cacheheaders) {
         assertNotNull("No headers to test for (was null)", values);
-        assertTrue("No headers to test for (no elements in array)", values.length > 0);
+        assertTrue("No headers to test for (no labels in array)", values.length > 0);
         assertNotNull("No cache headers set in response", cacheheaders);
         assertEquals(values.length, cacheheaders.size());
         for (String header : values) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/CallStack.java b/docproc/src/main/java/com/yahoo/docproc/CallStack.java
index 52b16302e26..c96df3e7192 100644
--- a/docproc/src/main/java/com/yahoo/docproc/CallStack.java
+++ b/docproc/src/main/java/com/yahoo/docproc/CallStack.java
@@ -119,7 +119,7 @@ public class CallStack {
     }
 
     /**
-     * Push multiple elements as the <i>next</i> elements on this stack
+     * Push multiple labels as the <i>next</i> labels on this stack
      *
      * @return this for convenience
      */
@@ -148,7 +148,7 @@ public class CallStack {
     }
 
     /**
-     * Adds multiple elements as the <i>last</i> elements on this stack
+     * Adds multiple labels as the <i>last</i> labels on this stack
      *
      * @return this for convenience
      */
@@ -194,7 +194,7 @@ public class CallStack {
     }
 
     /**
-     * Adds multiple elements just before the first occurence of some element on
+     * Adds multiple labels just before the first occurence of some element on
      * the stack. This can not be called during an iteration.
      *
      * @param before
@@ -254,7 +254,7 @@ public class CallStack {
     }
 
     /**
-     * Adds multiple elements just after another given element on the stack.
+     * Adds multiple labels just after another given element on the stack.
      * This can not be called during an iteration.
      *
      * @param after
@@ -332,7 +332,7 @@ public class CallStack {
     }
 
     /**
-     * Returns and removes the next element, or null if there are no more elements
+     * Returns and removes the next element, or null if there are no more labels
      */
     public Call pop() {
         if (elements.isEmpty()) return null;
@@ -342,7 +342,7 @@ public class CallStack {
 
     /**
      * Returns the next element without removing it, or null if there are no
-     * more elements
+     * more labels
      */
     public Call peek() {
         if (elements.isEmpty()) return null;
@@ -362,14 +362,14 @@ public class CallStack {
     }
 
     /**
-     * Returns a modifiable ListIterator over all the remaining elements of this
+     * Returns a modifiable ListIterator over all the remaining labels of this
      * stack, starting by the next element
      */
     public ListIterator<Call> iterator() {
         return elements.listIterator();
     }
 
-    /** Returns the number of remainnig elements in this stack */
+    /** Returns the number of remainnig labels in this stack */
     public int size() {
         return elements.size();
     }
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
index cb272a1d151..1604cd4acda 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
@@ -66,7 +66,7 @@ public abstract class DocumentProcessor extends ChainedComponent {
 
     /**
      * Processes a processing, which can contain zero or more document bases. The implementing document processor
-     * is free to modify, replace or delete elements in the list inside processing.
+     * is free to modify, replace or delete labels in the list inside processing.
      *
      * @param processing the processing to process
      * @return the outcome of this processing
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
index ed45435d6ef..98b0cce9e1e 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
@@ -63,7 +63,7 @@ public class SplitterDocumentProcessor extends DocumentProcessor {
 
         if (innerDocuments.size() == 0) {
             //the array is empty, return
-            log.log(LogLevel.DEBUG, "The given Document does not have any elements in array field "
+            log.log(LogLevel.DEBUG, "The given Document does not have any labels in array field "
                                     + arrayFieldName + ", returning. (Was given " + outerDoc + ").");
             return Progress.DONE;
         }
diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java
index 51af799efd9..bd4d41ca2ea 100644
--- a/document/src/main/java/com/yahoo/document/DataType.java
+++ b/document/src/main/java/com/yahoo/document/DataType.java
@@ -168,7 +168,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
     }
 
     /**
-     * Returns an array datatype, where the array elements are of the given type
+     * Returns an array datatype, where the array labels are of the given type
      *
      * @param type the type to create an array of
      * @return the array data type
@@ -189,7 +189,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
     }
 
     /**
-     * Returns a weighted set datatype, where the elements are of the given type
+     * Returns a weighted set datatype, where the labels are of the given type
      *
      * @param type the type to create a weighted set of
      * @return the weighted set data type
@@ -199,7 +199,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
     }
 
     /**
-     * Returns a weighted set datatype, where the elements are of the given type, and which supports the properties
+     * Returns a weighted set datatype, where the labels are of the given type, and which supports the properties
      * createIfNonExistent and removeIfZero
      *
      * @param type                the type to create a weighted set of
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Struct.java b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
index 5a01dc33aa1..ac99b8a1c80 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
@@ -349,7 +349,7 @@ public class Struct extends StructuredFieldValue {
 
         public Map.Entry<Field, FieldValue> next() {
             if (position >= increasing.length) {
-                throw new NoSuchElementException("No more elements in collection");
+                throw new NoSuchElementException("No more labels in collection");
             }
             FieldEntry retval = new FieldEntry(increasing[position]);
             position++;
diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
index 043c36faf93..e1444c5145f 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
@@ -99,7 +99,7 @@ public class JsonSerializationHelper {
     private static void serializeTensorAddress(JsonGenerator generator, TensorAddress address, TensorType type) throws IOException {
         generator.writeObjectFieldStart(JsonReader.TENSOR_ADDRESS);
         for (int i = 0; i < type.dimensions().size(); i++)
-            generator.writeStringField(type.dimensions().get(i).name(), address.elements().get(i));
+            generator.writeStringField(type.dimensions().get(i).name(), address.labels().get(i));
 
         generator.writeEndObject();
     }
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
index 9e764aae798..2f746a9160f 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -206,7 +206,7 @@ public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 imple
             numElements = getInt1_2_4Bytes(null);
         }
         if (numElements < 0) {
-            throw new DeserializationException("Bad number of array/map elements, " + numElements);
+            throw new DeserializationException("Bad number of array/map labels, " + numElements);
         }
         return numElements;
     }
@@ -374,7 +374,7 @@ public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 imple
 
         int numElements = getInt(null);
         if (numElements < 0) {
-            throw new DeserializationException("Bad number of weighted set elements, " + numElements);
+            throw new DeserializationException("Bad number of weighted set labels, " + numElements);
         }
 
         ws.clearAndReserve(numElements * 2); // Avoid resizing
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
index cdc676eca5f..b7fd392436e 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
@@ -47,7 +47,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader {
     }
 
     /**
-     * Optional test and set condition. Common for document/update/remove elements
+     * Optional test and set condition. Common for document/update/remove labels
      * This variable is either set in VespaXMLFieldReader#read (reader for document)
      * or in VespaXMLUpdateReader#read (reader for update).
      */
diff --git a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java
index 76e1588b2a1..174817972f3 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java
@@ -41,7 +41,7 @@ public class StructTestCase {
         }
 
         {
-            //add three elements and remove one of them, and replace the last one:
+            //add three labels and remove one of them, and replace the last one:
             assertEquals(0, struct.getFields().size());
 
             IntegerFieldValue ifv = new IntegerFieldValue(5);
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
index 19f753484d3..6131ee70069 100755
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
@@ -145,7 +145,7 @@ public class VespaXMLReaderTestCase {
 
     @Test
     public void testNews3() throws Exception {
-        // Updating all elements in a documentType
+        // Updating all labels in a documentType
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test03.xml", manager);
         VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
         parser.read(op);
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
index 870a39c0122..c8192d92798 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.

 package com.yahoo.documentapi.messagebus.systemstate.rule;

 

 import java.util.ArrayList;

@@ -62,7 +62,7 @@ public class Location {
 

     /**

      * Returns a location object that represents the "next" step along this location path. This means removing the first

-     * elements of this location's items and returning a new location for this sublist.

+     * labels of this location's items and returning a new location for this sublist.

      *

      * @return The next location along this path.

      */

diff --git a/jrt/src/com/yahoo/jrt/Queue.java b/jrt/src/com/yahoo/jrt/Queue.java
index 5feb62c2af1..789dd38a1fa 100644
--- a/jrt/src/com/yahoo/jrt/Queue.java
+++ b/jrt/src/com/yahoo/jrt/Queue.java
@@ -4,7 +4,7 @@ package com.yahoo.jrt;
 
 /**
  * A queue implementation that is not thread-safe. The implementation
- * uses a growable circular array to hold the elements.
+ * uses a growable circular array to hold the labels.
  **/
 class Queue
 {
@@ -15,7 +15,7 @@ class Queue
 
     /**
      * Ensure the queue has room for the specified number of
-     * additional elements.
+     * additional labels.
      *
      * @param need space needed on queue
      **/
@@ -39,7 +39,7 @@ class Queue
     }
 
     /**
-     * Create a queue. If more elements are put on the queue than can
+     * Create a queue. If more labels are put on the queue than can
      * be held by the initial capacity, the underlying structures will
      * be grown as needed.
      *
@@ -100,17 +100,17 @@ class Queue
     }
 
     /**
-     * @return the number of elements in this queue
+     * @return the number of labels in this queue
      **/
     public int size() {
         return used;
     }
 
     /**
-     * Flush all elements currently in this queue into another
+     * Flush all labels currently in this queue into another
      * queue. Note that this will clear the queue.
      *
-     * @return the number of elements flushed
+     * @return the number of labels flushed
      **/
     public int flush(Queue dst) {
         int cnt = used;
diff --git a/linguistics/src/main/java/com/yahoo/language/process/StemList.java b/linguistics/src/main/java/com/yahoo/language/process/StemList.java
index d355af87f08..8f81dd2b9ed 100644
--- a/linguistics/src/main/java/com/yahoo/language/process/StemList.java
+++ b/linguistics/src/main/java/com/yahoo/language/process/StemList.java
@@ -5,7 +5,7 @@ import java.util.AbstractList;
 import java.util.ArrayList;
 
 /**
- * A list of strings which does not allow for duplicate elements.
+ * A list of strings which does not allow for duplicate labels.
  *
  * @author steinar
  */
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharArraySet.java b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharArraySet.java
index df7dc32070b..5827b58f89b 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharArraySet.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharArraySet.java
@@ -53,7 +53,7 @@ public class CharArraySet extends AbstractSet<Object> {
    * Creates a set from a Collection of objects. 
    * 
    * @param c
-   *          a collection whose elements to be placed into the set
+   *          a collection whose labels to be placed into the set
    * @param ignoreCase
    *          <code>false</code> if and only if the set should be case sensitive
    *          otherwise <code>true</code>.
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
index 91bd6286b28..4ad5711f3a6 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
@@ -52,7 +52,7 @@ public abstract class CharacterUtils {
   public abstract int codePointAt(final CharSequence seq, final int offset);
   
   /**
-   * Returns the code point at the given index of the char array where only elements
+   * Returns the code point at the given index of the char array where only labels
    * with index less than the limit are used.
    * 
    * @param chars
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/kstem/KStemData3.java b/linguistics/src/main/java/com/yahoo/language/simple/kstem/KStemData3.java
index 4c72ef87526..caad2c4136a 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/kstem/KStemData3.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/kstem/KStemData3.java
@@ -163,7 +163,7 @@ class KStemData3 {
 "electroencephalogram","electroencephalograph","electrolysis","electrolyte","electron",
 "electronic","electronics","electroplate","eleemosynary","elegant",
 "elegiac","elegy","element","elemental","elementary",
-"elements","elephant","elephantiasis","elephantine","elevate",
+"labels","elephant","elephantiasis","elephantine","elevate",
 "elevated","elevation","elevator","eleven","elevenses",
 "elf","elfin","elfish","elicit","elide",
 "eligible","eliminate","elite","elitism","elixir",
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
index 8af5202739b..1a2c948ecb2 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
@@ -190,7 +190,7 @@ public class HandlerThread extends Thread implements LogHandler
             throw new NullPointerException("channel is not allowed to be null");
         }
 
-    	// TODO: Make the legmessage elements some kind of composite structure to handle both individual messages and lists uniformly.
+    	// TODO: Make the legmessage labels some kind of composite structure to handle both individual messages and lists uniformly.
         List<ItemOrList> drainList = new ArrayList<ItemOrList>(queue.size() + 1);
         try {
             for (;;) {
@@ -201,7 +201,7 @@ public class HandlerThread extends Thread implements LogHandler
                 queue.drainTo(drainList);
 
                 for (ItemOrList o : drainList) {
-                    // we can get two types of elements here: single log
+                    // we can get two types of labels here: single log
                     // messages or lists of log messages, so we need to
                     // handle them accordingly.
 
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java b/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java
index c4a1f2d9097..784ec69536b 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java
@@ -59,9 +59,9 @@ public class CallStack {
     }
 
     /**
-     * Returns the number of elements of the callstack.
+     * Returns the number of labels of the callstack.
      *
-     * @return The number of elements.
+     * @return The number of labels.
      */
     public int size() {
         return stack.size();
diff --git a/node-admin/scripts/pyroute2/netlink/nfnetlink/ipset.py b/node-admin/scripts/pyroute2/netlink/nfnetlink/ipset.py
index 10c6d57024e..1aef0b8949b 100644
--- a/node-admin/scripts/pyroute2/netlink/nfnetlink/ipset.py
+++ b/node-admin/scripts/pyroute2/netlink/nfnetlink/ipset.py
@@ -11,7 +11,7 @@ IPSET_CMD_NONE = 0
 IPSET_CMD_PROTOCOL = 1  # Return protocol version
 IPSET_CMD_CREATE = 2  # Create a new (empty) set
 IPSET_CMD_DESTROY = 3  # Destroy a (empty) set
-IPSET_CMD_FLUSH = 4  # Remove all elements from a set
+IPSET_CMD_FLUSH = 4  # Remove all labels from a set
 IPSET_CMD_RENAME = 5  # Rename a set
 IPSET_CMD_SWAP = 6  # Swap two sets
 IPSET_CMD_LIST = 7  # List sets
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 473b9171d7a..5fca9da807b 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -197,7 +197,7 @@ public class NodeAdminImpl implements NodeAdmin {
     }
 
     // Returns a full outer join of two data sources (of types T and U) on some extractable attribute (of type V).
-    // Full outer join means that all elements of both data sources are included in the result,
+    // Full outer join means that all labels of both data sources are included in the result,
     // even when there is no corresponding element (having the same attribute) in the other data set,
     // in which case the value from the other source will be empty.
     static <T, U, V> Stream<Pair<Optional<T>, Optional<U>>> fullOuterJoin(
diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/index/PredicateSearch.java b/predicate-search/src/main/java/com/yahoo/search/predicate/index/PredicateSearch.java
index c40bd944b7b..47cacad8082 100644
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/index/PredicateSearch.java
+++ b/predicate-search/src/main/java/com/yahoo/search/predicate/index/PredicateSearch.java
@@ -266,7 +266,7 @@ public class PredicateSearch {
     }
 
     private void sortIndexes(int numUpdated) {
-        // Sort the updated elements
+        // Sort the updated labels
         boolean swapMergeBuffer =
                 PrimitiveArraySorter.sortAndMerge(sortedIndexes, sortedIndexesMergeBuffer, numUpdated, nPostingLists,
                         (a, b) -> Integer.compare(docIds[a], docIds[b]));
diff --git a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
index 348966891b2..06e69864a3b 100644
--- a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
+++ b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
@@ -195,7 +195,7 @@ public final class CompoundName {
     }
 
     /**
-     * Returns the number of compound elements in this. Which is exactly the number of dots in the string plus one.
+     * Returns the number of compound labels in this. Which is exactly the number of dots in the string plus one.
      * The size of an empty compound is 0.
      */
     public int size() {
diff --git a/processing/src/main/java/com/yahoo/processing/response/Ordered.java b/processing/src/main/java/com/yahoo/processing/response/Ordered.java
index 87fa14e3c04..67d03dcc7a5 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Ordered.java
+++ b/processing/src/main/java/com/yahoo/processing/response/Ordered.java
@@ -3,7 +3,7 @@ package com.yahoo.processing.response;
 
 /**
  * This is an <i>optional marker interface</i>.
- * DataLists may implement this to return false to indicate that the order of the elements of
+ * DataLists may implement this to return false to indicate that the order of the labels of
  * the list is insignificant. The usage of this is to allow the content of a list to be rendered in the order
  * in which it completes rather than in the order in which it is added to the list.
  *
diff --git a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
index ea6f451b41b..b6a823ef0f7 100644
--- a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
+++ b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
@@ -229,7 +229,7 @@ public class ProcessorLibrary {
     }
 
     /**
-     * Adds a data element containing the (recursive) count of concrete (non-list) data elements in the response
+     * Adds a data element containing the (recursive) count of concrete (non-list) data labels in the response
      */
     public static class DataCounter extends Processor {
 
@@ -353,7 +353,7 @@ public class ProcessorLibrary {
 
                 // wait for other executions and merge the responses
                 for (Response additionalResponse : AsyncExecution.waitForAll(futures, 1000)) {
-                    additionalResponse.data().complete().get(); // block until we have all the data elements
+                    additionalResponse.data().complete().get(); // block until we have all the data labels
                     for (Object item : additionalResponse.data().asList())
                         response.data().add((Data) item);
                     response.mergeWith(additionalResponse);
diff --git a/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java b/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java
index 4578299adff..9aeb5f6603b 100644
--- a/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/ResponseTestCase.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.*;
 public class ResponseTestCase {
 
     /**
-     * Create a nested async tree of data elements, complete it recursively and check completion order.
+     * Create a nested async tree of data labels, complete it recursively and check completion order.
      * Check the recursive toString printing along the way.
      * List variable names ends by numbers specifying the index of the list at each level.
      */
@@ -47,7 +47,7 @@ public class ResponseTestCase {
         list12.add(list123);
         list123.add(list1231);
         list123.add(list1232);
-        // add sync data elements
+        // add sync data labels
         list1.add(new ProcessorLibrary.StringData(request,"list1"));
         list12.add(new ProcessorLibrary.StringData(request,"list12"));
         list14.add(new ProcessorLibrary.StringData(request,"list14"));
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java
index 7055686a4c0..f8e28ee1cb1 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java
@@ -42,10 +42,10 @@ public class HyperLogLogEstimator implements UniqueCountEstimator<Sketch<?>> {
     }
 
     /**
-     * Estimates the number of unique elements.
+     * Estimates the number of unique labels.
      *
      * @param sketch A sketch populated with values from the aggregation phase of HLL.
-     * @return The estimated number of unique elements.
+     * @return The estimated number of unique labels.
      */
     @Override
     public long estimateCount(Sketch<?> sketch) {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
index fbfd08be6b0..6c40befb124 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
@@ -43,7 +43,7 @@ public class SparseSketch extends Sketch<SparseSketch> {
      *
      * Serialization format
      * ==================
-     * Number of elements:      4 bytes
+     * Number of labels:      4 bytes
      * Elements:            N * 4 bytes
      * @param buf Serializer
      */
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/BiasEstimatorTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/BiasEstimatorTest.java
index 307214d8c1c..01a43b0e437 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/BiasEstimatorTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/BiasEstimatorTest.java
@@ -55,7 +55,7 @@ public class BiasEstimatorTest {
     @Test
     public void requireThatLinearInterpolationIsCorrect() {
         BiasEstimator estimator = new BiasEstimator(10);
-        double rawEstimate = (738.1256 + 750.4234) / 2; // average of two first elements
+        double rawEstimate = (738.1256 + 750.4234) / 2; // average of two first labels
         double expectedBias = (737.1256 + 724.4234) / 2;
         assertEstimateEquals(expectedBias, rawEstimate, estimator);
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java
index 3b0a584f37b..4ee5804b814 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java
@@ -20,7 +20,7 @@ public class NormalSketchTest {
 
     @Test
     public void requireThatSerializationIsCorrectForIncompressibleData() {
-        // A sketch of precision 1 contains only two elements and will therefore not be compressible.
+        // A sketch of precision 1 contains only two labels and will therefore not be compressible.
         testSerializationForPrecision(1);
     }
 
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
index cefa8d6e94a..51bfe88d1ac 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/DocumentQueue.java
@@ -41,7 +41,7 @@ class DocumentQueue {
                 queue.wait();
             }
             if (closed) {
-                throw new IllegalStateException("Cannot add elements to closed queue.");
+                throw new IllegalStateException("Cannot add labels to closed queue.");
             }
             queue.add(document);
             queue.notifyAll();
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
index 64ff6d736ea..a0fe01925c1 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
@@ -39,7 +39,7 @@ public final class ArraySet<E> implements Set<E> {
         @Override
         public E next() {
             if (!hasNext()) {
-                throw new NoSuchElementException("No more elements available");
+                throw new NoSuchElementException("No more labels available");
             }
             removed = false;
             return (E) entries[++i];
@@ -66,7 +66,7 @@ public final class ArraySet<E> implements Set<E> {
 
     /**
      * Create a set with an initial capacity of initSize. The internal array
-     * will grow automatically with a linear growth rate if more elements than
+     * will grow automatically with a linear growth rate if more labels than
      * initSize are added.
      *
      * @param initSize
diff --git a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
index 41e4a934d71..916d93bbe49 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
@@ -106,7 +106,7 @@ public class BobHash {
      * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
      * use a bitmask.  For example, if you need only 10 bits, do
      * h = (h &amp; hashmask(10));
-     * In which case, the hash table should have hashsize(10) elements.
+     * In which case, the hash table should have hashsize(10) labels.
      *
      * If you are hashing n strings (ub1 **)k, do it like this:
      *  for (i=0, h=0; i&lt;n; ++i) h = hash( k[i], len[i], h);
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java b/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java
index c0f630a92e5..e6e3f4b0e1c 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java
@@ -10,9 +10,9 @@ package com.yahoo.collections;
 public class ByteArrayComparator {
     /**
      * Compare the arguments. Shorter arrays are always considered
-     * smaller than longer arrays. For arrays of equal lengths, the elements
-     * are compared one-by-one. Whenever two corresponding elements in the
-     * two arrays are non-equal, the method returns. If all elements at
+     * smaller than longer arrays. For arrays of equal lengths, the labels
+     * are compared one-by-one. Whenever two corresponding labels in the
+     * two arrays are non-equal, the method returns. If all labels at
      * corresponding positions in the two arrays are equal, the arrays
      * are considered equal.
      *
diff --git a/vespajlib/src/main/java/com/yahoo/collections/CollectionComparator.java b/vespajlib/src/main/java/com/yahoo/collections/CollectionComparator.java
index 8999f0cac9c..6f434221cbb 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/CollectionComparator.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/CollectionComparator.java
@@ -13,9 +13,9 @@ import java.util.Iterator;
 public class CollectionComparator {
     /**
      * Compare the arguments. Shorter Collections are always considered
-     * smaller than longer Collections. For Collections of equal lengths, the elements
-     * are compared one-by-one. Whenever two corresponding elements in the
-     * two Collections are non-equal, the method returns. If all elements at
+     * smaller than longer Collections. For Collections of equal lengths, the labels
+     * are compared one-by-one. Whenever two corresponding labels in the
+     * two Collections are non-equal, the method returns. If all labels at
      * corresponding positions in the two Collections are equal, the Collections
      * are considered equal.
      *
diff --git a/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java b/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
index ddcc6e97dff..d3df67dcf78 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 public class CollectionUtil {
 
     /**
-     * Returns a String containing the string representation of all elements from
+     * Returns a String containing the string representation of all labels from
      * the given collection, separated by the separator string.
      *
      * @param collection The collection
@@ -32,7 +32,7 @@ public class CollectionUtil {
     }
 
     /**
-     * Returns a String containing the string representation of all elements from
+     * Returns a String containing the string representation of all labels from
      * the given collection, using a start string, separator strings, and an end string.
      *
      * @param collection The collection
@@ -57,7 +57,7 @@ public class CollectionUtil {
     }
 
     /**
-     * Returns the symmetric difference between two collections, i.e. the set of elements
+     * Returns the symmetric difference between two collections, i.e. the set of labels
      * that occur in exactly one of the collections.
      */
     public static <T> Set<T> symmetricDifference(Collection<? extends T> c1, Collection<? extends T> c2) {
@@ -72,7 +72,7 @@ public class CollectionUtil {
     }
 
     /**
-     * Returns the subset of elements from the given collection that can be cast to the reference
+     * Returns the subset of labels from the given collection that can be cast to the reference
      * type, defined by the given Class object.
      */
     public static <T> Collection<T> filter(Collection<?> collection, Class<T> lowerBound) {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/IntArrayComparator.java b/vespajlib/src/main/java/com/yahoo/collections/IntArrayComparator.java
index 21c6f514cbf..d7b6b13abce 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/IntArrayComparator.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/IntArrayComparator.java
@@ -10,9 +10,9 @@ package com.yahoo.collections;
 public class IntArrayComparator {
     /**
      * Compare the arguments. Shorter arrays are always considered
-     * smaller than longer arrays. For arrays of equal lengths, the elements
-     * are compared one-by-one. Whenever two corresponding elements in the
-     * two arrays are non-equal, the method returns. If all elements at
+     * smaller than longer arrays. For arrays of equal lengths, the labels
+     * are compared one-by-one. Whenever two corresponding labels in the
+     * two arrays are non-equal, the method returns. If all labels at
      * corresponding positions in the two arrays are equal, the arrays
      * are considered equal.
      *
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
index 8054179be30..2952b5267d6 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
@@ -31,7 +31,7 @@ public class ListMap<K, V> {
         }
     }
 
-    /** Puts an element into this. Multiple elements at the same position are added to the list at this key */
+    /** Puts an element into this. Multiple labels at the same position are added to the list at this key */
     public void put(K key, V value) {
         List<V> list = map.get(key);
         if (list == null) {
@@ -68,8 +68,8 @@ public class ListMap<K, V> {
     }
 
     /**
-     * Returns the List containing the elements with this key, or an empty list
-     * if there are no elements. The list returned is unmodifiable.
+     * Returns the List containing the labels with this key, or an empty list
+     * if there are no labels. The list returned is unmodifiable.
      */
     public List<V> get(K key) {
         List<V> list = map.get(key);
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
index d195cf36172..cadc285cba3 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
@@ -57,7 +57,7 @@ public class ListenableArrayList<ITEM> extends ArrayList<ITEM> {
     }
 
     /**
-     * Adds a listener which is invoked whenever elements are added to this.
+     * Adds a listener which is invoked whenever labels are added to this.
      * This may not be invoked once for each added element.
      */
     public void addListener(Runnable listener) {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/TinyIdentitySet.java b/vespajlib/src/main/java/com/yahoo/collections/TinyIdentitySet.java
index 177a4e6720b..bfa985c77e5 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/TinyIdentitySet.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/TinyIdentitySet.java
@@ -39,7 +39,7 @@ public final class TinyIdentitySet<E> implements Set<E> {
         @Override
         public E next() {
             if (!hasNext()) {
-                throw new NoSuchElementException("No more elements available");
+                throw new NoSuchElementException("No more labels available");
             }
             removed = false;
             return (E) entries[++i];
@@ -66,7 +66,7 @@ public final class TinyIdentitySet<E> implements Set<E> {
 
     /**
      * Create a set with an initial capacity of initSize. The internal array
-     * will grow automatically with a linear growth rate if more elements than
+     * will grow automatically with a linear growth rate if more labels than
      * initSize are added.
      *
      * @param initSize
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
index 42d3ff51aae..0465eb2a918 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
@@ -46,7 +46,7 @@ public class ThreadRobustList<T> implements Iterable<T> {
     }
 
     /**
-     * Returns an iterator over the elements of this. This iterator does not
+     * Returns an iterator over the labels of this. This iterator does not
      * support remove.
      */
     @Override
@@ -55,7 +55,7 @@ public class ThreadRobustList<T> implements Iterable<T> {
     }
 
     /**
-     * Returns an iterator over the elements of this, starting at the last
+     * Returns an iterator over the labels of this, starting at the last
      * element and working backwards. This iterator does not support remove.
      */
     public Iterator<T> reverseIterator() {
@@ -86,7 +86,7 @@ public class ThreadRobustList<T> implements Iterable<T> {
         @Override
         public T next() {
             if (!hasNext()) {
-                throw new NoSuchElementException("No more elements");
+                throw new NoSuchElementException("No more labels");
             }
 
             return (T) items[nextIndex++];
@@ -135,7 +135,7 @@ public class ThreadRobustList<T> implements Iterable<T> {
         @Override
         public T next() {
             if (!hasNext()) {
-                throw new NoSuchElementException("No more elements");
+                throw new NoSuchElementException("No more labels");
             }
 
             return (T) items[nextIndex--];
diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java
index a15ebacc4cf..62f743614f4 100644
--- a/vespajlib/src/main/java/com/yahoo/path/Path.java
+++ b/vespajlib/src/main/java/com/yahoo/path/Path.java
@@ -10,7 +10,7 @@ import java.util.List;
 // TODO: Remove and replace usage by java.nio.file.Path
 
 /**
- * Represents a path represented by a list of elements. Immutable
+ * Represents a path represented by a list of labels. Immutable
  *
  * @author lulf
  * @since 5.1
@@ -37,8 +37,8 @@ public final class Path {
     }
 
     /**
-     * Create path with given elements.
-     * @param elements a list of path elements
+     * Create path with given labels.
+     * @param elements a list of path labels
      */
     private Path(List<String> elements, String delimiter) {
         this.elements.addAll(elements);
@@ -51,7 +51,7 @@ public final class Path {
     }
 
     /**
-     * Add path elements by splitting based on delimiter and appending to elements.
+     * Add path labels by splitting based on delimiter and appending to labels.
      */
     private void addElementsFromString(String path) {
         String[] pathElements = path.split(delimiter);
@@ -116,7 +116,7 @@ public final class Path {
     }
 
     /**
-     * Get the parent path (all elements except last).
+     * Get the parent path (all labels except last).
      * @return the parent path.
      */
     public Path getParentPath() {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
index 436b31e7dae..d5beb60b22b 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MapTensor.java
@@ -75,7 +75,7 @@ public class MapTensor implements Tensor {
         for (String elementString : addressBody.split(",")) {
             String[] pair = elementString.split(":");
             if (pair.length != 2)
-                throw new IllegalArgumentException("Expecting argument elements to be on the form dimension:label, " +
+                throw new IllegalArgumentException("Expecting argument labels to be on the form dimension:label, " +
                                                    "got '" + elementString + "'");
             builder.mapped(pair[0].trim());
         }
@@ -120,7 +120,7 @@ public class MapTensor implements Tensor {
         for (String elementString : addressBody.split(",")) {
             String[] pair = elementString.split(":");
             if (pair.length != 2)
-                throw new IllegalArgumentException("Expecting argument elements to be on the form dimension:label, " +
+                throw new IllegalArgumentException("Expecting argument labels to be on the form dimension:label, " +
                                                    "got '" + elementString + "'");
             builder.add(pair[0].trim(), pair[1].trim());
         }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
index f3c1db06b05..f7a9f15e313 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MapTensorBuilder.java
@@ -4,9 +4,7 @@ package com.yahoo.tensor;
 import com.google.common.annotations.Beta;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Builder class for a MapTensor.
@@ -46,7 +44,7 @@ public class MapTensorBuilder {
         if (cells.size() == 0) return TensorType.empty;
         
         TensorType.Builder b = new TensorType.Builder();
-        for (String dimension : cells.keySet().iterator().next().elements())
+        for (String dimension : cells.keySet().iterator().next().labels())
             b.mapped(dimension);
         return b.build();
     }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index 801d5f1069a..74ea0a48c69 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -30,7 +30,7 @@ public final class TensorAddress implements Comparable<TensorAddress> {
     }
 
     /** Returns the labels of this as an immutable list in the order of the tensor this is the type of */
-    public List<String> elements() { return labels; }
+    public List<String> labels() { return labels; }
 
     @Override
     public int compareTo(TensorAddress other) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
index 9ce0370aaf5..0026f7b11e3 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
@@ -7,11 +7,9 @@ import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorAddress;
 import com.yahoo.tensor.TensorType;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.DoubleBinaryOperator;
 
 /**
@@ -99,8 +97,8 @@ public class Join extends PrimitiveTensorFunction {
     private TensorAddress combineAddresses(TensorAddress a, int[] aToIndexes, TensorAddress b, int[] bToIndexes, 
                                            TensorType joinedType) {
         String[] joinedLabels = new String[joinedType.dimensions().size()];
-        mapContent(a.elements(), joinedLabels, aToIndexes);
-        boolean compatible = mapContent(b.elements(), joinedLabels, bToIndexes);
+        mapContent(a.labels(), joinedLabels, aToIndexes);
+        boolean compatible = mapContent(b.labels(), joinedLabels, bToIndexes);
         if ( ! compatible) return null;
         return new TensorAddress(joinedLabels);
     }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
index 9251521f6bf..0a94a1e7b5e 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java
@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * The <i>reduce</i> tensor operation returns a tensor produced from the argument tensor where some dimensions 
@@ -125,9 +124,9 @@ public class Reduce extends PrimitiveTensorFunction {
 
         String[] reducedLabels = new String[reducedType.dimensions().size()];
         int reducedLabelIndex = 0;
-        for (int i = 0; i < address.elements().size(); i++)
+        for (int i = 0; i < address.labels().size(); i++)
             if ( ! indexesToRemove.contains(i))
-                reducedLabels[reducedLabelIndex++] = address.elements().get(i);
+                reducedLabels[reducedLabelIndex++] = address.labels().get(i);
         return new TensorAddress(reducedLabels);
     }
     
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
index 81582fd64ac..4b3a2f4142f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java
@@ -84,7 +84,7 @@ public class Rename extends PrimitiveTensorFunction {
     private TensorAddress rename(TensorAddress address, int[] toIndexes) {
         String[] reorderedLabels = new String[toIndexes.length];
         for (int i = 0; i < toIndexes.length; i++)
-            reorderedLabels[toIndexes[i]] = address.elements().get(i);
+            reorderedLabels[toIndexes[i]] = address.labels().get(i);
         return new TensorAddress(reorderedLabels);
     }
 
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
index 967c05f0878..b707802c55f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java
@@ -2,7 +2,6 @@
 package com.yahoo.tensor.serialization;
 
 import com.google.common.annotations.Beta;
-import com.google.common.collect.Sets;
 import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.tensor.MapTensorBuilder;
 import com.yahoo.tensor.Tensor;
@@ -50,7 +49,7 @@ class SparseBinaryFormat implements BinaryFormat {
     }
 
     private static void encodeAddress(GrowableByteBuffer buffer, TensorAddress address) {
-        for (String label : address.elements())
+        for (String label : address.labels())
             encodeString(buffer, label);
     }
 
diff --git a/vespajlib/src/main/java/com/yahoo/text/XML.java b/vespajlib/src/main/java/com/yahoo/text/XML.java
index c688d5f9722..e22e71b5c6c 100644
--- a/vespajlib/src/main/java/com/yahoo/text/XML.java
+++ b/vespajlib/src/main/java/com/yahoo/text/XML.java
@@ -458,7 +458,7 @@ public class XML {
     /**
      * Returns the child Element objects from a w3c dom spec
      *
-     * @return List of elements. Empty list (never null) if none found or if the
+     * @return List of labels. Empty list (never null) if none found or if the
      *         given element is null
      */
     public static List<Element> getChildren(Element spec) {
@@ -480,7 +480,7 @@ public class XML {
     /**
      * Returns the child Element objects with given name from a w3c dom spec
      *
-     * @return List of elements. Empty list (never null) if none found or the
+     * @return List of labels. Empty list (never null) if none found or the
      *         given element is null
      */
     public static List<Element> getChildren(Element spec, String name) {
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
index b856f78c5d6..b5c739aac88 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
@@ -13,7 +13,7 @@ public class Selectable {
 
     /**
      * Apply the predicate to this object. If the predicate returns true, pass this object to the operation, otherwise
-     * invoke the {@link #selectMembers(ObjectPredicate, ObjectOperation)} method to locate sub-elements that might
+     * invoke the {@link #selectMembers(ObjectPredicate, ObjectOperation)} method to locate sub-labels that might
      * trigger the predicate.
      *
      * @param predicate component used to select (sub-)objects
diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
index 5963f5a8eca..1e64a077383 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
@@ -92,7 +92,7 @@ public class JsonBenchmark {
      * jacksons 1000 40000 = 5.6 seconds
      * jacksont 1000 40000 = 11.0 seconds
      * slime 1000 40000  = 17.5 seconds
-     * @param argv type, num elements in weigted set, num iterations
+     * @param argv type, num labels in weigted set, num iterations
      */
     static public void main(String argv[]) {
         String type = argv[0];