diff --git a/weed/s3api/s3api_object_copy_handlers.go b/weed/s3api/s3api_object_handlers_copy.go
similarity index 100%
rename from weed/s3api/s3api_object_copy_handlers.go
rename to weed/s3api/s3api_object_handlers_copy.go
diff --git a/weed/s3api/s3api_object_copy_handlers_test.go b/weed/s3api/s3api_object_handlers_copy_test.go
similarity index 100%
rename from weed/s3api/s3api_object_copy_handlers_test.go
rename to weed/s3api/s3api_object_handlers_copy_test.go
diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_object_handlers_list.go
similarity index 100%
rename from weed/s3api/s3api_objects_list_handlers.go
rename to weed/s3api/s3api_object_handlers_list.go
diff --git a/weed/s3api/s3api_objects_list_handlers_test.go b/weed/s3api/s3api_object_handlers_list_test.go
similarity index 100%
rename from weed/s3api/s3api_objects_list_handlers_test.go
rename to weed/s3api/s3api_object_handlers_list_test.go
diff --git a/weed/s3api/s3api_object_multipart_handlers.go b/weed/s3api/s3api_object_handlers_multipart.go
similarity index 100%
rename from weed/s3api/s3api_object_multipart_handlers.go
rename to weed/s3api/s3api_object_handlers_multipart.go
diff --git a/weed/s3api/s3api_object_skip_handlers.go b/weed/s3api/s3api_object_handlers_skip.go
similarity index 100%
rename from weed/s3api/s3api_object_skip_handlers.go
rename to weed/s3api/s3api_object_handlers_skip.go
diff --git a/weed/s3api/s3api_object_tagging_handlers.go b/weed/s3api/s3api_object_handlers_tagging.go
similarity index 100%
rename from weed/s3api/s3api_object_tagging_handlers.go
rename to weed/s3api/s3api_object_handlers_tagging.go