diff --git a/docs/re-useable-fragments.md b/docs/re-useable-fragments.md
index 8a506f0..7f2e4f5 100644
--- a/docs/re-useable-fragments.md
+++ b/docs/re-useable-fragments.md
@@ -12,7 +12,7 @@ for easy manipulation.
 
 ```php
 use ElasticSearcher\Abstracts\AbstractQuery;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 
 class MoviesYouMightLikeQuery extends AbstractQuery
 {
@@ -24,7 +24,7 @@ class MoviesYouMightLikeQuery extends AbstractQuery
       'query' => array(
         'bool' => array(
           'filter' => array(
-            new TermFilter('status', 'active')
+            new TermQuery('status', 'active')
           )
         )
       )
@@ -72,8 +72,8 @@ root. You can do this by setting the `mergeWithParent` property on a fragment to
 ```php
 $body = [
 	'and' => [
-		new TermFilter('status', 'active'),
-		new TermFilter('published', true),
+		new TermQuery('status', 'active'),
+		new TermQuery('published', true),
 	]
 ];
 
diff --git a/src/Fragments/Filters/TermFilter.php b/src/Fragments/Queries/TermQuery.php
similarity index 50%
rename from src/Fragments/Filters/TermFilter.php
rename to src/Fragments/Queries/TermQuery.php
index 303a459..629df55 100644
--- a/src/Fragments/Filters/TermFilter.php
+++ b/src/Fragments/Queries/TermQuery.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace ElasticSearcher\Fragments\Filters;
+namespace ElasticSearcher\Fragments\Queries;
 
 use ElasticSearcher\Abstracts\AbstractFragment;
 
 /**
- * Simple term filter.
+ * Simple term query.
  *
- * @see     http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
- * @package ElasticSearcher\Fragments\Filters
+ * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
+ * @package ElasticSearcher\Fragments\Queries
  */
-class TermFilter extends AbstractFragment
+class TermQuery extends AbstractFragment
 {
 	/**
 	 * @param string $field
diff --git a/src/Fragments/Filters/TermsFilter.php b/src/Fragments/Queries/TermsQuery.php
similarity index 50%
rename from src/Fragments/Filters/TermsFilter.php
rename to src/Fragments/Queries/TermsQuery.php
index 53e1976..a94ff09 100644
--- a/src/Fragments/Filters/TermsFilter.php
+++ b/src/Fragments/Queries/TermsQuery.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace ElasticSearcher\Fragments\Filters;
+namespace ElasticSearcher\Fragments\Queries;
 
 use ElasticSearcher\Abstracts\AbstractFragment;
 
 /**
- * Simple terms filter.
+ * Simple terms query.
  *
- * @see     http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
- * @package ElasticSearcher\Fragments\Filters
+ * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html
+ * @package ElasticSearcher\Fragments\Queries
  */
-class TermsFilter extends AbstractFragment
+class TermsQuery extends AbstractFragment
 {
 	/**
 	 * @param string $field
diff --git a/tests/Fragments/Filters/TermFilterTest.php b/tests/Fragments/Filters/TermFilterTest.php
deleted file mode 100644
index 97d67e9..0000000
--- a/tests/Fragments/Filters/TermFilterTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use ElasticSearcher\Fragments\Filters\TermFilter;
-
-class TermFilterTest extends PHPUnit_Framework_TestCase
-{
-	public function testBody()
-	{
-		$term = new TermFilter('name', 'elasticsearch');
-
-		$this->assertEquals(['term' => ['name' => 'elasticsearch']], $term->getBody());
-	}
-}
diff --git a/tests/Fragments/Filters/TermsFilterTest.php b/tests/Fragments/Filters/TermsFilterTest.php
deleted file mode 100644
index ee559aa..0000000
--- a/tests/Fragments/Filters/TermsFilterTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use ElasticSearcher\Fragments\Filters\TermsFilter;
-
-class TermsFilterTest extends PHPUnit_Framework_TestCase
-{
-	public function testBody()
-	{
-		$term = new TermsFilter('name', ['elasticsearch', 'github']);
-
-		$this->assertEquals(['terms' => ['name' => ['elasticsearch', 'github']]], $term->getBody());
-	}
-}
diff --git a/tests/Fragments/Queries/TermQueryTest.php b/tests/Fragments/Queries/TermQueryTest.php
new file mode 100644
index 0000000..9f30557
--- /dev/null
+++ b/tests/Fragments/Queries/TermQueryTest.php
@@ -0,0 +1,13 @@
+<?php
+
+use ElasticSearcher\Fragments\Queries\TermQuery;
+
+class TermQueryTest extends PHPUnit_Framework_TestCase
+{
+	public function testBody()
+	{
+		$term = new TermQuery('name', 'elasticsearch');
+
+		$this->assertEquals(['term' => ['name' => 'elasticsearch']], $term->getBody());
+	}
+}
diff --git a/tests/Fragments/Queries/TermsQueryTest.php b/tests/Fragments/Queries/TermsQueryTest.php
new file mode 100644
index 0000000..4463b5b
--- /dev/null
+++ b/tests/Fragments/Queries/TermsQueryTest.php
@@ -0,0 +1,13 @@
+<?php
+
+use ElasticSearcher\Fragments\Queries\TermsQuery;
+
+class TermsQueryTest extends PHPUnit_Framework_TestCase
+{
+	public function testBody()
+	{
+		$term = new TermsQuery('name', ['elasticsearch', 'github']);
+
+		$this->assertEquals(['terms' => ['name' => ['elasticsearch', 'github']]], $term->getBody());
+	}
+}
diff --git a/tests/Parsers/FragmentParserTest.php b/tests/Parsers/FragmentParserTest.php
index 59664c9..76903de 100644
--- a/tests/Parsers/FragmentParserTest.php
+++ b/tests/Parsers/FragmentParserTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use ElasticSearcher\Parsers\FragmentParser;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 use ElasticSearcher\Fragments\Analyzers\StandardAnalyzer;
 
 class FragmentParserTest extends ElasticSearcherTestCase
@@ -11,7 +11,7 @@ public function testParsingRootLevel()
 		$parser = new FragmentParser();
 
 		$body = [
-			'query' => new TermFilter('name', 'John'),
+			'query' => new TermQuery('name', 'John'),
 		];
 		$expectedBody = [
 			'query' => [
@@ -32,8 +32,8 @@ public function testParsingChildLevel()
 			'query' => [
 				'bool' => [
 					'and' => [
-						new TermFilter('name', 'John'),
-						new TermFilter('category', 'authors'),
+						new TermQuery('name', 'John'),
+						new TermQuery('category', 'authors'),
 					]
 				]
 			]
@@ -68,7 +68,7 @@ public function testParsingNestedFragments()
 			'query' => [
 				'bool' => [
 					'and' => [
-						new TermFilter('name', new TermFilter('category', 'authors')),
+						new TermQuery('name', new TermQuery('category', 'authors')),
 					]
 				]
 			]
diff --git a/tests/dummy/Fragments/Filters/IDFilter.php b/tests/dummy/Fragments/Filters/IDFilter.php
index 85d98e8..bccd7cd 100644
--- a/tests/dummy/Fragments/Filters/IDFilter.php
+++ b/tests/dummy/Fragments/Filters/IDFilter.php
@@ -1,7 +1,7 @@
 <?php
 
 use ElasticSearcher\Abstracts\AbstractFragment;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 
 class IDFilter extends AbstractFragment
 {
@@ -20,6 +20,6 @@ public function __construct($id)
 
 	public function getBody()
 	{
-		return new TermFilter('id', $this->id);
+		return new TermQuery('id', $this->id);
 	}
 }
diff --git a/tests/dummy/Queries/CountMoviesFrom2014Query.php b/tests/dummy/Queries/CountMoviesFrom2014Query.php
index bc3db4a..e2988d9 100644
--- a/tests/dummy/Queries/CountMoviesFrom2014Query.php
+++ b/tests/dummy/Queries/CountMoviesFrom2014Query.php
@@ -1,7 +1,7 @@
 <?php
 
 use ElasticSearcher\Abstracts\AbstractQuery;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 
 class CountMoviesFrom2014Query extends AbstractQuery
 {
@@ -9,7 +9,7 @@ public function setup()
 	{
 		$this->searchIn('movies', 'movies');
 
-		$this->set('query.bool.filter', [new TermFilter('year', 2014)]);
+		$this->set('query.bool.filter', [new TermQuery('year', 2014)]);
 
 		$this->setSearchType('count');
 	}
diff --git a/tests/dummy/Queries/MoviesFrom2014Query.php b/tests/dummy/Queries/MoviesFrom2014Query.php
index e8ed2ab..cd85ac7 100644
--- a/tests/dummy/Queries/MoviesFrom2014Query.php
+++ b/tests/dummy/Queries/MoviesFrom2014Query.php
@@ -1,7 +1,7 @@
 <?php
 
 use ElasticSearcher\Abstracts\AbstractQuery;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 
 class MoviesFrom2014Query extends AbstractQuery
 {
@@ -9,6 +9,6 @@ public function setup()
 	{
 		$this->searchIn('movies', 'movies');
 
-		$this->set('query.bool.filter', [new TermFilter('year', 2014)]);
+		$this->set('query.bool.filter', [new TermQuery('year', 2014)]);
 	}
 }
diff --git a/tests/dummy/Queries/MoviesFromXYearQuery.php b/tests/dummy/Queries/MoviesFromXYearQuery.php
index 5178ff5..5366fc3 100644
--- a/tests/dummy/Queries/MoviesFromXYearQuery.php
+++ b/tests/dummy/Queries/MoviesFromXYearQuery.php
@@ -1,7 +1,7 @@
 <?php
 
 use ElasticSearcher\Abstracts\AbstractQuery;
-use ElasticSearcher\Fragments\Filters\TermFilter;
+use ElasticSearcher\Fragments\Queries\TermQuery;
 
 class MoviesFromXYearQuery extends AbstractQuery
 {
@@ -26,7 +26,7 @@ public function parseYear()
 	{
 		$year = $this->getData('year');
 		if ($year) {
-			return new TermFilter('year', $year);
+			return new TermQuery('year', $year);
 		}
 	}
 }