diff --git a/index.d.ts b/index.d.ts
index e69a042..e08c84a 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -30,21 +30,23 @@ declare module 'fastify' {
 
   export type WebsocketHandler = (
     this: FastifyInstance<Server, IncomingMessage, ServerResponse>,
-    connection: SocketStream,
+    connection: websocketPlugin.SocketStream,
     request: IncomingMessage,
     params?: { [key: string]: any }
   ) => void | Promise<any>;
 }
 
-export interface SocketStream extends Duplex {
-  socket: WebSocket;
-}
+declare const websocketPlugin: FastifyPlugin<websocketPlugin.WebsocketPluginOptions>;
 
-export interface WebsocketPluginOptions {
-  handle?: (this: FastifyInstance, connection: SocketStream) => void;
-  options?: WebSocket.ServerOptions;
-}
+declare module websocketPlugin {
+  interface SocketStream extends Duplex {
+    socket: WebSocket;
+  }
 
-declare const websocketPlugin: FastifyPlugin<WebsocketPluginOptions>;
+  interface WebsocketPluginOptions {
+    handle?: (this: FastifyInstance, connection: SocketStream) => void;
+    options?: WebSocket.ServerOptions;
+  }
+}
 
-export default websocketPlugin;
+export = websocketPlugin;
diff --git a/test/types/index.test-d.ts b/test/types/index.test-d.ts
index 7227720..5cbc185 100644
--- a/test/types/index.test-d.ts
+++ b/test/types/index.test-d.ts
@@ -1,4 +1,4 @@
-import wsPlugin, { SocketStream } from '../..';
+import * as wsPlugin from '../..';
 import fastify, { WebsocketHandler, FastifyRequest, FastifyInstance, RequestGenericInterface, FastifyReply } from 'fastify';
 import { expectType } from 'tsd';
 import { Server as HttpServer, IncomingMessage } from 'http'
@@ -9,23 +9,23 @@ app.register(wsPlugin);
 app.register(wsPlugin, {});
 app.register(wsPlugin, { options: { maxPayload: 123 } });
 app.register(wsPlugin, {
-  handle: function globalHandler(connection: SocketStream): void {
+  handle: function globalHandler(connection: wsPlugin.SocketStream): void {
     expectType<FastifyInstance>(this);
-    expectType<SocketStream>(connection)
+    expectType<wsPlugin.SocketStream>(connection)
   }
 });
 app.register(wsPlugin, { options: { perMessageDeflate: true } });
 
 app.get('/websockets-via-inferrence', { websocket: true }, async function(connection, req, params) {
   expectType<FastifyInstance>(this);
-  expectType<SocketStream>(connection);
+  expectType<wsPlugin.SocketStream>(connection);
   expectType<Server>(app.websocketServer);
   expectType<IncomingMessage>(req)
   expectType<{ [key: string]: any } | undefined>(params);
 });
 
 const handler: WebsocketHandler = async (connection, req, params) => {
-  expectType<SocketStream>(connection);
+  expectType<wsPlugin.SocketStream>(connection);
   expectType<Server>(app.websocketServer);
   expectType<IncomingMessage>(req)
   expectType<{ [key: string]: any } | undefined>(params);