diff --git a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
index 179bda9d7f217659ed8e65049b592c9f41c82126..c8894539d94343b2f608155bddbcbae0b9708bc1 100644
--- a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
@@ -37,7 +37,7 @@
 #include <QGraphicsItem>
 #include <QDeclarativeItem>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 AbstractFormEditorTool::AbstractFormEditorTool(QDeclarativeViewObserver *editorView)
     : QObject(editorView), m_observer(editorView)
diff --git a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
index 1cecc494bc9406331002cb9ea5048e5b80fa878a..18102862aa5f4e19b65d1027a2de0ed9a68faf76 100644
--- a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
@@ -45,7 +45,7 @@ class QWheelEvent;
 class QDeclarativeView;
 QT_END_NAMESPACE
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
index b889e67bc974e0b7cc1e3734ddadb56ea9be5d15..100869bd3efb84161f3e27e41f950123440c53ba 100644
--- a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
@@ -8,7 +8,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 const qreal AnimDelta = 0.025f;
 const int AnimInterval = 30;
@@ -238,4 +238,4 @@ void BoundingRectHighlighter::refresh()
 }
 
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
index 16b1c506997bd0e5de247e527e2338cfb9de09fe..b7403dbfb22eb7b04673cdf7fd2884b729e9fc72 100644
--- a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
@@ -12,7 +12,7 @@ QT_FORWARD_DECLARE_CLASS(QWidget);
 QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem);
 QT_FORWARD_DECLARE_CLASS(QTimer);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 class BoundingBox;
@@ -73,6 +73,6 @@ public:
     int type() const;
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // BOUNDINGRECTHIGHLIGHTER_H
diff --git a/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
index 863ce9b8bc9996694ffa517ecdc968814a0d17d2..84a78d96b6bfdd654658dd02da0ff4650e149047 100644
--- a/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
@@ -9,7 +9,7 @@
 #include <QApplication>
 #include <QPalette>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 ColorPickerTool::ColorPickerTool(QDeclarativeViewObserver *view) :
         AbstractFormEditorTool(view)
@@ -86,4 +86,4 @@ void ColorPickerTool::pickColor(const QPoint &pos)
     emit selectedColorChanged(m_selectedColor);
 }
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
index b9beec58db007c02fe208839c230bd0c107776e1..660bb94c26a715be7202f378f0b9c0d8e452f614 100644
--- a/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
@@ -7,7 +7,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QPoint);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class ColorPickerTool : public AbstractFormEditorTool
 {
@@ -48,6 +48,6 @@ private:
 
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // COLORPICKERTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
index 65261f459535c1f6784b44e1784648297aa52ba2..e93f95637c3efa3a544ccb20b1201c764484d874 100644
--- a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
@@ -32,7 +32,7 @@
 
 #include <QGraphicsScene>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 LayerItem::LayerItem(QGraphicsScene* scene)
             : QGraphicsObject()
@@ -75,4 +75,4 @@ QList<QGraphicsItem*> LayerItem::findAllChildItems(const QGraphicsItem *item) co
     return itemList;
 }
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/layeritem.h b/share/qtcreator/qmljsdebugger/editor/layeritem.h
index 5ce3c82e56f39467835dcdc85df08f31d3709fea..972bb366e463a6e983e4888ad7cadd03af0e46b1 100644
--- a/share/qtcreator/qmljsdebugger/editor/layeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.h
@@ -33,7 +33,7 @@
 #include <QGraphicsObject>
 #include <QWeakPointer>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class FormEditorScene;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
index 3c2969f886f0cba983cd76b7049c74c711c25c9c..0cfaf744ee60220956fad5c278ee90e1dc54e1df 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
@@ -8,7 +8,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 QmlToolbar::QmlToolbar(QWidget *parent)
     : QToolBar(parent)
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
index 001e7e47f603e9af3a1425c6587f1c7fc02f45fb..5f0765d377446803c40fac80492b427b055048b1 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
@@ -5,7 +5,7 @@
 #include <QIcon>
 #include "qmlviewerconstants.h"
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class ToolBarColorBox;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
index 66843e87ae666791694ab84055c8b38d25148fee..171d5d854fbc447e0a27a46d5140b27b1c7713a6 100644
--- a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
@@ -32,7 +32,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 RubberBandSelectionManipulator::RubberBandSelectionManipulator(QGraphicsObject *layerItem, QDeclarativeViewObserver *editorView)
     : m_selectionRectangleElement(layerItem),
diff --git a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
index feacc2d52a5abdf86b269286ce9a2a3f36a7ec3c..820dc97555df8ff0ee76731cd7ba0933e5caf014 100644
--- a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
@@ -33,7 +33,7 @@
 
 #include "selectionrectangle.h"
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
index 8ebc1d71a9122f7ed4e08d09ab993d437b6f5a21..4d36981b0b5e8f5ea469c6d897d2a6d2fe4fcda5 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
@@ -36,7 +36,7 @@
 #include <QGraphicsScene>
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 SelectionIndicator::SelectionIndicator(QDeclarativeViewObserver *editorView, QGraphicsObject *layerItem)
     : m_layerItem(layerItem), m_view(editorView)
@@ -123,5 +123,5 @@ void SelectionIndicator::setItems(const QList<QWeakPointer<QGraphicsObject> > &i
     }
 }
 
-} //namespace QmlViewer
+} //namespace QmlObserver
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionindicator.h b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
index 61dfa9af62f21acb7a48c890f608540c08dcb2a1..dffd3d11f67a9d85570438565a7eb62fe545dad3 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
@@ -34,7 +34,7 @@
 #include <QGraphicsPolygonItem>
 #include <QGraphicsObject>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
index 832a2d4ba21e59adf4bc4d7c31298d43d1b9f973..114aab960b6adbb32242a7578c62ec02bbaccf70 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
@@ -36,7 +36,7 @@
 #include <cmath>
 #include <QGraphicsScene>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class SelectionRectShape : public QGraphicsRectItem
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
index 3301a95793b5260d11299616a8127517e157dcd3..d91e93626b4c3179a55d3d253f831c96c1149df7 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
@@ -34,7 +34,7 @@
 #include <QGraphicsRectItem>
 #include <QGraphicsObject>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class SelectionRectangle
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
index 5e8a01dc1ff6e244f93ea42522f2fc453cb46418..492f258187ee1dc0b92faedc0666edfe8b8f8ee0 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
@@ -46,7 +46,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 SelectionTool::SelectionTool(QDeclarativeViewObserver *editorView)
     : AbstractFormEditorTool(editorView),
diff --git a/share/qtcreator/qmljsdebugger/editor/selectiontool.h b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
index e535786fe4c37fc2d9e2789b85170b1387724836..fa570fe542335356bdb795972bf3bcd295553b28 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectiontool.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
@@ -45,7 +45,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsItem);
 QT_FORWARD_DECLARE_CLASS(QMouseEvent);
 QT_FORWARD_DECLARE_CLASS(QKeyEvent);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class SelectionTool : public AbstractFormEditorTool
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
index 191252ae8b9841c34b4af32754c05ada32113398..5dccd091d704451f02005f3542a8bce47d825367 100644
--- a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
@@ -32,7 +32,7 @@
 #include "qdeclarativeviewobserver_p.h"
 #include <QtDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 SingleSelectionManipulator::SingleSelectionManipulator(QDeclarativeViewObserver *editorView)
     : m_editorView(editorView),
diff --git a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
index bde990634d4cbfa40a5f5e60d8ed1e2a13a090fe..851c2c6e18ad9772539d055e4048a097330bc13b 100644
--- a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
@@ -35,7 +35,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsItem);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
index bdb7e6196064e1717e16c7ce10da629f6a09a301..e500a83bf6e3e9acd81fdcc4a4ff9ac27a5d0309 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
@@ -12,7 +12,7 @@
 #include <QDebug>
 
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 const qreal MaxOpacity = 0.5f;
 
@@ -317,4 +317,4 @@ int SubcomponentEditorTool::contextIndex() const
 }
 
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
index c8196ed8e51225c7853af5ec61107bae44c24b0d..2fe7a17a473fb319eacff35f6b7da0011b359a6d 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
@@ -9,7 +9,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
 QT_FORWARD_DECLARE_CLASS(QPoint)
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class SubcomponentMaskLayerItem;
 
@@ -78,6 +78,6 @@ private:
     QTimer *m_animTimer;
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // SUBCOMPONENTEDITORTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
index 4e6e911163eac29431ac49839eb56cd2598f4364..2f4772b699bccb3769696af5be7740a2964317b3 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
@@ -3,7 +3,7 @@
 #include "qdeclarativeviewobserver.h"
 #include <QPolygonF>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 SubcomponentMaskLayerItem::SubcomponentMaskLayerItem(QDeclarativeViewObserver *observer, QGraphicsItem *parentItem) :
     QGraphicsPolygonItem(parentItem),
@@ -77,4 +77,4 @@ QGraphicsItem *SubcomponentMaskLayerItem::currentItem() const
     return m_currentItem;
 }
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
index 598cd161955db975d648a8f0ccb8344333126c5a..3b26732657ff489dc7a21d371162ecd039c81cb8 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
@@ -3,7 +3,7 @@
 
 #include <QGraphicsPolygonItem>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 
@@ -24,6 +24,6 @@ private:
     QRectF m_itemPolyRect;
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // SUBCOMPONENTMASKLAYERITEM_H
diff --git a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
index e72f70842681c0798a2be68a6b1f1c966cd8a6c7..9265ba18599eadd624e9851e2757a2997d42d1a1 100644
--- a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
@@ -14,7 +14,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 ToolBarColorBox::ToolBarColorBox(QWidget *parent) :
     QLabel(parent)
@@ -93,4 +93,4 @@ void ToolBarColorBox::copyColorToClipboard()
 }
 
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
index f3d3afea6976cefdb3431e888b78f24233932c55..7c0cc6530678f658b772eb202fd9f676995e2135 100644
--- a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
@@ -8,7 +8,7 @@
 QT_FORWARD_DECLARE_CLASS(QContextMenuEvent);
 QT_FORWARD_DECLARE_CLASS(QAction);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class ToolBarColorBox : public QLabel
 {
@@ -36,6 +36,6 @@ private:
 
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // ToolBarColorBox_H
diff --git a/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
index 7a946cf9e8290874da64d6d11b25745f56a6f1cd..585ba476f153ebdffa4c03f93bf526e6f9be6501 100644
--- a/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
@@ -10,7 +10,7 @@
 
 #include <QDebug>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 ZoomTool::ZoomTool(QDeclarativeViewObserver *view) :
         AbstractFormEditorTool(view),
@@ -284,4 +284,4 @@ qreal ZoomTool::nextZoomScale(ZoomDirection direction) const
     return 1.0f;
 }
 
-} // namespace QmlViewer
+} // namespace QmlObserver
diff --git a/share/qtcreator/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
index 31159a1b6db9dac9ef0f57d3a47cdc80885a9a64..f63bc230de9068d08bdd6164ed6ef44842ef965b 100644
--- a/share/qtcreator/qmljsdebugger/editor/zoomtool.h
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
@@ -6,7 +6,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QAction);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class ZoomTool : public AbstractFormEditorTool
 {
@@ -60,6 +60,6 @@ private:
 
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // ZOOMTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
index 70b09dbc33272f75a9ab0d33920f2487bc533626..b967d2475eed1adf9213dc3d6bffb32963d758ae 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
@@ -66,7 +66,7 @@ public:
     void setDesignModeBehavior(bool inDesignMode);
     void setCurrentObjects(QList<QObject*> items);
     void setAnimationSpeed(qreal slowdownFactor);
-    void setCurrentTool(QmlViewer::Constants::DesignTool toolId);
+    void setCurrentTool(QmlObserver::Constants::DesignTool toolId);
     void reloaded();
     QString idStringForObject(QObject *obj) const;
 
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
index b6ec2d0e8b2c9a6cc899f76c9bb13b6890af3f39..d83c0fb6cd40b513e74a3b3ed0663d6be43d063b 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -39,7 +39,7 @@ QT_FORWARD_DECLARE_CLASS(QDeclarativeItem);
 QT_FORWARD_DECLARE_CLASS(QMouseEvent);
 QT_FORWARD_DECLARE_CLASS(QToolBar);
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class CrumblePath;
 class QDeclarativeViewObserverPrivate;
@@ -124,6 +124,6 @@ private:
 
 };
 
-} //namespace QmlViewer
+} //namespace QmlObserver
 
 #endif // QDECLARATIVEVIEWOBSERVER_H
diff --git a/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h b/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
index 4cf90e19eee2270091d1c08dbe58238e764bea0a..7f3786af0ad5a9a50e468f7e2f7bde2af58c937f 100644
--- a/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
+++ b/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
@@ -1,7 +1,7 @@
 #ifndef QMLVIEWERCONSTANTS_H
 #define QMLVIEWERCONSTANTS_H
 
-namespace QmlViewer {
+namespace QmlObserver {
 namespace Constants {
 
 enum DesignTool {
@@ -34,6 +34,6 @@ enum GraphicsItemTypes {
 
 
 } // namespace Constants
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // QMLVIEWERCONSTANTS_H
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
index 0398dd05cbdfcf12c3a95257809eddec08b76b36..6fc218705f84877d94f0f35e151580a692884a80 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
@@ -172,7 +172,7 @@ void QDeclarativeObserverService::setCurrentObjects(QList<QObject*> objects)
     sendMessage(message);
 }
 
-void QDeclarativeObserverService::setCurrentTool(QmlViewer::Constants::DesignTool toolId)
+void QDeclarativeObserverService::setCurrentTool(QmlObserver::Constants::DesignTool toolId)
 {
     QByteArray message;
     QDataStream ds(&message, QIODevice::WriteOnly);
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
index 48985c9d4f43b3a0d8bf02ef468179034281ff59..a5aab41dc2345c53db9f4f6e5dd238b866c634f5 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -52,7 +52,7 @@
 #include <private/qdeclarativeengine_p.h>
 #include <private/qabstractanimation_p.h>
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 const int SceneChangeUpdateInterval = 5000;
 
@@ -799,6 +799,6 @@ void QDeclarativeViewObserver::setDebugMode(bool isDebugMode)
         data->jsDebuggerAgent = new JSDebuggerAgent(QDeclarativeEnginePrivate::getScriptEngine(data->view->engine()));
 }
 
-} //namespace QmlViewer
+} //namespace QmlObserver
 
 #include <moc_qdeclarativeviewobserver.cpp>
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
index eb3c593c3b7f14d04d80f39d684941ec2dda1743..fcf9b18a12c7ca2e07074e991b520257a48d1cb0 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
@@ -39,7 +39,7 @@
 
 QT_FORWARD_DECLARE_CLASS(JSDebuggerAgent)
 
-namespace QmlViewer {
+namespace QmlObserver {
 
 class QDeclarativeViewObserver;
 class SelectionTool;
@@ -138,6 +138,6 @@ public:
     static QDeclarativeViewObserverPrivate *get(QDeclarativeViewObserver *v) { return v->d_func(); }
 };
 
-} // namespace QmlViewer
+} // namespace QmlObserver
 
 #endif // QDECLARATIVEDESIGNVIEW_P_H
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8932ff02629bb7b65c4d6cda3bd74e1e1f83f4d0..0b4804e8058ac3b11df7951477f14bbe04dee06f 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -51,7 +51,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
     connect(engine(), SIGNAL(quit()), SLOT(close()));
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
 #ifdef QMLINSPECTOR
-    new QmlViewer::QDeclarativeViewObserver(this, parent);
+    new QmlObserver::QDeclarativeViewObserver(this, parent);
 #endif
 }
 
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index 87e86174db3078abec5a900219ec880010ae20ef..21384b3f6d2bbc2b80ccfe16ca2ba8a66bcb2605 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -341,4 +341,4 @@ void CrumblePath::paintEvent(QPaintEvent *event)
     QWidget::paintEvent(event);
 }
 
-} // namespace QmlViewer
+} // namespace Utils
diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h
index 5d7d2bf7f9c49b658ea63a541ec24e4ab5175113..bcb0551582b18b556e9331f8466ee0b941915e5c 100644
--- a/src/libs/utils/crumblepath.h
+++ b/src/libs/utils/crumblepath.h
@@ -72,6 +72,6 @@ private:
     QScopedPointer<CrumblePathPrivate> d;
 };
 
-} // namespace QmlViewer
+} // namespace Utils
 
 #endif // CRUMBLEPATH_H
diff --git a/src/tools/qml/qmlobserver/qmlruntime.cpp b/src/tools/qml/qmlobserver/qmlruntime.cpp
index 2894da2e355f2427f4bb152f5b75f2aaba2ac368..5a84cff33c015f6458fd5f725636df8494f468f0 100644
--- a/src/tools/qml/qmlobserver/qmlruntime.cpp
+++ b/src/tools/qml/qmlobserver/qmlruntime.cpp
@@ -614,7 +614,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     }
 
     canvas = new QDeclarativeView(this);
-    observer = new QmlViewer::QDeclarativeViewObserver(canvas, this);
+    observer = new QmlObserver::QDeclarativeViewObserver(canvas, this);
     if (!(flags & Qt::FramelessWindowHint)) {
         m_crumblePathWidget = new Utils::CrumblePath(canvas);
 #ifndef Q_WS_MAC
diff --git a/src/tools/qml/qmlobserver/qmlruntime.h b/src/tools/qml/qmlobserver/qmlruntime.h
index 1160d91eb521d2da13f675122bfd7457d73f2bd5..43e32f58d5b0610a36debc285699246a44d7b3e8 100644
--- a/src/tools/qml/qmlobserver/qmlruntime.h
+++ b/src/tools/qml/qmlobserver/qmlruntime.h
@@ -49,7 +49,7 @@
 
 #include "loggerwidget.h"
 
-namespace QmlViewer {
+namespace QmlObserver {
     class QDeclarativeViewObserver;
 }
 namespace Utils {
@@ -168,7 +168,7 @@ private:
     LoggerWidget *loggerWindow;
 
     QDeclarativeView *canvas;
-    QmlViewer::QDeclarativeViewObserver *observer;
+    QmlObserver::QDeclarativeViewObserver *observer;
     QSize initialSize;
     QString currentFileOrUrl;
     QTimer recordTimer;