diff --git a/extensions/aliases.php b/extensions/aliases.php
index ff60603..e3f1330 100644
--- a/extensions/aliases.php
+++ b/extensions/aliases.php
@@ -1,4 +1,8 @@
 <?php
 
-class_alias('Kirby\Kql\Kql', 'Kql');
-class_alias('Kirby\Kql\Interceptor', 'Kirby\Kql\Interceptors\Interceptor');
+class_alias(\Kirby\Kql\Kql::class, 'Kql');
+class_alias(\Kirby\Kql\Interceptor::class, 'Kirby\Kql\Interceptors\Interceptor');
+
+// Provide backwards compatibility for Kirby 3 core classes
+class_alias(\Kirby\Kql\Interceptors\Content\Content::class, 'Kirby\Kql\Interceptors\Cms\Content');
+class_alias(\Kirby\Kql\Interceptors\Content\Field::class, 'Kirby\Kql\Interceptors\Cms\Field');
diff --git a/src/Kql/Interceptors/Cms/Content.php b/src/Kql/Interceptors/Content/Content.php
similarity index 93%
rename from src/Kql/Interceptors/Cms/Content.php
rename to src/Kql/Interceptors/Content/Content.php
index 86ff6e0..e1e75e4 100644
--- a/src/Kql/Interceptors/Cms/Content.php
+++ b/src/Kql/Interceptors/Content/Content.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Kql\Interceptors\Cms;
+namespace Kirby\Kql\Interceptors\Content;
 
 use Kirby\Kql\Interceptor;
 
diff --git a/src/Kql/Interceptors/Cms/Field.php b/src/Kql/Interceptors/Content/Field.php
similarity index 95%
rename from src/Kql/Interceptors/Cms/Field.php
rename to src/Kql/Interceptors/Content/Field.php
index e0e8dce..05c589e 100644
--- a/src/Kql/Interceptors/Cms/Field.php
+++ b/src/Kql/Interceptors/Content/Field.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kirby\Kql\Interceptors\Cms;
+namespace Kirby\Kql\Interceptors\Content;
 
 use Kirby\Kql\Interceptor;