diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -598,7 +598,7 @@ int main( int argc, char *argv[] )
 
   //
   // Set up the QSettings environment must be done after qapp is created
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS2" );
   QCoreApplication::setAttribute( Qt::AA_DontShowIconsInMenus, false );
@@ -610,11 +610,11 @@ int main( int argc, char *argv[] )
     QSettings::setDefaultFormat( QSettings::IniFormat );
     QString path = optionpath.isEmpty() ? configpath : optionpath;
     QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, path );
-    customizationsettings = new QSettings( QSettings::IniFormat, QSettings::UserScope, "QuantumGIS", "QGISCUSTOMIZATION2" );
+    customizationsettings = new QSettings( QSettings::IniFormat, QSettings::UserScope, "QGIS", "QGISCUSTOMIZATION2" );
   }
   else
   {
-    customizationsettings = new QSettings( "QuantumGIS", "QGISCUSTOMIZATION2" );
+    customizationsettings = new QSettings( "QGIS", "QGISCUSTOMIZATION2" );
   }
 
   // Using the customizationfile option always overrides the option and config path options.

diff --git a/src/browser/main.cpp b/src/browser/main.cpp
@@ -45,7 +45,7 @@ int main( int argc, char ** argv )
   a.initQgis();
 
   // Set up the QSettings environment must be done after qapp is created
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS2" );
 

diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -31,7 +31,7 @@ int main( int argc, char ** argv )
   QgsApplication a( argc, argv, true );
 
   // Set up the QSettings environment must be done after qapp is created
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS2" );
 

diff --git a/src/plugins/spit/main.cpp b/src/plugins/spit/main.cpp
@@ -19,7 +19,7 @@ int main( int argc, char ** argv )
 {
   QApplication a( argc, argv );
   // Set up the QSettings environment must be done after qapp is created
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS2" );
 

diff --git a/src/ui/qgspluginmanagerbase.ui b/src/ui/qgspluginmanagerbase.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>QGIS Plugin Manager</string>
+   <string>Plugin Manager</string>
   </property>
   <property name="modal">
    <bool>true</bool>

diff --git a/tests/bench/main.cpp b/tests/bench/main.cpp
@@ -371,7 +371,7 @@ int main( int argc, char *argv[] )
   QgsApplication::setPrefixPath( myPrefixPath, true );
 
   // Set up the QSettings environment must be done after qapp is created
-  QgsApplication::setOrganizationName( "QuantumGIS" );
+  QgsApplication::setOrganizationName( "QGIS" );
   QgsApplication::setOrganizationDomain( "qgis.org" );
   QgsApplication::setApplicationName( "QGIS2" );
 

diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp
@@ -57,7 +57,7 @@ void TestQgsDataItem::initTestCase()
   QgsApplication::showSettings();
 
   // Set up the QSettings environment
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS-TEST" );
   // save current scanItemsSetting value

diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp
@@ -69,7 +69,7 @@ void TestStyleV2::initTestCase()
   QgsApplication::showSettings();
 
   // Set up the QSettings environment
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS-TEST" );
 

diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp
@@ -278,7 +278,7 @@ void TestZipLayer::initTestCase()
   QVERIFY( QFile::copy( QString( TEST_DATA_DIR ) + QDir::separator() + "zip" + QDir::separator() + "testzip.zip", QDir::tempPath() + "/testzip.zip" ) );
   mDataDir = QString( TEST_DATA_DIR ) + QDir::separator() + "zip" + QDir::separator();
   // Set up the QSettings environment
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS-TEST" );
 

diff --git a/tests/src/gui/testqgsrasterhistogram.cpp b/tests/src/gui/testqgsrasterhistogram.cpp
@@ -105,7 +105,7 @@ void TestRasterHistogram::initTestCase()
   mWidth = mHeight = 400;
   mImageQuality = -1;
   // Set up the QSettings environment
-  QCoreApplication::setOrganizationName( "QuantumGIS" );
+  QCoreApplication::setOrganizationName( "QGIS" );
   QCoreApplication::setOrganizationDomain( "qgis.org" );
   QCoreApplication::setApplicationName( "QGIS-TEST" );