diff --git a/framework/yii/ar/ActiveQuery.php b/framework/yii/ar/ActiveQueryTrait.php
similarity index 99%
rename from framework/yii/ar/ActiveQuery.php
rename to framework/yii/ar/ActiveQueryTrait.php
index 729b7b4..2100076 100644
--- a/framework/yii/ar/ActiveQuery.php
+++ b/framework/yii/ar/ActiveQueryTrait.php
@@ -42,7 +42,7 @@ use yii\db\ActiveRecord;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-trait ActiveQuery
+trait ActiveQueryTrait
 {
 	/**
 	 * @var string the name of the ActiveRecord class.
diff --git a/framework/yii/ar/ActiveRelation.php b/framework/yii/ar/ActiveRelationTrait.php
similarity index 99%
rename from framework/yii/ar/ActiveRelation.php
rename to framework/yii/ar/ActiveRelationTrait.php
index 17bba67..ab80558 100644
--- a/framework/yii/ar/ActiveRelation.php
+++ b/framework/yii/ar/ActiveRelationTrait.php
@@ -25,7 +25,7 @@ use yii\db\ActiveRecord;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-trait ActiveRelation
+trait ActiveRelationTrait
 {
 	/**
 	 * @var boolean whether this relation should populate all query results into AR instances.
diff --git a/framework/yii/db/ActiveQuery.php b/framework/yii/db/ActiveQuery.php
index 5ec3d7a..3b245fe 100644
--- a/framework/yii/db/ActiveQuery.php
+++ b/framework/yii/db/ActiveQuery.php
@@ -46,7 +46,7 @@ namespace yii\db;
  */
 class ActiveQuery extends Query
 {
-	use \yii\ar\ActiveQuery;
+	use \yii\ar\ActiveQueryTrait;
 
 	/**
 	 * @var string the SQL statement to be executed for retrieving AR records.
diff --git a/framework/yii/db/ActiveRelation.php b/framework/yii/db/ActiveRelation.php
index 8ca1baf..72b5667 100644
--- a/framework/yii/db/ActiveRelation.php
+++ b/framework/yii/db/ActiveRelation.php
@@ -28,7 +28,7 @@ namespace yii\db;
  */
 class ActiveRelation extends ActiveQuery
 {
-	use \yii\ar\ActiveRelation;
+	use \yii\ar\ActiveRelationTrait;
 
 	/**
 	 * Specifies the pivot table.
diff --git a/framework/yii/db/Query.php b/framework/yii/db/Query.php
index 73f8860..103cb67 100644
--- a/framework/yii/db/Query.php
+++ b/framework/yii/db/Query.php
@@ -37,7 +37,7 @@ use yii\base\Component;
  */
 class Query extends Component
 {
-	use BaseQuery;
+	use QueryTrait;
 
 	/**
 	 * Sort ascending
diff --git a/framework/yii/db/BaseQuery.php b/framework/yii/db/QueryTrait.php
similarity index 99%
rename from framework/yii/db/BaseQuery.php
rename to framework/yii/db/QueryTrait.php
index 98fcdab..92051ab 100644
--- a/framework/yii/db/BaseQuery.php
+++ b/framework/yii/db/QueryTrait.php
@@ -33,7 +33,7 @@ const SORT_DESC = true;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-trait BaseQuery
+trait QueryTrait
 {
 	/**
 	 * @var string|array query condition. This refers to the WHERE clause in a SQL statement.