diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index 6baa230dd4..210d297184 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Buffer.ts b/src/Buffer.ts
index 65b7d58e53..2d23980dc9 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/BufferSet.test.ts b/src/BufferSet.test.ts
index 320241ca52..b9c1824dbe 100644
--- a/src/BufferSet.test.ts
+++ b/src/BufferSet.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/BufferSet.ts b/src/BufferSet.ts
index 64b364e92f..e31d2278f1 100644
--- a/src/BufferSet.ts
+++ b/src/BufferSet.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Charsets.ts b/src/Charsets.ts
index c2c92e8d4a..0ee91d326d 100644
--- a/src/Charsets.ts
+++ b/src/Charsets.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/CompositionHelper.test.ts b/src/CompositionHelper.test.ts
index 7d78a259bb..09a59f729f 100644
--- a/src/CompositionHelper.test.ts
+++ b/src/CompositionHelper.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/CompositionHelper.ts b/src/CompositionHelper.ts
index 345041d667..cec8fb3738 100644
--- a/src/CompositionHelper.ts
+++ b/src/CompositionHelper.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/EscapeSequences.ts b/src/EscapeSequences.ts
index 9542658faa..cb97c3680e 100644
--- a/src/EscapeSequences.ts
+++ b/src/EscapeSequences.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/EventEmitter.test.ts b/src/EventEmitter.test.ts
index d61f994ab5..c1f0a0aba8 100644
--- a/src/EventEmitter.test.ts
+++ b/src/EventEmitter.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/EventEmitter.ts b/src/EventEmitter.ts
index a1768d2d4a..414eac8956 100644
--- a/src/EventEmitter.ts
+++ b/src/EventEmitter.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/InputHandler.test.ts b/src/InputHandler.test.ts
index f6e07f7efd..a8b2ff1264 100644
--- a/src/InputHandler.test.ts
+++ b/src/InputHandler.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 3bf16a1c38..88a86a4417 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1,4 +1,6 @@
 /**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
  * @license MIT
  */
 
diff --git a/src/Interfaces.ts b/src/Interfaces.ts
index b777968886..d022dc3ebd 100644
--- a/src/Interfaces.ts
+++ b/src/Interfaces.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index f165590f94..17793fca54 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index 55d8d68d95..d3839cb5b3 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Parser.ts b/src/Parser.ts
index b047f91f7a..b6493fea52 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -1,4 +1,6 @@
 /**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
  * @license MIT
  */
 
diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
index 8c90693e99..e5bdc117c5 100644
--- a/src/SelectionManager.test.ts
+++ b/src/SelectionManager.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index 4fe09c8c0f..29f12169b5 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/SelectionModel.test.ts b/src/SelectionModel.test.ts
index 6c750ed240..e195d6bde1 100644
--- a/src/SelectionModel.test.ts
+++ b/src/SelectionModel.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/SelectionModel.ts b/src/SelectionModel.ts
index 8c599fd7ae..1fbf40fe89 100644
--- a/src/SelectionModel.ts
+++ b/src/SelectionModel.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Terminal.integration.ts b/src/Terminal.integration.ts
index 124e89cb8e..00db4dd68c 100644
--- a/src/Terminal.integration.ts
+++ b/src/Terminal.integration.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  *
  * This file contains integration tests for xterm.js.
diff --git a/src/Terminal.test.ts b/src/Terminal.test.ts
index 7a44ee81e9..fd173831fa 100644
--- a/src/Terminal.test.ts
+++ b/src/Terminal.test.ts
@@ -1,4 +1,9 @@
-import { assert, expect } from 'chai';
+/**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+ import { assert, expect } from 'chai';
 import { Terminal } from './Terminal';
 import { MockViewport, MockCompositionHelper, MockRenderer } from './utils/TestUtils.test';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from './Buffer';
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 1a180cc152..e19887cbc2 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -1,5 +1,8 @@
 /**
- * xterm.js: xterm, in the browser
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * @license MIT
+ *
  * Originally forked from (with the author's permission):
  *   Fabrice Bellard's javascript vt100 for jslinux:
  *   http://bellard.org/jslinux/
@@ -7,7 +10,6 @@
  *   The original design remains. The terminal itself
  *   has been extended to include xterm CSI codes, among
  *   other features.
- * @license MIT
  *
  * Terminal Emulation References:
  *   http://vt100.net/
diff --git a/src/Types.ts b/src/Types.ts
index 06d495026c..a0c03fdd7d 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Viewport.test.ts b/src/Viewport.test.ts
index 6d23e19a1f..6ce798d327 100644
--- a/src/Viewport.test.ts
+++ b/src/Viewport.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/Viewport.ts b/src/Viewport.ts
index 2de698a0e0..1f693cfeb6 100644
--- a/src/Viewport.ts
+++ b/src/Viewport.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/addons/attach/attach.js b/src/addons/attach/attach.js
index 34dc4f681f..834ccd3c5d 100644
--- a/src/addons/attach/attach.js
+++ b/src/addons/attach/attach.js
@@ -1,7 +1,8 @@
 /**
- * Implements the attach method, that attaches the terminal to a WebSocket stream.
- * @module xterm/addons/attach/attach
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
  * @license MIT
+ *
+ * Implements the attach method, that attaches the terminal to a WebSocket stream.
  */
 
 (function (attach) {
diff --git a/src/addons/fit/fit.js b/src/addons/fit/fit.js
index 60214dad9e..59f0fd52e0 100644
--- a/src/addons/fit/fit.js
+++ b/src/addons/fit/fit.js
@@ -1,14 +1,16 @@
 /**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * @license MIT
+ *
  * Fit terminal columns and rows to the dimensions of its DOM element.
  *
  * ## Approach
- * - Rows: Truncate the division of the terminal parent element height by the terminal row height.
  *
- * - Columns: Truncate the division of the terminal parent element width by the terminal character
- * width (apply display: inline at the terminal row and truncate its width with the current
- * number of columns).
- * @module xterm/addons/fit/fit
- * @license MIT
+ *    Rows: Truncate the division of the terminal parent element height by the
+ *          terminal row height.
+ * Columns: Truncate the division of the terminal parent element width by the
+ *          terminal character width (apply display: inline at the terminal
+ *          row and truncate its width with the current number of columns).
  */
 
 (function (fit) {
diff --git a/src/addons/fullscreen/fullscreen.js b/src/addons/fullscreen/fullscreen.js
index 344669f6df..1474d2db6f 100644
--- a/src/addons/fullscreen/fullscreen.js
+++ b/src/addons/fullscreen/fullscreen.js
@@ -1,8 +1,8 @@
 /**
- * Fullscreen addon for xterm.js
- * @module xterm/addons/fullscreen/fullscreen
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
  * @license MIT
  */
+
 (function (fullscreen) {
   if (typeof exports === 'object' && typeof module === 'object') {
     /*
diff --git a/src/addons/search/SearchHelper.ts b/src/addons/search/SearchHelper.ts
index 26e4e8a7d2..1747e747e5 100644
--- a/src/addons/search/SearchHelper.ts
+++ b/src/addons/search/SearchHelper.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/addons/search/search.ts b/src/addons/search/search.ts
index 34223c4ea7..69c5737b53 100644
--- a/src/addons/search/search.ts
+++ b/src/addons/search/search.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/addons/terminado/terminado.js b/src/addons/terminado/terminado.js
index d1414c864b..54af76337a 100644
--- a/src/addons/terminado/terminado.js
+++ b/src/addons/terminado/terminado.js
@@ -1,8 +1,9 @@
 /**
- * This module provides methods for attaching a terminal to a terminado WebSocket stream.
- *
- * @module xterm/addons/terminado/terminado
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
+ *
+ * This module provides methods for attaching a terminal to a terminado
+ * WebSocket stream.
  */
 
 (function (attach) {
diff --git a/src/handlers/Clipboard.test.ts b/src/handlers/Clipboard.test.ts
index bd2cea0366..6901b73006 100644
--- a/src/handlers/Clipboard.test.ts
+++ b/src/handlers/Clipboard.test.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { assert } from 'chai';
 import * as Terminal from '../Terminal';
 import * as Clipboard from './Clipboard';
diff --git a/src/handlers/Clipboard.ts b/src/handlers/Clipboard.ts
index ac9a7b8714..a973535203 100644
--- a/src/handlers/Clipboard.ts
+++ b/src/handlers/Clipboard.ts
@@ -1,7 +1,5 @@
 /**
- * Clipboard handler module: exports methods for handling all clipboard-related events in the
- * terminal.
- * @module xterm/handlers/Clipboard
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/input/Interfaces.ts b/src/input/Interfaces.ts
index 19125d0801..e3ed4eef2c 100644
--- a/src/input/Interfaces.ts
+++ b/src/input/Interfaces.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 export interface IMouseZoneManager {
   add(zone: IMouseZone): void;
   clearAll(): void;
diff --git a/src/input/MouseZoneManager.ts b/src/input/MouseZoneManager.ts
index 1a6cedada9..d1bc8a758b 100644
--- a/src/input/MouseZoneManager.ts
+++ b/src/input/MouseZoneManager.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IMouseZoneManager, IMouseZone } from './Interfaces';
 import { ITerminal } from '../Interfaces';
 import { getCoords } from '../utils/Mouse';
diff --git a/src/renderer/BackgroundRenderLayer.ts b/src/renderer/BackgroundRenderLayer.ts
index 292847c2db..0c09727db7 100644
--- a/src/renderer/BackgroundRenderLayer.ts
+++ b/src/renderer/BackgroundRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';
 import { CHAR_DATA_ATTR_INDEX } from '../Buffer';
diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 4efc54812d..cc02bcea90 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IRenderLayer, IColorSet } from './Interfaces';
 import { ITerminal, ITerminalOptions } from '../Interfaces';
 import { acquireCharAtlas, CHAR_ATLAS_CELL_SPACING } from './CharAtlas';
diff --git a/src/renderer/CharAtlas.ts b/src/renderer/CharAtlas.ts
index 434b263baa..bf080cce57 100644
--- a/src/renderer/CharAtlas.ts
+++ b/src/renderer/CharAtlas.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { ITerminal, ITheme } from '../Interfaces';
 import { IColorSet } from '../renderer/Interfaces';
 import { isFirefox } from '../utils/Browser';
diff --git a/src/renderer/ColorManager.test.ts b/src/renderer/ColorManager.test.ts
index 6bd9c97775..e00f6b6d31 100644
--- a/src/renderer/ColorManager.test.ts
+++ b/src/renderer/ColorManager.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/renderer/ColorManager.ts b/src/renderer/ColorManager.ts
index 057292f77c..b9afd0e1a6 100644
--- a/src/renderer/ColorManager.ts
+++ b/src/renderer/ColorManager.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { ITheme } from '../Interfaces';
 
diff --git a/src/renderer/CursorRenderLayer.ts b/src/renderer/CursorRenderLayer.ts
index a888d54fa5..b136a13a18 100644
--- a/src/renderer/CursorRenderLayer.ts
+++ b/src/renderer/CursorRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { IBuffer, ICharMeasure, ITerminal, ITerminalOptions } from '../Interfaces';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';
diff --git a/src/renderer/ForegroundRenderLayer.ts b/src/renderer/ForegroundRenderLayer.ts
index bef57a0076..883be5d94a 100644
--- a/src/renderer/ForegroundRenderLayer.ts
+++ b/src/renderer/ForegroundRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';
 import { CHAR_DATA_ATTR_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from '../Buffer';
diff --git a/src/renderer/GridCache.test.ts b/src/renderer/GridCache.test.ts
index 37e55ee143..c4b1c220ee 100644
--- a/src/renderer/GridCache.test.ts
+++ b/src/renderer/GridCache.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/renderer/GridCache.ts b/src/renderer/GridCache.ts
index 3b3ae8dfab..dd188c6269 100644
--- a/src/renderer/GridCache.ts
+++ b/src/renderer/GridCache.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 export class GridCache<T> {
   public cache: T[][];
 
diff --git a/src/renderer/Interfaces.ts b/src/renderer/Interfaces.ts
index e6b09843df..05f98300d7 100644
--- a/src/renderer/Interfaces.ts
+++ b/src/renderer/Interfaces.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { ITerminal, ITerminalOptions, ITheme } from '../Interfaces';
 
 export interface IRenderer {
diff --git a/src/renderer/LinkRenderLayer.ts b/src/renderer/LinkRenderLayer.ts
index b948b70dc5..9b2cabb32d 100644
--- a/src/renderer/LinkRenderLayer.ts
+++ b/src/renderer/LinkRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { IBuffer, ICharMeasure, ITerminal, ILinkifierAccessor } from '../Interfaces';
 import { CHAR_DATA_ATTR_INDEX } from '../Buffer';
diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index ebdd0bdbcf..131a8b7849 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/renderer/SelectionRenderLayer.ts b/src/renderer/SelectionRenderLayer.ts
index 91e62a0c6d..39569c9beb 100644
--- a/src/renderer/SelectionRenderLayer.ts
+++ b/src/renderer/SelectionRenderLayer.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { IColorSet } from './Interfaces';
 import { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';
 import { CHAR_DATA_ATTR_INDEX } from '../Buffer';
diff --git a/src/renderer/Types.ts b/src/renderer/Types.ts
index 09e74439f4..b1a930f9d0 100644
--- a/src/renderer/Types.ts
+++ b/src/renderer/Types.ts
@@ -1,4 +1,9 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+ /**
  * Flags used to render terminal text properly.
  */
 export enum FLAGS {
diff --git a/src/utils/Browser.ts b/src/utils/Browser.ts
index 68148aeb65..48c0c3748f 100644
--- a/src/utils/Browser.ts
+++ b/src/utils/Browser.ts
@@ -1,6 +1,5 @@
 /**
- * Attributes and methods to help with identifying the current browser and platform.
- * @module xterm/utils/Browser
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/CharMeasure.test.ts b/src/utils/CharMeasure.test.ts
index 02a8dae9e1..5d2358f4bf 100644
--- a/src/utils/CharMeasure.test.ts
+++ b/src/utils/CharMeasure.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/CharMeasure.ts b/src/utils/CharMeasure.ts
index 37d6697aa9..e8fcff8626 100644
--- a/src/utils/CharMeasure.ts
+++ b/src/utils/CharMeasure.ts
@@ -1,5 +1,5 @@
 /**
- * @module xterm/utils/CharMeasure
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/CircularList.test.ts b/src/utils/CircularList.test.ts
index f404b6f28e..6bb35113ac 100644
--- a/src/utils/CircularList.test.ts
+++ b/src/utils/CircularList.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/CircularList.ts b/src/utils/CircularList.ts
index e188fb5d86..97a32b790b 100644
--- a/src/utils/CircularList.ts
+++ b/src/utils/CircularList.ts
@@ -1,13 +1,15 @@
 /**
- * Represents a circular list; a list with a maximum size that wraps around when push is called,
- * overriding values at the start of the list.
- * @module xterm/utils/CircularList
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
 import { EventEmitter } from '../EventEmitter';
 import { ICircularList } from '../Interfaces';
 
+/**
+ * Represents a circular list; a list with a maximum size that wraps around when push is called,
+ * overriding values at the start of the list.
+ */
 export class CircularList<T> extends EventEmitter implements ICircularList<T> {
   protected _array: T[];
   private _startIndex: number;
diff --git a/src/utils/Generic.ts b/src/utils/Generic.ts
index 9807232605..823736178f 100644
--- a/src/utils/Generic.ts
+++ b/src/utils/Generic.ts
@@ -1,6 +1,5 @@
 /**
- * Generic utilities module with methods that can be helpful at different parts of the code base.
- * @module xterm/utils/Generic
+ * Copyright (c) 2016 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/Mouse.test.ts b/src/utils/Mouse.test.ts
index 15b68ef2d1..4163263be3 100644
--- a/src/utils/Mouse.test.ts
+++ b/src/utils/Mouse.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/Mouse.ts b/src/utils/Mouse.ts
index 3bbad855ab..aef76d5bab 100644
--- a/src/utils/Mouse.ts
+++ b/src/utils/Mouse.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/Sounds.ts b/src/utils/Sounds.ts
index 6d20c67122..03f36f4267 100644
--- a/src/utils/Sounds.ts
+++ b/src/utils/Sounds.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts
index e229fc8782..eb2f25017b 100644
--- a/src/utils/TestUtils.test.ts
+++ b/src/utils/TestUtils.test.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  */
 
diff --git a/src/xterm.css b/src/xterm.css
index c26d459d72..399f56ceb5 100644
--- a/src/xterm.css
+++ b/src/xterm.css
@@ -1,8 +1,8 @@
 /**
- * xterm.js: xterm, in the browser
- * Copyright (c) 2014-2016, SourceLair Private Company (www.sourcelair.com (MIT License)
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
  * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
  * https://github.com/chjj/term.js
+ * @license MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/xterm.ts b/src/xterm.ts
index 50ac559287..6df3a4c065 100644
--- a/src/xterm.ts
+++ b/src/xterm.ts
@@ -1,4 +1,5 @@
 /**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
  * @license MIT
  *
  * This file is the entry point for browserify.