diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
index 7bf30859f87e..1e7b4dbed6be 100644
--- a/doc/users/screenshots.rst
+++ b/doc/users/screenshots.rst
@@ -43,7 +43,7 @@ Path demo
 You can add arbitrary paths in matplotlib using the
 :mod:`matplotlib.path` module:
 
-.. plot:: mpl_examples/shapes_and_collections/path_patch_demo.py
+.. plot:: mpl_examples/shapes_and_collections/plot_path_patch.py
 
 .. _screenshots_mplot3d_surface:
 
diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/plot_artist_reference.py
similarity index 100%
rename from examples/shapes_and_collections/artist_reference.py
rename to examples/shapes_and_collections/plot_artist_reference.py
diff --git a/examples/shapes_and_collections/path_patch_demo.py b/examples/shapes_and_collections/plot_path_patch.py
similarity index 89%
rename from examples/shapes_and_collections/path_patch_demo.py
rename to examples/shapes_and_collections/plot_path_patch.py
index 6017aa7bc937..dc07c2a5b004 100644
--- a/examples/shapes_and_collections/path_patch_demo.py
+++ b/examples/shapes_and_collections/plot_path_patch.py
@@ -2,6 +2,9 @@
 ================
 PathPatch object
 ================
+
+This example shows how to create `Path`\s and `PathPatch` objects through
+Matplotlib's API.
 """
 import matplotlib.path as mpath
 import matplotlib.patches as mpatches
diff --git a/examples/shapes_and_collections/scatter_demo.py b/examples/shapes_and_collections/plot_scatter.py
similarity index 100%
rename from examples/shapes_and_collections/scatter_demo.py
rename to examples/shapes_and_collections/plot_scatter.py
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
index 2db82217acc4..c7497d8997c4 100644
--- a/lib/matplotlib/axes/_axes.py
+++ b/lib/matplotlib/axes/_axes.py
@@ -3914,7 +3914,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         Examples
         --------
-        .. plot:: mpl_examples/shapes_and_collections/scatter_demo.py
+        .. plot:: mpl_examples/shapes_and_collections/plot_scatter.py
 
         """