diff --git a/README.md b/README.md
index 9a90b51..2fc38e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Vanadium JavaScript
 
-This repository defines the JavaScript API for [Vanadium].
+This repository defines the JavaScript API for Vanadium.
 The client and server APIs defined here work both in [Node.js] and the browser.
 
 ## Install
@@ -16,7 +16,6 @@
 ## Usage
 
 Documentation for this API is available at https://jsdoc.v.io/
-Tutorials can be found at https://v.io/tutorials/javascript/
 
 The entry point to the API is through a module called `vanadium`, everything
 else is considered private and should not be accessed by the users of the API.
@@ -31,8 +30,8 @@
 have been designed in the project to ensure this goal.
 
 When run in a browser, `vanadium.js` expects that the [vanadium
-extension](https://v.io/tools/vanadium-chrome-extension.html) will be
-installed.
+extension](https://github.com/vanadium/docs/blob/master/tools/vanadium-chrome-extension.md)
+will be installed.
 
 ## Bugs and feature requests
 
@@ -40,7 +39,7 @@
 
 ## Building and testing
 
-GNU Make is used to build and test [Vanadium].
+GNU Make is used to build and test Vanadium.
 
 Build everything:
 
@@ -64,6 +63,5 @@
 
     make clean
 
-[Vanadium]: https://v.io/
 [Node.js]: https://nodejs.org/
 [Browserify]: http://browserify.org/
diff --git a/extension/html/addcaveats.html b/extension/html/addcaveats.html
index 722d686..c6425be 100644
--- a/extension/html/addcaveats.html
+++ b/extension/html/addcaveats.html
@@ -21,24 +21,24 @@
   <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400,500|Roboto:500,400italic,300,500italic,300italic,400'
     rel='stylesheet'
     type='text/css'>
-  <link rel="stylesheet" href="https://staging.v.io/identity.css">
+  <link rel="stylesheet" href="https://v.io/identity.css">
 
-  <link rel="apple-touch-icon" sizes="57x57" href="https://staging.v.io/favicons/apple-touch-icon-57x57.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="https://staging.v.io/favicons/apple-touch-icon-114x114.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="https://staging.v.io/favicons/apple-touch-icon-72x72.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="https://staging.v.io/favicons/apple-touch-icon-144x144.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="https://staging.v.io/favicons/apple-touch-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="https://staging.v.io/favicons/apple-touch-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="https://staging.v.io/favicons/apple-touch-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="https://staging.v.io/favicons/apple-touch-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="https://staging.v.io/favicons/apple-touch-icon-180x180.png">
-  <link rel="icon" type="image/png" href="https://staging.v.io/favicons/favicon-192x192.png" sizes="192x192">
-  <link rel="icon" type="image/png" href="https://staging.v.io/favicons/favicon-160x160.png" sizes="160x160">
-  <link rel="icon" type="image/png" href="https://staging.v.io/favicons/favicon-96x96.png" sizes="96x96">
-  <link rel="icon" type="image/png" href="https://staging.v.io/favicons/favicon-16x16.png" sizes="16x16">
-  <link rel="icon" type="image/png" href="https://staging.v.io/favicons/favicon-32x32.png" sizes="32x32">
+  <link rel="apple-touch-icon" sizes="57x57" href="https://v.io/favicons/apple-touch-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="https://v.io/favicons/apple-touch-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="https://v.io/favicons/apple-touch-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="https://v.io/favicons/apple-touch-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="https://v.io/favicons/apple-touch-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="https://v.io/favicons/apple-touch-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="https://v.io/favicons/apple-touch-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="https://v.io/favicons/apple-touch-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="https://v.io/favicons/apple-touch-icon-180x180.png">
+  <link rel="icon" type="image/png" href="https://v.io/favicons/favicon-192x192.png" sizes="192x192">
+  <link rel="icon" type="image/png" href="https://v.io/favicons/favicon-160x160.png" sizes="160x160">
+  <link rel="icon" type="image/png" href="https://v.io/favicons/favicon-96x96.png" sizes="96x96">
+  <link rel="icon" type="image/png" href="https://v.io/favicons/favicon-16x16.png" sizes="16x16">
+  <link rel="icon" type="image/png" href="https://v.io/favicons/favicon-32x32.png" sizes="32x32">
   <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="msapplication-TileImage" content="https://staging.v.io/favicons/mstile-144x144.png">
+  <meta name="msapplication-TileImage" content="https://v.io/favicons/mstile-144x144.png">
 
   <script src="/js/addcaveats.js"></script>
   <title>Request for Blessings</title>
diff --git a/jsdocs/index.md b/jsdocs/index.md
index 4b336c9..abb0b91 100644
--- a/jsdocs/index.md
+++ b/jsdocs/index.md
@@ -1,5 +1,5 @@
 ## Vanadium JavaScript API
-Vanadium is an ongoing effort to build an open source, cross-platform application framework for secure, cross-device user experiences. For more details about the Vanadium project, please visit [https://v.io](https://v.io).
+Vanadium is an ongoing effort to build an open source, cross-platform application framework for secure, cross-device user experiences.
 
 [Vanadium module](./module-vanadium.html) provides JavaScript APIs into its application environment to enable development of Vanadium-based applications in JavaScript. These applications currently work in NodeJS and in the desktop Chrome browser.
 
@@ -8,6 +8,3 @@
 
 [Runtime](./module-vanadium-Runtime.html), as returned by the
 [init](module-vanadium.html#.init) function, defines entry points to create servers, client, blessing and other Vanadium functionality.
-
-## Tutorials
-Please visit tutorials section of [v.io website](https://v.io/tutorials/javascript/) for JavaScript tutorials.
\ No newline at end of file
diff --git a/src/browser/extension-consts.js b/src/browser/extension-consts.js
index 40459c0..b897185 100644
--- a/src/browser/extension-consts.js
+++ b/src/browser/extension-consts.js
@@ -4,7 +4,8 @@
 
 var extensionId = 'jcaelnibllfoobpedofhlaobfcoknpap';
 module.exports = {
-  extensionDocsUrl: 'https://v.io/tools/vanadium-chrome-extension.html',
+  extensionDocsUrl: ('https://github.com/vanadium/docs/blob/master/tools/' +
+                     'vanadium-chrome-extension.md'),
   extensionId: extensionId,
   extensionUrl: 'https://chrome.google.com/webstore/detail/' + extensionId
-};
\ No newline at end of file
+};
diff --git a/src/security/index.js b/src/security/index.js
index 5e2dff6..b5687e0 100644
--- a/src/security/index.js
+++ b/src/security/index.js
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 /**
- * @summary Namespace security provides an API for the Vanadium
- * security concepts defined in {@link https://v.io/concepts/security.html}.
+ * @summary Namespace security provides an API for the Vanadium security
+ * concepts defined in
+ * {@link https://github.com/vanadium/docs/blob/master/concepts/security.md}.
  * @description
- * <p>Namespace security provides an API for the Vanadium
- * security concepts defined in {@link https://v.io/concepts/security.html}.
+ * <p>Namespace security provides an API for the Vanadium security concepts
+ * defined in
+ * {@link https://github.com/vanadium/docs/blob/master/concepts/security.md}.
  * </p>
  *
  * <p>The primitives and APIs defined in this package enable bi-directional,
diff --git a/src/vanadium.js b/src/vanadium.js
index 6154e3a..440ff49 100644
--- a/src/vanadium.js
+++ b/src/vanadium.js
@@ -35,7 +35,7 @@
  * backwards compatibility we can't guarantee that until we reach the '1.0'
  * milestone.
  * For more details about the Vanadium project,
- * please visit {@link https://v.io}.</p>
+ * please visit {@link https://github.com/vanadium/docs}.</p>
  * @module vanadium
 */
 
diff --git a/src/vom/index.js b/src/vom/index.js
index be05c5f..2fb3068 100644
--- a/src/vom/index.js
+++ b/src/vom/index.js
@@ -8,7 +8,8 @@
  * @description
  * <p> Namespace vom implements Vanadium Object Marshaling, a serialization
  * protocol.</p>
- * <p>For the concept doc see {@link https://staging.v.io/concepts/vom.html}
+ * <p>For the concept doc see
+ * {@link https://github.com/vanadium/docs/blob/master/concepts/rpc.md#vom}
  * </p>
  * <p>Vom is used in Vanadium to enable interchange of user-defined data
  * structures across networks, languages and storage systems.</p>