diff --git a/src/lib/FieldType/RichText/RichTextStorage/Gateway/DoctrineStorage.php b/src/lib/FieldType/RichText/RichTextStorage/Gateway/DoctrineStorage.php
index ae707e84..1062015f 100644
--- a/src/lib/FieldType/RichText/RichTextStorage/Gateway/DoctrineStorage.php
+++ b/src/lib/FieldType/RichText/RichTextStorage/Gateway/DoctrineStorage.php
@@ -10,6 +10,7 @@
 
 use Doctrine\DBAL\Connection;
 use Ibexa\Core\FieldType\Url\UrlStorage\Gateway as UrlGateway;
+use Ibexa\Core\Persistence\Legacy\Content\Gateway as ContentGateway;
 use Ibexa\FieldTypeRichText\FieldType\RichText\RichTextStorage\Gateway;
 
 class DoctrineStorage extends Gateway
@@ -42,7 +43,7 @@ public function getContentIds(array $remoteIds): array
                     $this->connection->quoteIdentifier('id'),
                     $this->connection->quoteIdentifier('remote_id')
                 )
-                ->from('ezcontentobject')
+                ->from(ContentGateway::CONTENT_ITEM_TABLE)
                 ->where($query->expr()->in('remote_id', ':remoteIds'))
                 ->setParameter('remoteIds', $remoteIds, Connection::PARAM_STR_ARRAY)
             ;
diff --git a/src/lib/Persistence/Legacy/MigrateRichTextNamespaces/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/MigrateRichTextNamespaces/Gateway/DoctrineDatabase.php
index c0822a18..b9f528d8 100644
--- a/src/lib/Persistence/Legacy/MigrateRichTextNamespaces/Gateway/DoctrineDatabase.php
+++ b/src/lib/Persistence/Legacy/MigrateRichTextNamespaces/Gateway/DoctrineDatabase.php
@@ -10,13 +10,13 @@
 
 use Doctrine\DBAL\Connection;
 use Ibexa\Contracts\FieldTypeRichText\Persistence\Legacy\MigrateRichTextNamespaces\AbstractGateway;
+use Ibexa\Core\Persistence\Legacy\Content\Gateway;
 
 /**
  * @internal
  */
 final class DoctrineDatabase extends AbstractGateway
 {
-    private const TABLE_CONTENT_ATTRIBUTE = 'ezcontentobject_attribute';
     private const COLUMN_DATA_TEXT = 'data_text';
     private const FIELD_TYPE_IDENTIFIER = 'ezrichtext';
 
@@ -31,7 +31,7 @@ public function migrate(array $values): int
     {
         $queryBuilder = $this->connection->createQueryBuilder();
         $queryBuilder
-            ->update(self::TABLE_CONTENT_ATTRIBUTE)
+            ->update(Gateway::CONTENT_FIELD_TABLE)
             ->set(
                 self::COLUMN_DATA_TEXT,
                 $this->addReplaceStatement($queryBuilder, self::COLUMN_DATA_TEXT, $values)
diff --git a/tests/integration/Repository/RichTextFieldTypeIntegrationTest.php b/tests/integration/Repository/RichTextFieldTypeIntegrationTest.php
index add96a50..323b7a3b 100644
--- a/tests/integration/Repository/RichTextFieldTypeIntegrationTest.php
+++ b/tests/integration/Repository/RichTextFieldTypeIntegrationTest.php
@@ -756,7 +756,7 @@ private function getUrlIdsForContentObjectAttributeIdAndVersionNo(
             ->select(
                 $connection->quoteIdentifier('url_id')
             )
-            ->from('ezurl_object_link')
+            ->from(DoctrineDatabase::URL_LINK_TABLE)
             ->where('contentobject_attribute_id = :contentobject_attribute_id')
             ->andWhere('contentobject_attribute_version = :contentobject_attribute_version')
             ->setParameter('contentobject_attribute_version', $versionNo, ParameterType::INTEGER)
diff --git a/tests/lib/FieldType/RichText/Gateway/_fixtures/contentobjects.php b/tests/lib/FieldType/RichText/Gateway/_fixtures/contentobjects.php
index e8e0f32c..7785d93e 100644
--- a/tests/lib/FieldType/RichText/Gateway/_fixtures/contentobjects.php
+++ b/tests/lib/FieldType/RichText/Gateway/_fixtures/contentobjects.php
@@ -6,8 +6,10 @@
  */
 declare(strict_types=1);
 
+use Ibexa\Core\Persistence\Legacy\Content\Gateway;
+
 return [
-    'ezcontentobject' => [
+    Gateway::CONTENT_ITEM_TABLE => [
         0 => [
             'contentclass_id' => '3',
             'current_version' => '1',