diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts
index bc6d8929be59806f4fde97aaf95fe220cbc7f551..df0b6ecd14d74ff33ff7c44f251ab29e786fe21d 100644
--- a/example/src/app/app.component.ts
+++ b/example/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild, ElementRef, AfterViewInit, OnDestroy } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { DeaggResponse, Deaggregation, DeaggregationGraphView } from '@nshmp/disagg-d3/src/disagg';
+import { DisaggResponse, Disaggregation, DisaggGraphView } from '@nshmp/disagg-d3/src/disagg';
 import { Collection } from '@nshmp/disagg-d3/src/mvc';
 
 import { AppService } from './app.service';
@@ -22,12 +22,12 @@ export class AppComponent implements AfterViewInit, OnDestroy {
 
   ngAfterViewInit(): void {
     this.sub = this.service.callDeagg$.subscribe((usageResponse) => {
-      const response = new DeaggResponse(usageResponse.response.pop());
-      const deaggs = response.get<Collection<Deaggregation>>('deaggregations').data();
+      const response = new DisaggResponse(usageResponse.response.pop());
+      const deaggs = response.get<Collection<Disaggregation>>('disaggregations').data();
       const collection = new Collection(deaggs);
       collection.select(collection.data()[0]);
 
-      const view = new DeaggregationGraphView({
+      const view = new DisaggGraphView({
         el: this.el.nativeElement,
         collection,
       });
diff --git a/src/disagg/D33dDeaggregationBin.js b/src/disagg/D33dDisaggBin.js
similarity index 93%
rename from src/disagg/D33dDeaggregationBin.js
rename to src/disagg/D33dDisaggBin.js
index d61416974c6ec4a4f85e66f2bae2588275c293c1..3827c8a3389267b54ae763f3053f27c4afc82800 100644
--- a/src/disagg/D33dDeaggregationBin.js
+++ b/src/disagg/D33dDisaggBin.js
@@ -14,7 +14,7 @@ _DEFAULTS = {
 };
 
 /**
- * Represents one vertical bar on a deaggregation plot.
+ * Represents one vertical bar on a dissagregation plot.
  *
  * @param options {Object}
  * @param options.bin {Object}
@@ -38,11 +38,11 @@ _DEFAULTS = {
  *        default 1.
  *        multiplier for raw z values.
  */
-var D33dDeaggregationBin = function (options) {
+var D33dDisaggBin = function (options) {
   var _this, _initialize;
 
   _this = D33dGroup({
-    className: 'D33dDeaggregationBin',
+    className: 'D33dDisaggBin',
   });
 
   _initialize = function (options) {
@@ -110,4 +110,4 @@ var D33dDeaggregationBin = function (options) {
   return _this;
 };
 
-module.exports = D33dDeaggregationBin;
+module.exports = D33dDisaggBin;
diff --git a/src/disagg/DeaggregationGraphView.js b/src/disagg/DisaggGraphView.js
similarity index 95%
rename from src/disagg/DeaggregationGraphView.js
rename to src/disagg/DisaggGraphView.js
index 2ed45902e4bae0dc575d4dbaad0c779034ec99fc..a50a9cac467066af78a62d1be5233396d069db98 100644
--- a/src/disagg/DeaggregationGraphView.js
+++ b/src/disagg/DisaggGraphView.js
@@ -3,7 +3,7 @@
 var Collection = require('../mvc/Collection'),
   d3 = require('d3'),
   D33dAxis = require('../d3/3d/D33dAxis'),
-  D33dDeaggregationBin = require('./D33dDeaggregationBin'),
+  D33dDisaggBin = require('./D33dDisaggBin'),
   D33dPath = require('../d3/3d/D33dPath'),
   D33dView = require('../d3/view/D33dView'),
   D3Util = require('../d3/util/D3Util'),
@@ -17,10 +17,10 @@ _DEFAULTS = {};
 var __calculateBounds;
 
 /**
- * Calculate deaggregation data bounds.
+ * Calculate disaggregation data bounds.
  *
  * @param bindata {Array<Bin>}
- *     array of deaggregation bins
+ *     array of disaggregation bins
  *     where Bin is an Object:
  *       bin.r {Number}
  *             distance to bin (x-axis)
@@ -35,7 +35,7 @@ var __calculateBounds;
  *                          id of epsilon bin.
  *
  * @return {Array<Array<x0,y0,z0>, Array<x1,y1,z1>}
- *         bounds of deaggregation data.
+ *         bounds of disaggregation data.
  *         Array contains two sub arrays,
  *         containing minimum and maximum values for each axis.
  */
@@ -86,7 +86,7 @@ __calculateBounds = function (bindata) {
 };
 
 /**
- * A deaggregation distance/magnitude plot.
+ * A disaggregation distance/magnitude plot.
  *
  * @param options {Object}
  *        options are passed to SelectedCollectionView.
@@ -94,11 +94,11 @@ __calculateBounds = function (bindata) {
  *        default null.
  *        plotting bounds.
  *        can be changed later by setting VIEW.bounds and calling VIEW.render
- * @param options.collection {Collection<Deaggregation>}
+ * @param options.collection {Collection<Disaggregation>}
  *        collection with data to display.
- *        selected Deaggregation object is displayed.
+ *        selected Disaggregation object is displayed.
  */
-var DeaggregationGraphView = function (options) {
+var DisaggGraphView = function (options) {
   var _this, _initialize;
 
   _this = SelectedCollectionView(options);
@@ -106,7 +106,7 @@ var DeaggregationGraphView = function (options) {
   _initialize = function (options) {
     options = Util.extend({}, _DEFAULTS, options);
 
-    _this.el.innerHTML = '<div class="DeaggregationGraphView"></div>';
+    _this.el.innerHTML = '<div class="DisaggGraphView"></div>';
 
     _this.bounds = options.bounds || null;
 
@@ -122,7 +122,7 @@ var DeaggregationGraphView = function (options) {
     _this.zTickSpacing = 5;
 
     _this.d33d = D33dView({
-      el: _this.el.querySelector('.DeaggregationGraphView'),
+      el: _this.el.querySelector('.DisaggGraphView'),
       lookAt: [60, 125, 10],
       origin: [280, -150, 180],
       up: [0, 0, 1],
@@ -496,7 +496,7 @@ var DeaggregationGraphView = function (options) {
    * Get data bounds for plotting.
    *
    * @return {Array<Array<x0,y0,z0>, Array<x1,y1,z1>}
-   *         bounds of deaggregation data.
+   *         bounds of disaggregation data.
    *         Array contains two sub arrays,
    *         containing minimum and maximum values for each axis.
    */
@@ -567,7 +567,7 @@ var DeaggregationGraphView = function (options) {
       εbins = Collection(_this.model.get('metadata').εbins);
       _this.model.get('data').forEach(function (bin) {
         var view;
-        view = D33dDeaggregationBin({
+        view = D33dDisaggBin({
           bin: bin,
           xScale: _this.xScale,
           yScale: _this.yScale,
@@ -619,7 +619,7 @@ var DeaggregationGraphView = function (options) {
       .select(legendEl)
       .append('g')
       .attr('class', 'legend-content')
-      .attr('class', 'D33dDeaggregationBin');
+      .attr('class', 'D33dDisaggBin');
 
     metadata = _this.model.get('metadata');
     εbins = metadata.εbins;
@@ -651,6 +651,6 @@ var DeaggregationGraphView = function (options) {
   return _this;
 };
 
-DeaggregationGraphView.calculateBounds = __calculateBounds;
+DisaggGraphView.calculateBounds = __calculateBounds;
 
-module.exports = DeaggregationGraphView;
+module.exports = DisaggGraphView;
diff --git a/src/disagg/DeaggResponse.js b/src/disagg/DisaggResponse.js
similarity index 86%
rename from src/disagg/DeaggResponse.js
rename to src/disagg/DisaggResponse.js
index 0e5145e56a9881cba6fb0b0d3d00486627c7f62f..2558520d701d452609e2341c728f4223c63ee9f7 100644
--- a/src/disagg/DeaggResponse.js
+++ b/src/disagg/DisaggResponse.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var Deaggregation = require('./Deaggregation'),
+var Disaggregation = require('./Disaggregation'),
   Collection = require('../mvc/Collection'),
   Model = require('../mvc/Model'),
   Util = require('../util/Util');
@@ -25,7 +25,7 @@ var _DEAGG_ID = 0;
  * @param params {Object}
  *      Configuration options. See _DEFAULTS for more details.
  */
-var DeaggResponse = function (params) {
+var DisaggResponse = function (params) {
   var _this, _initialize;
 
   // Inherit from parent class
@@ -42,7 +42,7 @@ var DeaggResponse = function (params) {
 
     metadata = params.metadata;
     deaggs = params.data.map(function (deagg) {
-      return Deaggregation(
+      return Disaggregation(
         Util.extend(
           {
             metadata: metadata,
@@ -58,7 +58,7 @@ var DeaggResponse = function (params) {
       mlabel: metadata.mlabel,
       εlabel: metadata.εlabel,
       εbins: metadata.εbins,
-      deaggregations: Collection(deaggs),
+      disaggregations: Collection(deaggs),
     };
 
     // Should not have listeners yet, but silent anyway to short-circuit check
@@ -68,7 +68,7 @@ var DeaggResponse = function (params) {
   _this.destroy = Util.compose(function () {
     var deaggs;
 
-    deaggs = _this.get('deaggregations');
+    deaggs = _this.get('disaggregations');
     deaggs.destroy();
 
     _initialize = null;
@@ -80,4 +80,4 @@ var DeaggResponse = function (params) {
   return _this;
 };
 
-module.exports = DeaggResponse;
+module.exports = DisaggResponse;
diff --git a/src/disagg/Deaggregation.js b/src/disagg/Disaggregation.js
similarity index 85%
rename from src/disagg/Deaggregation.js
rename to src/disagg/Disaggregation.js
index 3868ce7f0da7e03a74333322daf4e608b18b44f9..c926c1c6da134b935dd7e3460bd6888b8609b40c 100644
--- a/src/disagg/Deaggregation.js
+++ b/src/disagg/Disaggregation.js
@@ -13,12 +13,10 @@ var _DEFAULTS = {
 var _DEAGG_ID = 0;
 
 /**
- * Class: Deaggregation
- *
  * @param params {Object}
  *      Configuration options. See _DEFAULTS for more details.
  */
-var Deaggregation = function (params) {
+var Disaggregation = function (params) {
   var _this;
 
   params = Util.extend({}, _DEFAULTS, { id: 'deagg-' + _DEAGG_ID++ }, params);
@@ -28,4 +26,4 @@ var Deaggregation = function (params) {
   return _this;
 };
 
-module.exports = Deaggregation;
+module.exports = Disaggregation;
diff --git a/src/disagg/index.js b/src/disagg/index.js
index 4f9fbbc8526762e3cd0585e0912c9d35ad81a50f..4ee44ec911e211446b1b5ae42c0a77375bedbe27 100644
--- a/src/disagg/index.js
+++ b/src/disagg/index.js
@@ -1,6 +1,6 @@
 module.exports = {
-  D33dDeaggregationBin: require('./D33dDeaggregationBin'),
-  Deaggregation: require('./Deaggregation'),
-  DeaggregationGraphView: require('./DeaggregationGraphView'),
-  DeaggResponse: require('./DeaggResponse'),
+  D33dDisaggBin: require('./D33dDisaggBin'),
+  Disaggregation: require('./Disaggregation'),
+  DisaggGraphView: require('./DisaggGraphView'),
+  DisaggResponse: require('./DisaggResponse'),
 };
diff --git a/styles/_D33dDeaggregationBin.scss b/styles/_D33dDisaggBin.scss
similarity index 97%
rename from styles/_D33dDeaggregationBin.scss
rename to styles/_D33dDisaggBin.scss
index d709b277be6346477ac22fff34d69af9f046df2d..c6aefdd443269a3ad69bbdcd2e8f3c897ba853f2 100644
--- a/styles/_D33dDeaggregationBin.scss
+++ b/styles/_D33dDisaggBin.scss
@@ -1,6 +1,6 @@
 @import '_GraphVariables.scss';
 
-.D33dDeaggregationBin {
+.D33dDisaggBin {
   > g {
     > path {
       stroke: #666;
diff --git a/styles/_DeaggregationGraphView.scss b/styles/_DisaggGraphView.scss
similarity index 88%
rename from styles/_DeaggregationGraphView.scss
rename to styles/_DisaggGraphView.scss
index 492649f5d17af509ad2a968dff80acb7ea5baf86..4205d25d713b8be2ce245a3194c6265a2f3dcfaf 100644
--- a/styles/_DeaggregationGraphView.scss
+++ b/styles/_DisaggGraphView.scss
@@ -1,4 +1,4 @@
-.DeaggregationGraphView {
+.DisaggGraphView {
   .axis {
     path {
       stroke: #999;
diff --git a/styles/disagg-d3.scss b/styles/disagg-d3.scss
index 3baad44135df3cd21209aa6d1194dc456dd171d4..562bb15b92f263119edf99ca7ed3b90a6f7cfe74 100644
--- a/styles/disagg-d3.scss
+++ b/styles/disagg-d3.scss
@@ -1,4 +1,4 @@
-@import './D33dDeaggregationBin';
+@import './D33dDisaggBin';
 @import './D3View';
-@import './DeaggregationGraphView';
+@import './DisaggGraphView';
 @import './GraphVariables';
diff --git a/types/disagg/D33dDeaggregationBin.d.ts b/types/disagg/D33dDisaggBin.d.ts
similarity index 72%
rename from types/disagg/D33dDeaggregationBin.d.ts
rename to types/disagg/D33dDisaggBin.d.ts
index 121e8db54ddfa931e78b8cb1a0a4e9c5de7d17db..b9327ad52b61c29bb6e880bbbb5f7c0cd718e266 100644
--- a/types/disagg/D33dDeaggregationBin.d.ts
+++ b/types/disagg/D33dDisaggBin.d.ts
@@ -1,9 +1,9 @@
 import { DisaggBinOptions } from './DisaggBinOptions';
 
 /**
- * Represents one vertical bar on a deaggregation plot.
+ * Represents one vertical bar on a disaggregation plot.
  */
-export class D33dDeaggregationBin {
+export class D33dDisaggBin {
   constructor(options?: DisaggBinOptions);
 
   /**
diff --git a/types/disagg/DeaggregationGraphView.d.ts b/types/disagg/DisaggGraphView.d.ts
similarity index 89%
rename from types/disagg/DeaggregationGraphView.d.ts
rename to types/disagg/DisaggGraphView.d.ts
index a9458f1a2f2c640fa37bcce28fd2da4a735986a9..f9ad8ba2456b66f4dff4d376655a91feb1e327c8 100644
--- a/types/disagg/DeaggregationGraphView.d.ts
+++ b/types/disagg/DisaggGraphView.d.ts
@@ -4,16 +4,16 @@ import { DisaggBin } from './DisaggBinOptions';
 import { DisaggGraphViewOptions } from './DisaggGraphViewOptions';
 
 /**
- * A deaggregation distance/magnitude plot.
+ * A Disaggregation distance/magnitude plot.
  */
-export class DeaggregationGraphView extends SelectedCollectionView<DisaggGraphViewOptions> {
+export class DisaggGraphView extends SelectedCollectionView<DisaggGraphViewOptions> {
   constructor(options: DisaggGraphViewOptions);
 
   /**
-   * Calculate deaggregation data bounds.
+   * Calculate Disaggregation data bounds.
    *
    * @param bindata
-   *     array of deaggregation bins
+   *     array of Disaggregation bins
    *     where Bin is an Object:
    *       bin.r
    *             distance to bin (x-axis)
@@ -28,7 +28,7 @@ export class DeaggregationGraphView extends SelectedCollectionView<DisaggGraphVi
    *                          id of epsilon bin.
    *
    * @return
-   *         bounds of deaggregation data.
+   *         bounds of Disaggregation data.
    *         Array contains two sub arrays,
    *         containing minimum and maximum values for each axis.
    */
@@ -83,7 +83,7 @@ export class DeaggregationGraphView extends SelectedCollectionView<DisaggGraphVi
    * Get data bounds for plotting.
    *
    * @return
-   *         bounds of deaggregation data.
+   *         bounds of Disaggregation data.
    *         Array contains two sub arrays,
    *         containing minimum and maximum values for each axis.
    */
diff --git a/types/disagg/DisaggGraphViewOptions.d.ts b/types/disagg/DisaggGraphViewOptions.d.ts
index 16df4c05b2b6d80432c085cd90ac476bec757aed..500dcd0c024b4834222db46e843caf0d5c149a2a 100644
--- a/types/disagg/DisaggGraphViewOptions.d.ts
+++ b/types/disagg/DisaggGraphViewOptions.d.ts
@@ -1,7 +1,7 @@
 import { Collection, SelectedCollectionViewOptions } from '../mvc';
-import { Deaggregation } from './Deaggregation';
+import { Disaggregation } from './Disaggregation';
 
-export interface DisaggGraphViewOptions extends SelectedCollectionViewOptions<Deaggregation> {
+export interface DisaggGraphViewOptions extends SelectedCollectionViewOptions<Disaggregation> {
   /**
    * Default null.
    * Plotting bounds.
@@ -11,7 +11,7 @@ export interface DisaggGraphViewOptions extends SelectedCollectionViewOptions<De
 
   /**
    * Collection with data to display.
-   * Selected Deaggregation object is displayed.
+   * Selected Disaggregation object is displayed.
    */
-  collection: Collection<Deaggregation>;
+  collection: Collection<Disaggregation>;
 }
diff --git a/types/disagg/DeaggResponse.d.ts b/types/disagg/DisaggResponse.d.ts
similarity index 81%
rename from types/disagg/DeaggResponse.d.ts
rename to types/disagg/DisaggResponse.d.ts
index c86579f1fe9583cd24446a84f1cb686264f14ed1..07cf774413c49995feabe55b2d447b711ecde44f 100644
--- a/types/disagg/DeaggResponse.d.ts
+++ b/types/disagg/DisaggResponse.d.ts
@@ -7,7 +7,7 @@ import { Model } from '../mvc/Model';
  * @param params
  *      Configuration options. See _DEFAULTS for more details.
  */
-export class DeaggResponse extends Model<DeaggResponseData> {
+export class DisaggResponse extends Model<DeaggResponseData> {
   constructor(params: DeaggResponseData);
 
   destroy(): void;
diff --git a/types/disagg/Deaggregation.d.ts b/types/disagg/Disaggregation.d.ts
similarity index 76%
rename from types/disagg/Deaggregation.d.ts
rename to types/disagg/Disaggregation.d.ts
index b7b7003d90295ce76be1df78262c18a1d57c53a1..b8c3d5289c2edf03574f0e00d3017121d1b0a7dd 100644
--- a/types/disagg/Deaggregation.d.ts
+++ b/types/disagg/Disaggregation.d.ts
@@ -1,5 +1,5 @@
 import { DisaggParameters } from './DisaggParameters';
 
-export class Deaggregation {
+export class Disaggregation {
   constructor(params: DisaggParameters);
 }
diff --git a/types/disagg/index.d.ts b/types/disagg/index.d.ts
index d8ebcf80bec256c65fe41151797ac9f4a7a54ede..babb33dea7366ca99f14e7eaa88f65635463a373 100644
--- a/types/disagg/index.d.ts
+++ b/types/disagg/index.d.ts
@@ -1,7 +1,7 @@
-export * from './D33dDeaggregationBin';
-export * from './DeaggResponse';
-export * from './Deaggregation';
-export * from './DeaggregationGraphView';
+export * from './D33dDisaggBin';
 export * from './DisaggBinOptions';
+export * from './DisaggGraphView';
 export * from './DisaggGraphViewOptions';
 export * from './DisaggParameters';
+export * from './DisaggResponse';
+export * from './Disaggregation';