diff --git a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
index 100869bd3ef..dd6db6a2b65 100644
--- a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
@@ -1,6 +1,6 @@
 #include "boundingrecthighlighter.h"
 #include "qdeclarativeviewobserver.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 #include <QGraphicsPolygonItem>
 #include <QTimer>
diff --git a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
index e93f95637c3..24b8bfeb9cb 100644
--- a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "layeritem.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 #include <QGraphicsScene>
 
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
index 5f0765d3774..73d204cd723 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
@@ -3,7 +3,7 @@
 
 #include <QToolBar>
 #include <QIcon>
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 namespace QmlObserver {
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
index 4d36981b0b5..b35e9354bfe 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
@@ -29,7 +29,7 @@
 
 #include "selectionindicator.h"
 #include "qdeclarativeviewobserver_p.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 #include <QPen>
 #include <cmath>
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
index 114aab960b6..1a100db7617 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "selectionrectangle.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 #include <QPen>
 #include <QGraphicsScene>
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
index 2f4772b699b..ade3638b4b4 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
@@ -1,5 +1,5 @@
 #include "subcomponentmasklayeritem.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 #include "qdeclarativeviewobserver.h"
 #include <QPolygonF>
 
diff --git a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
index 9265ba18599..5e295e7c1c4 100644
--- a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
@@ -1,5 +1,5 @@
 #include "toolbarcolorbox.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 
 #include <QPixmap>
 #include <QPainter>
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
index 220b8186e8a..8a56829485e 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVEDESIGNDEBUGSERVER_H
 
 #include <private/qdeclarativedebugservice_p.h>
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 #include "qmljsdebugger_global.h"
 
 #include <QHash>
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
index 7433a7c78cb..dc8ae50b69d 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -31,7 +31,7 @@
 #define QDECLARATIVEVIEWOBSERVER_H
 
 #include "qmljsdebugger_global.h"
-#include "qmlviewerconstants.h"
+#include "qmlobserverconstants.h"
 #include <qdeclarativeview.h>
 #include <QWeakPointer>
 
diff --git a/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h b/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
similarity index 86%
rename from share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
rename to share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
index 7f3786af0ad..72fcfe8472a 100644
--- a/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
+++ b/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
@@ -1,5 +1,5 @@
-#ifndef QMLVIEWERCONSTANTS_H
-#define QMLVIEWERCONSTANTS_H
+#ifndef QMLOBSERVERCONSTANTS_H
+#define QMLOBSERVERCONSTANTS_H
 
 namespace QmlObserver {
 namespace Constants {
@@ -36,4 +36,4 @@ enum GraphicsItemTypes {
 } // namespace Constants
 } // namespace QmlObserver
 
-#endif // QMLVIEWERCONSTANTS_H
+#endif // QMLOBSERVERCONSTANTS_H
diff --git a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
index 2c47e3ad91c..a39a2a415eb 100644
--- a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
@@ -19,7 +19,7 @@ HEADERS += \
     include/jsdebuggeragent.h \
     include/qdeclarativeviewobserver.h \
     include/qdeclarativeobserverservice.h \
-    include/qmlviewerconstants.h \
+    include/qmlobserverconstants.h \
     include/qmljsdebugger_global.h \
     qdeclarativeviewobserver_p.h