diff --git a/README.md b/README.md
index 52cfa343b..4beec1d6c 100644
--- a/README.md
+++ b/README.md
@@ -1028,7 +1028,7 @@ template.render({
 </async-fragment>
 ```
 
-For more details, please see [https://github.com/raptorjs3/marko-taglib-async](https://github.com/raptorjs3/marko-taglib-async).
+For more details, please see [https://github.com/raptorjs3/marko-async](https://github.com/raptorjs3/marko-async).
 
 ## Layout Taglib
 
@@ -1069,7 +1069,7 @@ _Usage of `default-layout.marko`:_
 ```
 
 
-For more details, please see [https://github.com/raptorjs3/marko-taglib-layout](https://github.com/raptorjs3/marko-taglib-layout).
+For more details, please see [https://github.com/raptorjs3/marko-layout](https://github.com/raptorjs3/marko-layout).
 
 # Custom Taglibs
 
diff --git a/compiler/marko-compiler.js b/compiler/marko-compiler.js
index a2a0b5f47..d9288f942 100644
--- a/compiler/marko-compiler.js
+++ b/compiler/marko-compiler.js
@@ -111,5 +111,5 @@ exports.taglibs.excludeDir(nodePath.join(__dirname, '../'));
 exports.taglibs.registerTaglib(require.resolve('../taglibs/core/marko-taglib.json'));
 exports.taglibs.registerTaglib(require.resolve('../taglibs/html/marko-taglib.json'));
 exports.taglibs.registerTaglib(require.resolve('../taglibs/caching/marko-taglib.json'));
-exports.taglibs.registerTaglib(require.resolve('marko-taglib-layout/marko-taglib.json'));
-exports.taglibs.registerTaglib(require.resolve('marko-taglib-async/marko-taglib.json'));
+exports.taglibs.registerTaglib(require.resolve('marko-layout/marko-taglib.json'));
+exports.taglibs.registerTaglib(require.resolve('marko-async/marko-taglib.json'));
diff --git a/package.json b/package.json
index 490b63ae0..abe4861ad 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,8 @@
         "raptor-regexp": "^1.0.0-beta",
         "async-writer": "^1.0.0-beta",
         "raptor-strings": "^1.0.0-beta",
-        "marko-taglib-async": "^1.1.0",
-        "marko-taglib-layout": "^1.1.0",
+        "marko-async": "^1.1.0",
+        "marko-layout": "^1.1.0",
         "raptor-util": "^1.0.0-beta",
         "sax": "^0.6.0"
     },
diff --git a/test/dust-tests.js b/test/dust-tests.js
index 0f2b898f4..67583a671 100644
--- a/test/dust-tests.js
+++ b/test/dust-tests.js
@@ -18,7 +18,7 @@ dust.onLoad = function(path, callback) {
 };
 
 
-require('marko-taglib-async/dust').registerHelpers(dust);
+require('marko-async/dust').registerHelpers(dust);
 
 function testRender(path, data, done, options) {
     options = options || {};