--- a/taskcluster/docker/lint/Dockerfile
+++ b/taskcluster/docker/lint/Dockerfile
@@ -20,18 +20,18 @@ ADD topsrcdir/taskcluster/docker/recipes
 
 # %include taskcluster/docker/recipes/install-mercurial.sh
 ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /build/install-mercurial.sh
 ADD system-setup.sh /tmp/system-setup.sh
 # %include tools/lint/eslint/manifest.tt
 ADD topsrcdir/tools/lint/eslint/manifest.tt /tmp/eslint.tt
 # %include tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
 ADD topsrcdir/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt /tmp/eslint-plugin-mozilla.tt
-# %include tools/lint/flake8_/flake8_requirements.txt
-ADD topsrcdir/tools/lint/flake8_/flake8_requirements.txt /tmp/flake8_requirements.txt
+# %include tools/lint/python/flake8_requirements.txt
+ADD topsrcdir/tools/lint/python/flake8_requirements.txt /tmp/flake8_requirements.txt
 # %include tools/lint/tox/tox_requirements.txt
 ADD topsrcdir/tools/lint/tox/tox_requirements.txt /tmp/tox_requirements.txt
 RUN bash /tmp/system-setup.sh
 
 # %include taskcluster/docker/recipes/run-task
 ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
 RUN chown -R worker:worker /builds/worker/bin && chmod 755 /builds/worker/bin/*
 

--- a/tools/lint/flake8.yml
+++ b/tools/lint/flake8.yml
@@ -19,9 +19,9 @@ flake8:
         - tools/mercurial
         - tools/tryselect
         - toolkit/components/telemetry
     # Excludes should be added to topsrcdir/.flake8 due to a bug in flake8 where
     # specifying --exclude causes custom configuration files to be ignored.
     exclude: []
     extensions: ['py']
     type: external
-    payload: flake8_:lint
+    payload: python.flake8:lint

rename from tools/lint/flake8_/__init__.py
rename to tools/lint/python/__init__.py

copy from tools/lint/flake8_/__init__.py
copy to tools/lint/python/flake8.py

rename from tools/lint/flake8_/flake8_requirements.txt
rename to tools/lint/python/flake8_requirements.txt