diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt
index da6990801d30e..f8552b84ffe4e 100644
--- a/tools/base/requirements.txt
+++ b/tools/base/requirements.txt
@@ -7,43 +7,45 @@
 abstracts==0.0.12 \
     --hash=sha256:acc01ff56c8a05fb88150dff62e295f9071fc33388c42f1dfc2787a8d1c755ff
     # via
-    #   aio.functional
-    #   envoy.abstract.command
-    #   envoy.base.utils
-    #   envoy.code-format.python-check
-    #   envoy.dependency.pip-check
-    #   envoy.github.abstract
-    #   envoy.github.release
-aio.functional==0.0.9 \
+    #   aio-functional
+    #   envoy-abstract-command
+    #   envoy-base-utils
+    #   envoy-code-format-python-check
+    #   envoy-dependency-pip-check
+    #   envoy-github-abstract
+    #   envoy-github-release
+aio-functional==0.0.9 \
     --hash=sha256:824a997a394ad891bc9f403426babc13c9d0d1f4d1708c38e77d6aecae1cab1d
     # via
     #   -r requirements.in
-    #   aio.tasks
-    #   envoy.github.abstract
-    #   envoy.github.release
-aio.stream==0.0.2 \
+    #   aio-tasks
+    #   envoy-github-abstract
+    #   envoy-github-release
+aio-stream==0.0.2 \
     --hash=sha256:6f5baaff48f6319db134cd56c06ccf89db1f7c5f67a26382e081efc96f2f675d
-    # via envoy.github.release
-aio.subprocess==0.0.4 \
+    # via envoy-github-release
+aio-subprocess==0.0.4 \
     --hash=sha256:fd504a7c02423c40fde19ad87b62932b9eaa091f5a22d26b89b452059a728750
-    # via envoy.code-format.python-check
-aio.tasks==0.0.4 \
+    # via
+    #   -r requirements.in
+    #   envoy-code-format-python-check
+aio-tasks==0.0.4 \
     --hash=sha256:9abd4b0881edb292c4f91a2f63b1dea7a9829a4bd4e8440225a1a412a90461fc
     # via
-    #   envoy.code-format.python-check
-    # via -r tools/base/requirements.in
-    #   envoy.github.abstract
-    #   envoy.github.release
+    #   -r requirements.in
+    #   envoy-code-format-python-check
+    #   envoy-github-abstract
+    #   envoy-github-release
 aiodocker==0.21.0 \
     --hash=sha256:1f2e6db6377195962bb676d4822f6e3a0c525e1b5d60b8ebbab68230bff3d227 \
     --hash=sha256:6fe00135bb7dc40a407669d3157ecdfd856f3737d939df54f40a479d40cf7bdc
     # via
-    #   envoy.distribution.distrotest
-    #   envoy.docker.utils
+    #   envoy-distribution-distrotest
+    #   envoy-docker-utils
 aiofiles==0.7.0 \
     --hash=sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4 \
     --hash=sha256:c67a6823b5f23fcab0a2595a289cec7d8c863ffcb4322fb8cd6b90400aedfdbc
-    # via aio.stream
+    # via aio-stream
 aiohttp==3.7.4.post0 \
     --hash=sha256:02f46fc0e3c5ac58b80d4d56eb0a7c7d97fcef69ace9326289fb9f1955e65cfe \
     --hash=sha256:0563c1b3826945eecd62186f3f5c7d31abb7391fedc893b7e2b26303b5a9f3fe \
@@ -83,10 +85,10 @@ aiohttp==3.7.4.post0 \
     --hash=sha256:f881853d2643a29e643609da57b96d5f9c9b93f62429dcc1cbb413c7d07f0e1a \
     --hash=sha256:fe60131d21b31fd1a14bd43e6bb88256f69dfc3188b3a89d736d6c71ed43ec95
     # via
-    #   aio.stream
+    #   aio-stream
     #   aiodocker
-    #   envoy.github.abstract
-    #   envoy.github.release
+    #   envoy-github-abstract
+    #   envoy-github-release
     #   slackclient
 alabaster==0.7.12 \
     --hash=sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359 \
@@ -172,13 +174,13 @@ colorama==0.4.4 \
     --hash=sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2
     # via
     #   -r requirements.in
-    #   envoy.docs.sphinx-runner
+    #   envoy-docs-sphinx-runner
 coloredlogs==15.0.1 \
     --hash=sha256:612ee75c546f53e92e70049c9dbfcc18c935a2b9a53b66085ce9ef6a6e5c0934 \
     --hash=sha256:7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0
     # via
     #   -r requirements.in
-    #   envoy.base.runner
+    #   envoy-base-runner
 coverage==5.5 \
     --hash=sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c \
     --hash=sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6 \
@@ -262,101 +264,102 @@ docutils==0.16 \
     --hash=sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af \
     --hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
     # via
-    #   envoy.docs.sphinx-runner
+    #   envoy-docs-sphinx-runner
     #   sphinx
     #   sphinx-rtd-theme
     #   sphinx-tabs
-envoy.abstract.command==0.0.3 \
+envoy-abstract-command==0.0.3 \
     --hash=sha256:4b7b15c91bea1f2eb7c2e8e35f95cd9437e1c8f151adc093bf7858fc85d48221
     # via
-    #   envoy.base.runner
-    #   envoy.distribution.release
-envoy.base.checker==0.0.2 \
+    #   envoy-base-runner
+    #   envoy-distribution-release
+envoy-base-checker==0.0.2 \
     --hash=sha256:2ac81efa20fd01fff644ff7dc7fadeac1c3e4dbb6210881ac7a7919ec0e048d8
     # via
-    #   envoy.code-format.python-check
-    #   envoy.dependency.pip-check
-    #   envoy.distribution.distrotest
-    #   envoy.distribution.verify
-envoy.base.runner==0.0.4 \
+    #   -r requirements.in
+    #   envoy-code-format-python-check
+    #   envoy-dependency-pip-check
+    #   envoy-distribution-distrotest
+    #   envoy-distribution-verify
+envoy-base-runner==0.0.4 \
     --hash=sha256:4eeb2b661f1f0c402df4425852be554a8a83ef5d338bfae69ddcb9b90755379e
     # via
-    #   -r tools/base/requirements.in
-    #   envoy.base.checker
-    #   envoy.distribution.release
-    #   envoy.docs.sphinx-runner
-    #   envoy.github.abstract
-    #   envoy.gpg.sign
-envoy.base.utils==0.0.8 \
+    #   -r requirements.in
+    #   envoy-base-checker
+    #   envoy-distribution-release
+    #   envoy-docs-sphinx-runner
+    #   envoy-github-abstract
+    #   envoy-gpg-sign
+envoy-base-utils==0.0.8 \
     --hash=sha256:b82e18ab0535207b7136d6980239c9350f7113fa5da7dda781bcb6ad1e05b3ab
     # via
     #   -r requirements.in
-    #   envoy.code-format.python-check
-    #   envoy.dependency.pip-check
-    #   envoy.distribution.distrotest
-    #   envoy.docs.sphinx-runner
-    #   envoy.github.release
-    #   envoy.gpg.sign
-envoy.code-format.python-check==0.0.4 \
+    #   envoy-code-format-python-check
+    #   envoy-dependency-pip-check
+    #   envoy-distribution-distrotest
+    #   envoy-docs-sphinx-runner
+    #   envoy-github-release
+    #   envoy-gpg-sign
+envoy-code-format-python-check==0.0.4 \
     --hash=sha256:5e166102d1f873f0c14640bcef87b46147cbad1cb68888c977acfde7fce96e04
     # via -r requirements.in
-envoy.dependency.pip-check==0.0.4 \
+envoy-dependency-pip-check==0.0.4 \
     --hash=sha256:3213d77959f65c3c97e9b5d74cb14c02bc02dae64bac2e7c3cb829a2f4e5e40e
     # via -r requirements.in
-envoy.distribution.distrotest==0.0.3 \
+envoy-distribution-distrotest==0.0.3 \
     --hash=sha256:c094adbd959eb1336f93afc00aedb7ee4e68e8252e2365be816a6f9ede8a3de7
-    # via envoy.distribution.verify
-envoy.distribution.release==0.0.4 \
+    # via envoy-distribution-verify
+envoy-distribution-release==0.0.4 \
     --hash=sha256:41037e0488f0593ce5173739fe0cd1b45a4775f5a47738b85d9d04024ca241a2
     # via -r requirements.in
-envoy.distribution.verify==0.0.2 \
+envoy-distribution-verify==0.0.2 \
     --hash=sha256:ae59134085de50203edf51c243dbf3301cbe5550db29f0ec6f9ea1c3b82fee1c
     # via -r requirements.in
-envoy.docker.utils==0.0.2 \
+envoy-docker-utils==0.0.2 \
     --hash=sha256:a12cb57f0b6e204d646cbf94f927b3a8f5a27ed15f60d0576176584ec16a4b76
-    # via envoy.distribution.distrotest
-envoy.docs.sphinx-runner==0.0.3 \
+    # via envoy-distribution-distrotest
+envoy-docs-sphinx-runner==0.0.3 \
     --hash=sha256:6da14a524cb1ede4c3d3f07c3bf2659405e8fe9191af9041979046c54b0ed35f \
     --hash=sha256:b497c0ed9756e91a9b5f6fbd3bef637b3b5b8597af040c9f89d8a7a414dbecec
     # via -r requirements.in
-envoy.github.abstract==0.0.16 \
+envoy-github-abstract==0.0.16 \
     --hash=sha256:badf04104492fb6b37ba2163f2b225132ed04aba680beb218e7c7d918564f8ee
     # via
-    #   envoy.distribution.release
-    #   envoy.github.release
-envoy.github.release==0.0.8 \
+    #   envoy-distribution-release
+    #   envoy-github-release
+envoy-github-release==0.0.8 \
     --hash=sha256:fbc4354030137eb565b8c4d679965e4ef60b01de0c09310441836e592ca0cd19
-    # via envoy.distribution.release
-envoy.gpg.identity==0.0.2 \
+    # via envoy-distribution-release
+envoy-gpg-identity==0.0.2 \
     --hash=sha256:7d32ff9133e00b9974b4dabd2512b4872b091b8c5069d0112240dcc1a56bc406
-    # via envoy.gpg.sign
-envoy.gpg.sign==0.0.3 \
+    # via envoy-gpg-sign
+envoy-gpg-sign==0.0.3 \
     --hash=sha256:31667931f5d7ff05fd809b89748f277511486311c777652af4cb8889bd641049
     # via -r requirements.in
-flake8-polyfill==1.0.2 \
-    --hash=sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9 \
-    --hash=sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda
-    # via pep8-naming
 flake8==3.9.2 \
     --hash=sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b \
     --hash=sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907
     # via
     #   -r requirements.in
-    #   envoy.code-format.python-check
+    #   envoy-code-format-python-check
     #   flake8-polyfill
     #   pep8-naming
+flake8-polyfill==1.0.2 \
+    --hash=sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9 \
+    --hash=sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda
+    # via pep8-naming
 frozendict==2.0.6 \
     --hash=sha256:3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1 \
     --hash=sha256:5d3f75832c35d4df041f0e19c268964cbef29c1eb34cd3517cf883f1c2d089b9
     # via
     #   -r requirements.in
-    #   envoy.base.runner
+    #   envoy-base-runner
 gidgethub==5.0.1 \
     --hash=sha256:3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682 \
     --hash=sha256:67245e93eb0918b37df038148af675df43b62e832c529d7f859f6b90d9f3e70d
     # via
-    #   envoy.github.abstract
-    #   envoy.github.release
+    #   envoy-github-abstract
+    #   envoy-github-release
 gitdb==4.0.7 \
     --hash=sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0 \
     --hash=sha256:96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005
@@ -494,7 +497,7 @@ packaging==21.0 \
     --hash=sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 \
     --hash=sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14
     # via
-    #   envoy.github.release
+    #   envoy-github-release
     #   pytest
     #   sphinx
 pep8-naming==0.12.1 \
@@ -502,7 +505,7 @@ pep8-naming==0.12.1 \
     --hash=sha256:bb2455947757d162aa4cad55dba4ce029005cd1692f2899a21d51d8630ca7841
     # via
     #   -r requirements.in
-    #   envoy.code-format.python-check
+    #   envoy-code-format-python-check
 pluggy==1.0.0 \
     --hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
     --hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
@@ -566,6 +569,14 @@ pyparsing==2.4.7 \
 pyreadline==2.1 \
     --hash=sha256:4530592fc2e85b25b1a9f79664433da09237c1a270e4d78ea5aa3a2c7229e2d1
     # via -r requirements.in
+pytest==6.2.5 \
+    --hash=sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 \
+    --hash=sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134
+    # via
+    #   -r requirements.in
+    #   pytest-asyncio
+    #   pytest-cov
+    #   pytest-patches
 pytest-asyncio==0.15.1 \
     --hash=sha256:2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f \
     --hash=sha256:3042bcdf1c5d978f6b74d96a151c4cfb9dcece65006198389ccd7e6c60eb1eea
@@ -577,18 +588,10 @@ pytest-cov==2.12.1 \
 pytest-patches==0.0.3 \
     --hash=sha256:6f8cdc8641c708c4812f58ae48d410f373a6fd16cd6cc4dc4d3fb8951df9c92a
     # via -r requirements.in
-pytest==6.2.5 \
-    --hash=sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 \
-    --hash=sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134
-    # via
-    #   -r requirements.in
-    #   pytest-asyncio
-    #   pytest-cov
-    #   pytest-patches
 python-gnupg==0.4.7 \
     --hash=sha256:2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7 \
     --hash=sha256:3ff5b1bf5e397de6e1fe41a7c0f403dad4e242ac92b345f440eaecfb72a7ebae
-    # via envoy.gpg.identity
+    # via envoy-gpg-identity
 pytz==2021.1 \
     --hash=sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da \
     --hash=sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798
@@ -625,7 +628,7 @@ pyyaml==5.4.1 \
     --hash=sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0
     # via
     #   -r requirements.in
-    #   envoy.base.utils
+    #   envoy-base-utils
 requests==2.26.0 \
     --hash=sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24 \
     --hash=sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7
@@ -641,7 +644,7 @@ six==1.16.0 \
 slackclient==2.9.3 \
     --hash=sha256:07ec8fa76f6aa64852210ae235ff9e637ba78124e06c0b07a7eeea4abb955965 \
     --hash=sha256:2d68d668c02f4038299897e5c4723ab85dd40a3548354924b24f333a435856f8
-    # via -r tools/base/requirements.in
+    # via -r requirements.in
 smmap==4.0.0 \
     --hash=sha256:7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182 \
     --hash=sha256:a9a7479e4c572e2e775c404dcd3080c8dc49f39918c2cf74913d30c4c478e3c2
@@ -655,6 +658,7 @@ sphinx==4.2.0 \
     --hash=sha256:98a535c62a4fcfcc362528592f69b26f7caec587d32cd55688db580be0287ae0
     # via
     #   -r requirements.in
+    #   envoy-docs-sphinx-runner
     #   sphinx-copybutton
     #   sphinx-rtd-theme
     #   sphinx-tabs
@@ -663,15 +667,21 @@ sphinx==4.2.0 \
 sphinx-copybutton==0.4.0 \
     --hash=sha256:4340d33c169dac6dd82dce2c83333412aa786a42dd01a81a8decac3b130dc8b0 \
     --hash=sha256:8daed13a87afd5013c3a9af3575cc4d5bec052075ccd3db243f895c07a689386
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   envoy-docs-sphinx-runner
 sphinx-rtd-theme==1.0.0 \
     --hash=sha256:4d35a56f4508cfee4c4fb604373ede6feae2a306731d533f409ef5c3496fdbd8 \
     --hash=sha256:eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   envoy-docs-sphinx-runner
 sphinx-tabs==3.2.0 \
     --hash=sha256:1e1b1846c80137bd81a78e4a69b02664b98b1e1da361beb30600b939dfc75065 \
     --hash=sha256:33137914ed9b276e6a686d7a337310ee77b1dae316fdcbce60476913a152e0a4
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   envoy-docs-sphinx-runner
 sphinxcontrib-applehelp==1.0.2 \
     --hash=sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a \
     --hash=sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58
@@ -689,7 +699,7 @@ sphinxcontrib-httpdomain==1.7.0 \
     --hash=sha256:ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335
     # via
     #   -r requirements.in
-    #   envoy.docs.sphinx-runner
+    #   envoy-docs-sphinx-runner
 sphinxcontrib-jsmath==1.0.1 \
     --hash=sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178 \
     --hash=sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8
@@ -703,14 +713,14 @@ sphinxcontrib-serializinghtml==1.1.5 \
     --hash=sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952
     # via
     #   -r requirements.in
-    #   envoy.docs.sphinx-runner
+    #   envoy-docs-sphinx-runner
     #   sphinx
 sphinxext-rediraffe==0.2.7 \
     --hash=sha256:651dcbfae5ffda9ffd534dfb8025f36120e5efb6ea1a33f5420023862b9f725d \
     --hash=sha256:9e430a52d4403847f4ffb3a8dd6dfc34a9fe43525305131f52ed899743a5fd8c
     # via
     #   -r requirements.in
-    #   envoy.docs.sphinx-runner
+    #   envoy-docs-sphinx-runner
 toml==0.10.2 \
     --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
     --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
@@ -720,7 +730,7 @@ toml==0.10.2 \
 trycast==0.3.0 \
     --hash=sha256:1b7b4c0d4b0d674770a53f34a762e52a6cd6879eb251ab21625602699920080d \
     --hash=sha256:687185b812e8d1c45f2ba841e8de7bdcdee0695dcf3464f206800505d4c65f26
-    # via envoy.base.utils
+    # via envoy-base-utils
 typing-extensions==3.10.0.2 \
     --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \
     --hash=sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7 \
@@ -741,9 +751,9 @@ verboselogs==1.7 \
     --hash=sha256:e33ddedcdfdafcb3a174701150430b11b46ceb64c2a9a26198c76a156568e427
     # via
     #   -r requirements.in
-    #   envoy.base.runner
-    #   envoy.github.abstract
-    #   envoy.github.release
+    #   envoy-base-runner
+    #   envoy-github-abstract
+    #   envoy-github-release
 wrapt==1.12.1 \
     --hash=sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7
     # via deprecated
@@ -752,7 +762,7 @@ yapf==0.31.0 \
     --hash=sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e
     # via
     #   -r requirements.in
-    #   envoy.code-format.python-check
+    #   envoy-code-format-python-check
 yarl==1.6.3 \
     --hash=sha256:00d7ad91b6583602eb9c1d085a2cf281ada267e9a197e8b7cae487dadbfa293e \
     --hash=sha256:0355a701b3998dcd832d0dc47cc5dedf3874f966ac7f870e0f3a6788d802d434 \
@@ -794,9 +804,9 @@ yarl==1.6.3 \
     # via aiohttp
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==58.0.4 \
-    --hash=sha256:69cc739bc2662098a68a9bc575cd974a57969e70c1d58ade89d104ab73d79770 \
-    --hash=sha256:f10059f0152e0b7fb6b2edd77bcb1ecd4c9ed7048a826eb2d79f72fd2e6e237b
+setuptools==67.3.2 \
+    --hash=sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012 \
+    --hash=sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48
     # via
     #   -r requirements.in
     #   sphinx