diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c011eb0..9d66ae64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
             database_type: mysql
             database_image: "mariadb:11.2"
             coverage: false
-            experimental: false
+            experimental: true
 
     env:
       MW_VERSION: ${{ matrix.mediawiki_version }}
diff --git a/includes/Filter.php b/includes/Filter.php
index f0b18a83..296408cf 100644
--- a/includes/Filter.php
+++ b/includes/Filter.php
@@ -5,9 +5,9 @@
 use MediaWiki\MediaWikiServices;
 use SD\Sql\PropertyTypeDbInfo;
 use SD\Sql\SqlProvider;
-use SMWDIProperty;
+use SMW\DIProperty;
+use SMW\DIWikiPage;
 use SMWDIUri;
-use SMWDIWikiPage;
 
 /**
  * Defines a class, Filter, that holds the information in a filter.
@@ -349,11 +349,11 @@ private function getPropertyType() {
 
 		$store = smwfGetStore();
 		$escapedProperty = $this->escapedProperty();
-		$propPage = new SMWDIWikiPage( $escapedProperty, SMW_NS_PROPERTY, '' );
-		$types = $store->getPropertyValues( $propPage, new SMWDIProperty( '_TYPE' ) );
+		$propPage = new DIWikiPage( $escapedProperty, SMW_NS_PROPERTY, '' );
+		$types = $store->getPropertyValues( $propPage, new DIProperty( '_TYPE' ) );
 		$datatypeLabels = smwfContLang()->getDatatypeLabels();
 		if ( count( $types ) > 0 ) {
-			if ( $types[0] instanceof SMWDIWikiPage ) {
+			if ( $types[0] instanceof DIWikiPage ) {
 				$typeValue = $types[0]->getDBkey();
 			} elseif ( $types[0] instanceof SMWDIURI ) {
 				// A bit inefficient, but it's the
diff --git a/includes/Specials/BrowseData/SemanticResultPrinter.php b/includes/Specials/BrowseData/SemanticResultPrinter.php
index 68bb219a..4207af4b 100644
--- a/includes/Specials/BrowseData/SemanticResultPrinter.php
+++ b/includes/Specials/BrowseData/SemanticResultPrinter.php
@@ -3,9 +3,9 @@
 namespace SD\Specials\BrowseData;
 
 use Closure;
+use SMW\DIWikiPage;
 use SMW\Query\PrintRequest;
 use SMW\Query\QueryResult;
-use SMWDIWikiPage;
 use SMWQuery;
 use SMWQueryProcessor;
 
@@ -57,7 +57,7 @@ private static function createGetSmwQueryResult( $res, $num ) {
 		$store = smwfGetStore();
 		while ( ( $num === null || $count < $num ) && $row = $res->fetchObject() ) {
 			$count++;
-			$qr[] = new SMWDIWikiPage( $row->t, $row->ns, '' );
+			$qr[] = new DIWikiPage( $row->t, $row->ns, '' );
 			if ( method_exists( $store, 'cacheSMWPageID' ) ) {
 				$store->cacheSMWPageID( $row->id, $row->t, $row->ns, $row->iw, '' );
 			}