diff --git a/src/SelectQuery.php b/src/SelectBuilder.php
similarity index 90%
rename from src/SelectQuery.php
rename to src/SelectBuilder.php
index 7dd96c4..342048a 100644
--- a/src/SelectQuery.php
+++ b/src/SelectBuilder.php
@@ -1,7 +1,7 @@
 <?php
 namespace Gt\SqlBuilder;
 
-abstract class SelectQuery extends SqlQuery {
+abstract class SelectBuilder extends SqlBuilder {
 	public function __toString():string {
 		return $this->processClauseList([
 			self::PRE_QUERY_COMMENT => $this->preQuery(),
@@ -17,7 +17,7 @@ public function __toString():string {
 		]);
 	}
 
-	/** @return string[]|SqlQuery[] */
+	/** @return string[]|SqlBuilder[] */
 	public function select():array {
 		return [];
 	}
diff --git a/src/SqlQuery.php b/src/SqlBuilder.php
similarity index 98%
rename from src/SqlQuery.php
rename to src/SqlBuilder.php
index 17d4011..1536c7e 100644
--- a/src/SqlQuery.php
+++ b/src/SqlBuilder.php
@@ -4,7 +4,7 @@
 use Gt\SqlBuilder\Condition\AndCondition;
 use Gt\SqlBuilder\Condition\Condition;
 
-abstract class SqlQuery {
+abstract class SqlBuilder {
 	const PRE_QUERY_COMMENT = "/* preQuery */";
 	const POST_QUERY_COMMENT = "/* postQuery */";
 	const WHERE_CLAUSES = ["where", "having"];
diff --git a/test/ExampleSelect.php b/test/ExampleSelect.php
index 0668d70..b8009f4 100644
--- a/test/ExampleSelect.php
+++ b/test/ExampleSelect.php
@@ -1,7 +1,7 @@
 <?php
 namespace Gt\SqlBuilder;
 
-class ExampleSelect extends SelectQuery {
+class ExampleSelect extends SelectBuilder {
 	public function select():array {
 		return [
 			"id",
diff --git a/test/unit/SelectQueryTest.php b/test/unit/SelectBuilderTest.php
similarity index 68%
rename from test/unit/SelectQueryTest.php
rename to test/unit/SelectBuilderTest.php
index f44bfbe..2ba3373 100644
--- a/test/unit/SelectQueryTest.php
+++ b/test/unit/SelectBuilderTest.php
@@ -1,14 +1,14 @@
 <?php
 namespace Gt\SqlBuilder\Test;
 
-use Gt\SqlBuilder\SelectQuery;
+use Gt\SqlBuilder\SelectBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-class SelectQueryTest extends TestCase {
+class SelectBuilderTest extends TestCase {
 	public function testDefaults() {
-		/** @var MockObject|SelectQuery $sut */
-		$sut = self::getMockForAbstractClass(SelectQuery::class);
+		/** @var MockObject|SelectBuilder $sut */
+		$sut = self::getMockForAbstractClass(SelectBuilder::class);
 		self::assertEmpty($sut->select());
 		self::assertEmpty($sut->from());
 		self::assertEmpty($sut->where());
@@ -20,7 +20,7 @@ public function testDefaults() {
 	}
 
 	public function testToStringEmpty() {
-		$sut = self::getMockForAbstractClass(SelectQuery::class);
+		$sut = self::getMockForAbstractClass(SelectBuilder::class);
 		self::assertEmpty((string)$sut);
 	}
 }
\ No newline at end of file
diff --git a/test/unit/SqlQueryTest.php b/test/unit/SqlBuilderTest.php
similarity index 58%
rename from test/unit/SqlQueryTest.php
rename to test/unit/SqlBuilderTest.php
index d9b5c31..53aaf85 100644
--- a/test/unit/SqlQueryTest.php
+++ b/test/unit/SqlBuilderTest.php
@@ -1,14 +1,14 @@
 <?php
 namespace Gt\SqlBuilder\Test;
 
-use Gt\SqlBuilder\SqlQuery;
+use Gt\SqlBuilder\SqlBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-class SqlQueryTest extends TestCase {
+class SqlBuilderTest extends TestCase {
 	public function testDefaults() {
-		/** @var MockObject|SqlQuery $sut */
-		$sut = self::getMockForAbstractClass(SqlQuery::class);
+		/** @var MockObject|SqlBuilder $sut */
+		$sut = self::getMockForAbstractClass(SqlBuilder::class);
 		self::assertEquals("", $sut->preQuery());
 		self::assertEquals("", $sut->postQuery());
 	}