diff --git a/test/s3tables/client_methods.go b/test/s3tables/client_methods.go
new file mode 100644
index 000000000..e69de29bb
diff --git a/weed/s3api/s3tables/bucket_create.go b/weed/s3api/s3tables/handler_bucket_create.go
similarity index 100%
rename from weed/s3api/s3tables/bucket_create.go
rename to weed/s3api/s3tables/handler_bucket_create.go
diff --git a/weed/s3api/s3tables/bucket_get_list_delete.go b/weed/s3api/s3tables/handler_bucket_get_list_delete.go
similarity index 100%
rename from weed/s3api/s3tables/bucket_get_list_delete.go
rename to weed/s3api/s3tables/handler_bucket_get_list_delete.go
diff --git a/weed/s3api/s3tables/namespace.go b/weed/s3api/s3tables/handler_namespace.go
similarity index 100%
rename from weed/s3api/s3tables/namespace.go
rename to weed/s3api/s3tables/handler_namespace.go
diff --git a/weed/s3api/s3tables/policy.go b/weed/s3api/s3tables/handler_policy.go
similarity index 100%
rename from weed/s3api/s3tables/policy.go
rename to weed/s3api/s3tables/handler_policy.go
diff --git a/weed/s3api/s3tables/table.go b/weed/s3api/s3tables/handler_table.go
similarity index 100%
rename from weed/s3api/s3tables/table.go
rename to weed/s3api/s3tables/handler_table.go