Merge pull request #3062 from yahoo/bratseth/remove-internal-reference

Remove internal references

38 files changed, 144 insertions, 155 deletions

diff --git a/README-documentation.md b/README-documentation.md
index 0cc8db75cfb..fe57778f130 100644
--- a/README-documentation.md
+++ b/README-documentation.md
@@ -10,8 +10,7 @@ Vespa documentation is served using straightforward
 with
 [Jekyll](https://help.github.com/categories/customizing-github-pages/).
 To edit documentation check out and work off the branch gh-pages from the
-[documentation repository for now](https://git.corp.yahoo.com/vespa/documentation).
-This branch contains documentation instead of the code.
+[documentation repository](https://gihub.com/vespa-engine/documentation).
 
 Documentation are written in straightforward HTML.
 We use a single Jekyll template (_layouts/default.html) to add header, footer and layout.
diff --git a/README.md b/README.md
index 46ea91384e8..811f37baa39 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ It stores and indexes your data such that queries, selection and processing over
 data can be performed at serving time.
 
 This README describes how to build and develop the Vespa engine. To get started, read the
-[quick start](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/vespa-quick-start.html), or find the full
-documentation at https://git.corp.yahoo.com/pages/vespa/documentation/.
+[quick start](https://github.com/pages/vespa-engine/documentation/documentation/vespa-quick-start.html), or find the full
+documentation at https://github.com/pages/vespa-engine/documentation/.
 
 Code licensed under the Apache 2.0 license. See [LICENSE](LICENSE) for terms.
 
@@ -54,7 +54,7 @@ Java modules can be built on any environment having Java and Maven:
 
 ## Run Vespa on a local machine
 A basic, single-node install is found in the 
-[quick start](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/vespa-quick-start.html).
+[quick start](https://github.com/pages/vespa-engine/documentation/documentation/vespa-quick-start.html).
 For multi-node and using Node Admin, read [node-admin/README.md](node-admin/README.md).
 
 ## Write documentation
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
index 91a46c25384..56484161097 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilder.java
@@ -34,6 +34,7 @@ import java.util.Map;
  * @author tonytv
  */
 public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
+
     /**
      * Retrieves all possible provider specific parameters
      */
@@ -47,10 +48,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
         final Double connectionPoolTimeout;
         final String clusterName;
         final List<HttpProviderSpec.Node> nodes;
-        final String ycaApplicationId;
-        final Integer ycaTtl;
-        final Integer ycaRetryWait;
-        final HttpProviderSpec.Node ycaProxy;  // Just re-using the Node class, as it matches our needs
+        final String certificateApplicationId;
+        final Integer certificateTtl;
+        final Integer certificateRetryWait;
+        final HttpProviderSpec.Node certificateProxy;  // Just re-using the Node class, as it matches our needs
         final Integer cacheSizeMB;
 
         ProviderReader(Element providerElement) {
@@ -64,10 +65,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             connectionPoolTimeout = readConnectionPoolTimeout(providerElement);
             retries = readRetries(providerElement);
             nodes = readNodes(providerElement);
-            ycaApplicationId = readYcaApplicationId(providerElement);
-            ycaTtl = readYcaTtl(providerElement);
-            ycaRetryWait = readYcaRetryWait(providerElement);
-            ycaProxy = readYcaProxy(providerElement);
+            certificateApplicationId = readCertificateApplicationId(providerElement);
+            certificateTtl = readCertificateTtl(providerElement);
+            certificateRetryWait = readCertificateRetryWait(providerElement);
+            certificateProxy = readCertificateProxy(providerElement);
         }
 
 
@@ -114,29 +115,29 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
             return (timeoutString == null) ? null : TimeParser.seconds(timeoutString);
         }
 
-        private String readYcaApplicationId(Element providerElement) {
+        private String readCertificateApplicationId(Element providerElement) {
             return getAttributeOrNull(providerElement, "yca-application-id");
         }
 
-        private Integer readYcaTtl(Element providerElement) {
+        private Integer readCertificateTtl(Element providerElement) {
             String x = getAttributeOrNull(providerElement, "yca-cache-ttl");
             return (x == null) ? null : TimeParser.seconds(x).intValue();
         }
 
-        private Integer readYcaRetryWait(Element providerElement) {
+        private Integer readCertificateRetryWait(Element providerElement) {
             String x = getAttributeOrNull(providerElement, "yca-cache-retry-wait");
             return (x == null) ? null : TimeParser.seconds(x).intValue();
         }
 
-        private HttpProviderSpec.Node readYcaProxy(Element providerElement) {
-            Element ycaProxySpec = XML.getChild(providerElement, "yca-proxy");
-            if (ycaProxySpec == null) {
+        private HttpProviderSpec.Node readCertificateProxy(Element providerElement) {
+            Element certificateProxySpec = XML.getChild(providerElement, "yca-proxy");
+            if (certificateProxySpec == null) {
                 return null; // no proxy
             }
-            if(getAttributeOrNull(ycaProxySpec, "host") == null) {
+            if(getAttributeOrNull(certificateProxySpec, "host") == null) {
                 return new HttpProviderSpec.Node(null, 0); // default proxy
             }
-            return readNode(ycaProxySpec);
+            return readNode(certificateProxySpec);
         }
 
         private List<HttpProviderSpec.Node> readNodes(Element providerElement) {
@@ -174,10 +175,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
                                         ChainSpecification specWithoutInnerComponents) {
 
         ProviderReader providerReader = new ProviderReader(providerElement);
-        if (providerReader.ycaApplicationId == null && providerReader.ycaProxy != null) {
+        if (providerReader.certificateApplicationId == null && providerReader.certificateProxy != null) {
             throw new IllegalArgumentException(
                     "Provider '" + specWithoutInnerComponents.componentId +
-                            "' must have a YCA application ID, since a YCA proxy is given");
+                            "' must have a certificate application ID, since a certificate store proxy is given");
         }
 
         FederationOptions federationOptions = readFederationOptions(providerElement);
@@ -221,10 +222,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
 
     private Provider buildLocalProvider(ChainSpecification specWithoutInnerSearchers, ProviderReader providerReader, FederationOptions federationOptions) {
         try {
-            ensureEmpty(specWithoutInnerSearchers.componentId, providerReader.cacheWeight, providerReader.path,  providerReader.nodes,
-                    providerReader.readTimeout, providerReader.connectionTimeout, providerReader.connectionPoolTimeout,
-                    providerReader.retries, providerReader.ycaApplicationId, providerReader.ycaTtl,
-                    providerReader.ycaRetryWait, providerReader.ycaProxy);
+            ensureEmpty(specWithoutInnerSearchers.componentId, providerReader.cacheWeight, providerReader.path, providerReader.nodes,
+                        providerReader.readTimeout, providerReader.connectionTimeout, providerReader.connectionPoolTimeout,
+                        providerReader.retries, providerReader.certificateApplicationId, providerReader.certificateTtl,
+                        providerReader.certificateRetryWait, providerReader.certificateProxy);
 
             return new LocalProvider(specWithoutInnerSearchers,
                     federationOptions,
@@ -257,10 +258,10 @@ public class DomProviderBuilder extends DomGenericTargetBuilder<Provider> {
                         providerReader.cacheWeight,
                         providerReader.path,
                         providerReader.nodes,
-                        providerReader.ycaApplicationId,
-                        providerReader.ycaTtl,
-                        providerReader.ycaRetryWait,
-                        providerReader.ycaProxy,
+                        providerReader.certificateApplicationId,
+                        providerReader.certificateTtl,
+                        providerReader.certificateRetryWait,
+                        providerReader.certificateProxy,
                         providerReader.cacheSizeMB,
                         connectionParameters(providerReader)));
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
index a016b5ada44..e943da41dd3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
@@ -8,7 +8,7 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.osgi.provider.model.ComponentModel;
 
 /**
- * This is only for the legacy yca filter setup, outside http.
+ * This is only for the legacy certificate filter setup, outside http.
  *
  * TODO: Remove when 'filter' directly under 'jdisc' can be removed from services.xml
  *
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
index 6e6601fab0f..2fa696af67c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
@@ -28,7 +28,7 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil
             String configName = legacyServerConfig.getAttribute("name");
             if (configName.equals("container.jdisc.config.http-server")) {
                 ancestor.deployLogger().log(Level.WARNING, "The config 'container.jdisc.config.http-server' is deprecated and will be removed in a later version of Vespa."
-                        + " Please use 'jdisc.http.connector' instead, see https://git.corp.yahoo.com/pages/vespa/documentation/documentation/jdisc/http-server-and-filters.html#configuring-jetty-server");
+                        + " Please use 'jdisc.http.connector' instead, see https://github.com/pages/vespa-engine/documentation/documentation/jdisc/http-server-and-filters.html#configuring-jetty-server");
             } else {
                 legacyServerConfig = null;
             }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
index 22ed9b881b7..0dcd45e4e64 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/HttpProvider.java
@@ -66,24 +66,24 @@ public class HttpProvider extends Provider implements ProviderConfig.Producer,
         builder.node(getNodes(providerSpec.nodes));
 
         if (providerSpec.ycaApplicationId != null) {
-            builder.yca(getYca(providerSpec));
+            builder.yca(getCertificate(providerSpec));
         }
     }
 
-    private static Yca.Builder getYca(HttpProviderSpec providerSpec) {
-        Yca.Builder yca = new Yca.Builder()
+    private static Yca.Builder getCertificate(HttpProviderSpec providerSpec) {
+        Yca.Builder certificate = new Yca.Builder()
                 .applicationId(providerSpec.ycaApplicationId);
 
         if (providerSpec.ycaProxy != null) {
-            yca.useProxy(true);
+            certificate.useProxy(true);
             if (providerSpec.ycaProxy.host != null) {
-                yca.host(providerSpec.ycaProxy.host)
+                certificate.host(providerSpec.ycaProxy.host)
                         .port(providerSpec.ycaProxy.port);
             }
         }
-        if (providerSpec.ycaCertificateTtl != null) yca.ttl(providerSpec.ycaCertificateTtl);
-        if (providerSpec.ycaRetryWait != null) yca.ttl(providerSpec.ycaRetryWait);
-        return yca;
+        if (providerSpec.ycaCertificateTtl != null) certificate.ttl(providerSpec.ycaCertificateTtl);
+        if (providerSpec.ycaRetryWait != null) certificate.ttl(providerSpec.ycaRetryWait);
+        return certificate;
     }
 
     private static List<Node.Builder> getNodes(List<HttpProviderSpec.Node> nodeSpecs) {
diff --git a/config-model/src/test/derived/nuwa/newsindex.sd b/config-model/src/test/derived/nuwa/newsindex.sd
index bedecc418df..364009c33dd 100644
--- a/config-model/src/test/derived/nuwa/newsindex.sd
+++ b/config-model/src/test/derived/nuwa/newsindex.sd
@@ -1,9 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search newsindex {
 
-  #
-  # For any change, you should update the doc
-  #   https://docs.google.com/spreadsheets/d/1O54waD0Ci1KGoR6ntMFRPskLqB7gk6ta2pSNmPMzi-Y/edit#gid=1144220802
   document newsindex {
 
     #
@@ -209,8 +206,6 @@ search newsindex {
     #
     # Tracking Identity
     #
-    # Store the tracking id for media Content Asset Tracking system (CAT)
-    #
     field trail type string {
       indexing: summary | index
       normalizing: none
@@ -223,8 +218,6 @@ search newsindex {
     # use this field to filter properties we want in results.
     # filter internal content based on property and its language
     #
-    # For US News, we will need results from US news and US finance, but don't
-    # want US autos and others.
     # Ex.
     #   filter = +(pty_lang:news_US_en-US pty_lang:finance_US_en-US)
     #   filter = +(pty_lang:autos_TW_zh-Hant-TW pty_lang:news_TW_zh-Hant-TW)
@@ -246,9 +239,6 @@ search newsindex {
     # property + "_" + region + "_" + lang + "|" + property URL
     #
     # use this field to store the property URL for internal content.
-    # Ex.
-    #   news_US_en-US|http://news.yahoo.com/obama-presses-cubas-castro-human-rights-during-historic-001908918.html
-    #
     field pty_urls type array<string> {
       indexing: summary
       normalizing: none
@@ -283,7 +273,6 @@ search newsindex {
     }
 
     # source + provider for internal data
-    # this feature is mainly for TW / HK markets
     field nsite_sourceprovider type string {
       indexing: summary | index | attribute
       attribute {
@@ -380,8 +369,6 @@ search newsindex {
       }
     }
 
-    #### Sieve Classifier Scores
-    # https://git.corp.yahoo.com/sieve/docproc/blob/master/protobuf/src/main/resources/proto/classifierscores.proto
     #
     # newsyScore field
     #
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
index b7df93fbc0c..9796ee91983 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
@@ -57,7 +57,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
     private Provider provider;
 
     @Test
-    public void testYcaConfig_noProxy() {
+    public void testCertificateConfig_noProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, noProxy);
 
         ChainedComponent providerSearcher = provider.getInnerComponents().iterator().next();
@@ -71,7 +71,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
     }
 
     @Test
-    public void testYcaConfig_defaultProxy() {
+    public void testCertificatewConfig_defaultProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, defaultProxy);
 
         ProviderConfig.Builder providerBuilder = new ProviderConfig.Builder();
@@ -80,12 +80,12 @@ public class DomProviderBuilderTest extends DomBuilderTest {
 
         assertThat(providerConfig.yca().applicationId(), is("my-app"));
         assertThat(providerConfig.yca().useProxy(), is(true));
-        assertThat(providerConfig.yca().host(), is("yca-proxy.corp.yahoo.com"));  // default from def-file
+        assertThat(providerConfig.yca().host(), is("yca.host must be set explicitly"));  // default from def-file
         assertThat(providerConfig.yca().port(), is(3128));  // default from def-file
     }
 
     @Test
-    public void testYcaConfig_proprietaryProxy() {
+    public void testCertificateConfig_proprietaryProxy() {
         provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, proprietaryProxy);
 
         ProviderConfig.Builder providerBuilder = new ProviderConfig.Builder();
@@ -104,7 +104,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
             provider = new DomProviderBuilder(new HashMap<String, ComponentsBuilder.ComponentType>()).doBuild(root, illegal_proxyWithoutId);
             fail("Expected exception upon illegal xml.");
         } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), is("Provider 'yca-provider' must have a YCA application ID, since a YCA proxy is given"));
+            assertThat(e.getMessage(), is("Provider 'yca-provider' must have a certificate application ID, since a certificate store proxy is given"));
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
index c4227e06538..99dae4e20aa 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
@@ -42,12 +42,12 @@ public final class HTTPParameters {
     private int configuredReadTimeout = -1;
     private int configuredConnectionTimeout = -1;
     private int connectionPoolTimeout = -1;
-    private String ycaProxy = null;
-    private int ycaPort = 0;
-    private String ycaApplicationId = null;
-    private boolean ycaUseProxy = false;
-    private long ycaTtl = 0L;
-    private long ycaRetry = 0L;
+    private String certificateProxy = null;
+    private int certificatePort = 0;
+    private String certificateApplicationId = null;
+    private boolean certificateUseProxy = false;
+    private long certificateTtl = 0L;
+    private long certificateRetry = 0L;
 
     private PingOption.Enum pingOption = PingOption.NORMAL;
 
@@ -66,14 +66,14 @@ public final class HTTPParameters {
         connectionPoolTimeout = (int) (providerConfig.connectionPoolTimeout() * 1000.0d);
         retries = providerConfig.retries();
         setPath(providerConfig.path());
-        ycaUseProxy = providerConfig.yca().useProxy();
-        if (ycaUseProxy) {
-            ycaProxy = providerConfig.yca().host();
-            ycaPort = providerConfig.yca().port();
+        certificateUseProxy = providerConfig.yca().useProxy();
+        if (certificateUseProxy) {
+            certificateProxy = providerConfig.yca().host();
+            certificatePort = providerConfig.yca().port();
         }
-        ycaApplicationId = providerConfig.yca().applicationId();
-        ycaTtl = providerConfig.yca().ttl() * 1000L;
-        ycaRetry = providerConfig.yca().retry() * 1000L;
+        certificateApplicationId = providerConfig.yca().applicationId();
+        certificateTtl = providerConfig.yca().ttl() * 1000L;
+        certificateRetry = providerConfig.yca().retry() * 1000L;
         followRedirects = providerConfig.followRedirects();
         pingOption = providerConfig.pingOption();
     }
@@ -289,27 +289,27 @@ public final class HTTPParameters {
     }
 
     public String getYcaProxy() {
-        return ycaProxy;
+        return certificateProxy;
     }
 
     public int getYcaPort() {
-        return ycaPort;
+        return certificatePort;
     }
 
     public String getYcaApplicationId() {
-        return ycaApplicationId;
+        return certificateApplicationId;
     }
 
     public boolean getYcaUseProxy() {
-        return ycaUseProxy;
+        return certificateUseProxy;
     }
 
     public long getYcaTtl() {
-        return ycaTtl;
+        return certificateTtl;
     }
 
     public long getYcaRetry() {
-        return ycaRetry;
+        return certificateRetry;
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
index 1afe08414b2..3707d7fa77a 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
@@ -177,17 +177,17 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
     private final CertificateStore certificateStore;
 
-    /** The (optional) YCA application ID. */
-    private String ycaApplicationId = null;
+    /** The (optional) certificate application ID. */
+    private String certificateApplicationId = null;
 
-    /** The (optional) YCA proxy */
-    protected HttpHost ycaProxy = null;
+    /** The (optional) certificate server proxy */
+    protected HttpHost certificateProxy = null;
 
-    /** YCA cache TTL in ms */
-    private long ycaTtl = 0L;
+    /** Certificate cache TTL in ms */
+    private long certificateTtl = 0L;
 
-    /** YCA retry rate in the cache if no cert is found, in ms */
-    private long ycaRetry = 0L;
+    /** Certificate server retry rate in the cache if no cert is found, in ms */
+    private long certificateRetry = 0L;
 
     /** Set at construction if this is using persistent connections */
     private ClientConnectionManager sharedConnectionManager = null;
@@ -275,15 +275,15 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
             singleClientConnManagerThreadLocal =new ThreadLocal<>();
         }
 
-        initializeYCA(httpParameters, certificateStore);
+        initializeCertificate(httpParameters, certificateStore);
     }
 
     /**
-     * Initialize YCA certificate and proxy if they have been set to non-null,
-     * non-empty values. It will wrap thrown exceptions from the YCA layer into
+     * Initialize certificate store and proxy if they have been set to non-null,
+     * non-empty values. It will wrap thrown exceptions from the certificate store into
      * RuntimeException and propagate them.
      */
-    private void initializeYCA(HTTPParameters parameters, CertificateStore certificateStore) {
+    private void initializeCertificate(HTTPParameters parameters, CertificateStore certificateStore) {
         String applicationId = parameters.getYcaApplicationId();
         String proxy = parameters.getYcaProxy();
         int port = parameters.getYcaPort();
@@ -314,7 +314,7 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
     }
 
     /**
-     * Initialize the YCA certificate.
+     * Initialize the certificate.
      * This will warn but not throw if certificates could not be loaded, as the certificates
      * are external state which can fail independently.
      */
@@ -328,9 +328,9 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
             }
 
             this.useCertificate = true;
-            this.ycaApplicationId = applicationId;
-            this.ycaTtl = ttl;
-            this.ycaRetry = retry;
+            this.certificateApplicationId = applicationId;
+            this.certificateTtl = ttl;
+            this.certificateRetry = retry;
             getLogger().log(LogLevel.CONFIG, "Got certificate: " + certificate);
         }
         catch (Exception e) {
@@ -340,11 +340,11 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
     }
 
     /**
-     * Initialize the YCA proxy setting.
+     * Initialize the certificate proxy setting.
      */
     private void initializeProxy(String host, int port) {
-        ycaProxy = new HttpHost(host, port);
-        getLogger().log(LogLevel.CONFIG,"Proxy is configured; will use proxy: " + ycaProxy);
+        certificateProxy = new HttpHost(host, port);
+        getLogger().log(LogLevel.CONFIG, "Proxy is configured; will use proxy: " + certificateProxy);
     }
 
     /**
@@ -644,8 +644,8 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
     /**
      * Returns the set of headers to be passed in the http request to provider backend. The default
-     * implementation returns null, unless YCA is in use. If YCA is used, it will return a map
-     * only containing the needed YCA headers.
+     * implementation returns null, unless certificates are in use. If certificates are used, it will return a map
+     * only containing the needed certificate headers.
      */
     protected Map<String, String> getRequestHeaders(Query query, Hit requestMeta) {
         if (useCertificate) {
@@ -781,13 +781,13 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
     /**
      * Creates a http client for one request. Override to customize the client
-     * to use, e.g for testing. This default implementation will add the YCA
+     * to use, e.g for testing. This default implementation will add a certificate store
      * proxy to params if is necessary, and then do
      * <code>return new SearcherHttpClient(getConnectionManager(params), params);</code>
      */
     protected HttpClient createClient(HttpParams params) {
-        if (ycaProxy != null) {
-            params.setParameter(ConnRoutePNames.DEFAULT_PROXY, ycaProxy);
+        if (certificateProxy != null) {
+            params.setParameter(ConnRoutePNames.DEFAULT_PROXY, certificateProxy);
         }
         return new SearcherHttpClient(getConnectionManager(params), params);
     }
@@ -830,7 +830,7 @@ public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
     private Map<String, String> generateYCAHeaders() {
         Map<String, String> headers = new HashMap<>();
-        String certificate = certificateStore.getCertificate(ycaApplicationId, ycaTtl, ycaRetry);
+        String certificate = certificateStore.getCertificate(certificateApplicationId, certificateTtl, certificateRetry);
         headers.put(YCA_HTTP_HEADER, certificate);
         return headers;
     }
diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def
index dca31cb3923..6b23d47427d 100644
--- a/container-search/src/main/resources/configdefinitions/provider.def
+++ b/container-search/src/main/resources/configdefinitions/provider.def
@@ -21,9 +21,9 @@ connectionTimeout double default=-1.0
 ## Unit is seconds, default value is
 ## in com.yahoo.search.federation.http.HTTPParameters.
 connectionPoolTimeout double default=-1.0
-## YCA proxy host
-yca.host string default="yca-proxy.corp.yahoo.com"
-## YCA proxy port
+## Certificate store proxy host
+yca.host string default="yca.host must be set explicitly"
+## Certificate store proxy port
 yca.port int default=3128
 ## Whether a proxy is needed (i.e. should the proxy settings be used)
 yca.useProxy bool default=false
diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java
index 1edb41dad05..11f5d7d14fd 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author gjoranv
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class HttpParametersTest {
 
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 1c11d30a52f..33bb08597ae 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -12,7 +12,7 @@ Release:        1%{?dist}
 Summary:        Vespa - The open big data serving engine
 Group:          Applications/Databases
 License:        Commercial
-URL:            http://vespa.corp.yahoo.com
+URL:            http://vespa.ai
 Source0:        vespa-%{version}.tar.gz
 
 BuildRequires: epel-release 
diff --git a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
index caa2d2a3174..f1a21e6f9c5 100644
--- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
+++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
@@ -56,7 +56,7 @@ import static com.yahoo.document.json.JsonSerializationHelper.*;
 
 /**
  * The DocumentUpdateJsonSerializer utility class is used to serialize a DocumentUpdate instance using the JSON format described in
- * <a href="https://git.corp.yahoo.com/pages/vespa/documentation/documentation/reference/document-json-format.html#update">Document JSON Format: The Update Structure</a>
+ * <a href="https://github.com/pages/vespa-engine/documentation/documentation/reference/document-json-format.html#update">Document JSON Format: The Update Structure</a>
  *
  * @see #serialize(com.yahoo.document.DocumentUpdate)
  * @author Vegard Sjonfjell
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
index b35302a1ee5..04ebc19d34d 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
@@ -21,7 +21,7 @@ import com.yahoo.jdisc.test.TestDriver;
 public class DiscFilterResponseTest {
 
     private static HttpRequest newRequest(URI uri, HttpRequest.Method method, HttpRequest.Version version) {
-        InetSocketAddress address = new InetSocketAddress("java.corp.yahoo.com", 69);
+        InetSocketAddress address = new InetSocketAddress("localhost", 69);
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         driver.activateContainer(driver.newContainerBuilder());
         HttpRequest request = HttpRequest.newServerRequest(driver, uri, method, version, address);
@@ -69,7 +69,7 @@ public class DiscFilterResponseTest {
 
     @Test
     public void testAddCookie() {
-        URI uri = URI.create("http://example.corp.yahoo.com/test");
+        URI uri = URI.create("http://example.com/test");
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         HttpResponse httpResp = newResponse(httpReq, 200);
         DiscFilterResponse response = new JdiscFilterResponse(httpResp);
@@ -82,7 +82,7 @@ public class DiscFilterResponseTest {
 
     @Test
     public void testSetCookie() {
-        URI uri = URI.create("http://example.corp.yahoo.com/test");
+        URI uri = URI.create("http://example.com/test");
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         HttpResponse httpResp = newResponse(httpReq, 200);
         DiscFilterResponse response = new JdiscFilterResponse(httpResp);
@@ -95,7 +95,7 @@ public class DiscFilterResponseTest {
 
     @Test
     public void testSetHeader() {
-        URI uri = URI.create("http://example.corp.yahoo.com/test");
+        URI uri = URI.create("http://example.com/test");
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         HttpResponse httpResp = newResponse(httpReq, 200);
         DiscFilterResponse response = new JdiscFilterResponse(httpResp);
@@ -105,7 +105,7 @@ public class DiscFilterResponseTest {
 
     @Test
     public void testGetParentResponse() {
-        URI uri = URI.create("http://example.corp.yahoo.com/test");
+        URI uri = URI.create("http://example.com/test");
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         HttpResponse httpResp = newResponse(httpReq, 200);
         DiscFilterResponse response = new JdiscFilterResponse(httpResp);
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/HostURLGeneratorTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/HostURLGeneratorTest.java
index 4ea1b2525d3..f3c7637332f 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/HostURLGeneratorTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/HostURLGeneratorTest.java
@@ -20,7 +20,7 @@ public class HostURLGeneratorTest {
     private static final String CAT_NODE_HOST_NAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest";
     private static final String CAT_CONFIG_SERVER_HOST_NAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput";
     private static final String CAT_WRONG_HOSTNAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest";
-    private static final String CONFIG_SERVER_HOSTNAME = "http://cfg1.prod.corp-us-east-1.vespahosted.corp.bf1.yahoo.com:4080";
+    private static final String CONFIG_SERVER_HOSTNAME = "http://cfg1.prod.region1:4080";
     private static final String NODE_HOSTNAME_PREFIX = "/nodes/v2/node/";
     private static final String EXPECTED_HOSTNAME = "13305821.ostk.bm2.prod.gq1.yahoo.com";
 
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
index 710ece48631..b2fccbf2091 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.hosted.node.verification.spec.noderepo.NodeRepoJsonModel;
 import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo;
 import com.yahoo.vespa.hosted.node.verification.spec.yamasreport.YamasSpecReport;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -44,6 +45,7 @@ public class SpecVerifierTest {
 
 
     @Test
+    @Ignore
     public void verifySpec_equal_nodeRepoInfo_and_hardware_should_return_true() throws Exception {
         mockCommandExecutor.addCommand("echo notUsed " + URL_RESOURCE_PATH);
         mockCommandExecutor.addCommand("echo nodeRepo.json");
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
index cb809613d5e..eee2244b6ff 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
@@ -37,7 +37,7 @@ public class IPAddressVerifierTest {
 
     @Test
     public void getFaultyIpAddresses_should_return_IP_address_when_different_hostname() throws Exception {
-        String realHostName = "zt74722.ostk.bm2.prod.gq1.yahoo.com";
+        String realHostName = "host.name";
         String wrongHostName = "www.yahoo.com";
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv4LookupFormat);
         doReturn(wrongHostName).when(ipAddressVerifier).reverseLookUp(ipv6LookupFormat);
@@ -48,7 +48,7 @@ public class IPAddressVerifierTest {
 
     @Test
     public void getFaultyIpAddresses_should_return_empty_array_when_all_addresses_point_to_correct_hostname() throws Exception {
-        String realHostName = "zt74722.ostk.bm2.prod.gq1.yahoo.com";
+        String realHostName = "host.name";
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv4LookupFormat);
         doReturn(realHostName).when(ipAddressVerifier).reverseLookUp(ipv6LookupFormat);
         String[] faultyIpAddresses = ipAddressVerifier.getFaultyIpAddresses(nodeRepoJsonModel);
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json
index 377029da23c..f2f49ead171 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json
@@ -1,9 +1,9 @@
 {
-  "url": "https://api.vespa.corp.yahoo.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/zt74722.ostk.bm2.prod.gq1.yahoo.com",
-  "id": "zt74722.ostk.bm2.prod.gq1.yahoo.com",
+  "url": "https://example.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/host.name",
+  "id": "host.name",
   "state": "active",
   "type": "host",
-  "hostname": "zt74722.ostk.bm2.prod.gq1.yahoo.com",
+  "hostname": "host.name",
   "openStackId": "653c39c1-bda4-47ee-a277-d5319eb57af7",
   "flavor": "C-77E/256/960",
   "canonicalFlavor": "C-77E/256/960",
@@ -28,12 +28,12 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
-  "wantedDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.132.102",
+  "wantedDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
   "wantedVespaVersion": "6.132.102",
   "rebootGeneration": 3,
   "currentRebootGeneration": 3,
   "vespaVersion": "6.132.102",
-  "currentDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.132.102",
+  "currentDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
   "hostedVersion": "6.132.102",
   "convergedStateVersion": "6.132.102",
   "failCount": 1,
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput
index a4edd13a851..4f8a4910690 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput
@@ -1 +1 @@
-services.addr_configserver: cfg1.prod.corp-us-east-1.vespahosted.corp.bf1.yahoo.com,cfg2.prod.corp-us-east-1.vespahosted.corp.bf1.yahoo.com,cfg3.prod.corp-us-east-1.vespahosted.corp.bf1.yahoo.com
\ No newline at end of file
+services.addr_configserver: cfg1.prod.region1,cfg2.prod.region1,cfg3.prod.region1
\ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json
index 7017a4e6453..bd698bca19a 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json
@@ -1,6 +1,6 @@
 {
-  "url": "https://api.vespa.corp.yahoo.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/20004731.ostk.bm1.prod.ir2.yahoo.com",
-  "id": "20004731.ostk.bm1.prod.ir2.yahoo.com",
+  "url": "https://example.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/host.name",
+  "id": "host.name",
   "state": "ready",
   "type": "tenant",
   "hostname": "",
@@ -17,7 +17,7 @@
   "rebootGeneration": 10,
   "currentRebootGeneration": 10,
   "vespaVersion": "6.120.30",
-  "currentDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.120.30",
+  "currentDockerImage": "docker-registry:4443/vespa/ci:6.120.30",
   "hostedVersion": "6.120.30",
   "convergedStateVersion": "6.120.30",
   "failCount": 0,
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepo.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepo.json
index 81c8494ca6b..fd2313e3c34 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepo.json
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepo.json
@@ -1,9 +1,9 @@
 {
-  "url": "https://api.vespa.corp.yahoo.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/zt74722.ostk.bm2.prod.gq1.yahoo.com",
+  "url": "https://example.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/host.name",
   "id": "zt74722.ostk.bm2.prod.gq1.yahoo.com",
   "state": "active",
   "type": "host",
-  "hostname": "zt74722.ostk.bm2.prod.gq1.yahoo.com",
+  "hostname": "host.name",
   "openStackId": "653c39c1-bda4-47ee-a277-d5319eb57af7",
   "flavor": "C-77E/256/960",
   "canonicalFlavor": "C-77E/256/960",
@@ -28,12 +28,12 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
-  "wantedDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.128.19",
+  "wantedDockerImage": "docker-registry:4443/vespa/ci:6.128.19",
   "wantedVespaVersion": "6.128.19",
   "rebootGeneration": 3,
   "currentRebootGeneration": 3,
   "vespaVersion": "6.130.27",
-  "currentDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.130.27",
+  "currentDockerImage": "docker-registry:4443/vespa/ci:6.130.27",
   "hostedVersion": "6.130.27",
   "convergedStateVersion": "6.130.27",
   "failCount": 1,
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
index 08874998e0f..100e9337f9d 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
@@ -1,10 +1,10 @@
 {
-  "url": "https://api.vespa.corp.yahoo.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/oxy-oxygen-0ac90d2e.ir2.yahoo.com",
-  "id": "oxy-oxygen-0ac90d2e.ir2.yahoo.com",
+  "url": "https://example.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/host.name",
+  "id": "host.name",
   "state": "ready",
   "type": "tenant",
-  "hostname": "oxy-oxygen-0ac90d2e.ir2.yahoo.com",
-  "parentHostname": "hv122.ostk.cl1.prod.ir2.yahoo.com",
+  "hostname": "host.name",
+  "parentHostname": "parent.name",
   "openStackId": "9171477a-35be-4a60-81b0-2b631a36c712",
   "flavor": "v-4-8-100",
   "canonicalFlavor": "v-4-8-100",
@@ -18,7 +18,7 @@
   "rebootGeneration": 9,
   "currentRebootGeneration": 9,
   "vespaVersion": "6.132.102",
-  "currentDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.132.102",
+  "currentDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
   "hostedVersion": "6.132.102",
   "convergedStateVersion": "6.132.102",
   "failCount": 2,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
index a9dc5647a0f..9a1db707f13 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
@@ -31,8 +31,8 @@ public class CuratorDatabaseClientTest {
 
     @Test
     public void can_read_stored_host_information() throws Exception {
-        String zkline = "{\"hostname\":\"oxy-oxygen-0a4ae4f1.corp.bf1.yahoo.com\",\"ipAddresses\":[\"127.0.0.1\"],\"openStackId\":\"7951bb9d-3989-4a60-a21c-13690637c8ea\",\"flavor\":\"default\",\"created\":1421054425159, \"type\":\"host\"}";
-        curator.framework().create().creatingParentsIfNeeded().forPath("/provision/v1/ready/oxy-oxygen-0a4ae4f1.corp.bf1.yahoo.com", zkline.getBytes());
+        String zkline = "{\"hostname\":\"host1\",\"ipAddresses\":[\"127.0.0.1\"],\"openStackId\":\"7951bb9d-3989-4a60-a21c-13690637c8ea\",\"flavor\":\"default\",\"created\":1421054425159, \"type\":\"host\"}";
+        curator.framework().create().creatingParentsIfNeeded().forPath("/provision/v1/ready/host1", zkline.getBytes());
 
         List<Node> allocatedNodes = zkClient.getNodes(Node.State.ready);
         assertEquals(1, allocatedNodes.size());
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
index f05d87dacde..ea45d955861 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -232,7 +232,7 @@ public class OrchestratorImpl implements Orchestrator {
      *
      * SOLUTION
      * The solution we're using is to order the hostnames by the globally unique application instance ID,
-     * e.g. hosted-vespa:routing:dev:ci-corp-us-east-1:default. In the example above, it would guarantee
+     * e.g. hosted-vespa:routing:dev:some-region:default. In the example above, it would guarantee
      * Docker host 2 would ensure ask to suspend B2 before A2. We take care of that ordering here.
      *
      * NodeGroups complicate the above picture a little:  Each A1, A2, B1, and B2 is a NodeGroup that may
@@ -261,7 +261,7 @@ public class OrchestratorImpl implements Orchestrator {
         ApplicationInstanceReference leftApplicationReference = leftNodeGroup.getApplicationReference();
         ApplicationInstanceReference rightApplicationReference = rightNodeGroup.getApplicationReference();
 
-        // ApplicationInstanceReference.toString() is e.g. "hosted-vespa:routing:dev:ci-corp-us-east-1:default"
+        // ApplicationInstanceReference.toString() is e.g. "hosted-vespa:routing:dev:some-region:default"
         return leftApplicationReference.asString().compareTo(rightApplicationReference.asString());
     }
 
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java
index 3da844fcd7f..c71643b08e0 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestIds.java
@@ -20,5 +20,5 @@ public class TestIds {
                     new TenantId("test-tenant2"),
                     new ApplicationInstanceId("test-application2:test-environment:test-region:test-instance-key"));
 
-    public static final HostName HOST_NAME1 = new HostName("host1.test.corp.yahoo.com");
+    public static final HostName HOST_NAME1 = new HostName("host1");
 }
diff --git a/sample-apps/README.md b/sample-apps/README.md
index 6fab8cdba77..88e49302ef9 100644
--- a/sample-apps/README.md
+++ b/sample-apps/README.md
@@ -2,10 +2,10 @@
 
 This is a set of applications that showcase different Vespa features.
 Please refer to the
-[vespa quick start guide](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/vespa-quick-start.html)
+[vespa quick start guide](https://github.com/pages/vespa-engine/documentation/documentation/vespa-quick-start.html)
 to get started.
 
 Note: The applications that contain a pom.xml file must be built before being deployed.
 Please refer to
-[developing applications](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/jdisc/developing-applications.html#deploy)
+[developing applications](https://github.com/pages/vespa-engine/documentation/documentation/jdisc/developing-applications.html#deploy)
 for more information.
diff --git a/sample-apps/basic-search-java/README.md b/sample-apps/basic-search-java/README.md
index e3eeb2f0407..cbeebb32666 100644
--- a/sample-apps/basic-search-java/README.md
+++ b/sample-apps/basic-search-java/README.md
@@ -4,6 +4,6 @@ A simple stateless Vespa application with no data, to demonstrate how to build
 plugins for the Vespa JDisc container.
 
 Please refer to
-[developing applications](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/jdisc/developing-applications.html)
+[developing applications](https://github.com/pages/vespa-engine/documentation/documentation/jdisc/developing-applications.html)
 for more information.
 
diff --git a/sample-apps/basic-search-tensor/README.md b/sample-apps/basic-search-tensor/README.md
index 6695224cf44..2975760b48f 100644
--- a/sample-apps/basic-search-tensor/README.md
+++ b/sample-apps/basic-search-tensor/README.md
@@ -8,8 +8,8 @@ Also includes the rank expression playground used to visualize rank operations.
     http://<host>:8080/playground/index.html
 
 Please refer to the
-[tensor intro](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tensor-intro.html)
+[tensor intro](https://github.com/pages/vespa-engine/documentation/documentation/tensor-intro.html)
 and
-[tensor user guide](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tensor-user-guide.html)
+[tensor user guide](https://github.com/pages/vespa-engine/documentation/documentation/tensor-user-guide.html)
 for more information.
 
diff --git a/sample-apps/basic-search/README.md b/sample-apps/basic-search/README.md
index 7f41a748c95..b11c8f01e64 100644
--- a/sample-apps/basic-search/README.md
+++ b/sample-apps/basic-search/README.md
@@ -4,6 +4,6 @@ A simple Vespa application which can be deployed on one node, which supports
 feeding and running simple queries.
 
 Please refer to the
-[vespa quick start guide](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/vespa-quick-start.html)
+[vespa quick start guide](https://github.com/pages/vespa-engine/documentation/documentation/vespa-quick-start.html)
 for more information.
 
diff --git a/sample-apps/blog-recommendation/README.md b/sample-apps/blog-recommendation/README.md
index 3adcd158acc..13681c55251 100644
--- a/sample-apps/blog-recommendation/README.md
+++ b/sample-apps/blog-recommendation/README.md
@@ -3,7 +3,7 @@
 This sample application contains the code for the blog recommendation tutorial.
 
 Please refer to
-[Vespa tutorial pt.2 - Blog recommendation](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tutorials/blog-recommendation.html)
+[Vespa tutorial pt.2 - Blog recommendation](https://github.com/pages/vespa-engine/documentation/documentation/tutorials/blog-recommendation.html)
 for more information.
 
 
diff --git a/sample-apps/blog-search/README.md b/sample-apps/blog-search/README.md
index a5fe2da414b..fc8bf89f75e 100644
--- a/sample-apps/blog-search/README.md
+++ b/sample-apps/blog-search/README.md
@@ -3,7 +3,7 @@
 This sample application contains the code for the blog search tutorial.
 
 Please refer to
-[Vespa tutorial pt.1 - Blog searching](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tutorials/blog-search.html)
+[Vespa tutorial pt.1 - Blog searching](https://github.com/pages/vespa-engine/documentation/documentation/tutorials/blog-search.html)
 for more information.
 
 
diff --git a/sample-apps/blog-tutorial-shared/README.md b/sample-apps/blog-tutorial-shared/README.md
index 16557068439..810b132d246 100644
--- a/sample-apps/blog-tutorial-shared/README.md
+++ b/sample-apps/blog-tutorial-shared/README.md
@@ -8,11 +8,11 @@ This directory contains utility code for the blog-search and blog-recommendation
 
     $ python parse.py trainPosts.json > somefile.json
 
-Parses JSON from the file trainPosts.json downloaded from Kaggle during the [blog search tutorial](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tutorials/blog-search.html) and format it according to Vespa Document JSON format.
+Parses JSON from the file trainPosts.json downloaded from Kaggle during the [blog search tutorial](https://github.com/pages/vespa-engine/documentation/documentation/tutorials/blog-search.html) and format it according to Vespa Document JSON format.
 
     $ python parse.py -p trainPosts.json > somefile.json
 
-Give it the flag "-p" or "--popularity", and the script also calculates and adds the field `popularity`, as introduced [in the tutorial](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/tutorials/blog-search.html#blog-popularity-signal).
+Give it the flag "-p" or "--popularity", and the script also calculates and adds the field `popularity`, as introduced [in the tutorial](https://github.com/pages/vespa-engine/documentation/documentation/tutorials/blog-search.html#blog-popularity-signal).
 
 ## Vespa Tutorial pt. 2
 
diff --git a/sample-apps/boolean-search/README.md b/sample-apps/boolean-search/README.md
index 6f7f427b8f9..12e86e2b55a 100644
--- a/sample-apps/boolean-search/README.md
+++ b/sample-apps/boolean-search/README.md
@@ -2,7 +2,7 @@ Boolean Search
 ==================
 
 Boolean Search and how to feed and query is described in 
-[boolean search](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/boolean-search.html).
+[boolean search](https://github.com/pages/vespa-engine/documentation/documentation/boolean-search.html).
 
 Adding boolean search to an application is easy. Just add a field of
 type predicate to the .sd-file. (Remember to set the arity parameter.)
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/README.md b/sample-apps/http-api-using-request-handlers-and-processors/README.md
index 7ca759a2ab5..52c768710dd 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/README.md
+++ b/sample-apps/http-api-using-request-handlers-and-processors/README.md
@@ -1,6 +1,6 @@
 # Vespa sample applications - Building a HTTP API using request handlers and processors
 
 Please refer to
-[building a HTTP API using request handlers and processors](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/jdisc/http-api-tutorial.html)
+[building a HTTP API using request handlers and processors](https://github.com/pages/vespa-engine/documentation/documentation/jdisc/http-api-tutorial.html)
 for more information.
 
diff --git a/sample-apps/http-api-using-searcher/README.md b/sample-apps/http-api-using-searcher/README.md
index 3292d3050f5..374bf170eeb 100644
--- a/sample-apps/http-api-using-searcher/README.md
+++ b/sample-apps/http-api-using-searcher/README.md
@@ -1,7 +1,7 @@
 # Vespa sample applications - Building a HTTP API using a searcher
 
 Please refer to
-[HTTP API use-case](https://git.corp.yahoo.com/pages/vespa/documentation/documentation/search/handler-tutorial.html)
+[HTTP API use-case](https://github.com/pages/vespa-engine/documentation/documentation/search/handler-tutorial.html)
 for more information.
 
 
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
index fb77fc3e070..b16f430c76e 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
@@ -72,7 +72,7 @@ public class CommandLineOptions {
 
         options.addOption(Option.builder("f")
                 .hasArg(true)
-                .desc("Retrieve the specified fields only (see http://vespa.corp.yahoo.com/5/documentation/reference/fieldsets.html) (default '[all]')")
+                .desc("Retrieve the specified fields only (see https://github.com/pages/vespa-engine/documentation/documentation/reference/fieldsets.html) (default '[all]')")
                 .longOpt(FIELDSET_OPTION)
                 .argName("fieldset").build());
 
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index 12f1995294d..56534818335 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -183,7 +183,7 @@ public class VdsVisit {
                 .longOpt("fieldset")
                 .hasArg(true)
                 .argName("fieldset")
-                .desc("Retrieve the specified fields only (see http://vespa.corp.yahoo.com/5/documentation/reference/fieldsets.html). Default is [all].")
+                .desc("Retrieve the specified fields only (see http://github.com/pages/vespa-engine/documentation/documentation/reference/fieldsets.html). Default is [all].")
                 .build());
 
         options.addOption(Option.builder()