diff --git a/DEPRECATED.md b/DEPRECATED.md
index 4f5ea86523f2..d4e577b76b60 100644
--- a/DEPRECATED.md
+++ b/DEPRECATED.md
@@ -1,7 +1,7 @@
 # DEPRECATED
 
 As of release 1.3.0, Envoy will follow a
-[Breaking Change Policy](https://github.com/lyft/envoy/blob/master//CONTRIBUTING.md#breaking-change-policy).
+[Breaking Change Policy](https://github.com/envoyproxy/envoy/blob/master//CONTRIBUTING.md#breaking-change-policy).
 
 The following features have been DEPRECATED and will be removed in the specified release cycle.
 
@@ -14,7 +14,7 @@ The following features have been DEPRECATED and will be removed in the specified
 * The following log macros have been deprecated: `log_trace`, `log_debug`, `conn_log`,
   `conn_log_info`, `conn_log_debug`, `conn_log_trace`, `stream_log`, `stream_log_info`,
   `stream_log_debug`, `stream_log_trace`.  For replacements, please see
-  [logger.h](https://github.com/lyft/envoy/blob/master/source/common/common/logger.h).
+  [logger.h](https://github.com/envoyproxy/envoy/blob/master/source/common/common/logger.h).
 * The connectionId() and ssl() callbacks of StreamFilterCallbacks have been deprecated and
   replaced with a more general connection() callback, which, when not returning a nullptr, can be
   used to get the connection id and SSL connection from the returned Connection object pointer.
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 1da61edf018f..5d5ee7d6030f 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -2,20 +2,20 @@
 
 Envoy is built using the Bazel build system. Travis CI builds, tests, and runs coverage against all pull requests and the master branch.
 
-To get started building Envoy locally, see the [Bazel quick start](https://github.com/lyft/envoy/blob/master/bazel/README.md#quick-start-bazel-build-for-developers). To run tests, there are Bazel [targets](https://github.com/lyft/envoy/blob/master/bazel/README.md#testing-envoy-with-bazel) for Google Test. To generate a coverage report, use the tooling for [gcovr](https://github.com/lyft/envoy/blob/master/bazel/README.md#coverage-builds).
+To get started building Envoy locally, see the [Bazel quick start](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#quick-start-bazel-build-for-developers). To run tests, there are Bazel [targets](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#testing-envoy-with-bazel) for Google Test. To generate a coverage report, use the tooling for [gcovr](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#coverage-builds).
 
 Below is a list of additional documentation to aid the development process:
 
-- [General build and installation documentation](https://lyft.github.io/envoy/docs/install/install.html)
+- [General build and installation documentation](https://envoyproxy.github.io/envoy/install/install.html)
 
-- [Building and testing Envoy with Bazel](https://github.com/lyft/envoy/blob/master/bazel/README.md)
+- [Building and testing Envoy with Bazel](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md)
 
-- [Managing external dependencies with Bazel](https://github.com/lyft/envoy/blob/master/bazel/EXTERNAL_DEPS.md)
+- [Managing external dependencies with Bazel](https://github.com/envoyproxy/envoy/blob/master/bazel/EXTERNAL_DEPS.md)
 
-- [Guide to Envoy Bazel rules (managing `BUILD` files)](https://github.com/lyft/envoy/blob/master/bazel/DEVELOPER.md)
+- [Guide to Envoy Bazel rules (managing `BUILD` files)](https://github.com/envoyproxy/envoy/blob/master/bazel/DEVELOPER.md)
 
-- [Using Docker for building and testing](https://github.com/lyft/envoy/tree/master/ci)
+- [Using Docker for building and testing](https://github.com/envoyproxy/envoy/tree/master/ci)
 
-- [Guide to contributing to Envoy](https://github.com/lyft/envoy/blob/master/CONTRIBUTING.md)
+- [Guide to contributing to Envoy](https://github.com/envoyproxy/envoy/blob/master/CONTRIBUTING.md)
 
 - [Envoy filter example project (how to consume and extend Envoy as a submodule)](https://github.com/lyft/envoy-filter-example)
diff --git a/bazel/README.md b/bazel/README.md
index 5e1a7c5243bd..4ea3ba75c90a 100644
--- a/bazel/README.md
+++ b/bazel/README.md
@@ -3,23 +3,23 @@
 ## Production environments
 
 To build Envoy with Bazel in a production environment, where the [Envoy
-dependencies](https://lyft.github.io/envoy/docs/install/requirements.html) are typically
+dependencies](https://envoyproxy.github.io/envoy/install/requirements.html) are typically
 independently sourced, the following steps should be followed:
 
 1. [Install Bazel](https://bazel.build/versions/master/docs/install.html) in your environment.
-2. Configure, build and/or install the [Envoy dependencies](https://lyft.github.io/envoy/docs/install/requirements.html).
+2. Configure, build and/or install the [Envoy dependencies](https://envoyproxy.github.io/envoy/install/requirements.html).
 3. Configure a Bazel [WORKSPACE](https://bazel.build/versions/master/docs/be/workspace.html)
    to point Bazel at the Envoy dependencies. An example is provided in the CI Docker image
-   [WORKSPACE](https://github.com/lyft/envoy/blob/master/ci/WORKSPACE) and corresponding
-   [BUILD](https://github.com/lyft/envoy/blob/master/ci/prebuilt/BUILD) files.
+   [WORKSPACE](https://github.com/envoyproxy/envoy/blob/master/ci/WORKSPACE) and corresponding
+   [BUILD](https://github.com/envoyproxy/envoy/blob/master/ci/prebuilt/BUILD) files.
 4. `bazel build --package_path %workspace%:<path to Envoy source tree> //source/exe:envoy-static`
    from the directory containing your WORKSPACE.
 
 ## Quick start Bazel build for developers
 
-As a developer convenience, a [WORKSPACE](https://github.com/lyft/envoy/blob/master/WORKSPACE) and
+As a developer convenience, a [WORKSPACE](https://github.com/envoyproxy/envoy/blob/master/WORKSPACE) and
 [rules for building a recent
-version](https://github.com/lyft/envoy/blob/master/bazel/repositories.bzl) of the various Envoy
+version](https://github.com/envoyproxy/envoy/blob/master/bazel/repositories.bzl) of the various Envoy
 dependencies are provided. These are provided as is, they are only suitable for development and
 testing purposes. The specific versions of the Envoy dependencies used in this build may not be
 up-to-date with the latest security patches.
@@ -60,7 +60,7 @@ Bazel can also be built with the Docker image used for CI, by installing Docker
 ./ci/run_envoy_docker.sh './ci/do_ci.sh bazel.dev'
 ```
 
-See also the [documentation](https://github.com/lyft/envoy/tree/master/ci) for developer use of the
+See also the [documentation](https://github.com/envoyproxy/envoy/tree/master/ci) for developer use of the
 CI Docker image.
 
 ## Using a compiler toolchain in a non-standard location
@@ -93,7 +93,7 @@ bazel test //test/...
 An individual test target can be run with a more specific Bazel
 [label](https://bazel.build/versions/master/docs/build-ref.html#Labels), e.g. to build and run only
 the units tests in
-[test/common/http/async_client_impl_test.cc](https://github.com/lyft/envoy/blob/master/test/common/http/async_client_impl_test.cc):
+[test/common/http/async_client_impl_test.cc](https://github.com/envoyproxy/envoy/blob/master/test/common/http/async_client_impl_test.cc):
 
 ```
 bazel test //test/common/http:async_client_impl_test
@@ -264,7 +264,7 @@ https://github.com/bazelbuild/bazel/issues/2805.
 To generate coverage results, make sure you have
 [`gcovr`](https://github.com/gcovr/gcovr) 3.3 in your `PATH` (or set `GCOVR` to
 point at it) and are using a GCC toolchain (clang does not work currently, see
-https://github.com/lyft/envoy/issues/1000). Then run:
+https://github.com/envoyproxy/envoy/issues/1000). Then run:
 
 ```
 test/run_envoy_bazel_coverage.sh
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index cdfef219e39c..0e462af4a4c2 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -27,7 +27,7 @@ def _repository_impl(ctxt):
     if result.return_code != 0:
         print("\033[31;1m\033[48;5;226m External dependency build failed, check above log " +
               "for errors and ensure all prerequisites at " +
-              "https://github.com/lyft/envoy/blob/master/bazel/README.md#quick-start-bazel-build-for-developers are met.")
+              "https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#quick-start-bazel-build-for-developers are met.")
         # This error message doesn't appear to the user :( https://github.com/bazelbuild/bazel/issues/3683
         fail("External dep build failed")
 
diff --git a/ci/README.md b/ci/README.md
index 1b3b356504ea..dc5c1b19c41d 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ Two flavors of Envoy Docker images, based on Ubuntu and Alpine Linux, are built.
 
 ## Ubuntu envoy image
 The Ubuntu based Envoy Docker image at [`lyft/envoy-build:<hash>`](https://hub.docker.com/r/lyft/envoy-build/) is used for Travis CI checks,
-where `<hash>` is specified in [`envoy_build_sha.sh`](https://github.com/lyft/envoy/blob/master/ci/envoy_build_sha.sh). Developers
+where `<hash>` is specified in [`envoy_build_sha.sh`](https://github.com/envoyproxy/envoy/blob/master/ci/envoy_build_sha.sh). Developers
 may work with `lyft/envoy-build:latest` to provide a self-contained environment for building Envoy binaries and
 running tests that reflects the latest built Ubuntu Envoy image. Moreover, the Docker image
 at [`lyft/envoy:<hash>`](https://hub.docker.com/r/lyft/envoy/) is an image that has an Envoy binary at `/usr/local/bin/envoy`. The `<hash>`
diff --git a/ci/build_container/README.md b/ci/build_container/README.md
index 949459b646f5..57f0ef32cd83 100644
--- a/ci/build_container/README.md
+++ b/ci/build_container/README.md
@@ -4,4 +4,4 @@ image. The image is pushed to [dockerhub](https://hub.docker.com/r/lyft/envoy-bu
 
 After the PR that changes `ci/build_container` has been merged, and the new image gets pushed,
 a second PR is needed to update `ci/envoy_build_sha.sh`. In order to pull the new tagged version of
-the build image, change ENVOY_BUILD_SHA [here](https://github.com/lyft/envoy/blob/master/ci/envoy_build_sha.sh). Any PRs that depend on this image change will have to merge master after the change to `ci/envoy_build_sha.sh` has been merged to master.
+the build image, change ENVOY_BUILD_SHA [here](https://github.com/envoyproxy/envoy/blob/master/ci/envoy_build_sha.sh). Any PRs that depend on this image change will have to merge master after the change to `ci/envoy_build_sha.sh` has been merged to master.
diff --git a/ci/build_container/build_recipes/lightstep.sh b/ci/build_container/build_recipes/lightstep.sh
index 3e3c9e63b365..5ca9f002cce3 100755
--- a/ci/build_container/build_recipes/lightstep.sh
+++ b/ci/build_container/build_recipes/lightstep.sh
@@ -8,7 +8,7 @@ wget -O lightstep-tracer-cpp-"$VERSION".tar.gz https://github.com/lightstep/ligh
 tar xf lightstep-tracer-cpp-"$VERSION".tar.gz
 cd lightstep-tracer-cpp-"$VERSION"
 
-# see https://github.com/lyft/envoy/issues/1387 for progress
+# see https://github.com/envoyproxy/envoy/issues/1387 for progress
 cat > ../lightstep-missing-header.diff << EOF
 --- ./src/c++11/lightstep/options.h.bak	2017-08-04 09:30:19.527076744 -0400
 +++ ./src/c++11/lightstep/options.h	2017-08-04 09:30:33.742106924 -0400
diff --git a/ci/build_setup.sh b/ci/build_setup.sh
index 06698f2cc0f3..d8a3c5926505 100755
--- a/ci/build_setup.sh
+++ b/ci/build_setup.sh
@@ -96,7 +96,7 @@ mkdir -p "${ENVOY_COVERAGE_DIR}"
 # This is where we build for bazel.release* and bazel.dev.
 export ENVOY_CI_DIR="${ENVOY_SRCDIR}"/ci
 
-# Hack due to https://github.com/lyft/envoy/issues/838 and the need to have
+# Hack due to https://github.com/envoyproxy/envoy/issues/838 and the need to have
 # tools and bazel.rc available for build linkstamping.
 mkdir -p "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/tools
 mkdir -p "${ENVOY_CI_DIR}"/tools
diff --git a/ci/ci_steps.sh b/ci/ci_steps.sh
index 309a2a5d75bf..f563fe1dfae4 100755
--- a/ci/ci_steps.sh
+++ b/ci/ci_steps.sh
@@ -45,7 +45,7 @@ else
     mkdir -p build_release
     cp -f "$ENVOY_BUILD_DIR"/envoy/source/exe/envoy ./build_release
     # This script builds lyft/envoy and lyft/envoy-alpine images and pushes that image on merge to master.
-    # It also makes sure that the docker examples (https://lyft.github.io/envoy/docs/install/sandboxes/sandboxes.html)
+    # It also makes sure that the docker examples (https://envoyproxy.github.io/envoy/install/sandboxes/sandboxes.html)
     # can be built and run.
     ./ci/docker_push.sh
   fi
diff --git a/ci/verify_examples.sh b/ci/verify_examples.sh
index 14133b91ec6e..d66e63ebe648 100755
--- a/ci/verify_examples.sh
+++ b/ci/verify_examples.sh
@@ -28,10 +28,10 @@ tar -xf go1.7.1.linux-amd64.tar.gz
 sudo mv go /usr/local
 export PATH=$PATH:/usr/local/go/bin
 export GOPATH=$HOME/go
-mkdir -p $GOPATH/src/github.com/lyft/envoy/examples/
-cp -r grpc-bridge $GOPATH/src/github.com/lyft/envoy/examples/
+mkdir -p $GOPATH/src/github.com/envoyproxy/envoy/examples/
+cp -r grpc-bridge $GOPATH/src/github.com/envoyproxy/envoy/examples/
 # build example
-cd $GOPATH/src/github.com/lyft/envoy/examples/grpc-bridge
+cd $GOPATH/src/github.com/envoyproxy/envoy/examples/grpc-bridge
 ./script/bootstrap
 ./script/build
 # verify example works
diff --git a/docs/README.md b/docs/README.md
index 800238a8af83..3b264c34bf62 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,7 +10,7 @@ The output can be found in `generated/docs`.
 
 The Envoy website, and docs are automatically built, and pushed on every commit 
 to master. This process is handled by Travis CI with the 
-[`publish.sh`](https://github.com/lyft/envoy/blob/master/docs/publish.sh) script. 
+[`publish.sh`](https://github.com/envoyproxy/envoy/blob/master/docs/publish.sh) script.
 
 In order to have this automatic process there is an encrypted ssh key at the root 
 of the envoy repo (`.publishdocskey.enc`). This key was encrypted with Travis CLI 
diff --git a/docs/conf.py b/docs/conf.py
index 68775a358d04..21fd829acec2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -32,7 +32,7 @@
 # ones.
 extensions = ['sphinxcontrib.httpdomain', 'sphinx.ext.extlinks']
 
-extlinks = {'repo': ('https://github.com/lyft/envoy/blob/master/%s', '')}
+extlinks = {'repo': ('https://github.com/envoyproxy/envoy/blob/master/%s', '')}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/examples/front-proxy/README.md b/examples/front-proxy/README.md
index 486ce87681fa..3d81aea12bb5 100644
--- a/examples/front-proxy/README.md
+++ b/examples/front-proxy/README.md
@@ -1,2 +1,2 @@
 To learn about this sandbox and for instructions on how to run it please head over
-to the [envoy docs](https://lyft.github.io/envoy/docs/install/sandboxes/front_proxy.html)
+to the [envoy docs](https://envoyproxy.github.io/envoy/install/sandboxes/front_proxy.html)
diff --git a/examples/grpc-bridge/README.md b/examples/grpc-bridge/README.md
index 4c8887fb512f..fe5257ea9d15 100644
--- a/examples/grpc-bridge/README.md
+++ b/examples/grpc-bridge/README.md
@@ -1,2 +1,2 @@
 To learn about this sandbox and for instructions on how to run it please head over
-to the [envoy docs](https://lyft.github.io/envoy/docs/install/sandboxes/grpc_bridge.html)
+to the [envoy docs](https://envoyproxy.github.io/envoy/install/sandboxes/grpc_bridge.html)
diff --git a/examples/grpc-bridge/service/main.go b/examples/grpc-bridge/service/main.go
index 5e9674cbe53e..61037113bf21 100644
--- a/examples/grpc-bridge/service/main.go
+++ b/examples/grpc-bridge/service/main.go
@@ -8,7 +8,7 @@ import (
 
 	"sync"
 
-	"github.com/lyft/envoy/examples/grpc-bridge/service/gen"
+	"github.com/envoyproxy/envoy/examples/grpc-bridge/service/gen"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
diff --git a/examples/jaeger-tracing/README.md b/examples/jaeger-tracing/README.md
index 1ce83a4246ce..b5a712938440 100644
--- a/examples/jaeger-tracing/README.md
+++ b/examples/jaeger-tracing/README.md
@@ -1,2 +1,2 @@
 To learn about this sandbox and for instructions on how to run it please head over
-to the [envoy docs](https://lyft.github.io/envoy/docs/install/sandboxes/jaeger_tracing.html)
+to the [envoy docs](https://envoyproxy.github.io/envoy/install/sandboxes/jaeger_tracing.html)
diff --git a/examples/zipkin-tracing/README.md b/examples/zipkin-tracing/README.md
index c3d71e019541..10600a015a2c 100644
--- a/examples/zipkin-tracing/README.md
+++ b/examples/zipkin-tracing/README.md
@@ -1,2 +1,2 @@
 To learn about this sandbox and for instructions on how to run it please head over
-to the [envoy docs](https://lyft.github.io/envoy/docs/install/sandboxes/zipkin_tracing.html)
+to the [envoy docs](https://envoyproxy.github.io/envoy/install/sandboxes/zipkin_tracing.html)
diff --git a/include/envoy/grpc/rpc_channel.h b/include/envoy/grpc/rpc_channel.h
index a1cb4eee339d..62920a61d764 100644
--- a/include/envoy/grpc/rpc_channel.h
+++ b/include/envoy/grpc/rpc_channel.h
@@ -47,7 +47,7 @@ class RpcChannelCallbacks {
  * object. An RpcChannel should be passed to the constructor of an RPC stub
  * generated via protoc using the "option cc_generic_services = true;" option.
  * It can be used for multiple service calls, but not concurrently.
- * DEPRECATED: See https://github.com/lyft/envoy/issues/1102
+ * DEPRECATED: See https://github.com/envoyproxy/envoy/issues/1102
  */
 class RpcChannel : public Protobuf::RpcChannel {
 public:
diff --git a/source/common/grpc/rpc_channel_impl.h b/source/common/grpc/rpc_channel_impl.h
index 3c6c85f3c150..865d16a14dc1 100644
--- a/source/common/grpc/rpc_channel_impl.h
+++ b/source/common/grpc/rpc_channel_impl.h
@@ -26,7 +26,7 @@ namespace Grpc {
  *    needed.
  * 4) Inflight RPCs can be safely cancelled using cancel().
  * 5) See GrpcRequestImplTest for an example.
- * DEPRECATED: See https://github.com/lyft/envoy/issues/1102
+ * DEPRECATED: See https://github.com/envoyproxy/envoy/issues/1102
  */
 class RpcChannelImpl : public RpcChannel, public Http::AsyncClient::Callbacks {
 public:
diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc
index 75780b619f9e..7b73371b446b 100644
--- a/source/common/http/utility.cc
+++ b/source/common/http/utility.cc
@@ -194,7 +194,7 @@ void Utility::sendLocalReply(
   if (!body_text.empty() && !is_reset) {
     Buffer::OwnedImpl buffer(body_text);
     // TODO(htuch): We shouldn't encodeData() if the stream is reset in the encodeHeaders() above,
-    // see https://github.com/lyft/envoy/issues/1283.
+    // see https://github.com/envoyproxy/envoy/issues/1283.
     encode_data(buffer, true);
   }
 }
diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h
index 9034c61d91cb..658217377cda 100644
--- a/source/common/local_info/local_info_impl.h
+++ b/source/common/local_info/local_info_impl.h
@@ -24,8 +24,8 @@ class LocalInfoImpl : public LocalInfo {
     }
   }
 
-  // TODO(PiotrSikora): Revert https://github.com/lyft/envoy/pull/1500 once protobuf string types
-  // converge.
+  // TODO(PiotrSikora): Revert https://github.com/envoyproxy/envoy/pull/1500 once protobuf string
+  // types converge.
 
   Network::Address::InstanceConstSharedPtr address() const override { return address_; }
   const std::string zoneName() const override { return node_.locality().zone(); }
diff --git a/tools/bazel.rc b/tools/bazel.rc
index c8ecbbeb5c54..1effdd639398 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -33,7 +33,7 @@ build:clang-tsan --linkopt -fsanitize=thread
 build:clang-tsan --define tcmalloc=disabled
 
 # Clang 5.0 MSAN - broken today since we need to rebuild lib[std]c++ and external deps with MSAN
-# support (see https://github.com/lyft/envoy/issues/443).
+# support (see https://github.com/envoyproxy/envoy/issues/443).
 build:clang-msan --copt -fsanitize=memory
 build:clang-msan --linkopt -fsanitize=memory
 build:clang-msan --define tcmalloc=disabled