diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 15450bdb603b8e71eb81dad028229315f7bab748..75624a530abbd145008d3da78a01c89fbb215002 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -65,7 +65,7 @@ public:
     BinEditorPlugin();
     ~BinEditorPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message = 0);
+    bool initialize(const QStringList &arguments, QString *errorMessage = 0);
     void extensionsInitialized();
 
     // Connect editor to settings changed signals.
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index 063056c9dec82005d0c0e922c07fe0095acfd417..1e2baeb9a791eb82141390b78707847c48719c46 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -66,7 +66,7 @@ public:
 
     static BookmarksPlugin *instance() { return m_instance; }
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
 public slots:
diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h
index 351f91ca52af29325bd08c838bbf4b6cc12b0b08..d4400732b7aa3f7e68d0f6f24ee30e4a94b43362 100644
--- a/src/plugins/classview/classviewplugin.h
+++ b/src/plugins/classview/classviewplugin.h
@@ -52,7 +52,7 @@ public:
     Plugin() {}
 
     //! \implements ExtensionSystem::IPlugin::initialize
-    bool initialize(const QStringList &arguments, QString *error_message = 0);
+    bool initialize(const QStringList &arguments, QString *errorMessage = 0);
 
     //! \implements ExtensionSystem::IPlugin::extensionsInitialized
     void extensionsInitialized() {}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index 98403f7d386d271f99da7d66874e192c020294b2..7c0e877a5ec73705fe6672563bae0bc4158f126a 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -49,7 +49,7 @@ public:
     CMakeProjectPlugin();
     ~CMakeProjectPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
 
     void extensionsInitialized();
 };
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 205bf462415529934bbc99ed6a44d8a33856b83a..8d7a9d4418987dbe147c1c642d140b319f35eff8 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -119,10 +119,10 @@ CodepasterPlugin::~CodepasterPlugin()
     CodepasterPlugin::m_instance = 0;
 }
 
-bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments)
-    Q_UNUSED(error_message)
+    Q_UNUSED(errorMessage)
 
     // Create the globalcontext list to register actions accordingly
     Core::Context globalcontext(Core::Constants::C_GLOBAL);
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index e684a92365ff4b3d08ea6727fb249473ed448aac..197af6c94672ee5600befb772f2c8e12e8cc1983 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -68,7 +68,7 @@ public:
     CodepasterPlugin();
     ~CodepasterPlugin();
 
-    virtual bool initialize(const QStringList &arguments, QString *error_message);
+    virtual bool initialize(const QStringList &arguments, QString *errorMessage);
     virtual void extensionsInitialized();
     virtual ShutdownFlag aboutToShutdown();
 
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 3539b49eee211663577f514139fc66d822245a47..0045d4dec7bf1571b28bb28e41765add9f407bb1 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -62,7 +62,7 @@ public:
 
     static CppPlugin *instance();
 
-    bool initialize(const QStringList &arguments, QString *error_message = 0);
+    bool initialize(const QStringList &arguments, QString *errorMessage = 0);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
 
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 3b75daa3fc9de9420253e6bcddd704d6e9a08a88..232d878bdc053a5afbc1ba636dab47bf4aa14981 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -67,7 +67,7 @@ public:
     CppToolsPlugin();
     ~CppToolsPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
     CppModelManager *cppModelManager() { return m_modelManager; }
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index d553de32c6e45f3172eed06cbfe1e7f3d5ecc387..125e7ce65064aac90a35f8393b53c193ed8d3b64 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -86,7 +86,7 @@ public:
     CVSPlugin();
     ~CVSPlugin();
 
-    virtual bool initialize(const QStringList &arguments, QString *error_message);
+    virtual bool initialize(const QStringList &arguments, QString *errorMessage);
 
     void cvsDiff(const QString &workingDir, const QStringList &files);
 
diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h
index f21040b907c3213d1e1c433221b488888857af2e..cb366f8462d34a2da85d4e13eec821299f8cfce2 100644
--- a/src/plugins/designer/formeditorplugin.h
+++ b/src/plugins/designer/formeditorplugin.h
@@ -47,7 +47,7 @@ public:
     ~FormEditorPlugin();
 
     //Plugin
-    bool initialize(const QStringList &arguments, QString *error_message = 0);
+    bool initialize(const QStringList &arguments, QString *errorMessage = 0);
     void extensionsInitialized();
 
 private:
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
index 3603f1b6321132fcedd1936942e167827935dd31..9f0cad8db64479641726d3acdeee39504107297d 100644
--- a/src/plugins/fakevim/fakevimplugin.h
+++ b/src/plugins/fakevim/fakevimplugin.h
@@ -51,7 +51,7 @@ public:
 
 private:
     // implementation of ExtensionSystem::IPlugin
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     ShutdownFlag aboutToShutdown();
     void extensionsInitialized();
 
diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h
index 6feed7f94abceaa19d9a7483e21bc65380d4a2cd..54062f04d9f0513ed98cd3d28f9552af4123d380 100644
--- a/src/plugins/find/findplugin.h
+++ b/src/plugins/find/findplugin.h
@@ -66,7 +66,7 @@ public:
     };
 
     // IPlugin
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
 
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 796642fcf3b512830a7ee98a7bfaf71956a29cb4..8aea43897df82e405cc860705190f142e9b1ed16 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -95,7 +95,7 @@ public:
 
     static GitPlugin *instance();
 
-    virtual bool initialize(const QStringList &arguments, QString *error_message);
+    virtual bool initialize(const QStringList &arguments, QString *errorMessage);
 
     GitVersionControl *gitVersionControl() const;
 
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 3907e5a0ec3cf9cd032769ac5a4d7a826cb8462b..117ed4f5f14b0f0caf01a80a6c3ddfb2def63089 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -107,10 +107,10 @@ Core::Command *createSeparator(Core::ActionManager *am,
     return am->registerAction(separator, Core::Id(id), context);
 }
 
-bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
 {
     Core::ICore *core = Core::ICore::instance();
-    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), error_message))
+    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), errorMessage))
         return false;
 
     parseGlslFile(QLatin1String("glsl_120.frag"), &m_glsl_120_frag);
@@ -162,7 +162,7 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
     cmd = am->command(TextEditor::Constants::UN_COMMENT_SELECTION);
     contextMenu->addAction(cmd);
 
-    error_message->clear();
+    errorMessage->clear();
 
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
     Core::MimeDatabase *mimeDatabase = Core::ICore::instance()->mimeDatabase();
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index 905df9d0c758cdccfcd1bb154bcdb3bc4e79adeb..6f7812f2de9d2cf719b4344b9771c092c40276bd 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -88,13 +88,13 @@ HelloWorldPlugin::~HelloWorldPlugin()
 /*! Initializes the plugin. Returns true on success.
     Plugins want to register objects with the plugin manager here.
 
-    \a error_message can be used to pass an error message to the plugin system,
+    \a errorMessage can be used to pass an error message to the plugin system,
        if there was any.
 */
-bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments)
-    Q_UNUSED(error_message)
+    Q_UNUSED(errorMessage)
 
     // Get the primary access point to the workbench.
     Core::ICore *core = Core::ICore::instance();
diff --git a/src/plugins/helloworld/helloworldplugin.h b/src/plugins/helloworld/helloworldplugin.h
index 0ebc4e37e0f4d6f4e2dcfb09598d8945b6523ea3..24e1b05390822250fef26086a9dd02ebe0adf3eb 100644
--- a/src/plugins/helloworld/helloworldplugin.h
+++ b/src/plugins/helloworld/helloworldplugin.h
@@ -47,7 +47,7 @@ public:
     HelloWorldPlugin();
     ~HelloWorldPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
 
     void extensionsInitialized();
 
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 97443d5927c2a6ea7472e46abf7d41a8e5b75afb..340e49269272f254f6e24999793487f2ddd3671a 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -76,7 +76,7 @@ public:
     HelpPlugin();
     virtual ~HelpPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
 
diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h
index fd937062aef6396455e5fbb082acb01d3a3c5c25..feabaaff3d62e6aeebc7e78aabacf82cdf1401af 100644
--- a/src/plugins/imageviewer/imageviewerplugin.h
+++ b/src/plugins/imageviewer/imageviewerplugin.h
@@ -51,7 +51,7 @@ public:
     ImageViewerPlugin();
     ~ImageViewerPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message = 0);
+    bool initialize(const QStringList &arguments, QString *errorMessage = 0);
     void extensionsInitialized();
 
 private:
diff --git a/src/plugins/locator/locatorplugin.h b/src/plugins/locator/locatorplugin.h
index 0d2ec895c0e38919f991b8e887097eb2a5174249..71dd334d1dd83882850f025d997b7c6424d81b5c 100644
--- a/src/plugins/locator/locatorplugin.h
+++ b/src/plugins/locator/locatorplugin.h
@@ -60,7 +60,7 @@ public:
     LocatorPlugin();
     ~LocatorPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
     QList<ILocatorFilter*> filters();
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 65efbc47163b1ce2820ce82acf173869d9e573f3..a7ac16da68da2e874efbe687f00eca21ee09a48e 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -64,10 +64,10 @@ MacrosPlugin::~MacrosPlugin()
 {
 }
 
-bool MacrosPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments);
-    Q_UNUSED(error_message);
+    Q_UNUSED(errorMessage);
 
     addAutoReleasedObject(new MacroOptionsPage);
     addAutoReleasedObject(new MacroLocatorFilter);
diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h
index 92b27523263ac544c00fab73e8feb00d7b903982..f64bbe1fa63637f91fef26a665ad1c43bb1ac749 100644
--- a/src/plugins/macros/macrosplugin.h
+++ b/src/plugins/macros/macrosplugin.h
@@ -49,7 +49,7 @@ public:
     MacrosPlugin();
     ~MacrosPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
 private:
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 8d4cf91f65e4c28d12d23d9d15123fc4487a5792..90e7271cd6cbc295b27a5c649027022e8fbb2eef 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -152,7 +152,7 @@ MercurialPlugin::~MercurialPlugin()
     m_instance = 0;
 }
 
-bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*error_message */)
+bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*errorMessage */)
 {
     typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
 
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 2e86c6daf15f6960e819498ab194f9857483f304..caf1d523b8a6f63bb3e6a7b39760c39dea5a7ff1 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -86,7 +86,7 @@ class MercurialPlugin : public VCSBase::VCSBasePlugin
 public:
     MercurialPlugin();
     virtual ~MercurialPlugin();
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
 
     static MercurialPlugin *instance() { return m_instance; }
     MercurialClient *client() const { return m_client; }
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 25fd97f56ed926b004fe8a418d0063eb7a56d76b..4b246c50a29b072a5efa5d06312129e2c93fd458 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -85,7 +85,7 @@ public:
     PerforcePlugin();
     ~PerforcePlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
     bool managesDirectory(const QString &directory, QString *topLevel = 0);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 480807a485976db259b85f63b7e7783ad8619196..48979495fddbc3fb6853c4bfb5db14c514cd8ea3 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -100,7 +100,7 @@ public:
     static void openEditorFromAction(QAction *action, const QString &fileName);
 
     //PluginInterface
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 296118256da9463ddc1910f8e6c75610a42bf766..004779c121ed4ed7de0da5aea1bf6e64248a8c01 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -117,7 +117,7 @@ BauhausPlugin::~BauhausPlugin()
 // INHERITED FROM ExtensionSystem::Plugin
 //
 ////////////////////////////////////////////////////
-bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error_message/* = 0*/) // =0;
+bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/) // =0;
 {
     Core::ICore *core = Core::ICore::instance();
 
@@ -150,7 +150,7 @@ bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error
 
     m_settings.fromSettings(core->settings());
 
-    error_message->clear();
+    errorMessage->clear();
 
     return true;
 }
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 3a93e478d798e6caba0f517a73381abb1534f553..1fe6bc41576fc0be9f650ea7c49f0b6c6412fb03 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -71,7 +71,7 @@ public:
     virtual ~BauhausPlugin();
 
     //Plugin
-    virtual bool initialize(const QStringList &arguments, QString *error_message = 0);
+    virtual bool initialize(const QStringList &arguments, QString *errorMessage = 0);
     virtual void extensionsInitialized();
 
     static BauhausPlugin *pluginInstance();
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 02e1af34d93f611ce2cd3c823ee38ae44c141ebd..ce89eaada2fe507553bfd0012becb0140255581c 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -122,10 +122,10 @@ Core::Command *createSeparator(Core::ActionManager *am,
     return am->registerAction(separator, Core::Id(id), context);
 }
 
-bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
 {
     Core::ICore *core = Core::ICore::instance();
-    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), error_message))
+    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), errorMessage))
         return false;
 
     m_modelManager = QmlJS::ModelManagerInterface::instance();
@@ -238,7 +238,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 
     addAutoReleasedObject(new HoverHandler);
 
-    error_message->clear();
+    errorMessage->clear();
 
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
     iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmljseditor/images/qmlfile.png")), "qml");
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h
index b383fb38e88872119ace85f40d7214b91a9aa42b..c5937a95fa412c37abb0a2c92e66ff86b7d0dd61 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.h
+++ b/src/plugins/qmljstools/qmljstoolsplugin.h
@@ -63,7 +63,7 @@ public:
     QmlJSToolsPlugin();
     ~QmlJSToolsPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
     ModelManager *modelManager() { return m_modelManager; }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index c1d67e012ad45c39c411adc9539b7ba68ede5bae..9610cd9c01193d341c1794b5bc1258e708ae4dd6 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -60,7 +60,7 @@ class Qt4ProjectManagerPlugin : public ExtensionSystem::IPlugin
 
 public:
     ~Qt4ProjectManagerPlugin();
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
 private slots:
diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h
index 612b99e8aa229f9ce0fa08ffe3af76958662f16a..60c85cb6813dcbea5758cf5f74a8c7022dfb5bde 100644
--- a/src/plugins/qtestlib/qtestlibplugin.h
+++ b/src/plugins/qtestlib/qtestlibplugin.h
@@ -178,7 +178,7 @@ public:
     QTestLibPlugin();
     virtual ~QTestLibPlugin();
 
-    bool init(const QStringList &args, QString *error_message);
+    bool init(const QStringList &args, QString *errorMessage);
     void extensionsInitialized();
 
     // IApplicationOutput
diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h
index a5d68c316659334022b717135b2b05fa32323411..871b1c4f1044ae333e72bbc873e73c36bb7dd098 100644
--- a/src/plugins/qtsupport/qtsupportplugin.h
+++ b/src/plugins/qtsupport/qtsupportplugin.h
@@ -48,7 +48,7 @@ class QtSupportPlugin : public ExtensionSystem::IPlugin
 
 public:
     ~QtSupportPlugin();
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
 private slots:
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index a1fb3ca57cc8425ee5f494a1263b91b397dd280a..a2e31498f3ee5c5c5618bdaef87e8a07daac8feb 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -68,10 +68,10 @@ RemoteLinuxPlugin::~RemoteLinuxPlugin()
 }
 
 bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
-    QString *error_message)
+    QString *errorMessage)
 {
     Q_UNUSED(arguments)
-    Q_UNUSED(error_message)
+    Q_UNUSED(errorMessage)
 
     MaemoQemuManager::instance(this);
     LinuxDeviceConfigurations::instance(this);
diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h
index 6acd2e52fa244e6c17e8ea29221cfd679a3ba783..d3620f145a684fcf68e498e5294180ac4cf7a248 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.h
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -45,7 +45,7 @@ public:
     RemoteLinuxPlugin();
     ~RemoteLinuxPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 };
 
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index ef8461fd085f107c526433fa92c9f7eb08b92ce7..ddadc78597d8f54af198236bdce70fbc38fc1bed 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -84,7 +84,7 @@ public:
     SubversionPlugin();
     ~SubversionPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
 
     void svnDiff(const QString  &workingDir, const QStringList &files, QString diffname = QString());
 
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index b233dc9f6a757cd8aafd45f59bf693767560ab37..efdb15846f456d946bd20ba4d6b3d0a4461c3ed3 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -116,7 +116,7 @@ void UpdateInfoPlugin::stopCurrentCheckTimer()
 /*! Initializes the plugin. Returns true on success.
     Plugins want to register objects with the plugin manager here.
 
-    \a error_message can be used to pass an error message to the plugin system,
+    \a errorMessage can be used to pass an error message to the plugin system,
        if there was any.
 */
 bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString * /* errorMessage */)
diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h
index 12297888cf89807747f34d00c26747d0f2585c1a..e3202bd0523f551ed1e405bc9699611213289bb3 100644
--- a/src/plugins/vcsbase/vcsplugin.h
+++ b/src/plugins/vcsbase/vcsplugin.h
@@ -56,7 +56,7 @@ public:
     VCSPlugin();
     ~VCSPlugin();
 
-    bool initialize(const QStringList &arguments, QString *error_message);
+    bool initialize(const QStringList &arguments, QString *errorMessage);
 
     void extensionsInitialized();
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index be99fc7717c85e3c34a2ac651f090f8c33548429..73177aa44e8be460cae13afd471cd69934a010df 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -319,10 +319,10 @@ WelcomePlugin::WelcomePlugin()
 /*! Initializes the plugin. Returns true on success.
     Plugins want to register objects with the plugin manager here.
 
-    \a error_message can be used to pass an error message to the plugin system,
+    \a errorMessage can be used to pass an error message to the plugin system,
        if there was any.
 */
-bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* error_message */)
+bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* errorMessage */)
 {
     m_welcomeMode = new WelcomeMode;
     addAutoReleasedObject(m_welcomeMode);
diff --git a/src/plugins/welcome/welcomeplugin.h b/src/plugins/welcome/welcomeplugin.h
index c6a498984d2d8264c3816b3b8e97c6661f34405c..9468773f7c1eab0e631d690f3590af4f29379807 100644
--- a/src/plugins/welcome/welcomeplugin.h
+++ b/src/plugins/welcome/welcomeplugin.h
@@ -50,7 +50,7 @@ class WelcomePlugin : public ExtensionSystem::IPlugin
 public:
     WelcomePlugin();
 
-    virtual bool initialize(const QStringList &arguments, QString *error_message);
+    virtual bool initialize(const QStringList &arguments, QString *errorMessage);
     virtual void extensionsInitialized();
 
 private: