diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index 684fde98e..000000000
--- a/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Code of Conduct
-
-Please see https://mithril.js.org/code-of-conduct.html.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 0a2ebcc55..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-open_collective: mithriljs
diff --git a/.github/ISSUE_TEMPLATE/feature-or-enhancement.md b/.github/ISSUE_TEMPLATE/feature-or-enhancement.md
index 86154eba4..4509b1841 100644
--- a/.github/ISSUE_TEMPLATE/feature-or-enhancement.md
+++ b/.github/ISSUE_TEMPLATE/feature-or-enhancement.md
@@ -12,17 +12,18 @@ assignees: isiahmeadows
 Optional: Provide the exact version of Mithril you're experiencing issues with.
 This could matter, even if it's really old like version 0.1.0. Do note that bugs
 in older versions are commonly fixed in newer versions and that newer versions
-do end up with a lot more features than older versions, so it's unlikely we'll
+are much more actively maintained than older versions, so it's unlikely we'll
 add new features to older versions like 0.1.x.
 -->
 **Mithril version:**
 
 <!--
-Optional: Provide the name and version of both the browser and operating system
-you're running Mithril on. If it's multiple, feel free to list multiple. This
-could matter, even if it's super ancient like IE 6 on Windows XP.
+Optional: Provide the name and version of both the platform (Chrome, Node, etc.)
+and operating system you're running Mithril on. If it's multiple, feel free to
+list multiple. This could matter, even if it's super ancient like IE 6 on
+Windows XP.
 -->
-**Browser and OS:**
+**Platform and OS:**
 
 <!--
 Optional: Provide a link to your project, if it happens to be open source or if
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f85840f2c..b02ca0990 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,4 +28,4 @@
 - [ ] I have read the **CONTRIBUTING** document.
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.
-- [ ] I have updated `docs/change-log.md`
+- [ ] I have updated `docs/changelog.md`
diff --git a/api/tests/test-mountRedraw.js b/api/tests/test-mountRedraw.js
index 4027c1c3e..e069e9b2c 100644
--- a/api/tests/test-mountRedraw.js
+++ b/api/tests/test-mountRedraw.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var throttleMocker = require("../../test-utils/throttleMock")
diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index 97bbc4eb6..be4c20cf8 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")
 
diff --git a/api/tests/test-routerGetSet.js b/api/tests/test-routerGetSet.js
index 6a7121b2a..aaffdc91a 100644
--- a/api/tests/test-routerGetSet.js
+++ b/api/tests/test-routerGetSet.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")
diff --git a/docs/change-log.md b/docs/changelog.md
similarity index 93%
rename from docs/change-log.md
rename to docs/changelog.md
index 6b4d8fe5e..b31b97909 100644
--- a/docs/change-log.md
+++ b/docs/changelog.md
@@ -9,8 +9,8 @@
 - [v1.x changelog](https://mithril.js.org/archive/v1.1.7/change-log.html)
 - [v1.x docs](https://mithril.js.org/archive/v1.1.7/index.html)
 - [v0.2 docs](https://mithril.js.org/archive/v0.2.5/index.html)
-- [`ospec` change log](https://github.com/MithrilJS/mithril.js/blob/master/ospec/change-log.md)
-- [`mithril/stream` change log](https://github.com/MithrilJS/mithril.js/blob/master/stream/change-log.md)
+- [`ospec` change log](https://github.com/MithrilJS/ospec/blob/master/changelog.md)
+- [`mithril-stream` change log](#mithril-stream-change-log)
 
 ---
 
@@ -20,6 +20,8 @@
 
 *Note for later: release as semver-minor.*
 
+PSA: changes to [`mithril/stream`](stream.md) are now specified in this change log. I've also moved the old
+
 - Reduced package download size substantially by removing the archive of previous releases' documentation. ([#2561](https://github.com/MithrilJS/mithril.js/pull/2561) [@cztomsik](https://github.com/cztomsik))
 - Improved error messages in multiple places. ([#2536](https://github.com/MithrilJS/mithril.js/pull/2536) [@isiahmeadows](https://github.com/isiahmeadows))
 - The redraw reentrancy check was moved from `m.mount` to `m.render` and its error message was updated accordingly. ([#2536](https://github.com/MithrilJS/mithril.js/pull/2536) [@isiahmeadows](https://github.com/isiahmeadows))
@@ -179,3 +181,22 @@ _2019-07-24_
 - docs: clarify valid key usage ([#2452](https://github.com/MithrilJS/mithril.js/pull/2452) [@isiahmeadows](https://github.com/isiahmeadows))
 - route: don't pollute globals ([#2453](https://github.com/MithrilJS/mithril.js/pull/2453) [@isiahmeadows](https://github.com/isiahmeadows))
 - request: track xhr replacements correctly ([#2455](https://github.com/MithrilJS/mithril.js/pull/2455) [@isiahmeadows](https://github.com/isiahmeadows))
+
+## `mithril-stream` change log
+
+Formerly, `mithril/stream` was available standalone as the package `mithril-stream`, but this package has been deprecated and is no longer updated. The changelog for that package prior to being merged back into Mithril proper is below.
+
+### 2.0.0
+_2019-02-07_
+
+- when a stream conditionally returns HALT, dependant stream will also end ([#2200](https://github.com/MithrilJS/mithril.js/pull/2200), [#2369](https://github.com/MithrilJS/mithril.js/pull/2369))
+- Add `stream.lift` as a user-friendly alternative to `merge -> map` or `combine` ([#1944](https://github.com/MithrilJS/mithril.js/issues/1944))
+- renamed HALT to SKIP ([#2207](https://github.com/MithrilJS/mithril.js/pull/2207))
+- rewrote implementation ([#2207](https://github.com/MithrilJS/mithril.js/pull/2207))
+- Removed `valueOf` & `toString` methods ([#2150](https://github.com/MithrilJS/mithril.js/pull/2150))
+- fixed `stream.end` propagation ([#2369](https://github.com/MithrilJS/mithril.js/pull/2369))
+
+### 1.1.0
+_2017-07-13_
+
+- Move the "use strict" directive inside the IIFE [#1831](https://github.com/MithrilJS/mithril.js/issues/1831) ([#1893](https://github.com/MithrilJS/mithril.js/pull/1893))
diff --git a/docs/nav-guides.md b/docs/nav-guides.md
index acfa11cb7..e0244b0f8 100644
--- a/docs/nav-guides.md
+++ b/docs/nav-guides.md
@@ -25,6 +25,6 @@
 	- [Code of Conduct](code-of-conduct.md)
 - Misc
 	- [Framework comparison](framework-comparison.md)
-	- [Change log/Migration](change-log.md)
+	- [Change log/Migration](changelog.md)
 	- [v1 Documentation](https://mithril.js.org/archive/v1.1.7/)
 	- [v0.2 Documentation](https://mithril.js.org/archive/v0.2.5/)
diff --git a/docs/releasing.md b/docs/releasing.md
index ee37832dd..47d068e33 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -4,7 +4,6 @@
 
 - [Releasing a new Mithril version](#releasing-a-new-mithril-version)
 - [Updating mithril.js.org](#updating-mithriljsorg)
-- [Releasing a new ospec version](#releasing-a-new-ospec-version)
 
 ## Releasing a new Mithril version
 
@@ -18,7 +17,7 @@ $ git pull --rebase mithriljs next
 ```
 
 2. Determine patch level of the change
-3. Update information in `docs/change-log.md` to match reality of the new version being prepared for release.
+3. Update information in `docs/changelog.md` to match reality of the new version being prepared for release.
 	- Don't forget to add today's date under the version heading!
 4. Replace all existing references to `mithril@next` to `mithril` if moving from a release candidate to stable.
     - Note: if making an initial release candidate, don't forget to move all the playground snippets to pull from `mithril@next`!
@@ -96,11 +95,11 @@ $ git push mithriljs next
 
 ### Update the GitHub release
 
-16. The GitHub Release will require a manual description & title to be added. I suggest coming up with a fun title & then copying the `docs/change-log.md` entry for the build.
+16. The GitHub Release will require a manual description & title to be added. I suggest coming up with a fun title & then copying the `docs/changelog.md` entry for the build.
 
 ## Updating mithril.js.org
 
-Fixes to documentation can land whenever, updates to the site are published via Travis.
+Fixes to documentation can land whenever, updates to the site are built and published via `scripts/update-docs.js`.
 
 ```bash
 # These steps assume that MithrilJS/mithril.js is a git remote named "mithriljs"
@@ -115,69 +114,9 @@ $ git checkout next -- ./docs
 
 # Manually ensure that no new feature docs were added
 
-$ git push mithriljs
+$ node scripts/update-docs
 ```
 
-After the Travis build completes the updated docs should appear on https://mithril.js.org in a few minutes.
+After the docs build completes, the updated docs should appear on https://mithril.js.org in a few minutes.
 
 **Note:** When updating the stable version with a release candidate out, ***make sure to update the index + navigation to point to the new stable version!!!***
-
-## Releasing a new ospec version
-
-1. Ensure your local branch is up to date
-
-```bash
-$ git checkout next
-$ git pull --rebase mithriljs next
-```
-
-2. Determine patch level of the change
-3. Update `version` field in `ospec/package.json` to match new version being prepared for release.
-4. Update `ospec/change-log.md` to match new version being prepared for release.
-	- Don't forget to add today's date under the version heading!
-5. Commit changes to `next`
-
-```
-$ git add .
-$ git commit -m "chore(ospec): ospec@<version>"
-
-# Push to your branch
-$ git push
-
-# Push to MithrilJS/mithril.js
-$ git push mithriljs next
-```
-
-### Merge from `next` to `master`
-
-5. Switch to `master` and make sure it's up to date
-
-```bash
-$ git checkout master
-$ git pull --rebase mithriljs master
-```
-
-6. merge `next` on top of it
-
-```bash
-$ git checkout next -- ./ospec
-$ git add .
-$ git commit -m "chore(ospec): ospec@<version>"
-```
-
-7. Ensure the tests are passing!
-
-### Publish the release
-
-8. Push the changes to `MithrilJS/mithril.js`
-
-```bash
-$ git push mithriljs master
-```
-
-9. Publish the changes to npm **from the `/ospec` folder**. That bit is important to ensure you don't accidentally ship a new Mithril release!
-
-```bash
-$ cd ./ospec
-$ npm publish
-```
diff --git a/ospec/ospec.js b/ospec/ospec.js
index 66c5dc75b..7bc2b1aaa 100644
--- a/ospec/ospec.js
+++ b/ospec/ospec.js
@@ -3,6 +3,12 @@
 if (typeof module !== "undefined") module["exports"] = m()
 else window.o = m()
 })(function init(name) {
+	console.warn(
+		"Please switch to the `ospec` package to remove this warning and see " +
+		"the most recent features. Using the `ospec` bundled within Mithril " +
+		"is deprecated, and it will be removed in the next major release."
+	)
+
 	var spec = {}, subjects = [], results, only = [], ctx = spec, start, stack = 0, nextTickish, hasProcess = typeof process === "object", hasOwn = ({}).hasOwnProperty
 	var ospecFileName = getStackName(ensureStackTrace(new Error), /[\/\\](.*?):\d+:\d+/), timeoutStackName
 	var globalTimeout = noTimeoutRightNow
diff --git a/ospec/tests/test-ospec.js b/ospec/tests/test-ospec.js
index 740d77b77..434f6895f 100644
--- a/ospec/tests/test-ospec.js
+++ b/ospec/tests/test-ospec.js
@@ -6,7 +6,11 @@ var o, callAsync
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
+	var warn = console.warn
+	// Let's drop the warning to leave the console a little less noisy.
+	console.warn = function() {}
 	o = require("../ospec")
+	console.warn = warn
 	/* eslint-enable global-require */
 } else {
 	callAsync = typeof setImmediate === "function" ? setImmediate : setTimeout
diff --git a/package-lock.json b/package-lock.json
index 6dcb509d6..f4b7ba801 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -259,8 +259,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -291,7 +290,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -523,8 +521,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -1152,8 +1149,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "2.1.0",
@@ -1229,7 +1225,6 @@
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
       "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1428,7 +1423,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1437,8 +1431,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "inquirer": {
       "version": "6.5.2",
@@ -2026,7 +2019,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -2217,7 +2209,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -2275,6 +2266,14 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
+    "ospec": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/ospec/-/ospec-4.0.1.tgz",
+      "integrity": "sha512-iHx5jkuXh/hU4eEFFf6FH/4vj5RH7041jhuJw7WnqIPHDJgEXkSBdmuD644I/qQm8s5aZEPOpSoVagGCr8ebag==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
     "p-finally": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
@@ -2321,8 +2320,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
       "version": "2.0.1",
@@ -3152,8 +3150,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "1.0.3",
diff --git a/package.json b/package.json
index 393a2ffef..82928fde3 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "Leo Horie",
   "license": "MIT",
   "unpkg": "mithril.min.js",
-  "repository": "MithrilJS/mithril.js",
+  "repository": "github:MithrilJS/mithril.js",
   "scripts": {
     "precommit": "lint-staged",
     "watch": "run-p watch:**",
@@ -24,7 +24,7 @@
     "perf": "node performance/test-perf.js",
     "pretest": "npm run lint",
     "test": "run-s test:js",
-    "test:js": "node ospec/bin/ospec",
+    "test:js": "ospec",
     "cover": "istanbul cover --print both ospec/bin/ospec",
     "release": "npm version -m 'v%s'",
     "version": "npm run build && git add mithril.js mithril.min.js stream.js stream.min.js README.md"
@@ -45,6 +45,7 @@
     "marked": "^0.7.0",
     "minimist": "^1.2.0",
     "npm-run-all": "^4.1.5",
+    "ospec": "^4.0.1",
     "pinpoint": "^1.1.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
@@ -61,5 +62,7 @@
       "git add"
     ]
   },
-  "dependencies": {}
+  "dependencies": {
+    "ospec": "*"
+  }
 }
diff --git a/pathname/tests/test-buildPathname.js b/pathname/tests/test-buildPathname.js
index 11d6cfb08..0b763d154 100644
--- a/pathname/tests/test-buildPathname.js
+++ b/pathname/tests/test-buildPathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildPathname = require("../../pathname/build")
 
 o.spec("buildPathname", function() {
diff --git a/pathname/tests/test-compileTemplate.js b/pathname/tests/test-compileTemplate.js
index 1fa37bdff..e9725b06c 100644
--- a/pathname/tests/test-compileTemplate.js
+++ b/pathname/tests/test-compileTemplate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 var compileTemplate = require("../../pathname/compileTemplate")
 
diff --git a/pathname/tests/test-parsePathname.js b/pathname/tests/test-parsePathname.js
index 565b08401..b81d34f1a 100644
--- a/pathname/tests/test-parsePathname.js
+++ b/pathname/tests/test-parsePathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 
 o.spec("parsePathname", function() {
diff --git a/promise/tests/test-promise.js b/promise/tests/test-promise.js
index d26dd5f80..07d600e1b 100644
--- a/promise/tests/test-promise.js
+++ b/promise/tests/test-promise.js
@@ -6,7 +6,7 @@ var o, callAsync, Promise
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
-	o = require("../../ospec/ospec")
+	o = require("ospec")
 	Promise = require("../../promise/polyfill")
 	/* eslint-enable global-require */
 } else {
diff --git a/querystring/tests/test-buildQueryString.js b/querystring/tests/test-buildQueryString.js
index 343b6c8e6..9b5149af5 100644
--- a/querystring/tests/test-buildQueryString.js
+++ b/querystring/tests/test-buildQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildQueryString = require("../../querystring/build")
 
 o.spec("buildQueryString", function() {
diff --git a/querystring/tests/test-parseQueryString.js b/querystring/tests/test-parseQueryString.js
index ca20e2328..4a61c4314 100644
--- a/querystring/tests/test-parseQueryString.js
+++ b/querystring/tests/test-parseQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parseQueryString = require("../../querystring/parse")
 
 o.spec("parseQueryString", function() {
diff --git a/render/tests/test-attributes.js b/render/tests/test-attributes.js
index 156323959..14a3b4062 100644
--- a/render/tests/test-attributes.js
+++ b/render/tests/test-attributes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-component.js b/render/tests/test-component.js
index 423ceeada..20dc02be4 100644
--- a/render/tests/test-component.js
+++ b/render/tests/test-component.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-createElement.js b/render/tests/test-createElement.js
index ba250a6ef..21e5e4d72 100644
--- a/render/tests/test-createElement.js
+++ b/render/tests/test-createElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createFragment.js b/render/tests/test-createFragment.js
index 5000f859e..37bdb8b0d 100644
--- a/render/tests/test-createFragment.js
+++ b/render/tests/test-createFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createHTML.js b/render/tests/test-createHTML.js
index 291f8f044..54de6a97b 100644
--- a/render/tests/test-createHTML.js
+++ b/render/tests/test-createHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createNodes.js b/render/tests/test-createNodes.js
index 649ebf9a9..3ba849056 100644
--- a/render/tests/test-createNodes.js
+++ b/render/tests/test-createNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createText.js b/render/tests/test-createText.js
index 7a05c44ef..76cb3e3df 100644
--- a/render/tests/test-createText.js
+++ b/render/tests/test-createText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-event.js b/render/tests/test-event.js
index b0b005926..8e650b91b 100644
--- a/render/tests/test-event.js
+++ b/render/tests/test-event.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-fragment.js b/render/tests/test-fragment.js
index e6883161d..02af0a9dd 100644
--- a/render/tests/test-fragment.js
+++ b/render/tests/test-fragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var fragment = require("../../render/fragment")
 var m = require("../../render/hyperscript")
 
diff --git a/render/tests/test-hyperscript.js b/render/tests/test-hyperscript.js
index 34d359745..cdb9071b1 100644
--- a/render/tests/test-hyperscript.js
+++ b/render/tests/test-hyperscript.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 
 o.spec("hyperscript", function() {
diff --git a/render/tests/test-input.js b/render/tests/test-input.js
index e28784a22..d7fbd6d87 100644
--- a/render/tests/test-input.js
+++ b/render/tests/test-input.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-normalize.js b/render/tests/test-normalize.js
index 2036d2ac0..3a656dd86 100644
--- a/render/tests/test-normalize.js
+++ b/render/tests/test-normalize.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalize", function() {
diff --git a/render/tests/test-normalizeChildren.js b/render/tests/test-normalizeChildren.js
index 769c39d19..a7cd5ba5b 100644
--- a/render/tests/test-normalizeChildren.js
+++ b/render/tests/test-normalizeChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalizeChildren", function() {
diff --git a/render/tests/test-normalizeComponentChildren.js b/render/tests/test-normalizeComponentChildren.js
index 6ef57f6c3..0ceabdf4f 100644
--- a/render/tests/test-normalizeComponentChildren.js
+++ b/render/tests/test-normalizeComponentChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-onbeforeremove.js b/render/tests/test-onbeforeremove.js
index 9e9a2e59e..96f5025e9 100644
--- a/render/tests/test-onbeforeremove.js
+++ b/render/tests/test-onbeforeremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
diff --git a/render/tests/test-onbeforeupdate.js b/render/tests/test-onbeforeupdate.js
index e179bad29..a4e50c480 100644
--- a/render/tests/test-onbeforeupdate.js
+++ b/render/tests/test-onbeforeupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-oncreate.js b/render/tests/test-oncreate.js
index df651f900..0358046f4 100644
--- a/render/tests/test-oncreate.js
+++ b/render/tests/test-oncreate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-oninit.js b/render/tests/test-oninit.js
index a42d51008..c2ce1248c 100644
--- a/render/tests/test-oninit.js
+++ b/render/tests/test-oninit.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-onremove.js b/render/tests/test-onremove.js
index c10b3c891..8643b105e 100644
--- a/render/tests/test-onremove.js
+++ b/render/tests/test-onremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-onupdate.js b/render/tests/test-onupdate.js
index 10794dd0c..e57612ab3 100644
--- a/render/tests/test-onupdate.js
+++ b/render/tests/test-onupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-render-hyperscript-integration.js b/render/tests/test-render-hyperscript-integration.js
index 1b722fb05..7a94eb879 100644
--- a/render/tests/test-render-hyperscript-integration.js
+++ b/render/tests/test-render-hyperscript-integration.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-render.js b/render/tests/test-render.js
index 7898c9a7a..06b441869 100644
--- a/render/tests/test-render.js
+++ b/render/tests/test-render.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-textContent.js b/render/tests/test-textContent.js
index 0cdd0b4ca..50f79a464 100644
--- a/render/tests/test-textContent.js
+++ b/render/tests/test-textContent.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-trust.js b/render/tests/test-trust.js
index d0f4b2ca5..304708cc6 100644
--- a/render/tests/test-trust.js
+++ b/render/tests/test-trust.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var trust = require("../../render/trust")
 
 o.spec("trust", function() {
diff --git a/render/tests/test-updateElement.js b/render/tests/test-updateElement.js
index 7a7285fab..e60ac5508 100644
--- a/render/tests/test-updateElement.js
+++ b/render/tests/test-updateElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateFragment.js b/render/tests/test-updateFragment.js
index e0cdecf80..1c127541c 100644
--- a/render/tests/test-updateFragment.js
+++ b/render/tests/test-updateFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateHTML.js b/render/tests/test-updateHTML.js
index b95fc9b15..5ed8d73a9 100644
--- a/render/tests/test-updateHTML.js
+++ b/render/tests/test-updateHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateNodes.js b/render/tests/test-updateNodes.js
index 5ce9e32f5..b5ff7efa7 100644
--- a/render/tests/test-updateNodes.js
+++ b/render/tests/test-updateNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-updateNodesFuzzer.js b/render/tests/test-updateNodesFuzzer.js
index 1e2116b36..e63a0d8aa 100644
--- a/render/tests/test-updateNodesFuzzer.js
+++ b/render/tests/test-updateNodesFuzzer.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateText.js b/render/tests/test-updateText.js
index f8579dead..05b33a85e 100644
--- a/render/tests/test-updateText.js
+++ b/render/tests/test-updateText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/request/tests/test-jsonp.js b/request/tests/test-jsonp.js
index 6dfed4e7c..a52c67a8a 100644
--- a/request/tests/test-jsonp.js
+++ b/request/tests/test-jsonp.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")
 var PromisePolyfill = require("../../promise/promise")
diff --git a/request/tests/test-request.js b/request/tests/test-request.js
index 706c8404b..51e8b0b36 100644
--- a/request/tests/test-request.js
+++ b/request/tests/test-request.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")
diff --git a/scripts/generate-docs.js b/scripts/generate-docs.js
index bf020d574..fa25ccc50 100644
--- a/scripts/generate-docs.js
+++ b/scripts/generate-docs.js
@@ -143,7 +143,7 @@ class Generator {
 				let anchor = text.toLowerCase()
 					.replace(/<(\/?)code>/g, "")
 					.replace(/<a.*?>.+?<\/a>/g, "")
-					.replace(/\.|\[|\]|&quot;|\/|\(|\)/g, "")
+					.replace(/[.`[\]\/()]|&quot;/g, "")
 					.replace(/\s/g, "-");
 
 				const anchorId = anchorIds.get(anchor)
diff --git a/scripts/lint-docs.js b/scripts/lint-docs.js
index 8306ae3d9..ec9286d94 100644
--- a/scripts/lint-docs.js
+++ b/scripts/lint-docs.js
@@ -278,8 +278,8 @@ async function lintAll({useCache}) {
 	await new Promise((resolve, reject) => {
 		const glob = new Glob(path.resolve(__dirname, "../**/*.md"), {
 			ignore: [
-				"**/change-log.md",
-				"**/migration-v02x.md",
+				"**/changelog.md",
+				"**/migration-*.md",
 				"**/node_modules/**",
 			],
 			nodir: true,
@@ -304,10 +304,10 @@ if (require.main === module) {
 		exec: lintAll,
 		watch() {
 			require("chokidar")
-				.watch(path.resolve(__dirname, "../**/*.md"), {
-					ignored: [
-						"**/change-log.md",
-						"**/migration-v02x.md",
+				.watch(path.resolve(__dirname, "../docs/**/*.md"), {
+					ignore: [
+						"**/changelog.md",
+						"**/migration-*.md",
 						"**/node_modules/**",
 					],
 				})
diff --git a/scripts/release.js b/scripts/release.js
index a6bd7200f..dc39d6da8 100644
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -123,7 +123,7 @@ async function release({increment, preid, publish}) {
 
 	console.error(`
 Copy the parts listed in "Upcoming" to a new section "### v${version}" in
-docs/change-log.md and clear that section out. Also, add today's date under the
+docs/changelog.md and clear that section out. Also, add today's date under the
 new section's heading to match the others and don't forget to update the table
 of contents accordingly.
 `)
@@ -138,7 +138,7 @@ of contents accordingly.
 		// Verify the changelog was updated, and give a chance to retry if it's
 		// prematurely continued.
 		const changes = getChanges()
-		const isChangelog = /^[ M][ M] docs\/change-log\.md$/
+		const isChangelog = /^[ M][ M] docs\/changelog\.md$/
 		const errors = []
 
 		console.log("changes", changes)
diff --git a/scripts/tests/test-bundler.js b/scripts/tests/test-bundler.js
index 7c0cdb7ca..b797bcb49 100644
--- a/scripts/tests/test-bundler.js
+++ b/scripts/tests/test-bundler.js
@@ -6,7 +6,7 @@ const access = util.promisify(fs.access)
 const writeFile = util.promisify(fs.writeFile)
 const unlink = util.promisify(fs.unlink)
 
-const o = require("../../ospec/ospec")
+const o = require("ospec")
 const bundle = require("../_bundler-impl")
 
 o.spec("bundler", async () => {
diff --git a/stream/LICENSE b/stream/LICENSE
deleted file mode 100644
index 2aae0f1e7..000000000
--- a/stream/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Leo Horie
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/stream/README.md b/stream/README.md
deleted file mode 100644
index 7e05817d6..000000000
--- a/stream/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-mithril-stream [![npm Version](https://img.shields.io/npm/v/mithril-stream.svg)](https://www.npmjs.com/package/mithril-stream) [![npm License](https://img.shields.io/npm/l/mithril-stream.svg)](https://www.npmjs.com/package/mithril-stream)
-==============
-
-Mithril's `m.stream` as a standalone module.
-
-See [mithril.js.org/stream.html](https://mithril.js.org/stream.html) for docs/usage.
diff --git a/stream/change-log.md b/stream/change-log.md
deleted file mode 100644
index d5495381d..000000000
--- a/stream/change-log.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Change log for stream
-
-- [Upcoming](#upcoming)
-- [v2.0.0](#v200)
-- [v1.1.0](#v110)
-
-### Upcoming...
-
-### 2.0.0
-_2019-02-07_
-
-- when a stream conditionally returns HALT, dependant stream will also end ([#2200](https://github.com/MithrilJS/mithril.js/pull/2200), [#2369](https://github.com/MithrilJS/mithril.js/pull/2369))
-- Add `stream.lift` as a user-friendly alternative to `merge -> map` or `combine` ([#1944](https://github.com/MithrilJS/mithril.js/issues/1944))
-- renamed HALT to SKIP ([#2207](https://github.com/MithrilJS/mithril.js/pull/2207))
-- rewrote implementation ([#2207](https://github.com/MithrilJS/mithril.js/pull/2207))
-- Removed `valueOf` & `toString` methods ([#2150](https://github.com/MithrilJS/mithril.js/pull/2150))
-- fixed `stream.end` propagation ([#2369](https://github.com/MithrilJS/mithril.js/pull/2369))
-
-### 1.1.0
-_2017-07-13_
-
-- Move the "use strict" directive inside the IIFE [#1831](https://github.com/MithrilJS/mithril.js/issues/1831) ([#1893](https://github.com/MithrilJS/mithril.js/pull/1893))
diff --git a/stream/package.json b/stream/package.json
deleted file mode 100644
index 7a9d6942f..000000000
--- a/stream/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "mithril-stream",
-  "version": "2.0.0",
-  "description": "Streaming data, mithril-style",
-  "main": "stream.js",
-  "directories": {
-    "test": "tests"
-  },
-  "keywords": [ "stream", "reactive", "data" ],
-  "author": "Leo Horie <lhorie@hotmail.com>",
-  "license": "MIT",
-  "repository": "MithrilJS/mithril.js"
-}
diff --git a/stream/tests/test-scan.js b/stream/tests/test-scan.js
index 22ee4407d..5940c3d17 100644
--- a/stream/tests/test-scan.js
+++ b/stream/tests/test-scan.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scan", function() {
diff --git a/stream/tests/test-scanMerge.js b/stream/tests/test-scanMerge.js
index cbf1e7f19..0a441f73d 100644
--- a/stream/tests/test-scanMerge.js
+++ b/stream/tests/test-scanMerge.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scanMerge", function() {
diff --git a/stream/tests/test-stream.js b/stream/tests/test-stream.js
index 30f3a1f30..02044d6c2 100644
--- a/stream/tests/test-stream.js
+++ b/stream/tests/test-stream.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Stream = require("../stream")
 
 o.spec("stream", function() {
diff --git a/test-utils/tests/test-browserMock.js b/test-utils/tests/test-browserMock.js
index 861f1ef07..c08b573fe 100644
--- a/test-utils/tests/test-browserMock.js
+++ b/test-utils/tests/test-browserMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var callAsync = require("../../test-utils/callAsync")
 o.spec("browserMock", function() {
diff --git a/test-utils/tests/test-callAsync.js b/test-utils/tests/test-callAsync.js
index a6bedb5ba..579269e25 100644
--- a/test-utils/tests/test-callAsync.js
+++ b/test-utils/tests/test-callAsync.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 
 o.spec("callAsync", function() {
diff --git a/test-utils/tests/test-components.js b/test-utils/tests/test-components.js
index 3094cff20..47ad5a7d4 100644
--- a/test-utils/tests/test-components.js
+++ b/test-utils/tests/test-components.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 
 o.spec("test-utils/components", function() {
diff --git a/test-utils/tests/test-domMock.js b/test-utils/tests/test-domMock.js
index 5c22c53da..269b641b7 100644
--- a/test-utils/tests/test-domMock.js
+++ b/test-utils/tests/test-domMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 
 o.spec("domMock", function() {
diff --git a/test-utils/tests/test-parseURL.js b/test-utils/tests/test-parseURL.js
index dff926838..5a1e3567d 100644
--- a/test-utils/tests/test-parseURL.js
+++ b/test-utils/tests/test-parseURL.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parseURL = require("../../test-utils/parseURL")
 
 o.spec("parseURL", function() {
diff --git a/test-utils/tests/test-pushStateMock.js b/test-utils/tests/test-pushStateMock.js
index b07ee1b4c..989d1dc21 100644
--- a/test-utils/tests/test-pushStateMock.js
+++ b/test-utils/tests/test-pushStateMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var pushStateMock = require("../../test-utils/pushStateMock")
 var callAsync = require("../../test-utils/callAsync")
 o.spec("pushStateMock", function() {
diff --git a/test-utils/tests/test-throttleMock.js b/test-utils/tests/test-throttleMock.js
index fd00d2bd0..b537b43af 100644
--- a/test-utils/tests/test-throttleMock.js
+++ b/test-utils/tests/test-throttleMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var throttleMocker = require("../../test-utils/throttleMock")
 
 o.spec("throttleMock", function() {
diff --git a/test-utils/tests/test-xhrMock.js b/test-utils/tests/test-xhrMock.js
index 410811b8a..1639ca64c 100644
--- a/test-utils/tests/test-xhrMock.js
+++ b/test-utils/tests/test-xhrMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var xhrMock = require("../../test-utils/xhrMock")
 var parseQueryString = require("../../querystring/parse")
 
diff --git a/tests/test-api.js b/tests/test-api.js
index da6026269..c64e749ab 100644
--- a/tests/test-api.js
+++ b/tests/test-api.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../test-utils/browserMock")
 var components = require("../test-utils/components")
 
diff --git a/util/tests/test-censor.js b/util/tests/test-censor.js
index 625641dfb..18500e202 100644
--- a/util/tests/test-censor.js
+++ b/util/tests/test-censor.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var censor = require("../../util/censor")
 
 o.spec("censor", function() {