reftests: Remove event box usage

22 files changed, 91 insertions, 91 deletions

diff --git a/testsuite/reftests/box-packing.ref.ui b/testsuite/reftests/box-packing.ref.ui
index 9624b30983..fe90b3d8fa 100644
--- a/testsuite/reftests/box-packing.ref.ui
+++ b/testsuite/reftests/box-packing.ref.ui
@@ -16,7 +16,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkImage" id="image1">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -28,7 +28,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox2">
+              <object class="GtkImage" id="image2">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -49,7 +49,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox3">
+              <object class="GtkImage" id="image3">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -61,7 +61,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox4">
+              <object class="GtkImage" id="image4">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -82,7 +82,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox5">
+              <object class="GtkImage" id="image5">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -94,7 +94,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox6">
+              <object class="GtkImage" id="image6">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -115,7 +115,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox7">
+              <object class="GtkImage" id="image7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -127,7 +127,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox8">
+              <object class="GtkImage" id="image8">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -153,7 +153,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox9">
+                  <object class="GtkImage" id="image9">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -165,7 +165,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox10">
+                  <object class="GtkImage" id="image10">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -187,7 +187,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox11">
+                  <object class="GtkImage" id="image11">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -199,7 +199,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox12">
+                  <object class="GtkImage" id="image12">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -221,7 +221,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox13">
+                  <object class="GtkImage" id="image13">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -233,7 +233,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox14">
+                  <object class="GtkImage" id="image14">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -255,7 +255,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox15">
+                  <object class="GtkImage" id="image15">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -267,7 +267,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox16">
+                  <object class="GtkImage" id="image16">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -294,7 +294,7 @@
             <property name="can_focus">False</property>
             <property name="orientation">horizontal</property>
             <child>
-              <object class="GtkEventBox" id="eventbox17">
+              <object class="GtkImage" id="image17">
                 <property name="name">red</property>
                 <property name="width_request">10</property>
                 <property name="height_request">30</property>
@@ -303,7 +303,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox18">
+              <object class="GtkImage" id="image18">
                 <property name="name">green</property>
                 <property name="width_request">10</property>
                 <property name="height_request">30</property>
@@ -312,7 +312,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox19">
+              <object class="GtkImage" id="image19">
                 <property name="name">red</property>
                 <property name="width_request">20</property>
                 <property name="height_request">30</property>
@@ -321,7 +321,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox20">
+              <object class="GtkImage" id="image20">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">30</property>
@@ -330,7 +330,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox21">
+              <object class="GtkImage" id="image21">
                 <property name="name">red</property>
                 <property name="width_request">40</property>
                 <property name="height_request">30</property>
@@ -339,7 +339,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox22">
+              <object class="GtkImage" id="image22">
                 <property name="name">green</property>
                 <property name="width_request">40</property>
                 <property name="height_request">30</property>
diff --git a/testsuite/reftests/box-packing.ui b/testsuite/reftests/box-packing.ui
index f551d26d9a..59cb81c4b7 100644
--- a/testsuite/reftests/box-packing.ui
+++ b/testsuite/reftests/box-packing.ui
@@ -16,7 +16,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkImage" id="image1">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -31,7 +31,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox2">
+              <object class="GtkImage" id="image2">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -55,7 +55,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox3">
+              <object class="GtkImage" id="image3">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -71,7 +71,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox4">
+              <object class="GtkImage" id="image4">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -95,7 +95,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox5">
+              <object class="GtkImage" id="image5">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -110,7 +110,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox6">
+              <object class="GtkImage" id="image6">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -135,7 +135,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox7">
+              <object class="GtkImage" id="image7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -151,7 +151,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox8">
+              <object class="GtkImage" id="image8">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -180,7 +180,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox9">
+                  <object class="GtkImage" id="image9">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -195,7 +195,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox10">
+                  <object class="GtkImage" id="image10">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -219,7 +219,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox11">
+                  <object class="GtkImage" id="image11">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -237,7 +237,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox12">
+                  <object class="GtkImage" id="image12">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -261,7 +261,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox13">
+                  <object class="GtkImage" id="image13">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -276,7 +276,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox14">
+                  <object class="GtkImage" id="image14">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -301,7 +301,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkEventBox" id="eventbox15">
+                  <object class="GtkImage" id="image15">
                     <property name="name">red</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -317,7 +317,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEventBox" id="eventbox16">
+                  <object class="GtkImage" id="image16">
                     <property name="name">green</property>
                     <property name="width_request">30</property>
                     <property name="height_request">30</property>
@@ -347,7 +347,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox17">
+              <object class="GtkImage" id="image17">
                 <property name="name">red</property>
                 <property name="width_request">10</property>
                 <property name="height_request">30</property>
@@ -362,7 +362,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox18">
+              <object class="GtkImage" id="image18">
                 <property name="name">green</property>
                 <property name="width_request">10</property>
                 <property name="height_request">30</property>
@@ -378,7 +378,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox19">
+              <object class="GtkImage" id="image19">
                 <property name="name">red</property>
                 <property name="width_request">20</property>
                 <property name="height_request">30</property>
@@ -393,7 +393,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox20">
+              <object class="GtkImage" id="image20">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">30</property>
@@ -409,7 +409,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox21">
+              <object class="GtkImage" id="image21">
                 <property name="name">red</property>
                 <property name="width_request">40</property>
                 <property name="height_request">30</property>
@@ -424,7 +424,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox22">
+              <object class="GtkImage" id="image22">
                 <property name="name">green</property>
                 <property name="width_request">40</property>
                 <property name="height_request">30</property>
diff --git a/testsuite/reftests/css-match-descendant-later.css b/testsuite/reftests/css-match-descendant-later.css
index 2c29036ab3..f0d62ef97e 100644
--- a/testsuite/reftests/css-match-descendant-later.css
+++ b/testsuite/reftests/css-match-descendant-later.css
@@ -1,11 +1,11 @@
-GtkEventBox {
+box {
   background-color: blue
 }
 
-GtkGrid GtkEventBox {
+grid box {
   background-color: red
 }
 
-window > GtkGrid GtkEventBox {
+window > grid box {
   background-color: blue
 }
diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui b/testsuite/reftests/css-match-descendant-later.ref.ui
index 1afc99baa6..a6a57bedbe 100644
--- a/testsuite/reftests/css-match-descendant-later.ref.ui
+++ b/testsuite/reftests/css-match-descendant-later.ref.ui
@@ -5,7 +5,7 @@
     <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkEventBox" id="eventbox1">
+      <object class="GtkBox" id="box1">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
         <property name="visible">True</property>
diff --git a/testsuite/reftests/css-match-descendant-later.ui b/testsuite/reftests/css-match-descendant-later.ui
index 68c8f58645..97d81708c4 100644
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -13,7 +13,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
                 <property name="visible">True</property>
diff --git a/testsuite/reftests/css-match-exact.css b/testsuite/reftests/css-match-exact.css
index f1b31ecba7..4c8f9ad610 100644
--- a/testsuite/reftests/css-match-exact.css
+++ b/testsuite/reftests/css-match-exact.css
@@ -4,6 +4,6 @@
   background-color: lime;
 }
 
-GtkGrid {
+grid {
   background-color: red;
 }
diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index 1c39ba740e..ce2f815a36 100644
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -11,7 +11,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="width_request">10</property>
             <property name="height_request">10</property>
             <property name="visible">True</property>
diff --git a/testsuite/reftests/grid-expand.css b/testsuite/reftests/grid-expand.css
index 87409fc165..fd336dbfe1 100644
--- a/testsuite/reftests/grid-expand.css
+++ b/testsuite/reftests/grid-expand.css
@@ -1,3 +1,3 @@
-GtkEventBox {
+box {
   background-color: lime
 }
diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index d2d3d318a8..9139bcdee5 100644
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -11,7 +11,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="width_request">45</property>
             <property name="height_request">10</property>
             <property name="visible">True</property>
@@ -28,7 +28,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox2">
+          <object class="GtkBox" id="box2">
             <property name="width_request">45</property>
             <property name="height_request">45</property>
             <property name="visible">True</property>
@@ -45,7 +45,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox3">
+          <object class="GtkBox" id="box3">
             <property name="width_request">10</property>
             <property name="height_request">45</property>
             <property name="visible">True</property>
diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index 3a44cfeac7..3819ed6500 100644
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -15,7 +15,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
                 <property name="visible">True</property>
@@ -34,7 +34,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox2">
+              <object class="GtkBox" id="box2">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
                 <property name="visible">True</property>
@@ -55,7 +55,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox3">
+              <object class="GtkBox" id="box3">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
                 <property name="visible">True</property>
diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index 6fbaeb1653..7b87fef07f 100644
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -9,7 +9,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -24,7 +24,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox2">
+          <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
@@ -39,7 +39,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox3">
+          <object class="GtkBox" id="box3">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -54,7 +54,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox4">
+          <object class="GtkBox" id="box4">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">30</property>
@@ -69,7 +69,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox5">
+          <object class="GtkBox" id="box5">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -84,7 +84,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox6">
+          <object class="GtkBox" id="box6">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">20</property>
@@ -99,7 +99,7 @@
           </packing>
         </child>
             <child>
-              <object class="GtkEventBox" id="eventbox7">
+              <object class="GtkBox" id="box7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -114,7 +114,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox8">
+              <object class="GtkBox" id="box8">
                 <property name="name">green</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index 7cfc98b7c3..4e40f2e4b3 100644
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -13,7 +13,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkBox" id="box1">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -28,7 +28,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox2">
+              <object class="GtkBox" id="box2">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
@@ -56,7 +56,7 @@
             <property name="can_focus">False</property>
             <property name="row_homogeneous">True</property>
             <child>
-              <object class="GtkEventBox" id="eventbox3">
+              <object class="GtkBox" id="box3">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -71,7 +71,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox4">
+              <object class="GtkBox" id="box4">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
@@ -99,7 +99,7 @@
             <property name="can_focus">False</property>
             <property name="column_homogeneous">True</property>
             <child>
-              <object class="GtkEventBox" id="eventbox5">
+              <object class="GtkBox" id="box5">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -114,7 +114,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox6">
+              <object class="GtkBox" id="box6">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
@@ -143,7 +143,7 @@
             <property name="row_homogeneous">True</property>
             <property name="column_homogeneous">True</property>
             <child>
-              <object class="GtkEventBox" id="eventbox7">
+              <object class="GtkBox" id="box7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
@@ -158,7 +158,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="eventbox8">
+              <object class="GtkBox" id="box8">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
diff --git a/testsuite/reftests/grid-spacing3.css b/testsuite/reftests/grid-spacing3.css
index 7d3df2a7b8..c8398de479 100644
--- a/testsuite/reftests/grid-spacing3.css
+++ b/testsuite/reftests/grid-spacing3.css
@@ -1,8 +1,8 @@
 #red {
-  background-color: red;
+  background: red;
 }
 
 #lime {
-  background-color: lime;
+  background: lime;
 }
 
diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 357635385e..6638fc5138 100644
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -11,7 +11,7 @@
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -26,7 +26,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox2">
+          <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -41,7 +41,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox3">
+          <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -56,7 +56,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox4">
+          <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index 6fc6ce4959..5ddbea17bd 100644
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -12,7 +12,7 @@
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -27,7 +27,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox2">
+          <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -42,7 +42,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox3">
+          <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
@@ -57,7 +57,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="eventbox4">
+          <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui
index 70240f749d..94fe8ad2c1 100644
--- a/testsuite/reftests/opacity.ref.ui
+++ b/testsuite/reftests/opacity.ref.ui
@@ -40,7 +40,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="box4">
+          <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui
index 1a9f8a470f..e9d096a050 100644
--- a/testsuite/reftests/opacity.ui
+++ b/testsuite/reftests/opacity.ui
@@ -42,7 +42,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEventBox" id="box4">
+          <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="name">alpha</property>
diff --git a/testsuite/reftests/paned-undersized.css b/testsuite/reftests/paned-undersized.css
index 0d0aae9909..6cd43f0bc9 100644
--- a/testsuite/reftests/paned-undersized.css
+++ b/testsuite/reftests/paned-undersized.css
@@ -1,3 +1,3 @@
-GtkEventBox {
+box {
   background-color: red;
 }
diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index fa42f31f0d..be91470585 100644
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -12,7 +12,7 @@
         <property name="orientation">vertical</property>
         <property name="position">10</property>
         <child>
-          <object class="GtkEventBox" id="eventbox1">
+          <object class="GtkBox" id="box1">
             <property name="width_request">50</property>
             <property name="height_request">10</property>
             <property name="visible">True</property>
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index 7c073e4b76..7f337fb6dd 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -16,7 +16,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkEventBox" id="eventbox1">
+              <object class="GtkBox" id="box1">
                 <property name="width_request">50</property>
                 <property name="height_request">50</property>
                 <property name="visible">True</property>
diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui
index eadb441ed4..c6c3361585 100644
--- a/testsuite/reftests/simple.ref.ui
+++ b/testsuite/reftests/simple.ref.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkEventBox" id="eventbox1">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui
index eadb441ed4..c6c3361585 100644
--- a/testsuite/reftests/simple.ui
+++ b/testsuite/reftests/simple.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkEventBox" id="eventbox1">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>