diff --git a/Tests/Integration/EntryQueriesGeneratorsTest.php b/Tests/Integration/EntryQueriesGeneratorsTest.php
index 1fb31c04eaaa75ea19bf28cec1fb67a1d1e32d32..ffcafbc6f2d8da43a8afcc07b98e3f52afb8b829 100644
--- a/Tests/Integration/EntryQueriesGeneratorsTest.php
+++ b/Tests/Integration/EntryQueriesGeneratorsTest.php
@@ -4,7 +4,7 @@
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\CreatesSelectQueries;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 use calderawp\CalderaFormsQuery\Tests\Traits\CanCreateEntryWithEmailField;
diff --git a/Tests/Integration/EntryQueriesTest.php b/Tests/Integration/EntryQueriesTest.php
index d17ef6ff74ed4b388c7df204084cff6f712096bc..1931b7ab802d97e9f8b787ba57d096e38f186421 100644
--- a/Tests/Integration/EntryQueriesTest.php
+++ b/Tests/Integration/EntryQueriesTest.php
@@ -4,7 +4,7 @@
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\Tests\Traits\CanCreateEntryWithEmailField;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use calderawp\CalderaFormsQuery\Tests\Traits\UsersMockFormAsDBForm;
@@ -26,7 +26,7 @@ class EntryQueriesTest extends IntegrationTestCase
 	/**
 	 * Test that getResults method runs queries against WordPress correctly
 	 *
-	 * @covers SelectsCreatesSelect::getResults()
+	 * @covers SelectQueries::getResults()
 	 */
 	public function testGetResultsCanDoSQL(){
 		$details = $this->create_entry( $this->mock_form );
@@ -44,7 +44,7 @@ class EntryQueriesTest extends IntegrationTestCase
 	/**
 	 * Test that we can run queries and the environment can update DB
 	 *
-	 * @covers SelectsCreatesSelect::getResults()
+	 * @covers SelectQueries::getResults()
 	 */
 	public function testCanQuery()
 	{
diff --git a/Tests/Integration/IntegrationTestCase.php b/Tests/Integration/IntegrationTestCase.php
index 3d0a4d7fb545738742035522462c3ce21a486265..4e7621e3c47de2a6b3331f2eb1abbe58c5942002 100755
--- a/Tests/Integration/IntegrationTestCase.php
+++ b/Tests/Integration/IntegrationTestCase.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use calderawp\CalderaFormsQuery\Tests\Traits\UsersMockFormAsDBForm;
 
@@ -57,12 +57,12 @@ abstract class IntegrationTestCase extends \WP_UnitTestCase
 	}
 
 	/**
-	 * @return SelectsCreatesSelect
+	 * @return SelectQueries
 	 */
 	protected function entryQueriesFactory()
 	{
 
-		return new SelectsCreatesSelect(
+		return new SelectQueries(
 			$this->entryGeneratorFactory(),
 			$this->entryValuesGeneratorFactory(),
 			$this->getWPDB()
diff --git a/Tests/Integration/TestsTest.php b/Tests/Integration/TestsTest.php
index 6abb0d7c597a53472d18adda3ef1da0adf306890..d4ecd31d3cfa38e18087ed6e0900c38edab6228e 100644
--- a/Tests/Integration/TestsTest.php
+++ b/Tests/Integration/TestsTest.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 
@@ -45,7 +45,7 @@ class TestsTest extends IntegrationTestCase
 	 */
 	public function testFactory()
 	{
-		$this->assertTrue(is_a($this->entryQueriesFactory(), SelectsCreatesSelect::class));
+		$this->assertTrue(is_a($this->entryQueriesFactory(), SelectQueries::class));
 		$this->assertTrue(is_a($this->entryValuesGeneratorFactory(), EntryValues::class));
 		$this->assertTrue(is_a($this->entryGeneratorFactory(), Entry::class));
 
diff --git a/Tests/Traits/HasFactories.php b/Tests/Traits/HasFactories.php
index 5a2f7a59d9fb8a31a2b6c9d6538ab3a3273df313..7c517ed51b43889c8aa6fab5cab9cc11aa48bbdf 100644
--- a/Tests/Traits/HasFactories.php
+++ b/Tests/Traits/HasFactories.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Traits;
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 
 trait HasFactories
 {
@@ -64,12 +64,12 @@ trait HasFactories
 
 
 	/**
-	 * @return SelectsCreatesSelect
+	 * @return SelectQueries
 	 */
 	protected function entryQueriesFactory()
 	{
 
-		return new SelectsCreatesSelect(
+		return new SelectQueries(
 			$this->entryGeneratorFactory(),
 			$this->entryValuesGeneratorFactory(),
 			$this->getWPDB()
diff --git a/Tests/Unit/EntryQueriesTest.php b/Tests/Unit/EntryQueriesTest.php
index 414619e645d667d138e06d728f57721d720ef354..c7f9b5a9c3974372ce3825a456a5114e38405974 100644
--- a/Tests/Unit/EntryQueriesTest.php
+++ b/Tests/Unit/EntryQueriesTest.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 use calderawp\CalderaFormsQuery\Select\SelectQueryBuilder;
@@ -14,8 +14,8 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test getting entry SQL generator
 	 *
-	 * @covers SelectsCreatesSelect::getEntryGenerator()
-	 * @covers SelectsCreatesSelect::$entryGenerator
+	 * @covers SelectQueries::getEntryGenerator()
+	 * @covers SelectQueries::$entryGenerator
 	 */
 	public function testGetEntryGenerator()
 	{
@@ -26,8 +26,8 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test getting entry values SQL generator
 	 *
-	 * @covers SelectsCreatesSelect::getEntryValueGenerator()
-	 * @covers SelectsCreatesSelect::$entryValueGenerator
+	 * @covers SelectQueries::getEntryValueGenerator()
+	 * @covers SelectQueries::$entryValueGenerator
 	 */
 	public function testGetEntryValueGenerator()
 	{
@@ -38,7 +38,7 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test that getResults method returns an array
 	 *
-	 * @covers SelectsCreatesSelect::getResults()
+	 * @covers SelectQueries::getResults()
 	 */
 	public function testGetResults()
 	{
diff --git a/Tests/Unit/TestCase.php b/Tests/Unit/TestCase.php
index 6f7a68deb5f0fa823075f28d4f14eed83e306d26..3040fb6ca1d74bd22a38b12d20d36e9d8d9505b0 100755
--- a/Tests/Unit/TestCase.php
+++ b/Tests/Unit/TestCase.php
@@ -5,7 +5,7 @@ namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
 //Import PHP unit test case.
 //Must be aliased to avoid having two classes of same name in scope.
-use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\SelectQueries;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use PHPUnit\Framework\TestCase as FrameworkTestCase;
 
diff --git a/src/SelectsCreatesSelect.php b/src/SelectQueries.php
similarity index 95%
rename from src/SelectsCreatesSelect.php
rename to src/SelectQueries.php
index 8a67dd8d2b15b6175bfdc46964c65a23ba7be925..a64a0cb324319d8a76efd368399095a812cc9319 100644
--- a/src/SelectsCreatesSelect.php
+++ b/src/SelectQueries.php
@@ -7,11 +7,11 @@ use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 
 /**
- * Class EntryQueries
+ * Class SelectQueries
  *
- * Used to query entry data, using SQL created by genrators
+ * Used to query entry data, using SQL created by generators
  */
-class SelectsCreatesSelect implements CreatesSelectQueries
+class SelectQueries implements CreatesSelectQueries
 {
 	/**
 	 * SQL generator for entry table