diff --git a/docker/examples/elastic/ES/add_data.sh b/docker/examples/elastic/ES/add_data.sh
index 866e300..9ab41d9 100755
--- a/docker/examples/elastic/ES/add_data.sh
+++ b/docker/examples/elastic/ES/add_data.sh
@@ -42,7 +42,7 @@ until $(curl -sSf -XGET --insecure 'http://localhost:9200/_cluster/health?wait_f
     printf 'No status yellow from ES, trying again in 10 seconds \n'
     sleep 10
 done
-echo "Elastic search seems to be working - Adding ne_110m_populated_places_simple.geojson to ES"
+echo "Elasticsearch seems to be working - Adding ne_110m_populated_places_simple.geojson to ES"
 
 python /load_es_data.py /usr/share/elasticsearch/data/ne_110m_populated_places_simple.geojson
 
diff --git a/docker/examples/elastic/pygeoapi/wait-for-elasticsearch.sh b/docker/examples/elastic/pygeoapi/wait-for-elasticsearch.sh
index b4e4376..06bfce8 100755
--- a/docker/examples/elastic/pygeoapi/wait-for-elasticsearch.sh
+++ b/docker/examples/elastic/pygeoapi/wait-for-elasticsearch.sh
@@ -38,7 +38,7 @@ cmd="$@"
 
 
 until $(curl --output /dev/null --silent --head --fail "$host")  ; do
-    echo 'Checking if Elastic Search server is up'
+    echo 'Checking if Elasticsearch server is up'
     sleep 5
     counter=$((counter+1))
 done
@@ -48,7 +48,7 @@ response=$(curl $host)
 
 until [ "$response" = "200" ]  ; do
     response=$(curl --write-out %{http_code} --silent --output /dev/null "$host")
-    >&2 echo "Elastic Search is up but unavailable - No Reponse - sleeping"
+    >&2 echo "Elasticsearch is up but unavailable - No Reponse - sleeping"
     sleep 10
 
 done
@@ -61,11 +61,11 @@ health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim wh
 until [ "$health" = 'yellow'  ] || [ "$health" = 'green'  ]  ; do
     health="$(curl -fsSL "$host/_cat/health?h=status")"
     health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')"
-    >&2 echo "Elastic Search status is not green or yellow - sleeping"
+    >&2 echo "Elasticsearch status is not green or yellow - sleeping"
     sleep 10
 done
 
->&2 echo "Elastic Search is up"
+>&2 echo "Elasticsearch is up"
 
 
 exec $cmd
diff --git a/docs/source/code.rst b/docs/source/code.rst
index d5bba38..91e8a77 100644
--- a/docs/source/code.rst
+++ b/docs/source/code.rst
@@ -165,8 +165,8 @@ CSV provider
    :members:
    :private-members:
    
-Elastic provider
-^^^^^^^^^^^^^^^^
+Elasticsearch provider
+^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: pygeoapi.provider.elasticsearch_
    :show-inheritance:
@@ -216,4 +216,4 @@ sqlite
 .. automodule:: pygeoapi.provider.sqlite
    :show-inheritance:
    :members:
-   :private-members:
\ No newline at end of file
+   :private-members: