diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
index d83c0fb6cd40b513e74a3b3ed0663d6be43d063b..7433a7c78cbc105fbc7468f84f801c852e72df60 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -70,7 +70,7 @@ public Q_SLOTS:
     void continueExecution(qreal slowdownFactor = 1.0f);
     void pauseExecution();
 
-    void setInspectorContext(int contextIndex);
+    void setObserverContext(int contextIndex);
 
 Q_SIGNALS:
     void designModeBehaviorChanged(bool inDesignMode);
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
index a5aab41dc2345c53db9f4f6e5dd238b866c634f5..e5f6537bd0e2fe86971b4bb63104d2b589c81461 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -127,7 +127,7 @@ QDeclarativeViewObserver::~QDeclarativeViewObserver()
 {
 }
 
-void QDeclarativeViewObserver::setInspectorContext(int contextIndex)
+void QDeclarativeViewObserver::setObserverContext(int contextIndex)
 {
     if (data->subcomponentEditorTool->contextIndex() != contextIndex) {
         QGraphicsObject *object = data->subcomponentEditorTool->setContext(contextIndex);
diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro
index db9b682eb23c427b747ec9420fac189d3b1a070f..2a6cda0595aba59b055051b7499774e921ef8b1a 100644
--- a/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@ -18,9 +18,9 @@ symbian:TARGET.UID3 = 0xE1111234
 
 symbian:ICON = symbianicon.svg
 
-# Define to enable the Qml Inspector in debug mode
-# QMLINSPECTOR #
-#DEFINES += QMLINSPECTOR
+# Define to enable the Qml Observer in debug mode
+# QMLOBSERVER #
+#DEFINES += QMLOBSERVER
 
 SOURCES += main.cpp
 
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 0b4804e8058ac3b11df7951477f14bbe04dee06f..2ae10f7171064729ab8eaf113d926036751477db 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -7,7 +7,7 @@
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
 
-#if defined(QMLINSPECTOR)
+#if defined(QMLOBSERVER)
 #include <qdeclarativeviewobserver.h>
 #endif
 
@@ -50,7 +50,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
 {
     connect(engine(), SIGNAL(quit()), SLOT(close()));
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
-#ifdef QMLINSPECTOR
+#ifdef QMLOBSERVER
     new QmlObserver::QDeclarativeViewObserver(this, parent);
 #endif
 }
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index feeb9b82649a1036b9f7efe1ac36c7d9a0ed3588..600262ac94a9b840cb67d44395eabf321e84e495 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -7,15 +7,15 @@ SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
 INCLUDEPATH += $$PWD
 
-contains(DEFINES, QMLINSPECTOR) {
+contains(DEFINES, QMLOBSERVER) {
     CONFIG(debug, debug|release) {
-        isEmpty(QMLINSPECTOR_PATH) {
-            warning(QMLINSPECTOR_PATH was not set. QMLINSPECTOR not activated.)
-            DEFINES -= QMLINSPECTOR
+        isEmpty(QMLOBSERVER_PATH) {
+            warning(QMLOBSERVER_PATH was not set. QMLOBSERVER not activated.)
+            DEFINES -= QMLOBSERVER
         } else {
-            include($$QMLINSPECTOR_PATH/qmljsdebugger-lib.pri)
+            include($$QMLOBSERVER_PATH/qmljsdebugger-lib.pri)
         }
     } else {
-        DEFINES -= QMLINSPECTOR
+        DEFINES -= QMLOBSERVER
     }
 }
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index f789f843a4ab1409d77cb56fb2bebcb955ad20f7..ff301ee7556a612fa635beb54487a3b24a6c10d5 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -579,20 +579,20 @@ void InspectorUi::setupDockWidgets()
 
     m_objectTreeWidget = new QmlJSObjectTree;
 
-    QWidget *inspectorWidget = new QWidget;
-    inspectorWidget->setWindowTitle(tr("Inspector"));
+    QWidget *observerWidget = new QWidget;
+    observerWidget->setWindowTitle(tr("QML Observer"));
 
-    QVBoxLayout *wlay = new QVBoxLayout(inspectorWidget);
+    QVBoxLayout *wlay = new QVBoxLayout(observerWidget);
     wlay->setMargin(0);
     wlay->setSpacing(0);
-    inspectorWidget->setLayout(wlay);
+    observerWidget->setLayout(wlay);
     wlay->addWidget(m_toolbar->widget());
     wlay->addWidget(m_objectTreeWidget);
     wlay->addWidget(m_crumblePath);
 
 
     m_inspectorDockWidget = uiSwitcher->createDockWidget(Debugger::QmlLanguage,
-                                                         inspectorWidget, Qt::BottomDockWidgetArea);
+                                                         observerWidget, Qt::BottomDockWidgetArea);
     m_inspectorDockWidget->setObjectName(Debugger::Constants::DOCKWIDGET_QML_INSPECTOR);
     m_inspectorDockWidget->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     m_inspectorDockWidget->setTitleBarWidget(new QWidget(m_inspectorDockWidget));