diff --git a/packages/google-cloud-dataflow-client/.github/.OwlBot.lock.yaml b/packages/google-cloud-dataflow-client/.github/.OwlBot.lock.yaml
index e2b39f946040..1a86dde1ddf7 100644
--- a/packages/google-cloud-dataflow-client/.github/.OwlBot.lock.yaml
+++ b/packages/google-cloud-dataflow-client/.github/.OwlBot.lock.yaml
@@ -1,3 +1,17 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 docker:
   image: gcr.io/repo-automation-bots/owlbot-python:latest
   digest: sha256:99d90d097e4a4710cc8658ee0b5b963f4426d0e424819787c3ac1405c9a26719
diff --git a/packages/google-cloud-dataflow-client/.github/ISSUE_TEMPLATE/bug_report.md b/packages/google-cloud-dataflow-client/.github/ISSUE_TEMPLATE/bug_report.md
index a563629b1a85..23cfce8334bb 100644
--- a/packages/google-cloud-dataflow-client/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/packages/google-cloud-dataflow-client/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ Thanks for stopping by to let us know something could be better!
 
 Please run down the following list and make sure you've tried the usual "quick fixes":
 
-  - Search the issues already opened: https://github.com/googleapis/python-dataflow/issues
+  - Search the issues already opened: https://github.com/googleapis/python-dataflow-client/issues
   - Search StackOverflow: https://stackoverflow.com/questions/tagged/google-cloud-platform+python
 
 If you are still having issues, please be sure to include as much information as possible:
@@ -20,7 +20,7 @@ If you are still having issues, please be sure to include as much information as
   - OS type and version:
   - Python version: `python --version`
   - pip version: `pip --version`
-  - `google-cloud-dataflow` version: `pip show google-cloud-dataflow`
+  - `google-cloud-dataflow-client` version: `pip show google-cloud-dataflow-client`
 
 #### Steps to reproduce
 
diff --git a/packages/google-cloud-dataflow-client/.github/PULL_REQUEST_TEMPLATE.md b/packages/google-cloud-dataflow-client/.github/PULL_REQUEST_TEMPLATE.md
index e5f1ceade9ff..944fefc1bcfc 100644
--- a/packages/google-cloud-dataflow-client/.github/PULL_REQUEST_TEMPLATE.md
+++ b/packages/google-cloud-dataflow-client/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
-- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-dataflow/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
+- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-dataflow-client/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
 - [ ] Ensure the tests and linter pass
 - [ ] Code coverage does not decrease (if any source code was changed)
 - [ ] Appropriate docs were updated (if necessary)
diff --git a/packages/google-cloud-dataflow-client/.kokoro/build.sh b/packages/google-cloud-dataflow-client/.kokoro/build.sh
index 6df95f9beed2..26566d5ee327 100755
--- a/packages/google-cloud-dataflow-client/.kokoro/build.sh
+++ b/packages/google-cloud-dataflow-client/.kokoro/build.sh
@@ -16,7 +16,7 @@
 set -eo pipefail
 
 if [[ -z "${PROJECT_ROOT:-}" ]]; then
-    PROJECT_ROOT="github/python-dataflow"
+    PROJECT_ROOT="github/python-dataflow-client"
 fi
 
 cd "${PROJECT_ROOT}"
diff --git a/packages/google-cloud-dataflow-client/.kokoro/continuous/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/continuous/common.cfg
index 8d8e9055bd19..409588b84a27 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/continuous/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/continuous/common.cfg
@@ -14,7 +14,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -23,5 +23,5 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/build.sh"
+    value: "github/python-dataflow-client/.kokoro/build.sh"
 }
diff --git a/packages/google-cloud-dataflow-client/.kokoro/docs/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/docs/common.cfg
index c7b0a9d0eabf..afa96e691515 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/docs/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/docs/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline_v2.sh"
+build_file: "python-dataflow-client/.kokoro/trampoline_v2.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -20,7 +20,7 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/publish-docs.sh"
+    value: "github/python-dataflow-client/.kokoro/publish-docs.sh"
 }
 
 env_vars: {
diff --git a/packages/google-cloud-dataflow-client/.kokoro/docs/docs-presubmit.cfg b/packages/google-cloud-dataflow-client/.kokoro/docs/docs-presubmit.cfg
index 45ca7a04c50f..c131b48e31c7 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/docs/docs-presubmit.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/docs/docs-presubmit.cfg
@@ -18,7 +18,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/build.sh"
+    value: "github/python-dataflow-client/.kokoro/build.sh"
 }
 
 # Only run this nox session.
diff --git a/packages/google-cloud-dataflow-client/.kokoro/presubmit/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/presubmit/common.cfg
index 8d8e9055bd19..409588b84a27 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/presubmit/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/presubmit/common.cfg
@@ -14,7 +14,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -23,5 +23,5 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/build.sh"
+    value: "github/python-dataflow-client/.kokoro/build.sh"
 }
diff --git a/packages/google-cloud-dataflow-client/.kokoro/release.sh b/packages/google-cloud-dataflow-client/.kokoro/release.sh
index b841ce9c9866..d38c957b46a0 100755
--- a/packages/google-cloud-dataflow-client/.kokoro/release.sh
+++ b/packages/google-cloud-dataflow-client/.kokoro/release.sh
@@ -27,6 +27,6 @@ export PYTHONUNBUFFERED=1
 
 # Move into the package, build the distribution and upload.
 TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token")
-cd github/python-dataflow
+cd github/python-dataflow-client
 python3 setup.py sdist bdist_wheel
 twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*
diff --git a/packages/google-cloud-dataflow-client/.kokoro/release/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/release/common.cfg
index ed6b912e080f..86f31ceec01a 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/release/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/release/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -20,7 +20,7 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/release.sh"
+    value: "github/python-dataflow-client/.kokoro/release.sh"
 }
 
 # Tokens needed to report release status back to GitHub
diff --git a/packages/google-cloud-dataflow-client/.kokoro/samples/lint/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/samples/lint/common.cfg
index 0530852a6b70..ce3d8e6cf54d 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/samples/lint/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/samples/lint/common.cfg
@@ -15,7 +15,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/test-samples.sh"
+    value: "github/python-dataflow-client/.kokoro/test-samples.sh"
 }
 
 # Configure the docker image for kokoro-trampoline.
@@ -31,4 +31,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.6/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.6/common.cfg
index 57811d1b43d0..7e3ec984f7d5 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.6/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.6/common.cfg
@@ -21,7 +21,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/test-samples.sh"
+    value: "github/python-dataflow-client/.kokoro/test-samples.sh"
 }
 
 # Configure the docker image for kokoro-trampoline.
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.7/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.7/common.cfg
index d18a4f1e7673..7d39de4d3ce0 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.7/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.7/common.cfg
@@ -21,7 +21,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/test-samples.sh"
+    value: "github/python-dataflow-client/.kokoro/test-samples.sh"
 }
 
 # Configure the docker image for kokoro-trampoline.
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.8/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.8/common.cfg
index 212a2f1cc551..dd262cf49013 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.8/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.8/common.cfg
@@ -21,7 +21,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/test-samples.sh"
+    value: "github/python-dataflow-client/.kokoro/test-samples.sh"
 }
 
 # Configure the docker image for kokoro-trampoline.
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.9/common.cfg b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.9/common.cfg
index fb93c9b34376..18c6a75785c8 100644
--- a/packages/google-cloud-dataflow-client/.kokoro/samples/python3.9/common.cfg
+++ b/packages/google-cloud-dataflow-client/.kokoro/samples/python3.9/common.cfg
@@ -21,7 +21,7 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-dataflow/.kokoro/test-samples.sh"
+    value: "github/python-dataflow-client/.kokoro/test-samples.sh"
 }
 
 # Configure the docker image for kokoro-trampoline.
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-dataflow/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-dataflow-client/.kokoro/trampoline.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/.kokoro/test-samples-against-head.sh b/packages/google-cloud-dataflow-client/.kokoro/test-samples-against-head.sh
index de0bc4ee1d2e..89bef8eeada8 100755
--- a/packages/google-cloud-dataflow-client/.kokoro/test-samples-against-head.sh
+++ b/packages/google-cloud-dataflow-client/.kokoro/test-samples-against-head.sh
@@ -23,6 +23,6 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-dataflow
+cd github/python-dataflow-client
 
 exec .kokoro/test-samples-impl.sh
diff --git a/packages/google-cloud-dataflow-client/.kokoro/test-samples.sh b/packages/google-cloud-dataflow-client/.kokoro/test-samples.sh
index 138e0b92e96d..195af761bb82 100755
--- a/packages/google-cloud-dataflow-client/.kokoro/test-samples.sh
+++ b/packages/google-cloud-dataflow-client/.kokoro/test-samples.sh
@@ -24,7 +24,7 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-dataflow
+cd github/python-dataflow-client
 
 # Run periodic samples tests at latest release
 if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
diff --git a/packages/google-cloud-dataflow-client/.repo-metadata.json b/packages/google-cloud-dataflow-client/.repo-metadata.json
index f25dfff0e3ca..17f46a58334f 100644
--- a/packages/google-cloud-dataflow-client/.repo-metadata.json
+++ b/packages/google-cloud-dataflow-client/.repo-metadata.json
@@ -7,7 +7,7 @@
     "release_level": "beta",
     "language": "python",
     "library_type": "GAPIC_AUTO",
-    "repo": "googleapis/python-dataflow",
-    "distribution_name": "google-cloud-dataflow",
+    "repo": "googleapis/python-dataflow-client",
+    "distribution_name": "google-cloud-dataflow-client",
     "api_id": "dataflow.googleapis.com"
 }
\ No newline at end of file
diff --git a/packages/google-cloud-dataflow-client/CONTRIBUTING.rst b/packages/google-cloud-dataflow-client/CONTRIBUTING.rst
index d1310e326219..f676d6fca0b8 100644
--- a/packages/google-cloud-dataflow-client/CONTRIBUTING.rst
+++ b/packages/google-cloud-dataflow-client/CONTRIBUTING.rst
@@ -35,21 +35,21 @@ Using a Development Checkout
 You'll have to create a development environment using a Git checkout:
 
 - While logged into your GitHub account, navigate to the
-  ``python-dataflow`` `repo`_ on GitHub.
+  ``python-dataflow-client`` `repo`_ on GitHub.
 
-- Fork and clone the ``python-dataflow`` repository to your GitHub account by
+- Fork and clone the ``python-dataflow-client`` repository to your GitHub account by
   clicking the "Fork" button.
 
-- Clone your fork of ``python-dataflow`` from your GitHub account to your local
+- Clone your fork of ``python-dataflow-client`` from your GitHub account to your local
   computer, substituting your account username and specifying the destination
-  as ``hack-on-python-dataflow``.  E.g.::
+  as ``hack-on-python-dataflow-client``.  E.g.::
 
    $ cd ${HOME}
-   $ git clone git@github.com:USERNAME/python-dataflow.git hack-on-python-dataflow
-   $ cd hack-on-python-dataflow
-   # Configure remotes such that you can pull changes from the googleapis/python-dataflow
+   $ git clone git@github.com:USERNAME/python-dataflow-client.git hack-on-python-dataflow-client
+   $ cd hack-on-python-dataflow-client
+   # Configure remotes such that you can pull changes from the googleapis/python-dataflow-client
    # repository into your local repository.
-   $ git remote add upstream git@github.com:googleapis/python-dataflow.git
+   $ git remote add upstream git@github.com:googleapis/python-dataflow-client.git
    # fetch and merge changes from upstream into master
    $ git fetch upstream
    $ git merge upstream/master
@@ -60,7 +60,7 @@ repo, from which you can submit a pull request.
 To work on the codebase and run the tests, we recommend using ``nox``,
 but you can also use a ``virtualenv`` of your own creation.
 
-.. _repo: https://github.com/googleapis/python-dataflow
+.. _repo: https://github.com/googleapis/python-dataflow-client
 
 Using ``nox``
 =============
@@ -113,7 +113,7 @@ Coding Style
    export GOOGLE_CLOUD_TESTING_BRANCH="master"
 
   By doing this, you are specifying the location of the most up-to-date
-  version of ``python-dataflow``. The the suggested remote name ``upstream``
+  version of ``python-dataflow-client``. The the suggested remote name ``upstream``
   should point to the official ``googleapis`` checkout and the
   the branch should be the main branch on that remote (``master``).
 
@@ -185,10 +185,10 @@ The `description on PyPI`_ for the project comes directly from the
 ``README``. Due to the reStructuredText (``rst``) parser used by
 PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
 instead of
-``https://github.com/googleapis/python-dataflow/blob/master/CONTRIBUTING.rst``)
+``https://github.com/googleapis/python-dataflow-client/blob/master/CONTRIBUTING.rst``)
 may cause problems creating links or rendering the description.
 
-.. _description on PyPI: https://pypi.org/project/google-cloud-dataflow
+.. _description on PyPI: https://pypi.org/project/google-cloud-dataflow-client
 
 
 *************************
@@ -210,7 +210,7 @@ We support:
 
 Supported versions can be found in our ``noxfile.py`` `config`_.
 
-.. _config: https://github.com/googleapis/python-dataflow/blob/master/noxfile.py
+.. _config: https://github.com/googleapis/python-dataflow-client/blob/master/noxfile.py
 
 
 We also explicitly decided to support Python 3 beginning with version 3.6.
diff --git a/packages/google-cloud-dataflow-client/README.rst b/packages/google-cloud-dataflow-client/README.rst
index fffaf17bea6c..24ff11de8826 100644
--- a/packages/google-cloud-dataflow-client/README.rst
+++ b/packages/google-cloud-dataflow-client/README.rst
@@ -10,10 +10,10 @@ Python Client for Cloud Dataflow
 
 .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg
    :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support
-.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow.svg
-   :target: https://pypi.org/project/google-cloud-dataflow/
-.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow.svg
-   :target: https://pypi.org/project/google-cloud-dataflow/
+.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow-client.svg
+   :target: https://pypi.org/project/google-cloud-dataflow-client/
+.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow-client.svg
+   :target: https://pypi.org/project/google-cloud-dataflow-client/
 .. _Cloud Dataflow: https://cloud.google.com/dataflow/
 .. _Client Library Documentation: https://googleapis.dev/python/dataflow/latest
 .. _Product Documentation:  https://cloud.google.com/dataflow/
@@ -55,7 +55,7 @@ Mac/Linux
     pip install virtualenv
     virtualenv <your-env>
     source <your-env>/bin/activate
-    <your-env>/bin/pip install google-cloud-dataflow
+    <your-env>/bin/pip install google-cloud-dataflow-client
 
 
 Windows
@@ -66,7 +66,7 @@ Windows
     pip install virtualenv
     virtualenv <your-env>
     <your-env>\Scripts\activate
-    <your-env>\Scripts\pip.exe install google-cloud-dataflow
+    <your-env>\Scripts\pip.exe install google-cloud-dataflow-client
 
 Next Steps
 ~~~~~~~~~~
diff --git a/packages/google-cloud-dataflow-client/docs/README.rst b/packages/google-cloud-dataflow-client/docs/README.rst
index fffaf17bea6c..24ff11de8826 100644
--- a/packages/google-cloud-dataflow-client/docs/README.rst
+++ b/packages/google-cloud-dataflow-client/docs/README.rst
@@ -10,10 +10,10 @@ Python Client for Cloud Dataflow
 
 .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg
    :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support
-.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow.svg
-   :target: https://pypi.org/project/google-cloud-dataflow/
-.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow.svg
-   :target: https://pypi.org/project/google-cloud-dataflow/
+.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow-client.svg
+   :target: https://pypi.org/project/google-cloud-dataflow-client/
+.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow-client.svg
+   :target: https://pypi.org/project/google-cloud-dataflow-client/
 .. _Cloud Dataflow: https://cloud.google.com/dataflow/
 .. _Client Library Documentation: https://googleapis.dev/python/dataflow/latest
 .. _Product Documentation:  https://cloud.google.com/dataflow/
@@ -55,7 +55,7 @@ Mac/Linux
     pip install virtualenv
     virtualenv <your-env>
     source <your-env>/bin/activate
-    <your-env>/bin/pip install google-cloud-dataflow
+    <your-env>/bin/pip install google-cloud-dataflow-client
 
 
 Windows
@@ -66,7 +66,7 @@ Windows
     pip install virtualenv
     virtualenv <your-env>
     <your-env>\Scripts\activate
-    <your-env>\Scripts\pip.exe install google-cloud-dataflow
+    <your-env>\Scripts\pip.exe install google-cloud-dataflow-client
 
 Next Steps
 ~~~~~~~~~~
diff --git a/packages/google-cloud-dataflow-client/docs/conf.py b/packages/google-cloud-dataflow-client/docs/conf.py
index 84d1c685cdaa..789beb3d9116 100644
--- a/packages/google-cloud-dataflow-client/docs/conf.py
+++ b/packages/google-cloud-dataflow-client/docs/conf.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# google-cloud-dataflow documentation build configuration file
+# google-cloud-dataflow-client documentation build configuration file
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
@@ -80,7 +80,7 @@
 master_doc = "index"
 
 # General information about the project.
-project = "google-cloud-dataflow"
+project = "google-cloud-dataflow-client"
 copyright = "2019, Google"
 author = "Google APIs"
 
@@ -153,9 +153,9 @@
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    "description": "Google Cloud Client Libraries for google-cloud-dataflow",
+    "description": "Google Cloud Client Libraries for google-cloud-dataflow-client",
     "github_user": "googleapis",
-    "github_repo": "python-dataflow",
+    "github_repo": "python-dataflow-client",
     "github_banner": True,
     "font_family": "'Roboto', Georgia, sans",
     "head_font_family": "'Roboto', Georgia, serif",
@@ -247,7 +247,7 @@
 # html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "google-cloud-dataflow-doc"
+htmlhelp_basename = "google-cloud-dataflow-client-doc"
 
 # -- Options for warnings ------------------------------------------------------
 
@@ -280,8 +280,8 @@
 latex_documents = [
     (
         master_doc,
-        "google-cloud-dataflow.tex",
-        "google-cloud-dataflow Documentation",
+        "google-cloud-dataflow-client.tex",
+        "google-cloud-dataflow-client Documentation",
         author,
         "manual",
     )
@@ -315,8 +315,8 @@
 man_pages = [
     (
         master_doc,
-        "google-cloud-dataflow",
-        "google-cloud-dataflow Documentation",
+        "google-cloud-dataflow-client",
+        "google-cloud-dataflow-client Documentation",
         [author],
         1,
     )
@@ -334,11 +334,11 @@
 texinfo_documents = [
     (
         master_doc,
-        "google-cloud-dataflow",
-        "google-cloud-dataflow Documentation",
+        "google-cloud-dataflow-client",
+        "google-cloud-dataflow-client Documentation",
         author,
-        "google-cloud-dataflow",
-        "google-cloud-dataflow Library",
+        "google-cloud-dataflow-client",
+        "google-cloud-dataflow-client Library",
         "APIs",
     )
 ]
diff --git a/packages/google-cloud-dataflow-client/docs/index.rst b/packages/google-cloud-dataflow-client/docs/index.rst
index d6989236b5c8..e1942ee501ca 100644
--- a/packages/google-cloud-dataflow-client/docs/index.rst
+++ b/packages/google-cloud-dataflow-client/docs/index.rst
@@ -13,7 +13,7 @@ API Reference
 Changelog
 ---------
 
-For a list of all ``google-cloud-dataflow`` releases:
+For a list of all ``google-cloud-dataflow-client`` releases:
 
 .. toctree::
    :maxdepth: 2
diff --git a/packages/google-cloud-dataflow-client/setup.py b/packages/google-cloud-dataflow-client/setup.py
index 1419e9edc31a..f63d31defc2c 100644
--- a/packages/google-cloud-dataflow-client/setup.py
+++ b/packages/google-cloud-dataflow-client/setup.py
@@ -20,11 +20,11 @@
 import setuptools
 
 
-name = "google-cloud-dataflow"
+name = "google-cloud-dataflow-client"
 description = "Cloud Dataflow API client library"
 version = "0.1.0"
 release_status = "Development Status :: 4 - Beta"
-url = "https://github.com/googleapis/python-dataflow"
+url = "https://github.com/googleapis/python-dataflow-client"
 dependencies = [
     "google-api-core[grpc] >= 1.26.0, <2.0.0dev",
     "proto-plus >= 1.15.0",