diff --git a/src/plugins/qnx/blackberryconfigurationmanager.h b/src/plugins/qnx/blackberryconfigurationmanager.h
index 30713cd6731d8f4b238b543febc27fe30ae5cb03..823bece6b08618d9acfc28476c294c51a781d268 100644
--- a/src/plugins/qnx/blackberryconfigurationmanager.h
+++ b/src/plugins/qnx/blackberryconfigurationmanager.h
@@ -45,7 +45,7 @@ namespace Internal {
 
 class BlackBerryApiLevelConfiguration;
 class BlackBerryRuntimeConfiguration;
-class QNXPlugin;
+class QnxPlugin;
 
 class BlackBerryConfigurationManager : public QObject
 {
@@ -112,7 +112,7 @@ private:
     void insertApiLevelByVersion(BlackBerryApiLevelConfiguration* apiLevel);
     void insertRuntimeByVersion(BlackBerryRuntimeConfiguration* runtime);
 
-    friend class QNXPlugin;
+    friend class QnxPlugin;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index f1e4083ff6ee18515d9e935a21177a2d2079363b..44f48a115a1a65470d9376dc3177112f7adf66e5 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -76,18 +76,18 @@
 
 using namespace Qnx::Internal;
 
-QNXPlugin::QNXPlugin()
+QnxPlugin::QnxPlugin()
     : m_debugSeparator(0)
     , m_attachToQnxApplication(0)
 {
 }
 
-QNXPlugin::~QNXPlugin()
+QnxPlugin::~QnxPlugin()
 {
     delete BlackBerryDeviceConnectionManager::instance();
 }
 
-bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
+bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
@@ -141,7 +141,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
     return true;
 }
 
-void QNXPlugin::extensionsInitialized()
+void QnxPlugin::extensionsInitialized()
 {
     ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
                                           tr("BAR Descriptor"));
@@ -164,12 +164,12 @@ void QNXPlugin::extensionsInitialized()
     connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions()));
 }
 
-ExtensionSystem::IPlugin::ShutdownFlag QNXPlugin::aboutToShutdown()
+ExtensionSystem::IPlugin::ShutdownFlag QnxPlugin::aboutToShutdown()
 {
     return SynchronousShutdown;
 }
 
-void QNXPlugin::updateDebuggerActions()
+void QnxPlugin::updateDebuggerActions()
 {
     bool hasValidQnxKit = false;
     ProjectExplorer::DeviceTypeMatcher qnxTypeMatcher(Constants::QNX_QNX_OS_TYPE);
@@ -191,7 +191,7 @@ void QNXPlugin::updateDebuggerActions()
 
 #include "bardescriptordocument.h"
 
-void QNXPlugin::testBarDescriptorDocumentSetValue_data()
+void QnxPlugin::testBarDescriptorDocumentSetValue_data()
 {
     QTest::addColumn<BarDescriptorDocument::Tag>("tag");
     QTest::addColumn<QVariant>("value");
@@ -362,7 +362,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue_data()
                                   << true;
 }
 
-void QNXPlugin::testBarDescriptorDocumentSetValue()
+void QnxPlugin::testBarDescriptorDocumentSetValue()
 {
     QFETCH(BarDescriptorDocument::Tag, tag);
     QFETCH(QVariant, value);
@@ -381,7 +381,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue()
         QCOMPARE(doc.value(tag), value);
 }
 
-void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data()
+void QnxPlugin::testBarDescriptorDocumentSetBannerComment_data()
 {
     QTest::addColumn<QString>("comment");
     QTest::addColumn<QString>("baseXml");
@@ -426,7 +426,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data()
 
 }
 
-void QNXPlugin::testBarDescriptorDocumentSetBannerComment()
+void QnxPlugin::testBarDescriptorDocumentSetBannerComment()
 {
     QFETCH(QString, comment);
     QFETCH(QString, baseXml);
@@ -442,7 +442,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment()
     QCOMPARE(doc.bannerComment(), comment);
 }
 
-void QNXPlugin::testConfigurationManager_data()
+void QnxPlugin::testConfigurationManager_data()
 {
     const QLatin1String NDKEnvFileKey("NDKEnvFile");
     const QLatin1String NDKPathKey("NDKPath");
@@ -479,7 +479,7 @@ void QNXPlugin::testConfigurationManager_data()
     QTest::newRow("configurations") << newerConfiguration << olderConfiguration;;
 }
 
-void QNXPlugin::testConfigurationManager()
+void QnxPlugin::testConfigurationManager()
 {
     BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance();
 
diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h
index 86aa537848855006a6c1c19ecadffe617c04b5d0..64941a4063408f48ad1a8098c84d88600021853f 100644
--- a/src/plugins/qnx/qnxplugin.h
+++ b/src/plugins/qnx/qnxplugin.h
@@ -41,14 +41,14 @@ QT_END_NAMESPACE
 namespace Qnx {
 namespace Internal {
 
-class QNXPlugin : public ExtensionSystem::IPlugin
+class QnxPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json")
 
 public:
-    QNXPlugin();
-    ~QNXPlugin();
+    QnxPlugin();
+    ~QnxPlugin();
 
     bool initialize(const QStringList &arguments, QString *errorString);
     void extensionsInitialized();