diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index a482ab35d78..a42cb25f6f0 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -368,7 +368,7 @@ function run_tests
         01666_blns
 
         # Depends on AWS
-        01801_s3_distributed
+        01801_s3_cluster
     )
 
     (time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"
diff --git a/src/Storages/StorageS3Distributed.cpp b/src/Storages/StorageS3Cluster.cpp
similarity index 100%
rename from src/Storages/StorageS3Distributed.cpp
rename to src/Storages/StorageS3Cluster.cpp
diff --git a/src/Storages/StorageS3Distributed.h b/src/Storages/StorageS3Cluster.h
similarity index 100%
rename from src/Storages/StorageS3Distributed.h
rename to src/Storages/StorageS3Cluster.h
diff --git a/src/TableFunctions/TableFunctionS3Distributed.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
similarity index 100%
rename from src/TableFunctions/TableFunctionS3Distributed.cpp
rename to src/TableFunctions/TableFunctionS3Cluster.cpp
diff --git a/src/TableFunctions/TableFunctionS3Distributed.h b/src/TableFunctions/TableFunctionS3Cluster.h
similarity index 100%
rename from src/TableFunctions/TableFunctionS3Distributed.h
rename to src/TableFunctions/TableFunctionS3Cluster.h
diff --git a/tests/integration/test_s3_distributed/__init__.py b/tests/integration/test_s3_cluster/__init__.py
similarity index 100%
rename from tests/integration/test_s3_distributed/__init__.py
rename to tests/integration/test_s3_cluster/__init__.py
diff --git a/tests/integration/test_s3_distributed/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
similarity index 100%
rename from tests/integration/test_s3_distributed/configs/cluster.xml
rename to tests/integration/test_s3_cluster/configs/cluster.xml
diff --git a/tests/integration/test_s3_distributed/data/clickhouse/part1.csv b/tests/integration/test_s3_cluster/data/clickhouse/part1.csv
similarity index 100%
rename from tests/integration/test_s3_distributed/data/clickhouse/part1.csv
rename to tests/integration/test_s3_cluster/data/clickhouse/part1.csv
diff --git a/tests/integration/test_s3_distributed/data/clickhouse/part123.csv b/tests/integration/test_s3_cluster/data/clickhouse/part123.csv
similarity index 100%
rename from tests/integration/test_s3_distributed/data/clickhouse/part123.csv
rename to tests/integration/test_s3_cluster/data/clickhouse/part123.csv
diff --git a/tests/integration/test_s3_distributed/data/database/part2.csv b/tests/integration/test_s3_cluster/data/database/part2.csv
similarity index 100%
rename from tests/integration/test_s3_distributed/data/database/part2.csv
rename to tests/integration/test_s3_cluster/data/database/part2.csv
diff --git a/tests/integration/test_s3_distributed/data/database/partition675.csv b/tests/integration/test_s3_cluster/data/database/partition675.csv
similarity index 100%
rename from tests/integration/test_s3_distributed/data/database/partition675.csv
rename to tests/integration/test_s3_cluster/data/database/partition675.csv
diff --git a/tests/integration/test_s3_distributed/test.py b/tests/integration/test_s3_cluster/test.py
similarity index 95%
rename from tests/integration/test_s3_distributed/test.py
rename to tests/integration/test_s3_cluster/test.py
index 671d611fca4..f60e6e6862f 100644
--- a/tests/integration/test_s3_distributed/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -48,7 +48,7 @@ def test_select_all(started_cluster):
     ORDER BY (name, value, polygon)""")
     # print(pure_s3)
     s3_distibuted = node.query("""
-    SELECT * from s3Distributed(
+    SELECT * from s3Cluster(
         'cluster_simple', 
         'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)""")
@@ -66,7 +66,7 @@ def test_count(started_cluster):
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
     # print(pure_s3)
     s3_distibuted = node.query("""
-    SELECT count(*) from s3Distributed(
+    SELECT count(*) from s3Cluster(
         'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
@@ -96,12 +96,12 @@ def test_union_all(started_cluster):
     s3_distibuted = node.query("""
     SELECT * FROM
     (
-        SELECT * from s3Distributed(
+        SELECT * from s3Cluster(
             'cluster_simple', 
             'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
         UNION ALL
-        SELECT * from s3Distributed(
+        SELECT * from s3Cluster(
             'cluster_simple', 
             'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
@@ -116,12 +116,12 @@ def test_union_all(started_cluster):
 def test_wrong_cluster(started_cluster):
     node = started_cluster.instances['s0_0_0']
     error = node.query_and_get_error("""
-    SELECT count(*) from s3Distributed(
+    SELECT count(*) from s3Cluster(
         'non_existent_cluster',
         'http://minio1:9001/root/data/{clickhouse,database}/*', 
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     UNION ALL
-    SELECT count(*) from s3Distributed(
+    SELECT count(*) from s3Cluster(
         'non_existent_cluster',
         'http://minio1:9001/root/data/{clickhouse,database}/*', 
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
diff --git a/tests/queries/0_stateless/01801_s3_distributed.reference b/tests/queries/0_stateless/01801_s3_cluster.reference
similarity index 100%
rename from tests/queries/0_stateless/01801_s3_distributed.reference
rename to tests/queries/0_stateless/01801_s3_cluster.reference
diff --git a/tests/queries/0_stateless/01801_s3_distributed.sh b/tests/queries/0_stateless/01801_s3_cluster.sh
similarity index 70%
rename from tests/queries/0_stateless/01801_s3_distributed.sh
rename to tests/queries/0_stateless/01801_s3_cluster.sh
index 05710a21214..215d5500be5 100755
--- a/tests/queries/0_stateless/01801_s3_distributed.sh
+++ b/tests/queries/0_stateless/01801_s3_cluster.sh
@@ -9,4 +9,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 ${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3('https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
-${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3Distributed('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
+${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3Cluster('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"