diff --git a/addons/@xterm/addon-attach/.gitignore b/addons/@xtermjs/addon-attach/.gitignore
similarity index 100%
rename from addons/@xterm/addon-attach/.gitignore
rename to addons/@xtermjs/addon-attach/.gitignore
diff --git a/addons/@xterm/addon-attach/.npmignore b/addons/@xtermjs/addon-attach/.npmignore
similarity index 100%
rename from addons/@xterm/addon-attach/.npmignore
rename to addons/@xtermjs/addon-attach/.npmignore
diff --git a/addons/@xterm/addon-attach/LICENSE b/addons/@xtermjs/addon-attach/LICENSE
similarity index 100%
rename from addons/@xterm/addon-attach/LICENSE
rename to addons/@xtermjs/addon-attach/LICENSE
diff --git a/addons/@xterm/addon-attach/package.json b/addons/@xtermjs/addon-attach/package.json
similarity index 90%
rename from addons/@xterm/addon-attach/package.json
rename to addons/@xtermjs/addon-attach/package.json
index f1bcc459..56c09d68 100644
--- a/addons/@xterm/addon-attach/package.json
+++ b/addons/@xtermjs/addon-attach/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@xterm/addon-attach",
+  "name": "@xtermjs/addon-attach",
   "version": "0.1.0-beta8",
   "author": {
     "name": "The xterm.js authors",
diff --git a/addons/@xterm/addon-attach/src/AttachAddon.api.ts b/addons/@xtermjs/addon-attach/src/AttachAddon.api.ts
similarity index 100%
rename from addons/@xterm/addon-attach/src/AttachAddon.api.ts
rename to addons/@xtermjs/addon-attach/src/AttachAddon.api.ts
diff --git a/addons/@xterm/addon-attach/src/AttachAddon.ts b/addons/@xtermjs/addon-attach/src/AttachAddon.ts
similarity index 100%
rename from addons/@xterm/addon-attach/src/AttachAddon.ts
rename to addons/@xtermjs/addon-attach/src/AttachAddon.ts
diff --git a/addons/@xterm/addon-attach/src/tsconfig.json b/addons/@xtermjs/addon-attach/src/tsconfig.json
similarity index 100%
rename from addons/@xterm/addon-attach/src/tsconfig.json
rename to addons/@xtermjs/addon-attach/src/tsconfig.json
diff --git a/addons/@xterm/addon-attach/typings/attach.d.ts b/addons/@xtermjs/addon-attach/typings/attach.d.ts
similarity index 95%
rename from addons/@xterm/addon-attach/typings/attach.d.ts
rename to addons/@xtermjs/addon-attach/typings/attach.d.ts
index da2fb6e1..90538bf6 100644
--- a/addons/@xterm/addon-attach/typings/attach.d.ts
+++ b/addons/@xtermjs/addon-attach/typings/attach.d.ts
@@ -5,7 +5,7 @@
 
 import { Terminal, ILinkMatcherOptions, ITerminalAddon } from 'xterm';
 
-declare module '@xterm/addon-attach' {
+declare module '@xtermjs/addon-attach' {
   export interface IAttachOptions {
     /**
      * Whether input should be written to the backend. Defaults to `true`.
diff --git a/addons/@xterm/addon-fit/.gitignore b/addons/@xtermjs/addon-fit/.gitignore
similarity index 100%
rename from addons/@xterm/addon-fit/.gitignore
rename to addons/@xtermjs/addon-fit/.gitignore
diff --git a/addons/@xterm/addon-fit/.npmignore b/addons/@xtermjs/addon-fit/.npmignore
similarity index 100%
rename from addons/@xterm/addon-fit/.npmignore
rename to addons/@xtermjs/addon-fit/.npmignore
diff --git a/addons/@xterm/addon-fit/LICENSE b/addons/@xtermjs/addon-fit/LICENSE
similarity index 100%
rename from addons/@xterm/addon-fit/LICENSE
rename to addons/@xtermjs/addon-fit/LICENSE
diff --git a/addons/@xterm/addon-fit/package.json b/addons/@xtermjs/addon-fit/package.json
similarity index 91%
rename from addons/@xterm/addon-fit/package.json
rename to addons/@xtermjs/addon-fit/package.json
index a2ac73f0..1bbe1c79 100644
--- a/addons/@xterm/addon-fit/package.json
+++ b/addons/@xtermjs/addon-fit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@xterm/addon-fit",
+  "name": "@xtermjs/addon-fit",
   "version": "0.1.0-beta7",
   "author": {
     "name": "The xterm.js authors",
diff --git a/addons/@xterm/addon-fit/src/FitAddon.ts b/addons/@xtermjs/addon-fit/src/FitAddon.ts
similarity index 100%
rename from addons/@xterm/addon-fit/src/FitAddon.ts
rename to addons/@xtermjs/addon-fit/src/FitAddon.ts
diff --git a/addons/@xterm/addon-fit/src/tsconfig.json b/addons/@xtermjs/addon-fit/src/tsconfig.json
similarity index 100%
rename from addons/@xterm/addon-fit/src/tsconfig.json
rename to addons/@xtermjs/addon-fit/src/tsconfig.json
diff --git a/addons/@xterm/addon-fit/typings/fit.d.ts b/addons/@xtermjs/addon-fit/typings/fit.d.ts
similarity index 96%
rename from addons/@xterm/addon-fit/typings/fit.d.ts
rename to addons/@xtermjs/addon-fit/typings/fit.d.ts
index aabde31d..5592a205 100644
--- a/addons/@xterm/addon-fit/typings/fit.d.ts
+++ b/addons/@xtermjs/addon-fit/typings/fit.d.ts
@@ -5,7 +5,7 @@
 
 import { Terminal, ITerminalAddon } from 'xterm';
 
-declare module '@xterm/addon-fit' {
+declare module '@xtermjs/addon-fit' {
   /**
    * An xterm.js addon that enables resizing the terminal to the dimensions of
    * its containing element.
diff --git a/addons/@xterm/addon-search/.gitignore b/addons/@xtermjs/addon-search/.gitignore
similarity index 100%
rename from addons/@xterm/addon-search/.gitignore
rename to addons/@xtermjs/addon-search/.gitignore
diff --git a/addons/@xterm/addon-search/.npmignore b/addons/@xtermjs/addon-search/.npmignore
similarity index 100%
rename from addons/@xterm/addon-search/.npmignore
rename to addons/@xtermjs/addon-search/.npmignore
diff --git a/addons/@xterm/addon-search/LICENSE b/addons/@xtermjs/addon-search/LICENSE
similarity index 100%
rename from addons/@xterm/addon-search/LICENSE
rename to addons/@xtermjs/addon-search/LICENSE
diff --git a/addons/@xterm/addon-search/package.json b/addons/@xtermjs/addon-search/package.json
similarity index 90%
rename from addons/@xterm/addon-search/package.json
rename to addons/@xtermjs/addon-search/package.json
index 6b7b1013..12b141cd 100644
--- a/addons/@xterm/addon-search/package.json
+++ b/addons/@xtermjs/addon-search/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@xterm/addon-search",
+  "name": "@xtermjs/addon-search",
   "version": "0.1.0-beta4",
   "author": {
     "name": "The xterm.js authors",
diff --git a/addons/@xterm/addon-search/src/SearchAddon.ts b/addons/@xtermjs/addon-search/src/SearchAddon.ts
similarity index 100%
rename from addons/@xterm/addon-search/src/SearchAddon.ts
rename to addons/@xtermjs/addon-search/src/SearchAddon.ts
diff --git a/addons/@xterm/addon-search/src/tsconfig.json b/addons/@xtermjs/addon-search/src/tsconfig.json
similarity index 100%
rename from addons/@xterm/addon-search/src/tsconfig.json
rename to addons/@xtermjs/addon-search/src/tsconfig.json
diff --git a/addons/@xterm/addon-search/typings/search.d.ts b/addons/@xtermjs/addon-search/typings/search.d.ts
similarity index 97%
rename from addons/@xterm/addon-search/typings/search.d.ts
rename to addons/@xtermjs/addon-search/typings/search.d.ts
index da6ec32c..276f0559 100644
--- a/addons/@xterm/addon-search/typings/search.d.ts
+++ b/addons/@xtermjs/addon-search/typings/search.d.ts
@@ -5,7 +5,7 @@
 
 import { Terminal, ILinkMatcherOptions, IDisposable, ITerminalAddon } from 'xterm';
 
-declare module '@xterm/addon-search' {
+declare module '@xtermjs/addon-search' {
   /**
    * Options for a search.
    */
diff --git a/addons/@xterm/addon-web-links/.gitignore b/addons/@xtermjs/addon-web-links/.gitignore
similarity index 100%
rename from addons/@xterm/addon-web-links/.gitignore
rename to addons/@xtermjs/addon-web-links/.gitignore
diff --git a/addons/@xterm/addon-web-links/.npmignore b/addons/@xtermjs/addon-web-links/.npmignore
similarity index 100%
rename from addons/@xterm/addon-web-links/.npmignore
rename to addons/@xtermjs/addon-web-links/.npmignore
diff --git a/addons/@xterm/addon-web-links/LICENSE b/addons/@xtermjs/addon-web-links/LICENSE
similarity index 100%
rename from addons/@xterm/addon-web-links/LICENSE
rename to addons/@xtermjs/addon-web-links/LICENSE
diff --git a/addons/@xterm/addon-web-links/README.md b/addons/@xtermjs/addon-web-links/README.md
similarity index 100%
rename from addons/@xterm/addon-web-links/README.md
rename to addons/@xtermjs/addon-web-links/README.md
diff --git a/addons/@xterm/addon-web-links/package.json b/addons/@xtermjs/addon-web-links/package.json
similarity index 90%
rename from addons/@xterm/addon-web-links/package.json
rename to addons/@xtermjs/addon-web-links/package.json
index df2b2566..af270c98 100644
--- a/addons/@xterm/addon-web-links/package.json
+++ b/addons/@xtermjs/addon-web-links/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@xtermaddon-web-links",
+  "name": "@xtermjs/addon-web-links",
   "version": "0.1.0-beta7",
   "author": {
     "name": "The xterm.js authors",
diff --git a/addons/@xterm/addon-web-links/src/WebLinksAddon.api.ts b/addons/@xtermjs/addon-web-links/src/WebLinksAddon.api.ts
similarity index 100%
rename from addons/@xterm/addon-web-links/src/WebLinksAddon.api.ts
rename to addons/@xtermjs/addon-web-links/src/WebLinksAddon.api.ts
diff --git a/addons/@xterm/addon-web-links/src/WebLinksAddon.ts b/addons/@xtermjs/addon-web-links/src/WebLinksAddon.ts
similarity index 100%
rename from addons/@xterm/addon-web-links/src/WebLinksAddon.ts
rename to addons/@xtermjs/addon-web-links/src/WebLinksAddon.ts
diff --git a/addons/@xterm/addon-web-links/src/tsconfig.json b/addons/@xtermjs/addon-web-links/src/tsconfig.json
similarity index 100%
rename from addons/@xterm/addon-web-links/src/tsconfig.json
rename to addons/@xtermjs/addon-web-links/src/tsconfig.json
diff --git a/addons/@xterm/addon-web-links/typings/web-links.d.ts b/addons/@xtermjs/addon-web-links/typings/web-links.d.ts
similarity index 95%
rename from addons/@xterm/addon-web-links/typings/web-links.d.ts
rename to addons/@xtermjs/addon-web-links/typings/web-links.d.ts
index f2ad23ff..fdad5465 100644
--- a/addons/@xterm/addon-web-links/typings/web-links.d.ts
+++ b/addons/@xtermjs/addon-web-links/typings/web-links.d.ts
@@ -6,7 +6,7 @@
 
 import { Terminal, IDisposable, ILinkMatcherOptions } from 'xterm';
 
-declare module '@xterm/addon-web-links' {
+declare module '@xtermjs/addon-web-links' {
   // TODO: This is temporary, link to xterm when the new version is published
   export interface ITerminalAddon extends IDisposable {
     activate(terminal: Terminal): void;
diff --git a/demo/client.ts b/demo/client.ts
index a832b4ec..6a6de69b 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -12,10 +12,10 @@ import { Terminal } from '../out/public/Terminal';
 // Use webpacked version (yarn package)
 // import { Terminal } from '../lib/xterm';
 
-import { AttachAddon } from '@xterm/addon-attach';
-import { FitAddon } from '@xterm/addon-fit';
-import { SearchAddon, ISearchOptions } from '@xterm/addon-search';
-import { WebLinksAddon } from '@xterm/addon-web-links';
+import { AttachAddon } from '@xtermjs/addon-attach';
+import { FitAddon } from '@xtermjs/addon-fit';
+import { SearchAddon, ISearchOptions } from '@xtermjs/addon-search';
+import { WebLinksAddon } from '@xtermjs/addon-web-links';
 
 // Pulling in the module's types relies on the <reference> above, it's looks a
 // little weird here as we're importing "this" module
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
index 446adade..b30e275d 100644
--- a/demo/tsconfig.json
+++ b/demo/tsconfig.json
@@ -6,10 +6,10 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
-      "@xterm/addon-attach": ["../addons/@xterm/addon-attach"],
-      "@xterm/addon-fit": ["../addons/@xterm/addon-fit"],
-      "@xterm/addon-search": ["../addons/@xterm/addon-search"],
-      "@xterm/addon-web-links": ["../addons/@xterm/addon-web-links"]
+      "@xtermjs/addon-attach": ["../addons/@xtermjs/addon-attach"],
+      "@xtermjs/addon-fit": ["../addons/@xtermjs/addon-fit"],
+      "@xtermjs/addon-search": ["../addons/@xtermjs/addon-search"],
+      "@xtermjs/addon-web-links": ["../addons/@xtermjs/addon-web-links"]
     }
   },
   "include": [
diff --git a/package.json b/package.json
index 022e4e40..56b0bc43 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "prepare": "npm run build",
     "prepublishOnly": "npm run package",
     "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
-    "clean": "rm -rf lib out addons/@xterm/*/lib"
+    "clean": "rm -rf lib out addons/@xtermjs/*/lib"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",
diff --git a/tsconfig.all.json b/tsconfig.all.json
index cb33f9c7..8d38d012 100644
--- a/tsconfig.all.json
+++ b/tsconfig.all.json
@@ -3,9 +3,9 @@
   "include": [],
   "references": [
     { "path": "./src" },
-    { "path": "./addons/@xterm/addon-attach/src" },
-    { "path": "./addons/@xterm/addon-fit/src" },
-    { "path": "./addons/@xterm/addon-search/src" },
-    { "path": "./addons/@xterm/addon-web-links/src" }
+    { "path": "./addons/@xtermjs/addon-attach/src" },
+    { "path": "./addons/@xtermjs/addon-fit/src" },
+    { "path": "./addons/@xtermjs/addon-search/src" },
+    { "path": "./addons/@xtermjs/addon-web-links/src" }
   ]
 }