diff --git a/contracts/lifecycle/Stoppable.sol b/contracts/lifecycle/Pausable.sol
similarity index 92%
rename from contracts/lifecycle/Stoppable.sol
rename to contracts/lifecycle/Pausable.sol
index 2dc37d6fc..5c2b2941c 100644
--- a/contracts/lifecycle/Stoppable.sol
+++ b/contracts/lifecycle/Pausable.sol
@@ -5,11 +5,11 @@ import "../ownership/Ownable.sol";
 
 
 /*
- * Stoppable
+ * Pausable
  * Abstract contract that allows children to implement an
  * emergency stop mechanism.
  */
-contract Stoppable is Ownable {
+contract Pausable is Ownable {
   bool public stopped;
 
   modifier stopInEmergency { if (!stopped) _; }
diff --git a/contracts/test-helpers/StoppableMock.sol b/contracts/test-helpers/PausableMock.sol
similarity index 69%
rename from contracts/test-helpers/StoppableMock.sol
rename to contracts/test-helpers/PausableMock.sol
index 32e456a20..267bff841 100644
--- a/contracts/test-helpers/StoppableMock.sol
+++ b/contracts/test-helpers/PausableMock.sol
@@ -1,15 +1,15 @@
 pragma solidity ^0.4.4;
 
 
-import '../lifecycle/Stoppable.sol';
+import '../lifecycle/Pausable.sol';
 
 
-// mock class using Stoppable
-contract StoppableMock is Stoppable {
+// mock class using Pausable
+contract PausableMock is Pausable {
   bool public drasticMeasureTaken;
   uint public count;
 
-  function StoppableMock() {
+  function PausableMock() {
     drasticMeasureTaken = false;
     count = 0;
   }
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 8ea157a6c..42ff0bda6 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -26,7 +26,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
    :caption: Smart Contracts
    
    ownable
-   stoppable
+   Pausable
    killable
    claimable
    migrations
diff --git a/docs/source/stoppable.rst b/docs/source/pausable.rst
similarity index 94%
rename from docs/source/stoppable.rst
rename to docs/source/pausable.rst
index 3ad04d7a1..30c0a8054 100644
--- a/docs/source/stoppable.rst
+++ b/docs/source/pausable.rst
@@ -1,4 +1,4 @@
-Stoppable
+Pausable
 =============================================
 
 Base contract that provides an emergency stop mechanism.
diff --git a/test/Pausable.js b/test/Pausable.js
new file mode 100644
index 000000000..f6f436bca
--- /dev/null
+++ b/test/Pausable.js
@@ -0,0 +1,52 @@
+contract('Pausable', function(accounts) {
+
+  it("can perform normal process in non-emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let count0 = await Pausable.count();
+    assert.equal(count0, 0);
+
+    let normalProcess = await Pausable.normalProcess();
+    let count1 = await Pausable.count();
+    assert.equal(count1, 1);
+  });
+
+  it("can not perform normal process in emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let count0 = await Pausable.count();
+    assert.equal(count0, 0);
+
+    let normalProcess = await Pausable.normalProcess();
+    let count1 = await Pausable.count();
+    assert.equal(count1, 0);
+  });
+
+
+  it("can not take drastic measure in non-emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let drasticMeasure = await Pausable.drasticMeasure();
+    let drasticMeasureTaken = await Pausable.drasticMeasureTaken();
+
+    assert.isFalse(drasticMeasureTaken);
+  });
+
+  it("can take a drastic measure in an emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let drasticMeasure = await Pausable.drasticMeasure();
+    let drasticMeasureTaken = await Pausable.drasticMeasureTaken();
+
+    assert.isTrue(drasticMeasureTaken);
+  });
+
+  it("should resume allowing normal process after emergency is over", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let release = await Pausable.release();
+    let normalProcess = await Pausable.normalProcess();
+    let count0 = await Pausable.count();
+
+    assert.equal(count0, 1);
+  });
+
+});
diff --git a/test/Stoppable.js b/test/Stoppable.js
deleted file mode 100644
index e8e6e2e80..000000000
--- a/test/Stoppable.js
+++ /dev/null
@@ -1,52 +0,0 @@
-contract('Stoppable', function(accounts) {
-
-  it("can perform normal process in non-emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let count0 = await stoppable.count();
-    assert.equal(count0, 0);
-
-    let normalProcess = await stoppable.normalProcess();
-    let count1 = await stoppable.count();
-    assert.equal(count1, 1);
-  });
-
-  it("can not perform normal process in emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let count0 = await stoppable.count();
-    assert.equal(count0, 0);
-
-    let normalProcess = await stoppable.normalProcess();
-    let count1 = await stoppable.count();
-    assert.equal(count1, 0);
-  });
-
-
-  it("can not take drastic measure in non-emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let drasticMeasure = await stoppable.drasticMeasure();
-    let drasticMeasureTaken = await stoppable.drasticMeasureTaken();
-
-    assert.isFalse(drasticMeasureTaken);
-  });
-
-  it("can take a drastic measure in an emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let drasticMeasure = await stoppable.drasticMeasure();
-    let drasticMeasureTaken = await stoppable.drasticMeasureTaken();
-
-    assert.isTrue(drasticMeasureTaken);
-  });
-
-  it("should resume allowing normal process after emergency is over", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let release = await stoppable.release();
-    let normalProcess = await stoppable.normalProcess();
-    let count0 = await stoppable.count();
-
-    assert.equal(count0, 1);
-  });
-
-});