diff --git a/doc/templates/scripts/functions.js b/doc/templates/scripts/functions.js
index 32cc901fe93..1b1f8732931 100644
--- a/doc/templates/scripts/functions.js
+++ b/doc/templates/scripts/functions.js
@@ -53,7 +53,7 @@ var articleCount = 0;
 var exampleCount = 0;
 var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
 
-function processNokiaData(response){
+function processData(response){
 	var propertyTags = response.getElementsByTagName('page');
 	
  	for (var i=0; i< propertyTags.length; i++) {
@@ -180,7 +180,7 @@ else
 				$('.searching').remove(); 
 				$('#pageType').removeClass('loading');
 				$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
-                processNokiaData(response);
+                processData(response);
 
  }     
               });
diff --git a/src/tools/screenshotcropper/main.cpp b/src/tools/screenshotcropper/main.cpp
index 782cedfd0b8..2da7cd44477 100644
--- a/src/tools/screenshotcropper/main.cpp
+++ b/src/tools/screenshotcropper/main.cpp
@@ -40,7 +40,7 @@ const QString settingsKeyImagesFolder = QLatin1String("imagesFolder");
 
 static void promptPaths(QString &areasXmlFile, QString &imagesFolder)
 {
-    QSettings settings(QLatin1String("Nokia"), QLatin1String("Qt Creator Screenshot Cropper"));
+    QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt Creator Screenshot Cropper"));
 
     areasXmlFile = settings.value(settingsKeyAreasXmlFile).toString();
     areasXmlFile = QFileDialog::getOpenFileName(0, QLatin1String("Select the 'images_areaofinterest.xml' file in Qt Creator's sources"), areasXmlFile);