diff --git a/src/Auth/Protect/Tags.php b/src/Auth/Protect/Tags.php
index 09a49b3bda..3fd17a270a 100644
--- a/src/Auth/Protect/Tags.php
+++ b/src/Auth/Protect/Tags.php
@@ -3,12 +3,12 @@
 namespace Statamic\Auth\Protect;
 
 use Illuminate\Support\ViewErrorBag;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags as BaseTags;
-use Statamic\Tags\Traits\RendersForms;
 
 class Tags extends BaseTags
 {
-    use RendersForms;
+    use Concerns\RendersForms;
 
     protected static $handle = 'protect';
 
diff --git a/src/Auth/UserTags.php b/src/Auth/UserTags.php
index 86f1de45a9..8a128faeea 100644
--- a/src/Auth/UserTags.php
+++ b/src/Auth/UserTags.php
@@ -9,11 +9,11 @@
 use Statamic\Fields\Field;
 use Statamic\Support\Arr;
 use Statamic\Tags\Tags;
-use Statamic\Tags\Traits\RendersForms;
+use Statamic\Tags\Concerns;
 
 class UserTags extends Tags
 {
-    use RendersForms;
+    use Concerns\RendersForms;
 
     protected static $handle = 'user';
 
diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index a508b8f4c7..f4bad20219 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -7,13 +7,13 @@
 use Illuminate\Support\Facades\Crypt;
 use Statamic\Facades\Form;
 use Statamic\Facades\URL;
-use Statamic\Tags\OutputsItems;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags as BaseTags;
-use Statamic\Tags\Traits\RendersForms;
 
 class Tags extends BaseTags
 {
-    use OutputsItems, RendersForms;
+    use Concerns\OutputsItems,
+        Concerns\RendersForms;
 
     const HANDLE_PARAM = ['handle', 'is', 'in', 'form', 'formset'];
 
diff --git a/src/Http/Controllers/API/ApiController.php b/src/Http/Controllers/API/ApiController.php
index 8d3b46471b..1e4cb5fdf9 100644
--- a/src/Http/Controllers/API/ApiController.php
+++ b/src/Http/Controllers/API/ApiController.php
@@ -6,11 +6,11 @@
 use Statamic\Http\Controllers\Controller;
 use Statamic\Statamic;
 use Statamic\Support\Str;
-use Statamic\Tags\Query\HasConditions;
+use Statamic\Tags\Concerns\QueriesConditions;
 
 class ApiController extends Controller
 {
-    use HasConditions;
+    use QueriesConditions;
 
     /**
      * @var \Illuminate\Http\Request
diff --git a/src/Search/Tags.php b/src/Search/Tags.php
index 163578bf16..001dedb50f 100644
--- a/src/Search/Tags.php
+++ b/src/Search/Tags.php
@@ -3,12 +3,12 @@
 namespace Statamic\Search;
 
 use Statamic\Facades\Search;
-use Statamic\Tags\OutputsItems;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags as BaseTags;
 
 class Tags extends BaseTags
 {
-    use OutputsItems;
+    use Concerns\OutputsItems;
 
     protected static $handle = 'search';
 
diff --git a/src/Tags/Collection/Collection.php b/src/Tags/Collection/Collection.php
index 669cea56fa..f14486c6fe 100644
--- a/src/Tags/Collection/Collection.php
+++ b/src/Tags/Collection/Collection.php
@@ -2,15 +2,15 @@
 
 namespace Statamic\Tags\Collection;
 
-use Statamic\Facades\URL;
+use Statamic\Entries\EntryCollection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\URL;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags;
-use Statamic\Tags\OutputsItems;
-use Statamic\Entries\EntryCollection;
 
 class Collection extends Tags
 {
-    use OutputsItems;
+    use Concerns\OutputsItems;
 
     protected $defaultAsKey = 'entries';
 
diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index fa78d65068..e6e1649239 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -10,14 +10,14 @@
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
 use Statamic\Support\Str;
-use Statamic\Tags\Query;
+use Statamic\Tags\Concerns;
 
 class Entries
 {
-    use Query\HasConditions,
-        Query\HasScopes,
-        Query\HasOrderBys,
-        Query\GetsResults;
+    use Concerns\QueriesConditions,
+        Concerns\QueriesScopes,
+        Concerns\QueriesOrderBys,
+        Concerns\GetsQueryResults;
 
     protected $ignoredParams = ['as'];
     protected $parameters;
diff --git a/src/Tags/Taxonomy/Taxonomy.php b/src/Tags/Taxonomy/Taxonomy.php
index 3f90e56c0e..d32ceb26cc 100644
--- a/src/Tags/Taxonomy/Taxonomy.php
+++ b/src/Tags/Taxonomy/Taxonomy.php
@@ -4,12 +4,12 @@
 
 use Statamic\Facades\Site;
 use Statamic\Support\Arr;
-use Statamic\Tags\OutputsItems;
+use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags;
 
 class Taxonomy extends Tags
 {
-    use OutputsItems;
+    use Concerns\OutputsItems;
 
     protected $defaultAsKey = 'terms';
 
diff --git a/src/Tags/Taxonomy/Terms.php b/src/Tags/Taxonomy/Terms.php
index 96d71cfe4e..68dbfaa39c 100644
--- a/src/Tags/Taxonomy/Terms.php
+++ b/src/Tags/Taxonomy/Terms.php
@@ -3,22 +3,22 @@
 namespace Statamic\Tags\Taxonomy;
 
 use Closure;
+use Illuminate\Support\Carbon;
 use Statamic\Facades;
-use Statamic\Support\Arr;
+use Statamic\Facades\Collection;
 use Statamic\Facades\Site;
-use Statamic\Facades\Term;
-use Statamic\Tags\Query;
 use Statamic\Facades\Taxonomy;
-use Statamic\Facades\Collection;
-use Illuminate\Support\Carbon;
+use Statamic\Facades\Term;
+use Statamic\Support\Arr;
+use Statamic\Tags\Concerns;
 use Statamic\Taxonomies\TermCollection;
 
 class Terms
 {
-    use Query\HasConditions,
-        Query\HasScopes,
-        Query\HasOrderBys,
-        Query\GetsResults;
+    use Concerns\QueriesConditions,
+        Concerns\QueriesScopes,
+        Concerns\QueriesOrderBys,
+        Concerns\GetsQueryResults;
 
     protected $ignoredParams = ['as'];
     protected $parameters;
diff --git a/src/Tags/Users.php b/src/Tags/Users.php
index ad7795497f..befdd98378 100644
--- a/src/Tags/Users.php
+++ b/src/Tags/Users.php
@@ -4,15 +4,15 @@
 
 use Statamic\Facades\User;
 use Statamic\Facades\UserGroup;
-use Statamic\Tags\Query;
+use Statamic\Tags\Concerns;
 
 class Users extends Tags
 {
-    use Query\HasConditions,
-        Query\HasScopes,
-        Query\HasOrderBys,
-        Query\GetsResults,
-        OutputsItems;
+    use Concerns\QueriesConditions,
+        Concerns\QueriesScopes,
+        Concerns\QueriesOrderBys,
+        Concerns\GetsQueryResults,
+        Concerns\OutputsItems;
 
     /**
      * {{ get_content from="" }} ... {{ /get_content }}