diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
index 1859bad973784f90eda60ce41eb01ec39c1ffd62..ab9dce4b8a35ddb67bdc99f3c0b1c33f4844db15 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
@@ -198,7 +198,7 @@ void WebPage::handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolH
 //! [registerProtocolHandlerRequested]
 
 #if QT_CONFIG(ssl)
-void WebPage::handleSelectClientCertificate(QWebEngineClientCertSelection selection)
+void WebPage::handleSelectClientCertificate(QWebEngineClientCertificateSelection selection)
 {
     // Just select one.
     selection.select(selection.certificates().at(0));
diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h
index 72cea5304ac7c8c8fecd44307e781f0539cb8d48..0b351ab313268e6b37e49292163c1777dc21105d 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.h
+++ b/examples/webenginewidgets/simplebrowser/webpage.h
@@ -70,7 +70,7 @@ private slots:
     void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);
     void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
 #if QT_CONFIG(ssl)
-    void handleSelectClientCertificate(QWebEngineClientCertSelection clientCertSelection);
+    void handleSelectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
 #endif
 };
 
diff --git a/src/webenginewidgets/api/qwebengineclientcertselection.cpp b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
similarity index 77%
rename from src/webenginewidgets/api/qwebengineclientcertselection.cpp
rename to src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
index de1e101f6e3f1292b771fbfa3839eaf3c3783cad..8b5f49d6bbcc70835b25135ca4d13048c0ffa573 100644
--- a/src/webenginewidgets/api/qwebengineclientcertselection.cpp
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwebengineclientcertselection.h"
+#include "qwebengineclientcertificateselection.h"
 
 #if QT_CONFIG(ssl)
 
@@ -46,12 +46,12 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QWebEngineClientCertSelection
+    \class QWebEngineClientCertificateSelection
     \brief The QWebEngineClientCertSelection class wraps a client certificate selection.
     \since 5.12
     \inmodule QtWebEngineWidgets
 
-    Provides access to the certicates to choose from, and a method for selecting one.
+    Provides access to the certificates to choose from, and a method for selecting one.
 
     The selection is asynchronous. If no certificate is selected and no copy of the
     object is kept alive, loading will continue without a certificate.
@@ -59,21 +59,21 @@ QT_BEGIN_NAMESPACE
 
 /*! \internal
 */
-QWebEngineClientCertSelection::QWebEngineClientCertSelection(QSharedPointer<ClientCertSelectController> selectController)
+QWebEngineClientCertificateSelection::QWebEngineClientCertificateSelection(QSharedPointer<ClientCertSelectController> selectController)
         : d_ptr(selectController)
 {}
 
-QWebEngineClientCertSelection::QWebEngineClientCertSelection(const QWebEngineClientCertSelection &other)
+QWebEngineClientCertificateSelection::QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &other)
         : d_ptr(other.d_ptr)
 {}
 
-QWebEngineClientCertSelection &QWebEngineClientCertSelection::operator=(const QWebEngineClientCertSelection &other)
+QWebEngineClientCertificateSelection &QWebEngineClientCertificateSelection::operator=(const QWebEngineClientCertificateSelection &other)
 {
     d_ptr = other.d_ptr;
     return *this;
 }
 
-QWebEngineClientCertSelection::~QWebEngineClientCertSelection()
+QWebEngineClientCertificateSelection::~QWebEngineClientCertificateSelection()
 {
 }
 
@@ -82,7 +82,7 @@ QWebEngineClientCertSelection::~QWebEngineClientCertSelection()
 
     \sa select()
 */
-QVector<QSslCertificate> QWebEngineClientCertSelection::certificates() const
+QVector<QSslCertificate> QWebEngineClientCertificateSelection::certificates() const
 {
     return d_ptr->certificates();
 }
@@ -93,7 +93,7 @@ QVector<QSslCertificate> QWebEngineClientCertSelection::certificates() const
 
     \sa certificates(), selectNone()
 */
-void QWebEngineClientCertSelection::select(const QSslCertificate &certificate)
+void QWebEngineClientCertificateSelection::select(const QSslCertificate &certificate)
 {
     d_ptr->select(certificate);
 }
@@ -105,7 +105,7 @@ void QWebEngineClientCertSelection::select(const QSslCertificate &certificate)
 
     \sa select()
 */
-void QWebEngineClientCertSelection::selectNone()
+void QWebEngineClientCertificateSelection::selectNone()
 {
     d_ptr->selectNone();
 }
@@ -113,7 +113,7 @@ void QWebEngineClientCertSelection::selectNone()
 /*!
     Returns the host and port of the server requesting the client certificate.
 */
-QUrl QWebEngineClientCertSelection::host() const
+QUrl QWebEngineClientCertificateSelection::host() const
 {
     return d_ptr->hostAndPort();
 }
diff --git a/src/webenginewidgets/api/qwebengineclientcertselection.h b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
similarity index 83%
rename from src/webenginewidgets/api/qwebengineclientcertselection.h
rename to src/webenginewidgets/api/qwebengineclientcertificateselection.h
index 84de56a674257150aaa9890b6966f7d508149d2a..15b8a47c6856af5ab95682fea5372ad2a174af85 100644
--- a/src/webenginewidgets/api/qwebengineclientcertselection.h
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
@@ -45,19 +45,19 @@
 
 #if QT_CONFIG(ssl)
 
-#include <QtCore/QScopedPointer>
-#include <QtCore/QVector>
-#include <QtNetwork/QSslCertificate>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qvector.h>
+#include <QtNetwork/qsslcertificate.h>
 
 QT_BEGIN_NAMESPACE
 class ClientCertSelectController;
 
-class QWEBENGINEWIDGETS_EXPORT QWebEngineClientCertSelection {
+class QWEBENGINEWIDGETS_EXPORT QWebEngineClientCertificateSelection {
 public:
-    QWebEngineClientCertSelection(const QWebEngineClientCertSelection &);
-    ~QWebEngineClientCertSelection();
+    QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &);
+    ~QWebEngineClientCertificateSelection();
 
-    QWebEngineClientCertSelection &operator=(const QWebEngineClientCertSelection &);
+    QWebEngineClientCertificateSelection &operator=(const QWebEngineClientCertificateSelection &);
 
     QUrl host() const;
 
@@ -68,7 +68,7 @@ public:
 private:
     friend class QWebEnginePagePrivate;
 
-    QWebEngineClientCertSelection(QSharedPointer<ClientCertSelectController>);
+    QWebEngineClientCertificateSelection(QSharedPointer<ClientCertSelectController>);
 
     QSharedPointer<ClientCertSelectController> d_ptr;
 };
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 8362f190e961d580f1e584979aa1b0412d896cb8..3d8f9389aed72bec49d6ba148bef5c7a4034a20c 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1679,7 +1679,7 @@ void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSele
 {
 #if QT_CONFIG(ssl)
     Q_Q(QWebEnginePage);
-    QWebEngineClientCertSelection certSelection(controller);
+    QWebEngineClientCertificateSelection certSelection(controller);
 
     Q_EMIT q->selectClientCertificate(certSelection);
 #else
@@ -1689,19 +1689,19 @@ void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSele
 
 #if QT_CONFIG(ssl)
 /*!
-    \fn void QWebEnginePage::selectClientCertificate(QWebEngineClientCertSelection clientCertSelection)
+    \fn void QWebEnginePage::selectClientCertificate(QWebEngineClientCertificateSelection clientCertificateSelection)
     \since 5.12
 
     This signal is emitted when a web site requests an SSL client certificate, and one or more were
     found in system's client certificate store.
 
     Handling the signal is asynchronous, and loading will be waiting until a certificate is selected,
-    or the last copy of \a clientCertSelection is destroyed.
+    or the last copy of \a clientCertificateSelection is destroyed.
 
-    If the signal is not handled, \a clientCertSelection is automatically destroyed, and loading
+    If the signal is not handled, \a clientCertificateSelection is automatically destroyed, and loading
     will continue without a client certificate.
 
-    \sa QWebEngineClientCertSelection
+    \sa QWebEngineClientCertificateSelection
 */
 #endif
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index b8bf6170043f9042196df02e70842974f01b2eb1..6dd2da21cd35d246f75f624723c335975d671c23 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -41,7 +41,7 @@
 #define QWEBENGINEPAGE_H
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineWidgets/qwebengineclientcertselection.h>
+#include <QtWebEngineWidgets/qwebengineclientcertificateselection.h>
 #include <QtWebEngineWidgets/qwebenginedownloaditem.h>
 #include <QtWebEngineCore/qwebenginecallback.h>
 #include <QtWebEngineCore/qwebenginehttprequest.h>
@@ -60,7 +60,7 @@ class QPrinter;
 class QContextMenuBuilder;
 class QWebChannel;
 class QWebEngineCertificateError;
-class QWebEngineClientCertSelection;
+class QWebEngineClientCertificateSelection;
 class QWebEngineContextMenuData;
 class QWebEngineFullScreenRequest;
 class QWebEngineHistory;
@@ -323,7 +323,7 @@ Q_SIGNALS:
     void quotaRequested(QWebEngineQuotaRequest quotaRequest);
     void registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
 #if QT_CONFIG(ssl)
-    void selectClientCertificate(QWebEngineClientCertSelection clientCertSelection);
+    void selectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
 #endif
 
     void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator);
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 1e24f35e9f1bd02ccf6d1b953fef7166b108c452..e61575d3adda5f04c48938c70dfc1fa4ac18ac4a 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api
 SOURCES = \
         api/qtwebenginewidgetsglobal.cpp \
         api/qwebenginecertificateerror.cpp \
-        api/qwebengineclientcertselection.cpp \
+        api/qwebengineclientcertificateselection.cpp \
         api/qwebenginecontextmenudata.cpp \
         api/qwebenginedownloaditem.cpp \
         api/qwebenginefullscreenrequest.cpp \
@@ -30,7 +30,7 @@ SOURCES = \
 HEADERS = \
         api/qtwebenginewidgetsglobal.h \
         api/qwebenginecertificateerror.h \
-        api/qwebengineclientcertselection.h \
+        api/qwebengineclientcertificateselection.h \
         api/qwebenginecontextmenudata.h \
         api/qwebenginedownloaditem.h \
         api/qwebenginedownloaditem_p.h \