diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
index f9f9722c8d5..1d78be53ac6 100644
--- a/src/Backups/BackupUtils.cpp
+++ b/src/Backups/BackupUtils.cpp
@@ -97,7 +97,7 @@ namespace
                 res.push_back(makeBackupEntryForMetadata(*info.create_query));
                 if (info.has_data)
                 {
-                    auto data_backup = info.storage->backup(context, info.partitions);
+                    auto data_backup = info.storage->backupData(context, info.partitions);
                     if (!data_backup.empty())
                     {
                         String data_path = getDataPathInBackup(*info.create_query);
@@ -129,7 +129,7 @@ namespace
             const auto & database = table_.first;
             const auto & storage = table_.second;
 
-            if (database->hasHollowBackup())
+            if (!database->hasTablesToBackup())
                 throw Exception(
                     ErrorCodes::CANNOT_BACKUP_TABLE,
                     "Cannot backup the {} because it's contained in a hollow database (engine: {})",
@@ -144,7 +144,7 @@ namespace
             /// Make a create query for this table.
             auto create_query = renameInCreateQuery(database->getCreateTableQuery(table_name_.second, context));
 
-            bool has_data = !storage->hasHollowBackup() && !backup_settings.structure_only;
+            bool has_data = storage->hasDataToBackup() && !backup_settings.structure_only;
             if (has_data)
             {
                 /// We check for SELECT privilege only if we're going to read data from the table.
@@ -220,7 +220,7 @@ namespace
             }
 
             /// Backup tables in this database.
-            if (!database_->hasHollowBackup())
+            if (database_->hasTablesToBackup())
             {
                 for (auto it = database_->getTablesIterator(context); it->isValid(); it->next())
                 {
diff --git a/src/Backups/RestoreUtils.cpp b/src/Backups/RestoreUtils.cpp
index a94690ea881..0878fbbf233 100644
--- a/src/Backups/RestoreUtils.cpp
+++ b/src/Backups/RestoreUtils.cpp
@@ -231,7 +231,7 @@ namespace
         {
             if (!hasData())
                 return {};
-            return storage->restoreFromBackup(context, partitions, backup, data_path_in_backup, *restore_settings);
+            return storage->restoreData(context, partitions, backup, data_path_in_backup, *restore_settings);
         }
 
         ContextMutablePtr context;
diff --git a/src/Databases/DatabaseMemory.h b/src/Databases/DatabaseMemory.h
index b854d9be1f3..87fae115b59 100644
--- a/src/Databases/DatabaseMemory.h
+++ b/src/Databases/DatabaseMemory.h
@@ -50,6 +50,9 @@ public:
 
     void alterTable(ContextPtr local_context, const StorageID & table_id, const StorageInMemoryMetadata & metadata) override;
 
+    /// This database can contain tables to backup.
+    bool hasTablesToBackup() const override { return true; }
+
 private:
     String data_path;
     using NameToASTCreate = std::unordered_map<String, ASTPtr>;
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index 982be2024ce..2144f874b03 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -36,6 +36,9 @@ public:
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
+    /// This database can contain tables to backup.
+    bool hasTablesToBackup() const override { return true; }
+
 protected:
     virtual void commitAlterTable(
         const StorageID & table_id,
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 5d2a1289833..51d4b8bb6b1 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -331,7 +331,7 @@ public:
 
     /// Returns true if the backup of the database is hollow, which means it doesn't contain
     /// any tables which can be stored to a backup.
-    virtual bool hasHollowBackup() const { return false; }
+    virtual bool hasTablesToBackup() const { return false; }
 
     virtual ~IDatabase() = default;
 
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index ab27f263b8e..88ddde32d83 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -216,14 +216,14 @@ bool IStorage::isStaticStorage() const
     return false;
 }
 
-BackupEntries IStorage::backup(ContextPtr, const ASTs &)
+BackupEntries IStorage::backupData(ContextPtr, const ASTs &)
 {
     throw Exception("Table engine " + getName() + " doesn't support backups", ErrorCodes::NOT_IMPLEMENTED);
 }
 
-RestoreTaskPtr IStorage::restoreFromBackup(ContextMutablePtr, const ASTs &, const BackupPtr &, const String &, const StorageRestoreSettings &)
+RestoreTaskPtr IStorage::restoreData(ContextMutablePtr, const ASTs &, const BackupPtr &, const String &, const StorageRestoreSettings &)
 {
-    throw Exception("Table engine " + getName() + " doesn't support restoring", ErrorCodes::NOT_IMPLEMENTED);
+    throw Exception("Table engine " + getName() + " doesn't support backups", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 std::string PrewhereInfo::dump() const
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 2bfae021da1..17e9e55455c 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -219,13 +219,13 @@ public:
     NameDependencies getDependentViewsByColumn(ContextPtr context) const;
 
     /// Returns true if the backup is hollow, which means it doesn't contain any data.
-    virtual bool hasHollowBackup() const { return false; }
+    virtual bool hasDataToBackup() const { return false; }
 
     /// Prepares entries to backup data of the storage.
-    virtual BackupEntries backup(ContextPtr context, const ASTs & partitions);
+    virtual BackupEntries backupData(ContextPtr context, const ASTs & partitions);
 
     /// Extract data from the backup and put it to the storage.
-    virtual RestoreTaskPtr restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings);
+    virtual RestoreTaskPtr restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings);
 
     /// Returns whether the column is virtual - by default all columns are real.
     /// Initially reserved virtual column name may be shadowed by real column.
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 8554426b073..f66586b121a 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -3630,7 +3630,7 @@ Pipe MergeTreeData::alterPartition(
 }
 
 
-BackupEntries MergeTreeData::backup(ContextPtr local_context, const ASTs & partitions)
+BackupEntries MergeTreeData::backupData(ContextPtr local_context, const ASTs & partitions)
 {
     DataPartsVector data_parts;
     if (partitions.empty())
@@ -3789,9 +3789,9 @@ private:
 };
 
 
-RestoreTaskPtr MergeTreeData::restoreDataPartsFromBackup(const std::unordered_set<String> & partition_ids,
-                                                         const BackupPtr & backup, const String & data_path_in_backup,
-                                                         SimpleIncrement * increment)
+RestoreTaskPtr MergeTreeData::restoreDataParts(const std::unordered_set<String> & partition_ids,
+                                               const BackupPtr & backup, const String & data_path_in_backup,
+                                               SimpleIncrement * increment)
 {
     return std::make_unique<MergeTreeDataRestoreTask>(
         std::static_pointer_cast<MergeTreeData>(shared_from_this()), backup, data_path_in_backup, partition_ids, increment);
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index fd9427d04fd..fb839e5a0dd 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -674,12 +674,15 @@ public:
         ContextPtr context,
         TableLockHolder & table_lock_holder);
 
+    /// Storage has data to backup.
+    bool hasDataToBackup() const override { return true; }
+
     /// Prepares entries to backup data of the storage.
-    BackupEntries backup(ContextPtr context, const ASTs & partitions) override;
+    BackupEntries backupData(ContextPtr context, const ASTs & partitions) override;
     static BackupEntries backupDataParts(const DataPartsVector & data_parts);
 
     /// Extract data from the backup and put it to the storage.
-    RestoreTaskPtr restoreDataPartsFromBackup(
+    RestoreTaskPtr restoreDataParts(
         const std::unordered_set<String> & partition_ids,
         const BackupPtr & backup,
         const String & data_path_in_backup,
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index f22fa9cdb55..11116780734 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -888,7 +888,7 @@ IStorage::ColumnSizeByName StorageLog::getColumnSizes() const
 }
 
 
-BackupEntries StorageLog::backup(ContextPtr context, const ASTs & partitions)
+BackupEntries StorageLog::backupData(ContextPtr context, const ASTs & partitions)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
@@ -1063,7 +1063,7 @@ private:
     ContextMutablePtr context;
 };
 
-RestoreTaskPtr StorageLog::restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
+RestoreTaskPtr StorageLog::restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index 6767d40583c..b9255c16f2b 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -52,8 +52,9 @@ public:
     bool supportsSubcolumns() const override { return true; }
     ColumnSizeByName getColumnSizes() const override;
 
-    BackupEntries backup(ContextPtr context, const ASTs & partitions) override;
-    RestoreTaskPtr restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
+    bool hasDataToBackup() const override { return true; }
+    BackupEntries backupData(ContextPtr context, const ASTs & partitions) override;
+    RestoreTaskPtr restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
 
 protected:
     /** Attach the table with the appropriate name, along the appropriate path (with / at the end),
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 7b28149342e..2231ee5da1d 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -469,7 +469,7 @@ private:
 };
 
 
-BackupEntries StorageMemory::backup(ContextPtr context, const ASTs & partitions)
+BackupEntries StorageMemory::backupData(ContextPtr context, const ASTs & partitions)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
@@ -552,7 +552,7 @@ private:
 };
 
 
-RestoreTaskPtr StorageMemory::restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
+RestoreTaskPtr StorageMemory::restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index c530cbaa31b..20f47828846 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -66,8 +66,9 @@ public:
 
     void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
-    BackupEntries backup(ContextPtr context, const ASTs & partitions) override;
-    RestoreTaskPtr restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
+    bool hasDataToBackup() const override { return true; }
+    BackupEntries backupData(ContextPtr context, const ASTs & partitions) override;
+    RestoreTaskPtr restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index af4fa1d9b4e..7f4c3deca37 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -1644,9 +1644,9 @@ CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_
 }
 
 
-RestoreTaskPtr StorageMergeTree::restoreFromBackup(ContextMutablePtr local_context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
+RestoreTaskPtr StorageMergeTree::restoreData(ContextMutablePtr local_context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
 {
-    return restoreDataPartsFromBackup(getPartitionIDsFromQuery(partitions, local_context), backup, data_path_in_backup, &increment);
+    return restoreDataParts(getPartitionIDsFromQuery(partitions, local_context), backup, data_path_in_backup, &increment);
 }
 
 
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 6acd19f73eb..a1fc310d912 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -97,7 +97,7 @@ public:
 
     CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
-    RestoreTaskPtr restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
+    RestoreTaskPtr restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
 
     bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 5c6af9fadc1..274789f012b 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -491,7 +491,7 @@ void StorageStripeLog::saveFileSizes(const WriteLock & /* already locked for wri
 }
 
 
-BackupEntries StorageStripeLog::backup(ContextPtr context, const ASTs & partitions)
+BackupEntries StorageStripeLog::backupData(ContextPtr context, const ASTs & partitions)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
@@ -637,7 +637,7 @@ private:
 };
 
 
-RestoreTaskPtr StorageStripeLog::restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
+RestoreTaskPtr StorageStripeLog::restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings &)
 {
     if (!partitions.empty())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Table engine {} doesn't support partitions", getName());
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index 9cd9bc2c165..223b662d13c 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -52,8 +52,9 @@ public:
 
     void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder&) override;
 
-    BackupEntries backup(ContextPtr context, const ASTs & partitions) override;
-    RestoreTaskPtr restoreFromBackup(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
+    bool hasDataToBackup() const override { return true; }
+    BackupEntries backupData(ContextPtr context, const ASTs & partitions) override;
+    RestoreTaskPtr restoreData(ContextMutablePtr context, const ASTs & partitions, const BackupPtr & backup, const String & data_path_in_backup, const StorageRestoreSettings & restore_settings) override;
 
 protected:
     StorageStripeLog(