--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -32,17 +32,17 @@ mozilla.pth:build/pymake
 mozilla.pth:config
 mozilla.pth:dom/bindings
 mozilla.pth:dom/bindings/parser
 mozilla.pth:layout/tools/reftest
 mozilla.pth:other-licenses/ply/
 mozilla.pth:taskcluster
 mozilla.pth:testing
 mozilla.pth:testing/firefox-ui/harness
-mozilla.pth:testing/marionette/client
+mozilla.pth:testing/marionette/driver
 mozilla.pth:testing/marionette/harness
 mozilla.pth:testing/marionette/harness/marionette_harness/runner/mixins/browsermob-proxy-py
 mozilla.pth:testing/marionette/puppeteer/firefox
 packages.txt:testing/mozbase/packages.txt
 mozilla.pth:tools
 mozilla.pth:testing/web-platform
 mozilla.pth:testing/web-platform/tests/tools/wptrunner
 mozilla.pth:testing/web-platform/tests/tools/wptserve

--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -114,24 +114,24 @@ ARCHIVE_FILES = {
             'source': buildconfig.topobjdir,
             'base': '_tests',
             'pattern': 'modules/**',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing/marionette',
             'patterns': [
-                'client/**',
+                'driver/**',
                 'harness/**',
                 'puppeteer/**',
                 'mach_test_package_commands.py',
             ],
             'dest': 'marionette',
             'ignore': [
-                'client/docs',
+                'driver/docs',
                 'harness/marionette_harness/tests',
                 'puppeteer/firefox/docs',
             ],
         },
         {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [

--- a/testing/config/marionette_requirements.txt
+++ b/testing/config/marionette_requirements.txt
@@ -1,9 +1,9 @@
 -r mozbase_requirements.txt
 
 ../tools/wptserve
-../marionette/client
+../marionette/driver
 ../marionette/harness/marionette_harness/runner/mixins/browsermob-proxy-py
 ../marionette/harness
 
 # Allows to use the Puppeteer page object model for Firefox
 ../marionette/puppeteer/firefox/

--- a/testing/config/telemetry_tests_requirements.txt
+++ b/testing/config/telemetry_tests_requirements.txt
@@ -1,9 +1,6 @@
--r mozbase_requirements.txt
-
-../marionette/client/
-../marionette/harness/
+-r marionette_requirements.txt
 
 # Allows to use the Puppeteer page object model for Firefox
 ../marionette/puppeteer/firefox/
 
 ../../toolkit/components/telemetry/tests/marionette/harness
\ No newline at end of file

rename from testing/marionette/client/.flake8
rename to testing/marionette/driver/.flake8

rename from testing/marionette/client/MANIFEST.in
rename to testing/marionette/driver/MANIFEST.in

rename from testing/marionette/client/docs/Makefile
rename to testing/marionette/driver/docs/Makefile

rename from testing/marionette/client/docs/advanced/actions.rst
rename to testing/marionette/driver/docs/advanced/actions.rst

rename from testing/marionette/client/docs/advanced/debug.rst
rename to testing/marionette/driver/docs/advanced/debug.rst

rename from testing/marionette/client/docs/advanced/findelement.rst
rename to testing/marionette/driver/docs/advanced/findelement.rst

rename from testing/marionette/client/docs/advanced/landing.rst
rename to testing/marionette/driver/docs/advanced/landing.rst

rename from testing/marionette/client/docs/advanced/stale.rst
rename to testing/marionette/driver/docs/advanced/stale.rst

rename from testing/marionette/client/docs/basics.rst
rename to testing/marionette/driver/docs/basics.rst

rename from testing/marionette/client/docs/conf.py
rename to testing/marionette/driver/docs/conf.py

rename from testing/marionette/client/docs/index.rst
rename to testing/marionette/driver/docs/index.rst

rename from testing/marionette/client/docs/interactive.rst
rename to testing/marionette/driver/docs/interactive.rst

rename from testing/marionette/client/docs/make.bat
rename to testing/marionette/driver/docs/make.bat

rename from testing/marionette/client/docs/reference.rst
rename to testing/marionette/driver/docs/reference.rst

rename from testing/marionette/client/marionette_driver/__init__.py
rename to testing/marionette/driver/marionette_driver/__init__.py

rename from testing/marionette/client/marionette_driver/addons.py
rename to testing/marionette/driver/marionette_driver/addons.py

rename from testing/marionette/client/marionette_driver/by.py
rename to testing/marionette/driver/marionette_driver/by.py

rename from testing/marionette/client/marionette_driver/date_time_value.py
rename to testing/marionette/driver/marionette_driver/date_time_value.py

rename from testing/marionette/client/marionette_driver/decorators.py
rename to testing/marionette/driver/marionette_driver/decorators.py

rename from testing/marionette/client/marionette_driver/errors.py
rename to testing/marionette/driver/marionette_driver/errors.py

rename from testing/marionette/client/marionette_driver/expected.py
rename to testing/marionette/driver/marionette_driver/expected.py

rename from testing/marionette/client/marionette_driver/geckoinstance.py
rename to testing/marionette/driver/marionette_driver/geckoinstance.py

rename from testing/marionette/client/marionette_driver/gestures.py
rename to testing/marionette/driver/marionette_driver/gestures.py

rename from testing/marionette/client/marionette_driver/keys.py
rename to testing/marionette/driver/marionette_driver/keys.py

rename from testing/marionette/client/marionette_driver/localization.py
rename to testing/marionette/driver/marionette_driver/localization.py

rename from testing/marionette/client/marionette_driver/marionette.py
rename to testing/marionette/driver/marionette_driver/marionette.py

rename from testing/marionette/client/marionette_driver/selection.py
rename to testing/marionette/driver/marionette_driver/selection.py

rename from testing/marionette/client/marionette_driver/timeout.py
rename to testing/marionette/driver/marionette_driver/timeout.py

rename from testing/marionette/client/marionette_driver/transport.py
rename to testing/marionette/driver/marionette_driver/transport.py

rename from testing/marionette/client/marionette_driver/wait.py
rename to testing/marionette/driver/marionette_driver/wait.py

rename from testing/marionette/client/requirements.txt
rename to testing/marionette/driver/requirements.txt

rename from testing/marionette/client/setup.py
rename to testing/marionette/driver/setup.py