diff --git a/golden-files/results/pep8-hi3_py b/golden-files/results/pycodestyle-hi3_py
similarity index 100%
rename from golden-files/results/pep8-hi3_py
rename to golden-files/results/pycodestyle-hi3_py
diff --git a/golden-files/results/pep8-hi_py b/golden-files/results/pycodestyle-hi_py
similarity index 100%
rename from golden-files/results/pep8-hi_py
rename to golden-files/results/pycodestyle-hi_py
diff --git a/tools.py b/tools.py
index 616b5b2..095218e 100644
--- a/tools.py
+++ b/tools.py
@@ -375,11 +375,11 @@ def python_profile(path):
 python_profile.dependencies = {"python", "python3"}
 
 
-def pep8(path):
-    cmd = (["pep8"] if _python_version(path) == "python"
-           else ["python3", "-m", "pep8"])
+def pycodestyle(path):
+    cmd = (["pycodestyle"] if _python_version(path) == "python"
+           else ["python3", "-m", "pycodestyle"])
     return _run_command(cmd + [path])
-pep8.dependencies = {"pep8", "python3-pep8"}
+pycodestyle.dependencies = {"pycodestyle", "python3-pycodestyle"}
 
 
 def pyflakes(path):
@@ -706,7 +706,7 @@ def _generic_tools():
 def _tools_for_extension():
     return {
         "py": [python_syntax, python_unittests, pydoc, mypy, python_coverage,
-               python_profile, pep8, pyflakes, pylint, python_gut,
+               python_profile, pycodestyle, pyflakes, pylint, python_gut,
                python_modulefinder, python_mccabe, bandit],
         "pyc": [disassemble_pyc],
         "pl": [perl_syntax, perldoc, perltidy],
diff --git a/tools_test.py b/tools_test.py
index 25a10ad..98790b8 100755
--- a/tools_test.py
+++ b/tools_test.py
@@ -102,8 +102,8 @@ class ToolsTestCase(unittest.TestCase):
 
     # Not testing python_profile, because it is non-deterministic.
 
-    def test_pep8(self):
-        self._test_tool(tools.pep8, self.HI_OK)
+    def test_pycodestyle(self):
+        self._test_tool(tools.pycodestyle, self.HI_OK)
 
     def test_pyflakes(self):
         self._test_tool(tools.pyflakes, self.HI_OK)