diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index fdd4319fad6..4d80f50b2bd 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -42301,7 +42301,7 @@ Filtr: %2
     </message>
 </context>
 <context>
-    <name>VCSBase::Command</name>
+    <name>VcsBase::Command</name>
     <message>
         <source>Error: VCS timed out after %1s.</source>
         <translation>Chyba: Překročení času u správy verzí po %1s.</translation>
diff --git a/src/plugins/bazaar/Bazaar.pluginspec.in b/src/plugins/bazaar/Bazaar.pluginspec.in
index 4141be47485..a3f95751c38 100644
--- a/src/plugins/bazaar/Bazaar.pluginspec.in
+++ b/src/plugins/bazaar/Bazaar.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 01548243dfe..8767e25cf40 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/cvs/CVS.pluginspec.in b/src/plugins/cvs/CVS.pluginspec.in
index b63dffa7d65..8f226c98b49 100644
--- a/src/plugins/cvs/CVS.pluginspec.in
+++ b/src/plugins/cvs/CVS.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 643a1ffd048..b458ae5c9d7 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/git/ScmGit.pluginspec.in b/src/plugins/git/ScmGit.pluginspec.in
index 46f4977cf5c..0f987dfc166 100644
--- a/src/plugins/git/ScmGit.pluginspec.in
+++ b/src/plugins/git/ScmGit.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 6c5f20ec588..e4a93427036 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/mercurial/Mercurial.pluginspec.in b/src/plugins/mercurial/Mercurial.pluginspec.in
index 8ff246b0de4..771008c2fb5 100644
--- a/src/plugins/mercurial/Mercurial.pluginspec.in
+++ b/src/plugins/mercurial/Mercurial.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 21a8a5c976a..6d1a81aba6d 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/perforce/Perforce.pluginspec.in b/src/plugins/perforce/Perforce.pluginspec.in
index 8e03fc03175..3c47e440692 100644
--- a/src/plugins/perforce/Perforce.pluginspec.in
+++ b/src/plugins/perforce/Perforce.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index b396e5eb4e4..8b5d84dbd27 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/subversion/Subversion.pluginspec.in b/src/plugins/subversion/Subversion.pluginspec.in
index 3bd39698542..f6ae84e94e2 100644
--- a/src/plugins/subversion/Subversion.pluginspec.in
+++ b/src/plugins/subversion/Subversion.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 110a014351d..471e8eb7baa 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "find" }
-    Depends { name: "VCSBase" }
+    Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
     Depends { name: "cpp" }
diff --git a/src/plugins/vcsbase/VCSBase.mimetypes.xml b/src/plugins/vcsbase/VcsBase.mimetypes.xml
similarity index 100%
rename from src/plugins/vcsbase/VCSBase.mimetypes.xml
rename to src/plugins/vcsbase/VcsBase.mimetypes.xml
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in
similarity index 95%
rename from src/plugins/vcsbase/VCSBase.pluginspec.in
rename to src/plugins/vcsbase/VcsBase.pluginspec.in
index f39b851d45f..276ae7e0dd8 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec.in
+++ b/src/plugins/vcsbase/VcsBase.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+<plugin name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2011 Nokia Corporation</copyright>
     <license>
diff --git a/src/plugins/vcsbase/vcsbase.pri b/src/plugins/vcsbase/vcsbase.pri
index 7ac74218c8e..17708695d7f 100644
--- a/src/plugins/vcsbase/vcsbase.pri
+++ b/src/plugins/vcsbase/vcsbase.pri
@@ -1,3 +1,3 @@
 include(vcsbase_dependencies.pri)
 
-LIBS *= -l$$qtLibraryName(VCSBase)
+LIBS *= -l$$qtLibraryName(VcsBase)
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index 5c377dc70e2..a50c97676a7 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = VCSBase
+TARGET = VcsBase
 DEFINES += VCSBASE_LIBRARY QT_NO_CAST_FROM_ASCII
 include(../../qtcreatorplugin.pri)
 include(vcsbase_dependencies.pri)
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 194135f58f3..fcbcdc660a1 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -3,7 +3,7 @@ import qbs.base 1.0
 import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
-    name: "VCSBase"
+    name: "VcsBase"
 
     Depends { name: "aggregation" }     // ### should be injected by product dependency "Core"
     Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
@@ -25,7 +25,7 @@ QtcPlugin {
     ]
 
     files: [
-        "VCSBase.mimetypes.xml",
+        "VcsBase.mimetypes.xml",
         "vcsbase.qrc",
         "vcsbase_global.h",
         "baseannotationhighlighter.cpp",
diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc
index f4fa641bf5d..4da5d9ca9f5 100644
--- a/src/plugins/vcsbase/vcsbase.qrc
+++ b/src/plugins/vcsbase/vcsbase.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/vcsbase" >
-        <file>VCSBase.mimetypes.xml</file>
+        <file>VcsBase.mimetypes.xml</file>
         <file>images/diff.png</file>
         <file>images/submit.png</file>
     </qresource>
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index f518994bf2d..f7e457a4ebe 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -67,7 +67,7 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments)
 
-    if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VCSBase.mimetypes.xml"), errorMessage))
+    if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VcsBase.mimetypes.xml"), errorMessage))
         return false;
 
     m_coreListener = new CoreListener;