diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 8211492fad1b280aca07627fa7f02ceb83b91f21..3ac171b4ce5b042faf84d6e3926cc613e62ac8d4 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -86,7 +86,7 @@
     Developing applications on different platforms are covered in the platform
     pages.
     \list
-    \li \l{Getting Started with Qt for Android}{Android}
+    \li \l{Qt for Android}{Android}
     \li \l{Qt for iOS}{iOS}
     \li \l{Qt for Windows}{Windows}
     \li \l{Qt for Linux/X11}{Linux/X11}
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/android-platform-notes.qdoc
similarity index 99%
rename from doc/src/platforms/platform-notes-android.qdoc
rename to doc/src/platforms/android-platform-notes.qdoc
index be1ee75c8c66c997e32ae36e9251523ac50b31b2..6baed10f3b98a3c98fd27e389fd185e0b326a31b 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/android-platform-notes.qdoc
@@ -27,7 +27,7 @@
 
 
 /*!
-    \page platform-notes-android.html
+    \page android-platform-notes.html
     \title Platform and Compiler Notes - Android
     \contentspage Platform and Compiler Notes
 
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index cd2c6e8642ea0a2c6de9f7cc9ad3188a928ef176..8261e7d06fcf78dbab34765d9da76797ef707874 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\page android_support.html
+\page android.html
 \title Qt for Android
 \brief Provides information about Android support in Qt.
 \ingroup supportedplatform
@@ -75,7 +75,7 @@ The following topics provide more details about how to use Qt for Android:
 */
 
 /*!
-  \page android3rdpartylibs.html
+  \page android-3rdparty-libs.html
   \title Third-party Android Libraries
   \brief Provides instructions to include third-party Android libraries in an application.
 
@@ -136,7 +136,7 @@ The following topics provide more details about how to use Qt for Android:
 */
 
 /*!
-\page androidgs.html
+\page android-getting-started.html
 \title Getting Started with Qt for Android
 \brief Provides instructions to install and configure your development environment.
 
@@ -235,7 +235,7 @@ field to list all the examples tested on Android.
 To develop a simple application from scratch, see \l{Creating a Mobile Application}.
 */
 /*!
-\page portingtoandroid.html
+\page porting-to-android.html
 \title Porting to Android
 \brief Provides instructions to port your existing Qt application to Android.
 
@@ -296,7 +296,7 @@ AVDs found.
 */
 
 /*!
-\page opensslsupport.html
+\page android-openssl-support.html
 \title Adding OpenSSL Support for Android
 \brief Provides instructions to package OpenSSL libraries with your Qt application for Android.
 
@@ -413,7 +413,7 @@ to deploy the APK on the target you chose and launch the application.
 */
 
 /*!
-\page publishtogoogleplay.html
+\page android-publishing-to-googleplay.html
 \title Publishing to Google Play
 \brief Provides instructions to prepare your application for publishing.
 
@@ -482,7 +482,7 @@ packaging is done and how you can influence it.
 
 
 /*!
-\page androidservices.html
+\page android-services.html
 \title Android Services
 \brief Provides information about Android Services support in Qt.
 
diff --git a/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
index b7d5a9ecee074c9300dc36fc0677799050f716ee..1762c23955bffea1bd9e02c763f55ee0828d112e 100644
--- a/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
+++ b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
@@ -29,7 +29,7 @@
 /*!
     \page integrity-monolith-project-tutorial.html
     \title Qt for INTEGRITY: Monolith Project Tutorial
-    \previouspage platform-notes-integrity.html
+    \previouspage integrity.html
     \nextpage integrity-installing-dependencies.html
 
     The INTEGRITY applications can be monolith application projects,
diff --git a/doc/src/platforms/platform-notes-integrity.qdoc b/doc/src/platforms/integrity.qdoc
similarity index 98%
rename from doc/src/platforms/platform-notes-integrity.qdoc
rename to doc/src/platforms/integrity.qdoc
index 00c028b239a27950d677dae07ede8519187ccbb7..da5c127e2e4cec8a86701308e9bb7627771a4492 100644
--- a/doc/src/platforms/platform-notes-integrity.qdoc
+++ b/doc/src/platforms/integrity.qdoc
@@ -27,7 +27,7 @@
 
 
 /*!
-    \page platform-notes-integrity.html
+    \page integrity.html
     \title Qt for INTEGRITY
     \contentspage Platform Notes
     \keyword INTEGRITY
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index 352187cb76b846e7d0e0eab97e90dc60577d6b4e..d8668ab13f3a91c20e035bda198384c577cb95c8 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \page ios_support.html
+    \page ios.html
     \title Qt for iOS
     \brief Provides insight into Qt's iOS port and how to use it.
     \ingroup supportedplatform
@@ -56,7 +56,7 @@
 */
 
 /*!
-    \page building-from-source-ios.html
+    \page ios-building-from-source.html
     \title Qt for iOS - Building from Source
     \brief Provides instructions to build Qt from source for iOS platform.
 
@@ -177,7 +177,7 @@
 */
 
 /*!
-    \page platform-notes-ios.html
+    \page ios-platform-notes.html
     \title Platform Notes - iOS
     \brief This page contains information about building Qt applications for and running them on the iOS platform.
 
diff --git a/doc/src/platforms/platform-notes.qdocinc b/doc/src/platforms/platform-notes.qdocinc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/qnx.qdoc
similarity index 99%
rename from doc/src/platforms/platform-notes-rtos.qdoc
rename to doc/src/platforms/qnx.qdoc
index b12e323899e69bb57b5bc7a41010ccde794734e4..026540f9b37b00365edec589084efc4383785782 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/qnx.qdoc
@@ -26,9 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \page platform-notes-qnx.html
-    \title Platform and Compiler Notes - QNX
+    \page qnx.html
+    \title Qt for QNX
     \contentspage Platform and Compiler Notes
+    \ingroup supportedplatform
     \keyword QNX
 
     \section1 Supported Architectures and QNX Releases
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index ba32add3e3bac816c3f2a9699eed5abb26e2a0b4..6d3426cb2e4f6e7d6d9357d2202cb108ba99d127 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \page windows-support.html
+    \page windows.html
     \title Qt for Windows
     \brief Platform support for Windows.
     \ingroup supportedplatform