diff --git a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/helper/widget/MotionPlaceholder.java b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/helper/widget/MotionPlaceholder.java
index 679db69b6..ed4357613 100644
--- a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/helper/widget/MotionPlaceholder.java
+++ b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/helper/widget/MotionPlaceholder.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.SparseArray;
-import android.view.ViewParent;
 
 import androidx.constraintlayout.core.widgets.ConstraintWidget;
 import androidx.constraintlayout.core.widgets.ConstraintWidgetContainer;
diff --git a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
index 271e06b40..acf3b4151 100644
--- a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
+++ b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
@@ -1236,7 +1236,7 @@ private int parseConstraintSet(Context context, XmlPullParser parser) {
                 case "deriveConstraintsFrom":
                     derivedId = getId(context, value);
                     break;
-                case "ConstraintRotate":
+                case "constraintRotate":
                     set.mRotate = Integer.parseInt(value);
                     break;
             }
diff --git a/constraintlayout/constraintlayout/src/main/res/values/attrs.xml b/constraintlayout/constraintlayout/src/main/res/values/attrs.xml
index 5a2e82f93..f2519a68c 100644
--- a/constraintlayout/constraintlayout/src/main/res/values/attrs.xml
+++ b/constraintlayout/constraintlayout/src/main/res/values/attrs.xml
@@ -632,7 +632,7 @@
 
     <declare-styleable name="ConstraintSet">
         <attr name="deriveConstraintsFrom" format="reference" />
-        <attr name="ConstraintRotate" format="enum" >
+        <attr name="constraintRotate" format="enum" >
             <enum name="none" value="0"/>
             <enum name="right" value="1"/>
             <enum name="left" value="2"/>
diff --git a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_037.xml b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_037.xml
index ec0b45533..a100da1f2 100644
--- a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_037.xml
+++ b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_037.xml
@@ -21,22 +21,22 @@
 
     <ConstraintSet android:id="@+id/landscape_R90"
         motion:deriveConstraintsFrom="@id/landscape"
-        motion:ConstraintRotate="left" />
+        motion:constraintRotate="left" />
 
     <ConstraintSet android:id="@+id/landscape_right_RN90"
         motion:deriveConstraintsFrom="@id/landscape_right"
-        motion:ConstraintRotate="right"/>
+        motion:constraintRotate="right"/>
 
     <ConstraintSet android:id="@+id/portrait_R90"
         motion:deriveConstraintsFrom="@id/portrait"
-        motion:ConstraintRotate="x_right">
+        motion:constraintRotate="x_right">
     </ConstraintSet>
 
     <!--???????????????????????????????????????????-->
 
     <ConstraintSet android:id="@+id/portrait_RN90"
         motion:deriveConstraintsFrom="@id/portrait"
-        motion:ConstraintRotate="x_left">
+        motion:constraintRotate="x_left">
     </ConstraintSet>
 
 
diff --git a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_039.xml b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_039.xml
index ec0b45533..a100da1f2 100644
--- a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_039.xml
+++ b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_039.xml
@@ -21,22 +21,22 @@
 
     <ConstraintSet android:id="@+id/landscape_R90"
         motion:deriveConstraintsFrom="@id/landscape"
-        motion:ConstraintRotate="left" />
+        motion:constraintRotate="left" />
 
     <ConstraintSet android:id="@+id/landscape_right_RN90"
         motion:deriveConstraintsFrom="@id/landscape_right"
-        motion:ConstraintRotate="right"/>
+        motion:constraintRotate="right"/>
 
     <ConstraintSet android:id="@+id/portrait_R90"
         motion:deriveConstraintsFrom="@id/portrait"
-        motion:ConstraintRotate="x_right">
+        motion:constraintRotate="x_right">
     </ConstraintSet>
 
     <!--???????????????????????????????????????????-->
 
     <ConstraintSet android:id="@+id/portrait_RN90"
         motion:deriveConstraintsFrom="@id/portrait"
-        motion:ConstraintRotate="x_left">
+        motion:constraintRotate="x_left">
     </ConstraintSet>