diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3307c0525..5609ff91e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -26,7 +26,7 @@ body:
         - supabase_auth
         - postgrest
         - realtime_client
-        - storage_client
+        - supabase_storage
         - functions_client
         - yet_another_json_isolate
         - unsure/all/other
@@ -58,10 +58,10 @@ body:
         Output of `flutter doctor -v`, plus the versions of the affected packages.
 
         On Linux/macOS:
-        `dart pub deps | grep -E "supabase|postgrest|storage_client|realtime_client|functions_client"`
+        `dart pub deps | grep -E "supabase|postgrest|realtime_client|functions_client"`
 
         On Windows:
-        `dart pub deps | findstr "supabase postgrest storage_client realtime_client functions_client"`
+        `dart pub deps | findstr "supabase postgrest realtime_client functions_client"`
       render: shell
       placeholder: Flutter, Dart and package versions
     validations:
diff --git a/.github/workflows/label-issues.yml b/.github/workflows/label-issues.yml
index ff32e0499..962f4c2f2 100644
--- a/.github/workflows/label-issues.yml
+++ b/.github/workflows/label-issues.yml
@@ -25,6 +25,7 @@ jobs:
           "auth": "auth",
           "storage": "storage",
           "storage_client": "storage",
+          "supabase_storage": "storage",
           "realtime": "realtime",
           "realtime_client": "realtime",
           "postgrest": "postgrest",
diff --git a/.github/workflows/release-pana.yml b/.github/workflows/release-pana.yml
index 7248398cf..752f0f1c5 100644
--- a/.github/workflows/release-pana.yml
+++ b/.github/workflows/release-pana.yml
@@ -28,11 +28,11 @@ jobs:
           - functions_client
           - postgrest
           - realtime_client
-          - storage_client
           - supabase
           - supabase_auth
           - supabase_common
           - supabase_flutter
+          - supabase_storage
           - supabase_typegen
           - yet_another_json_isolate
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0568bed2f..d7af4dee5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -64,7 +64,7 @@ jobs:
           echo "Affected packages:"
           echo "$CHANGED"
 
-          DART_PACKAGES="functions_client postgrest realtime_client storage_client supabase supabase_auth supabase_common supabase_typegen yet_another_json_isolate"
+          DART_PACKAGES="functions_client postgrest realtime_client supabase supabase_auth supabase_common supabase_storage supabase_typegen yet_another_json_isolate"
 
           entries=()
           for package in $DART_PACKAGES; do
@@ -72,11 +72,11 @@ jobs:
               continue
             fi
             case "$package" in
-              postgrest|realtime_client|storage_client|supabase|supabase_auth) backend=true ;;
+              postgrest|realtime_client|supabase|supabase_auth|supabase_storage) backend=true ;;
               *) backend=false ;;
             esac
             case "$package" in
-              postgrest|realtime_client|storage_client|supabase|supabase_auth) concurrency="1" ;;
+              postgrest|realtime_client|supabase|supabase_auth|supabase_storage) concurrency="1" ;;
               *) concurrency="0" ;;
             esac
             entries+=("{\"name\":\"$package\",\"backend\":$backend,\"concurrency\":\"$concurrency\"}")
@@ -344,7 +344,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
-          carryforward: 'functions_client,postgrest,realtime_client,storage_client,supabase,supabase_auth,supabase_common,supabase_typegen,yet_another_json_isolate,supabase_flutter'
+          carryforward: 'functions_client,postgrest,realtime_client,supabase,supabase_auth,supabase_common,supabase_storage,supabase_typegen,yet_another_json_isolate,supabase_flutter'
           fail-on-error: false
 
   test-result:
diff --git a/AGENTS.md b/AGENTS.md
index e9ef41dfd..af1e7d79f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -15,7 +15,7 @@ The repository follows a layered dependency structure:
 - **supabase_auth**: Authentication client (sessions, JWT, OAuth)
 - **postgrest**: Database query client with ORM-style API
 - **realtime_client**: WebSocket client for real-time subscriptions
-- **storage_client**: File storage client with retry logic
+- **supabase_storage**: File storage client with retry logic
 - **functions_client**: Edge functions invocation client
 - **yet_another_json_isolate**: JSON parsing in separate isolate for performance
 
@@ -52,9 +52,9 @@ melos format
 
 ### Testing
 
-Most packages have unit tests. The `postgrest`, `supabase_auth`, `realtime_client`, and `storage_client` packages run against a local Supabase stack started with the Supabase CLI. This requires Docker and the [Supabase CLI](https://supabase.com/docs/guides/local-development/cli/getting-started) installed.
+Most packages have unit tests. The `postgrest`, `supabase_auth`, `realtime_client`, and `supabase_storage` packages run against a local Supabase stack started with the Supabase CLI. This requires Docker and the [Supabase CLI](https://supabase.com/docs/guides/local-development/cli/getting-started) installed.
 
-**For packages requiring a backend (postgrest, supabase_auth, realtime_client, storage_client):**
+**For packages requiring a backend (postgrest, supabase_auth, realtime_client, supabase_storage):**
 
 ```bash
 # 1. Start the local Supabase stack from the repository root
diff --git a/MIGRATION.md b/MIGRATION.md
index ebb517370..070d8a4ca 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -4,7 +4,7 @@ This document describes the breaking changes you need to be aware of when upgrad
 versions of the Supabase Flutter SDK, together with the steps required to migrate your code.
 
 All packages in this repository are released together for a major version, so a single section
-covers `supabase_flutter`, `supabase`, `supabase_auth`, `postgrest`, `realtime_client`, `storage_client`
+covers `supabase_flutter`, `supabase`, `supabase_auth`, `postgrest`, `realtime_client`, `supabase_storage`
 and `functions_client`. Every symbol mentioned here is re-exported from `supabase_flutter`, so the
 snippets apply whether you depend on the individual package or on the Flutter one.
 
@@ -76,6 +76,38 @@ example to hide it in an import.
 Nothing about the wire format changes. The `X-Client-Info` header still identifies this client as
 `gotrue-dart`, and the `gotrue_meta_security` field in captcha payloads is unchanged.
 
+### The `storage_client` package is now `supabase_storage`
+
+`storage_client` says nothing about Supabase and does not match how the rest of the packages are
+named. The package is published as `supabase_storage` from v3 onwards, and the `storage_client`
+package is discontinued on pub.dev when v3 ships.
+
+If you depend on `supabase_flutter` or `supabase` you do not need to change anything, both pull in
+`supabase_storage` for you and re-export it.
+
+If you depend on the storage client directly, rename the dependency and the import:
+
+```yaml
+# Before
+dependencies:
+  storage_client: ^2.8.0
+
+# After
+dependencies:
+  supabase_storage: ^3.0.0
+```
+
+```dart
+// Before
+import 'package:storage_client/storage_client.dart';
+
+// After
+import 'package:supabase_storage/supabase_storage.dart';
+```
+
+The rename does not touch any type names. `SupabaseStorageClient`, `StorageFileApi` and the rest
+keep theirs, and the `X-Client-Info` header still identifies this client as `storage-dart`.
+
 ### `RealtimeClient.connectionState` is now typed
 
 `RealtimeClient` used to expose the socket state twice: a typed `connState` field and a stringly
@@ -184,7 +216,7 @@ ones below are the renames you can actually hit.
 | `SocketStates` | `SocketState` | `realtime_client` |
 | `PostgresTypes` | `PostgresType` | `realtime_client` |
 | `AuthenticatorAssuranceLevels` | `AuthenticatorAssuranceLevel` | `supabase_auth` |
-| `LoadTableSnapshots` | `TableSnapshotScope` | `storage_client` |
+| `LoadTableSnapshots` | `TableSnapshotScope` | `supabase_storage` |
 
 No enum values changed, so the only work is renaming the type where you name it explicitly.
 
@@ -370,7 +402,7 @@ already inert: unused types, options the client ignored, or values the server ne
 | `PostgrestClient.auth()` | `PostgrestClient.setAuth()` | `postgrest` |
 | `RealtimeClient.longpollerTimeout` | none, there is no longpoll transport | `realtime_client` |
 | `ChannelResponse.rateLimited` | none, it was never returned | `realtime_client` |
-| `FileObject.lastAccessedAt`, `FileObjectV2.lastAccessedAt` | none, the server does not populate it | `storage_client` |
+| `FileObject.lastAccessedAt`, `FileObjectV2.lastAccessedAt` | none, the server does not populate it | `supabase_storage` |
 | `AuthUser` | `User` | `supabase` |
 | `RealtimeClientOptions.eventsPerSecond` | none, it was already ignored | `supabase` |
 | `RemoveSubscriptionResult` | none | `supabase` |
diff --git a/README.md b/README.md
index 29e55e27f..0a81ac2c2 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ To install on a locally developed app:
 
 ## Testing
 
-The tests for the packages `postgrest`, `supabase_auth`, `realtime_client` and `storage_client` run against a
+The tests for the packages `postgrest`, `supabase_auth`, `realtime_client` and `supabase_storage` run against a
 local Supabase stack. To run these tests locally you need `docker` and the
 [Supabase CLI](https://supabase.com/docs/guides/local-development/cli/getting-started) installed.
 
diff --git a/packages/storage_client/lib/src/version.dart b/packages/storage_client/lib/src/version.dart
deleted file mode 100644
index 2cdfc59d8..000000000
--- a/packages/storage_client/lib/src/version.dart
+++ /dev/null
@@ -1 +0,0 @@
-const version = '2.8.0';
diff --git a/packages/supabase/lib/supabase.dart b/packages/supabase/lib/supabase.dart
index ecaa9d377..ca001d941 100644
--- a/packages/supabase/lib/supabase.dart
+++ b/packages/supabase/lib/supabase.dart
@@ -7,7 +7,7 @@ export 'package:functions_client/functions_client.dart';
 export 'package:supabase_auth/supabase_auth.dart';
 export 'package:postgrest/postgrest.dart';
 export 'package:realtime_client/realtime_client.dart';
-export 'package:storage_client/storage_client.dart';
+export 'package:supabase_storage/supabase_storage.dart';
 
 export 'src/realtime_client_options.dart';
 export 'src/supabase_client.dart';
diff --git a/packages/supabase/pubspec.yaml b/packages/supabase/pubspec.yaml
index 7fbae5b84..79cb18360 100644
--- a/packages/supabase/pubspec.yaml
+++ b/packages/supabase/pubspec.yaml
@@ -23,9 +23,9 @@ dependencies:
   meta: ^1.7.0
   postgrest: 2.9.1
   realtime_client: 2.13.0
-  storage_client: 2.8.0
   supabase_auth: 3.0.0-dev.1
   supabase_common: 0.1.2
+  supabase_storage: 3.0.0-dev.1
   yet_another_json_isolate: 2.1.1
   logging: ^1.3.0
 
diff --git a/packages/supabase_common/README.md b/packages/supabase_common/README.md
index a0d8d1507..76e984096 100644
--- a/packages/supabase_common/README.md
+++ b/packages/supabase_common/README.md
@@ -7,7 +7,7 @@
 > do not depend on it directly.
 
 Shared internal utilities used across the Supabase Dart and Flutter client
-packages (`supabase_auth`, `postgrest`, `realtime_client`, `storage_client`,
+packages (`supabase_auth`, `postgrest`, `realtime_client`, `supabase_storage`,
 `functions_client`, `supabase`, `supabase_flutter`).
 
 This package holds code that would otherwise be duplicated across those
diff --git a/packages/supabase_flutter/README.md b/packages/supabase_flutter/README.md
index ca4078c30..762356f60 100644
--- a/packages/supabase_flutter/README.md
+++ b/packages/supabase_flutter/README.md
@@ -592,7 +592,7 @@ supabaseLogger.onRecord.listen((record) {
 - `postgrest`: `Logger('supabase.postgrest')`
 - `supabase_auth`: `Logger('supabase.auth')`
 - `realtime_client`: `Logger('supabase.realtime')`
-- `storage_client`: `Logger('supabase.storage')`
+- `supabase_storage`: `Logger('supabase.storage')`
 - `functions_client`: `Logger('supabase.functions')`
 
 ---
diff --git a/packages/storage_client/CHANGELOG.md b/packages/supabase_storage/CHANGELOG.md
similarity index 100%
rename from packages/storage_client/CHANGELOG.md
rename to packages/supabase_storage/CHANGELOG.md
diff --git a/packages/storage_client/LICENSE b/packages/supabase_storage/LICENSE
similarity index 100%
rename from packages/storage_client/LICENSE
rename to packages/supabase_storage/LICENSE
diff --git a/packages/storage_client/README.md b/packages/supabase_storage/README.md
similarity index 78%
rename from packages/storage_client/README.md
rename to packages/supabase_storage/README.md
index 9ac96ddc7..f3bad9d7a 100644
--- a/packages/storage_client/README.md
+++ b/packages/supabase_storage/README.md
@@ -4,7 +4,7 @@
     <img alt="Supabase Logo" width="300" src="https://raw.githubusercontent.com/supabase/supabase/master/packages/common/assets/images/logo-preview.jpg">
   </a>
 
-  <h1 align="center">storage_client</h1>
+  <h1 align="center">supabase_storage</h1>
 
   <p align="center">
     Dart client library to interact with <a href="https://supabase.com/docs/guides/storage">Supabase Storage</a>.
@@ -19,11 +19,15 @@
 
 <div align="center">
 
-[![pub package](https://img.shields.io/pub/v/storage_client.svg)](https://pub.dev/packages/storage_client)
+[![pub package](https://img.shields.io/pub/v/supabase_storage.svg)](https://pub.dev/packages/supabase_storage)
 [![pub test](https://github.com/supabase/supabase-flutter/workflows/Test/badge.svg)](https://github.com/supabase/supabase-flutter/actions?query=workflow%3ATest)
 
 </div>
 
+> **Note**
+>
+> This package was published as `storage_client` up to and including v2. That package is discontinued in favour of `supabase_storage`.
+
 ## Docs
 
 The docs can be found on the official Supabase website.
diff --git a/packages/storage_client/analysis_options.yaml b/packages/supabase_storage/analysis_options.yaml
similarity index 100%
rename from packages/storage_client/analysis_options.yaml
rename to packages/supabase_storage/analysis_options.yaml
diff --git a/packages/storage_client/example/main.dart b/packages/supabase_storage/example/main.dart
similarity index 96%
rename from packages/storage_client/example/main.dart
rename to packages/supabase_storage/example/main.dart
index 7fef88fb1..f0489c7d4 100644
--- a/packages/storage_client/example/main.dart
+++ b/packages/supabase_storage/example/main.dart
@@ -3,7 +3,7 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 
 Future<void> main() async {
   const supabaseUrl = '';
diff --git a/packages/storage_client/lib/src/constants.dart b/packages/supabase_storage/lib/src/constants.dart
similarity index 82%
rename from packages/storage_client/lib/src/constants.dart
rename to packages/supabase_storage/lib/src/constants.dart
index 1159663ee..0d7fe846d 100644
--- a/packages/storage_client/lib/src/constants.dart
+++ b/packages/supabase_storage/lib/src/constants.dart
@@ -1,4 +1,4 @@
-import 'package:storage_client/src/version.dart';
+import 'package:supabase_storage/src/version.dart';
 import 'package:supabase_common/supabase_common.dart';
 import 'package:meta/meta.dart';
 
diff --git a/packages/storage_client/lib/src/fetch.dart b/packages/supabase_storage/lib/src/fetch.dart
similarity index 99%
rename from packages/storage_client/lib/src/fetch.dart
rename to packages/supabase_storage/lib/src/fetch.dart
index 779943a9e..ee7863765 100644
--- a/packages/storage_client/lib/src/fetch.dart
+++ b/packages/supabase_storage/lib/src/fetch.dart
@@ -7,7 +7,7 @@ import 'package:http/http.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:mime/mime.dart';
-import 'package:storage_client/src/types.dart';
+import 'package:supabase_storage/src/types.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 import 'file_stub.dart' if (dart.library.io) './file_io.dart';
diff --git a/packages/storage_client/lib/src/file_io.dart b/packages/supabase_storage/lib/src/file_io.dart
similarity index 100%
rename from packages/storage_client/lib/src/file_io.dart
rename to packages/supabase_storage/lib/src/file_io.dart
diff --git a/packages/storage_client/lib/src/file_stub.dart b/packages/supabase_storage/lib/src/file_stub.dart
similarity index 100%
rename from packages/storage_client/lib/src/file_stub.dart
rename to packages/supabase_storage/lib/src/file_stub.dart
diff --git a/packages/storage_client/lib/src/iceberg/iceberg_error.dart b/packages/supabase_storage/lib/src/iceberg/iceberg_error.dart
similarity index 100%
rename from packages/storage_client/lib/src/iceberg/iceberg_error.dart
rename to packages/supabase_storage/lib/src/iceberg/iceberg_error.dart
diff --git a/packages/storage_client/lib/src/iceberg/iceberg_rest_catalog.dart b/packages/supabase_storage/lib/src/iceberg/iceberg_rest_catalog.dart
similarity index 98%
rename from packages/storage_client/lib/src/iceberg/iceberg_rest_catalog.dart
rename to packages/supabase_storage/lib/src/iceberg/iceberg_rest_catalog.dart
index 7c2cf8476..59ddac128 100644
--- a/packages/storage_client/lib/src/iceberg/iceberg_rest_catalog.dart
+++ b/packages/supabase_storage/lib/src/iceberg/iceberg_rest_catalog.dart
@@ -3,10 +3,10 @@ import 'dart:math';
 
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
-import 'package:storage_client/src/iceberg/iceberg_error.dart';
-import 'package:storage_client/src/iceberg/iceberg_types.dart';
-import 'package:storage_client/src/iceberg/table_requirement.dart';
-import 'package:storage_client/src/iceberg/table_update.dart';
+import 'package:supabase_storage/src/iceberg/iceberg_error.dart';
+import 'package:supabase_storage/src/iceberg/iceberg_types.dart';
+import 'package:supabase_storage/src/iceberg/table_requirement.dart';
+import 'package:supabase_storage/src/iceberg/table_update.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 class _IcebergResponse {
diff --git a/packages/storage_client/lib/src/iceberg/iceberg_types.dart b/packages/supabase_storage/lib/src/iceberg/iceberg_types.dart
similarity index 100%
rename from packages/storage_client/lib/src/iceberg/iceberg_types.dart
rename to packages/supabase_storage/lib/src/iceberg/iceberg_types.dart
diff --git a/packages/storage_client/lib/src/iceberg/table_requirement.dart b/packages/supabase_storage/lib/src/iceberg/table_requirement.dart
similarity index 100%
rename from packages/storage_client/lib/src/iceberg/table_requirement.dart
rename to packages/supabase_storage/lib/src/iceberg/table_requirement.dart
diff --git a/packages/storage_client/lib/src/iceberg/table_update.dart b/packages/supabase_storage/lib/src/iceberg/table_update.dart
similarity index 98%
rename from packages/storage_client/lib/src/iceberg/table_update.dart
rename to packages/supabase_storage/lib/src/iceberg/table_update.dart
index 257e3bc53..e189b19e1 100644
--- a/packages/storage_client/lib/src/iceberg/table_update.dart
+++ b/packages/supabase_storage/lib/src/iceberg/table_update.dart
@@ -1,4 +1,4 @@
-import 'package:storage_client/src/iceberg/iceberg_types.dart';
+import 'package:supabase_storage/src/iceberg/iceberg_types.dart';
 
 /// A single change applied to a table as part of a commit. The common data
 /// definition updates are modelled as dedicated subclasses. Updates that are
diff --git a/packages/storage_client/lib/src/storage_bucket_api.dart b/packages/supabase_storage/lib/src/storage_bucket_api.dart
similarity index 98%
rename from packages/storage_client/lib/src/storage_bucket_api.dart
rename to packages/supabase_storage/lib/src/storage_bucket_api.dart
index ff59bd3fc..fb2e9bc10 100644
--- a/packages/storage_client/lib/src/storage_bucket_api.dart
+++ b/packages/supabase_storage/lib/src/storage_bucket_api.dart
@@ -1,7 +1,7 @@
 import 'package:http/http.dart';
 import 'package:meta/meta.dart';
-import 'package:storage_client/src/fetch.dart';
-import 'package:storage_client/src/types.dart';
+import 'package:supabase_storage/src/fetch.dart';
+import 'package:supabase_storage/src/types.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 class StorageBucketApi {
diff --git a/packages/storage_client/lib/src/storage_client.dart b/packages/supabase_storage/lib/src/storage_client.dart
similarity index 92%
rename from packages/storage_client/lib/src/storage_client.dart
rename to packages/supabase_storage/lib/src/storage_client.dart
index 3a905d04b..f1b954fa0 100644
--- a/packages/storage_client/lib/src/storage_client.dart
+++ b/packages/supabase_storage/lib/src/storage_client.dart
@@ -1,12 +1,12 @@
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:storage_client/src/constants.dart';
-import 'package:storage_client/src/iceberg/iceberg_rest_catalog.dart';
-import 'package:storage_client/src/iceberg/iceberg_types.dart';
-import 'package:storage_client/src/storage_bucket_api.dart';
-import 'package:storage_client/src/storage_file_api.dart';
-import 'package:storage_client/src/vector_client.dart';
-import 'package:storage_client/src/version.dart';
+import 'package:supabase_storage/src/constants.dart';
+import 'package:supabase_storage/src/iceberg/iceberg_rest_catalog.dart';
+import 'package:supabase_storage/src/iceberg/iceberg_types.dart';
+import 'package:supabase_storage/src/storage_bucket_api.dart';
+import 'package:supabase_storage/src/storage_file_api.dart';
+import 'package:supabase_storage/src/vector_client.dart';
+import 'package:supabase_storage/src/version.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 class SupabaseStorageClient extends StorageBucketApi {
diff --git a/packages/storage_client/lib/src/storage_file_api.dart b/packages/supabase_storage/lib/src/storage_file_api.dart
similarity index 99%
rename from packages/storage_client/lib/src/storage_file_api.dart
rename to packages/supabase_storage/lib/src/storage_file_api.dart
index e2627279a..0ea62b3b9 100644
--- a/packages/storage_client/lib/src/storage_file_api.dart
+++ b/packages/supabase_storage/lib/src/storage_file_api.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
-import 'package:storage_client/src/fetch.dart';
-import 'package:storage_client/src/types.dart';
+import 'package:supabase_storage/src/fetch.dart';
+import 'package:supabase_storage/src/types.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 import 'file_stub.dart' if (dart.library.io) './file_io.dart';
diff --git a/packages/storage_client/lib/src/types.dart b/packages/supabase_storage/lib/src/types.dart
similarity index 100%
rename from packages/storage_client/lib/src/types.dart
rename to packages/supabase_storage/lib/src/types.dart
diff --git a/packages/storage_client/lib/src/vector_client.dart b/packages/supabase_storage/lib/src/vector_client.dart
similarity index 99%
rename from packages/storage_client/lib/src/vector_client.dart
rename to packages/supabase_storage/lib/src/vector_client.dart
index 5413cf584..0b3fb91f7 100644
--- a/packages/storage_client/lib/src/vector_client.dart
+++ b/packages/supabase_storage/lib/src/vector_client.dart
@@ -1,6 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:storage_client/src/fetch.dart';
-import 'package:storage_client/src/vector_types.dart';
+import 'package:supabase_storage/src/fetch.dart';
+import 'package:supabase_storage/src/vector_types.dart';
 import 'package:supabase_common/supabase_common.dart';
 
 /// Client for the Storage Vectors API, reachable through
diff --git a/packages/storage_client/lib/src/vector_types.dart b/packages/supabase_storage/lib/src/vector_types.dart
similarity index 100%
rename from packages/storage_client/lib/src/vector_types.dart
rename to packages/supabase_storage/lib/src/vector_types.dart
diff --git a/packages/supabase_storage/lib/src/version.dart b/packages/supabase_storage/lib/src/version.dart
new file mode 100644
index 000000000..7f2f1c7d4
--- /dev/null
+++ b/packages/supabase_storage/lib/src/version.dart
@@ -0,0 +1 @@
+const version = '3.0.0-dev.1';
diff --git a/packages/storage_client/lib/storage_client.dart b/packages/supabase_storage/lib/supabase_storage.dart
similarity index 100%
rename from packages/storage_client/lib/storage_client.dart
rename to packages/supabase_storage/lib/supabase_storage.dart
diff --git a/packages/storage_client/pubspec.yaml b/packages/supabase_storage/pubspec.yaml
similarity index 91%
rename from packages/storage_client/pubspec.yaml
rename to packages/supabase_storage/pubspec.yaml
index 16fd4ebb0..7a1f61feb 100644
--- a/packages/storage_client/pubspec.yaml
+++ b/packages/supabase_storage/pubspec.yaml
@@ -1,8 +1,8 @@
-name: storage_client
+name: supabase_storage
 description: Dart client library to interact with Supabase Storage. Supabase Storage provides an interface for managing Files stored in S3, using Postgres to manage permissions.
-version: 2.8.0
+version: 3.0.0-dev.1
 homepage: 'https://supabase.com'
-repository: 'https://github.com/supabase/supabase-flutter/tree/main/packages/storage_client'
+repository: 'https://github.com/supabase/supabase-flutter/tree/main/packages/supabase_storage'
 issue_tracker: 'https://github.com/supabase/supabase-flutter/issues'
 documentation: 'https://supabase.com/docs/reference/dart/file-buckets-createbucket'
 topics:
diff --git a/packages/storage_client/test/basic_test.dart b/packages/supabase_storage/test/basic_test.dart
similarity index 99%
rename from packages/storage_client/test/basic_test.dart
rename to packages/supabase_storage/test/basic_test.dart
index 7ddb13df7..027ad77c3 100644
--- a/packages/storage_client/test/basic_test.dart
+++ b/packages/supabase_storage/test/basic_test.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:http/http.dart';
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:test/test.dart';
 
 import 'custom_http_client.dart';
diff --git a/packages/storage_client/test/client_test.dart b/packages/supabase_storage/test/client_test.dart
similarity index 99%
rename from packages/storage_client/test/client_test.dart
rename to packages/supabase_storage/test/client_test.dart
index c9f564176..82a27471d 100644
--- a/packages/storage_client/test/client_test.dart
+++ b/packages/supabase_storage/test/client_test.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:mime/mime.dart';
 import "package:path/path.dart" show join;
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:supabase_common/testing.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/storage_client/test/custom_http_client.dart b/packages/supabase_storage/test/custom_http_client.dart
similarity index 100%
rename from packages/storage_client/test/custom_http_client.dart
rename to packages/supabase_storage/test/custom_http_client.dart
diff --git a/packages/storage_client/test/fetch_test.dart b/packages/supabase_storage/test/fetch_test.dart
similarity index 98%
rename from packages/storage_client/test/fetch_test.dart
rename to packages/supabase_storage/test/fetch_test.dart
index c6ff73058..673181186 100644
--- a/packages/storage_client/test/fetch_test.dart
+++ b/packages/supabase_storage/test/fetch_test.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:http/http.dart';
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:test/test.dart';
 
 import 'custom_http_client.dart';
diff --git a/packages/storage_client/test/fixtures/upload/sadcat.jpg b/packages/supabase_storage/test/fixtures/upload/sadcat.jpg
similarity index 100%
rename from packages/storage_client/test/fixtures/upload/sadcat.jpg
rename to packages/supabase_storage/test/fixtures/upload/sadcat.jpg
diff --git a/packages/storage_client/test/iceberg_test.dart b/packages/supabase_storage/test/iceberg_test.dart
similarity index 99%
rename from packages/storage_client/test/iceberg_test.dart
rename to packages/supabase_storage/test/iceberg_test.dart
index 03d603127..37f4cb02d 100644
--- a/packages/storage_client/test/iceberg_test.dart
+++ b/packages/supabase_storage/test/iceberg_test.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:http/http.dart';
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:test/test.dart';
 
 const String supabaseUrl = 'SUPABASE_TEST_URL';
diff --git a/packages/storage_client/test/path_encoding_test.dart b/packages/supabase_storage/test/path_encoding_test.dart
similarity index 94%
rename from packages/storage_client/test/path_encoding_test.dart
rename to packages/supabase_storage/test/path_encoding_test.dart
index 7f7823135..c81afe4a2 100644
--- a/packages/storage_client/test/path_encoding_test.dart
+++ b/packages/supabase_storage/test/path_encoding_test.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:test/test.dart';
 
 import 'custom_http_client.dart';
diff --git a/packages/storage_client/test/types_test.dart b/packages/supabase_storage/test/types_test.dart
similarity index 99%
rename from packages/storage_client/test/types_test.dart
rename to packages/supabase_storage/test/types_test.dart
index c2badb42c..18eb7ce60 100644
--- a/packages/storage_client/test/types_test.dart
+++ b/packages/supabase_storage/test/types_test.dart
@@ -1,4 +1,4 @@
-import 'package:storage_client/src/types.dart';
+import 'package:supabase_storage/src/types.dart';
 import 'package:supabase_common/supabase_common.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/storage_client/test/vector_integration_test.dart b/packages/supabase_storage/test/vector_integration_test.dart
similarity index 98%
rename from packages/storage_client/test/vector_integration_test.dart
rename to packages/supabase_storage/test/vector_integration_test.dart
index 1abe45946..ae07126dc 100644
--- a/packages/storage_client/test/vector_integration_test.dart
+++ b/packages/supabase_storage/test/vector_integration_test.dart
@@ -1,4 +1,4 @@
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:supabase_common/testing.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/storage_client/test/vector_test.dart b/packages/supabase_storage/test/vector_test.dart
similarity index 99%
rename from packages/storage_client/test/vector_test.dart
rename to packages/supabase_storage/test/vector_test.dart
index 91f81c767..5491b1dab 100644
--- a/packages/storage_client/test/vector_test.dart
+++ b/packages/supabase_storage/test/vector_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:http/http.dart';
-import 'package:storage_client/storage_client.dart';
+import 'package:supabase_storage/supabase_storage.dart';
 import 'package:test/test.dart';
 
 import 'custom_http_client.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 587abb511..000d1a61a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ workspace:
   - packages/supabase_auth
   - packages/postgrest
   - packages/realtime_client
-  - packages/storage_client
+  - packages/supabase_storage
   - packages/supabase
   - packages/supabase/example
   - packages/supabase_flutter
diff --git a/sdk-compliance.yaml b/sdk-compliance.yaml
index 6b06bba92..41ce4128d 100644
--- a/sdk-compliance.yaml
+++ b/sdk-compliance.yaml
@@ -15,7 +15,7 @@
 #                           explains why.
 #
 # Verified against the source in this repository (packages/supabase_auth, postgrest,
-# storage_client, realtime_client, functions_client, supabase, supabase_flutter).
+# supabase_storage, realtime_client, functions_client, supabase, supabase_flutter).
 # Unlisted features default to not_implemented.
 
 sdk: flutter
diff --git a/supabase/config.toml b/supabase/config.toml
index a28027524..7799a867c 100644
--- a/supabase/config.toml
+++ b/supabase/config.toml
@@ -132,7 +132,7 @@ file_size_limit = "50MiB"
 [storage.s3_protocol]
 enabled = true
 
-# Image transformation API is exercised by the storage_client transform tests.
+# Image transformation API is exercised by the supabase_storage transform tests.
 [storage.image_transformation]
 enabled = true
 
diff --git a/supabase/seed.sql b/supabase/seed.sql
index c4b949e96..bb7548f9e 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -52,7 +52,7 @@ insert into public.addresses (username, location)
 values ('supabot', 'SRID=4326;POINT(-71.10044 42.373695)');
 
 -- ---------------------------------------------------------------------------
--- storage_client dummy data (ported from infra/storage_client/postgres/dummy-data.sql)
+-- supabase_storage dummy data (ported from infra/storage_client/postgres/dummy-data.sql)
 -- The storage tests authenticate with the service_role key, which bypasses RLS,
 -- so the previous per-user policies are no longer needed; only the buckets and
 -- objects the tests read are seeded. The owners are seeded as auth users so the