diff --git a/.eslintrc.js b/.eslintrc.js
index 7868213f..a540ebff 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -26,7 +26,7 @@ module.exports = {
         'no-undef': 'off',
         'no-dupe-class-members': 'off',
         // see:
-        // https://github.com/ably-labs/spaces/issues/76
+        // https://github.com/ably/spaces/issues/76
         // https://github.com/microsoft/TypeScript/issues/16577#issuecomment-703190339
         'import/extensions': [
           'error',
diff --git a/README.md b/README.md
index 39d2e82b..24c6524c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
     <img src="https://badgen.net/badge/development-status/alpha/yellow?icon=github" alt="Development status"   />
   </a>
   <a href="">
-    <img src="https://github.com/ably-labs/spaces/actions/workflows/dev-ci.yml/badge.svg?branch=main" alt="CI status"   />
+    <img src="https://github.com/ably/spaces/actions/workflows/dev-ci.yml/badge.svg?branch=main" alt="CI status"   />
   </a>
     <a href="">
     <img src="https://badgen.net/github/license/3scale/saas-operator" alt="License" />
@@ -65,13 +65,13 @@ To start using this SDK, you will need the following:
 Install the Ably JavaScript SDK and the Spaces SDK:
 
 ```sh
-npm install ably @ably-labs/spaces
+npm install ably @ably/spaces
 ```
 
 To instantiate the Spaces SDK, create an [Ably client](https://ably.com/docs/getting-started/setup) and pass it into the Spaces constructor:
 
 ```ts
-import Spaces from '@ably-labs/spaces';
+import Spaces from '@ably/spaces';
 import { Realtime } from 'ably';
 
 const client = new Realtime.Promise({ key: "<API-key>", clientId: "<client-ID>" });
diff --git a/demo/src/utils/types.d.ts b/demo/src/utils/types.d.ts
index f9b9d106..2ec5aee3 100644
--- a/demo/src/utils/types.d.ts
+++ b/demo/src/utils/types.d.ts
@@ -1,4 +1,4 @@
-import { type SpaceMember } from '@ably-labs/spaces';
+import { type SpaceMember } from '@ably/spaces';
 
 interface ProfileData {
   name: string;
diff --git a/docs/class-definitions.md b/docs/class-definitions.md
index 2c8d5543..dbc12d0c 100644
--- a/docs/class-definitions.md
+++ b/docs/class-definitions.md
@@ -6,7 +6,7 @@ Create a new instance of the Space SDK by passing an instance of the realtime, p
 
 ```ts
 import { Realtime } from 'ably/promise';
-import Spaces from '@ably-labs/spaces';
+import Spaces from '@ably/spaces';
 
 const client = new Realtime.Promise({ key: "<API-key>", clientId: "<client-ID>" });
 const spaces = new Spaces(client);
diff --git a/docs/usage.md b/docs/usage.md
index 110a6688..fd2c64b5 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -25,7 +25,7 @@ Spaces is built on top of the [Ably JavaScript SDK](https://github.com/ably/ably
 You'll need to install both the ably client and the spaces client:
 
 ```sh
-npm install ably @ably-labs/spaces
+npm install ably @ably/spaces
 ```
 
 ### CDN
@@ -34,7 +34,7 @@ You can also use Spaces with a CDN like [unpkg](https://www.unpkg.com/):
 
 ```html
 <script src="https://cdn.ably.com/lib/ably.min-1.js"></script>
-<script src="https://unpkg.com/@ably-labs/spaces@0.0.10/dist/iife/index.bundle.js"></script>
+<script src="https://unpkg.com/@ably/spaces@0.0.10/dist/iife/index.bundle.js"></script>
 ```
 
 ## Authentication and instantiation
@@ -45,7 +45,7 @@ The Ably client instantiation accepts client options. You will need at minimum a
 
 ```ts
 import { Realtime } from 'ably/promise';
-import Spaces from '@ably-labs/spaces';
+import Spaces from '@ably/spaces';
 
 const client = new Realtime.Promise({ key: "<API-key>", clientId: "<client-ID>" });
 const spaces = new Spaces(client);
diff --git a/examples/avatar-stack.ts b/examples/avatar-stack.ts
index 8112ad57..d847be67 100644
--- a/examples/avatar-stack.ts
+++ b/examples/avatar-stack.ts
@@ -1,4 +1,4 @@
-import Spaces from '@ably-labs/spaces';
+import Spaces from '@ably/spaces';
 import { Realtime } from 'ably';
 
 import { renderAvatars, renderNotification } from './my-application';
diff --git a/examples/live-cursors.ts b/examples/live-cursors.ts
index 438f2b6c..a319ff15 100644
--- a/examples/live-cursors.ts
+++ b/examples/live-cursors.ts
@@ -1,4 +1,4 @@
-import Spaces from '@ably-labs/spaces';
+import Spaces from '@ably/spaces';
 import { Realtime } from 'ably';
 
 import renderCursor from './my-application';
diff --git a/examples/locking.ts b/examples/locking.ts
index d41c8b91..13ff339c 100644
--- a/examples/locking.ts
+++ b/examples/locking.ts
@@ -1,4 +1,4 @@
-import Spaces, { LockStatus } from '@ably-labs/spaces';
+import Spaces, { LockStatus } from '@ably/spaces';
 import { Realtime } from 'ably';
 
 import { enableLocationEditing, lockId } from './my-application';
diff --git a/package-lock.json b/package-lock.json
index 29ceee98..904b1d89 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "@ably-labs/spaces",
+  "name": "@ably/spaces",
   "version": "0.0.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "@ably-labs/spaces",
+      "name": "@ably/spaces",
       "version": "0.0.13",
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index d823d3cf..34589e41 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@ably-labs/spaces",
+  "name": "@ably/spaces",
   "version": "0.0.13",
   "description": "",
   "main": "dist/cjs/index.js",
@@ -27,14 +27,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ably-labs/spaces.git"
+    "url": "git+https://github.com/ably/spaces.git"
   },
   "author": "",
   "license": "ISC",
   "bugs": {
     "url": ""
   },
-  "homepage": "https://github.com/ably-labs/spaces",
+  "homepage": "https://github.com/ably/spaces",
   "publishConfig": {
     "access": "public"
   },