diff --git a/changes.txt b/changes.txt
index be1e483c9f..4cfe0e5d1c 100755
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,9 @@
 CHANGES
 
+2014-04-27
+- Fix missing use in TermsStats->setOrder()
+- Replace all instances of ElasticSearch with Elasticsearch
+
 2014-04-24
 - Fixing the Bool filter with Bool filter children bug #594
 
diff --git a/lib/Elastica/Exception/Connection/HttpException.php b/lib/Elastica/Exception/Connection/HttpException.php
index f05b5d491d..2a36fe48d6 100644
--- a/lib/Elastica/Exception/Connection/HttpException.php
+++ b/lib/Elastica/Exception/Connection/HttpException.php
@@ -63,7 +63,7 @@ public function getErrorMessage($error)
                 $error = "Couldn't resolve host";
                 break;
             case CURLE_COULDNT_CONNECT:
-                $error = "Couldn't connect to host, ElasticSearch down?";
+                $error = "Couldn't connect to host, Elasticsearch down?";
                 break;
             case 28:
                 $error = "Operation timed out";
diff --git a/lib/Elastica/Facet/AbstractFacet.php b/lib/Elastica/Facet/AbstractFacet.php
index 2ba6b3c506..25cee8128a 100644
--- a/lib/Elastica/Facet/AbstractFacet.php
+++ b/lib/Elastica/Facet/AbstractFacet.php
@@ -80,7 +80,7 @@ public function setFilter(AbstractFilter $filter)
     /**
      * Sets the flag to either run the facet globally or bound to the
      * current search query. When not set, it defaults to the
-     * ElasticSearch default value.
+     * Elasticsearch default value.
      *
      * @param  bool                         $global Flag to either run the facet globally.
      * @return \Elastica\Facet\AbstractFacet
diff --git a/lib/Elastica/Facet/Terms.php b/lib/Elastica/Facet/Terms.php
index 2ecb609e06..c1dab80077 100644
--- a/lib/Elastica/Facet/Terms.php
+++ b/lib/Elastica/Facet/Terms.php
@@ -18,7 +18,7 @@ class Terms extends AbstractFacet
 {
     /**
      * Holds the types of ordering which are allowed
-     * by ElasticSearch.
+     * by Elasticsearch.
      *
      * @var array
      */
@@ -75,7 +75,7 @@ public function setAllTerms($allTerms)
     }
 
     /**
-     * Sets the ordering type for this facet. ElasticSearch
+     * Sets the ordering type for this facet. Elasticsearch
      * internal default is count.
      *
      * @param  string                              $type The order type to set use for sorting of the terms.
diff --git a/lib/Elastica/Facet/TermsStats.php b/lib/Elastica/Facet/TermsStats.php
index da8e3a6012..61c6b39e1e 100644
--- a/lib/Elastica/Facet/TermsStats.php
+++ b/lib/Elastica/Facet/TermsStats.php
@@ -2,6 +2,8 @@
 
 namespace Elastica\Facet;
 
+use Elastica\Exception\InvalidException;
+
 /**
  * Implements the statistical facet on a per term basis.
  *
@@ -15,7 +17,7 @@ class TermsStats extends AbstractFacet
 
     /**
      * Holds the types of ordering which are allowed
-     * by ElasticSearch.
+     * by Elasticsearch.
      *
      * @var array
      */
@@ -46,7 +48,7 @@ public function setValueScript( $valueScript )
     }
 
     /**
-     * Sets the ordering type for this facet. ElasticSearch
+     * Sets the ordering type for this facet. Elasticsearch
      * internal default is count.
      *
      * @param  string                              $type The order type to set use for sorting of the terms.
diff --git a/lib/Elastica/Query/Builder.php b/lib/Elastica/Query/Builder.php
index 65a616caae..927f2853db 100644
--- a/lib/Elastica/Query/Builder.php
+++ b/lib/Elastica/Query/Builder.php
@@ -285,7 +285,7 @@ public function explain($value = true)
      * In the simple case, a facet can return facet counts for various facet
      * values for a specific field.
      *
-     * ElasticSearch supports more advanced facet implementations, such as
+     * Elasticsearch supports more advanced facet implementations, such as
      * statistical or date histogram facets.
      *
      * @return \Elastica\Query\Builder
diff --git a/test/lib/Elastica/Test/Query/MultiMatchTest.php b/test/lib/Elastica/Test/Query/MultiMatchTest.php
index 97a5b179d7..78a8a8febc 100644
--- a/test/lib/Elastica/Test/Query/MultiMatchTest.php
+++ b/test/lib/Elastica/Test/Query/MultiMatchTest.php
@@ -77,7 +77,7 @@ public function testFuzzy()
 
     public function testFuzzyWithOptions1()
     {
-        // Here ElasticSearch will not accept mispells
+        // Here Elasticsearch will not accept mispells
         // on the first 6 letters.
         $this->multiMatch->setQuery('Tritsan'); // Mispell on purpose
         $this->multiMatch->setFields(array('full_name', 'name'));