diff --git a/ci/WORKSPACE.consumer b/ci/WORKSPACE.filter.example
similarity index 100%
rename from ci/WORKSPACE.consumer
rename to ci/WORKSPACE.filter.example
diff --git a/ci/build_setup.sh b/ci/build_setup.sh
index 48b0ea1ca48f4..cf928b880fa68 100755
--- a/ci/build_setup.sh
+++ b/ci/build_setup.sh
@@ -27,7 +27,7 @@ then
   echo "${BUILD_DIR} mount missing - did you forget -v <something>:${BUILD_DIR}?"
   exit 1
 fi
-export ENVOY_CONSUMER_SRCDIR="${BUILD_DIR}/envoy-consumer"
+export ENVOY_FILTER_EXAMPLE_SRCDIR="${BUILD_DIR}/envoy-filter-example"
 
 # Make sure that /source doesn't contain /build on the underlying host
 # filesystem, including via hard links or symlinks. We can get into weird
@@ -61,15 +61,15 @@ ln -sf /thirdparty "${ENVOY_SRCDIR}"/ci/prebuilt
 ln -sf /thirdparty_build "${ENVOY_SRCDIR}"/ci/prebuilt
 
 # Setup Envoy consuming project.
-if [[ ! -a "${ENVOY_CONSUMER_SRCDIR}" ]]
+if [[ ! -a "${ENVOY_FILTER_EXAMPLE_SRCDIR}" ]]
 then
-  # TODO(htuch): Update to non-htuch when https://github.com/lyft/envoy/issues/404 is sorted.
-  git clone https://github.com/htuch/envoy-consumer.git "${ENVOY_CONSUMER_SRCDIR}"
+  git clone https://github.com/lyft/envoy-filter-example.git "${ENVOY_FILTER_EXAMPLE_SRCDIR}"
 fi
-cp -f "${ENVOY_SRCDIR}"/ci/WORKSPACE.consumer "${ENVOY_CONSUMER_SRCDIR}"/WORKSPACE
+cp -f "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/WORKSPACE
 
-# This is the hash on https://github.com/htuch/envoy-consumer.git we pin to.
-(cd "${ENVOY_CONSUMER_SRCDIR}" && git checkout 94e11fa753a1e787c82cccaec642eda5e5b61ed8)
+# This is the hash on https://github.com/lyft/envoy-filter-example.git we pin to.
+# TODO(hennna): Point to updated hash.
+(cd "${ENVOY_FILTER_EXAMPLE_SRCDIR}" && git checkout 9f006f6be519007e9be3b29ad531b8e8be5a18d6)
 
 # Also setup some space for building Envoy standalone.
 export ENVOY_BUILD_DIR="${BUILD_DIR}"/envoy
@@ -85,13 +85,13 @@ export ENVOY_CI_DIR="${ENVOY_SRCDIR}"/ci
 
 # Hack due to https://github.com/lyft/envoy/issues/838 and the need to have
 # tools and bazel.rc available for build linkstamping.
-mkdir -p "${ENVOY_CONSUMER_SRCDIR}"/tools
+mkdir -p "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/tools
 mkdir -p "${ENVOY_CI_DIR}"/tools
-ln -sf "${ENVOY_SRCDIR}"/tools/bazel.rc "${ENVOY_CONSUMER_SRCDIR}"/tools/
+ln -sf "${ENVOY_SRCDIR}"/tools/bazel.rc "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/tools/
 ln -sf "${ENVOY_SRCDIR}"/tools/bazel.rc "${ENVOY_CI_DIR}"/tools/
-mkdir -p "${ENVOY_CONSUMER_SRCDIR}"/bazel
+mkdir -p "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel
 mkdir -p "${ENVOY_CI_DIR}"/bazel
-ln -sf "${ENVOY_SRCDIR}"/bazel/get_workspace_status "${ENVOY_CONSUMER_SRCDIR}"/bazel/
+ln -sf "${ENVOY_SRCDIR}"/bazel/get_workspace_status "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel/
 ln -sf "${ENVOY_SRCDIR}"/bazel/get_workspace_status "${ENVOY_CI_DIR}"/bazel/
 
 function cleanup() {
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index be0bc61091a08..1a8f3dd4aa0bc 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -30,7 +30,7 @@ elif [[ "$1" == "bazel.release.server_only" ]]; then
   exit 0
 elif [[ "$1" == "bazel.asan" ]]; then
   echo "bazel ASAN debug build with tests..."
-  cd "${ENVOY_CONSUMER_SRCDIR}"
+  cd "${ENVOY_FILTER_EXAMPLE_SRCDIR}"
   echo "Building and testing..."
   # TODO(htuch): This should switch to using clang when available.
   bazel --batch test ${BAZEL_TEST_OPTIONS} -c dbg --config=asan @envoy//test/... \