diff --git a/spacy/pipeline/__init__.py b/spacy/pipeline/__init__.py
index 26931606b..4744a989b 100644
--- a/spacy/pipeline/__init__.py
+++ b/spacy/pipeline/__init__.py
@@ -1,9 +1,9 @@
-from .attributeruler import AttributeRuler
+from .attribute_ruler import AttributeRuler
 from .dep_parser import DependencyParser
 from .edit_tree_lemmatizer import EditTreeLemmatizer
 from .entity_linker import EntityLinker
 from .ner import EntityRecognizer
-from .entityruler import EntityRuler
+from .entity_ruler import EntityRuler
 from .lemmatizer import Lemmatizer
 from .morphologizer import Morphologizer
 from .pipe import Pipe
diff --git a/spacy/pipeline/attributeruler.py b/spacy/pipeline/attribute_ruler.py
similarity index 100%
rename from spacy/pipeline/attributeruler.py
rename to spacy/pipeline/attribute_ruler.py
diff --git a/spacy/pipeline/entityruler.py b/spacy/pipeline/entity_ruler.py
similarity index 100%
rename from spacy/pipeline/entityruler.py
rename to spacy/pipeline/entity_ruler.py
diff --git a/website/docs/api/attributeruler.md b/website/docs/api/attributeruler.md
index 965bffbcc..f56e15b29 100644
--- a/website/docs/api/attributeruler.md
+++ b/website/docs/api/attributeruler.md
@@ -1,7 +1,7 @@
 ---
 title: AttributeRuler
 tag: class
-source: spacy/pipeline/attributeruler.py
+source: spacy/pipeline/attribute_ruler.py
 new: 3
 teaser: 'Pipeline component for rule-based token attribute assignment'
 api_string_name: attribute_ruler
@@ -34,7 +34,7 @@ how the component should be configured. You can override its settings via the
 | `validate` | Whether patterns should be validated (passed to the `Matcher`). Defaults to `False`. ~~bool~~ |
 
 ```python
-%%GITHUB_SPACY/spacy/pipeline/attributeruler.py
+%%GITHUB_SPACY/spacy/pipeline/attribute_ruler.py
 ```
 
 ## AttributeRuler.\_\_init\_\_ {#init tag="method"}
diff --git a/website/docs/api/entityruler.md b/website/docs/api/entityruler.md
index c2ba33f01..ef7acbbf1 100644
--- a/website/docs/api/entityruler.md
+++ b/website/docs/api/entityruler.md
@@ -1,7 +1,7 @@
 ---
 title: EntityRuler
 tag: class
-source: spacy/pipeline/entityruler.py
+source: spacy/pipeline/entity_ruler.py
 new: 2.1
 teaser: 'Pipeline component for rule-based named entity recognition'
 api_string_name: entity_ruler
@@ -64,7 +64,7 @@ how the component should be configured. You can override its settings via the
 | `scorer`              | The scoring method. Defaults to [`spacy.scorer.get_ner_prf`](/api/scorer#get_ner_prf). ~~Optional[Callable]~~                                                                                 |
 
 ```python
-%%GITHUB_SPACY/spacy/pipeline/entityruler.py
+%%GITHUB_SPACY/spacy/pipeline/entity_ruler.py
 ```
 
 ## EntityRuler.\_\_init\_\_ {#init tag="method"}
diff --git a/website/docs/usage/saving-loading.md b/website/docs/usage/saving-loading.md
index 0fd713a49..9a4b584a3 100644
--- a/website/docs/usage/saving-loading.md
+++ b/website/docs/usage/saving-loading.md
@@ -195,7 +195,7 @@ the data to and from a JSON file.
 >
 > To see custom serialization methods in action, check out the new
 > [`EntityRuler`](/api/entityruler) component and its
-> [source](%%GITHUB_SPACY/spacy/pipeline/entityruler.py). Patterns added to the
+> [source](%%GITHUB_SPACY/spacy/pipeline/entity_ruler.py). Patterns added to the
 > component will be saved to a `.jsonl` file if the pipeline is serialized to
 > disk, and to a bytestring if the pipeline is serialized to bytes. This allows
 > saving out a pipeline with a rule-based entity recognizer and including all