diff --git a/macros/AddonSidebar.ejs b/macros/AddonSidebar.ejs
index a8dc8bc21..6449152e8 100644
--- a/macros/AddonSidebar.ejs
+++ b/macros/AddonSidebar.ejs
@@ -16,86 +16,86 @@ function currentPageIsUnder(root) {
 
 <section class="Quick_links" id="Quick_Links">
   <ol>
-    <li><a href="<%=baseURL%>WebExtensions"><strong>Browser extensions</strong></a></li>
+    <li><a href="<%=baseURL%>Extensions"><strong>Browser extensions</strong></a></li>
 
-    <li><a href="<%=baseURL%>WebExtensions#Getting_started">Getting started</a>
+    <li><a href="<%=baseURL%>Extensions#Getting_started">Getting started</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/What_are_WebExtensions_">What are extensions?</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Your_first_WebExtension">Your first extension</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Your_second_WebExtension">Your second extension</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Anatomy_of_a_WebExtension">Anatomy of an extension</a>
-        <li><a href="<%=baseURL%>WebExtensions/Examples">Example extensions</a>
+        <li><a href="<%=baseURL%>Extensions/What_are_extensions_">What are extensions?</a></li>
+        <li><a href="<%=baseURL%>Extensions/Your_first_extension">Your first extension</a></li>
+        <li><a href="<%=baseURL%>Extensions/Your_second_extension">Your second extension</a></li>
+        <li><a href="<%=baseURL%>Extensions/Anatomy_of_an_extension">Anatomy of an extension</a>
+        <li><a href="<%=baseURL%>Extensions/Examples">Example extensions</a>
       </ol>
     </li>
     
-    <li><a href="<%=baseURL%>WebExtensions#How_to">How to</a>
+    <li><a href="<%=baseURL%>Extensions#How_to">How to</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/Intercept_HTTP_requests">Intercept HTTP requests</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Modify_a_web_page">Modify a web page</a>
-        <li><a href="<%=baseURL%>WebExtensions/Add_a_button_to_the_toolbar">Add a button to the toolbar</a>
-        <li><a href="<%=baseURL%>WebExtensions/Implement_a_settings_page">Implement a settings page</a></li>
+        <li><a href="<%=baseURL%>Extensions/Intercept_HTTP_requests">Intercept HTTP requests</a></li>
+        <li><a href="<%=baseURL%>Extensions/Modify_a_web_page">Modify a web page</a>
+        <li><a href="<%=baseURL%>Extensions/Add_a_button_to_the_toolbar">Add a button to the toolbar</a>
+        <li><a href="<%=baseURL%>Extensions/Implement_a_settings_page">Implement a settings page</a></li>
       </ol>
     </li>
 
-    <li><a href="<%=baseURL%>WebExtensions#How_to">User interface</a>
+    <li><a href="<%=baseURL%>Extensions#How_to">User interface</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface">Introduction</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Browser_action">Toolbar button</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Page_actions">Address bar button</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Sidebars">Sidebar</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Context_menu_items">Context menu items</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Options_pages">Options page</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Bundled_web_pages">Bundled web pages</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Notifications">Notifications</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/Omnibox">Address bar suggestions</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/user_interface/devtools_panels">Developer tools panels</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface">Introduction</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Browser_action">Toolbar button</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Page_actions">Address bar button</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Sidebars">Sidebar</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Context_menu_items">Context menu items</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Options_pages">Options page</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Bundled_web_pages">Bundled web pages</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Notifications">Notifications</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/Omnibox">Address bar suggestions</a></li>
+        <li><a href="<%=baseURL%>Extensions/user_interface/devtools_panels">Developer tools panels</a></li>
       </ol>
     </li>
 
-    <li><a href="<%=baseURL%>WebExtensions#Concepts">Concepts</a>
+    <li><a href="<%=baseURL%>Extensions#Concepts">Concepts</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/Using_the_JavaScript_APIs">Using the JavaScript APIs</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Content_scripts">Content scripts</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Match_patterns">Match patterns</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Working_with_files">Working with files</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Internationalization">Internationalization</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Content_Security_Policy">Content Security Policy</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Native_messaging">Native messaging</a></li>
+        <li><a href="<%=baseURL%>Extensions/Using_the_JavaScript_APIs">Using the JavaScript APIs</a></li>
+        <li><a href="<%=baseURL%>Extensions/Content_scripts">Content scripts</a></li>
+        <li><a href="<%=baseURL%>Extensions/Match_patterns">Match patterns</a></li>
+        <li><a href="<%=baseURL%>Extensions/Working_with_files">Working with files</a></li>
+        <li><a href="<%=baseURL%>Extensions/Internationalization">Internationalization</a></li>
+        <li><a href="<%=baseURL%>Extensions/Content_Security_Policy">Content Security Policy</a></li>
+        <li><a href="<%=baseURL%>Extensions/Native_messaging">Native messaging</a></li>
       </ol>
     </li>  
 
-    <li><a href="<%=baseURL%>WebExtensions#Porting">Porting</a>
+    <li><a href="<%=baseURL%>Extensions#Porting">Porting</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/Porting_a_Google_Chrome_extension">Porting a Google Chrome extension</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Porting_a_legacy_Firefox_add-on">Porting a legacy Firefox extension</a>
-        <li><a href="<%=baseURL%>WebExtensions/Embedded_WebExtensions">Embedded WebExtensions</a>
-        <li><a href="<%=baseURL%>WebExtensions/Comparison_with_the_Add-on_SDK">Comparison with the Add-on SDK</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Comparison_with_XUL_XPCOM_extensions">Comparison with XUL/XPCOM extensions</a>
-        <li><a href="<%=baseURL%>WebExtensions/Chrome_incompatibilities">Chrome incompatibilities</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Differences_between_desktop_and_Android">Differences between desktop and Android</a></li>
+        <li><a href="<%=baseURL%>Extensions/Porting_a_Google_Chrome_extension">Porting a Google Chrome extension</a></li>
+        <li><a href="<%=baseURL%>Extensions/Porting_a_legacy_Firefox_extension">Porting a legacy Firefox extension</a>
+        <li><a href="<%=baseURL%>Extensions/Embedded_WebExtensions">Embedded WebExtensions</a>
+        <li><a href="<%=baseURL%>Extensions/Comparison_with_the_Add-on_SDK">Comparison with the Add-on SDK</a></li>
+        <li><a href="<%=baseURL%>Extensions/Comparison_with_XUL_XPCOM_extensions">Comparison with XUL/XPCOM extensions</a>
+        <li><a href="<%=baseURL%>Extensions/Chrome_incompatibilities">Chrome incompatibilities</a></li>
+        <li><a href="<%=baseURL%>Extensions/Differences_between_desktop_and_Android">Differences between desktop and Android</a></li>
       </ol>
     </li>  
 
-    <li><a href="<%=baseURL%>WebExtensions#Firefox_workflow">Firefox workflow</a>
+    <li><a href="<%=baseURL%>Extensions#Firefox_workflow">Firefox workflow</a>
       <ol>
-        <li><a href="<%=baseURL%>WebExtensions/Temporary_Installation_in_Firefox">Temporary Installation in Firefox</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Debugging">Debugging</a>
-        <li><a href="<%=baseURL%>WebExtensions/Developing_WebExtensions_for_Firefox_for_Android">Developing for Firefox for Android</a>
-        <li><a href="<%=baseURL%>WebExtensions/Getting_started_with_web-ext">Getting started with web-ext</a>
-        <li><a href="<%=baseURL%>WebExtensions/web-ext_command_reference">web-ext command reference</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/WebExtensions_and_the_Add-on_ID">Extensions and the Add-on ID</a></li>
-        <li><a href="<%=baseURL%>WebExtensions/Publishing_your_WebExtension">Publishing your extension</a></li>
+        <li><a href="<%=baseURL%>Extensions/Temporary_Installation_in_Firefox">Temporary Installation in Firefox</a></li>
+        <li><a href="<%=baseURL%>Extensions/Debugging">Debugging</a>
+        <li><a href="<%=baseURL%>Extensions/Developing_extensions_for_Firefox_for_Android">Developing for Firefox for Android</a>
+        <li><a href="<%=baseURL%>Extensions/Getting_started_with_web-ext">Getting started with web-ext</a>
+        <li><a href="<%=baseURL%>Extensions/web-ext_command_reference">web-ext command reference</a></li>
+        <li><a href="<%=baseURL%>Extensions/Extensions_and_the_Add-on_ID">Extensions and the Add-on ID</a></li>
+        <li><a href="<%=baseURL%>Extensions/Publishing_your_extension">Publishing your extension</a></li>
 
       </ol>
     </li>  
     
-    <li data-default-state="<%=currentPageIsUnder('WebExtensions/API')%>"><a href="<%=baseURL%>WebExtensions/API">JavaScript APIs</a>
+    <li data-default-state="<%=currentPageIsUnder('Extensions/API')%>"><a href="<%=baseURL%>Extensions/API">JavaScript APIs</a>
      <%-template("WebExtAPISidebar", [])%>
     </li>
     
-    <li><a href="<%=baseURL%>WebExtensions/manifest.json">Manifest keys</a>
+    <li><a href="<%=baseURL%>Extensions/manifest.json">Manifest keys</a>
     <%-
-      wiki.tree(baseURL + "WebExtensions/manifest.json", 1, 0, 0, 1)
+      wiki.tree(baseURL + "Extensions/manifest.json", 1, 0, 0, 1)
     %>
     </li>
 
@@ -135,7 +135,7 @@ function currentPageIsUnder(root) {
     <li><a href="<%=baseURL%>Channels">Channels</a>
       <ol>
         <li><a href="https://blog.mozilla.org/addons">Add-ons blog</a></li>
-        <li><a href="https://discourse.mozilla-community.org/c/add-ons">Add-on forums</a></li>
+        <li><a href="https://discourse.mozilla.org/c/add-ons">Add-on forums</a></li>
         <li><a href="http://stackoverflow.com/questions/tagged/firefox-addon">Stack Overflow</a></li>
         <li><a href="https://groups.google.com/forum/#!forum/mozilla.dev.extensions">Development newsgroup</a></li>
         <li><a href="<%=baseURL%>#Contact_us">Contact us</a></li>
diff --git a/macros/WebExtAPIRef.ejs b/macros/WebExtAPIRef.ejs
index c1fce8027..690854e58 100644
--- a/macros/WebExtAPIRef.ejs
+++ b/macros/WebExtAPIRef.ejs
@@ -2,11 +2,11 @@
 /* Used for generating cross-references within the Web Extensions API
  * documentation.
  * if you specify the API name with parens (ie, "bar()"), the link is to
- * lang//en-US/docs/Mozilla/Add-ons/WebExtensions/API/Foo/bar but the title
+ * lang//en-US/docs/Mozilla/Add-ons/Extensions/API/Foo/bar but the title
  * is displayed as "bar()" to make it clear it's a function.
  * @param
  *   The path of the page to link to, relative to the
- * /en-US/docs/Mozilla/Add-ons/WebExtensions/API documentation path.
+ * /en-US/docs/Mozilla/Add-ons/Extensions/API documentation path.
  * @param [optional] 
  *   The text to use for the link.  If omitted, the value of the first
  *   parameter will be used
@@ -30,7 +30,7 @@ if (rtlLocales.indexOf(lang) != -1) {
     str = '<bdi>' + str +'</bdi>';
 }
 
-var URL = "/" + lang + '/docs/Mozilla/Add-ons/WebExtensions/API/' + api;
+var URL = "/" + lang + '/docs/Mozilla/Add-ons/Extensions/API/' + api;
 
 var anch = '';
 
diff --git a/macros/WebExtAPISidebar.ejs b/macros/WebExtAPISidebar.ejs
index fd0a4c1e3..bafd30c6f 100644
--- a/macros/WebExtAPISidebar.ejs
+++ b/macros/WebExtAPISidebar.ejs
@@ -7,7 +7,7 @@ var hasTag = page.hasTag;
 var slug = env.slug;
 var locale = env.locale;
 var baseURL = "/" + locale + "/docs/";
-var baseAPIPage = baseURL + "Mozilla/Add-ons/WebExtensions/API";
+var baseAPIPage = baseURL + "Mozilla/Add-ons/Extensions/API";
 
 function classifyPages(subpages) {
   var collection = {
@@ -60,7 +60,7 @@ output += '</ol>';
 
 function buildSidebarForAllAPIs() {
   output = "<ol>";
-  var browserSupportURL = baseURL + "Mozilla/Add-ons/WebExtensions/Browser_support_for_JavaScript_APIs";
+  var browserSupportURL = baseURL + "Mozilla/Add-ons/Extensions/Browser_support_for_JavaScript_APIs";
   var browserSupportTitle = "Browser support for JavaScript APIs";
   output +=  '<li><a href="' +  browserSupportURL + '">' + browserSupportTitle + '</a>';
 
diff --git a/macros/WebExtAllCompatTables.ejs b/macros/WebExtAllCompatTables.ejs
index aefa03f1a..710a10aad 100644
--- a/macros/WebExtAllCompatTables.ejs
+++ b/macros/WebExtAllCompatTables.ejs
@@ -17,12 +17,12 @@ The exception is the devtools APIs: these have a three-level structure
 "devtools.panels" the namespace. So for devtools APIs, we iterate into
 the devtools namespace to generate aggregated tables.
 
-This macro can be inserted anywhere, and takes not arguments.
+This macro can be inserted anywhere, and takes no arguments.
 */
 
 const compatDataUrl = "https://raw.githubusercontent.com/mdn/browser-compat-data/master/webextensions/javascript-apis.json";
 const compatJson = mdn.fetchJSONResource(compatDataUrl);
-const webExtAPIBaseUrl = "docs/Mozilla/Add-ons/WebExtensions/API";
+const webExtAPIBaseUrl = "docs/Mozilla/Add-ons/Extensions/API";
 
 function writeTableForModule(data, moduleName) {
   var table = `<h2>${moduleName}</h2>`;
diff --git a/macros/WebExtAllExamples.ejs b/macros/WebExtAllExamples.ejs
index 5762ac738..5710ac601 100644
--- a/macros/WebExtAllExamples.ejs
+++ b/macros/WebExtAllExamples.ejs
@@ -1,19 +1,19 @@
 <%
 
 /*
-The "examples.json" file from the https://github.com/mdn/webextensions-examples
+The "examples.json" file from the https://github.com/mdn/browser-extensions-examples
 repository contains information about the examples living in that repository.
 
 This macro loads the "examples.json" file and uses it to build a table
 presenting that information.
 
-For example, the page at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Examples
+For example, the page at https://developer.mozilla.org/en-US/Add-ons/Extensions/Examples
 is generated using this macro.
 
 */
 
-const examplesBaseUrl = "https://github.com/mdn/webextensions-examples/tree/master/";
-const allExamples = mdn.fetchJSONResource("https://raw.githubusercontent.com/mdn/webextensions-examples/master/examples.json");
+const examplesBaseUrl = "https://github.com/mdn/browser-extensions-examples/tree/master/";
+const allExamples = mdn.fetchJSONResource("https://raw.githubusercontent.com/mdn/browser-extensions-examples/master/examples.json");
 const lang = env.locale;
 
 const s_name = mdn.localString({
@@ -29,7 +29,7 @@ const s_javascript_apis = mdn.localString({
 });
 
 const s_webextension_api_path = mdn.localString({
-    "en-US": "Add-ons/WebExtensions/API"
+    "en-US": "Add-ons/Extensions/API"
 });
 
 function writeJavaScriptAPIs(apisJSON) {
diff --git a/macros/WebExtBrowserCompat.ejs b/macros/WebExtBrowserCompat.ejs
index 886687f23..84082f66d 100644
--- a/macros/WebExtBrowserCompat.ejs
+++ b/macros/WebExtBrowserCompat.ejs
@@ -3,7 +3,7 @@
 /**
 WebExtBrowserCompat.ejs
 -----------------------
-Use this macro to insert the appropriate WebExtension compat table for the
+Use this macro to insert the appropriate Extension compat table for the
 current page.
 
 It takes one optional argument.
@@ -15,7 +15,7 @@ this function only supports tables for manifest.json keys.
 * If the argument is omitted, the macro calls tableFromSlug(), which uses
 the slug of the current page to get the right chunk of JSON data for the
 table. The no-argument form is only allowed on pages under
-"Add-ons/WebExtensions/API/".
+"Add-ons/Extensions/API/".
 */
 
 /**
@@ -42,7 +42,7 @@ function tableFromArgument(path) {
   const manifestDataUrl = "https://raw.githubusercontent.com/mdn/browser-compat-data/master/webextensions/manifest-keys.json";
   // if the argument does not specify a manifest key, generate the aggregate table
   if (pathComponents.length === 2) {
-    const manifestBaseUrl = "Add-ons/WebExtensions/manifest.json";
+    const manifestBaseUrl = "Add-ons/Extensions/manifest.json";
     compatJson = mdn.fetchJSONResource(manifestDataUrl).data.webextensions.manifest;
     return template("WebExtBrowserCompatTable", [compatJson, manifestBaseUrl]);
   } else {
@@ -57,33 +57,33 @@ This function transforms the URL of the current page into a path through
 the compat data, and uses this path to retrieve the appropriate bit of data.
 For example:
 
-https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/alarms
+https://developer.mozilla.org/en-US/Add-ons/Extensions/API/alarms
 ...would become data["alarms"]
 
-https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/alarms/get
+https://developer.mozilla.org/en-US/Add-ons/Extensions/API/alarms/get
 ...would become data["alarms"]["get"]
 
 One tricky detail is that it needs to handle the devtools APIs, which name
 themselves "devtools.thing":
 
-https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/devtools.panels
+https://developer.mozilla.org/en-US/Add-ons/Extensions/API/devtools.panels
 ...would become data["devtools"]["panels"]
 
 It then passes the compat data into "WebExtBrowserCompatTable", which
 builds the table.
 
-This function may only be called from pages under "Add-ons/WebExtensions/API/".
+This function may only be called from pages under "Add-ons/Extensions/API/".
 */
 function tableFromSlug() {
   const url = "https://raw.githubusercontent.com/mdn/browser-compat-data/master/webextensions/javascript-apis.json";
-  const webExtAPIBaseUrl = "Add-ons/WebExtensions/API/";
+  const webExtAPIBaseUrl = "Add-ons/Extensions/API/";
 
   // Pages that include this macro must be under
-  // the "Add-ons/WebExtensions/API/" hierarchy.
+  // the "Add-ons/Extensions/API/" hierarchy.
   // So first, let's get the part of the URL following that subpath, or fail.
   var components = env.slug.split(webExtAPIBaseUrl);
   if (components.length < 2) {
-    throw "If no arguments are given, then this macro can only be called from pages under \"Add-ons/WebExtensions/API/\"";
+    throw "If no arguments are given, then this macro can only be called from pages under \"Add-ons/Extensions/API/\"";
   }
 
   // Now we're looking at a subpath like:
diff --git a/macros/WebExtBrowserCompatTable.ejs b/macros/WebExtBrowserCompatTable.ejs
index 0a63e2288..452d1445c 100644
--- a/macros/WebExtBrowserCompatTable.ejs
+++ b/macros/WebExtBrowserCompatTable.ejs
@@ -40,7 +40,7 @@ containing aggregated compat data for the child properties of the compat object.
 The second argument must be a relative URL pointing to the docs page for
 the aggregating object, omitting the locale. For example:
 
-    "/Add-ons/WebExtensions/API/alarms"
+    "/Add-ons/Extensions/API/alarms"
 
 */
 
diff --git a/macros/WebExtChromeCompat.ejs b/macros/WebExtChromeCompat.ejs
index 2633fd4af..c735f2f65 100644
--- a/macros/WebExtChromeCompat.ejs
+++ b/macros/WebExtChromeCompat.ejs
@@ -3,7 +3,7 @@
 var output = "<h3>Chrome incompatibilities</h3>";
 
 // source URL for incompatibilities
-var url = "/en-US/docs/Mozilla/Add-ons/WebExtensions/Chrome_incompatibilities";
+var url = "/en-US/docs/Mozilla/Add-ons/Extensions/Chrome_incompatibilities";
 var none = "<p>None.</p>"
 
 // API is either $0 or the name of the calling page
diff --git a/macros/WebExtCompat.ejs b/macros/WebExtCompat.ejs
deleted file mode 100644
index 89d23d954..000000000
--- a/macros/WebExtCompat.ejs
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-
-var heading = $1 || "h3";
-
-var output = "<" + heading + ">Chrome incompatibilities</" + heading + ">";
-
-// source URL for incompatibilities
-var url = "/en-US/docs/Mozilla/Add-ons/WebExtensions/Chrome_incompatibilities";
-var none = "None."
-
-// API is either $0 or the name of the calling page
-var slug = env.slug;
-if (!slug) {
-    return;
-}
-var pathComponents = slug.split("/");
-if (pathComponents < 1) {
-    return;
-}
-var leafDocument = pathComponents[pathComponents.length-1];
-var section = $0 || leafDocument;
-
-var incompatibilities = wiki.page(url, section);
-
-if (incompatibilities) {
-  output += incompatibilities;
-}
-else {
-  output += none;
-}
-
-%>
-
-<%- output %>
diff --git a/macros/WebExtExamples.ejs b/macros/WebExtExamples.ejs
index 7240bacd3..6f533a9bb 100644
--- a/macros/WebExtExamples.ejs
+++ b/macros/WebExtExamples.ejs
@@ -1,13 +1,13 @@
 <%
 
 /*
-The "examples.json" file from the https://github.com/mdn/webextensions-examples
+The "examples.json" file from the https://github.com/mdn/browser-extensions-examples
 repository contains information about the examples living in that repository.
 
-This macro must be embedded in a WebExtensions API page, either of:
+This macro must be embedded in an Extensions API page, either of:
 
-* a "module" page (for example: "/en-US/Add-ons/WebExtensions/API/alarms" or "/en-US/Add-ons/WebExtensions/API/tabs")
-* an "API" page (for example: "/en-US/Add-ons/WebExtensions/API/alarms/create" or "/en-US/Add-ons/WebExtensions/API/tabs/executeScript")
+* a "module" page (for example: "/en-US/Add-ons/Extensions/API/alarms" or "/en-US/Add-ons/Extensions/API/tabs")
+* an "API" page (for example: "/en-US/Add-ons/Extensions/API/alarms/create" or "/en-US/Add-ons/Extensions/API/tabs/executeScript")
 
 If it's embedded in a module page, it fetches all the examples that use any
 of the APIs in the given module, and outputs a list of links to those examples.
@@ -20,8 +20,8 @@ The macro takes one optional argument, which is the name of the tag to use
 for the header. So if you want the header to be an <h2>, call it with "h2".
 */
 
-const allExamples = mdn.fetchJSONResource("https://raw.githubusercontent.com/mdn/webextensions-examples/master/examples.json");
-const examplesBaseURL = "https://github.com/mdn/webextensions-examples/tree/master/";
+const allExamples = mdn.fetchJSONResource("https://raw.githubusercontent.com/mdn/browser-extensions-examples/master/examples.json");
+const examplesBaseURL = "https://github.com/mdn/browser-extensions-examples/tree/master/";
 const desiredHeading = $0 || "h3";
 const lang = env.locale;
 
diff --git a/macros/WebExtTopicRef.ejs b/macros/WebExtTopicRef.ejs
deleted file mode 100644
index 39012140a..000000000
--- a/macros/WebExtTopicRef.ejs
+++ /dev/null
@@ -1,69 +0,0 @@
-<%
-/* Used for generating cross-references from the Web Extensions API
- * documentation to guide pages.
- *
- * This macro is used for porting documentation from other systems,
- * and probably isn't suitable for other uses.
- *
- * Given the first parameter as the name of the target page,
- * it looks for that page in:
- *
- *  /en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/<name>
- *
- * If it finds a page here is builds a link to that page.
- * If it doesn't find a page here, it looks for a page in:
- *
- *  /en-US/docs/Mozilla/Add-ons/WebExtensions/<name>
- *
- * If it doesn't find the page here either, it just returns the link text (param 2)
- * if given, or the name otherwise.
- *
- * @param
- *   The path of the page to link to, relative to the
- * /en-US/docs/Mozilla/Add-ons/WebExtensions/API documentation path.
- * @param [optional] 
- *   The text to use for the link.  If omitted, the value of the first
- *   parameter will be used
- */
-
-var targetPage = $0;
-var linkText = $1 || $0;
-var myWiki = wiki;
-var myMdn = mdn;
-
-function getResult(targetPage) {
-  var firstChoice = '/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/' + targetPage;
-  guidePage = targetPage.replace(' ', '_');
-  var secondChoice = '/en-US/docs/Mozilla/Add-ons/WebExtensions/' + guidePage;
-
-  var page = myWiki.getPage(firstChoice);
-
-  if (page.url) {
-    return buildLink(page, firstChoice, linkText);
-  }
-
-  page = myWiki.getPage(secondChoice);
-
-  if (page.url) {
-    return buildLink(page, secondChoice, linkText);
-  }
-
-  return linkText;
-}
-
-function buildLink(page, target, text) {
-  if (page.summary) {
-    var summary = myMdn.escapeQuotes(page.summary);
-    return '<a href="' + target + '"' +
-               'title="' + summary + '"' +
-            '>' + text + "</a>";
-  }
-  else {
-    return '<a href="' + target + '""' +
-           '>' + text + "</a>";  
-  }
-}
-
-var result = getResult(targetPage);
-
-%><%-result%>
diff --git a/macros/WebExtensionSidebar.ejs b/macros/WebExtensionSidebar.ejs
deleted file mode 100644
index 6f848b21b..000000000
--- a/macros/WebExtensionSidebar.ejs
+++ /dev/null
@@ -1,102 +0,0 @@
-<%
-
-var sidebarUtils = require_macro("SidebarUtilities");
-var hasTag = page.hasTag;
-var pageModule = page;
-
-var slug = env.slug;
-
-var output = "";
-
-function classifyPages(subpages) {
-  var collection = {
-      properties: [],
-      methods: [],
-      events: [],
-      types: []
-  }
-
-  subpages.forEach(function(subpage) {
-    if (hasTag(subpage, "Property")) {
-      collection.properties.push(subpage);
-    }
-    if (hasTag(subpage, "Method")) {
-      collection.methods.push(subpage);
-    }
-    if (hasTag(subpage, "Type")) {
-      collection.types.push(subpage);
-    }
-    if (hasTag(subpage, "Event")) {
-      collection.events.push(subpage);
-    }
-  });
-
-  return collection;
-}
-
-function buildSidebar(slug) {
-  if (!slug) {
-    return;
-  }
-
-  var pathComponents = slug.split("/");
-  if (pathComponents < 2) {
-    return;
-  }
-
-  // find out where we are in the tree
-  var leafDocument = pathComponents[pathComponents.length-1];
-  // 1) we are at the root
-  if (leafDocument == "API") {
-    buildSidebarForRoot(slug);
-  }
-  else {
-    parentDocument = pathComponents[pathComponents.length-2];
-    var apiPath = "";
-    if (parentDocument == "API") {
-      // 2) we are at an API overview
-      apiPath = slug;
-      buildSidebarForAPI(apiPath, leafDocument);
-    }
-    else {
-      // 3) we are at an API component page (method, property, ...)
-      apiPath = slug.slice(0, apiPath.length - (leafDocument.length + 1));
-      buildSidebarForAPI(apiPath, parentDocument);
-    }
-  }
-}
-
-function buildSidebarForRoot(path) {
-  output = '<section class="Quick_links" id="Quick_Links"><ol>';
-  var subpages = pageModule.subpagesExpand("/en-US/docs/" + path);
-  output += sidebarUtils.buildSublist(subpages, "API Reference");
-  output += '</ol></section>';
-}
-
-function buildSidebarForAPI(path, parent) {
-  output = '<section class="Quick_links" id="Quick_Links"><ol>';
-  output += '<li><strong><a href="' +  "/en-US/docs/" + path + '"><code>' + parent + '</a></code></strong></li>';
-
-  var subpages = pageModule.subpagesExpand("/en-US/docs/" + path);
-  var pageCollection = classifyPages(subpages);
-
-  if (pageCollection.methods.length > 0) {
-    output += sidebarUtils.buildSublist(pageCollection.methods, "Methods");
-  }
-  if (pageCollection.properties.length > 0) {
-    output += sidebarUtils.buildSublist(pageCollection.properties, "Properties");
-  }
-  if (pageCollection.types.length > 0) {
-    output += sidebarUtils.buildSublist(pageCollection.types, "Types");
-  }
-  if (pageCollection.events.length > 0) {
-    output += sidebarUtils.buildSublist(pageCollection.events, "Events");
-  }
-  output += '</ol></section>';
-}
-
-buildSidebar(env.slug);
-
-%>
-
-<%-output%>
diff --git a/macros/wexref.ejs b/macros/wexref.ejs
deleted file mode 100644
index 08959feb0..000000000
--- a/macros/wexref.ejs
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/* Used for generating cross-references within the Web Extensions API
- * documentation.
- * if you specify the API name with parens (ie, "bar()"), the link is to
- * lang//en-US/docs/Mozilla/Add-ons/WebExtensions/API/Foo/bar but the title
- * is displayed as "bar()" to make it clear it's a function.
- * @param
- *   The path of the page to link to, relative to the
- * /en-US/docs/Mozilla/Add-ons/WebExtensions/API documentation path.
- * @param [optional] 
- *   The text to use for the link.  If omitted, the value of the first
- *   parameter will be used
- * @param [optional] 
- *   An anchor to link to on the page. Link text will display as $0.$2 or $1.$2 
- * @param [optional] 
- *   If set, do not put the wexref text in code 
- */
-
-/* get a page's language (Don't use page.language!) */
-var lang = env.locale;
-var api = $0;
-var str = $1 || $0;
-var rtlLocales = ['ar', 'he', 'fa'];
-var localStrings = string.deserialize(template("L10n:Common"));
-
-api = api.replace(' ', '_').replace('()', '').replace(/\./g, '/');
-
-// RTL locales
-if (rtlLocales.indexOf(lang) != -1) {
-    str = '<bdi>' + str +'</bdi>';
-}
-// Ensure Interfaces are always uppercased in links 
-// (important for red links to create correct new pages)
-api = api.charAt(0).toUpperCase() + api.slice(1);
-
-var URL = "/" + lang + '/docs/Mozilla/Add-ons/WebExtensions/API/' + api;
-
-var anch = '';
-
-if ($2) {
-  str = str + '.' + $2;
-  anch = '#' + $2;
-}
-
-// Now that we have the URL, let's gather the page summary for our tooltip
-
-var page = wiki.getPage(URL);
-var summary = "";
-
-if (!$2) {
-    if (page && page.summary) {
-        summary = mdn.escapeQuotes(page.summary);
-    } else {
-        summary = mdn.getLocalString(localStrings, "summary");
-    }
-}
-
-var code = '';
-var endcode = '';
-if (!$3) { code = '<code>'; endcode = '</code>' }
-
-%><a href="<%- URL+anch %>" title="<%-summary%>"><%- code %><%- str %><%- endcode %></a>