diff --git a/www/_data/redirects.yml b/www/_data/redirects.yml
index c85c474..bfc3adb 100644
--- a/www/_data/redirects.yml
+++ b/www/_data/redirects.yml
@@ -40,6 +40,14 @@
     "dev/cordova/plugins/pluginapis.html": "deprecated.html"
     "latest/cordova/plugins/pluginapis.html": "deprecated.html"
 
+    # Rename `cordova-windows` URLs from `win8` to `windows`
+    "dev/guide/platforms/win8/index.html": "dev/guide/platforms/windows/index.html"
+    "latest/guide/platforms/win8/index.html": "latest/guide/platforms/windows/index.html"
+    "dev/guide/platforms/win8/plugin.html": "dev/guide/platforms/windows/index.html"
+    "latest/guide/platforms/win8/plugin.html": "latest/guide/platforms/windows/index.html"
+    "dev/guide/platforms/win8/upgrade.html": "dev/guide/platforms/windows/index.html"
+    "latest/guide/platforms/win8/upgrade.html": "latest/guide/platforms/windows/index.html"
+
     # Removing deprecated platforms and plugins
     "dev/guide/platforms/blackberry10/home.html": "deprecated.html"
     "latest/guide/platforms/blackberry10/home.html": "deprecated.html"
diff --git a/www/_data/toc/en_dev-src.yml b/www/_data/toc/en_dev-src.yml
index 2d9a4d8..f10dd44 100644
--- a/www/_data/toc/en_dev-src.yml
+++ b/www/_data/toc/en_dev-src.yml
@@ -13,8 +13,8 @@
             children:
                 - url: guide/platforms/android/index.html
                 - url: guide/platforms/ios/index.html
+                - url: guide/platforms/windows/index.html
                 - url: guide/platforms/osx/index.html
-                - url: guide/platforms/win8/index.html
         - url: platform_plugin_versioning_ref/index.html
         - url: config_ref/images.html
         - url: cordova/storage/storage.html
@@ -30,7 +30,7 @@
             children:
                 - url: guide/platforms/android/plugin.html
                 - url: guide/platforms/ios/plugin.html
-                - url: guide/platforms/win8/plugin.html
+                - url: guide/platforms/windows/plugin.html
         - url: plugin_ref/plugman.html
 -
     name: Advanced Topics
diff --git a/www/docs/en/dev/guide/cli/index.md b/www/docs/en/dev/guide/cli/index.md
index 3958c3a..8734ef4 100644
--- a/www/docs/en/dev/guide/cli/index.md
+++ b/www/docs/en/dev/guide/cli/index.md
@@ -140,10 +140,10 @@
 Error: Some of requirements check failed
 ```
 
-###See Also
+### See Also
 - [Android platform requirements](../../guide/platforms/android/index.html#requirements-and-support)
 - [iOS platform requirements](../../guide/platforms/ios/index.html#requirements-and-support)
-- [Windows platform requirements](../../guide/platforms/win8/index.html#requirements-and-support)
+- [Windows platform requirements](../../guide/platforms/windows/index.html#requirements-and-support)
 
 ## Build the App
 
diff --git a/www/docs/en/dev/guide/hybrid/plugins/index.md b/www/docs/en/dev/guide/hybrid/plugins/index.md
index 55b3309..d416dd9 100644
--- a/www/docs/en/dev/guide/hybrid/plugins/index.md
+++ b/www/docs/en/dev/guide/hybrid/plugins/index.md
@@ -197,7 +197,7 @@
 
 - [Android Plugins](../../platforms/android/plugin.html)
 - [iOS Plugins](../../platforms/ios/plugin.html)
-- [Windows Plugins](../../platforms/win8/plugin.html)
+- [Windows Plugins](../../platforms/windows/plugin.html)
 
 ## Publishing Plugins
 
diff --git a/www/docs/en/dev/guide/platforms/win8/index.md b/www/docs/en/dev/guide/platforms/windows/index.md
similarity index 97%
rename from www/docs/en/dev/guide/platforms/win8/index.md
rename to www/docs/en/dev/guide/platforms/windows/index.md
index d053081..5029647 100644
--- a/www/docs/en/dev/guide/platforms/win8/index.md
+++ b/www/docs/en/dev/guide/platforms/windows/index.md
@@ -82,7 +82,7 @@
 
 The tools and SDKs for the target Windows platforms (UWP, 8.1, etc.) must also be selected in the installer. They can be found under the "Windows and Web Development" heading.
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_installTools.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_installTools.png" /></p><br/>
 
 ## Project Configuration
 
@@ -160,24 +160,24 @@
 Solution (_.sln_) file. Open the file in the File Explorer to modify
 the project within Visual Studio:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_openSLN.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_openSLN.png" /></p><br/>
 
 The `CordovaApp` component displays within the solution, and its `www`
 directory contains the web-based source code, including the
 `index.html` home page:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk.png" /></p><br/>
 
 The projects for different Windows versions are displayed separately in the solution explorer. You can choose the deploy target version by right clicking the 'solution' (topmost entry in the solution explorer) and then going into 'Properties'. Here you can update the 'Single start up' field. The controls below Visual Studio's main menu allow you to test or
 deploy the app:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_deploy.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_deploy.png" /></p><br/>
 
 With __Local Machine__ selected, press the green arrow to install the
 app on the same machine running Visual Studio. Once you do so, the app
 appears in Windows' app listings:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_runApp.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_runApp.png" /></p><br/>
 
 Each time you rebuild the app, the version available in the interface
 is refreshed.
@@ -185,18 +185,18 @@
 Once available in the app listings, holding down the __CTRL__ key
 while selecting the app allows you to pin it to the main screen:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_runHome.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_runHome.png" /></p><br/>
 
 Note that if you open the app within a virtual machine environment,
 you may need to click in the corners or along the sides of the windows
 to switch apps or access additional functionality:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_run.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_run.png" /></p><br/>
 
 Alternately, choose the __Simulator__ deployment option to view the
 app as if it were running on a tablet device:
 
-<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/win8/win8_sdk_sim.png" /></p><br/>
+<br/><p align="center"><img src="{{ site.baseurl }}/static/img/guide/platforms/windows/win8_sdk_sim.png" /></p><br/>
 
 Unlike desktop deployment, this option allows you to simulate the
 tablet's orientation, location, and vary its network settings.
@@ -233,7 +233,7 @@
 
 *Name* and *Version* can be set from **config.xml**. *Publisher* can be provided as a build parameter or can be set on **build.json** file.
 
-![]({{ site.baseurl }}/static/img/guide/platforms/win8/packaging.png)
+![]({{ site.baseurl }}/static/img/guide/platforms/windows/packaging.png)
 
 *Name* and *Version* can also be set as platform-specific preferences in **config.xml** in the following way:
 
diff --git a/www/docs/en/dev/guide/platforms/win8/plugin.md b/www/docs/en/dev/guide/platforms/windows/plugin.md
similarity index 100%
rename from www/docs/en/dev/guide/platforms/win8/plugin.md
rename to www/docs/en/dev/guide/platforms/windows/plugin.md
diff --git a/www/docs/en/dev/guide/platforms/win8/upgrade.md b/www/docs/en/dev/guide/platforms/windows/upgrade.md
similarity index 100%
rename from www/docs/en/dev/guide/platforms/win8/upgrade.md
rename to www/docs/en/dev/guide/platforms/windows/upgrade.md
diff --git a/www/docs/en/dev/guide/support/index.md b/www/docs/en/dev/guide/support/index.md
index a4fec23..fed9c9e 100644
--- a/www/docs/en/dev/guide/support/index.md
+++ b/www/docs/en/dev/guide/support/index.md
@@ -39,7 +39,7 @@
         <th><a href="../android/index.html">Android</a></th>
         <th><a href="../ios/index.html">iOS</a></th>
         <th><a href="../osx/index.html">OS X</a></th>
-        <th><a href="../win8/index.html">Windows 8.1, 10, Phone 8.1</a></th>
+        <th><a href="../windows/index.html">Windows<br>8.1, Phone 8.1, 10</a></th>
     </tr>
     <tr>
         <th>CLI shorthand:</th>
@@ -58,10 +58,10 @@
     </tr>
     <tr>
         <th><a href="../cli/index.html">Cordova<br/>CLI</a></th>
-        <td data-col="android"    class="y">Mac, Windows, Linux</td>
-        <td data-col="ios"        class="y">Mac</td>
-        <td data-col="osx"       class="y">Mac</td>
-        <td data-col="win8"       class="y">Windows</td>
+        <td data-col="android" class="y">Mac, Windows, Linux</td>
+        <td data-col="ios"     class="y">Mac</td>
+        <td data-col="osx"     class="y">Mac</td>
+        <td data-col="windows" class="y">Windows</td>
     </tr>
 
     <tr>
@@ -71,130 +71,130 @@
 
     <tr>
         <th><a href="../../reference/cordova-plugin-battery-status/">BatteryStatus</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y">Windows Phone 8.1 only</td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y">Windows Phone 8.1 only</td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-camera/">Camera</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-media-capture/">Capture</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-network-information/">Connection</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-device/">Device</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="y"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="y"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../cordova/events/events.html">Events</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-file">File</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="y"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="y"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-geolocation/">Geolocation</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-globalization/">Globalization</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-inappbrowser/">InAppBrowser</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="p">uses iframe</td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="p">uses iframe</td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-media/">Media</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
         <td data-col="osx"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-dialogs/">Notification</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-splashscreen/">Splashscreen</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-statusbar/">Status Bar</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y">Windows Phone 8.1 only</td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y">Windows Phone 8.1 only</td>
     </tr>
 
     <tr>
         <th><a href="../../cordova/storage/storage.html">Storage</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y">localStorage &amp; indexedDB</td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y">localStorage &amp; indexedDB</td>
     </tr>
 
     <tr>
         <th><a href="../../reference/cordova-plugin-vibration/">Vibration</a></th>
-        <td data-col="android"    class="y"></td>
-        <td data-col="ios"        class="y"></td>
-        <td data-col="osx"       class="n"></td>
-        <td data-col="win8"       class="y">Windows Phone 8.1 only</td>
+        <td data-col="android" class="y"></td>
+        <td data-col="ios"     class="y"></td>
+        <td data-col="osx"     class="n"></td>
+        <td data-col="windows" class="y">Windows Phone 8.1 only</td>
     </tr>
 
     <tr>
@@ -203,17 +203,17 @@
     </tr>
     <tr>
         <th><a href="../hybrid/plugins/index.html">Plugin<br/>Interface</a></th>
-        <td data-col="android"    class="y"><a href="../platforms/android/plugin.html">(see details)</a></td>
-        <td data-col="ios"        class="y"><a href="../platforms/ios/plugin.html">(see details)</a></td>
-        <td data-col="osx"       class="y"></td>
-        <td data-col="win8"       class="y"></td>
+        <td data-col="android" class="y"><a href="../platforms/android/plugin.html">(see details)</a></td>
+        <td data-col="ios"     class="y"><a href="../platforms/ios/plugin.html">(see details)</a></td>
+        <td data-col="osx"     class="y"></td>
+        <td data-col="windows" class="y"></td>
     </tr>
     <tr>
         <th><a href="../hybrid/webviews/index.html">Embedded<br/>WebView</a></th>
-        <td data-col="android"    class="y"><a href="../platforms/android/webview.html">(see details)</a></td>
-        <td data-col="ios"        class="y"><a href="../platforms/ios/webview.html">(see details)</a></td>
-        <td data-col="osx"       class="y"></td>
-        <td data-col="win8"       class="n"></td>
+        <td data-col="android" class="y"><a href="../platforms/android/webview.html">(see details)</a></td>
+        <td data-col="ios"     class="y"><a href="../platforms/ios/webview.html">(see details)</a></td>
+        <td data-col="osx"     class="y"></td>
+        <td data-col="windows" class="n"></td>
     </tr>
 </tbody>
 </table>