diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index 8d584d8d0becf477926466cd3a457e735b84cb2c..1237a672270df5b8c6b47059e679a622fda2013b 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -58,7 +58,7 @@ Rectangle {
                 spacing: 4
                 Repeater {
                     model: statesEditorModel
-                    delegate: Delegate
+                    delegate: delegate
                 }
             }
             Loader {
@@ -81,14 +81,14 @@ Rectangle {
     }
 
     Component {
-        id: Delegate
+        id: delegate
         Item {
             id: container
             width: Math.max(img.width, txt.width+removeState.width+2,stateNameEditor.width) + 4
             height: img.height + txt.height + 4
 
             Rectangle {
-                id: Highlight
+                id: highlight
                 anchors.fill: parent
                 color: "#0303e0"
                 radius: 4
@@ -152,7 +152,7 @@ Rectangle {
                 Rectangle {
                     width: parent.width - 4;
                     height:2
-                    color:(root.currentStateIndex==index?Highlight.color:root.color);
+                    color:(root.currentStateIndex==index?highlight.color:root.color);
                     anchors.centerIn:parent
                 }
 
@@ -237,7 +237,7 @@ Rectangle {
                     }
 
                     MouseRegion {
-                        id: AbsorbAllClicks
+                        id: absorbAllClicks
                         anchors.fill:parent
                     }
                     Text {
diff --git a/src/plugins/qmlinspector/components/engines.qml b/src/plugins/qmlinspector/components/engines.qml
index 1e9335b58839309561e91897738684a0f14fc79e..d5c8f76fdcbfa1ea8ad35b8a3ac80205601bd159 100644
--- a/src/plugins/qmlinspector/components/engines.qml
+++ b/src/plugins/qmlinspector/components/engines.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Item {
     height: 100
-    id: Root
+    id: root
     signal engineClicked(int id)
     signal refreshEngines()
 
@@ -13,18 +13,18 @@ Item {
             Item {
                 width: 100; height: 100;
                 Image { 
-                    id: EngineIcon; 
+                    id: engineIcon; 
                     source: "qrc:/engine.png"
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
                 Text { 
-                    anchors.top: EngineIcon.bottom; 
+                    anchors.top: engineIcon.bottom; 
                     text: modelData.name + "(" + modelData.engineId + ")"
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
                 MouseRegion {
                     anchors.fill: parent
-                    onClicked: Root.engineClicked(modelData.engineId);
+                    onClicked: root.engineClicked(modelData.engineId);
                 }
             }
         }