diff --git a/package.json b/package.json
index 14953575..80b9603c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-js",
+  "name": "@rsocket/js",
   "description": "A JavaScript implementation of the RSocket protocol (https://github.com/rsocket/rsocket).",
   "private": true,
   "license": "Apache-2.0",
diff --git a/packages/rsocket-adapter-rxjs/package.json b/packages/rsocket-adapter-rxjs/package.json
index a1e9b47e..3207379b 100644
--- a/packages/rsocket-adapter-rxjs/package.json
+++ b/packages/rsocket-adapter-rxjs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-adapter-rxjs",
+  "name": "@rsocket/adapter-rxjs",
   "version": "1.0.0-alpha.4",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -19,8 +19,8 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3",
-    "rsocket-messaging": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
+    "@rsocket/messaging": "^1.0.0-alpha.3",
     "rxjs": "^7.4.0"
   },
   "devDependencies": {
diff --git a/packages/rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts b/packages/rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts
index db92b5fd..6d17d906 100644
--- a/packages/rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts
+++ b/packages/rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts
@@ -21,8 +21,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Requestable,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import {
   asyncScheduler,
   Observable,
diff --git a/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts b/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts
index c26186a8..5489a968 100644
--- a/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts
+++ b/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts
@@ -20,8 +20,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Requestable,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import { Observer, Subscription } from "rxjs";
 import { applyMixins } from "./Utils";
 
diff --git a/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts b/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts
index bd05a4c0..2041fb50 100644
--- a/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts
+++ b/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts
@@ -19,8 +19,8 @@ import {
   OnExtensionSubscriber,
   OnNextSubscriber,
   OnTerminalSubscriber,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import { Observer, Subscription } from "rxjs";
 
 export default class ObserverToRSocketSubscriber<T>
diff --git a/packages/rsocket-adapter-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts b/packages/rsocket-adapter-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts
index ed2ab165..62cd10b8 100644
--- a/packages/rsocket-adapter-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts
+++ b/packages/rsocket-adapter-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts
@@ -21,8 +21,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import { asyncScheduler, SchedulerLike, Subscriber, TeardownLogic } from "rxjs";
 import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
 import RSocketPublisherToPrefetchingObservable from "./RSocketPublisherToPrefetchingObservable";
diff --git a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts
index 4a138cc9..96cf2018 100644
--- a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts
+++ b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts
@@ -20,8 +20,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Payload,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import { Observable, Subscriber, TeardownLogic, Unsubscribable } from "rxjs";
 
 export default class RSocketPublisherToObservable<T>
diff --git a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts
index 1047b96a..8931797a 100644
--- a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts
+++ b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts
@@ -21,8 +21,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import {
   asyncScheduler,
   Observable,
diff --git a/packages/rsocket-adapter-rxjs/src/Requesters.ts b/packages/rsocket-adapter-rxjs/src/Requesters.ts
index 79ce94ac..ef9b555b 100644
--- a/packages/rsocket-adapter-rxjs/src/Requesters.ts
+++ b/packages/rsocket-adapter-rxjs/src/Requesters.ts
@@ -19,7 +19,7 @@
 import {
   encodeCompositeMetadata,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 import {
   Cancellable,
   OnExtensionSubscriber,
@@ -27,8 +27,8 @@ import {
   OnTerminalSubscriber,
   Requestable,
   RSocket,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import {
   asyncScheduler,
   concatMap,
diff --git a/packages/rsocket-adapter-rxjs/src/Responders.ts b/packages/rsocket-adapter-rxjs/src/Responders.ts
index 01a315a2..ee90a5d5 100644
--- a/packages/rsocket-adapter-rxjs/src/Responders.ts
+++ b/packages/rsocket-adapter-rxjs/src/Responders.ts
@@ -24,8 +24,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "rsocket-core";
-import { Codec } from "rsocket-messaging";
+} from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
 import { asyncScheduler, Observable, SchedulerLike } from "rxjs";
 import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
 import ObserverToRSocketSubscriber from "./ObserverToRSocketSubscriber";
diff --git a/packages/rsocket-composite-metadata/__tests__/encodeAndAddCustomMetadata.spec.ts b/packages/rsocket-composite-metadata/__tests__/encodeAndAddCustomMetadata.spec.ts
index d591f933..3d012297 100644
--- a/packages/rsocket-composite-metadata/__tests__/encodeAndAddCustomMetadata.spec.ts
+++ b/packages/rsocket-composite-metadata/__tests__/encodeAndAddCustomMetadata.spec.ts
@@ -1,4 +1,4 @@
-import { encodeAndAddCustomMetadata } from "rsocket-composite-metadata";
+import { encodeAndAddCustomMetadata } from "@rsocket/composite-metadata";
 import { hex } from "./test-utils/hex";
 
 describe("encodeAndAddCustomMetadata", () => {
diff --git a/packages/rsocket-composite-metadata/__tests__/encodeAndAddWellKnownMetadata.ts b/packages/rsocket-composite-metadata/__tests__/encodeAndAddWellKnownMetadata.ts
index 8f48e7aa..847e01a0 100644
--- a/packages/rsocket-composite-metadata/__tests__/encodeAndAddWellKnownMetadata.ts
+++ b/packages/rsocket-composite-metadata/__tests__/encodeAndAddWellKnownMetadata.ts
@@ -1,8 +1,8 @@
 import {
   encodeAndAddWellKnownMetadata,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
-import { readUInt24BE } from "rsocket-core";
+} from "@rsocket/composite-metadata";
+import { readUInt24BE } from "@rsocket/core";
 
 describe("encodeWellKnownMetadataHeader", () => {
   it("encodes the header as per spec when WellKnownMimeType given", () => {
diff --git a/packages/rsocket-composite-metadata/__tests__/encodeCompositeMetadata.ts b/packages/rsocket-composite-metadata/__tests__/encodeCompositeMetadata.ts
index 210f3867..ed21d4a7 100644
--- a/packages/rsocket-composite-metadata/__tests__/encodeCompositeMetadata.ts
+++ b/packages/rsocket-composite-metadata/__tests__/encodeCompositeMetadata.ts
@@ -1,8 +1,8 @@
 import {
   encodeCompositeMetadata,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
-import { readUInt24BE } from "rsocket-core";
+} from "@rsocket/composite-metadata";
+import { readUInt24BE } from "@rsocket/core";
 
 describe("encodeCompositeMetadata encodes the metadata", () => {
   describe("when given a map", () => {
diff --git a/packages/rsocket-composite-metadata/__tests__/encodeCustomMetadataHeader.ts b/packages/rsocket-composite-metadata/__tests__/encodeCustomMetadataHeader.ts
index e8b1b5da..c482d2be 100644
--- a/packages/rsocket-composite-metadata/__tests__/encodeCustomMetadataHeader.ts
+++ b/packages/rsocket-composite-metadata/__tests__/encodeCustomMetadataHeader.ts
@@ -1,4 +1,4 @@
-import { encodeCustomMetadataHeader } from "rsocket-composite-metadata";
+import { encodeCustomMetadataHeader } from "@rsocket/composite-metadata";
 import { hex } from "./test-utils/hex";
 
 describe("encodeCustomMetadataHeader", () => {
diff --git a/packages/rsocket-composite-metadata/__tests__/encodeWellKnownMetadataHeader.ts b/packages/rsocket-composite-metadata/__tests__/encodeWellKnownMetadataHeader.ts
index 72bcd0f7..08e253bf 100644
--- a/packages/rsocket-composite-metadata/__tests__/encodeWellKnownMetadataHeader.ts
+++ b/packages/rsocket-composite-metadata/__tests__/encodeWellKnownMetadataHeader.ts
@@ -1,7 +1,7 @@
 import {
   encodeWellKnownMetadataHeader,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 
 describe("encodeWellKnownMetadataHeader", () => {
   it("encodes the header as per spec", () => {
diff --git a/packages/rsocket-composite-metadata/package.json b/packages/rsocket-composite-metadata/package.json
index f78246c3..0219b647 100644
--- a/packages/rsocket-composite-metadata/package.json
+++ b/packages/rsocket-composite-metadata/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-composite-metadata",
+  "name": "@rsocket/composite-metadata",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -19,7 +19,7 @@
     "test": "yarn jest"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3"
+    "@rsocket/core": "^1.0.0-alpha.3"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
diff --git a/packages/rsocket-composite-metadata/src/CompositeMetadata.ts b/packages/rsocket-composite-metadata/src/CompositeMetadata.ts
index d780d0bc..cd72572f 100644
--- a/packages/rsocket-composite-metadata/src/CompositeMetadata.ts
+++ b/packages/rsocket-composite-metadata/src/CompositeMetadata.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { readUInt24BE, writeUInt24BE } from "rsocket-core";
+import { readUInt24BE, writeUInt24BE } from "@rsocket/core";
 import { WellKnownMimeType } from "./WellKnownMimeType";
 
 export class CompositeMetadata implements Iterable<Entry> {
diff --git a/packages/rsocket-core/package.json b/packages/rsocket-core/package.json
index 693d6cf5..311c30d8 100644
--- a/packages/rsocket-core/package.json
+++ b/packages/rsocket-core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-core",
+  "name": "@rsocket/core",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
diff --git a/packages/rsocket-examples/package.json b/packages/rsocket-examples/package.json
index 4bc6d403..5cb997ae 100644
--- a/packages/rsocket-examples/package.json
+++ b/packages/rsocket-examples/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-examples",
+  "name": "@rsocket/examples",
   "version": "1.0.0-alpha.4",
   "license": "Apache-2.0",
   "private": true,
@@ -28,13 +28,13 @@
     "graphql": "^16.0.0",
     "graphql-tag": "^2.12.6",
     "graphql-subscriptions": "^2.0.0",
-    "rsocket-adapter-rxjs": "^1.0.0-alpha.4",
-    "rsocket-composite-metadata": "^1.0.0-alpha.3",
-    "rsocket-core": "^1.0.0-alpha.3",
-    "rsocket-tcp-client": "^1.0.0-alpha.3",
-    "rsocket-tcp-server": "^1.0.0-alpha.3",
-    "rsocket-websocket-client": "^1.0.0-alpha.3",
-    "rsocket-websocket-server": "^1.0.0-alpha.3",
+    "@rsocket/adapter-rxjs": "^1.0.0-alpha.4",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
+    "@rsocket/tcp-client": "^1.0.0-alpha.3",
+    "@rsocket/tcp-server": "^1.0.0-alpha.3",
+    "@rsocket/websocket-client": "^1.0.0-alpha.3",
+    "@rsocket/websocket-server": "^1.0.0-alpha.3",
     "ws": "~8.2.3"
   },
   "devDependencies": {
diff --git a/packages/rsocket-examples/src/ClientRequestChannelExample.ts b/packages/rsocket-examples/src/ClientRequestChannelExample.ts
index df89f8e7..3c8e2d2d 100644
--- a/packages/rsocket-examples/src/ClientRequestChannelExample.ts
+++ b/packages/rsocket-examples/src/ClientRequestChannelExample.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { RSocketConnector } from "rsocket-core";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
+import { RSocketConnector } from "@rsocket/core";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
 import { exit } from "process";
 import WebSocket from "ws";
 
diff --git a/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts b/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts
index 246e5832..deca21ff 100644
--- a/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts
+++ b/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts
@@ -24,16 +24,16 @@ import {
   RSocketConnector,
   RSocketError,
   RSocketServer,
-} from "rsocket-core";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+} from "@rsocket/core";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 import {
   decodeCompositeMetadata,
   decodeRoutes,
   encodeCompositeMetadata,
   encodeRoute,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 import { exit } from "process";
 import MESSAGE_RSOCKET_ROUTING = WellKnownMimeType.MESSAGE_RSOCKET_ROUTING;
 import Logger from "./shared/logger";
diff --git a/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts b/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts
index c2d70d3b..08b1d4fb 100644
--- a/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts
+++ b/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts
@@ -24,10 +24,10 @@ import {
   RSocket,
   RSocketConnector,
   RSocketServer,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { exit } from "process";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 
 async function main() {
   const server = new RSocketServer({
diff --git a/packages/rsocket-examples/src/graphql/apollo/client-server/example.ts b/packages/rsocket-examples/src/graphql/apollo/client-server/example.ts
index 8586f3d4..0cf1d5af 100644
--- a/packages/rsocket-examples/src/graphql/apollo/client-server/example.ts
+++ b/packages/rsocket-examples/src/graphql/apollo/client-server/example.ts
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { RSocket, RSocketConnector, RSocketServer } from "rsocket-core";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+import { RSocket, RSocketConnector, RSocketServer } from "@rsocket/core";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 import { exit } from "process";
-import { makeRSocketLink } from "rsocket-graphql-apollo-link";
-import { RSocketApolloServer } from "rsocket-graphql-apollo-server";
+import { makeRSocketLink } from "@rsocket/graphql-apollo-link";
+import { RSocketApolloServer } from "@rsocket/graphql-apollo-server";
 import {
   ApolloClient,
   InMemoryCache,
@@ -30,7 +30,7 @@ import { resolvers } from "./resolvers";
 import { DocumentNode } from "@apollo/client";
 import * as fs from "fs";
 import path from "path";
-import { RSocketApolloGraphlQLPlugin } from "rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin";
+import { RSocketApolloGraphlQLPlugin } from "@rsocket/graphql-apollo-server/src/RSocketApolloGraphlQLPlugin";
 
 let apolloServer: RSocketApolloServer;
 let rsocketClient: RSocket;
diff --git a/packages/rsocket-examples/src/graphql/apollo/client/example.ts b/packages/rsocket-examples/src/graphql/apollo/client/example.ts
index 27c22fe0..dd9bb68f 100644
--- a/packages/rsocket-examples/src/graphql/apollo/client/example.ts
+++ b/packages/rsocket-examples/src/graphql/apollo/client/example.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { RSocket, RSocketConnector } from "rsocket-core";
-import { makeRSocketLink } from "rsocket-graphql-apollo-link";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
+import { RSocket, RSocketConnector } from "@rsocket/core";
+import { makeRSocketLink } from "@rsocket/graphql-apollo-link";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
 import {
   ApolloClient,
   InMemoryCache,
@@ -25,7 +25,7 @@ import {
 import gql from "graphql-tag";
 import WebSocket from "ws";
 import { exit } from "process";
-import { WellKnownMimeType } from "rsocket-composite-metadata";
+import { WellKnownMimeType } from "@rsocket/composite-metadata";
 import { DocumentNode } from "@apollo/client";
 
 let rsocketClient: RSocket;
diff --git a/packages/rsocket-examples/src/rxjs/RxjsMessagingCompositeMetadataRouteExample.ts b/packages/rsocket-examples/src/rxjs/RxjsMessagingCompositeMetadataRouteExample.ts
index 56b4dfa7..6e47043f 100644
--- a/packages/rsocket-examples/src/rxjs/RxjsMessagingCompositeMetadataRouteExample.ts
+++ b/packages/rsocket-examples/src/rxjs/RxjsMessagingCompositeMetadataRouteExample.ts
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-import { RSocketConnector, RSocketServer } from "rsocket-core";
-import { Codec, RSocketRequester, RSocketResponder } from "rsocket-messaging";
-import { RxRequestersFactory, RxRespondersFactory } from "rsocket-adapter-rxjs";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+import { RSocketConnector, RSocketServer } from "@rsocket/core";
+import { Codec, RSocketRequester, RSocketResponder } from "@rsocket/messaging";
+import {
+  RxRequestersFactory,
+  RxRespondersFactory,
+} from "@rsocket/adapter-rxjs";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 import { exit } from "process";
 import {
   firstValueFrom,
diff --git a/packages/rsocket-examples/src/rxjs/RxjsRequesterResponderExample.ts b/packages/rsocket-examples/src/rxjs/RxjsRequesterResponderExample.ts
index c5ee32b1..e790c94b 100644
--- a/packages/rsocket-examples/src/rxjs/RxjsRequesterResponderExample.ts
+++ b/packages/rsocket-examples/src/rxjs/RxjsRequesterResponderExample.ts
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-import { RSocket, RSocketConnector, RSocketServer } from "rsocket-core";
-import { Codec } from "rsocket-messaging";
-import { RxRequestersFactory, RxRespondersFactory } from "rsocket-adapter-rxjs";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+import { RSocket, RSocketConnector, RSocketServer } from "@rsocket/core";
+import { Codec } from "@rsocket/messaging";
+import {
+  RxRequestersFactory,
+  RxRespondersFactory,
+} from "@rsocket/adapter-rxjs";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 import { exit } from "process";
 import {
   firstValueFrom,
diff --git a/packages/rsocket-examples/src/tcp/ClienRequestFnfnWithLeaseExampleTcp.ts b/packages/rsocket-examples/src/tcp/ClienRequestFnfnWithLeaseExampleTcp.ts
index 1a74111b..25d5c3b3 100644
--- a/packages/rsocket-examples/src/tcp/ClienRequestFnfnWithLeaseExampleTcp.ts
+++ b/packages/rsocket-examples/src/tcp/ClienRequestFnfnWithLeaseExampleTcp.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { RSocket, RSocketConnector } from "rsocket-core";
-import { TcpClientTransport } from "rsocket-tcp-client";
+import { RSocket, RSocketConnector } from "@rsocket/core";
+import { TcpClientTransport } from "@rsocket/tcp-client";
 import { exit } from "process";
 
 let serverCloseable;
diff --git a/packages/rsocket-examples/src/tcp/ClientServerRequestResponseExampleTcp.ts b/packages/rsocket-examples/src/tcp/ClientServerRequestResponseExampleTcp.ts
index d5a728ea..c508261f 100644
--- a/packages/rsocket-examples/src/tcp/ClientServerRequestResponseExampleTcp.ts
+++ b/packages/rsocket-examples/src/tcp/ClientServerRequestResponseExampleTcp.ts
@@ -22,9 +22,9 @@ import {
   RSocket,
   RSocketConnector,
   RSocketServer,
-} from "rsocket-core";
-import { TcpClientTransport } from "rsocket-tcp-client";
-import { TcpServerTransport } from "rsocket-tcp-server";
+} from "@rsocket/core";
+import { TcpClientTransport } from "@rsocket/tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
 import { exit } from "process";
 
 let serverCloseable;
diff --git a/packages/rsocket-examples/src/tcp/ClientServerRequestStreamExampleTcp.ts b/packages/rsocket-examples/src/tcp/ClientServerRequestStreamExampleTcp.ts
index beae37aa..91cd7c90 100644
--- a/packages/rsocket-examples/src/tcp/ClientServerRequestStreamExampleTcp.ts
+++ b/packages/rsocket-examples/src/tcp/ClientServerRequestStreamExampleTcp.ts
@@ -21,11 +21,11 @@ import {
   Payload,
   RSocketConnector,
   RSocketServer,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { exit } from "process";
 import Logger from "../shared/logger";
-import { TcpServerTransport } from "rsocket-tcp-server";
-import { TcpClientTransport } from "rsocket-tcp-client";
+import { TcpServerTransport } from "@rsocket/tcp-server";
+import { TcpClientTransport } from "@rsocket/tcp-client";
 
 function makeServer() {
   return new RSocketServer({
diff --git a/packages/rsocket-examples/src/webpack/browser-bundle/package.json b/packages/rsocket-examples/src/webpack/browser-bundle/package.json
index 69286307..5250a899 100644
--- a/packages/rsocket-examples/src/webpack/browser-bundle/package.json
+++ b/packages/rsocket-examples/src/webpack/browser-bundle/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-examples-websocket-simple-client",
+  "name": "@rsocket/examples-websocket-simple-client",
   "version": "0.0.0",
   "license": "Apache-2.0",
   "private": true,
@@ -17,10 +17,10 @@
   },
   "devDependencies": {
     "buffer": "^6.0.3",
-    "rsocket-adapter-rxjs": "^1.0.0-alpha.4",
-    "rsocket-composite-metadata": "^1.0.0-alpha.3",
-    "rsocket-core": "^1.0.0-alpha.3",
-    "rsocket-websocket-client": "^1.0.0-alpha.3",
+    "@rsocket/adapter-rxjs": "^1.0.0-alpha.4",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
+    "@rsocket/websocket-client": "^1.0.0-alpha.3",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.0"
diff --git a/packages/rsocket-examples/src/webpack/browser-bundle/rsocket.js b/packages/rsocket-examples/src/webpack/browser-bundle/rsocket.js
index b23b6814..f0bec0c8 100644
--- a/packages/rsocket-examples/src/webpack/browser-bundle/rsocket.js
+++ b/packages/rsocket-examples/src/webpack/browser-bundle/rsocket.js
@@ -1,5 +1,5 @@
-import { RSocketConnector } from "rsocket-core";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
+import { RSocketConnector } from "@rsocket/core";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
 
 export async function connect(transportOptions) {
   const connector = new RSocketConnector({
diff --git a/packages/rsocket-examples/src/webpack/simple/client/index.js b/packages/rsocket-examples/src/webpack/simple/client/index.js
index 2316cf11..def5c455 100644
--- a/packages/rsocket-examples/src/webpack/simple/client/index.js
+++ b/packages/rsocket-examples/src/webpack/simple/client/index.js
@@ -1,5 +1,5 @@
-import { RSocketConnector } from "rsocket-core";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
+import { RSocketConnector } from "@rsocket/core";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
 
 (async () => {
   const outputDiv = document.querySelector("#output");
diff --git a/packages/rsocket-examples/src/webpack/simple/client/package.json b/packages/rsocket-examples/src/webpack/simple/client/package.json
index 4aaef5d4..e8ca68fb 100644
--- a/packages/rsocket-examples/src/webpack/simple/client/package.json
+++ b/packages/rsocket-examples/src/webpack/simple/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-examples-websocket-simple-client",
+  "name": "@rsocket/examples-websocket-simple-client",
   "version": "0.0.0",
   "license": "Apache-2.0",
   "private": true,
@@ -17,10 +17,10 @@
   },
   "devDependencies": {
     "buffer": "^6.0.3",
-    "rsocket-adapter-rxjs": "^1.0.0-alpha.4",
-    "rsocket-composite-metadata": "^1.0.0-alpha.3",
-    "rsocket-core": "^1.0.0-alpha.3",
-    "rsocket-websocket-client": "^1.0.0-alpha.3",
+    "@rsocket/adapter-rxjs": "^1.0.0-alpha.4",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
+    "@rsocket/websocket-client": "^1.0.0-alpha.3",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.0"
diff --git a/packages/rsocket-examples/src/webpack/simple/server/package.json b/packages/rsocket-examples/src/webpack/simple/server/package.json
index be29a758..e57dbdd3 100644
--- a/packages/rsocket-examples/src/webpack/simple/server/package.json
+++ b/packages/rsocket-examples/src/webpack/simple/server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-examples-websocket-simple-server",
+  "name": "@rsocket/examples-websocket-simple-server",
   "version": "0.0.0",
   "license": "Apache-2.0",
   "private": true,
@@ -15,13 +15,13 @@
     "node": "^16.17.0"
   },
   "dependencies": {
-    "rsocket-adapter-rxjs": "^1.0.0-alpha.4",
-    "rsocket-composite-metadata": "^1.0.0-alpha.3",
-    "rsocket-core": "^1.0.0-alpha.3",
-    "rsocket-tcp-client": "^1.0.0-alpha.3",
-    "rsocket-tcp-server": "^1.0.0-alpha.3",
-    "rsocket-websocket-client": "^1.0.0-alpha.3",
-    "rsocket-websocket-server": "^1.0.0-alpha.3",
+    "@rsocket/adapter-rxjs": "^1.0.0-alpha.4",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
+    "@rsocket/tcp-client": "^1.0.0-alpha.3",
+    "@rsocket/tcp-server": "^1.0.0-alpha.3",
+    "@rsocket/websocket-client": "^1.0.0-alpha.3",
+    "@rsocket/websocket-server": "^1.0.0-alpha.3",
     "ws": "~8.2.3"
   },
   "devDependencies": {
diff --git a/packages/rsocket-examples/src/webpack/simple/server/server.js b/packages/rsocket-examples/src/webpack/simple/server/server.js
index 24ce2924..257c7c1b 100644
--- a/packages/rsocket-examples/src/webpack/simple/server/server.js
+++ b/packages/rsocket-examples/src/webpack/simple/server/server.js
@@ -1,5 +1,5 @@
-const { RSocketServer } = require("rsocket-core");
-const { WebsocketServerTransport } = require("rsocket-websocket-server");
+const { RSocketServer } = require("@rsocket/core");
+const { WebsocketServerTransport } = require("@rsocket/websocket-server");
 const WebSocket = require("ws");
 
 const port = 9090;
diff --git a/packages/rsocket-examples/src/websocket/ClientServerRequestResponseExampleWebSocket.ts b/packages/rsocket-examples/src/websocket/ClientServerRequestResponseExampleWebSocket.ts
index b42fa053..5cea79c5 100644
--- a/packages/rsocket-examples/src/websocket/ClientServerRequestResponseExampleWebSocket.ts
+++ b/packages/rsocket-examples/src/websocket/ClientServerRequestResponseExampleWebSocket.ts
@@ -21,9 +21,9 @@ import {
   Payload,
   RSocketConnector,
   RSocketServer,
-} from "rsocket-core";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
-import { WebsocketServerTransport } from "rsocket-websocket-server";
+} from "@rsocket/core";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
+import { WebsocketServerTransport } from "@rsocket/websocket-server";
 import { exit } from "process";
 import WebSocket from "ws";
 
diff --git a/packages/rsocket-examples/src/websocket/ClientServerRequestStreamExampleWebSocket.ts b/packages/rsocket-examples/src/websocket/ClientServerRequestStreamExampleWebSocket.ts
index 3a8597fc..7e183395 100644
--- a/packages/rsocket-examples/src/websocket/ClientServerRequestStreamExampleWebSocket.ts
+++ b/packages/rsocket-examples/src/websocket/ClientServerRequestStreamExampleWebSocket.ts
@@ -21,9 +21,9 @@ import {
   Payload,
   RSocketConnector,
   RSocketServer,
-} from "rsocket-core";
-import { WebsocketClientTransport } from "rsocket-websocket-client";
-import { WebsocketServerTransport } from "rsocket-websocket-server";
+} from "@rsocket/core";
+import { WebsocketClientTransport } from "@rsocket/websocket-client";
+import { WebsocketServerTransport } from "@rsocket/websocket-server";
 import { exit } from "process";
 import WebSocket from "ws";
 import Logger from "../shared/logger";
diff --git a/packages/rsocket-graphql-apollo-link/package.json b/packages/rsocket-graphql-apollo-link/package.json
index 7918a5bc..d82df29b 100644
--- a/packages/rsocket-graphql-apollo-link/package.json
+++ b/packages/rsocket-graphql-apollo-link/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-graphql-apollo-link",
+  "name": "@rsocket/graphql-apollo-link",
   "version": "1.0.0-alpha.1",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -9,6 +9,9 @@
     "LICENSE",
     "README.md"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "yarn run clean && yarn run compile",
     "clean": "rimraf -rf ./dist",
@@ -18,12 +21,13 @@
   },
   "dependencies": {
     "@apollo/client": "^3.5.10",
-    "rsocket-composite-metadata": "^1.0.0-alpha.1",
-    "rsocket-core": "^1.0.0-alpha.1",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.1",
+    "@rsocket/core": "^1.0.0-alpha.1",
     "graphql": "^16.3.0"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
     "typescript": "~4.5.2"
-  }
+  },
+  "gitHead": "39565e56d069f40fd9ac8d169f8f62a918f7f723"
 }
diff --git a/packages/rsocket-graphql-apollo-link/src/RSocketLink.ts b/packages/rsocket-graphql-apollo-link/src/RSocketLink.ts
index bf289664..26a37df7 100644
--- a/packages/rsocket-graphql-apollo-link/src/RSocketLink.ts
+++ b/packages/rsocket-graphql-apollo-link/src/RSocketLink.ts
@@ -18,7 +18,7 @@ import { split } from "@apollo/client/core";
 import { getMainDefinition } from "@apollo/client/utilities";
 import { RSocketQueryLink } from "./RSocketQueryLink";
 import { RSocketSubscriptionLink } from "./RSocketSubscriptionLink";
-import { RSocket } from "rsocket-core";
+import { RSocket } from "@rsocket/core";
 
 export type makeRSocketLinkConfig = {
   rsocket: RSocket;
diff --git a/packages/rsocket-graphql-apollo-link/src/RSocketQueryLink.ts b/packages/rsocket-graphql-apollo-link/src/RSocketQueryLink.ts
index 7aad9909..8ce3bc8d 100644
--- a/packages/rsocket-graphql-apollo-link/src/RSocketQueryLink.ts
+++ b/packages/rsocket-graphql-apollo-link/src/RSocketQueryLink.ts
@@ -22,12 +22,12 @@ import {
   Observable,
   Operation,
 } from "@apollo/client/core";
-import { Payload, RSocket } from "rsocket-core";
+import { Payload, RSocket } from "@rsocket/core";
 import {
   encodeCompositeMetadata,
   encodeRoutes,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 import { print } from "graphql";
 
 type QueryLinkOptions = {
diff --git a/packages/rsocket-graphql-apollo-link/src/RSocketSubscriptionLink.ts b/packages/rsocket-graphql-apollo-link/src/RSocketSubscriptionLink.ts
index 5826556a..1b569bf5 100644
--- a/packages/rsocket-graphql-apollo-link/src/RSocketSubscriptionLink.ts
+++ b/packages/rsocket-graphql-apollo-link/src/RSocketSubscriptionLink.ts
@@ -24,13 +24,13 @@ import {
   Observer,
   Operation,
 } from "@apollo/client/core";
-import { MAX_REQUEST_COUNT, Payload, RSocket } from "rsocket-core";
+import { MAX_REQUEST_COUNT, Payload, RSocket } from "@rsocket/core";
 import { ExecutionResult, print } from "graphql";
 import {
   encodeCompositeMetadata,
   encodeRoutes,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 
 type SubscribeOperation = {
   query: String;
diff --git a/packages/rsocket-graphql-apollo-server/package.json b/packages/rsocket-graphql-apollo-server/package.json
index c9851e70..eeca616e 100644
--- a/packages/rsocket-graphql-apollo-server/package.json
+++ b/packages/rsocket-graphql-apollo-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-graphql-apollo-server",
+  "name": "@rsocket/graphql-apollo-server",
   "version": "1.0.0-alpha.1",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -9,6 +9,9 @@
     "LICENSE",
     "README.md"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "yarn run clean && yarn run compile",
     "clean": "rimraf -rf ./dist",
@@ -19,16 +22,17 @@
   "dependencies": {
     "@apollo/client": "^3.5.10",
     "@graphql-tools/schema": "^8.3.5",
-    "rsocket-composite-metadata": "^1.0.0-alpha.1",
-    "rsocket-core": "^1.0.0-alpha.1",
-    "apollo-server-plugin-base": "^3.6.2",
+    "@rsocket/composite-metadata": "^1.0.0-alpha.1",
+    "@rsocket/core": "^1.0.0-alpha.1",
     "apollo-server-core": "^3.6.6",
     "apollo-server-env": "^4.2.1",
+    "apollo-server-plugin-base": "^3.6.2",
     "graphql": "^16.3.0",
     "rxjs": "^7.5"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
     "typescript": "~4.5.2"
-  }
+  },
+  "gitHead": "39565e56d069f40fd9ac8d169f8f62a918f7f723"
 }
diff --git a/packages/rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin.ts b/packages/rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin.ts
index d4a943ed..4369f736 100644
--- a/packages/rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin.ts
+++ b/packages/rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin.ts
@@ -4,7 +4,7 @@ import {
   GraphQLServerListener,
   GraphQLServiceContext,
 } from "apollo-server-plugin-base";
-import { RSocket } from "rsocket-core";
+import { RSocket } from "@rsocket/core";
 import { RSocketApolloServer } from "./RSocketApolloServer";
 
 type RSocketApolloGraphlQLPluginOptions = {
diff --git a/packages/rsocket-graphql-apollo-server/src/RSocketApolloServer.ts b/packages/rsocket-graphql-apollo-server/src/RSocketApolloServer.ts
index bd01cf28..45c30160 100644
--- a/packages/rsocket-graphql-apollo-server/src/RSocketApolloServer.ts
+++ b/packages/rsocket-graphql-apollo-server/src/RSocketApolloServer.ts
@@ -6,7 +6,7 @@ import {
   Payload,
   Requestable,
   RSocket,
-} from "rsocket-core";
+} from "@rsocket/core";
 import {
   ApolloServerBase,
   GraphQLOptions,
diff --git a/packages/rsocket-graphql-apollo-server/src/utilities.ts b/packages/rsocket-graphql-apollo-server/src/utilities.ts
index 271fa181..2efea987 100644
--- a/packages/rsocket-graphql-apollo-server/src/utilities.ts
+++ b/packages/rsocket-graphql-apollo-server/src/utilities.ts
@@ -1,9 +1,9 @@
-import { Payload } from "rsocket-core";
+import { Payload } from "@rsocket/core";
 import {
   decodeCompositeMetadata,
   decodeRoutes,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 import MESSAGE_RSOCKET_ROUTING = WellKnownMimeType.MESSAGE_RSOCKET_ROUTING;
 
 const APPLICATION_GRAPHQL_JSON = "application/graphql+json";
diff --git a/packages/rsocket-messaging/package.json b/packages/rsocket-messaging/package.json
index 9a8599e1..5dde7bad 100644
--- a/packages/rsocket-messaging/package.json
+++ b/packages/rsocket-messaging/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-messaging",
+  "name": "@rsocket/messaging",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -19,8 +19,8 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "rsocket-composite-metadata": "^1.0.0-alpha.3",
-    "rsocket-core": "^1.0.0-alpha.3"
+    "@rsocket/composite-metadata": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
diff --git a/packages/rsocket-messaging/src/index.ts b/packages/rsocket-messaging/src/index.ts
index 8cd9a70e..f8413a8d 100644
--- a/packages/rsocket-messaging/src/index.ts
+++ b/packages/rsocket-messaging/src/index.ts
@@ -21,7 +21,7 @@ import {
   decodeRoutes,
   encodeRoutes,
   WellKnownMimeType,
-} from "rsocket-composite-metadata";
+} from "@rsocket/composite-metadata";
 import {
   Cancellable,
   ErrorCodes,
@@ -33,7 +33,7 @@ import {
   Requestable,
   RSocket,
   RSocketError,
-} from "rsocket-core";
+} from "@rsocket/core";
 
 export interface Codec<D> {
   mimeType: string;
diff --git a/packages/rsocket-tcp-client/package.json b/packages/rsocket-tcp-client/package.json
index 866a6bde..48d23863 100644
--- a/packages/rsocket-tcp-client/package.json
+++ b/packages/rsocket-tcp-client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-tcp-client",
+  "name": "@rsocket/tcp-client",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -20,7 +20,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3"
+    "@rsocket/core": "^1.0.0-alpha.3"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
diff --git a/packages/rsocket-tcp-client/src/TcpClientTransport.ts b/packages/rsocket-tcp-client/src/TcpClientTransport.ts
index 8e4bd0df..539b2af7 100644
--- a/packages/rsocket-tcp-client/src/TcpClientTransport.ts
+++ b/packages/rsocket-tcp-client/src/TcpClientTransport.ts
@@ -23,7 +23,7 @@ import {
   FrameHandler,
   Multiplexer,
   Outbound,
-} from "rsocket-core";
+} from "@rsocket/core";
 import net, { SocketConnectOpts } from "net";
 import { TcpDuplexConnection } from "./TcpDuplexConnection";
 
diff --git a/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts b/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts
index c04e8ec4..f0c04cf4 100644
--- a/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts
+++ b/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrameWithLength,
-} from "rsocket-core";
+} from "@rsocket/core";
 import net from "net";
 
 export class TcpDuplexConnection
diff --git a/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts b/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts
index d83755bf..0253380d 100644
--- a/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts
+++ b/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts
@@ -3,7 +3,7 @@ import { TcpDuplexConnection } from "../TcpDuplexConnection";
 import * as net from "net";
 import sinon from "sinon";
 import EventEmitter from "events";
-import { Demultiplexer, FrameHandler, Multiplexer } from "rsocket-core/src";
+import { Demultiplexer, FrameHandler, Multiplexer } from "@rsocket/core/src";
 import { mock } from "jest-mock-extended";
 
 describe("TcpClientTransport", function () {
diff --git a/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts b/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts
index c820e08c..e41054d8 100644
--- a/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts
+++ b/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts
@@ -11,7 +11,7 @@ import {
   Multiplexer,
   serializeFrameWithLength,
   SetupFrame,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { MockSocket } from "../__mocks__/net";
 import { TcpDuplexConnection } from "../TcpDuplexConnection";
 
diff --git a/packages/rsocket-tcp-server/package.json b/packages/rsocket-tcp-server/package.json
index cc45a7fc..aa0be06b 100644
--- a/packages/rsocket-tcp-server/package.json
+++ b/packages/rsocket-tcp-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-tcp-server",
+  "name": "@rsocket/tcp-server",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -20,7 +20,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3"
+    "@rsocket/core": "^1.0.0-alpha.3"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
diff --git a/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts b/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts
index 59fee149..e0e4952d 100644
--- a/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts
+++ b/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrameWithLength,
-} from "rsocket-core";
+} from "@rsocket/core";
 import net from "net";
 
 export class TcpDuplexConnection
diff --git a/packages/rsocket-tcp-server/src/TcpServerTransport.ts b/packages/rsocket-tcp-server/src/TcpServerTransport.ts
index b63335dc..dd5dfd48 100644
--- a/packages/rsocket-tcp-server/src/TcpServerTransport.ts
+++ b/packages/rsocket-tcp-server/src/TcpServerTransport.ts
@@ -24,7 +24,7 @@ import {
   Multiplexer,
   Outbound,
   ServerTransport,
-} from "rsocket-core";
+} from "@rsocket/core";
 import net from "net";
 import { TcpDuplexConnection } from "./TcpDuplexConnection";
 
diff --git a/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts b/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts
index 86f2eb60..4c954557 100644
--- a/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts
+++ b/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts
@@ -1,7 +1,7 @@
 // import { TcpDuplexConnection } from "../TcpDuplexConnection";
 // import sinon from "sinon";
 // import EventEmitter from "events";
-// import { DuplexConnection } from "rsocket-core/src";
+// import { DuplexConnection } from "@rsocket/core/src";
 
 describe("TcpClientTransport", function () {
   describe("connect", () => {
diff --git a/packages/rsocket-websocket-client/package.json b/packages/rsocket-websocket-client/package.json
index 4abee493..22f1d32b 100644
--- a/packages/rsocket-websocket-client/package.json
+++ b/packages/rsocket-websocket-client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-websocket-client",
+  "name": "@rsocket/websocket-client",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -20,7 +20,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3"
+    "@rsocket/core": "^1.0.0-alpha.3"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",
diff --git a/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts b/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts
index c70a1056..ad020060 100644
--- a/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts
+++ b/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts
@@ -23,7 +23,7 @@ import {
   FrameHandler,
   Multiplexer,
   Outbound,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { WebsocketDuplexConnection } from "./WebsocketDuplexConnection";
 
 export type ClientOptions = {
diff --git a/packages/rsocket-websocket-client/src/WebsocketDuplexConnection.ts b/packages/rsocket-websocket-client/src/WebsocketDuplexConnection.ts
index 551b82a5..e02d623e 100644
--- a/packages/rsocket-websocket-client/src/WebsocketDuplexConnection.ts
+++ b/packages/rsocket-websocket-client/src/WebsocketDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrame,
-} from "rsocket-core";
+} from "@rsocket/core";
 
 export class WebsocketDuplexConnection
   extends Deferred
diff --git a/packages/rsocket-websocket-client/src/__tests__/WebsocketDuplexConnection.spec.ts b/packages/rsocket-websocket-client/src/__tests__/WebsocketDuplexConnection.spec.ts
index f2008479..0ad3f313 100644
--- a/packages/rsocket-websocket-client/src/__tests__/WebsocketDuplexConnection.spec.ts
+++ b/packages/rsocket-websocket-client/src/__tests__/WebsocketDuplexConnection.spec.ts
@@ -8,7 +8,7 @@ import {
   Multiplexer,
   serializeFrame,
   SetupFrame,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { WebsocketDuplexConnection } from "../WebsocketDuplexConnection";
 import { MockSocket } from "../__mocks__/ws";
 
diff --git a/packages/rsocket-websocket-server/package.json b/packages/rsocket-websocket-server/package.json
index d82ce24c..c6d656f0 100644
--- a/packages/rsocket-websocket-server/package.json
+++ b/packages/rsocket-websocket-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rsocket-websocket-server",
+  "name": "@rsocket/websocket-server",
   "version": "1.0.0-alpha.3",
   "license": "Apache-2.0",
   "main": "dist/index",
@@ -20,7 +20,7 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "rsocket-core": "^1.0.0-alpha.3",
+    "@rsocket/core": "^1.0.0-alpha.3",
     "ws": "~8.2.3"
   },
   "devDependencies": {
diff --git a/packages/rsocket-websocket-server/src/WebsocketDuplexConnection.ts b/packages/rsocket-websocket-server/src/WebsocketDuplexConnection.ts
index e2479516..55ba51da 100644
--- a/packages/rsocket-websocket-server/src/WebsocketDuplexConnection.ts
+++ b/packages/rsocket-websocket-server/src/WebsocketDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrame,
-} from "rsocket-core";
+} from "@rsocket/core";
 import { Duplex } from "stream";
 
 export class WebsocketDuplexConnection
diff --git a/packages/rsocket-websocket-server/src/WebsocketServerTransport.ts b/packages/rsocket-websocket-server/src/WebsocketServerTransport.ts
index 4d0f78f9..10d384b2 100644
--- a/packages/rsocket-websocket-server/src/WebsocketServerTransport.ts
+++ b/packages/rsocket-websocket-server/src/WebsocketServerTransport.ts
@@ -24,7 +24,7 @@ import {
   Multiplexer,
   Outbound,
   ServerTransport,
-} from "rsocket-core";
+} from "@rsocket/core";
 import WebSocket, { Server } from "ws";
 import { WebsocketDuplexConnection } from "./WebsocketDuplexConnection";
 
diff --git a/tsconfig.json b/tsconfig.json
index de534b62..c83a05a5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "rsocket-*": [
+      "@rsocket/*": [
         "packages/rsocket-*/src"
       ]
     }